@myx-trade/sdk 0.1.217 → 0.1.218

package/dist/index.js

@@ -1807,7 +1807,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.217",
+  version: "0.1.218",
   private: false,
   publishConfig: {
     access: "public"
@@ -21732,22 +21732,11 @@ var import_ethers27 = require("ethers");
 var import_dayjs4 = __toESM(require("dayjs"));
 
 // src/utils/index.ts
-function getChainDomainConfig(chainId, address) {
-  return CHAIN_DOMAIN?.[chainId]?.[address];
-}
-var CHAIN_DOMAIN = {
-  [421614 /* ARB_TESTNET */]: {
-    [getContractAddressByChainId(421614 /* ARB_TESTNET */).USDC]: {
-      name: "USDC",
-      version: "2",
-      chainId: 421614 /* ARB_TESTNET */.toString(),
-      verifyingContract: getContractAddressByChainId(421614 /* ARB_TESTNET */).USDC
-    }
-  }
-};
 var getEIP712Domain = async (contract) => {
   try {
     const eip712Domain = await contract.eip712Domain();
+    console.log("eip712Domain-->", eip712Domain.name);
+    console.log("eip712Domain.version-->", eip712Domain.version);
     return {
       name: eip712Domain.name,
       version: eip712Domain.version,
@@ -21759,27 +21748,6 @@ var getEIP712Domain = async (contract) => {
     throw new Error(`Error fetching EIP712 domain: ${error}`);
   }
 };
-function wait(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function waitRandom(min, max) {
-  return wait(min + Math.round(Math.random() * Math.max(0, max - min)));
-}
-var CanceledError = class extends Error {
-  constructor() {
-    super();
-    this.name = "CanceledError";
-    this.message = "Retryable was canceled";
-    this.name = "CanceledError";
-  }
-};
-var RetryableError = class extends Error {
-  constructor() {
-    super();
-    this.name = "RetryableError";
-    this.name = "RetryableError";
-  }
-};
 var TimeoutError = class extends Error {
   constructor() {
     super();
@@ -21788,47 +21756,6 @@ var TimeoutError = class extends Error {
     this.name = "TimeoutError";
   }
 };
-function retry(fn, { n, minWait, maxWait }) {
-  let completed = false;
-  let rejectCancelled;
-  const promise = new Promise(async (resolve, reject) => {
-    rejectCancelled = reject;
-    while (true) {
-      let result;
-      try {
-        result = await fn();
-        if (!completed) {
-          resolve(result);
-          completed = true;
-        }
-        break;
-      } catch (error) {
-        if (completed) {
-          break;
-        }
-        if (n <= 0 || !(error instanceof RetryableError)) {
-          if (error instanceof RetryableError) {
-            reject(new TimeoutError());
-          } else {
-            reject(error);
-          }
-          completed = true;
-          break;
-        }
-        n--;
-      }
-      await waitRandom(minWait, maxWait);
-    }
-  });
-  return {
-    promise,
-    cancel: () => {
-      if (completed) return;
-      completed = true;
-      rejectCancelled(new CanceledError());
-    }
-  };
-}
 
 // src/manager/seamless/index.ts
 var import_bytes = require("@ethersproject/bytes");
@@ -21877,9 +21804,8 @@ var charFill = (ping) => {
   return ping + paddedString;
 };
 var getIvMapString = () => import_crypto_js.default.enc.Utf8.parse(seamlessNonceString);
-async function signPermit(provider, contract, owner, spender, value, nonce, deadline, chainId) {
-  const chainDomainConfig = getChainDomainConfig(chainId, contract.target);
-  const domain = chainDomainConfig ?? await getEIP712Domain(contract);
+async function signPermit(provider, contract, owner, spender, value, nonce, deadline) {
+  const domain = await getEIP712Domain(contract);
   const types = {
     Permit: [
       { name: "owner", type: "address" },
@@ -21938,8 +21864,7 @@ var Seamless = class {
         brokerAddress,
         import_ethers27.ethers.MaxUint256.toString(),
         nonces.toString(),
-        deadline.toString(),
-        chainId
+        deadline.toString()
       );
       const forwarderSignPermit = await signPermit(
         config.signer,
@@ -21949,8 +21874,7 @@ var Seamless = class {
         forwarderAddress,
         import_ethers27.ethers.MaxUint256.toString(),
         (nonces + BigInt(1)).toString(),
-        deadline.toString(),
-        chainId
+        deadline.toString()
       );
       const brokerSeamlessUSDPermitParams = {
         token: erc20Contract.target,
@@ -21973,7 +21897,7 @@ var Seamless = class {
         r: forwarderSignPermit.r,
         s: forwarderSignPermit.s
       };
-      this.logger.info("forwarderPermitParams-->", forwarderPermitParams);
+      this.logger.info("forwarderPermitParams brokerSeamlessUSDPermitParams-->", brokerSeamlessUSDPermitParams, forwarderPermitParams);
       return [brokerSeamlessUSDPermitParams, forwarderPermitParams];
     } catch (error) {
       this.logger.error("error-->", error);
@@ -21997,6 +21921,7 @@ var Seamless = class {
       chainId: forwarderJsonRpcContractDomain.chainId,
       verifyingContract: forwarderJsonRpcContractDomain.verifyingContract
     };
+    this.logger.info("domain-->", domain);
     const walletProvider = provider ?? await getSignerProvider(chainId);
     const signature = await walletProvider.signTypedData(domain, contractTypes, {
       from,
@@ -22040,7 +21965,6 @@ var Seamless = class {
     }
     const forwarderContract = await getForwarderContract(chainId, 1 /* Signer */);
     const nonce = await forwarderContract.nonces(masterAddress);
-    this.logger.info("permitParams-->", permitParams);
     const functionHash = forwarderContract.interface.encodeFunctionData("permitAndApproveForwarder", [
       seamlessAddress,
       approve2,
@@ -22057,32 +21981,17 @@ var Seamless = class {
       deadline
     }, chainId);
     if (!txRs.data?.txHash) {
-      const retryOptions = { n: 10, minWait: 250, maxWait: 1e3 };
-      const { promise } = retry(async () => {
+      try {
         const getRs = await this.api.fetchForwarderGetApi({
           requestId: txRs.data?.requestId
         });
-        if (getRs.data?.status === 9 /* EXECUTED */) {
-          if (getRs.data?.txHash) {
-            txRs.data.txHash = getRs.data.txHash;
-            return {
-              code: 0,
-              data: {
-                seamlessAccount: seamlessAddress,
-                authorized: approve2
-              }
-            };
-          } else {
-            throw new MyxSDKError("OPERATION_FAILED" /* OperationFailed */, "Operation failed, please try again later");
+        return {
+          code: 0,
+          data: {
+            seamlessAccount: seamlessAddress,
+            authorized: approve2
           }
-        } else if ([2 /* BROADCAST_FAILED */, 3 /* TIMEOUT_CANCEL */].includes(getRs?.data?.status)) {
-          throw new MyxSDKError("OPERATION_FAILED" /* OperationFailed */, "Operation failed, please try again later");
-        }
-        throw new RetryableError();
-      }, retryOptions);
-      try {
-        const rs = await promise;
-        return rs;
+        };
       } catch (err) {
         if (err instanceof TimeoutError) {
           throw new MyxSDKError("TIMEOUT" /* Timeout */, "Your request timed out, please try again");

package/dist/index.mjs

@@ -1731,7 +1731,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.217",
+  version: "0.1.218",
   private: false,
   publishConfig: {
     access: "public"
@@ -21656,22 +21656,11 @@ import { toUtf8Bytes, keccak256, hexlify, ethers as ethers9, isHexString, getByt
 import dayjs4 from "dayjs";
 
 // src/utils/index.ts
-function getChainDomainConfig(chainId, address) {
-  return CHAIN_DOMAIN?.[chainId]?.[address];
-}
-var CHAIN_DOMAIN = {
-  [421614 /* ARB_TESTNET */]: {
-    [getContractAddressByChainId(421614 /* ARB_TESTNET */).USDC]: {
-      name: "USDC",
-      version: "2",
-      chainId: 421614 /* ARB_TESTNET */.toString(),
-      verifyingContract: getContractAddressByChainId(421614 /* ARB_TESTNET */).USDC
-    }
-  }
-};
 var getEIP712Domain = async (contract) => {
   try {
     const eip712Domain = await contract.eip712Domain();
+    console.log("eip712Domain-->", eip712Domain.name);
+    console.log("eip712Domain.version-->", eip712Domain.version);
     return {
       name: eip712Domain.name,
       version: eip712Domain.version,
@@ -21683,27 +21672,6 @@ var getEIP712Domain = async (contract) => {
     throw new Error(`Error fetching EIP712 domain: ${error}`);
   }
 };
-function wait(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function waitRandom(min, max) {
-  return wait(min + Math.round(Math.random() * Math.max(0, max - min)));
-}
-var CanceledError = class extends Error {
-  constructor() {
-    super();
-    this.name = "CanceledError";
-    this.message = "Retryable was canceled";
-    this.name = "CanceledError";
-  }
-};
-var RetryableError = class extends Error {
-  constructor() {
-    super();
-    this.name = "RetryableError";
-    this.name = "RetryableError";
-  }
-};
 var TimeoutError = class extends Error {
   constructor() {
     super();
@@ -21712,47 +21680,6 @@ var TimeoutError = class extends Error {
     this.name = "TimeoutError";
   }
 };
-function retry(fn, { n, minWait, maxWait }) {
-  let completed = false;
-  let rejectCancelled;
-  const promise = new Promise(async (resolve, reject) => {
-    rejectCancelled = reject;
-    while (true) {
-      let result;
-      try {
-        result = await fn();
-        if (!completed) {
-          resolve(result);
-          completed = true;
-        }
-        break;
-      } catch (error) {
-        if (completed) {
-          break;
-        }
-        if (n <= 0 || !(error instanceof RetryableError)) {
-          if (error instanceof RetryableError) {
-            reject(new TimeoutError());
-          } else {
-            reject(error);
-          }
-          completed = true;
-          break;
-        }
-        n--;
-      }
-      await waitRandom(minWait, maxWait);
-    }
-  });
-  return {
-    promise,
-    cancel: () => {
-      if (completed) return;
-      completed = true;
-      rejectCancelled(new CanceledError());
-    }
-  };
-}
 
 // src/manager/seamless/index.ts
 import { splitSignature } from "@ethersproject/bytes";
@@ -21801,9 +21728,8 @@ var charFill = (ping) => {
   return ping + paddedString;
 };
 var getIvMapString = () => CryptoJS.enc.Utf8.parse(seamlessNonceString);
-async function signPermit(provider, contract, owner, spender, value, nonce, deadline, chainId) {
-  const chainDomainConfig = getChainDomainConfig(chainId, contract.target);
-  const domain = chainDomainConfig ?? await getEIP712Domain(contract);
+async function signPermit(provider, contract, owner, spender, value, nonce, deadline) {
+  const domain = await getEIP712Domain(contract);
   const types = {
     Permit: [
       { name: "owner", type: "address" },
@@ -21862,8 +21788,7 @@ var Seamless = class {
         brokerAddress,
         ethers9.MaxUint256.toString(),
         nonces.toString(),
-        deadline.toString(),
-        chainId
+        deadline.toString()
       );
       const forwarderSignPermit = await signPermit(
         config.signer,
@@ -21873,8 +21798,7 @@ var Seamless = class {
         forwarderAddress,
         ethers9.MaxUint256.toString(),
         (nonces + BigInt(1)).toString(),
-        deadline.toString(),
-        chainId
+        deadline.toString()
       );
       const brokerSeamlessUSDPermitParams = {
         token: erc20Contract.target,
@@ -21897,7 +21821,7 @@ var Seamless = class {
         r: forwarderSignPermit.r,
         s: forwarderSignPermit.s
       };
-      this.logger.info("forwarderPermitParams-->", forwarderPermitParams);
+      this.logger.info("forwarderPermitParams brokerSeamlessUSDPermitParams-->", brokerSeamlessUSDPermitParams, forwarderPermitParams);
       return [brokerSeamlessUSDPermitParams, forwarderPermitParams];
     } catch (error) {
       this.logger.error("error-->", error);
@@ -21921,6 +21845,7 @@ var Seamless = class {
       chainId: forwarderJsonRpcContractDomain.chainId,
       verifyingContract: forwarderJsonRpcContractDomain.verifyingContract
     };
+    this.logger.info("domain-->", domain);
     const walletProvider = provider ?? await getSignerProvider(chainId);
     const signature = await walletProvider.signTypedData(domain, contractTypes, {
       from,
@@ -21964,7 +21889,6 @@ var Seamless = class {
     }
     const forwarderContract = await getForwarderContract(chainId, 1 /* Signer */);
     const nonce = await forwarderContract.nonces(masterAddress);
-    this.logger.info("permitParams-->", permitParams);
     const functionHash = forwarderContract.interface.encodeFunctionData("permitAndApproveForwarder", [
       seamlessAddress,
       approve2,
@@ -21981,32 +21905,17 @@ var Seamless = class {
       deadline
     }, chainId);
     if (!txRs.data?.txHash) {
-      const retryOptions = { n: 10, minWait: 250, maxWait: 1e3 };
-      const { promise } = retry(async () => {
+      try {
         const getRs = await this.api.fetchForwarderGetApi({
           requestId: txRs.data?.requestId
         });
-        if (getRs.data?.status === 9 /* EXECUTED */) {
-          if (getRs.data?.txHash) {
-            txRs.data.txHash = getRs.data.txHash;
-            return {
-              code: 0,
-              data: {
-                seamlessAccount: seamlessAddress,
-                authorized: approve2
-              }
-            };
-          } else {
-            throw new MyxSDKError("OPERATION_FAILED" /* OperationFailed */, "Operation failed, please try again later");
+        return {
+          code: 0,
+          data: {
+            seamlessAccount: seamlessAddress,
+            authorized: approve2
           }
-        } else if ([2 /* BROADCAST_FAILED */, 3 /* TIMEOUT_CANCEL */].includes(getRs?.data?.status)) {
-          throw new MyxSDKError("OPERATION_FAILED" /* OperationFailed */, "Operation failed, please try again later");
-        }
-        throw new RetryableError();
-      }, retryOptions);
-      try {
-        const rs = await promise;
-        return rs;
+        };
       } catch (err) {
         if (err instanceof TimeoutError) {
           throw new MyxSDKError("TIMEOUT" /* Timeout */, "Your request timed out, please try again");

package/package.json

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