@reyaxyz/common 0.344.3 → 0.346.0

package/src/transactions/executeTransaction.ts

@@ -1,25 +1,10 @@
-import {
-  ethers,
-  JsonRpcProvider,
-  JsonRpcSigner,
-  Network,
-  Signer,
-} from 'ethers';
-import { MoneyInOutChainId, ReyaChainId } from '../types';
+import { JsonRpcSigner, Signer } from 'ethers';
+import { ReyaChainId } from '../types';
 import { ContractType, getAddress } from './contractAddresses';
 import { abi } from './abis/Errors.json';
 import { ErrorDecoder } from 'ethers-decode-error';
 import type { DecodedError } from 'ethers-decode-error';
 import { getGasBuffer } from './txHelpers';
-import { getPublicRpcUrlsOrThrow } from '../utils';
-import { Interface } from 'ethers';
-
-const reyaChainIdRPCMapper: { [key: number]: string } = {
-  [ReyaChainId.reyaNetwork]:
-    'https://rpc.reya.network/263e76b89da84d478fd2b6e8783a1cfe',
-  [ReyaChainId.reyaCronos]:
-    'https://rpc.reya-cronos.gelato.digital/263e76b89da84d478fd2b6e8783a1cfe',
-};
 
 export type Transaction = {
   from: string;
@@ -29,108 +14,6 @@ export type Transaction = {
 };
 const errorDecoder = ErrorDecoder.create([abi]);
 
-export async function estimateGas(
-  signer: Signer | JsonRpcSigner,
-  data: string,
-  value: string,
-  chainId: number,
-  targetContract: ContractType | string,
-): Promise<
-  Transaction & {
-    gasLimit: bigint;
-    maxPriorityFeePerGas?: bigint;
-    maxFeePerGas?: bigint;
-  }
-> {
-  const accountAddress = await signer.getAddress();
-
-  return estimateGasGivenAddress(
-    accountAddress,
-    data,
-    value,
-    chainId,
-    targetContract,
-  );
-}
-
-// TODO: deprecate this when /executeGelato is gone
-export async function estimateGasGivenAddress(
-  accountAddress: string,
-  data: string,
-  value: string,
-  chainId: number,
-  targetContract: ContractType | string,
-): Promise<
-  Transaction & {
-    gasLimit: bigint;
-    maxPriorityFeePerGas?: bigint;
-    maxFeePerGas?: bigint;
-  }
-> {
-  const contractAddress = Object.values(ContractType).includes(
-    targetContract as ContractType,
-  )
-    ? getAddress(chainId, targetContract as ContractType)
-    : targetContract;
-
-  const tx = {
-    from: accountAddress, // @todo Update with relayer address
-    to: contractAddress,
-    data,
-    ...(value && value !== '0' ? { value: value } : {}),
-  };
-
-  const gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate
-
-  try {
-    const network = new Network('Reya', chainId);
-    const provider = new JsonRpcProvider(
-      reyaChainIdRPCMapper[chainId],
-      network,
-      {
-        staticNetwork: network,
-        pollingInterval: 50,
-      },
-    );
-    await provider.call(tx);
-  } catch (error) {
-    const decodedError = await errorDecoder.decode(error);
-    const reason = customReasonMapper(decodedError);
-    console.error(
-      `Error simulating transaction account address ${accountAddress} reason ${decodedError?.name} ${decodedError} ${error}`,
-    );
-    throw new Error(reason);
-  }
-
-  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
-    const maxPriorityFeePerGas: bigint = BigInt('0');
-    const maxFeePerGas: bigint = BigInt('100000000');
-    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
-  }
-
-  return { ...tx, gasLimit };
-}
-
-export async function estimateGasFromTxAndChainId(
-  chainId: ReyaChainId | MoneyInOutChainId,
-  tx: ethers.TransactionRequest,
-): Promise<bigint> {
-  const rpcUrls = getPublicRpcUrlsOrThrow(chainId);
-  let lastError = null;
-
-  for (const url of rpcUrls) {
-    try {
-      const provider = new ethers.JsonRpcProvider(url);
-      const estimation = await provider.estimateGas(tx);
-      return addGasBuffer(estimation);
-    } catch (error) {
-      lastError = error;
-    }
-  }
-
-  throw new Error('All RPC URLs failed; last error: ' + lastError);
-}
-
 async function estimateGasExternalChains(
   signer: Signer | JsonRpcSigner,
   data: string,
@@ -224,14 +107,3 @@ const customReasonMapper = ({ name, reason }: DecodedError): string => {
       return reason ?? 'Error executing transaction';
   }
 };
