diff --git a/packages/sdk-router/src/abi/FastBridge.json b/packages/sdk-router/src/abi/FastBridge.json
new file mode 100644
index 0000000000..2b008da14e
--- /dev/null
+++ b/packages/sdk-router/src/abi/FastBridge.json
@@ -0,0 +1,864 @@
+[
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_owner", "type": "address" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  { "inputs": [], "name": "AccessControlBadConfirmation", "type": "error" },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "account", "type": "address" },
+      { "internalType": "bytes32", "name": "neededRole", "type": "bytes32" }
+    ],
+    "name": "AccessControlUnauthorizedAccount",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "target", "type": "address" }
+    ],
+    "name": "AddressEmptyCode",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "account", "type": "address" }
+    ],
+    "name": "AddressInsufficientBalance",
+    "type": "error"
+  },
+  { "inputs": [], "name": "AmountIncorrect", "type": "error" },
+  { "inputs": [], "name": "ChainIncorrect", "type": "error" },
+  { "inputs": [], "name": "DeadlineExceeded", "type": "error" },
+  { "inputs": [], "name": "DeadlineNotExceeded", "type": "error" },
+  { "inputs": [], "name": "DeadlineTooShort", "type": "error" },
+  { "inputs": [], "name": "DisputePeriodNotPassed", "type": "error" },
+  { "inputs": [], "name": "DisputePeriodPassed", "type": "error" },
+  { "inputs": [], "name": "FailedInnerCall", "type": "error" },
+  { "inputs": [], "name": "MsgValueIncorrect", "type": "error" },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" }
+    ],
+    "name": "SafeERC20FailedOperation",
+    "type": "error"
+  },
+  { "inputs": [], "name": "SenderIncorrect", "type": "error" },
+  { "inputs": [], "name": "StatusIncorrect", "type": "error" },
+  { "inputs": [], "name": "TokenNotContract", "type": "error" },
+  { "inputs": [], "name": "TransactionRelayed", "type": "error" },
+  { "inputs": [], "name": "ZeroAddress", "type": "error" },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "BridgeDepositClaimed",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "BridgeDepositRefunded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      }
+    ],
+    "name": "BridgeProofDisputed",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "BridgeProofProvided",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "chainGasAmount",
+        "type": "uint256"
+      }
+    ],
+    "name": "BridgeRelayed",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "transactionId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "request",
+        "type": "bytes"
+      }
+    ],
+    "name": "BridgeRequested",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "oldChainGasAmount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "newChainGasAmount",
+        "type": "uint256"
+      }
+    ],
+    "name": "ChainGasAmountUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "oldFeeRate",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "newFeeRate",
+        "type": "uint256"
+      }
+    ],
+    "name": "FeeRateUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "recipient",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "FeesSwept",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "governor",
+        "type": "address"
+      }
+    ],
+    "name": "GovernorAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "governor",
+        "type": "address"
+      }
+    ],
+    "name": "GovernorRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "guard",
+        "type": "address"
+      }
+    ],
+    "name": "GuardAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "guard",
+        "type": "address"
+      }
+    ],
+    "name": "GuardRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      }
+    ],
+    "name": "RelayerAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "relayer",
+        "type": "address"
+      }
+    ],
+    "name": "RelayerRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "previousAdminRole",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "newAdminRole",
+        "type": "bytes32"
+      }
+    ],
+    "name": "RoleAdminChanged",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
+      }
+    ],
+    "name": "RoleGranted",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "bytes32",
+        "name": "role",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
+      }
+    ],
+    "name": "RoleRevoked",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "DEFAULT_ADMIN_ROLE",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "DISPUTE_PERIOD",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "FEE_BPS",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "FEE_RATE_MAX",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "GOVERNOR_ROLE",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "GUARD_ROLE",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "MIN_DEADLINE_PERIOD",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "RELAYER_ROLE",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_governor", "type": "address" }
+    ],
+    "name": "addGovernor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_guard", "type": "address" }
+    ],
+    "name": "addGuard",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_relayer", "type": "address" }
+    ],
+    "name": "addRelayer",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "uint32", "name": "dstChainId", "type": "uint32" },
+          { "internalType": "address", "name": "to", "type": "address" },
+          {
+            "internalType": "address",
+            "name": "originToken",
+            "type": "address"
+          },
+          { "internalType": "address", "name": "destToken", "type": "address" },
+          {
+            "internalType": "uint256",
+            "name": "originAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "destAmount",
+            "type": "uint256"
+          },
+          { "internalType": "bool", "name": "sendChainGas", "type": "bool" },
+          { "internalType": "uint256", "name": "deadline", "type": "uint256" }
+        ],
+        "internalType": "struct IFastBridge.BridgeParams",
+        "name": "params",
+        "type": "tuple"
+      }
+    ],
+    "name": "bridge",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "name": "bridgeProofs",
+    "outputs": [
+      { "internalType": "uint96", "name": "timestamp", "type": "uint96" },
+      { "internalType": "address", "name": "relayer", "type": "address" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "name": "bridgeRelays",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "name": "bridgeStatuses",
+    "outputs": [
+      {
+        "internalType": "enum FastBridge.BridgeStatus",
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "transactionId", "type": "bytes32" },
+      { "internalType": "address", "name": "relayer", "type": "address" }
+    ],
+    "name": "canClaim",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "chainGasAmount",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "request", "type": "bytes" },
+      { "internalType": "address", "name": "to", "type": "address" }
+    ],
+    "name": "claim",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "deployBlock",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "transactionId", "type": "bytes32" }
+    ],
+    "name": "dispute",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "request", "type": "bytes" }],
+    "name": "getBridgeTransaction",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "uint32",
+            "name": "originChainId",
+            "type": "uint32"
+          },
+          { "internalType": "uint32", "name": "destChainId", "type": "uint32" },
+          {
+            "internalType": "address",
+            "name": "originSender",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "destRecipient",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "originToken",
+            "type": "address"
+          },
+          { "internalType": "address", "name": "destToken", "type": "address" },
+          {
+            "internalType": "uint256",
+            "name": "originAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "destAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "originFeeAmount",
+            "type": "uint256"
+          },
+          { "internalType": "bool", "name": "sendChainGas", "type": "bool" },
+          { "internalType": "uint256", "name": "deadline", "type": "uint256" },
+          { "internalType": "uint256", "name": "nonce", "type": "uint256" }
+        ],
+        "internalType": "struct IFastBridge.BridgeTransaction",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "role", "type": "bytes32" }
+    ],
+    "name": "getRoleAdmin",
+    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "role", "type": "bytes32" },
+      { "internalType": "address", "name": "account", "type": "address" }
+    ],
+    "name": "grantRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "role", "type": "bytes32" },
+      { "internalType": "address", "name": "account", "type": "address" }
+    ],
+    "name": "hasRole",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "nonce",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "protocolFeeRate",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "protocolFees",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "request", "type": "bytes" },
+      { "internalType": "bytes32", "name": "destTxHash", "type": "bytes32" }
+    ],
+    "name": "prove",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes", "name": "request", "type": "bytes" },
+      { "internalType": "address", "name": "to", "type": "address" }
+    ],
+    "name": "refund",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "request", "type": "bytes" }],
+    "name": "relay",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_governor", "type": "address" }
+    ],
+    "name": "removeGovernor",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_guard", "type": "address" }
+    ],
+    "name": "removeGuard",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "_relayer", "type": "address" }
+    ],
+    "name": "removeRelayer",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "role", "type": "bytes32" },
+      {
+        "internalType": "address",
+        "name": "callerConfirmation",
+        "type": "address"
+      }
+    ],
+    "name": "renounceRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes32", "name": "role", "type": "bytes32" },
+      { "internalType": "address", "name": "account", "type": "address" }
+    ],
+    "name": "revokeRole",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "newChainGasAmount",
+        "type": "uint256"
+      }
+    ],
+    "name": "setChainGasAmount",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "newFeeRate", "type": "uint256" }
+    ],
+    "name": "setProtocolFeeRate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "bytes4", "name": "interfaceId", "type": "bytes4" }
+    ],
+    "name": "supportsInterface",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "address", "name": "recipient", "type": "address" }
+    ],
+    "name": "sweepProtocolFees",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
diff --git a/packages/sdk-router/src/typechain/FastBridge.ts b/packages/sdk-router/src/typechain/FastBridge.ts
new file mode 100644
index 0000000000..67ec5f621e
--- /dev/null
+++ b/packages/sdk-router/src/typechain/FastBridge.ts
@@ -0,0 +1,1628 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type {
+  FunctionFragment,
+  Result,
+  EventFragment,
+} from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from './common'
+
+export declare namespace IFastBridge {
+  export type BridgeParamsStruct = {
+    dstChainId: BigNumberish
+    to: string
+    originToken: string
+    destToken: string
+    originAmount: BigNumberish
+    destAmount: BigNumberish
+    sendChainGas: boolean
+    deadline: BigNumberish
+  }
+
+  export type BridgeParamsStructOutput = [
+    number,
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    boolean,
+    BigNumber
+  ] & {
+    dstChainId: number
+    to: string
+    originToken: string
+    destToken: string
+    originAmount: BigNumber
+    destAmount: BigNumber
+    sendChainGas: boolean
+    deadline: BigNumber
+  }
+
+  export type BridgeTransactionStruct = {
+    originChainId: BigNumberish
+    destChainId: BigNumberish
+    originSender: string
+    destRecipient: string
+    originToken: string
+    destToken: string
+    originAmount: BigNumberish
+    destAmount: BigNumberish
+    originFeeAmount: BigNumberish
+    sendChainGas: boolean
+    deadline: BigNumberish
+    nonce: BigNumberish
+  }
+
+  export type BridgeTransactionStructOutput = [
+    number,
+    number,
+    string,
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    boolean,
+    BigNumber,
+    BigNumber
+  ] & {
+    originChainId: number
+    destChainId: number
+    originSender: string
+    destRecipient: string
+    originToken: string
+    destToken: string
+    originAmount: BigNumber
+    destAmount: BigNumber
+    originFeeAmount: BigNumber
+    sendChainGas: boolean
+    deadline: BigNumber
+    nonce: BigNumber
+  }
+}
+
+export interface FastBridgeInterface extends utils.Interface {
+  functions: {
+    'DEFAULT_ADMIN_ROLE()': FunctionFragment
+    'DISPUTE_PERIOD()': FunctionFragment
+    'FEE_BPS()': FunctionFragment
+    'FEE_RATE_MAX()': FunctionFragment
+    'GOVERNOR_ROLE()': FunctionFragment
+    'GUARD_ROLE()': FunctionFragment
+    'MIN_DEADLINE_PERIOD()': FunctionFragment
+    'RELAYER_ROLE()': FunctionFragment
+    'addGovernor(address)': FunctionFragment
+    'addGuard(address)': FunctionFragment
+    'addRelayer(address)': FunctionFragment
+    'bridge((uint32,address,address,address,uint256,uint256,bool,uint256))': FunctionFragment
+    'bridgeProofs(bytes32)': FunctionFragment
+    'bridgeRelays(bytes32)': FunctionFragment
+    'bridgeStatuses(bytes32)': FunctionFragment
+    'canClaim(bytes32,address)': FunctionFragment
+    'chainGasAmount()': FunctionFragment
+    'claim(bytes,address)': FunctionFragment
+    'deployBlock()': FunctionFragment
+    'dispute(bytes32)': FunctionFragment
+    'getBridgeTransaction(bytes)': FunctionFragment
+    'getRoleAdmin(bytes32)': FunctionFragment
+    'grantRole(bytes32,address)': FunctionFragment
+    'hasRole(bytes32,address)': FunctionFragment
+    'nonce()': FunctionFragment
+    'protocolFeeRate()': FunctionFragment
+    'protocolFees(address)': FunctionFragment
+    'prove(bytes,bytes32)': FunctionFragment
+    'refund(bytes,address)': FunctionFragment
+    'relay(bytes)': FunctionFragment
+    'removeGovernor(address)': FunctionFragment
+    'removeGuard(address)': FunctionFragment
+    'removeRelayer(address)': FunctionFragment
+    'renounceRole(bytes32,address)': FunctionFragment
+    'revokeRole(bytes32,address)': FunctionFragment
+    'setChainGasAmount(uint256)': FunctionFragment
+    'setProtocolFeeRate(uint256)': FunctionFragment
+    'supportsInterface(bytes4)': FunctionFragment
+    'sweepProtocolFees(address,address)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'DEFAULT_ADMIN_ROLE'
+      | 'DISPUTE_PERIOD'
+      | 'FEE_BPS'
+      | 'FEE_RATE_MAX'
+      | 'GOVERNOR_ROLE'
+      | 'GUARD_ROLE'
+      | 'MIN_DEADLINE_PERIOD'
+      | 'RELAYER_ROLE'
+      | 'addGovernor'
+      | 'addGuard'
+      | 'addRelayer'
+      | 'bridge'
+      | 'bridgeProofs'
+      | 'bridgeRelays'
+      | 'bridgeStatuses'
+      | 'canClaim'
+      | 'chainGasAmount'
+      | 'claim'
+      | 'deployBlock'
+      | 'dispute'
+      | 'getBridgeTransaction'
+      | 'getRoleAdmin'
+      | 'grantRole'
+      | 'hasRole'
+      | 'nonce'
+      | 'protocolFeeRate'
+      | 'protocolFees'
+      | 'prove'
+      | 'refund'
+      | 'relay'
+      | 'removeGovernor'
+      | 'removeGuard'
+      | 'removeRelayer'
+      | 'renounceRole'
+      | 'revokeRole'
+      | 'setChainGasAmount'
+      | 'setProtocolFeeRate'
+      | 'supportsInterface'
+      | 'sweepProtocolFees'
+  ): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'DEFAULT_ADMIN_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'DISPUTE_PERIOD',
+    values?: undefined
+  ): string
+  encodeFunctionData(functionFragment: 'FEE_BPS', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'FEE_RATE_MAX',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'GOVERNOR_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(functionFragment: 'GUARD_ROLE', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'MIN_DEADLINE_PERIOD',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'RELAYER_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(functionFragment: 'addGovernor', values: [string]): string
+  encodeFunctionData(functionFragment: 'addGuard', values: [string]): string
+  encodeFunctionData(functionFragment: 'addRelayer', values: [string]): string
+  encodeFunctionData(
+    functionFragment: 'bridge',
+    values: [IFastBridge.BridgeParamsStruct]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'bridgeProofs',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'bridgeRelays',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'bridgeStatuses',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'canClaim',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'chainGasAmount',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'claim',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'deployBlock',
+    values?: undefined
+  ): string
+  encodeFunctionData(functionFragment: 'dispute', values: [BytesLike]): string
+  encodeFunctionData(
+    functionFragment: 'getBridgeTransaction',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getRoleAdmin',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'grantRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'hasRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(functionFragment: 'nonce', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'protocolFeeRate',
+    values?: undefined
+  ): string
+  encodeFunctionData(functionFragment: 'protocolFees', values: [string]): string
+  encodeFunctionData(
+    functionFragment: 'prove',
+    values: [BytesLike, BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'refund',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(functionFragment: 'relay', values: [BytesLike]): string
+  encodeFunctionData(
+    functionFragment: 'removeGovernor',
+    values: [string]
+  ): string
+  encodeFunctionData(functionFragment: 'removeGuard', values: [string]): string
+  encodeFunctionData(
+    functionFragment: 'removeRelayer',
+    values: [string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'renounceRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'revokeRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setChainGasAmount',
+    values: [BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setProtocolFeeRate',
+    values: [BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'supportsInterface',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'sweepProtocolFees',
+    values: [string, string]
+  ): string
+
+  decodeFunctionResult(
+    functionFragment: 'DEFAULT_ADMIN_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'DISPUTE_PERIOD',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'FEE_BPS', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'FEE_RATE_MAX',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'GOVERNOR_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'GUARD_ROLE', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'MIN_DEADLINE_PERIOD',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'RELAYER_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'addGovernor', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addGuard', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addRelayer', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'bridge', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'bridgeProofs',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'bridgeRelays',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'bridgeStatuses',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'canClaim', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'chainGasAmount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'claim', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'deployBlock', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'dispute', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'getBridgeTransaction',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getRoleAdmin',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'grantRole', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'hasRole', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'nonce', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'protocolFeeRate',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'protocolFees',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'prove', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'refund', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'relay', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'removeGovernor',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'removeGuard', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'removeRelayer',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'renounceRole',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'revokeRole', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'setChainGasAmount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'setProtocolFeeRate',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'supportsInterface',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'sweepProtocolFees',
+    data: BytesLike
+  ): Result
+
+  events: {
+    'BridgeDepositClaimed(bytes32,address,address,address,uint256)': EventFragment
+    'BridgeDepositRefunded(bytes32,address,address,uint256)': EventFragment
+    'BridgeProofDisputed(bytes32,address)': EventFragment
+    'BridgeProofProvided(bytes32,address,bytes32)': EventFragment
+    'BridgeRelayed(bytes32,address,address,address,uint256,uint256)': EventFragment
+    'BridgeRequested(bytes32,address,bytes)': EventFragment
+    'ChainGasAmountUpdated(uint256,uint256)': EventFragment
+    'FeeRateUpdated(uint256,uint256)': EventFragment
+    'FeesSwept(address,address,uint256)': EventFragment
+    'GovernorAdded(address)': EventFragment
+    'GovernorRemoved(address)': EventFragment
+    'GuardAdded(address)': EventFragment
+    'GuardRemoved(address)': EventFragment
+    'RelayerAdded(address)': EventFragment
+    'RelayerRemoved(address)': EventFragment
+    'RoleAdminChanged(bytes32,bytes32,bytes32)': EventFragment
+    'RoleGranted(bytes32,address,address)': EventFragment
+    'RoleRevoked(bytes32,address,address)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'BridgeDepositClaimed'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'BridgeDepositRefunded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'BridgeProofDisputed'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'BridgeProofProvided'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'BridgeRelayed'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'BridgeRequested'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'ChainGasAmountUpdated'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'FeeRateUpdated'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'FeesSwept'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'GovernorAdded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'GovernorRemoved'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'GuardAdded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'GuardRemoved'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RelayerAdded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RelayerRemoved'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleAdminChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleGranted'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleRevoked'): EventFragment
+}
+
+export interface BridgeDepositClaimedEventObject {
+  transactionId: string
+  relayer: string
+  to: string
+  token: string
+  amount: BigNumber
+}
+export type BridgeDepositClaimedEvent = TypedEvent<
+  [string, string, string, string, BigNumber],
+  BridgeDepositClaimedEventObject
+>
+
+export type BridgeDepositClaimedEventFilter =
+  TypedEventFilter<BridgeDepositClaimedEvent>
+
+export interface BridgeDepositRefundedEventObject {
+  transactionId: string
+  to: string
+  token: string
+  amount: BigNumber
+}
+export type BridgeDepositRefundedEvent = TypedEvent<
+  [string, string, string, BigNumber],
+  BridgeDepositRefundedEventObject
+>
+
+export type BridgeDepositRefundedEventFilter =
+  TypedEventFilter<BridgeDepositRefundedEvent>
+
+export interface BridgeProofDisputedEventObject {
+  transactionId: string
+  relayer: string
+}
+export type BridgeProofDisputedEvent = TypedEvent<
+  [string, string],
+  BridgeProofDisputedEventObject
+>
+
+export type BridgeProofDisputedEventFilter =
+  TypedEventFilter<BridgeProofDisputedEvent>
+
+export interface BridgeProofProvidedEventObject {
+  transactionId: string
+  relayer: string
+  transactionHash: string
+}
+export type BridgeProofProvidedEvent = TypedEvent<
+  [string, string, string],
+  BridgeProofProvidedEventObject
+>
+
+export type BridgeProofProvidedEventFilter =
+  TypedEventFilter<BridgeProofProvidedEvent>
+
+export interface BridgeRelayedEventObject {
+  transactionId: string
+  relayer: string
+  to: string
+  token: string
+  amount: BigNumber
+  chainGasAmount: BigNumber
+}
+export type BridgeRelayedEvent = TypedEvent<
+  [string, string, string, string, BigNumber, BigNumber],
+  BridgeRelayedEventObject
+>
+
+export type BridgeRelayedEventFilter = TypedEventFilter<BridgeRelayedEvent>
+
+export interface BridgeRequestedEventObject {
+  transactionId: string
+  sender: string
+  request: string
+}
+export type BridgeRequestedEvent = TypedEvent<
+  [string, string, string],
+  BridgeRequestedEventObject
+>
+
+export type BridgeRequestedEventFilter = TypedEventFilter<BridgeRequestedEvent>
+
+export interface ChainGasAmountUpdatedEventObject {
+  oldChainGasAmount: BigNumber
+  newChainGasAmount: BigNumber
+}
+export type ChainGasAmountUpdatedEvent = TypedEvent<
+  [BigNumber, BigNumber],
+  ChainGasAmountUpdatedEventObject
+>
+
+export type ChainGasAmountUpdatedEventFilter =
+  TypedEventFilter<ChainGasAmountUpdatedEvent>
+
+export interface FeeRateUpdatedEventObject {
+  oldFeeRate: BigNumber
+  newFeeRate: BigNumber
+}
+export type FeeRateUpdatedEvent = TypedEvent<
+  [BigNumber, BigNumber],
+  FeeRateUpdatedEventObject
+>
+
+export type FeeRateUpdatedEventFilter = TypedEventFilter<FeeRateUpdatedEvent>
+
+export interface FeesSweptEventObject {
+  token: string
+  recipient: string
+  amount: BigNumber
+}
+export type FeesSweptEvent = TypedEvent<
+  [string, string, BigNumber],
+  FeesSweptEventObject
+>
+
+export type FeesSweptEventFilter = TypedEventFilter<FeesSweptEvent>
+
+export interface GovernorAddedEventObject {
+  governor: string
+}
+export type GovernorAddedEvent = TypedEvent<[string], GovernorAddedEventObject>
+
+export type GovernorAddedEventFilter = TypedEventFilter<GovernorAddedEvent>
+
+export interface GovernorRemovedEventObject {
+  governor: string
+}
+export type GovernorRemovedEvent = TypedEvent<
+  [string],
+  GovernorRemovedEventObject
+>
+
+export type GovernorRemovedEventFilter = TypedEventFilter<GovernorRemovedEvent>
+
+export interface GuardAddedEventObject {
+  guard: string
+}
+export type GuardAddedEvent = TypedEvent<[string], GuardAddedEventObject>
+
+export type GuardAddedEventFilter = TypedEventFilter<GuardAddedEvent>
+
+export interface GuardRemovedEventObject {
+  guard: string
+}
+export type GuardRemovedEvent = TypedEvent<[string], GuardRemovedEventObject>
+
+export type GuardRemovedEventFilter = TypedEventFilter<GuardRemovedEvent>
+
+export interface RelayerAddedEventObject {
+  relayer: string
+}
+export type RelayerAddedEvent = TypedEvent<[string], RelayerAddedEventObject>
+
+export type RelayerAddedEventFilter = TypedEventFilter<RelayerAddedEvent>
+
+export interface RelayerRemovedEventObject {
+  relayer: string
+}
+export type RelayerRemovedEvent = TypedEvent<
+  [string],
+  RelayerRemovedEventObject
+>
+
+export type RelayerRemovedEventFilter = TypedEventFilter<RelayerRemovedEvent>
+
+export interface RoleAdminChangedEventObject {
+  role: string
+  previousAdminRole: string
+  newAdminRole: string
+}
+export type RoleAdminChangedEvent = TypedEvent<
+  [string, string, string],
+  RoleAdminChangedEventObject
+>
+
+export type RoleAdminChangedEventFilter =
+  TypedEventFilter<RoleAdminChangedEvent>
+
+export interface RoleGrantedEventObject {
+  role: string
+  account: string
+  sender: string
+}
+export type RoleGrantedEvent = TypedEvent<
+  [string, string, string],
+  RoleGrantedEventObject
+>
+
+export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>
+
+export interface RoleRevokedEventObject {
+  role: string
+  account: string
+  sender: string
+}
+export type RoleRevokedEvent = TypedEvent<
+  [string, string, string],
+  RoleRevokedEventObject
+>
+
+export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>
+
+export interface FastBridge extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: FastBridgeInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    DISPUTE_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    FEE_BPS(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    FEE_RATE_MAX(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    GOVERNOR_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    GUARD_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    MIN_DEADLINE_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    RELAYER_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    addGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    addGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    addRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    bridge(
+      params: IFastBridge.BridgeParamsStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    bridgeProofs(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, string] & { timestamp: BigNumber; relayer: string }>
+
+    bridgeRelays(arg0: BytesLike, overrides?: CallOverrides): Promise<[boolean]>
+
+    bridgeStatuses(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[number]>
+
+    canClaim(
+      transactionId: BytesLike,
+      relayer: string,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    claim(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    deployBlock(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    dispute(
+      transactionId: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    getBridgeTransaction(
+      request: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[IFastBridge.BridgeTransactionStructOutput]>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<[string]>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    nonce(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    protocolFeeRate(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    protocolFees(arg0: string, overrides?: CallOverrides): Promise<[BigNumber]>
+
+    prove(
+      request: BytesLike,
+      destTxHash: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    refund(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    relay(
+      request: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    removeGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    removeGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    removeRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    renounceRole(
+      role: BytesLike,
+      callerConfirmation: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    setChainGasAmount(
+      newChainGasAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    setProtocolFeeRate(
+      newFeeRate: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    supportsInterface(
+      interfaceId: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    sweepProtocolFees(
+      token: string,
+      recipient: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+  }
+
+  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>
+
+  DISPUTE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+  FEE_BPS(overrides?: CallOverrides): Promise<BigNumber>
+
+  FEE_RATE_MAX(overrides?: CallOverrides): Promise<BigNumber>
+
+  GOVERNOR_ROLE(overrides?: CallOverrides): Promise<string>
+
+  GUARD_ROLE(overrides?: CallOverrides): Promise<string>
+
+  MIN_DEADLINE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+  RELAYER_ROLE(overrides?: CallOverrides): Promise<string>
+
+  addGovernor(
+    _governor: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  addGuard(
+    _guard: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  addRelayer(
+    _relayer: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  bridge(
+    params: IFastBridge.BridgeParamsStruct,
+    overrides?: PayableOverrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  bridgeProofs(
+    arg0: BytesLike,
+    overrides?: CallOverrides
+  ): Promise<[BigNumber, string] & { timestamp: BigNumber; relayer: string }>
+
+  bridgeRelays(arg0: BytesLike, overrides?: CallOverrides): Promise<boolean>
+
+  bridgeStatuses(arg0: BytesLike, overrides?: CallOverrides): Promise<number>
+
+  canClaim(
+    transactionId: BytesLike,
+    relayer: string,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+  claim(
+    request: BytesLike,
+    to: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  deployBlock(overrides?: CallOverrides): Promise<BigNumber>
+
+  dispute(
+    transactionId: BytesLike,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  getBridgeTransaction(
+    request: BytesLike,
+    overrides?: CallOverrides
+  ): Promise<IFastBridge.BridgeTransactionStructOutput>
+
+  getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>
+
+  grantRole(
+    role: BytesLike,
+    account: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  hasRole(
+    role: BytesLike,
+    account: string,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  nonce(overrides?: CallOverrides): Promise<BigNumber>
+
+  protocolFeeRate(overrides?: CallOverrides): Promise<BigNumber>
+
+  protocolFees(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
+
+  prove(
+    request: BytesLike,
+    destTxHash: BytesLike,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  refund(
+    request: BytesLike,
+    to: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  relay(
+    request: BytesLike,
+    overrides?: PayableOverrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  removeGovernor(
+    _governor: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  removeGuard(
+    _guard: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  removeRelayer(
+    _relayer: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  renounceRole(
+    role: BytesLike,
+    callerConfirmation: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  revokeRole(
+    role: BytesLike,
+    account: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  setChainGasAmount(
+    newChainGasAmount: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  setProtocolFeeRate(
+    newFeeRate: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  supportsInterface(
+    interfaceId: BytesLike,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  sweepProtocolFees(
+    token: string,
+    recipient: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  callStatic: {
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>
+
+    DISPUTE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+    FEE_BPS(overrides?: CallOverrides): Promise<BigNumber>
+
+    FEE_RATE_MAX(overrides?: CallOverrides): Promise<BigNumber>
+
+    GOVERNOR_ROLE(overrides?: CallOverrides): Promise<string>
+
+    GUARD_ROLE(overrides?: CallOverrides): Promise<string>
+
+    MIN_DEADLINE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+    RELAYER_ROLE(overrides?: CallOverrides): Promise<string>
+
+    addGovernor(_governor: string, overrides?: CallOverrides): Promise<void>
+
+    addGuard(_guard: string, overrides?: CallOverrides): Promise<void>
+
+    addRelayer(_relayer: string, overrides?: CallOverrides): Promise<void>
+
+    bridge(
+      params: IFastBridge.BridgeParamsStruct,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    bridgeProofs(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, string] & { timestamp: BigNumber; relayer: string }>
+
+    bridgeRelays(arg0: BytesLike, overrides?: CallOverrides): Promise<boolean>
+
+    bridgeStatuses(arg0: BytesLike, overrides?: CallOverrides): Promise<number>
+
+    canClaim(
+      transactionId: BytesLike,
+      relayer: string,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+    claim(
+      request: BytesLike,
+      to: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    deployBlock(overrides?: CallOverrides): Promise<BigNumber>
+
+    dispute(transactionId: BytesLike, overrides?: CallOverrides): Promise<void>
+
+    getBridgeTransaction(
+      request: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<IFastBridge.BridgeTransactionStructOutput>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    nonce(overrides?: CallOverrides): Promise<BigNumber>
+
+    protocolFeeRate(overrides?: CallOverrides): Promise<BigNumber>
+
+    protocolFees(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
+
+    prove(
+      request: BytesLike,
+      destTxHash: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    refund(
+      request: BytesLike,
+      to: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    relay(request: BytesLike, overrides?: CallOverrides): Promise<void>
+
+    removeGovernor(_governor: string, overrides?: CallOverrides): Promise<void>
+
+    removeGuard(_guard: string, overrides?: CallOverrides): Promise<void>
+
+    removeRelayer(_relayer: string, overrides?: CallOverrides): Promise<void>
+
+    renounceRole(
+      role: BytesLike,
+      callerConfirmation: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setChainGasAmount(
+      newChainGasAmount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setProtocolFeeRate(
+      newFeeRate: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    supportsInterface(
+      interfaceId: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    sweepProtocolFees(
+      token: string,
+      recipient: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+  }
+
+  filters: {
+    'BridgeDepositClaimed(bytes32,address,address,address,uint256)'(
+      transactionId?: null,
+      relayer?: null,
+      to?: null,
+      token?: null,
+      amount?: null
+    ): BridgeDepositClaimedEventFilter
+    BridgeDepositClaimed(
+      transactionId?: null,
+      relayer?: null,
+      to?: null,
+      token?: null,
+      amount?: null
+    ): BridgeDepositClaimedEventFilter
+
+    'BridgeDepositRefunded(bytes32,address,address,uint256)'(
+      transactionId?: null,
+      to?: null,
+      token?: null,
+      amount?: null
+    ): BridgeDepositRefundedEventFilter
+    BridgeDepositRefunded(
+      transactionId?: null,
+      to?: null,
+      token?: null,
+      amount?: null
+    ): BridgeDepositRefundedEventFilter
+
+    'BridgeProofDisputed(bytes32,address)'(
+      transactionId?: null,
+      relayer?: null
+    ): BridgeProofDisputedEventFilter
+    BridgeProofDisputed(
+      transactionId?: null,
+      relayer?: null
+    ): BridgeProofDisputedEventFilter
+
+    'BridgeProofProvided(bytes32,address,bytes32)'(
+      transactionId?: null,
+      relayer?: null,
+      transactionHash?: null
+    ): BridgeProofProvidedEventFilter
+    BridgeProofProvided(
+      transactionId?: null,
+      relayer?: null,
+      transactionHash?: null
+    ): BridgeProofProvidedEventFilter
+
+    'BridgeRelayed(bytes32,address,address,address,uint256,uint256)'(
+      transactionId?: null,
+      relayer?: null,
+      to?: null,
+      token?: null,
+      amount?: null,
+      chainGasAmount?: null
+    ): BridgeRelayedEventFilter
+    BridgeRelayed(
+      transactionId?: null,
+      relayer?: null,
+      to?: null,
+      token?: null,
+      amount?: null,
+      chainGasAmount?: null
+    ): BridgeRelayedEventFilter
+
+    'BridgeRequested(bytes32,address,bytes)'(
+      transactionId?: null,
+      sender?: null,
+      request?: null
+    ): BridgeRequestedEventFilter
+    BridgeRequested(
+      transactionId?: null,
+      sender?: null,
+      request?: null
+    ): BridgeRequestedEventFilter
+
+    'ChainGasAmountUpdated(uint256,uint256)'(
+      oldChainGasAmount?: null,
+      newChainGasAmount?: null
+    ): ChainGasAmountUpdatedEventFilter
+    ChainGasAmountUpdated(
+      oldChainGasAmount?: null,
+      newChainGasAmount?: null
+    ): ChainGasAmountUpdatedEventFilter
+
+    'FeeRateUpdated(uint256,uint256)'(
+      oldFeeRate?: null,
+      newFeeRate?: null
+    ): FeeRateUpdatedEventFilter
+    FeeRateUpdated(
+      oldFeeRate?: null,
+      newFeeRate?: null
+    ): FeeRateUpdatedEventFilter
+
+    'FeesSwept(address,address,uint256)'(
+      token?: null,
+      recipient?: null,
+      amount?: null
+    ): FeesSweptEventFilter
+    FeesSwept(
+      token?: null,
+      recipient?: null,
+      amount?: null
+    ): FeesSweptEventFilter
+
+    'GovernorAdded(address)'(governor?: null): GovernorAddedEventFilter
+    GovernorAdded(governor?: null): GovernorAddedEventFilter
+
+    'GovernorRemoved(address)'(governor?: null): GovernorRemovedEventFilter
+    GovernorRemoved(governor?: null): GovernorRemovedEventFilter
+
+    'GuardAdded(address)'(guard?: null): GuardAddedEventFilter
+    GuardAdded(guard?: null): GuardAddedEventFilter
+
+    'GuardRemoved(address)'(guard?: null): GuardRemovedEventFilter
+    GuardRemoved(guard?: null): GuardRemovedEventFilter
+
+    'RelayerAdded(address)'(relayer?: null): RelayerAddedEventFilter
+    RelayerAdded(relayer?: null): RelayerAddedEventFilter
+
+    'RelayerRemoved(address)'(relayer?: null): RelayerRemovedEventFilter
+    RelayerRemoved(relayer?: null): RelayerRemovedEventFilter
+
+    'RoleAdminChanged(bytes32,bytes32,bytes32)'(
+      role?: BytesLike | null,
+      previousAdminRole?: BytesLike | null,
+      newAdminRole?: BytesLike | null
+    ): RoleAdminChangedEventFilter
+    RoleAdminChanged(
+      role?: BytesLike | null,
+      previousAdminRole?: BytesLike | null,
+      newAdminRole?: BytesLike | null
+    ): RoleAdminChangedEventFilter
+
+    'RoleGranted(bytes32,address,address)'(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleGrantedEventFilter
+    RoleGranted(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleGrantedEventFilter
+
+    'RoleRevoked(bytes32,address,address)'(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleRevokedEventFilter
+    RoleRevoked(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleRevokedEventFilter
+  }
+
+  estimateGas: {
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    DISPUTE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+    FEE_BPS(overrides?: CallOverrides): Promise<BigNumber>
+
+    FEE_RATE_MAX(overrides?: CallOverrides): Promise<BigNumber>
+
+    GOVERNOR_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    GUARD_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    MIN_DEADLINE_PERIOD(overrides?: CallOverrides): Promise<BigNumber>
+
+    RELAYER_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    addGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    addGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    addRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    bridge(
+      params: IFastBridge.BridgeParamsStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<BigNumber>
+
+    bridgeProofs(arg0: BytesLike, overrides?: CallOverrides): Promise<BigNumber>
+
+    bridgeRelays(arg0: BytesLike, overrides?: CallOverrides): Promise<BigNumber>
+
+    bridgeStatuses(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    canClaim(
+      transactionId: BytesLike,
+      relayer: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+    claim(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    deployBlock(overrides?: CallOverrides): Promise<BigNumber>
+
+    dispute(
+      transactionId: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    getBridgeTransaction(
+      request: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<BigNumber>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    nonce(overrides?: CallOverrides): Promise<BigNumber>
+
+    protocolFeeRate(overrides?: CallOverrides): Promise<BigNumber>
+
+    protocolFees(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
+
+    prove(
+      request: BytesLike,
+      destTxHash: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    refund(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    relay(
+      request: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<BigNumber>
+
+    removeGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    removeGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    removeRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    renounceRole(
+      role: BytesLike,
+      callerConfirmation: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    setChainGasAmount(
+      newChainGasAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    setProtocolFeeRate(
+      newFeeRate: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    supportsInterface(
+      interfaceId: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    sweepProtocolFees(
+      token: string,
+      recipient: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    DISPUTE_PERIOD(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    FEE_BPS(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    FEE_RATE_MAX(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    GOVERNOR_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    GUARD_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    MIN_DEADLINE_PERIOD(
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    RELAYER_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    addGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    addGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    addRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    bridge(
+      params: IFastBridge.BridgeParamsStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    bridgeProofs(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    bridgeRelays(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    bridgeStatuses(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    canClaim(
+      transactionId: BytesLike,
+      relayer: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    claim(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    deployBlock(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    dispute(
+      transactionId: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    getBridgeTransaction(
+      request: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getRoleAdmin(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    nonce(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    protocolFeeRate(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    protocolFees(
+      arg0: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    prove(
+      request: BytesLike,
+      destTxHash: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    refund(
+      request: BytesLike,
+      to: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    relay(
+      request: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    removeGovernor(
+      _governor: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    removeGuard(
+      _guard: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    removeRelayer(
+      _relayer: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    renounceRole(
+      role: BytesLike,
+      callerConfirmation: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    setChainGasAmount(
+      newChainGasAmount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    setProtocolFeeRate(
+      newFeeRate: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    supportsInterface(
+      interfaceId: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    sweepProtocolFees(
+      token: string,
+      recipient: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/packages/sdk-router/src/typechain/SynapseBridge.ts b/packages/sdk-router/src/typechain/SynapseBridge.ts
index 7d66a8534a..0b141e44aa 100644
--- a/packages/sdk-router/src/typechain/SynapseBridge.ts
+++ b/packages/sdk-router/src/typechain/SynapseBridge.ts
@@ -4,11 +4,11 @@
 import type {
   BaseContract,
   BigNumber,
+  BigNumberish,
   BytesLike,
   CallOverrides,
   ContractTransaction,
   Overrides,
-  PayableOverrides,
   PopulatedTransaction,
   Signer,
   utils,
@@ -24,83 +24,613 @@ import type {
   TypedEvent,
   TypedListener,
   OnEvent,
-  PromiseOrValue,
 } from './common'
 
 export interface SynapseBridgeInterface extends utils.Interface {
   functions: {
-    'admin()': FunctionFragment
-    'changeAdmin(address)': FunctionFragment
-    'implementation()': FunctionFragment
-    'upgradeTo(address)': FunctionFragment
-    'upgradeToAndCall(address,bytes)': FunctionFragment
+    'DEFAULT_ADMIN_ROLE()': FunctionFragment
+    'GOVERNANCE_ROLE()': FunctionFragment
+    'NODEGROUP_ROLE()': FunctionFragment
+    'WETH_ADDRESS()': FunctionFragment
+    'addKappas(bytes32[])': FunctionFragment
+    'bridgeVersion()': FunctionFragment
+    'chainGasAmount()': FunctionFragment
+    'deposit(address,uint256,address,uint256)': FunctionFragment
+    'depositAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)': FunctionFragment
+    'getFeeBalance(address)': FunctionFragment
+    'getRoleAdmin(bytes32)': FunctionFragment
+    'getRoleMember(bytes32,uint256)': FunctionFragment
+    'getRoleMemberCount(bytes32)': FunctionFragment
+    'grantRole(bytes32,address)': FunctionFragment
+    'hasRole(bytes32,address)': FunctionFragment
+    'initialize()': FunctionFragment
+    'kappaExists(bytes32)': FunctionFragment
+    'mint(address,address,uint256,uint256,bytes32)': FunctionFragment
+    'mintAndSwap(address,address,uint256,uint256,address,uint8,uint8,uint256,uint256,bytes32)': FunctionFragment
+    'pause()': FunctionFragment
+    'paused()': FunctionFragment
+    'redeem(address,uint256,address,uint256)': FunctionFragment
+    'redeemAndRemove(address,uint256,address,uint256,uint8,uint256,uint256)': FunctionFragment
+    'redeemAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)': FunctionFragment
+    'redeemV2(bytes32,uint256,address,uint256)': FunctionFragment
+    'renounceRole(bytes32,address)': FunctionFragment
+    'revokeRole(bytes32,address)': FunctionFragment
+    'setChainGasAmount(uint256)': FunctionFragment
+    'setWethAddress(address)': FunctionFragment
+    'startBlockNumber()': FunctionFragment
+    'unpause()': FunctionFragment
+    'withdraw(address,address,uint256,uint256,bytes32)': FunctionFragment
+    'withdrawAndRemove(address,address,uint256,uint256,address,uint8,uint256,uint256,bytes32)': FunctionFragment
+    'withdrawFees(address,address)': FunctionFragment
   }
 
   getFunction(
     nameOrSignatureOrTopic:
-      | 'admin'
-      | 'changeAdmin'
-      | 'implementation'
-      | 'upgradeTo'
-      | 'upgradeToAndCall'
+      | 'DEFAULT_ADMIN_ROLE'
+      | 'GOVERNANCE_ROLE'
+      | 'NODEGROUP_ROLE'
+      | 'WETH_ADDRESS'
+      | 'addKappas'
+      | 'bridgeVersion'
+      | 'chainGasAmount'
+      | 'deposit'
+      | 'depositAndSwap'
+      | 'getFeeBalance'
+      | 'getRoleAdmin'
+      | 'getRoleMember'
+      | 'getRoleMemberCount'
+      | 'grantRole'
+      | 'hasRole'
+      | 'initialize'
+      | 'kappaExists'
+      | 'mint'
+      | 'mintAndSwap'
+      | 'pause'
+      | 'paused'
+      | 'redeem'
+      | 'redeemAndRemove'
+      | 'redeemAndSwap'
+      | 'redeemV2'
+      | 'renounceRole'
+      | 'revokeRole'
+      | 'setChainGasAmount'
+      | 'setWethAddress'
+      | 'startBlockNumber'
+      | 'unpause'
+      | 'withdraw'
+      | 'withdrawAndRemove'
+      | 'withdrawFees'
   ): FunctionFragment
 
-  encodeFunctionData(functionFragment: 'admin', values?: undefined): string
   encodeFunctionData(
-    functionFragment: 'changeAdmin',
-    values: [PromiseOrValue<string>]
+    functionFragment: 'DEFAULT_ADMIN_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'GOVERNANCE_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'NODEGROUP_ROLE',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'WETH_ADDRESS',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'addKappas',
+    values: [BytesLike[]]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'bridgeVersion',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'chainGasAmount',
+    values?: undefined
+  ): string
+  encodeFunctionData(
+    functionFragment: 'deposit',
+    values: [string, BigNumberish, string, BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'depositAndSwap',
+    values: [
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getFeeBalance',
+    values: [string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getRoleAdmin',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getRoleMember',
+    values: [BytesLike, BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getRoleMemberCount',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'grantRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'hasRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(functionFragment: 'initialize', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'kappaExists',
+    values: [BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'mint',
+    values: [string, string, BigNumberish, BigNumberish, BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'mintAndSwap',
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BytesLike
+    ]
+  ): string
+  encodeFunctionData(functionFragment: 'pause', values?: undefined): string
+  encodeFunctionData(functionFragment: 'paused', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'redeem',
+    values: [string, BigNumberish, string, BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'redeemAndRemove',
+    values: [
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'redeemAndSwap',
+    values: [
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'redeemV2',
+    values: [BytesLike, BigNumberish, string, BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'renounceRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'revokeRole',
+    values: [BytesLike, string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setChainGasAmount',
+    values: [BigNumberish]
   ): string
   encodeFunctionData(
-    functionFragment: 'implementation',
+    functionFragment: 'setWethAddress',
+    values: [string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'startBlockNumber',
     values?: undefined
   ): string
+  encodeFunctionData(functionFragment: 'unpause', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'withdraw',
+    values: [string, string, BigNumberish, BigNumberish, BytesLike]
+  ): string
   encodeFunctionData(
-    functionFragment: 'upgradeTo',
-    values: [PromiseOrValue<string>]
+    functionFragment: 'withdrawAndRemove',
+    values: [
+      string,
+      string,
+      BigNumberish,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish,
+      BytesLike
+    ]
   ): string
   encodeFunctionData(
-    functionFragment: 'upgradeToAndCall',
-    values: [PromiseOrValue<string>, PromiseOrValue<BytesLike>]
+    functionFragment: 'withdrawFees',
+    values: [string, string]
   ): string
 
-  decodeFunctionResult(functionFragment: 'admin', data: BytesLike): Result
-  decodeFunctionResult(functionFragment: 'changeAdmin', data: BytesLike): Result
   decodeFunctionResult(
-    functionFragment: 'implementation',
+    functionFragment: 'DEFAULT_ADMIN_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'GOVERNANCE_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'NODEGROUP_ROLE',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'WETH_ADDRESS',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'addKappas', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'bridgeVersion',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'chainGasAmount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'deposit', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'depositAndSwap',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getFeeBalance',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getRoleAdmin',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getRoleMember',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getRoleMemberCount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'grantRole', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'hasRole', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'initialize', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'kappaExists', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'mint', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'mintAndSwap', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'pause', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'paused', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'redeem', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'redeemAndRemove',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'redeemAndSwap',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'redeemV2', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'renounceRole',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'revokeRole', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'setChainGasAmount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'setWethAddress',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'startBlockNumber',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'unpause', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'withdraw', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'withdrawAndRemove',
     data: BytesLike
   ): Result
-  decodeFunctionResult(functionFragment: 'upgradeTo', data: BytesLike): Result
   decodeFunctionResult(
-    functionFragment: 'upgradeToAndCall',
+    functionFragment: 'withdrawFees',
     data: BytesLike
   ): Result
 
   events: {
-    'AdminChanged(address,address)': EventFragment
-    'Upgraded(address)': EventFragment
+    'Paused(address)': EventFragment
+    'RoleAdminChanged(bytes32,bytes32,bytes32)': EventFragment
+    'RoleGranted(bytes32,address,address)': EventFragment
+    'RoleRevoked(bytes32,address,address)': EventFragment
+    'TokenDeposit(address,uint256,address,uint256)': EventFragment
+    'TokenDepositAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)': EventFragment
+    'TokenMint(address,address,uint256,uint256,bytes32)': EventFragment
+    'TokenMintAndSwap(address,address,uint256,uint256,uint8,uint8,uint256,uint256,bool,bytes32)': EventFragment
+    'TokenRedeem(address,uint256,address,uint256)': EventFragment
+    'TokenRedeemAndRemove(address,uint256,address,uint256,uint8,uint256,uint256)': EventFragment
+    'TokenRedeemAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)': EventFragment
+    'TokenRedeemV2(bytes32,uint256,address,uint256)': EventFragment
+    'TokenWithdraw(address,address,uint256,uint256,bytes32)': EventFragment
+    'TokenWithdrawAndRemove(address,address,uint256,uint256,uint8,uint256,uint256,bool,bytes32)': EventFragment
+    'Unpaused(address)': EventFragment
   }
 
-  getEvent(nameOrSignatureOrTopic: 'AdminChanged'): EventFragment
-  getEvent(nameOrSignatureOrTopic: 'Upgraded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Paused'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleAdminChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleGranted'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RoleRevoked'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenDeposit'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenDepositAndSwap'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenMint'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenMintAndSwap'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenRedeem'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenRedeemAndRemove'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenRedeemAndSwap'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenRedeemV2'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenWithdraw'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TokenWithdrawAndRemove'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Unpaused'): EventFragment
+}
+
+export interface PausedEventObject {
+  account: string
+}
+export type PausedEvent = TypedEvent<[string], PausedEventObject>
+
+export type PausedEventFilter = TypedEventFilter<PausedEvent>
+
+export interface RoleAdminChangedEventObject {
+  role: string
+  previousAdminRole: string
+  newAdminRole: string
+}
+export type RoleAdminChangedEvent = TypedEvent<
+  [string, string, string],
+  RoleAdminChangedEventObject
+>
+
+export type RoleAdminChangedEventFilter =
+  TypedEventFilter<RoleAdminChangedEvent>
+
+export interface RoleGrantedEventObject {
+  role: string
+  account: string
+  sender: string
+}
+export type RoleGrantedEvent = TypedEvent<
+  [string, string, string],
+  RoleGrantedEventObject
+>
+
+export type RoleGrantedEventFilter = TypedEventFilter<RoleGrantedEvent>
+
+export interface RoleRevokedEventObject {
+  role: string
+  account: string
+  sender: string
+}
+export type RoleRevokedEvent = TypedEvent<
+  [string, string, string],
+  RoleRevokedEventObject
+>
+
+export type RoleRevokedEventFilter = TypedEventFilter<RoleRevokedEvent>
+
+export interface TokenDepositEventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
+}
+export type TokenDepositEvent = TypedEvent<
+  [string, BigNumber, string, BigNumber],
+  TokenDepositEventObject
+>
+
+export type TokenDepositEventFilter = TypedEventFilter<TokenDepositEvent>
+
+export interface TokenDepositAndSwapEventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
+  tokenIndexFrom: number
+  tokenIndexTo: number
+  minDy: BigNumber
+  deadline: BigNumber
+}
+export type TokenDepositAndSwapEvent = TypedEvent<
+  [string, BigNumber, string, BigNumber, number, number, BigNumber, BigNumber],
+  TokenDepositAndSwapEventObject
+>
+
+export type TokenDepositAndSwapEventFilter =
+  TypedEventFilter<TokenDepositAndSwapEvent>
+
+export interface TokenMintEventObject {
+  to: string
+  token: string
+  amount: BigNumber
+  fee: BigNumber
+  kappa: string
+}
+export type TokenMintEvent = TypedEvent<
+  [string, string, BigNumber, BigNumber, string],
+  TokenMintEventObject
+>
+
+export type TokenMintEventFilter = TypedEventFilter<TokenMintEvent>
+
+export interface TokenMintAndSwapEventObject {
+  to: string
+  token: string
+  amount: BigNumber
+  fee: BigNumber
+  tokenIndexFrom: number
+  tokenIndexTo: number
+  minDy: BigNumber
+  deadline: BigNumber
+  swapSuccess: boolean
+  kappa: string
+}
+export type TokenMintAndSwapEvent = TypedEvent<
+  [
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    number,
+    number,
+    BigNumber,
+    BigNumber,
+    boolean,
+    string
+  ],
+  TokenMintAndSwapEventObject
+>
+
+export type TokenMintAndSwapEventFilter =
+  TypedEventFilter<TokenMintAndSwapEvent>
+
+export interface TokenRedeemEventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
 }
+export type TokenRedeemEvent = TypedEvent<
+  [string, BigNumber, string, BigNumber],
+  TokenRedeemEventObject
+>
+
+export type TokenRedeemEventFilter = TypedEventFilter<TokenRedeemEvent>
 
-export interface AdminChangedEventObject {
-  previousAdmin: string
-  newAdmin: string
+export interface TokenRedeemAndRemoveEventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
+  swapTokenIndex: number
+  swapMinAmount: BigNumber
+  swapDeadline: BigNumber
 }
-export type AdminChangedEvent = TypedEvent<
-  [string, string],
-  AdminChangedEventObject
+export type TokenRedeemAndRemoveEvent = TypedEvent<
+  [string, BigNumber, string, BigNumber, number, BigNumber, BigNumber],
+  TokenRedeemAndRemoveEventObject
 >
 
-export type AdminChangedEventFilter = TypedEventFilter<AdminChangedEvent>
+export type TokenRedeemAndRemoveEventFilter =
+  TypedEventFilter<TokenRedeemAndRemoveEvent>
 
-export interface UpgradedEventObject {
-  implementation: string
+export interface TokenRedeemAndSwapEventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
+  tokenIndexFrom: number
+  tokenIndexTo: number
+  minDy: BigNumber
+  deadline: BigNumber
 }
-export type UpgradedEvent = TypedEvent<[string], UpgradedEventObject>
+export type TokenRedeemAndSwapEvent = TypedEvent<
+  [string, BigNumber, string, BigNumber, number, number, BigNumber, BigNumber],
+  TokenRedeemAndSwapEventObject
+>
+
+export type TokenRedeemAndSwapEventFilter =
+  TypedEventFilter<TokenRedeemAndSwapEvent>
+
+export interface TokenRedeemV2EventObject {
+  to: string
+  chainId: BigNumber
+  token: string
+  amount: BigNumber
+}
+export type TokenRedeemV2Event = TypedEvent<
+  [string, BigNumber, string, BigNumber],
+  TokenRedeemV2EventObject
+>
 
-export type UpgradedEventFilter = TypedEventFilter<UpgradedEvent>
+export type TokenRedeemV2EventFilter = TypedEventFilter<TokenRedeemV2Event>
+
+export interface TokenWithdrawEventObject {
+  to: string
+  token: string
+  amount: BigNumber
+  fee: BigNumber
+  kappa: string
+}
+export type TokenWithdrawEvent = TypedEvent<
+  [string, string, BigNumber, BigNumber, string],
+  TokenWithdrawEventObject
+>
+
+export type TokenWithdrawEventFilter = TypedEventFilter<TokenWithdrawEvent>
+
+export interface TokenWithdrawAndRemoveEventObject {
+  to: string
+  token: string
+  amount: BigNumber
+  fee: BigNumber
+  swapTokenIndex: number
+  swapMinAmount: BigNumber
+  swapDeadline: BigNumber
+  swapSuccess: boolean
+  kappa: string
+}
+export type TokenWithdrawAndRemoveEvent = TypedEvent<
+  [
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    number,
+    BigNumber,
+    BigNumber,
+    boolean,
+    string
+  ],
+  TokenWithdrawAndRemoveEventObject
+>
+
+export type TokenWithdrawAndRemoveEventFilter =
+  TypedEventFilter<TokenWithdrawAndRemoveEvent>
+
+export interface UnpausedEventObject {
+  account: string
+}
+export type UnpausedEvent = TypedEvent<[string], UnpausedEventObject>
+
+export type UnpausedEventFilter = TypedEventFilter<UnpausedEvent>
 
 export interface SynapseBridge extends BaseContract {
   connect(signerOrProvider: Signer | Provider | string): this
@@ -129,141 +659,1203 @@ export interface SynapseBridge extends BaseContract {
   removeListener: OnEvent<this>
 
   functions: {
-    admin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    GOVERNANCE_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    NODEGROUP_ROLE(overrides?: CallOverrides): Promise<[string]>
+
+    WETH_ADDRESS(overrides?: CallOverrides): Promise<[string]>
+
+    addKappas(
+      kappas: BytesLike[],
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    bridgeVersion(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    deposit(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    depositAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    getFeeBalance(
+      tokenAddress: string,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<[string]>
+
+    getRoleMember(
+      role: BytesLike,
+      index: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+
+    getRoleMemberCount(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    initialize(
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    kappaExists(kappa: BytesLike, overrides?: CallOverrides): Promise<[boolean]>
+
+    mint(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    mintAndSwap(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    pause(
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    paused(overrides?: CallOverrides): Promise<[boolean]>
+
+    redeem(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    redeemAndRemove(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    redeemAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    redeemV2(
+      to: BytesLike,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
-    changeAdmin(
-      newAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    renounceRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
-    implementation(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
-    upgradeTo(
-      newImplementation: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    setChainGasAmount(
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
-    upgradeToAndCall(
-      newImplementation: PromiseOrValue<string>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    setWethAddress(
+      _wethAddress: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    startBlockNumber(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    unpause(
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    withdraw(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    withdrawAndRemove(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<ContractTransaction>
+
+    withdrawFees(
+      token: string,
+      to: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
   }
 
-  admin(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>
+
+  GOVERNANCE_ROLE(overrides?: CallOverrides): Promise<string>
+
+  NODEGROUP_ROLE(overrides?: CallOverrides): Promise<string>
+
+  WETH_ADDRESS(overrides?: CallOverrides): Promise<string>
+
+  addKappas(
+    kappas: BytesLike[],
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
-  changeAdmin(
-    newAdmin: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  bridgeVersion(overrides?: CallOverrides): Promise<BigNumber>
+
+  chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+  deposit(
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
-  implementation(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  depositAndSwap(
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    tokenIndexFrom: BigNumberish,
+    tokenIndexTo: BigNumberish,
+    minDy: BigNumberish,
+    deadline: BigNumberish,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
-  upgradeTo(
-    newImplementation: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  getFeeBalance(
+    tokenAddress: string,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>
+
+  getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>
+
+  getRoleMember(
+    role: BytesLike,
+    index: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  getRoleMemberCount(
+    role: BytesLike,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>
+
+  grantRole(
+    role: BytesLike,
+    account: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  hasRole(
+    role: BytesLike,
+    account: string,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  initialize(
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  kappaExists(kappa: BytesLike, overrides?: CallOverrides): Promise<boolean>
+
+  mint(
+    to: string,
+    token: string,
+    amount: BigNumberish,
+    fee: BigNumberish,
+    kappa: BytesLike,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  mintAndSwap(
+    to: string,
+    token: string,
+    amount: BigNumberish,
+    fee: BigNumberish,
+    pool: string,
+    tokenIndexFrom: BigNumberish,
+    tokenIndexTo: BigNumberish,
+    minDy: BigNumberish,
+    deadline: BigNumberish,
+    kappa: BytesLike,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  pause(overrides?: Overrides & { from?: string }): Promise<ContractTransaction>
+
+  paused(overrides?: CallOverrides): Promise<boolean>
+
+  redeem(
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  redeemAndRemove(
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    swapTokenIndex: BigNumberish,
+    swapMinAmount: BigNumberish,
+    swapDeadline: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  redeemAndSwap(
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    tokenIndexFrom: BigNumberish,
+    tokenIndexTo: BigNumberish,
+    minDy: BigNumberish,
+    deadline: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  redeemV2(
+    to: BytesLike,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  renounceRole(
+    role: BytesLike,
+    account: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  revokeRole(
+    role: BytesLike,
+    account: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  setChainGasAmount(
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  setWethAddress(
+    _wethAddress: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  startBlockNumber(overrides?: CallOverrides): Promise<BigNumber>
+
+  unpause(
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  withdraw(
+    to: string,
+    token: string,
+    amount: BigNumberish,
+    fee: BigNumberish,
+    kappa: BytesLike,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  withdrawAndRemove(
+    to: string,
+    token: string,
+    amount: BigNumberish,
+    fee: BigNumberish,
+    pool: string,
+    swapTokenIndex: BigNumberish,
+    swapMinAmount: BigNumberish,
+    swapDeadline: BigNumberish,
+    kappa: BytesLike,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
-  upgradeToAndCall(
-    newImplementation: PromiseOrValue<string>,
-    data: PromiseOrValue<BytesLike>,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+  withdrawFees(
+    token: string,
+    to: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   callStatic: {
-    admin(overrides?: CallOverrides): Promise<string>
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>
+
+    GOVERNANCE_ROLE(overrides?: CallOverrides): Promise<string>
+
+    NODEGROUP_ROLE(overrides?: CallOverrides): Promise<string>
+
+    WETH_ADDRESS(overrides?: CallOverrides): Promise<string>
+
+    addKappas(kappas: BytesLike[], overrides?: CallOverrides): Promise<void>
+
+    bridgeVersion(overrides?: CallOverrides): Promise<BigNumber>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+    deposit(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    depositAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    getFeeBalance(
+      tokenAddress: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<string>
+
+    getRoleMember(
+      role: BytesLike,
+      index: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<string>
+
+    getRoleMemberCount(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    initialize(overrides?: CallOverrides): Promise<void>
+
+    kappaExists(kappa: BytesLike, overrides?: CallOverrides): Promise<boolean>
+
+    mint(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    mintAndSwap(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    pause(overrides?: CallOverrides): Promise<void>
+
+    paused(overrides?: CallOverrides): Promise<boolean>
+
+    redeem(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    redeemAndRemove(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    redeemAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    redeemV2(
+      to: BytesLike,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    renounceRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setChainGasAmount(
+      amount: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>
 
-    changeAdmin(
-      newAdmin: PromiseOrValue<string>,
+    setWethAddress(
+      _wethAddress: string,
       overrides?: CallOverrides
     ): Promise<void>
 
-    implementation(overrides?: CallOverrides): Promise<string>
+    startBlockNumber(overrides?: CallOverrides): Promise<BigNumber>
 
-    upgradeTo(
-      newImplementation: PromiseOrValue<string>,
+    unpause(overrides?: CallOverrides): Promise<void>
+
+    withdraw(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
       overrides?: CallOverrides
     ): Promise<void>
 
-    upgradeToAndCall(
-      newImplementation: PromiseOrValue<string>,
-      data: PromiseOrValue<BytesLike>,
+    withdrawAndRemove(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    withdrawFees(
+      token: string,
+      to: string,
       overrides?: CallOverrides
     ): Promise<void>
   }
 
   filters: {
-    'AdminChanged(address,address)'(
-      previousAdmin?: null,
-      newAdmin?: null
-    ): AdminChangedEventFilter
-    AdminChanged(previousAdmin?: null, newAdmin?: null): AdminChangedEventFilter
-
-    'Upgraded(address)'(
-      implementation?: PromiseOrValue<string> | null
-    ): UpgradedEventFilter
-    Upgraded(
-      implementation?: PromiseOrValue<string> | null
-    ): UpgradedEventFilter
+    'Paused(address)'(account?: null): PausedEventFilter
+    Paused(account?: null): PausedEventFilter
+
+    'RoleAdminChanged(bytes32,bytes32,bytes32)'(
+      role?: BytesLike | null,
+      previousAdminRole?: BytesLike | null,
+      newAdminRole?: BytesLike | null
+    ): RoleAdminChangedEventFilter
+    RoleAdminChanged(
+      role?: BytesLike | null,
+      previousAdminRole?: BytesLike | null,
+      newAdminRole?: BytesLike | null
+    ): RoleAdminChangedEventFilter
+
+    'RoleGranted(bytes32,address,address)'(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleGrantedEventFilter
+    RoleGranted(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleGrantedEventFilter
+
+    'RoleRevoked(bytes32,address,address)'(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleRevokedEventFilter
+    RoleRevoked(
+      role?: BytesLike | null,
+      account?: string | null,
+      sender?: string | null
+    ): RoleRevokedEventFilter
+
+    'TokenDeposit(address,uint256,address,uint256)'(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenDepositEventFilter
+    TokenDeposit(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenDepositEventFilter
+
+    'TokenDepositAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)'(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null
+    ): TokenDepositAndSwapEventFilter
+    TokenDepositAndSwap(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null
+    ): TokenDepositAndSwapEventFilter
+
+    'TokenMint(address,address,uint256,uint256,bytes32)'(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      kappa?: BytesLike | null
+    ): TokenMintEventFilter
+    TokenMint(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      kappa?: BytesLike | null
+    ): TokenMintEventFilter
+
+    'TokenMintAndSwap(address,address,uint256,uint256,uint8,uint8,uint256,uint256,bool,bytes32)'(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null,
+      swapSuccess?: null,
+      kappa?: BytesLike | null
+    ): TokenMintAndSwapEventFilter
+    TokenMintAndSwap(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null,
+      swapSuccess?: null,
+      kappa?: BytesLike | null
+    ): TokenMintAndSwapEventFilter
+
+    'TokenRedeem(address,uint256,address,uint256)'(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenRedeemEventFilter
+    TokenRedeem(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenRedeemEventFilter
+
+    'TokenRedeemAndRemove(address,uint256,address,uint256,uint8,uint256,uint256)'(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      swapTokenIndex?: null,
+      swapMinAmount?: null,
+      swapDeadline?: null
+    ): TokenRedeemAndRemoveEventFilter
+    TokenRedeemAndRemove(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      swapTokenIndex?: null,
+      swapMinAmount?: null,
+      swapDeadline?: null
+    ): TokenRedeemAndRemoveEventFilter
+
+    'TokenRedeemAndSwap(address,uint256,address,uint256,uint8,uint8,uint256,uint256)'(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null
+    ): TokenRedeemAndSwapEventFilter
+    TokenRedeemAndSwap(
+      to?: string | null,
+      chainId?: null,
+      token?: null,
+      amount?: null,
+      tokenIndexFrom?: null,
+      tokenIndexTo?: null,
+      minDy?: null,
+      deadline?: null
+    ): TokenRedeemAndSwapEventFilter
+
+    'TokenRedeemV2(bytes32,uint256,address,uint256)'(
+      to?: BytesLike | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenRedeemV2EventFilter
+    TokenRedeemV2(
+      to?: BytesLike | null,
+      chainId?: null,
+      token?: null,
+      amount?: null
+    ): TokenRedeemV2EventFilter
+
+    'TokenWithdraw(address,address,uint256,uint256,bytes32)'(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      kappa?: BytesLike | null
+    ): TokenWithdrawEventFilter
+    TokenWithdraw(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      kappa?: BytesLike | null
+    ): TokenWithdrawEventFilter
+
+    'TokenWithdrawAndRemove(address,address,uint256,uint256,uint8,uint256,uint256,bool,bytes32)'(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      swapTokenIndex?: null,
+      swapMinAmount?: null,
+      swapDeadline?: null,
+      swapSuccess?: null,
+      kappa?: BytesLike | null
+    ): TokenWithdrawAndRemoveEventFilter
+    TokenWithdrawAndRemove(
+      to?: string | null,
+      token?: null,
+      amount?: null,
+      fee?: null,
+      swapTokenIndex?: null,
+      swapMinAmount?: null,
+      swapDeadline?: null,
+      swapSuccess?: null,
+      kappa?: BytesLike | null
+    ): TokenWithdrawAndRemoveEventFilter
+
+    'Unpaused(address)'(account?: null): UnpausedEventFilter
+    Unpaused(account?: null): UnpausedEventFilter
   }
 
   estimateGas: {
-    admin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    GOVERNANCE_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    NODEGROUP_ROLE(overrides?: CallOverrides): Promise<BigNumber>
+
+    WETH_ADDRESS(overrides?: CallOverrides): Promise<BigNumber>
+
+    addKappas(
+      kappas: BytesLike[],
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    bridgeVersion(overrides?: CallOverrides): Promise<BigNumber>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<BigNumber>
+
+    deposit(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    depositAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    getFeeBalance(
+      tokenAddress: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getRoleAdmin(role: BytesLike, overrides?: CallOverrides): Promise<BigNumber>
+
+    getRoleMember(
+      role: BytesLike,
+      index: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getRoleMemberCount(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
     ): Promise<BigNumber>
 
-    changeAdmin(
-      newAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    initialize(overrides?: Overrides & { from?: string }): Promise<BigNumber>
+
+    kappaExists(kappa: BytesLike, overrides?: CallOverrides): Promise<BigNumber>
+
+    mint(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    mintAndSwap(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    pause(overrides?: Overrides & { from?: string }): Promise<BigNumber>
+
+    paused(overrides?: CallOverrides): Promise<BigNumber>
+
+    redeem(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    redeemAndRemove(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    redeemAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    redeemV2(
+      to: BytesLike,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
-    implementation(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    renounceRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
-    upgradeTo(
-      newImplementation: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
-    upgradeToAndCall(
-      newImplementation: PromiseOrValue<string>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    setChainGasAmount(
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    setWethAddress(
+      _wethAddress: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    startBlockNumber(overrides?: CallOverrides): Promise<BigNumber>
+
+    unpause(overrides?: Overrides & { from?: string }): Promise<BigNumber>
+
+    withdraw(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    withdrawAndRemove(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<BigNumber>
+
+    withdrawFees(
+      token: string,
+      to: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
   }
 
   populateTransaction: {
-    admin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    GOVERNANCE_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    NODEGROUP_ROLE(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    WETH_ADDRESS(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    addKappas(
+      kappas: BytesLike[],
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    bridgeVersion(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    chainGasAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    deposit(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    depositAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
-    changeAdmin(
-      newAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    getFeeBalance(
+      tokenAddress: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getRoleAdmin(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getRoleMember(
+      role: BytesLike,
+      index: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getRoleMemberCount(
+      role: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    grantRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    hasRole(
+      role: BytesLike,
+      account: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    initialize(
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    kappaExists(
+      kappa: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    mint(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    mintAndSwap(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    pause(
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    paused(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    redeem(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    redeemAndRemove(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    redeemAndSwap(
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      minDy: BigNumberish,
+      deadline: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    redeemV2(
+      to: BytesLike,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    renounceRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    revokeRole(
+      role: BytesLike,
+      account: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    setChainGasAmount(
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    setWethAddress(
+      _wethAddress: string,
+      overrides?: Overrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    startBlockNumber(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    unpause(
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
-    implementation(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    withdraw(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
-    upgradeTo(
-      newImplementation: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    withdrawAndRemove(
+      to: string,
+      token: string,
+      amount: BigNumberish,
+      fee: BigNumberish,
+      pool: string,
+      swapTokenIndex: BigNumberish,
+      swapMinAmount: BigNumberish,
+      swapDeadline: BigNumberish,
+      kappa: BytesLike,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
-    upgradeToAndCall(
-      newImplementation: PromiseOrValue<string>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    withdrawFees(
+      token: string,
+      to: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
   }
 }
diff --git a/packages/sdk-router/src/typechain/SynapseCCTPRouter.ts b/packages/sdk-router/src/typechain/SynapseCCTPRouter.ts
index ce99912041..07bc5cb485 100644
--- a/packages/sdk-router/src/typechain/SynapseCCTPRouter.ts
+++ b/packages/sdk-router/src/typechain/SynapseCCTPRouter.ts
@@ -1,344 +1,233 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-
-import {
-    ethers,
-    EventFilter,
-    Signer,
-    BigNumber,
-    BigNumberish,
-    PopulatedTransaction,
-    BaseContract,
-    ContractTransaction,
-    PayableOverrides,
-    CallOverrides,
-  } from "ethers";
-  import { BytesLike } from "@ethersproject/bytes";
-  import { Listener, Provider } from "@ethersproject/providers";
-  import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-  import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-  interface SynapseCCTPRouterInterface extends ethers.utils.Interface {
-    functions: {
-      "adapterSwap(address,address,uint256,address,bytes)": FunctionFragment;
-      "bridge(address,uint256,address,uint256,(address,address,uint256,uint256,bytes),(address,address,uint256,uint256,bytes))": FunctionFragment;
-      "calculateFeeAmount(address,uint256,bool)": FunctionFragment;
-      "feeStructures(address)": FunctionFragment;
-      "getConnectedBridgeTokens(address)": FunctionFragment;
-      "getDestinationAmountOut(tuple[],address)": FunctionFragment;
-      "getOriginAmountOut(address,string[],uint256)": FunctionFragment;
-      "synapseCCTP()": FunctionFragment;
-    };
-
-    encodeFunctionData(
-      functionFragment: "adapterSwap",
-      values: [string, string, BigNumberish, string, BytesLike]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "bridge",
-      values: [
-        string,
-        BigNumberish,
-        string,
-        BigNumberish,
-        {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        }
-      ]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "calculateFeeAmount",
-      values: [string, BigNumberish, boolean]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "feeStructures",
-      values: [string]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "getConnectedBridgeTokens",
-      values: [string]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "getDestinationAmountOut",
-      values: [{ symbol: string; amountIn: BigNumberish }[], string]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "getOriginAmountOut",
-      values: [string, string[], BigNumberish]
-    ): string;
-    encodeFunctionData(
-      functionFragment: "synapseCCTP",
-      values?: undefined
-    ): string;
-
-    decodeFunctionResult(
-      functionFragment: "adapterSwap",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(functionFragment: "bridge", data: BytesLike): Result;
-    decodeFunctionResult(
-      functionFragment: "calculateFeeAmount",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(
-      functionFragment: "feeStructures",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(
-      functionFragment: "getConnectedBridgeTokens",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(
-      functionFragment: "getDestinationAmountOut",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(
-      functionFragment: "getOriginAmountOut",
-      data: BytesLike
-    ): Result;
-    decodeFunctionResult(
-      functionFragment: "synapseCCTP",
-      data: BytesLike
-    ): Result;
-
-    events: {};
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from './common'
+
+export type SwapQueryStruct = {
+  routerAdapter: string
+  tokenOut: string
+  minAmountOut: BigNumberish
+  deadline: BigNumberish
+  rawParams: BytesLike
+}
+
+export type SwapQueryStructOutput = [
+  string,
+  string,
+  BigNumber,
+  BigNumber,
+  string
+] & {
+  routerAdapter: string
+  tokenOut: string
+  minAmountOut: BigNumber
+  deadline: BigNumber
+  rawParams: string
+}
+
+export type BridgeTokenStruct = { symbol: string; token: string }
+
+export type BridgeTokenStructOutput = [string, string] & {
+  symbol: string
+  token: string
+}
+
+export type DestRequestStruct = { symbol: string; amountIn: BigNumberish }
+
+export type DestRequestStructOutput = [string, BigNumber] & {
+  symbol: string
+  amountIn: BigNumber
+}
+
+export interface SynapseCCTPRouterInterface extends utils.Interface {
+  functions: {
+    'adapterSwap(address,address,uint256,address,bytes)': FunctionFragment
+    'bridge(address,uint256,address,uint256,(address,address,uint256,uint256,bytes),(address,address,uint256,uint256,bytes))': FunctionFragment
+    'calculateFeeAmount(address,uint256,bool)': FunctionFragment
+    'feeStructures(address)': FunctionFragment
+    'getConnectedBridgeTokens(address)': FunctionFragment
+    'getDestinationAmountOut((string,uint256)[],address)': FunctionFragment
+    'getOriginAmountOut(address,string[],uint256)': FunctionFragment
+    'synapseCCTP()': FunctionFragment
   }
 
-  export class SynapseCCTPRouter extends BaseContract {
-    connect(signerOrProvider: Signer | Provider | string): this;
-    attach(addressOrName: string): this;
-    deployed(): Promise<this>;
-
-    listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-    ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-    off<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-      listener: TypedListener<EventArgsArray, EventArgsObject>
-    ): this;
-    on<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-      listener: TypedListener<EventArgsArray, EventArgsObject>
-    ): this;
-    once<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-      listener: TypedListener<EventArgsArray, EventArgsObject>
-    ): this;
-    removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-      listener: TypedListener<EventArgsArray, EventArgsObject>
-    ): this;
-    removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-      eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-    ): this;
-
-    listeners(eventName?: string): Array<Listener>;
-    off(eventName: string, listener: Listener): this;
-    on(eventName: string, listener: Listener): this;
-    once(eventName: string, listener: Listener): this;
-    removeListener(eventName: string, listener: Listener): this;
-    removeAllListeners(eventName?: string): this;
-
-    queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-      event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-      fromBlockOrBlockhash?: string | number | undefined,
-      toBlock?: string | number | undefined
-    ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-    interface: SynapseCCTPRouterInterface;
-
-    functions: {
-      adapterSwap(
-        recipient: string,
-        tokenIn: string,
-        amountIn: BigNumberish,
-        tokenOut: string,
-        rawParams: BytesLike,
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<ContractTransaction>;
-
-      bridge(
-        recipient: string,
-        chainId: BigNumberish,
-        token: string,
-        amount: BigNumberish,
-        originQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        destQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<ContractTransaction>;
-
-      calculateFeeAmount(
-        token: string,
-        amount: BigNumberish,
-        isSwap: boolean,
-        overrides?: CallOverrides
-      ): Promise<[BigNumber] & { fee: BigNumber }>;
-
-      feeStructures(
-        token: string,
-        overrides?: CallOverrides
-      ): Promise<
-        [number, BigNumber, BigNumber, BigNumber] & {
-          relayerFee: number;
-          minBaseFee: BigNumber;
-          minSwapFee: BigNumber;
-          maxFee: BigNumber;
-        }
-      >;
-
-      getConnectedBridgeTokens(
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<
-        [([string, string] & { symbol: string; token: string })[]] & {
-          tokens: ([string, string] & { symbol: string; token: string })[];
-        }
-      >;
-
-      getDestinationAmountOut(
-        requests: { symbol: string; amountIn: BigNumberish }[],
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<
-        [
-          ([string, string, BigNumber, BigNumber, string] & {
-            routerAdapter: string;
-            tokenOut: string;
-            minAmountOut: BigNumber;
-            deadline: BigNumber;
-            rawParams: string;
-          })[]
-        ] & {
-          destQueries: ([string, string, BigNumber, BigNumber, string] & {
-            routerAdapter: string;
-            tokenOut: string;
-            minAmountOut: BigNumber;
-            deadline: BigNumber;
-            rawParams: string;
-          })[];
-        }
-      >;
-
-      getOriginAmountOut(
-        tokenIn: string,
-        tokenSymbols: string[],
-        amountIn: BigNumberish,
-        overrides?: CallOverrides
-      ): Promise<
-        [
-          ([string, string, BigNumber, BigNumber, string] & {
-            routerAdapter: string;
-            tokenOut: string;
-            minAmountOut: BigNumber;
-            deadline: BigNumber;
-            rawParams: string;
-          })[]
-        ] & {
-          originQueries: ([string, string, BigNumber, BigNumber, string] & {
-            routerAdapter: string;
-            tokenOut: string;
-            minAmountOut: BigNumber;
-            deadline: BigNumber;
-            rawParams: string;
-          })[];
-        }
-      >;
-
-      synapseCCTP(overrides?: CallOverrides): Promise<[string]>;
-    };
-
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'adapterSwap'
+      | 'bridge'
+      | 'calculateFeeAmount'
+      | 'feeStructures'
+      | 'getConnectedBridgeTokens'
+      | 'getDestinationAmountOut'
+      | 'getOriginAmountOut'
+      | 'synapseCCTP'
+  ): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'adapterSwap',
+    values: [string, string, BigNumberish, string, BytesLike]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'bridge',
+    values: [
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
+      SwapQueryStruct,
+      SwapQueryStruct
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'calculateFeeAmount',
+    values: [string, BigNumberish, boolean]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'feeStructures',
+    values: [string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getConnectedBridgeTokens',
+    values: [string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getDestinationAmountOut',
+    values: [DestRequestStruct[], string]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getOriginAmountOut',
+    values: [string, string[], BigNumberish]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'synapseCCTP',
+    values?: undefined
+  ): string
+
+  decodeFunctionResult(functionFragment: 'adapterSwap', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'bridge', data: BytesLike): Result
+  decodeFunctionResult(
+    functionFragment: 'calculateFeeAmount',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'feeStructures',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getConnectedBridgeTokens',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getDestinationAmountOut',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(
+    functionFragment: 'getOriginAmountOut',
+    data: BytesLike
+  ): Result
+  decodeFunctionResult(functionFragment: 'synapseCCTP', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface SynapseCCTPRouter extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: SynapseCCTPRouterInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
     adapterSwap(
       recipient: string,
       tokenIn: string,
       amountIn: BigNumberish,
       tokenOut: string,
       rawParams: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<ContractTransaction>
 
     bridge(
       recipient: string,
       chainId: BigNumberish,
       token: string,
       amount: BigNumberish,
-      originQuery: {
-        routerAdapter: string;
-        tokenOut: string;
-        minAmountOut: BigNumberish;
-        deadline: BigNumberish;
-        rawParams: BytesLike;
-      },
-      destQuery: {
-        routerAdapter: string;
-        tokenOut: string;
-        minAmountOut: BigNumberish;
-        deadline: BigNumberish;
-        rawParams: BytesLike;
-      },
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
+      originQuery: SwapQueryStruct,
+      destQuery: SwapQueryStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<ContractTransaction>
 
     calculateFeeAmount(
       token: string,
       amount: BigNumberish,
       isSwap: boolean,
       overrides?: CallOverrides
-    ): Promise<BigNumber>;
+    ): Promise<[BigNumber] & { fee: BigNumber }>
 
     feeStructures(
       token: string,
       overrides?: CallOverrides
     ): Promise<
       [number, BigNumber, BigNumber, BigNumber] & {
-        relayerFee: number;
-        minBaseFee: BigNumber;
-        minSwapFee: BigNumber;
-        maxFee: BigNumber;
+        relayerFee: number
+        minBaseFee: BigNumber
+        minSwapFee: BigNumber
+        maxFee: BigNumber
       }
-    >;
+    >
 
     getConnectedBridgeTokens(
       tokenOut: string,
       overrides?: CallOverrides
-    ): Promise<([string, string] & { symbol: string; token: string })[]>;
+    ): Promise<
+      [BridgeTokenStructOutput[]] & { tokens: BridgeTokenStructOutput[] }
+    >
 
     getDestinationAmountOut(
-      requests: { symbol: string; amountIn: BigNumberish }[],
+      requests: DestRequestStruct[],
       tokenOut: string,
       overrides?: CallOverrides
     ): Promise<
-      ([string, string, BigNumber, BigNumber, string] & {
-        routerAdapter: string;
-        tokenOut: string;
-        minAmountOut: BigNumber;
-        deadline: BigNumber;
-        rawParams: string;
-      })[]
-    >;
+      [SwapQueryStructOutput[]] & { destQueries: SwapQueryStructOutput[] }
+    >
 
     getOriginAmountOut(
       tokenIn: string,
@@ -346,231 +235,232 @@ import {
       amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
-      ([string, string, BigNumber, BigNumber, string] & {
-        routerAdapter: string;
-        tokenOut: string;
-        minAmountOut: BigNumber;
-        deadline: BigNumber;
-        rawParams: string;
-      })[]
-    >;
-
-    synapseCCTP(overrides?: CallOverrides): Promise<string>;
-
-    callStatic: {
-      adapterSwap(
-        recipient: string,
-        tokenIn: string,
-        amountIn: BigNumberish,
-        tokenOut: string,
-        rawParams: BytesLike,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      bridge(
-        recipient: string,
-        chainId: BigNumberish,
-        token: string,
-        amount: BigNumberish,
-        originQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        destQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        overrides?: CallOverrides
-      ): Promise<void>;
-
-      calculateFeeAmount(
-        token: string,
-        amount: BigNumberish,
-        isSwap: boolean,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      feeStructures(
-        token: string,
-        overrides?: CallOverrides
-      ): Promise<
-        [number, BigNumber, BigNumber, BigNumber] & {
-          relayerFee: number;
-          minBaseFee: BigNumber;
-          minSwapFee: BigNumber;
-          maxFee: BigNumber;
-        }
-      >;
-
-      getConnectedBridgeTokens(
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<([string, string] & { symbol: string; token: string })[]>;
-
-      getDestinationAmountOut(
-        requests: { symbol: string; amountIn: BigNumberish }[],
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<
-        ([string, string, BigNumber, BigNumber, string] & {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumber;
-          deadline: BigNumber;
-          rawParams: string;
-        })[]
-      >;
-
-      getOriginAmountOut(
-        tokenIn: string,
-        tokenSymbols: string[],
-        amountIn: BigNumberish,
-        overrides?: CallOverrides
-      ): Promise<
-        ([string, string, BigNumber, BigNumber, string] & {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumber;
-          deadline: BigNumber;
-          rawParams: string;
-        })[]
-      >;
-
-      synapseCCTP(overrides?: CallOverrides): Promise<string>;
-    };
-
-    filters: {};
-
-    estimateGas: {
-      adapterSwap(
-        recipient: string,
-        tokenIn: string,
-        amountIn: BigNumberish,
-        tokenOut: string,
-        rawParams: BytesLike,
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<BigNumber>;
-
-      bridge(
-        recipient: string,
-        chainId: BigNumberish,
-        token: string,
-        amount: BigNumberish,
-        originQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        destQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<BigNumber>;
-
-      calculateFeeAmount(
-        token: string,
-        amount: BigNumberish,
-        isSwap: boolean,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      feeStructures(token: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-      getConnectedBridgeTokens(
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      getDestinationAmountOut(
-        requests: { symbol: string; amountIn: BigNumberish }[],
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      getOriginAmountOut(
-        tokenIn: string,
-        tokenSymbols: string[],
-        amountIn: BigNumberish,
-        overrides?: CallOverrides
-      ): Promise<BigNumber>;
-
-      synapseCCTP(overrides?: CallOverrides): Promise<BigNumber>;
-    };
-
-    populateTransaction: {
-      adapterSwap(
-        recipient: string,
-        tokenIn: string,
-        amountIn: BigNumberish,
-        tokenOut: string,
-        rawParams: BytesLike,
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<PopulatedTransaction>;
-
-      bridge(
-        recipient: string,
-        chainId: BigNumberish,
-        token: string,
-        amount: BigNumberish,
-        originQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        destQuery: {
-          routerAdapter: string;
-          tokenOut: string;
-          minAmountOut: BigNumberish;
-          deadline: BigNumberish;
-          rawParams: BytesLike;
-        },
-        overrides?: PayableOverrides & { from?: string | Promise<string> }
-      ): Promise<PopulatedTransaction>;
-
-      calculateFeeAmount(
-        token: string,
-        amount: BigNumberish,
-        isSwap: boolean,
-        overrides?: CallOverrides
-      ): Promise<PopulatedTransaction>;
-
-      feeStructures(
-        token: string,
-        overrides?: CallOverrides
-      ): Promise<PopulatedTransaction>;
-
-      getConnectedBridgeTokens(
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<PopulatedTransaction>;
-
-      getDestinationAmountOut(
-        requests: { symbol: string; amountIn: BigNumberish }[],
-        tokenOut: string,
-        overrides?: CallOverrides
-      ): Promise<PopulatedTransaction>;
-
-      getOriginAmountOut(
-        tokenIn: string,
-        tokenSymbols: string[],
-        amountIn: BigNumberish,
-        overrides?: CallOverrides
-      ): Promise<PopulatedTransaction>;
-
-      synapseCCTP(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-    };
-  }
\ No newline at end of file
+      [SwapQueryStructOutput[]] & { originQueries: SwapQueryStructOutput[] }
+    >
+
+    synapseCCTP(overrides?: CallOverrides): Promise<[string]>
+  }
+
+  adapterSwap(
+    recipient: string,
+    tokenIn: string,
+    amountIn: BigNumberish,
+    tokenOut: string,
+    rawParams: BytesLike,
+    overrides?: PayableOverrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  bridge(
+    recipient: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
+    originQuery: SwapQueryStruct,
+    destQuery: SwapQueryStruct,
+    overrides?: PayableOverrides & { from?: string }
+  ): Promise<ContractTransaction>
+
+  calculateFeeAmount(
+    token: string,
+    amount: BigNumberish,
+    isSwap: boolean,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>
+
+  feeStructures(
+    token: string,
+    overrides?: CallOverrides
+  ): Promise<
+    [number, BigNumber, BigNumber, BigNumber] & {
+      relayerFee: number
+      minBaseFee: BigNumber
+      minSwapFee: BigNumber
+      maxFee: BigNumber
+    }
+  >
+
+  getConnectedBridgeTokens(
+    tokenOut: string,
+    overrides?: CallOverrides
+  ): Promise<BridgeTokenStructOutput[]>
+
+  getDestinationAmountOut(
+    requests: DestRequestStruct[],
+    tokenOut: string,
+    overrides?: CallOverrides
+  ): Promise<SwapQueryStructOutput[]>
+
+  getOriginAmountOut(
+    tokenIn: string,
+    tokenSymbols: string[],
+    amountIn: BigNumberish,
+    overrides?: CallOverrides
+  ): Promise<SwapQueryStructOutput[]>
+
+  synapseCCTP(overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    adapterSwap(
+      recipient: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    bridge(
+      recipient: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      originQuery: SwapQueryStruct,
+      destQuery: SwapQueryStruct,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    calculateFeeAmount(
+      token: string,
+      amount: BigNumberish,
+      isSwap: boolean,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    feeStructures(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<
+      [number, BigNumber, BigNumber, BigNumber] & {
+        relayerFee: number
+        minBaseFee: BigNumber
+        minSwapFee: BigNumber
+        maxFee: BigNumber
+      }
+    >
+
+    getConnectedBridgeTokens(
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<BridgeTokenStructOutput[]>
+
+    getDestinationAmountOut(
+      requests: DestRequestStruct[],
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<SwapQueryStructOutput[]>
+
+    getOriginAmountOut(
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<SwapQueryStructOutput[]>
+
+    synapseCCTP(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    adapterSwap(
+      recipient: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<BigNumber>
+
+    bridge(
+      recipient: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      originQuery: SwapQueryStruct,
+      destQuery: SwapQueryStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<BigNumber>
+
+    calculateFeeAmount(
+      token: string,
+      amount: BigNumberish,
+      isSwap: boolean,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    feeStructures(token: string, overrides?: CallOverrides): Promise<BigNumber>
+
+    getConnectedBridgeTokens(
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getDestinationAmountOut(
+      requests: DestRequestStruct[],
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getOriginAmountOut(
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    synapseCCTP(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    adapterSwap(
+      recipient: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    bridge(
+      recipient: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
+      originQuery: SwapQueryStruct,
+      destQuery: SwapQueryStruct,
+      overrides?: PayableOverrides & { from?: string }
+    ): Promise<PopulatedTransaction>
+
+    calculateFeeAmount(
+      token: string,
+      amount: BigNumberish,
+      isSwap: boolean,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    feeStructures(
+      token: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getConnectedBridgeTokens(
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getDestinationAmountOut(
+      requests: DestRequestStruct[],
+      tokenOut: string,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getOriginAmountOut(
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    synapseCCTP(overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/packages/sdk-router/src/typechain/SynapseRouter.ts b/packages/sdk-router/src/typechain/SynapseRouter.ts
index fef9e60b4e..ef1ee58fc1 100644
--- a/packages/sdk-router/src/typechain/SynapseRouter.ts
+++ b/packages/sdk-router/src/typechain/SynapseRouter.ts
@@ -25,13 +25,9 @@ import type {
   TypedEvent,
   TypedListener,
   OnEvent,
-  PromiseOrValue,
 } from './common'
 
-export type PoolTokenStruct = {
-  isWeth: PromiseOrValue<boolean>
-  token: PromiseOrValue<string>
-}
+export type PoolTokenStruct = { isWeth: boolean; token: string }
 
 export type PoolTokenStructOutput = [boolean, string] & {
   isWeth: boolean
@@ -39,8 +35,8 @@ export type PoolTokenStructOutput = [boolean, string] & {
 }
 
 export type PoolStruct = {
-  pool: PromiseOrValue<string>
-  lpToken: PromiseOrValue<string>
+  pool: string
+  lpToken: string
   tokens: PoolTokenStruct[]
 }
 
@@ -51,11 +47,11 @@ export type PoolStructOutput = [string, string, PoolTokenStructOutput[]] & {
 }
 
 export type SwapQueryStruct = {
-  swapAdapter: PromiseOrValue<string>
-  tokenOut: PromiseOrValue<string>
-  minAmountOut: PromiseOrValue<BigNumberish>
-  deadline: PromiseOrValue<BigNumberish>
-  rawParams: PromiseOrValue<BytesLike>
+  swapAdapter: string
+  tokenOut: string
+  minAmountOut: BigNumberish
+  deadline: BigNumberish
+  rawParams: BytesLike
 }
 
 export type SwapQueryStructOutput = [
@@ -72,20 +68,14 @@ export type SwapQueryStructOutput = [
   rawParams: string
 }
 
-export type BridgeTokenStruct = {
-  symbol: PromiseOrValue<string>
-  token: PromiseOrValue<string>
-}
+export type BridgeTokenStruct = { symbol: string; token: string }
 
 export type BridgeTokenStructOutput = [string, string] & {
   symbol: string
   token: string
 }
 
-export type DestRequestStruct = {
-  symbol: PromiseOrValue<string>
-  amountIn: PromiseOrValue<BigNumberish>
-}
+export type DestRequestStruct = { symbol: string; amountIn: BigNumberish }
 
 export type DestRequestStructOutput = [string, BigNumber] & {
   symbol: string
@@ -94,18 +84,20 @@ export type DestRequestStructOutput = [string, BigNumber] & {
 
 export declare namespace LocalBridgeConfig {
   export type BridgeTokenConfigStruct = {
-    id: PromiseOrValue<string>
-    token: PromiseOrValue<string>
-    tokenType: PromiseOrValue<BigNumberish>
-    bridgeToken: PromiseOrValue<string>
-    bridgeFee: PromiseOrValue<BigNumberish>
-    minFee: PromiseOrValue<BigNumberish>
-    maxFee: PromiseOrValue<BigNumberish>
+    id: string
+    token: string
+    decimals: BigNumberish
+    tokenType: BigNumberish
+    bridgeToken: string
+    bridgeFee: BigNumberish
+    minFee: BigNumberish
+    maxFee: BigNumberish
   }
 
   export type BridgeTokenConfigStructOutput = [
     string,
     string,
+    BigNumber,
     number,
     string,
     BigNumber,
@@ -114,6 +106,7 @@ export declare namespace LocalBridgeConfig {
   ] & {
     id: string
     token: string
+    decimals: BigNumber
     tokenType: number
     bridgeToken: string
     bridgeFee: BigNumber
@@ -122,11 +115,20 @@ export declare namespace LocalBridgeConfig {
   }
 }
 
+export declare namespace MulticallView {
+  export type ResultStruct = { success: boolean; returnData: BytesLike }
+
+  export type ResultStructOutput = [boolean, string] & {
+    success: boolean
+    returnData: string
+  }
+}
+
 export interface SynapseRouterInterface extends utils.Interface {
   functions: {
     'adapterSwap(address,address,uint256,address,bytes)': FunctionFragment
     'addToken(string,address,uint8,address,uint256,uint256,uint256)': FunctionFragment
-    'addTokens((string,address,uint8,address,uint256,uint256,uint256)[])': FunctionFragment
+    'addTokens((string,address,uint256,uint8,address,uint256,uint256,uint256)[])': FunctionFragment
     'allPools()': FunctionFragment
     'bridge(address,uint256,address,uint256,(address,address,uint256,uint256,bytes),(address,address,uint256,uint256,bytes))': FunctionFragment
     'bridgeTokens()': FunctionFragment
@@ -142,6 +144,7 @@ export interface SynapseRouterInterface extends utils.Interface {
     'getConnectedBridgeTokens(address)': FunctionFragment
     'getDestinationAmountOut((string,uint256)[],address)': FunctionFragment
     'getOriginAmountOut(address,string[],uint256)': FunctionFragment
+    'multicallView(bytes[])': FunctionFragment
     'owner()': FunctionFragment
     'poolInfo(address)': FunctionFragment
     'poolTokens(address)': FunctionFragment
@@ -181,6 +184,7 @@ export interface SynapseRouterInterface extends utils.Interface {
       | 'getConnectedBridgeTokens'
       | 'getDestinationAmountOut'
       | 'getOriginAmountOut'
+      | 'multicallView'
       | 'owner'
       | 'poolInfo'
       | 'poolTokens'
@@ -202,24 +206,18 @@ export interface SynapseRouterInterface extends utils.Interface {
 
   encodeFunctionData(
     functionFragment: 'adapterSwap',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BytesLike>
-    ]
+    values: [string, string, BigNumberish, string, BytesLike]
   ): string
   encodeFunctionData(
     functionFragment: 'addToken',
     values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>
+      string,
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
+      BigNumberish,
+      BigNumberish
     ]
   ): string
   encodeFunctionData(
@@ -230,10 +228,10 @@ export interface SynapseRouterInterface extends utils.Interface {
   encodeFunctionData(
     functionFragment: 'bridge',
     values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
+      string,
+      BigNumberish,
+      string,
+      BigNumberish,
       SwapQueryStruct,
       SwapQueryStruct
     ]
@@ -248,85 +246,57 @@ export interface SynapseRouterInterface extends utils.Interface {
   ): string
   encodeFunctionData(
     functionFragment: 'calculateAddLiquidity',
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>[]]
+    values: [string, BigNumberish[]]
   ): string
   encodeFunctionData(
     functionFragment: 'calculateBridgeFee',
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+    values: [string, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'calculateRemoveLiquidity',
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+    values: [string, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'calculateSwap',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>
-    ]
+    values: [string, BigNumberish, BigNumberish, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'calculateWithdrawOneToken',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string
-  encodeFunctionData(
-    functionFragment: 'config',
-    values: [PromiseOrValue<string>]
-  ): string
-  encodeFunctionData(
-    functionFragment: 'fee',
-    values: [PromiseOrValue<string>]
+    values: [string, BigNumberish, BigNumberish]
   ): string
+  encodeFunctionData(functionFragment: 'config', values: [string]): string
+  encodeFunctionData(functionFragment: 'fee', values: [string]): string
   encodeFunctionData(
     functionFragment: 'getAmountOut',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
+    values: [string, string, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'getConnectedBridgeTokens',
-    values: [PromiseOrValue<string>]
+    values: [string]
   ): string
   encodeFunctionData(
     functionFragment: 'getDestinationAmountOut',
-    values: [DestRequestStruct[], PromiseOrValue<string>]
+    values: [DestRequestStruct[], string]
   ): string
   encodeFunctionData(
     functionFragment: 'getOriginAmountOut',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>[],
-      PromiseOrValue<BigNumberish>
-    ]
+    values: [string, string[], BigNumberish]
   ): string
-  encodeFunctionData(functionFragment: 'owner', values?: undefined): string
   encodeFunctionData(
-    functionFragment: 'poolInfo',
-    values: [PromiseOrValue<string>]
-  ): string
-  encodeFunctionData(
-    functionFragment: 'poolTokens',
-    values: [PromiseOrValue<string>]
+    functionFragment: 'multicallView',
+    values: [BytesLike[]]
   ): string
+  encodeFunctionData(functionFragment: 'owner', values?: undefined): string
+  encodeFunctionData(functionFragment: 'poolInfo', values: [string]): string
+  encodeFunctionData(functionFragment: 'poolTokens', values: [string]): string
   encodeFunctionData(
     functionFragment: 'poolsAmount',
     values?: undefined
   ): string
-  encodeFunctionData(
-    functionFragment: 'removeToken',
-    values: [PromiseOrValue<string>]
-  ): string
+  encodeFunctionData(functionFragment: 'removeToken', values: [string]): string
   encodeFunctionData(
     functionFragment: 'removeTokens',
-    values: [PromiseOrValue<string>[]]
+    values: [string[]]
   ): string
   encodeFunctionData(
     functionFragment: 'renounceOwnership',
@@ -334,46 +304,28 @@ export interface SynapseRouterInterface extends utils.Interface {
   ): string
   encodeFunctionData(
     functionFragment: 'setAllowance',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
+    values: [string, string, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'setSwapQuoter',
-    values: [PromiseOrValue<string>]
+    values: [string]
   ): string
   encodeFunctionData(
     functionFragment: 'setTokenConfig',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>
-    ]
+    values: [string, BigNumberish, string]
   ): string
   encodeFunctionData(
     functionFragment: 'setTokenFee',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>
-    ]
+    values: [string, BigNumberish, BigNumberish, BigNumberish]
   ): string
   encodeFunctionData(
     functionFragment: 'swap',
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      SwapQueryStruct
-    ]
+    values: [string, string, BigNumberish, SwapQueryStruct]
   ): string
   encodeFunctionData(functionFragment: 'swapQuoter', values?: undefined): string
   encodeFunctionData(
     functionFragment: 'symbolToToken',
-    values: [PromiseOrValue<string>]
+    values: [string]
   ): string
   encodeFunctionData(
     functionFragment: 'synapseBridge',
@@ -381,11 +333,11 @@ export interface SynapseRouterInterface extends utils.Interface {
   ): string
   encodeFunctionData(
     functionFragment: 'tokenToSymbol',
-    values: [PromiseOrValue<string>]
+    values: [string]
   ): string
   encodeFunctionData(
     functionFragment: 'transferOwnership',
-    values: [PromiseOrValue<string>]
+    values: [string]
   ): string
 
   decodeFunctionResult(functionFragment: 'adapterSwap', data: BytesLike): Result
@@ -439,6 +391,10 @@ export interface SynapseRouterInterface extends utils.Interface {
     functionFragment: 'getOriginAmountOut',
     data: BytesLike
   ): Result
+  decodeFunctionResult(
+    functionFragment: 'multicallView',
+    data: BytesLike
+  ): Result
   decodeFunctionResult(functionFragment: 'owner', data: BytesLike): Result
   decodeFunctionResult(functionFragment: 'poolInfo', data: BytesLike): Result
   decodeFunctionResult(functionFragment: 'poolTokens', data: BytesLike): Result
@@ -531,28 +487,28 @@ export interface SynapseRouter extends BaseContract {
 
   functions: {
     adapterSwap(
-      to: PromiseOrValue<string>,
-      tokenIn: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
-      tokenOut: PromiseOrValue<string>,
-      rawParams: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      to: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<ContractTransaction>
 
     addToken(
-      symbol: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      symbol: string,
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     addTokens(
       tokens: LocalBridgeConfig.BridgeTokenConfigStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     allPools(
@@ -560,13 +516,13 @@ export interface SynapseRouter extends BaseContract {
     ): Promise<[PoolStructOutput[]] & { pools: PoolStructOutput[] }>
 
     bridge(
-      to: PromiseOrValue<string>,
-      chainId: PromiseOrValue<BigNumberish>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
       originQuery: SwapQueryStruct,
       destQuery: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<ContractTransaction>
 
     bridgeTokens(
@@ -578,45 +534,45 @@ export interface SynapseRouter extends BaseContract {
     ): Promise<[BigNumber] & { amount: BigNumber }>
 
     calculateAddLiquidity(
-      pool: PromiseOrValue<string>,
-      amounts: PromiseOrValue<BigNumberish>[],
+      pool: string,
+      amounts: BigNumberish[],
       overrides?: CallOverrides
     ): Promise<[BigNumber]>
 
     calculateBridgeFee(
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      token: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber] & { feeAmount: BigNumber }>
 
     calculateRemoveLiquidity(
-      pool: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      pool: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber[]] & { amountsOut: BigNumber[] }>
 
     calculateSwap(
-      pool: PromiseOrValue<string>,
-      tokenIndexFrom: PromiseOrValue<BigNumberish>,
-      tokenIndexTo: PromiseOrValue<BigNumberish>,
-      dx: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      dx: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber] & { amountOut: BigNumber }>
 
     calculateWithdrawOneToken(
-      pool: PromiseOrValue<string>,
-      tokenAmount: PromiseOrValue<BigNumberish>,
-      tokenIndex: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenAmount: BigNumberish,
+      tokenIndex: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[BigNumber] & { amountOut: BigNumber }>
 
     config(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<[number, string] & { tokenType: number; bridgeToken: string }>
 
     fee(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<
       [number, BigNumber, BigNumber] & {
@@ -627,14 +583,14 @@ export interface SynapseRouter extends BaseContract {
     >
 
     getAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenOut: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenOut: string,
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<[SwapQueryStructOutput]>
 
     getConnectedBridgeTokens(
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<
       [BridgeTokenStructOutput[]] & { tokens: BridgeTokenStructOutput[] }
@@ -642,30 +598,39 @@ export interface SynapseRouter extends BaseContract {
 
     getDestinationAmountOut(
       requests: DestRequestStruct[],
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<
       [SwapQueryStructOutput[]] & { destQueries: SwapQueryStructOutput[] }
     >
 
     getOriginAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenSymbols: PromiseOrValue<string>[],
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<
       [SwapQueryStructOutput[]] & { originQueries: SwapQueryStructOutput[] }
     >
 
+    multicallView(
+      data: BytesLike[],
+      overrides?: CallOverrides
+    ): Promise<
+      [MulticallView.ResultStructOutput[]] & {
+        callResults: MulticallView.ResultStructOutput[]
+      }
+    >
+
     owner(overrides?: CallOverrides): Promise<[string]>
 
     poolInfo(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<[BigNumber, string]>
 
     poolTokens(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<[PoolTokenStructOutput[]] & { tokens: PoolTokenStructOutput[] }>
 
@@ -674,109 +639,103 @@ export interface SynapseRouter extends BaseContract {
     ): Promise<[BigNumber] & { amount: BigNumber }>
 
     removeToken(
-      token: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     removeTokens(
-      tokens: PromiseOrValue<string>[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      tokens: string[],
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     renounceOwnership(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     setAllowance(
-      token: PromiseOrValue<string>,
-      spender: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      spender: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     setSwapQuoter(
-      _swapQuoter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      _swapQuoter: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     setTokenConfig(
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     setTokenFee(
-      token: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
 
     swap(
-      to: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      token: string,
+      amount: BigNumberish,
       query: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<ContractTransaction>
 
     swapQuoter(overrides?: CallOverrides): Promise<[string]>
 
-    symbolToToken(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[string]>
+    symbolToToken(arg0: string, overrides?: CallOverrides): Promise<[string]>
 
     synapseBridge(overrides?: CallOverrides): Promise<[string]>
 
-    tokenToSymbol(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[string]>
+    tokenToSymbol(arg0: string, overrides?: CallOverrides): Promise<[string]>
 
     transferOwnership(
-      newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      newOwner: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<ContractTransaction>
   }
 
   adapterSwap(
-    to: PromiseOrValue<string>,
-    tokenIn: PromiseOrValue<string>,
-    amountIn: PromiseOrValue<BigNumberish>,
-    tokenOut: PromiseOrValue<string>,
-    rawParams: PromiseOrValue<BytesLike>,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    to: string,
+    tokenIn: string,
+    amountIn: BigNumberish,
+    tokenOut: string,
+    rawParams: BytesLike,
+    overrides?: PayableOverrides & { from?: string }
   ): Promise<ContractTransaction>
 
   addToken(
-    symbol: PromiseOrValue<string>,
-    token: PromiseOrValue<string>,
-    tokenType: PromiseOrValue<BigNumberish>,
-    bridgeToken: PromiseOrValue<string>,
-    bridgeFee: PromiseOrValue<BigNumberish>,
-    minFee: PromiseOrValue<BigNumberish>,
-    maxFee: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    symbol: string,
+    token: string,
+    tokenType: BigNumberish,
+    bridgeToken: string,
+    bridgeFee: BigNumberish,
+    minFee: BigNumberish,
+    maxFee: BigNumberish,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   addTokens(
     tokens: LocalBridgeConfig.BridgeTokenConfigStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   allPools(overrides?: CallOverrides): Promise<PoolStructOutput[]>
 
   bridge(
-    to: PromiseOrValue<string>,
-    chainId: PromiseOrValue<BigNumberish>,
-    token: PromiseOrValue<string>,
-    amount: PromiseOrValue<BigNumberish>,
+    to: string,
+    chainId: BigNumberish,
+    token: string,
+    amount: BigNumberish,
     originQuery: SwapQueryStruct,
     destQuery: SwapQueryStruct,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    overrides?: PayableOverrides & { from?: string }
   ): Promise<ContractTransaction>
 
   bridgeTokens(overrides?: CallOverrides): Promise<string[]>
@@ -784,45 +743,45 @@ export interface SynapseRouter extends BaseContract {
   bridgeTokensAmount(overrides?: CallOverrides): Promise<BigNumber>
 
   calculateAddLiquidity(
-    pool: PromiseOrValue<string>,
-    amounts: PromiseOrValue<BigNumberish>[],
+    pool: string,
+    amounts: BigNumberish[],
     overrides?: CallOverrides
   ): Promise<BigNumber>
 
   calculateBridgeFee(
-    token: PromiseOrValue<string>,
-    amount: PromiseOrValue<BigNumberish>,
+    token: string,
+    amount: BigNumberish,
     overrides?: CallOverrides
   ): Promise<BigNumber>
 
   calculateRemoveLiquidity(
-    pool: PromiseOrValue<string>,
-    amount: PromiseOrValue<BigNumberish>,
+    pool: string,
+    amount: BigNumberish,
     overrides?: CallOverrides
   ): Promise<BigNumber[]>
 
   calculateSwap(
-    pool: PromiseOrValue<string>,
-    tokenIndexFrom: PromiseOrValue<BigNumberish>,
-    tokenIndexTo: PromiseOrValue<BigNumberish>,
-    dx: PromiseOrValue<BigNumberish>,
+    pool: string,
+    tokenIndexFrom: BigNumberish,
+    tokenIndexTo: BigNumberish,
+    dx: BigNumberish,
     overrides?: CallOverrides
   ): Promise<BigNumber>
 
   calculateWithdrawOneToken(
-    pool: PromiseOrValue<string>,
-    tokenAmount: PromiseOrValue<BigNumberish>,
-    tokenIndex: PromiseOrValue<BigNumberish>,
+    pool: string,
+    tokenAmount: BigNumberish,
+    tokenIndex: BigNumberish,
     overrides?: CallOverrides
   ): Promise<BigNumber>
 
   config(
-    arg0: PromiseOrValue<string>,
+    arg0: string,
     overrides?: CallOverrides
   ): Promise<[number, string] & { tokenType: number; bridgeToken: string }>
 
   fee(
-    arg0: PromiseOrValue<string>,
+    arg0: string,
     overrides?: CallOverrides
   ): Promise<
     [number, BigNumber, BigNumber] & {
@@ -833,130 +792,129 @@ export interface SynapseRouter extends BaseContract {
   >
 
   getAmountOut(
-    tokenIn: PromiseOrValue<string>,
-    tokenOut: PromiseOrValue<string>,
-    amountIn: PromiseOrValue<BigNumberish>,
+    tokenIn: string,
+    tokenOut: string,
+    amountIn: BigNumberish,
     overrides?: CallOverrides
   ): Promise<SwapQueryStructOutput>
 
   getConnectedBridgeTokens(
-    tokenOut: PromiseOrValue<string>,
+    tokenOut: string,
     overrides?: CallOverrides
   ): Promise<BridgeTokenStructOutput[]>
 
   getDestinationAmountOut(
     requests: DestRequestStruct[],
-    tokenOut: PromiseOrValue<string>,
+    tokenOut: string,
     overrides?: CallOverrides
   ): Promise<SwapQueryStructOutput[]>
 
   getOriginAmountOut(
-    tokenIn: PromiseOrValue<string>,
-    tokenSymbols: PromiseOrValue<string>[],
-    amountIn: PromiseOrValue<BigNumberish>,
+    tokenIn: string,
+    tokenSymbols: string[],
+    amountIn: BigNumberish,
     overrides?: CallOverrides
   ): Promise<SwapQueryStructOutput[]>
 
+  multicallView(
+    data: BytesLike[],
+    overrides?: CallOverrides
+  ): Promise<MulticallView.ResultStructOutput[]>
+
   owner(overrides?: CallOverrides): Promise<string>
 
   poolInfo(
-    pool: PromiseOrValue<string>,
+    pool: string,
     overrides?: CallOverrides
   ): Promise<[BigNumber, string]>
 
   poolTokens(
-    pool: PromiseOrValue<string>,
+    pool: string,
     overrides?: CallOverrides
   ): Promise<PoolTokenStructOutput[]>
 
   poolsAmount(overrides?: CallOverrides): Promise<BigNumber>
 
   removeToken(
-    token: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    token: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   removeTokens(
-    tokens: PromiseOrValue<string>[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    tokens: string[],
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   renounceOwnership(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   setAllowance(
-    token: PromiseOrValue<string>,
-    spender: PromiseOrValue<string>,
-    amount: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    token: string,
+    spender: string,
+    amount: BigNumberish,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   setSwapQuoter(
-    _swapQuoter: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    _swapQuoter: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   setTokenConfig(
-    token: PromiseOrValue<string>,
-    tokenType: PromiseOrValue<BigNumberish>,
-    bridgeToken: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    token: string,
+    tokenType: BigNumberish,
+    bridgeToken: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   setTokenFee(
-    token: PromiseOrValue<string>,
-    bridgeFee: PromiseOrValue<BigNumberish>,
-    minFee: PromiseOrValue<BigNumberish>,
-    maxFee: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    token: string,
+    bridgeFee: BigNumberish,
+    minFee: BigNumberish,
+    maxFee: BigNumberish,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   swap(
-    to: PromiseOrValue<string>,
-    token: PromiseOrValue<string>,
-    amount: PromiseOrValue<BigNumberish>,
+    to: string,
+    token: string,
+    amount: BigNumberish,
     query: SwapQueryStruct,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    overrides?: PayableOverrides & { from?: string }
   ): Promise<ContractTransaction>
 
   swapQuoter(overrides?: CallOverrides): Promise<string>
 
-  symbolToToken(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<string>
+  symbolToToken(arg0: string, overrides?: CallOverrides): Promise<string>
 
   synapseBridge(overrides?: CallOverrides): Promise<string>
 
-  tokenToSymbol(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<string>
+  tokenToSymbol(arg0: string, overrides?: CallOverrides): Promise<string>
 
   transferOwnership(
-    newOwner: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    newOwner: string,
+    overrides?: Overrides & { from?: string }
   ): Promise<ContractTransaction>
 
   callStatic: {
     adapterSwap(
-      to: PromiseOrValue<string>,
-      tokenIn: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
-      tokenOut: PromiseOrValue<string>,
-      rawParams: PromiseOrValue<BytesLike>,
+      to: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     addToken(
-      symbol: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
+      symbol: string,
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
       overrides?: CallOverrides
     ): Promise<boolean>
 
@@ -968,10 +926,10 @@ export interface SynapseRouter extends BaseContract {
     allPools(overrides?: CallOverrides): Promise<PoolStructOutput[]>
 
     bridge(
-      to: PromiseOrValue<string>,
-      chainId: PromiseOrValue<BigNumberish>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
       originQuery: SwapQueryStruct,
       destQuery: SwapQueryStruct,
       overrides?: CallOverrides
@@ -982,45 +940,45 @@ export interface SynapseRouter extends BaseContract {
     bridgeTokensAmount(overrides?: CallOverrides): Promise<BigNumber>
 
     calculateAddLiquidity(
-      pool: PromiseOrValue<string>,
-      amounts: PromiseOrValue<BigNumberish>[],
+      pool: string,
+      amounts: BigNumberish[],
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateBridgeFee(
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      token: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateRemoveLiquidity(
-      pool: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      pool: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber[]>
 
     calculateSwap(
-      pool: PromiseOrValue<string>,
-      tokenIndexFrom: PromiseOrValue<BigNumberish>,
-      tokenIndexTo: PromiseOrValue<BigNumberish>,
-      dx: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      dx: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateWithdrawOneToken(
-      pool: PromiseOrValue<string>,
-      tokenAmount: PromiseOrValue<BigNumberish>,
-      tokenIndex: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenAmount: BigNumberish,
+      tokenIndex: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     config(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<[number, string] & { tokenType: number; bridgeToken: string }>
 
     fee(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<
       [number, BigNumber, BigNumber] & {
@@ -1031,158 +989,148 @@ export interface SynapseRouter extends BaseContract {
     >
 
     getAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenOut: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenOut: string,
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<SwapQueryStructOutput>
 
     getConnectedBridgeTokens(
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<BridgeTokenStructOutput[]>
 
     getDestinationAmountOut(
       requests: DestRequestStruct[],
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<SwapQueryStructOutput[]>
 
     getOriginAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenSymbols: PromiseOrValue<string>[],
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<SwapQueryStructOutput[]>
 
+    multicallView(
+      data: BytesLike[],
+      overrides?: CallOverrides
+    ): Promise<MulticallView.ResultStructOutput[]>
+
     owner(overrides?: CallOverrides): Promise<string>
 
     poolInfo(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<[BigNumber, string]>
 
     poolTokens(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<PoolTokenStructOutput[]>
 
     poolsAmount(overrides?: CallOverrides): Promise<BigNumber>
 
-    removeToken(
-      token: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>
+    removeToken(token: string, overrides?: CallOverrides): Promise<boolean>
 
-    removeTokens(
-      tokens: PromiseOrValue<string>[],
-      overrides?: CallOverrides
-    ): Promise<void>
+    removeTokens(tokens: string[], overrides?: CallOverrides): Promise<void>
 
     renounceOwnership(overrides?: CallOverrides): Promise<void>
 
     setAllowance(
-      token: PromiseOrValue<string>,
-      spender: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      token: string,
+      spender: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>
 
-    setSwapQuoter(
-      _swapQuoter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>
+    setSwapQuoter(_swapQuoter: string, overrides?: CallOverrides): Promise<void>
 
     setTokenConfig(
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
       overrides?: CallOverrides
     ): Promise<void>
 
     setTokenFee(
-      token: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
+      token: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
       overrides?: CallOverrides
     ): Promise<void>
 
     swap(
-      to: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      token: string,
+      amount: BigNumberish,
       query: SwapQueryStruct,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     swapQuoter(overrides?: CallOverrides): Promise<string>
 
-    symbolToToken(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<string>
+    symbolToToken(arg0: string, overrides?: CallOverrides): Promise<string>
 
     synapseBridge(overrides?: CallOverrides): Promise<string>
 
-    tokenToSymbol(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<string>
+    tokenToSymbol(arg0: string, overrides?: CallOverrides): Promise<string>
 
     transferOwnership(
-      newOwner: PromiseOrValue<string>,
+      newOwner: string,
       overrides?: CallOverrides
     ): Promise<void>
   }
 
   filters: {
     'OwnershipTransferred(address,address)'(
-      previousOwner?: PromiseOrValue<string> | null,
-      newOwner?: PromiseOrValue<string> | null
+      previousOwner?: string | null,
+      newOwner?: string | null
     ): OwnershipTransferredEventFilter
     OwnershipTransferred(
-      previousOwner?: PromiseOrValue<string> | null,
-      newOwner?: PromiseOrValue<string> | null
+      previousOwner?: string | null,
+      newOwner?: string | null
     ): OwnershipTransferredEventFilter
   }
 
   estimateGas: {
     adapterSwap(
-      to: PromiseOrValue<string>,
-      tokenIn: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
-      tokenOut: PromiseOrValue<string>,
-      rawParams: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      to: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<BigNumber>
 
     addToken(
-      symbol: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      symbol: string,
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     addTokens(
       tokens: LocalBridgeConfig.BridgeTokenConfigStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     allPools(overrides?: CallOverrides): Promise<BigNumber>
 
     bridge(
-      to: PromiseOrValue<string>,
-      chainId: PromiseOrValue<BigNumberish>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
       originQuery: SwapQueryStruct,
       destQuery: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<BigNumber>
 
     bridgeTokens(overrides?: CallOverrides): Promise<BigNumber>
@@ -1190,192 +1138,179 @@ export interface SynapseRouter extends BaseContract {
     bridgeTokensAmount(overrides?: CallOverrides): Promise<BigNumber>
 
     calculateAddLiquidity(
-      pool: PromiseOrValue<string>,
-      amounts: PromiseOrValue<BigNumberish>[],
+      pool: string,
+      amounts: BigNumberish[],
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateBridgeFee(
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      token: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateRemoveLiquidity(
-      pool: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      pool: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateSwap(
-      pool: PromiseOrValue<string>,
-      tokenIndexFrom: PromiseOrValue<BigNumberish>,
-      tokenIndexTo: PromiseOrValue<BigNumberish>,
-      dx: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      dx: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     calculateWithdrawOneToken(
-      pool: PromiseOrValue<string>,
-      tokenAmount: PromiseOrValue<BigNumberish>,
-      tokenIndex: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenAmount: BigNumberish,
+      tokenIndex: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
-    config(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>
+    config(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
 
-    fee(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>
+    fee(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
 
     getAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenOut: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenOut: string,
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     getConnectedBridgeTokens(
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     getDestinationAmountOut(
       requests: DestRequestStruct[],
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
     getOriginAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenSymbols: PromiseOrValue<string>[],
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
-    owner(overrides?: CallOverrides): Promise<BigNumber>
-
-    poolInfo(
-      pool: PromiseOrValue<string>,
+    multicallView(
+      data: BytesLike[],
       overrides?: CallOverrides
     ): Promise<BigNumber>
 
-    poolTokens(
-      pool: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>
+    owner(overrides?: CallOverrides): Promise<BigNumber>
+
+    poolInfo(pool: string, overrides?: CallOverrides): Promise<BigNumber>
+
+    poolTokens(pool: string, overrides?: CallOverrides): Promise<BigNumber>
 
     poolsAmount(overrides?: CallOverrides): Promise<BigNumber>
 
     removeToken(
-      token: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     removeTokens(
-      tokens: PromiseOrValue<string>[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      tokens: string[],
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     renounceOwnership(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     setAllowance(
-      token: PromiseOrValue<string>,
-      spender: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      spender: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     setSwapQuoter(
-      _swapQuoter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      _swapQuoter: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     setTokenConfig(
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     setTokenFee(
-      token: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
 
     swap(
-      to: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      token: string,
+      amount: BigNumberish,
       query: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<BigNumber>
 
     swapQuoter(overrides?: CallOverrides): Promise<BigNumber>
 
-    symbolToToken(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>
+    symbolToToken(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
 
     synapseBridge(overrides?: CallOverrides): Promise<BigNumber>
 
-    tokenToSymbol(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>
+    tokenToSymbol(arg0: string, overrides?: CallOverrides): Promise<BigNumber>
 
     transferOwnership(
-      newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      newOwner: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<BigNumber>
   }
 
   populateTransaction: {
     adapterSwap(
-      to: PromiseOrValue<string>,
-      tokenIn: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
-      tokenOut: PromiseOrValue<string>,
-      rawParams: PromiseOrValue<BytesLike>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      to: string,
+      tokenIn: string,
+      amountIn: BigNumberish,
+      tokenOut: string,
+      rawParams: BytesLike,
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     addToken(
-      symbol: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      symbol: string,
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     addTokens(
       tokens: LocalBridgeConfig.BridgeTokenConfigStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     allPools(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     bridge(
-      to: PromiseOrValue<string>,
-      chainId: PromiseOrValue<BigNumberish>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      chainId: BigNumberish,
+      token: string,
+      amount: BigNumberish,
       originQuery: SwapQueryStruct,
       destQuery: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     bridgeTokens(overrides?: CallOverrides): Promise<PopulatedTransaction>
@@ -1383,153 +1318,155 @@ export interface SynapseRouter extends BaseContract {
     bridgeTokensAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     calculateAddLiquidity(
-      pool: PromiseOrValue<string>,
-      amounts: PromiseOrValue<BigNumberish>[],
+      pool: string,
+      amounts: BigNumberish[],
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     calculateBridgeFee(
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      token: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     calculateRemoveLiquidity(
-      pool: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      pool: string,
+      amount: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     calculateSwap(
-      pool: PromiseOrValue<string>,
-      tokenIndexFrom: PromiseOrValue<BigNumberish>,
-      tokenIndexTo: PromiseOrValue<BigNumberish>,
-      dx: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenIndexFrom: BigNumberish,
+      tokenIndexTo: BigNumberish,
+      dx: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     calculateWithdrawOneToken(
-      pool: PromiseOrValue<string>,
-      tokenAmount: PromiseOrValue<BigNumberish>,
-      tokenIndex: PromiseOrValue<BigNumberish>,
+      pool: string,
+      tokenAmount: BigNumberish,
+      tokenIndex: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     config(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
-    fee(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>
+    fee(arg0: string, overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     getAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenOut: PromiseOrValue<string>,
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenOut: string,
+      amountIn: BigNumberish,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     getConnectedBridgeTokens(
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     getDestinationAmountOut(
       requests: DestRequestStruct[],
-      tokenOut: PromiseOrValue<string>,
+      tokenOut: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     getOriginAmountOut(
-      tokenIn: PromiseOrValue<string>,
-      tokenSymbols: PromiseOrValue<string>[],
-      amountIn: PromiseOrValue<BigNumberish>,
+      tokenIn: string,
+      tokenSymbols: string[],
+      amountIn: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    multicallView(
+      data: BytesLike[],
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     owner(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     poolInfo(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     poolTokens(
-      pool: PromiseOrValue<string>,
+      pool: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     poolsAmount(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     removeToken(
-      token: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     removeTokens(
-      tokens: PromiseOrValue<string>[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      tokens: string[],
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     renounceOwnership(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     setAllowance(
-      token: PromiseOrValue<string>,
-      spender: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      spender: string,
+      amount: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     setSwapQuoter(
-      _swapQuoter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      _swapQuoter: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     setTokenConfig(
-      token: PromiseOrValue<string>,
-      tokenType: PromiseOrValue<BigNumberish>,
-      bridgeToken: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      tokenType: BigNumberish,
+      bridgeToken: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     setTokenFee(
-      token: PromiseOrValue<string>,
-      bridgeFee: PromiseOrValue<BigNumberish>,
-      minFee: PromiseOrValue<BigNumberish>,
-      maxFee: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      token: string,
+      bridgeFee: BigNumberish,
+      minFee: BigNumberish,
+      maxFee: BigNumberish,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     swap(
-      to: PromiseOrValue<string>,
-      token: PromiseOrValue<string>,
-      amount: PromiseOrValue<BigNumberish>,
+      to: string,
+      token: string,
+      amount: BigNumberish,
       query: SwapQueryStruct,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+      overrides?: PayableOverrides & { from?: string }
     ): Promise<PopulatedTransaction>
 
     swapQuoter(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     symbolToToken(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     synapseBridge(overrides?: CallOverrides): Promise<PopulatedTransaction>
 
     tokenToSymbol(
-      arg0: PromiseOrValue<string>,
+      arg0: string,
       overrides?: CallOverrides
     ): Promise<PopulatedTransaction>
 
     transferOwnership(
-      newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
+      newOwner: string,
+      overrides?: Overrides & { from?: string }
     ): Promise<PopulatedTransaction>
   }
 }
diff --git a/packages/sdk-router/src/typechain/common.ts b/packages/sdk-router/src/typechain/common.ts
index 4c90b08bb4..bce91ad87e 100644
--- a/packages/sdk-router/src/typechain/common.ts
+++ b/packages/sdk-router/src/typechain/common.ts
@@ -1,46 +1,44 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import type { Listener } from "@ethersproject/providers";
-import type { Event, EventFilter } from "ethers";
+import type { Listener } from '@ethersproject/providers'
+import type { Event, EventFilter } from 'ethers'
 
 export interface TypedEvent<
   TArgsArray extends Array<any> = any,
   TArgsObject = any
 > extends Event {
-  args: TArgsArray & TArgsObject;
+  args: TArgsArray & TArgsObject
 }
 
 export interface TypedEventFilter<_TEvent extends TypedEvent>
   extends EventFilter {}
 
 export interface TypedListener<TEvent extends TypedEvent> {
-  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void;
+  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void
 }
 
-type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never;
+type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never
 
 export interface OnEvent<TRes> {
   <TEvent extends TypedEvent>(
     eventFilter: TypedEventFilter<TEvent>,
     listener: TypedListener<TEvent>
-  ): TRes;
-  (eventName: string, listener: Listener): TRes;
+  ): TRes
+  (eventName: string, listener: Listener): TRes
 }
 
 export type MinEthersFactory<C, ARGS> = {
-  deploy(...a: ARGS[]): Promise<C>;
-};
+  deploy(...a: ARGS[]): Promise<C>
+}
 
 export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
   infer C,
   any
 >
   ? C
-  : never;
+  : never
 
 export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
-  ? Parameters<F["deploy"]>
-  : never;
-
-export type PromiseOrValue<T> = T | Promise<T>;
+  ? Parameters<F['deploy']>
+  : never