@reyaxyz/common 0.336.0 → 0.337.0

package/dist/transactions/executeTransaction.js

@@ -181,7 +181,7 @@ function estimateGasExternalChains(signer, data, value, chainId, targetContract)
                 case 5:
                     decodedError = _a.sent();
                     reason = customReasonMapper(decodedError);
-                    console.error("Error simulating external transaction with value ".concat(value, ", account address ").concat(accountAddress, ", reason ").concat(decodedError === null || decodedError === void 0 ? void 0 : decodedError.name, " ").concat(decodedError, " ").concat(error_3));
+                    console.error("Error simulating external transaction with value ".concat(value, ", account address ").concat(accountAddress, ", reason ").concat(decodedError === null || decodedError === void 0 ? void 0 : decodedError.name, " ").concat(JSON.stringify(decodedError), " ").concat(error_3));
                     throw new Error(reason);
                 case 6:
                     if (Object.values(types_1.ReyaChainId).includes(chainId)) {

package/dist/transactions/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["transactions/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ethers,\n  JsonRpcProvider,\n  JsonRpcSigner,\n  Network,\n  Signer,\n} from 'ethers';\nimport { MoneyInOutChainId, ReyaChainId } from '../types';\nimport { ContractType, getAddress } from './contractAddresses';\nimport { abi } from './abis/Errors.json';\nimport { ErrorDecoder } from 'ethers-decode-error';\nimport type { DecodedError } from 'ethers-decode-error';\nimport { getGasBuffer } from './txHelpers';\nimport { getPublicRpcUrlsOrThrow } from '../utils';\nimport { Interface } from 'ethers';\n\nconst reyaChainIdRPCMapper: { [key: number]: string } = {\n  [ReyaChainId.reyaNetwork]:\n    'https://rpc.reya.network/263e76b89da84d478fd2b6e8783a1cfe',\n  [ReyaChainId.reyaCronos]:\n    'https://rpc.reya-cronos.gelato.digital/263e76b89da84d478fd2b6e8783a1cfe',\n};\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\nconst errorDecoder = ErrorDecoder.create([abi]);\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  return estimateGasGivenAddress(\n    accountAddress,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n}\n\n// TODO: deprecate this when /executeGelato is gone\nexport async function estimateGasGivenAddress(\n  accountAddress: string,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n\n  const tx = {\n    from: accountAddress, // @todo Update with relayer address\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  const gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const network = new Network('Reya', chainId);\n    const provider = new JsonRpcProvider(\n      reyaChainIdRPCMapper[chainId],\n      network,\n      {\n        staticNetwork: network,\n        pollingInterval: 50,\n      },\n    );\n    await provider.call(tx);\n  } catch (error) {\n    const decodedError = await errorDecoder.decode(error);\n    const reason = customReasonMapper(decodedError);\n    console.error(\n      `Error simulating transaction account address ${accountAddress} reason ${decodedError?.name} ${decodedError} ${error}`,\n    );\n    throw new Error(reason);\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('100000000');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function estimateGasFromTxAndChainId(\n  chainId: ReyaChainId | MoneyInOutChainId,\n  tx: ethers.TransactionRequest,\n): Promise<bigint> {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chainId);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const estimation = await provider.estimateGas(tx);\n      return addGasBuffer(estimation);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n}\n\nasync function estimateGasExternalChains(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    const decodedError = await errorDecoder.decode(error);\n    const reason = customReasonMapper(decodedError);\n    console.error(\n      `Error simulating external transaction with value ${value}, account address ${accountAddress}, reason ${decodedError?.name} ${decodedError} ${error}`,\n    );\n    throw new Error(reason);\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('100000000');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGasExternalChains(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\nconst customReasonMapper = ({ name, reason }: DecodedError): string => {\n  switch (name) {\n    case 'SignatureInvalid':\n      return `Invalid signature. Please refresh page and try again`;\n    case 'StalePriceDetected':\n      return `Price not updated, please try again a bit later`;\n    case 'SmallOrderSize':\n      return `Order size below minimum`;\n    case 'DustyOrderSize':\n      return `Order amount is not divisible by trade size spacing`;\n    case 'AccountBelowIM':\n      return `Account below required margin`;\n    default:\n      // This handles the non-custom errors\n      return reason ?? 'Error executing transaction';\n  }\n};\n\nfunction addGasBuffer(estimation: bigint): bigint {\n  return (estimation * BigInt(120)) / BigInt(100);\n}\n\nexport async function decodeErrorBytes(returnData: string): Promise<string> {\n  const INTERFACE = new Interface(abi);\n  const decodedError = INTERFACE.parseError(returnData);\n  console.log(decodedError);\n  return `${decodedError?.name}: ${decodedError?.args}` || 'Error not found';\n}\n"]}
+{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["transactions/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ethers,\n  JsonRpcProvider,\n  JsonRpcSigner,\n  Network,\n  Signer,\n} from 'ethers';\nimport { MoneyInOutChainId, ReyaChainId } from '../types';\nimport { ContractType, getAddress } from './contractAddresses';\nimport { abi } from './abis/Errors.json';\nimport { ErrorDecoder } from 'ethers-decode-error';\nimport type { DecodedError } from 'ethers-decode-error';\nimport { getGasBuffer } from './txHelpers';\nimport { getPublicRpcUrlsOrThrow } from '../utils';\nimport { Interface } from 'ethers';\n\nconst reyaChainIdRPCMapper: { [key: number]: string } = {\n  [ReyaChainId.reyaNetwork]:\n    'https://rpc.reya.network/263e76b89da84d478fd2b6e8783a1cfe',\n  [ReyaChainId.reyaCronos]:\n    'https://rpc.reya-cronos.gelato.digital/263e76b89da84d478fd2b6e8783a1cfe',\n};\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\nconst errorDecoder = ErrorDecoder.create([abi]);\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  return estimateGasGivenAddress(\n    accountAddress,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n}\n\n// TODO: deprecate this when /executeGelato is gone\nexport async function estimateGasGivenAddress(\n  accountAddress: string,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n\n  const tx = {\n    from: accountAddress, // @todo Update with relayer address\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  const gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const network = new Network('Reya', chainId);\n    const provider = new JsonRpcProvider(\n      reyaChainIdRPCMapper[chainId],\n      network,\n      {\n        staticNetwork: network,\n        pollingInterval: 50,\n      },\n    );\n    await provider.call(tx);\n  } catch (error) {\n    const decodedError = await errorDecoder.decode(error);\n    const reason = customReasonMapper(decodedError);\n    console.error(\n      `Error simulating transaction account address ${accountAddress} reason ${decodedError?.name} ${decodedError} ${error}`,\n    );\n    throw new Error(reason);\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('100000000');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function estimateGasFromTxAndChainId(\n  chainId: ReyaChainId | MoneyInOutChainId,\n  tx: ethers.TransactionRequest,\n): Promise<bigint> {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chainId);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const estimation = await provider.estimateGas(tx);\n      return addGasBuffer(estimation);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n}\n\nasync function estimateGasExternalChains(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    const decodedError = await errorDecoder.decode(error);\n    const reason = customReasonMapper(decodedError);\n    console.error(\n      `Error simulating external transaction with value ${value}, account address ${accountAddress}, reason ${decodedError?.name} ${JSON.stringify(\n        decodedError,\n      )} ${error}`,\n    );\n    throw new Error(reason);\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('100000000');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGasExternalChains(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\nconst customReasonMapper = ({ name, reason }: DecodedError): string => {\n  switch (name) {\n    case 'SignatureInvalid':\n      return `Invalid signature. Please refresh page and try again`;\n    case 'StalePriceDetected':\n      return `Price not updated, please try again a bit later`;\n    case 'SmallOrderSize':\n      return `Order size below minimum`;\n    case 'DustyOrderSize':\n      return `Order amount is not divisible by trade size spacing`;\n    case 'AccountBelowIM':\n      return `Account below required margin`;\n    default:\n      // This handles the non-custom errors\n      return reason ?? 'Error executing transaction';\n  }\n};\n\nfunction addGasBuffer(estimation: bigint): bigint {\n  return (estimation * BigInt(120)) / BigInt(100);\n}\n\nexport async function decodeErrorBytes(returnData: string): Promise<string> {\n  const INTERFACE = new Interface(abi);\n  const decodedError = INTERFACE.parseError(returnData);\n  console.log(decodedError);\n  return `${decodedError?.name}: ${decodedError?.args}` || 'Error not found';\n}\n"]}

