feat: replace ics20-1 with ics20-2

README.md

@@ -161,11 +161,11 @@ The following benchmarks are for a single packet transfer without aggregation.
 
 | **Contract** | **Method** | **Description** | **Gas (groth16)** | **Gas (plonk)** |
 |:---:|:---:|:---:|:---:|:---:|
-| `ICS26Router.sol` | `sendPacket` | Initiating an IBC transfer with an `ERC20`. | ~160,500 | ~160,500 |
-| `ICS26Router.sol` | `recvPacket` | Receiving _back_ an `ERC20` token. | ~514,404 | ~598,268 |
-| `ICS26Router.sol` | `recvPacket` | Receiving a _new_ Cosmos token for the first time. (Deploying an `ERC20` contract) | ~1,364,844 | ~1,448,420 |
-| `ICS26Router.sol` | `ackPacket` | Acknowledging an ICS20 packet. | ~395,625 | ~479,390 |
-| `ICS26Router.sol` | `timeoutPacket` | Timing out an ICS20 packet | ~452,966 | ~536,673 |
+| `ICS26Router.sol` | `sendPacket` | Initiating an IBC transfer with an `ERC20`. | ~156,150 | ~156,150 |
+| `ICS26Router.sol` | `recvPacket` | Receiving _back_ an `ERC20` token. | ~434,621 | ~508,755 |
+| `ICS26Router.sol` | `recvPacket` | Receiving a _new_ Cosmos token for the first time. (Deploying an `ERC20` contract) | ~1,429,785 | ~1,503,717 |
+| `ICS26Router.sol` | `ackPacket` | Acknowledging an ICS20 packet. | ~308,692 | ~382,757 |
+| `ICS26Router.sol` | `timeoutPacket` | Timing out an ICS20 packet | ~365,355 | ~439,550 |
 
 ### Aggregated Packet Benchmarks
 
@@ -174,8 +174,8 @@ Since there is no meaningful difference in gas costs between plonk and groth16 i
 
 | **ICS26Router Method** | **Description** | **Avg Gas (25 packets)** | **Avg Gas (50 packets)** |
 |:---:|:---:|:---:|:---:|
-| `multicall/recvPacket` | Receiving _back_ an `ERC20` token. | ~185,876 | ~179,615 |
-| `multicall/ackPacket` | Acknowledging an ICS20 packet. | ~96,436 | ~90,776 |
+| `multicall/recvPacket` | Receiving _back_ an `ERC20` token. | ~185,811 | ~181,461 |
+| `multicall/ackPacket` | Acknowledging an ICS20 packet. | ~82,914 | ~78,926 |
 
 Note: These gas benchmarks are with Groth16.
 

abi/IBCERC20.json

@@ -13,19 +13,33 @@
         "internalType": "contract IEscrow"
       },
       {
-        "name": "ibcDenom_",
-        "type": "string",
-        "internalType": "string"
-      },
-      {
-        "name": "baseDenom_",
-        "type": "string",
-        "internalType": "string"
-      },
-      {
-        "name": "fullDenomPath_",
-        "type": "string",
-        "internalType": "string"
+        "name": "denom_",
+        "type": "tuple",
+        "internalType": "struct IICS20TransferMsgs.Denom",
+        "components": [
+          {
+            "name": "base",
+            "type": "string",
+            "internalType": "string"
+          },
+          {
+            "name": "trace",
+            "type": "tuple[]",
+            "internalType": "struct IICS20TransferMsgs.Hop[]",
+            "components": [
+              {
+                "name": "portId",
+                "type": "string",
+                "internalType": "string"
+              },
+              {
+                "name": "clientId",
+                "type": "string",
+                "internalType": "string"
+              }
+            ]
+          }
+        ]
       }
     ],
     "stateMutability": "nonpayable"
@@ -151,13 +165,37 @@
   },
   {
     "type": "function",
-    "name": "fullDenomPath",
+    "name": "fullDenom",
     "inputs": [],
     "outputs": [
       {
         "name": "",
-        "type": "string",
-        "internalType": "string"
+        "type": "tuple",
+        "internalType": "struct IICS20TransferMsgs.Denom",
+        "components": [
+          {
+            "name": "base",
+            "type": "string",
+            "internalType": "string"
+          },
+          {
+            "name": "trace",
+            "type": "tuple[]",
+            "internalType": "struct IICS20TransferMsgs.Hop[]",
+            "components": [
+              {
+                "name": "portId",
+                "type": "string",
+                "internalType": "string"
+              },
+              {
+                "name": "clientId",
+                "type": "string",
+                "internalType": "string"
+              }
+            ]
+          }
+        ]
       }
     ],
     "stateMutability": "view"
@@ -403,6 +441,41 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "IBCERC20InvalidDenom",
+    "inputs": [
+      {
+        "name": "denom",
+        "type": "tuple",
+        "internalType": "struct IICS20TransferMsgs.Denom",
+        "components": [
+          {
+            "name": "base",
+            "type": "string",
+            "internalType": "string"
+          },
+          {
+            "name": "trace",
+            "type": "tuple[]",
+            "internalType": "struct IICS20TransferMsgs.Hop[]",
+            "components": [
+              {
+                "name": "portId",
+                "type": "string",
+                "internalType": "string"
+              },
+              {
+                "name": "clientId",
+                "type": "string",
+                "internalType": "string"
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "IBCERC20Unauthorized",