@myx-trade/sdk 0.1.246 → 0.1.247

package/dist/index.js

@@ -1851,7 +1851,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.246",
+  version: "0.1.247",
   private: false,
   publishConfig: {
     access: "public"
@@ -9326,6 +9326,24 @@ var Forwarder_default = [
     name: "InvalidInitialization",
     inputs: []
   },
+  {
+    type: "error",
+    name: "MismatchExecuteFee",
+    inputs: [
+      {
+        type: "uint256",
+        name: "balanceBefore"
+      },
+      {
+        type: "uint256",
+        name: "balanceAfter"
+      },
+      {
+        type: "uint256",
+        name: "expected"
+      }
+    ]
+  },
   {
     type: "error",
     name: "MismatchedSender",
@@ -9402,13 +9420,8 @@ var Forwarder_default = [
   },
   {
     type: "error",
-    name: "SafeERC20FailedOperation",
-    inputs: [
-      {
-        type: "address",
-        name: "token"
-      }
-    ]
+    name: "RemoveRelayerFailed",
+    inputs: []
   },
   {
     type: "error",
@@ -9437,6 +9450,28 @@ var Forwarder_default = [
       }
     ]
   },
+  {
+    type: "event",
+    anonymous: false,
+    name: "ChargeForwardFee",
+    inputs: [
+      {
+        type: "address",
+        name: "account",
+        indexed: false
+      },
+      {
+        type: "address",
+        name: "feeToken",
+        indexed: false
+      },
+      {
+        type: "uint256",
+        name: "relayFee",
+        indexed: false
+      }
+    ]
+  },
   {
     type: "event",
     anonymous: false,
@@ -9543,7 +9578,7 @@ var Forwarder_default = [
   {
     type: "event",
     anonymous: false,
-    name: "UpdateMaxRelayFee",
+    name: "UpdateAcquiescentFeeToken",
     inputs: [
       {
         type: "address",
@@ -9551,13 +9586,13 @@ var Forwarder_default = [
         indexed: false
       },
       {
-        type: "uint256",
-        name: "oldMaxRelayFee",
+        type: "address",
+        name: "oldRelayGas",
         indexed: false
       },
       {
-        type: "uint256",
-        name: "newMaxRelayFee",
+        type: "address",
+        name: "newRelayGas",
         indexed: false
       }
     ]
@@ -9565,7 +9600,7 @@ var Forwarder_default = [
   {
     type: "event",
     anonymous: false,
-    name: "UpdateRelayInfo",
+    name: "UpdateEquilibriumGas",
     inputs: [
       {
         type: "address",
@@ -9574,22 +9609,34 @@ var Forwarder_default = [
       },
       {
         type: "uint256",
-        name: "oldRelayFee",
+        name: "oldRelayGas",
         indexed: false
       },
       {
         type: "uint256",
-        name: "newRelayFee",
+        name: "newRelayGas",
+        indexed: false
+      }
+    ]
+  },
+  {
+    type: "event",
+    anonymous: false,
+    name: "UpdateMaxRelayFee",
+    inputs: [
+      {
+        type: "address",
+        name: "sender",
         indexed: false
       },
       {
         type: "uint256",
-        name: "oldRelayGas",
+        name: "oldMaxRelayFee",
         indexed: false
       },
       {
         type: "uint256",
-        name: "newRelayGas",
+        name: "newMaxRelayFee",
         indexed: false
       }
     ]
@@ -9652,6 +9699,10 @@ var Forwarder_default = [
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "address",
+        name: "forwardFeeToken"
+      },
       {
         type: "tuple[]",
         name: "bundleParams",
@@ -9727,6 +9778,19 @@ var Forwarder_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "equilibriumGas",
+    constant: true,
+    stateMutability: "view",
+    payable: false,
+    inputs: [],
+    outputs: [
+      {
+        type: "uint256"
+      }
+    ]
+  },
   {
     type: "function",
     name: "execute",
@@ -9767,6 +9831,10 @@ var Forwarder_default = [
             name: "signature"
           }
         ]
+      },
+      {
+        type: "address",
+        name: "masterAccount"
       }
     ],
     outputs: []
@@ -9812,6 +9880,10 @@ var Forwarder_default = [
           }
         ]
       },
+      {
+        type: "address",
+        name: "masterAccount"
+      },
       {
         type: "address",
         name: "refundReceiver"
@@ -9826,6 +9898,10 @@ var Forwarder_default = [
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "address",
+        name: "forwardFeeToken"
+      },
       {
         type: "tuple",
         name: "params",
@@ -9865,16 +9941,11 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "feeToken",
-    constant: true,
-    stateMutability: "view",
+    name: "exitForwardMode",
+    constant: false,
     payable: false,
     inputs: [],
-    outputs: [
-      {
-        type: "address"
-      }
-    ]
+    outputs: []
   },
   {
     type: "function",
@@ -9922,7 +9993,7 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "getFeeToken",
+    name: "getDesignatedToken",
     constant: true,
     stateMutability: "view",
     payable: false,
@@ -9935,71 +10006,58 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "getImplementation",
+    name: "getEquilibriumGas",
     constant: true,
     stateMutability: "view",
     payable: false,
     inputs: [],
     outputs: [
       {
-        type: "address"
+        type: "uint256"
       }
     ]
   },
   {
     type: "function",
-    name: "getMaxRelayFee",
+    name: "getImplementation",
     constant: true,
     stateMutability: "view",
     payable: false,
     inputs: [],
     outputs: [
       {
-        type: "uint256"
+        type: "address"
       }
     ]
   },
   {
     type: "function",
-    name: "getRelayFee",
+    name: "getUserRelayers",
     constant: true,
     stateMutability: "view",
     payable: false,
-    inputs: [],
-    outputs: [
+    inputs: [
       {
-        type: "uint256"
+        type: "address",
+        name: "account"
       }
-    ]
-  },
-  {
-    type: "function",
-    name: "getRelayGas",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
+    ],
     outputs: [
       {
-        type: "uint256"
+        type: "address[]"
       }
     ]
   },
   {
     type: "function",
-    name: "getUserRelayers",
+    name: "inForwardMode",
     constant: true,
     stateMutability: "view",
     payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "account"
-      }
-    ],
+    inputs: [],
     outputs: [
       {
-        type: "address[]"
+        type: "bool"
       }
     ]
   },
@@ -10013,35 +10071,23 @@ var Forwarder_default = [
         type: "address",
         name: "addressManager"
       },
-      {
-        type: "address",
-        name: "_feeToken"
-      },
-      {
-        type: "uint256",
-        name: "_relayFee"
-      },
-      {
-        type: "uint256",
-        name: "_relayGas"
-      },
       {
         type: "uint256",
-        name: "_maxRelayFee"
+        name: "_equilibriumGas"
       }
     ],
     outputs: []
   },
   {
     type: "function",
-    name: "isTrustedForwarder",
+    name: "isAllowedTargets",
     constant: true,
     stateMutability: "view",
     payable: false,
     inputs: [
       {
         type: "address",
-        name: "forwarder"
+        name: "contractAddr"
       }
     ],
     outputs: [
@@ -10052,18 +10098,14 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "isUserRelayerEnabled",
+    name: "isTrustedForwarder",
     constant: true,
     stateMutability: "view",
     payable: false,
     inputs: [
       {
         type: "address",
-        name: "account"
-      },
-      {
-        type: "address",
-        name: "relayer"
+        name: "forwarder"
       }
     ],
     outputs: [
@@ -10074,14 +10116,23 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "maxRelayFee",
+    name: "isUserRelayerEnabled",
     constant: true,
     stateMutability: "view",
     payable: false,
-    inputs: [],
+    inputs: [
+      {
+        type: "address",
+        name: "account"
+      },
+      {
+        type: "address",
+        name: "relayer"
+      }
+    ],
     outputs: [
       {
-        type: "uint256"
+        type: "bool"
       }
     ]
   },
@@ -10190,32 +10241,6 @@ var Forwarder_default = [
       }
     ]
   },
-  {
-    type: "function",
-    name: "relayFee",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "uint256"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "relayGas",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "uint256"
-      }
-    ]
-  },
   {
     type: "function",
     name: "removeAllowedTarget",
@@ -10244,30 +10269,13 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "updateMaxRelayFee",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "uint256",
-        name: "_maxRelayFee"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "updateRelayInfo",
+    name: "updateEquilibriumGas",
     constant: false,
     payable: false,
     inputs: [
       {
         type: "uint256",
-        name: "_relayFee"
-      },
-      {
-        type: "uint256",
-        name: "_relayGas"
+        name: "_equilibriumGas"
       }
     ],
     outputs: []
@@ -19151,9 +19159,14 @@ var Utils = class {
     }
   }
   async checkSeamlessGas(userAddress, chainId) {
-    const forwarderContract = await getForwarderContract(chainId);
-    const relayFee = await forwarderContract.getRelayFee();
     const provider = await getJSONProvider(chainId);
+    const marketManagerContract = new import_ethers25.ethers.Contract(
+      getContractAddressByChainId(chainId).MARKET_MANAGER,
+      MarketManager_default,
+      provider
+    );
+    const forwardFeeToken = executeAddressByChainId(chainId);
+    const relayFee = await marketManagerContract.getRelayFee(forwardFeeToken);
     const contractAddress = getContractAddressByChainId(chainId);
     const erc20Contract = new import_ethers25.ethers.Contract(
       contractAddress.ERC20,
@@ -20660,408 +20673,6 @@ var getEIP712Domain = async (contract) => {
 
 // src/manager/seamless/index.ts
 var import_bytes = require("@ethersproject/bytes");
-
-// src/abi/TradingRouter.json
-var TradingRouter_default = [
-  {
-    type: "error",
-    name: "AddressEmptyCode",
-    inputs: [
-      {
-        type: "address",
-        name: "target"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "DesignatedTokenMismatch",
-    inputs: [
-      {
-        type: "address",
-        name: "collectToken"
-      },
-      {
-        type: "address",
-        name: "designatedToken"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "ERC1967InvalidImplementation",
-    inputs: [
-      {
-        type: "address",
-        name: "implementation"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "ERC1967NonPayable",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "FailedCall",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "InvalidInitialization",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "NotActiveBroker",
-    inputs: [
-      {
-        type: "address",
-        name: "broker"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "NotAddressManager",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "NotDependencyManager",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "NotForwardAllowedTarget",
-    inputs: [
-      {
-        type: "address",
-        name: "from"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "NotInitializing",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "NotProxyAdmin",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "PermissionDenied",
-    inputs: [
-      {
-        type: "address",
-        name: "caller"
-      },
-      {
-        type: "address",
-        name: "target"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "ReentrancyGuardReentrantCall",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "SafeERC20FailedOperation",
-    inputs: [
-      {
-        type: "address",
-        name: "token"
-      }
-    ]
-  },
-  {
-    type: "error",
-    name: "UUPSUnauthorizedCallContext",
-    inputs: []
-  },
-  {
-    type: "error",
-    name: "UUPSUnsupportedProxiableUUID",
-    inputs: [
-      {
-        type: "bytes32",
-        name: "slot"
-      }
-    ]
-  },
-  {
-    type: "event",
-    anonymous: false,
-    name: "Initialized",
-    inputs: [
-      {
-        type: "uint64",
-        name: "version",
-        indexed: false
-      }
-    ]
-  },
-  {
-    type: "event",
-    anonymous: false,
-    name: "Upgraded",
-    inputs: [
-      {
-        type: "address",
-        name: "implementation",
-        indexed: true
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "UPGRADE_INTERFACE_VERSION",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "string"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "__ERC2771ContextUpgradeable_init",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "trustedForwarder_"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "collectExecutionFee",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "uint8",
-        name: "source"
-      },
-      {
-        type: "bytes",
-        name: "data"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "collectForwardFeeIfNecessary",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "uint8",
-        name: "source"
-      },
-      {
-        type: "bytes",
-        name: "data"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "depositFor",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "user"
-      },
-      {
-        type: "address",
-        name: "token"
-      },
-      {
-        type: "uint256",
-        name: "amount"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "depositToAccount",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "recipient"
-      },
-      {
-        type: "address",
-        name: "token"
-      },
-      {
-        type: "uint256",
-        name: "amount"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "getAddressManager",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "address"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "getDependencyAddress",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [
-      {
-        type: "bytes32",
-        name: "identifier"
-      }
-    ],
-    outputs: [
-      {
-        type: "address"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "getImplementation",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "address"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "initialize",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "addressManager"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "isTrustedForwarder",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "forwarder"
-      }
-    ],
-    outputs: [
-      {
-        type: "bool"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "proxiableUUID",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "bytes32"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "trustedForwarder",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [],
-    outputs: [
-      {
-        type: "address"
-      }
-    ]
-  },
-  {
-    type: "function",
-    name: "upgradeTo",
-    constant: false,
-    stateMutability: "payable",
-    payable: true,
-    inputs: [
-      {
-        type: "address",
-        name: "newImplementation"
-      },
-      {
-        type: "bytes",
-        name: "data"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "upgradeToAndCall",
-    constant: false,
-    stateMutability: "payable",
-    payable: true,
-    inputs: [
-      {
-        type: "address",
-        name: "newImplementation"
-      },
-      {
-        type: "bytes",
-        name: "data"
-      }
-    ],
-    outputs: []
-  }
-];
-
-// src/manager/seamless/index.ts
 var contractTypes = {
   ForwardRequest: [
     { name: "from", type: "address" },
@@ -21149,11 +20760,6 @@ var Seamless = class {
     }
     const contractAddress = getContractAddressByChainId(chainId);
     const masterAddress = await config.signer.getAddress();
-    const tradingRouterContract = new import_ethers27.ethers.Contract(
-      contractAddress.TRADING_ROUTER,
-      TradingRouter_default,
-      config.signer
-    );
     const erc20Contract = new import_ethers27.ethers.Contract(
       contractAddress.ERC20,
       ERC20Token_default,
@@ -21163,7 +20769,7 @@ var Seamless = class {
       const nonces = await erc20Contract.nonces(masterAddress);
       const tradingRouterSignPermit = await signPermit(
         config.signer,
-        tradingRouterContract,
+        erc20Contract,
         masterAddress,
         contractAddress.TRADING_ROUTER,
         import_ethers27.ethers.MaxUint256.toString(),
@@ -21182,6 +20788,7 @@ var Seamless = class {
       };
       return [tradingRouterPermitParams];
     } catch (error) {
+      console.log("error-->", error);
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
   }
@@ -21219,11 +20826,17 @@ var Seamless = class {
   async authorizeSeamlessAccount({ approve: approve2, seamlessAddress, chainId }) {
     const config = this.configManager.getConfig();
     const masterAddress = await config.signer?.getAddress() ?? "";
+    const provider = await getSignerProvider(chainId);
     if (approve2) {
       const balanceRes = await this.account.getWalletQuoteTokenBalance(chainId, masterAddress);
       const balance = balanceRes.data;
-      const forwarderContract2 = await getForwarderContract(chainId);
-      const pledgeFee = await forwarderContract2.getRelayFee();
+      const marketManagerContract = new import_ethers27.ethers.Contract(
+        getContractAddressByChainId(chainId).MARKET_MANAGER,
+        MarketManager_default,
+        provider
+      );
+      const forwardFeeToken = executeAddressByChainId(chainId);
+      const pledgeFee = await marketManagerContract.getForwardFeeByToken(forwardFeeToken);
       const gasFee = BigInt(pledgeFee) * BigInt(FORWARD_PLEDGE_FEE_RADIO);
       if (gasFee > 0 && gasFee > BigInt(balance)) {
         throw new MyxSDKError("INSUFFICIENT_BALANCE" /* InsufficientBalance */, "Insufficient balance");