package/dist/types/transactions/executeTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["transactions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,aAAa,EAEb,MAAM,EACP,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAc,MAAM,qBAAqB,CAAC;AAe/D,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CAUA;AAGD,wBAAsB,uBAAuB,CAC3C,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CA2CA;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,WAAW,GAAG,iBAAiB,EACxC,EAAE,EAAE,MAAM,CAAC,kBAAkB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAejB;AAoDD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,6CAkBtC;AAuBD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK1E"}
+{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["transactions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAEN,aAAa,EAEb,MAAM,EACP,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAc,MAAM,qBAAqB,CAAC;AAe/D,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CAUA;AAGD,wBAAsB,uBAAuB,CAC3C,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CA2CA;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,WAAW,GAAG,iBAAiB,EACxC,EAAE,EAAE,MAAM,CAAC,kBAAkB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAejB;AAsDD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,6CAkBtC;AAuBD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK1E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/common",
-  "version": "0.336.0",
+  "version": "0.337.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -44,5 +44,5 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "9214f3587f4a89038d86f6e9781e995276cef5f4"
+  "gitHead": "6758c837f027a7b0fab5970c8a7ab3654d71f386"
 }

package/src/transactions/executeTransaction.ts

@@ -167,7 +167,9 @@ async function estimateGasExternalChains(
     const decodedError = await errorDecoder.decode(error);
     const reason = customReasonMapper(decodedError);
     console.error(
-      `Error simulating external transaction with value ${value}, account address ${accountAddress}, reason ${decodedError?.name} ${decodedError} ${error}`,
+      `Error simulating external transaction with value ${value}, account address ${accountAddress}, reason ${decodedError?.name} ${JSON.stringify(
+        decodedError,
+      )} ${error}`,
     );
     throw new Error(reason);
   }