feat(ics20): receive foreign tokens (#25)

Co-authored-by: srdtrk <[email protected]> Co-authored-by: srdtrk <[email protected]>
cosmos · Aug 13, 2024 · f1dffcc · f1dffcc
1 parent 554478d
commit f1dffcc
Show file tree

Hide file tree

Showing 16 changed files with 1,061 additions and 234 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -44,6 +44,7 @@ jobs:
           # List your tests here
           - TestWithIbcEurekaTestSuite/TestDeploy
           - TestWithIbcEurekaTestSuite/TestICS20Transfer
+          - TestWithIbcEurekaTestSuite/TestICS20TransferNativeSdkCoin
           - TestWithIbcEurekaTestSuite/TestICS20Timeout
     name: ${{ matrix.test }}
     runs-on: ubuntu-latest
@@ -69,4 +70,4 @@ jobs:
           SP1_PRIVATE_KEY: ${{ secrets.SP1_PRIVATE_KEY }}
         run: |
           cd e2e/interchaintestv8
-          go test -v -mod=readonly . -run=${{ matrix.test }} -timeout 40m
+          go test -v -mod=readonly . -run '^${{ matrix.test }}$' -timeout 40m
diff --git a/abi/ICS20Transfer.json b/abi/ICS20Transfer.json
@@ -386,28 +386,38 @@
         "name": "packetData",
         "type": "tuple",
         "indexed": false,
-        "internalType": "struct ICS20Lib.UnwrappedFungibleTokenPacketData",
+        "internalType": "struct ICS20Lib.UnwrappedPacketData",
         "components": [
           {
-            "name": "erc20ContractAddress",
-            "type": "address",
-            "internalType": "address"
+            "name": "denom",
+            "type": "string",
+            "internalType": "string"
           },
           {
-            "name": "amount",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "originatorChainIsSource",
+            "type": "bool",
+            "internalType": "bool"
           },
           {
-            "name": "sender",
+            "name": "erc20Contract",
             "type": "address",
             "internalType": "address"
           },
+          {
+            "name": "sender",
+            "type": "string",
+            "internalType": "string"
+          },
           {
             "name": "receiver",
             "type": "string",
             "internalType": "string"
           },
+          {
+            "name": "amount",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
           {
             "name": "memo",
             "type": "string",
@@ -432,13 +442,23 @@
         "name": "packetData",
         "type": "tuple",
         "indexed": false,
-        "internalType": "struct ICS20Lib.PacketDataJSON",
+        "internalType": "struct ICS20Lib.UnwrappedPacketData",
         "components": [
           {
             "name": "denom",
             "type": "string",
             "internalType": "string"
           },
+          {
+            "name": "originatorChainIsSource",
+            "type": "bool",
+            "internalType": "bool"
+          },
+          {
+            "name": "erc20Contract",
+            "type": "address",
+            "internalType": "address"
+          },
           {
             "name": "sender",
             "type": "string",
@@ -472,28 +492,38 @@
         "name": "packetData",
         "type": "tuple",
         "indexed": false,
-        "internalType": "struct ICS20Lib.UnwrappedFungibleTokenPacketData",
+        "internalType": "struct ICS20Lib.UnwrappedPacketData",
         "components": [
           {
-            "name": "erc20ContractAddress",
-            "type": "address",
-            "internalType": "address"
+            "name": "denom",
+            "type": "string",
+            "internalType": "string"
           },
           {
-            "name": "amount",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "originatorChainIsSource",
+            "type": "bool",
+            "internalType": "bool"
           },
           {
-            "name": "sender",
+            "name": "erc20Contract",
             "type": "address",
             "internalType": "address"
           },
+          {
+            "name": "sender",
+            "type": "string",
+            "internalType": "string"
+          },
           {
             "name": "receiver",
             "type": "string",
             "internalType": "string"
           },
+          {
+            "name": "amount",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
           {
             "name": "memo",
             "type": "string",
@@ -512,28 +542,38 @@
         "name": "packetData",
         "type": "tuple",
         "indexed": false,
-        "internalType": "struct ICS20Lib.UnwrappedFungibleTokenPacketData",
+        "internalType": "struct ICS20Lib.UnwrappedPacketData",
         "components": [
           {
-            "name": "erc20ContractAddress",
-            "type": "address",
-            "internalType": "address"
+            "name": "denom",
+            "type": "string",
+            "internalType": "string"
           },
           {
-            "name": "amount",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "originatorChainIsSource",
+            "type": "bool",
+            "internalType": "bool"
           },
           {
-            "name": "sender",
+            "name": "erc20Contract",
             "type": "address",
             "internalType": "address"
           },
+          {
+            "name": "sender",
+            "type": "string",
+            "internalType": "string"
+          },
           {
             "name": "receiver",
             "type": "string",
             "internalType": "string"
           },
+          {
+            "name": "amount",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
           {
             "name": "memo",
             "type": "string",
@@ -624,34 +664,34 @@
   },
   {
     "type": "error",
-    "name": "ICS20InvalidAmount",
+    "name": "ICS20DenomNotFound",
     "inputs": [
       {
-        "name": "amount",
-        "type": "uint256",
-        "internalType": "uint256"
+        "name": "denom",
+        "type": "string",
+        "internalType": "string"
       }
     ]
   },
   {
     "type": "error",
-    "name": "ICS20InvalidReceiver",
+    "name": "ICS20InvalidAddress",
     "inputs": [
       {
-        "name": "receiver",
+        "name": "addr",
         "type": "string",
         "internalType": "string"
       }
     ]
   },
   {
     "type": "error",
-    "name": "ICS20InvalidSender",
+    "name": "ICS20InvalidAmount",
     "inputs": [
       {
-        "name": "sender",
-        "type": "string",
-        "internalType": "string"
+        "name": "amount",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ]
   },

diff --git a/bun.lockb b/bun.lockb
diff --git a/e2e/artifacts/genesis.json b/e2e/artifacts/genesis.json
@@ -1,7 +1,7 @@
 {
   "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b24dfc0a376dcfbf32aa896d68958779c5d6ef4c73b5f0eb8c55e74eaeb1399a9f8250b29f00b95808b8b596d78d77bbb1f263250537c5561baf2dc879ae5226c9ccd7",
-  "updateClientVkey": "0x0068b9d316aced51c5923b2d50692f4a6a9bfefcd89392914b90e77545727fbe",
-  "membershipVkey": "0x00a4245d249b5c35c9782cc899c8e370a35d5d928187dc9e7acbab7096764b72",
-  "ucAndMembershipVkey": "0x00cea834e3408d45d29080a3146e4fb1fd0c06503d655bd787219caac86cf59c"
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b9eea063bcab1d2706362bf6a681e2d3290c2aabb5a4fb8bb1be180fde34c25bccd1af6d0f97857b6ffe08adeab2f8a4f8425638aa3d8d3eaeb59283abe81ab18417a7",
+  "updateClientVkey": "0x00ba8c461624efc02962f1fd9683d6576a73a3f126c5539832a725cc26071fba",
+  "membershipVkey": "0x00439c7d9afabe135aff8d86bae1e522beae2a66397fb27085233da1e45d0a02",
+  "ucAndMembershipVkey": "0x0065cb0619cfe50b6131a2cae2cad8ea153ef255fc3c6d0e83195ec4b64394cb"
 }