-
-function addGasBuffer(estimation: bigint): bigint {
-  return (estimation * BigInt(120)) / BigInt(100);
-}
-
-export async function decodeErrorBytes(returnData: string): Promise<string> {
-  const INTERFACE = new Interface(abi);
-  const decodedError = INTERFACE.parseError(returnData);
-  console.log(decodedError);
-  return `${decodedError?.name}: ${decodedError?.args}` || 'Error not found';
-}

package/src/utils/layerzero.ts

@@ -0,0 +1,66 @@
+import { ethers } from 'ethers';
+
+export type OFTMessagingFee = {
+  nativeFee: string;
+  lzTokenFee: string;
+};
+
+enum LzComposerOperationType {
+  NONE = 0,
+  DEPOSIT_SPOT_ACCOUNT = 1,
+  DEPOSIT_ACCOUNT = 2,
+}
+
+export type OFTSendParams = {
+  dstEid: number;
+  to: string;
+  amountLD: bigint;
+  minAmountLD: bigint;
+  extraOptions: string;
+  composeMsg: string;
+  oftCmd: string;
+};
+
+const buildComposeMsg = (
+  accountId: number,
+  collateralAddressInReyaPeriphery: string,
+) => {
+  const opType = LzComposerOperationType.DEPOSIT_ACCOUNT;
+  const opData = ethers.AbiCoder.defaultAbiCoder().encode(
+    ['uint128', 'address'],
+    [accountId, collateralAddressInReyaPeriphery],
+  );
+
+  const composeMsg = ethers.AbiCoder.defaultAbiCoder().encode(
+    ['uint8', 'bytes'],
+    [opType, opData],
+  );
+
+  return composeMsg;
+};
+
+export const buildOFTSendParamsToDepositInMA = (params: {
+  amount: bigint;
+  collateralAddressInReyaPeriphery: string;
+  dstEid: number;
+  extraOptions: string;
+  receiverAddress: string;
+  marginAccountId: number;
+}): OFTSendParams => {
+  const receiverBytes32 = ethers.zeroPadValue(params.receiverAddress, 32);
+
+  const composeMsg = buildComposeMsg(
+    params.marginAccountId,
+    params.collateralAddressInReyaPeriphery,
+  );
+
+  return {
+    dstEid: params.dstEid,
+    to: receiverBytes32,
+    amountLD: params.amount,
+    minAmountLD: params.amount,
+    extraOptions: params.extraOptions,
+    composeMsg,
+    oftCmd: '0x',
+  };
+};

package/src/utils/token/batch-token-getters.ts

@@ -1,14 +1,8 @@
 import { ethers } from 'ethers';
 import { MoneyInOutChainId, ReyaChainId } from '../../types';
 import { getPublicRpcUrlsOrThrow } from '../network';
-import { exponentialBackoff } from '../retry';
 import { descale, getERC20TokenContract } from './utils';
 
