@myx-trade/sdk 0.1.80 → 0.1.82

package/dist/index.d.mts

@@ -1184,6 +1184,11 @@ interface AccessTokenResponse {
 interface MyxClientConfig {
     chainId: number;
     signer?: Signer;
+    seamlessAccount?: {
+        masterAddress: string;
+        wallet: ethers$1.Wallet | null;
+        authorized: boolean;
+    };
     walletClient?: WalletClient;
     brokerAddress: string;
     isTestnet?: boolean;
@@ -1200,6 +1205,11 @@ declare class ConfigManager {
     constructor(config: MyxClientConfig);
     clear(): void;
     startSeamlessMode(open: boolean): void;
+    updateSeamlessWallet({ wallet, authorized, masterAddress }: {
+        wallet?: ethers$1.Wallet;
+        authorized?: boolean;
+        masterAddress?: string;
+    }): void;
     updateClientChainId(chainId: number, brokerAddress: string): void;
     auth(params: Pick<MyxClientConfig, "signer" | "getAccessToken">): void;
     private validateConfig;
@@ -1514,9 +1524,6 @@ declare class Seamless {
     private logger;
     private utils;
     private account;
-    seamlessWallet: ethers$1.Wallet | null;
-    private seamlessWalletAuthorized;
-    private seamlessWalletApikey;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils, account: Account);
     onCheckRelayer(account: string, relayer: string): Promise<boolean>;
     getUSDPermitParams(deadline: number): Promise<{

package/dist/index.d.ts

@@ -1184,6 +1184,11 @@ interface AccessTokenResponse {
 interface MyxClientConfig {
     chainId: number;
     signer?: Signer;
+    seamlessAccount?: {
+        masterAddress: string;
+        wallet: ethers$1.Wallet | null;
+        authorized: boolean;
+    };
     walletClient?: WalletClient;
     brokerAddress: string;
     isTestnet?: boolean;
@@ -1200,6 +1205,11 @@ declare class ConfigManager {
     constructor(config: MyxClientConfig);
     clear(): void;
     startSeamlessMode(open: boolean): void;
+    updateSeamlessWallet({ wallet, authorized, masterAddress }: {
+        wallet?: ethers$1.Wallet;
+        authorized?: boolean;
+        masterAddress?: string;
+    }): void;
     updateClientChainId(chainId: number, brokerAddress: string): void;
     auth(params: Pick<MyxClientConfig, "signer" | "getAccessToken">): void;
     private validateConfig;
@@ -1514,9 +1524,6 @@ declare class Seamless {
     private logger;
     private utils;
     private account;
-    seamlessWallet: ethers$1.Wallet | null;
-    private seamlessWalletAuthorized;
-    private seamlessWalletApikey;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils, account: Account);
     onCheckRelayer(account: string, relayer: string): Promise<boolean>;
     getUSDPermitParams(deadline: number): Promise<{

package/dist/index.js

@@ -1841,7 +1841,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.80",
+  version: "0.1.82",
   private: false,
   publishConfig: {
     access: "public"
@@ -13668,6 +13668,16 @@ var ConfigManager = class {
       seamlessMode: open
     };
   }
+  updateSeamlessWallet({ wallet, authorized, masterAddress }) {
+    this.config = {
+      ...this.config,
+      seamlessAccount: {
+        masterAddress: masterAddress ?? "",
+        wallet: wallet ?? null,
+        authorized: authorized ?? false
+      }
+    };
+  }
   updateClientChainId(chainId, brokerAddress) {
     this.config = {
       ...this.config,
@@ -14348,12 +14358,9 @@ var Order = class {
         useAccountBalance: false
       };
       this.logger.info("createIncreaseOrder position params--->", data);
-      if (config.seamlessMode) {
-        const seamlessWallet = this.seamless.seamlessWallet;
-        if (!seamlessWallet) {
-          throw new MyxSDKError("INVALID_SEAMLESS_WALLET" /* InvalidSeamlessWallet */, "Invalid seamless wallet");
-        }
-        console.log("seamlessWallet-->", seamlessWallet);
+      const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
+      const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
+      if (config.seamlessMode && authorized && seamlessWallet) {
         const isEnoughGas = await this.utils.checkSeamlessGas(params.address);
         if (!isEnoughGas) {
           throw new MyxSDKError("INSUFFICIENT_BALANCE" /* InsufficientBalance */, "Insufficient relay fee");
@@ -14362,7 +14369,7 @@ var Order = class {
         const forwarderContract = await getForwarderContract(params.chainId);
         const brokerContract2 = await getSeamlessBrokerContract(
           this.configManager.getConfig().brokerAddress,
-          this.seamless.seamlessWallet
+          seamlessWallet
         );
         let functionHash = "";
         if (!params.positionId) {
@@ -14383,7 +14390,7 @@ var Order = class {
         }
         const nonce = await forwarderContract.nonces(seamlessWallet.address);
         const forwardTxParams = {
-          from: this.seamless.seamlessWallet?.address ?? "",
+          from: seamlessWallet.address ?? "",
           to: this.configManager.getConfig().brokerAddress,
           value: "0",
           gas: "350000",
@@ -14392,7 +14399,7 @@ var Order = class {
           nonce: nonce.toString()
         };
         this.logger.info("createIncreaseOrder forward tx params --->", forwardTxParams);
-        const rs = await this.seamless.forwarderTx(forwardTxParams, this.seamless.seamlessWallet);
+        const rs = await this.seamless.forwarderTx(forwardTxParams, seamlessWallet);
         console.log("rs-->", rs);
         return {
           code: 0,
@@ -19473,14 +19480,16 @@ var Utils = class {
   async getUserTradingFeeRate(assetClass) {
     const config = this.configManager.getConfig();
     const brokerAddress = config.brokerAddress;
-    const brokerContract = new import_ethers25.ethers.Contract(
-      brokerAddress,
-      Broker_default,
-      config.signer
-    );
     try {
+      const provider = await getJSONProvider(config.chainId);
+      const brokerContract = new import_ethers25.ethers.Contract(
+        brokerAddress,
+        Broker_default,
+        provider
+      );
+      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
       const userFeeRate = await brokerContract.getUserFeeRate(
-        config.signer?.getAddress(),
+        targetAddress,
         assetClass
       );
       return {
@@ -19506,10 +19515,11 @@ var Utils = class {
     const orderManagerAddress = getContractAddressByChainId(
       config.chainId
     ).ORDER_MANAGER;
+    const provider = await getJSONProvider(config.chainId);
     const orderManagerContract = new import_ethers25.ethers.Contract(
       orderManagerAddress,
       OrderManager_default,
-      config.signer
+      provider
     );
     try {
       const networkFee = await orderManagerContract.getExecutionFee(
@@ -20358,13 +20368,15 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
+    const provider = await getJSONProvider(config.chainId);
     const accountContract = new import_ethers26.ethers.Contract(
       contractAddress.Account,
       Account_default,
-      config.signer
+      provider
     );
     try {
-      const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
+      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
+      const assets = await accountContract.getTradableAmount(targetAddress, poolId);
       const data = {
         profitIsReleased: assets[0],
         freeAmount: assets[1],
@@ -20634,14 +20646,14 @@ async function signPermit(provider, contract, owner, spender, value, nonce, dead
   return { v, r, s };
 }
 var Seamless = class {
+  // public seamlessWallet: ethers.Wallet | null
+  // private seamlessWalletAuthorized: boolean
+  // private seamlessWalletApikey: string
   constructor(configManager, logger, utils, account) {
     this.configManager = configManager;
     this.logger = logger;
     this.utils = utils;
     this.account = account;
-    this.seamlessWallet = null;
-    this.seamlessWalletAuthorized = false;
-    this.seamlessWalletApikey = "";
   }
   async onCheckRelayer(account, relayer) {
     const config = this.configManager.getConfig();
@@ -20816,9 +20828,12 @@ var Seamless = class {
     });
     const privateKey = decrypted.toString(import_crypto_js.default.enc.Utf8);
     const wallet = new import_ethers27.ethers.Wallet(privateKey);
-    this.seamlessWallet = wallet;
     const isAuthorized = await this.onCheckRelayer(masterAddress, wallet.address);
-    this.seamlessWalletAuthorized = isAuthorized;
+    this.configManager.updateSeamlessWallet({
+      masterAddress,
+      wallet,
+      authorized: isAuthorized
+    });
     return {
       code: 0,
       data: {
@@ -20838,8 +20853,7 @@ var Seamless = class {
     });
     const privateKey = decrypted.toString(import_crypto_js.default.enc.Utf8);
     const wallet = new import_ethers27.ethers.Wallet(privateKey);
-    this.logger.info("export verify seamless wallet-->", wallet.address, this.seamlessWallet);
-    if (wallet.address !== this.seamlessWallet?.address) {
+    if (wallet.address !== this.configManager.getConfig().seamlessAccount?.wallet?.address) {
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key");
     }
     return {
@@ -20869,9 +20883,11 @@ var Seamless = class {
       padding: import_crypto_js.default.pad.Pkcs7
     });
     const apiKey = encrypted.toString();
-    this.seamlessWallet = wallet;
-    this.seamlessWalletAuthorized = isAuthorized;
-    this.seamlessWalletApikey = apiKey;
+    this.configManager.updateSeamlessWallet({
+      masterAddress,
+      wallet,
+      authorized: isAuthorized
+    });
     return {
       code: 0,
       data: {
@@ -20911,9 +20927,11 @@ var Seamless = class {
       });
       const apiKey = encrypted.toString();
       let isAuthorized = await this.onCheckRelayer(account, wallet.address);
-      this.seamlessWallet = wallet;
-      this.seamlessWalletAuthorized = isAuthorized;
-      this.seamlessWalletApikey = apiKey;
+      this.configManager.updateSeamlessWallet({
+        masterAddress: account,
+        wallet,
+        authorized: isAuthorized
+      });
       const forwarderContract = await getForwarderContract(config.chainId);
       const erc20Address = getContractAddressByChainId(config.chainId).ERC20;
       await this.utils.approveAuthorization({

package/dist/index.mjs

@@ -1752,7 +1752,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.80",
+  version: "0.1.82",
   private: false,
   publishConfig: {
     access: "public"
@@ -13579,6 +13579,16 @@ var ConfigManager = class {
       seamlessMode: open
     };
   }
+  updateSeamlessWallet({ wallet, authorized, masterAddress }) {
+    this.config = {
+      ...this.config,
+      seamlessAccount: {
+        masterAddress: masterAddress ?? "",
+        wallet: wallet ?? null,
+        authorized: authorized ?? false
+      }
+    };
+  }
   updateClientChainId(chainId, brokerAddress) {
     this.config = {
       ...this.config,
@@ -14259,12 +14269,9 @@ var Order = class {
         useAccountBalance: false
       };
       this.logger.info("createIncreaseOrder position params--->", data);
-      if (config.seamlessMode) {
-        const seamlessWallet = this.seamless.seamlessWallet;
-        if (!seamlessWallet) {
-          throw new MyxSDKError("INVALID_SEAMLESS_WALLET" /* InvalidSeamlessWallet */, "Invalid seamless wallet");
-        }
-        console.log("seamlessWallet-->", seamlessWallet);
+      const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
+      const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
+      if (config.seamlessMode && authorized && seamlessWallet) {
         const isEnoughGas = await this.utils.checkSeamlessGas(params.address);
         if (!isEnoughGas) {
           throw new MyxSDKError("INSUFFICIENT_BALANCE" /* InsufficientBalance */, "Insufficient relay fee");
@@ -14273,7 +14280,7 @@ var Order = class {
         const forwarderContract = await getForwarderContract(params.chainId);
         const brokerContract2 = await getSeamlessBrokerContract(
           this.configManager.getConfig().brokerAddress,
-          this.seamless.seamlessWallet
+          seamlessWallet
         );
         let functionHash = "";
         if (!params.positionId) {
@@ -14294,7 +14301,7 @@ var Order = class {
         }
         const nonce = await forwarderContract.nonces(seamlessWallet.address);
         const forwardTxParams = {
-          from: this.seamless.seamlessWallet?.address ?? "",
+          from: seamlessWallet.address ?? "",
           to: this.configManager.getConfig().brokerAddress,
           value: "0",
           gas: "350000",
@@ -14303,7 +14310,7 @@ var Order = class {
           nonce: nonce.toString()
         };
         this.logger.info("createIncreaseOrder forward tx params --->", forwardTxParams);
-        const rs = await this.seamless.forwarderTx(forwardTxParams, this.seamless.seamlessWallet);
+        const rs = await this.seamless.forwarderTx(forwardTxParams, seamlessWallet);
         console.log("rs-->", rs);
         return {
           code: 0,
@@ -19384,14 +19391,16 @@ var Utils = class {
   async getUserTradingFeeRate(assetClass) {
     const config = this.configManager.getConfig();
     const brokerAddress = config.brokerAddress;
-    const brokerContract = new ethers7.Contract(
-      brokerAddress,
-      Broker_default,
-      config.signer
-    );
     try {
+      const provider = await getJSONProvider(config.chainId);
+      const brokerContract = new ethers7.Contract(
+        brokerAddress,
+        Broker_default,
+        provider
+      );
+      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
       const userFeeRate = await brokerContract.getUserFeeRate(
-        config.signer?.getAddress(),
+        targetAddress,
         assetClass
       );
       return {
@@ -19417,10 +19426,11 @@ var Utils = class {
     const orderManagerAddress = getContractAddressByChainId(
       config.chainId
     ).ORDER_MANAGER;
+    const provider = await getJSONProvider(config.chainId);
     const orderManagerContract = new ethers7.Contract(
       orderManagerAddress,
       OrderManager_default,
-      config.signer
+      provider
     );
     try {
       const networkFee = await orderManagerContract.getExecutionFee(
@@ -20269,13 +20279,15 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
+    const provider = await getJSONProvider(config.chainId);
     const accountContract = new ethers8.Contract(
       contractAddress.Account,
       Account_default,
-      config.signer
+      provider
     );
     try {
-      const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
+      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
+      const assets = await accountContract.getTradableAmount(targetAddress, poolId);
       const data = {
         profitIsReleased: assets[0],
         freeAmount: assets[1],
@@ -20545,14 +20557,14 @@ async function signPermit(provider, contract, owner, spender, value, nonce, dead
   return { v, r, s };
 }
 var Seamless = class {
+  // public seamlessWallet: ethers.Wallet | null
+  // private seamlessWalletAuthorized: boolean
+  // private seamlessWalletApikey: string
   constructor(configManager, logger, utils, account) {
     this.configManager = configManager;
     this.logger = logger;
     this.utils = utils;
     this.account = account;
-    this.seamlessWallet = null;
-    this.seamlessWalletAuthorized = false;
-    this.seamlessWalletApikey = "";
   }
   async onCheckRelayer(account, relayer) {
     const config = this.configManager.getConfig();
@@ -20727,9 +20739,12 @@ var Seamless = class {
     });
     const privateKey = decrypted.toString(CryptoJS.enc.Utf8);
     const wallet = new ethers9.Wallet(privateKey);
-    this.seamlessWallet = wallet;
     const isAuthorized = await this.onCheckRelayer(masterAddress, wallet.address);
-    this.seamlessWalletAuthorized = isAuthorized;
+    this.configManager.updateSeamlessWallet({
+      masterAddress,
+      wallet,
+      authorized: isAuthorized
+    });
     return {
       code: 0,
       data: {
@@ -20749,8 +20764,7 @@ var Seamless = class {
     });
     const privateKey = decrypted.toString(CryptoJS.enc.Utf8);
     const wallet = new ethers9.Wallet(privateKey);
-    this.logger.info("export verify seamless wallet-->", wallet.address, this.seamlessWallet);
-    if (wallet.address !== this.seamlessWallet?.address) {
+    if (wallet.address !== this.configManager.getConfig().seamlessAccount?.wallet?.address) {
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key");
     }
     return {
@@ -20780,9 +20794,11 @@ var Seamless = class {
       padding: CryptoJS.pad.Pkcs7
     });
     const apiKey = encrypted.toString();
-    this.seamlessWallet = wallet;
-    this.seamlessWalletAuthorized = isAuthorized;
-    this.seamlessWalletApikey = apiKey;
+    this.configManager.updateSeamlessWallet({
+      masterAddress,
+      wallet,
+      authorized: isAuthorized
+    });
     return {
       code: 0,
       data: {
@@ -20822,9 +20838,11 @@ var Seamless = class {
       });
       const apiKey = encrypted.toString();
       let isAuthorized = await this.onCheckRelayer(account, wallet.address);
-      this.seamlessWallet = wallet;
-      this.seamlessWalletAuthorized = isAuthorized;
-      this.seamlessWalletApikey = apiKey;
+      this.configManager.updateSeamlessWallet({
+        masterAddress: account,
+        wallet,
+        authorized: isAuthorized
+      });
       const forwarderContract = await getForwarderContract(config.chainId);
       const erc20Address = getContractAddressByChainId(config.chainId).ERC20;
       await this.utils.approveAuthorization({

package/package.json

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