@airswap/utils: getFullSwapERC20: handle case of zero fee transfer

airswap · Nov 21, 2024 · 30d18bc · 30d18bc
1 parent 6ce3c6b
commit 30d18bc
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/source/batch-call/package.json b/source/batch-call/package.json
@@ -29,7 +29,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@airswap/swap": "5.0.1",
     "@airswap/swap-erc20": "5.0.1",
     "@openzeppelin/contracts": "^4.8.3"

diff --git a/source/delegate/package.json b/source/delegate/package.json
@@ -29,7 +29,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@airswap/swap-erc20": "5.0.1"
   },
   "publishConfig": {

diff --git a/source/pool/package.json b/source/pool/package.json
@@ -30,7 +30,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@airswap/merkle": "0.0.2",
     "@openzeppelin/contracts": "^4.8.3"
   },

diff --git a/source/registry/package.json b/source/registry/package.json
@@ -29,7 +29,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@openzeppelin/contracts": "^4.8.3"
   },
   "publishConfig": {

diff --git a/source/staking/package.json b/source/staking/package.json
@@ -29,7 +29,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@openzeppelin/contracts": "^4.8.3"
   },
   "publishConfig": {

diff --git a/source/swap-erc20/package.json b/source/swap-erc20/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@airswap/staking": "5.0.1",
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "solady": "0.0.173"
   },
   "publishConfig": {

diff --git a/source/swap/package.json b/source/swap/package.json
@@ -31,7 +31,7 @@
     "ethers": "^5.7.2"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.7",
     "@openzeppelin/contracts": "^4.8.3"
   },

diff --git a/source/wrapper/package.json b/source/wrapper/package.json
@@ -26,7 +26,7 @@
     "owners": "hardhat run ./scripts/owner.js"
   },
   "devDependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@airswap/swap-erc20": "5.0.1",
     "@openzeppelin/contracts": "^4.8.3",
     "@uniswap/v2-periphery": "^1.1.0-beta.0"

diff --git a/tools/libraries/package.json b/tools/libraries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/libraries",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "AirSwap: Libraries for Developers",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "@airswap/staking": "5.0.1",
     "@airswap/swap": "5.0.1",
     "@airswap/swap-erc20": "5.0.1",
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "@airswap/wrapper": "5.0.1",
     "browser-or-node": "^2.1.1",
     "ethers": "^5.7.2",

diff --git a/tools/stores/package.json b/tools/stores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/stores",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "AirSwap: Storage for Indexing",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "test": "REDISCLOUD_URL=redis://localhost:6379 TS_NODE_COMPILER_OPTIONS='{\"strict\":false}' yarn mocha -r ts-node/esm test/*.ts"
   },
   "dependencies": {
-    "@airswap/utils": "5.0.1",
+    "@airswap/utils": "5.0.2",
     "redis": "^4.6.13"
   },
   "devDependencies": {

diff --git a/tools/utils/package.json b/tools/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/utils",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "AirSwap: Utilities for Developers",
   "repository": {
     "type": "git",

diff --git a/tools/utils/src/swap-erc20.ts b/tools/utils/src/swap-erc20.ts
@@ -382,7 +382,7 @@ export const getFullSwapERC20FromTransfers = (
   }
 
   if (!signerTransfer || !senderTransfer) {
-    throw new Error('getFullSwapERC20: Either signer or sender not found')
+    throw new Error('getFullSwapERC20: mutual transfers not found')
   }
 
   return {
@@ -393,7 +393,7 @@ export const getFullSwapERC20FromTransfers = (
     senderWallet: senderTransfer.from,
     senderToken: senderTransfer.token,
     senderAmount: senderTransfer.amount.toString(),
-    feeAmount: feeTransfer.amount.toString(),
+    feeAmount: (feeTransfer?.amount || 0).toString(),
   }
 }