@myx-trade/sdk 0.1.245 → 0.1.247

package/dist/index.mjs

@@ -1435,6 +1435,18 @@ var address_default = {
   [59141 /* LINEA_SEPOLIA */]: LINEA_SEPOLIA,
   [97 /* BSC_TESTNET */]: BSC_TEST_NET
 };
+var executeAddressByChainId = (chainId) => {
+  if (chainId === 421614 /* ARB_TESTNET */) {
+    return "0x7e248ec1721639413a280d9e82e2862cae2e6e28";
+  }
+  if (chainId === 59141 /* LINEA_SEPOLIA */) {
+    return "";
+  }
+  if (chainId === 97 /* BSC_TESTNET */) {
+    return "";
+  }
+  return "";
+};
 
 // src/web3/index.ts
 import {
@@ -1763,7 +1775,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.245",
+  version: "0.1.247",
   private: false,
   publishConfig: {
     access: "public"
@@ -9238,6 +9250,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",
@@ -9314,13 +9344,8 @@ var Forwarder_default = [
   },
   {
     type: "error",
-    name: "SafeERC20FailedOperation",
-    inputs: [
-      {
-        type: "address",
-        name: "token"
-      }
-    ]
+    name: "RemoveRelayerFailed",
+    inputs: []
   },
   {
     type: "error",
@@ -9349,6 +9374,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,
@@ -9455,7 +9502,7 @@ var Forwarder_default = [
   {
     type: "event",
     anonymous: false,
-    name: "UpdateMaxRelayFee",
+    name: "UpdateAcquiescentFeeToken",
     inputs: [
       {
         type: "address",
@@ -9463,13 +9510,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
       }
     ]
@@ -9477,7 +9524,7 @@ var Forwarder_default = [
   {
     type: "event",
     anonymous: false,
-    name: "UpdateRelayInfo",
+    name: "UpdateEquilibriumGas",
     inputs: [
       {
         type: "address",
@@ -9486,22 +9533,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
       }
     ]
@@ -9564,6 +9623,10 @@ var Forwarder_default = [
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "address",
+        name: "forwardFeeToken"
+      },
       {
         type: "tuple[]",
         name: "bundleParams",
@@ -9639,6 +9702,19 @@ var Forwarder_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "equilibriumGas",
+    constant: true,
+    stateMutability: "view",
+    payable: false,
+    inputs: [],
+    outputs: [
+      {
+        type: "uint256"
+      }
+    ]
+  },
   {
     type: "function",
     name: "execute",
@@ -9679,6 +9755,10 @@ var Forwarder_default = [
             name: "signature"
           }
         ]
+      },
+      {
+        type: "address",
+        name: "masterAccount"
       }
     ],
     outputs: []
@@ -9724,6 +9804,10 @@ var Forwarder_default = [
           }
         ]
       },
+      {
+        type: "address",
+        name: "masterAccount"
+      },
       {
         type: "address",
         name: "refundReceiver"
@@ -9738,6 +9822,10 @@ var Forwarder_default = [
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "address",
+        name: "forwardFeeToken"
+      },
       {
         type: "tuple",
         name: "params",
@@ -9777,16 +9865,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",
@@ -9834,7 +9917,7 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "getFeeToken",
+    name: "getDesignatedToken",
     constant: true,
     stateMutability: "view",
     payable: false,
@@ -9847,71 +9930,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"
       }
     ]
   },
@@ -9925,35 +9995,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: [
@@ -9964,18 +10022,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: [
@@ -9986,14 +10040,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"
       }
     ]
   },
@@ -10102,32 +10165,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",
@@ -10156,30 +10193,13 @@ var Forwarder_default = [
   },
   {
     type: "function",
-    name: "updateMaxRelayFee",
+    name: "updateEquilibriumGas",
     constant: false,
     payable: false,
     inputs: [
       {
         type: "uint256",
-        name: "_maxRelayFee"
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "updateRelayInfo",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "uint256",
-        name: "_relayFee"
-      },
-      {
-        type: "uint256",
-        name: "_relayGas"
+        name: "_equilibriumGas"
       }
     ],
     outputs: []
@@ -13077,10 +13097,10 @@ var Position = class {
       }
       const updateParams = {
         poolId,
+        oracleType: poolOracleType,
         referencePrice: ethers5.parseUnits(priceData?.price ?? "0", 30),
         oracleUpdateData: priceData?.vaa ?? "0",
-        publishTime: priceData.publishTime,
-        oracleType: poolOracleType
+        publishTime: priceData.publishTime
       };
       let needsApproval = false;
       if (Number(adjustAmount) > 0) {
@@ -19063,9 +19083,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 ethers7.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 ethers7.Contract(
       contractAddress.ERC20,
@@ -19936,29 +19961,6 @@ var Account = class {
   }
   async getAvailableMarginBalance({ poolId, chainId, address }) {
     try {
-      const poolListRes = await this.client.api.getPoolList();
-      if (poolListRes.code !== 9200) {
-        throw new MyxSDKError(
-          "REQUEST_FAILED" /* RequestFailed */,
-          "Failed to get pool list"
-        );
-      }
-      const poolList = poolListRes.data;
-      const pool = poolList?.find((pool2) => pool2.poolId === poolId);
-      const orderRes = await this.client.order.getOrders(address);
-      if (orderRes.code !== 0) {
-        throw new MyxSDKError(
-          "REQUEST_FAILED" /* RequestFailed */,
-          "Failed to get orders"
-        );
-      }
-      const orders = orderRes.data;
-      const openOrders = orders?.filter((order) => order.poolId === poolId);
-      const used = openOrders?.reduce((acc, order) => {
-        const prev = BigInt(ethers8.parseUnits(acc, pool?.quoteDecimals ?? 6));
-        const curr = BigInt(ethers8.parseUnits(order.collateralAmount ?? "0", pool?.quoteDecimals ?? 6)) + prev;
-        return curr.toString();
-      }, "0");
       const marginAccountBalanceRes = await this.getAccountInfo(chainId, address, poolId);
       if (marginAccountBalanceRes.code !== 0) {
         throw new MyxSDKError(
@@ -19967,15 +19969,10 @@ var Account = class {
         );
       }
       const marginAccountBalance = marginAccountBalanceRes.data;
-      const usedMargin = BigInt(used ?? "0");
       const quoteProfit = BigInt(marginAccountBalance.quoteProfit ?? 0);
       const freeAmount = BigInt(marginAccountBalance?.freeMargin ?? 0);
       const accountMargin = freeAmount + quoteProfit;
-      if (accountMargin < usedMargin) {
-        return BigInt(0);
-      }
-      const availableAccountMarginBalance = accountMargin - usedMargin;
-      return availableAccountMarginBalance;
+      return accountMargin;
     } catch (error) {
       throw new MyxSDKError(
         "REQUEST_FAILED" /* RequestFailed */,
@@ -20137,8 +20134,6 @@ var Account = class {
       };
     }
   }
-  async getCurrentEpoch() {
-  }
   async getAccountVipInfo(chainId, address) {
     const config = this.configManager.getConfig();
     const provider = await getJSONProvider(chainId);
@@ -20689,8 +20684,6 @@ var Seamless = class {
     }
     const contractAddress = getContractAddressByChainId(chainId);
     const masterAddress = await config.signer.getAddress();
-    const forwarderContract = await getForwarderContract(chainId);
-    const forwarderAddress = forwarderContract.target;
     const erc20Contract = new ethers9.Contract(
       contractAddress.ERC20,
       ERC20Token_default,
@@ -20698,49 +20691,28 @@ var Seamless = class {
     );
     try {
       const nonces = await erc20Contract.nonces(masterAddress);
-      const forwarderSignPermit = await signPermit(
+      const tradingRouterSignPermit = await signPermit(
         config.signer,
-        // 使用 signer 而不是 provider
         erc20Contract,
         masterAddress,
-        forwarderAddress,
+        contractAddress.TRADING_ROUTER,
         ethers9.MaxUint256.toString(),
         nonces.toString(),
         deadline.toString()
       );
-      const accountSignPermit = await signPermit(
-        config.signer,
-        // 使用 signer 而不是 provider
-        erc20Contract,
-        masterAddress,
-        contractAddress.Account,
-        ethers9.MaxUint256.toString(),
-        (nonces + BigInt(1)).toString(),
-        deadline.toString()
-      );
-      const forwarderPermitParams = {
-        token: erc20Contract.target,
+      const tradingRouterPermitParams = {
+        token: contractAddress.ERC20,
         owner: masterAddress,
-        spender: forwarderAddress,
-        value: ethers9.MaxUint256,
-        deadline,
-        v: forwarderSignPermit.v,
-        r: forwarderSignPermit.r,
-        s: forwarderSignPermit.s
+        spender: contractAddress.TRADING_ROUTER,
+        value: ethers9.MaxUint256.toString(),
+        deadline: deadline.toString(),
+        v: tradingRouterSignPermit.v,
+        r: tradingRouterSignPermit.r,
+        s: tradingRouterSignPermit.s
       };
-      const accountPermitParams = {
-        token: erc20Contract.target,
-        owner: masterAddress,
-        spender: contractAddress.Account,
-        value: ethers9.MaxUint256,
-        deadline,
-        v: accountSignPermit.v,
-        r: accountSignPermit.r,
-        s: accountSignPermit.s
-      };
-      return [forwarderPermitParams, accountPermitParams];
+      return [tradingRouterPermitParams];
     } catch (error) {
-      this.logger.error("error-->", error);
+      console.log("error-->", error);
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
   }
@@ -20771,17 +20743,24 @@ var Seamless = class {
       deadline,
       data
     });
-    const txRs = await this.api.forwarderTxApi({ from, to, value, gas, nonce, data, deadline, signature }, chainId);
+    const forwardFeeToken = executeAddressByChainId(chainId);
+    const txRs = await this.api.forwarderTxApi({ from, to, value, gas, nonce, data, deadline, signature, forwardFeeToken }, chainId);
     return txRs;
   }
   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 ethers9.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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myx-trade/sdk",
-  "version": "0.1.245",
+  "version": "0.1.247",
   "private": false,
   "publishConfig": {
     "access": "public"