@airswap/utils fix: lowercase addresses for getFullSwapERC20

airswap · Jan 31, 2024 · 07cf57c · 07cf57c
1 parent 148557b
commit 07cf57c
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 deletions.
diff --git a/source/batch-call/package.json b/source/batch-call/package.json
@@ -31,7 +31,7 @@
     "@airswap/swap-erc20": "4.2.0"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

diff --git a/source/pool/package.json b/source/pool/package.json
@@ -31,7 +31,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "@airswap/merkle": "0.0.2",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/source/registry/package.json b/source/registry/package.json
@@ -32,7 +32,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "prompt-confirm": "^2.0.4"
   }
 }
diff --git a/source/staking/package.json b/source/staking/package.json
@@ -32,7 +32,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "prompt-confirm": "^2.0.4"
   }
 }
diff --git a/source/swap-erc20/package.json b/source/swap-erc20/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@airswap/staking": "4.0.5",
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "prompt-confirm": "^2.0.4"
   },
   "publishConfig": {

diff --git a/source/swap/package.json b/source/swap/package.json
@@ -32,7 +32,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.7"
   },
   "publishConfig": {

diff --git a/source/wrapper/package.json b/source/wrapper/package.json
@@ -32,7 +32,7 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "devDependencies": {
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "prompt-confirm": "^2.0.4"
   },

diff --git a/tools/libraries/package.json b/tools/libraries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airswap/libraries",
-  "version": "4.2.4",
+  "version": "4.2.5",
   "description": "AirSwap: Libraries for Developers",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "@airswap/staking": "4.0.5",
     "@airswap/swap": "4.2.0",
     "@airswap/swap-erc20": "4.2.0",
-    "@airswap/utils": "4.2.3",
+    "@airswap/utils": "4.2.4",
     "@airswap/wrapper": "4.1.5",
     "browser-or-node": "^2.1.1",
     "ethers": "^5.6.9",

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

diff --git a/tools/utils/src/swap-erc20.ts b/tools/utils/src/swap-erc20.ts
@@ -339,9 +339,9 @@ const parseTransfer = (log: any) => {
     parsed = erc20Interface.parseLog(log)
     if (parsed.name === 'Transfer') {
       transfer = {
-        token: log.address,
-        from: parsed.args[0],
-        to: parsed.args[1],
+        token: log.address?.toLowerCase(),
+        from: parsed.args[0]?.toLowerCase(),
+        to: parsed.args[1]?.toLowerCase(),
         amount: ethers.BigNumber.from(parsed.args[2]),
       }
     }
@@ -360,6 +360,10 @@ export const getFullSwapERC20 = async (
   const transfers = []
   let transfer: any
   let length = logs.length
+
+  feeReceiver = feeReceiver.toLowerCase()
+  signerWallet = signerWallet.toLowerCase()
+
   while (length--) {
     if ((transfer = parseTransfer(logs[length]))) {
       transfers.push(transfer)
@@ -390,6 +394,10 @@ export const getFullSwapERC20 = async (
     }
   }
 
+  if (!signer || !sender) {
+    throw new Error('getFullSwapERC20: Swap not found')
+  }
+
   return {
     nonce: nonce.toString(),
     signerWallet: signer.from,

diff --git a/tools/utils/test/utils.ts b/tools/utils/test/utils.ts
@@ -201,7 +201,7 @@ describe('Utils', async () => {
 
   it('Gets full SwapERC20 from signerWallet and logs', async () => {
     const nonce = '1'
-    const signerWallet = '0x51C72848c68a965f66FA7a88855F9f7784502a7F'
+    const signerWallet = '0x51c72848c68a965f66fa7a88855f9f7784502a7f'
     const feeReceiver = '0xaD30f7EEBD9Bd5150a256F47DA41d4403033CdF0'
     const fullSwap = await getFullSwapERC20(
       nonce,
@@ -212,10 +212,10 @@ describe('Utils', async () => {
     expect(fullSwap).to.deep.equal({
       nonce,
       signerWallet,
-      signerToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+      signerToken: '0xdac17f958d2ee523a2206206994597c13d831ec7',
       signerAmount: '1008438461',
-      senderWallet: '0x74de5d4FCbf63E00296fd95d33236B9794016631',
-      senderToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+      senderWallet: '0x74de5d4fcbf63e00296fd95d33236b9794016631',
+      senderToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
       senderAmount: '461545050000000000',
       feeAmount: '705906',
     })