-export type GetETHBalanceBatchArgs = {
-  walletAddress: string;
-  chain: MoneyInOutChainId | ReyaChainId;
-};
-
 export type GetERC20BalanceBatchArgs = {
   tokenAddress: string;
   tokenDecimals: number;
@@ -24,28 +18,6 @@ export type GetERC20AllowanceBatchArgs = {
   chain: MoneyInOutChainId | ReyaChainId;
 };
 
-export const getETHBalanceBatch = async ({
-  walletAddress,
-  chain,
-}: GetETHBalanceBatchArgs): Promise<number> => {
-  const rpcUrls = getPublicRpcUrlsOrThrow(chain);
-  let lastError = null;
-
-  for (const url of rpcUrls) {
-    try {
-      const provider = new ethers.JsonRpcProvider(url);
-      const currentBalance = await exponentialBackoff(() =>
-        provider.getBalance(ethers.getAddress(walletAddress)),
-      );
-      return descale(18)(currentBalance);
-    } catch (error) {
-      lastError = error;
-    }
-  }
-
-  throw new Error('All RPC URLs failed; last error: ' + lastError);
-};
-
 export const getERC20BalanceBatch = async ({
   tokenAddress,
   tokenDecimals,

package/src/utils/token/token-getters.ts

@@ -40,32 +40,3 @@ export const getERC20Allowance = async ({
     ? Number.MAX_SAFE_INTEGER
     : descale(tokenDecimals)(allowance);
 };
-
-export const getERC20Balance = async ({
-  tokenAddress,
-  tokenDecimals,
-  walletAddress,
-  subject,
-}: GetERC20BalanceArgs): Promise<number> => {
-  const token = getERC20TokenContract(tokenAddress, subject);
-
-  const currentBalance = await exponentialBackoff(() =>
-    token.balanceOf(walletAddress),
-  );
-
-  return descale(tokenDecimals)(currentBalance);
-};
-
-export const getETHBalance = async ({
-  walletAddress,
-  subject,
-}: GetETHBalanceArgs): Promise<number> => {
-  const provider = subject.provider;
-  if (!provider) throw new Error("User's provider not found");
-
-  const currentBalance = await exponentialBackoff(() =>
-    provider.getBalance(ethers.getAddress(walletAddress)),
-  );
-
-  return descale(18)(currentBalance);
-};

package/dist/types/utils/layerzero/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types';
-export * from './oft-config';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/utils/layerzero/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["utils/layerzero/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC"}

package/dist/types/utils/layerzero/oft-config.d.ts

@@ -1,4 +0,0 @@
-import { MoneyInOutChainId, ReyaChainId, TokenName } from '../../types';
-export declare const getLzEndpointId: (chainId: MoneyInOutChainId | ReyaChainId) => number;
-export declare const getOFTTokenAddress: (tokenName: TokenName, chainId: MoneyInOutChainId | ReyaChainId) => string;
-//# sourceMappingURL=oft-config.d.ts.map

package/dist/types/utils/layerzero/oft-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"oft-config.d.ts","sourceRoot":"/","sources":["utils/layerzero/oft-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxE,eAAO,MAAM,eAAe,YACjB,iBAAiB,GAAG,WAAW,KACvC,MAaF,CAAC;AAEF,eAAO,MAAM,kBAAkB,cAClB,SAAS,WACX,iBAAiB,GAAG,WAAW,KACvC,MAQF,CAAC"}

package/dist/types/utils/layerzero/types.d.ts

@@ -1,23 +0,0 @@
-export type OFTSendParam = {
-    dstEid: number;
-    to: string;
-    amountLD: bigint;
-    minAmountLD: bigint;
-    extraOptions: string;
-    composeMsg: string;
-    oftCmd: string;
-};
-export type OFTMessagingFee = {
-    nativeFee: bigint;
-    lzTokenFee: bigint;
-};
-export type OFTMessagingReceipt = {
-    guid: string;
-    nonce: bigint;
-    fee: OFTMessagingFee;
-};
-export type OFTReceipt = {
-    amountSentLD: bigint;
-    amountReceivedLD: bigint;
-};
-//# sourceMappingURL=types.d.ts.map

package/dist/types/utils/layerzero/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["utils/layerzero/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,eAAe,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC"}

package/dist/utils/layerzero/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./oft-config"), exports);
-//# sourceMappingURL=index.js.map

package/dist/utils/layerzero/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["utils/layerzero/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,+CAA6B","sourcesContent":["export * from './types';\nexport * from './oft-config';\n"]}

package/dist/utils/layerzero/oft-config.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOFTTokenAddress = exports.getLzEndpointId = void 0;
-var types_1 = require("../../types");
-var token_info_getters_1 = require("../token/token-info-getters");
-var getLzEndpointId = function (chainId) {
-    var _a;
-    var chainToLzEid = (_a = {},
-        _a[types_1.MoneyInOutChainId.ethereumMainnet] = 30101,
-        _a[types_1.MoneyInOutChainId.ethereumSepolia] = 40161,
-        _a[types_1.ReyaChainId.reyaNetwork] = 30313,
-        _a[types_1.ReyaChainId.reyaCronos] = 40319,
-        _a);
-    var lzEid = chainToLzEid[chainId];
-    if (!lzEid) {
-        throw new Error("No LayerZero endpoint ID found for chain ".concat(chainId));
-    }
-    return lzEid;
-};
-exports.getLzEndpointId = getLzEndpointId;
-var getOFTTokenAddress = function (tokenName, chainId) {
-    var tokenInfo = (0, token_info_getters_1.getTokenInfoByName)(tokenName, chainId);
-    if (!tokenInfo.isOFT) {
-        throw new Error("getOFTTokenAddress: token ".concat(tokenName, " on chain ").concat(chainId, " is not an OFT token"));
-    }
-    return tokenInfo.address;
-};
-exports.getOFTTokenAddress = getOFTTokenAddress;
-//# sourceMappingURL=oft-config.js.map

package/dist/utils/layerzero/oft-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"oft-config.js","sourceRoot":"/","sources":["utils/layerzero/oft-config.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;AACxE,kEAAiE;AAE1D,IAAM,eAAe,GAAG,UAC7B,OAAwC;;IAExC,IAAM,YAAY;QAChB,GAAC,yBAAiB,CAAC,eAAe,IAAG,KAAK;QAC1C,GAAC,yBAAiB,CAAC,eAAe,IAAG,KAAK;QAC1C,GAAC,mBAAW,CAAC,WAAW,IAAG,KAAK;QAChC,GAAC,mBAAW,CAAC,UAAU,IAAG,KAAK;WAChC,CAAC;IAEF,IAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,mDAA4C,OAAO,CAAE,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B;AAEK,IAAM,kBAAkB,GAAG,UAChC,SAAoB,EACpB,OAAwC;IAExC,IAAM,SAAS,GAAG,IAAA,uCAAkB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,oCAA6B,SAAS,uBAAa,OAAO,yBAAsB,CACjF,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC,OAAO,CAAC;AAC3B,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B","sourcesContent":["import { MoneyInOutChainId, ReyaChainId, TokenName } from '../../types';\nimport { getTokenInfoByName } from '../token/token-info-getters';\n\nexport const getLzEndpointId = (\n  chainId: MoneyInOutChainId | ReyaChainId,\n): number => {\n  const chainToLzEid: Record<number, number> = {\n    [MoneyInOutChainId.ethereumMainnet]: 30101,\n    [MoneyInOutChainId.ethereumSepolia]: 40161,\n    [ReyaChainId.reyaNetwork]: 30313,\n    [ReyaChainId.reyaCronos]: 40319,\n  };\n\n  const lzEid = chainToLzEid[chainId];\n  if (!lzEid) {\n    throw new Error(`No LayerZero endpoint ID found for chain ${chainId}`);\n  }\n  return lzEid;\n};\n\nexport const getOFTTokenAddress = (\n  tokenName: TokenName,\n  chainId: MoneyInOutChainId | ReyaChainId,\n): string => {\n  const tokenInfo = getTokenInfoByName(tokenName, chainId);\n  if (!tokenInfo.isOFT) {\n    throw new Error(\n      `getOFTTokenAddress: token ${tokenName} on chain ${chainId} is not an OFT token`,\n    );\n  }\n  return tokenInfo.address;\n};\n"]}

package/dist/utils/layerzero/types.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/utils/layerzero/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["utils/layerzero/types.ts"],"names":[],"mappings":"","sourcesContent":["export type OFTSendParam = {\n  dstEid: number;\n  to: string;\n  amountLD: bigint;\n  minAmountLD: bigint;\n  extraOptions: string;\n  composeMsg: string;\n  oftCmd: string;\n};\n\nexport type OFTMessagingFee = {\n  nativeFee: bigint;\n  lzTokenFee: bigint;\n};\n\nexport type OFTMessagingReceipt = {\n  guid: string;\n  nonce: bigint;\n  fee: OFTMessagingFee;\n};\n\nexport type OFTReceipt = {\n  amountSentLD: bigint;\n  amountReceivedLD: bigint;\n};\n"]}

package/src/utils/layerzero/index.ts

@@ -1,2 +0,0 @@
-export * from './types';
-export * from './oft-config';

package/src/utils/layerzero/oft-config.ts

@@ -1,32 +0,0 @@
-import { MoneyInOutChainId, ReyaChainId, TokenName } from '../../types';
-import { getTokenInfoByName } from '../token/token-info-getters';
-
-export const getLzEndpointId = (
-  chainId: MoneyInOutChainId | ReyaChainId,
-): number => {
-  const chainToLzEid: Record<number, number> = {
-    [MoneyInOutChainId.ethereumMainnet]: 30101,
-    [MoneyInOutChainId.ethereumSepolia]: 40161,
-    [ReyaChainId.reyaNetwork]: 30313,
-    [ReyaChainId.reyaCronos]: 40319,
-  };
-
-  const lzEid = chainToLzEid[chainId];
-  if (!lzEid) {
-    throw new Error(`No LayerZero endpoint ID found for chain ${chainId}`);
-  }
-  return lzEid;
-};
-
-export const getOFTTokenAddress = (
-  tokenName: TokenName,
-  chainId: MoneyInOutChainId | ReyaChainId,
-): string => {
-  const tokenInfo = getTokenInfoByName(tokenName, chainId);
-  if (!tokenInfo.isOFT) {
-    throw new Error(
-      `getOFTTokenAddress: token ${tokenName} on chain ${chainId} is not an OFT token`,
-    );
-  }
-  return tokenInfo.address;
-};

package/src/utils/layerzero/types.ts

@@ -1,25 +0,0 @@
-export type OFTSendParam = {
-  dstEid: number;
-  to: string;
-  amountLD: bigint;
-  minAmountLD: bigint;
-  extraOptions: string;
-  composeMsg: string;
-  oftCmd: string;
-};
-
-export type OFTMessagingFee = {
-  nativeFee: bigint;
-  lzTokenFee: bigint;
-};
-
-export type OFTMessagingReceipt = {
-  guid: string;
-  nonce: bigint;
-  fee: OFTMessagingFee;
-};
-
-export type OFTReceipt = {
-  amountSentLD: bigint;
-  amountReceivedLD: bigint;
-};