@reyaxyz/common 0.345.0 → 0.347.0

package/dist/types/utils/token/batch-token-getters.d.ts

@@ -1,8 +1,4 @@
 import { MoneyInOutChainId, ReyaChainId } from '../../types';
-export type GetETHBalanceBatchArgs = {
-    walletAddress: string;
-    chain: MoneyInOutChainId | ReyaChainId;
-};
 export type GetERC20BalanceBatchArgs = {
     tokenAddress: string;
     tokenDecimals: number;
@@ -16,7 +12,6 @@ export type GetERC20AllowanceBatchArgs = {
     spenderAddress: string;
     chain: MoneyInOutChainId | ReyaChainId;
 };
-export declare const getETHBalanceBatch: ({ walletAddress, chain, }: GetETHBalanceBatchArgs) => Promise<number>;
 export declare const getERC20BalanceBatch: ({ tokenAddress, tokenDecimals, walletAddress, chain, }: GetERC20BalanceBatchArgs) => Promise<number>;
 export declare const getERC20AllowanceBatch: ({ tokenAddress, tokenDecimals, walletAddress, spenderAddress, chain, }: GetERC20AllowanceBatchArgs) => Promise<number>;
 //# sourceMappingURL=batch-token-getters.d.ts.map

package/dist/types/utils/token/batch-token-getters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-token-getters.d.ts","sourceRoot":"/","sources":["utils/token/batch-token-getters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK7D,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,GAAG,WAAW,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,GAAG,WAAW,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,iBAAiB,GAAG,WAAW,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,kBAAkB,8BAG5B,sBAAsB,KAAG,QAAQ,MAAM,CAiBzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,2DAK9B,wBAAwB,KAAG,QAAQ,MAAM,CAiB3C,CAAC;AAEF,eAAO,MAAM,sBAAsB,2EAMhC,0BAA0B,KAAG,QAAQ,MAAM,CAoB7C,CAAC"}
+{"version":3,"file":"batch-token-getters.d.ts","sourceRoot":"/","sources":["utils/token/batch-token-getters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI7D,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,GAAG,WAAW,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,iBAAiB,GAAG,WAAW,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,2DAK9B,wBAAwB,KAAG,QAAQ,MAAM,CAiB3C,CAAC;AAEF,eAAO,MAAM,sBAAsB,2EAMhC,0BAA0B,KAAG,QAAQ,MAAM,CAoB7C,CAAC"}

package/dist/types/utils/token/token-getters.d.ts

@@ -18,6 +18,4 @@ export type GetERC20AllowanceArgs = {
     subject: ethers.Signer;
 };
 export declare const getERC20Allowance: ({ walletAddress, tokenAddress, tokenDecimals, spenderAddress, subject, }: GetERC20AllowanceArgs) => Promise<number>;
-export declare const getERC20Balance: ({ tokenAddress, tokenDecimals, walletAddress, subject, }: GetERC20BalanceArgs) => Promise<number>;
-export declare const getETHBalance: ({ walletAddress, subject, }: GetETHBalanceArgs) => Promise<number>;
 //# sourceMappingURL=token-getters.d.ts.map

package/dist/types/utils/token/token-getters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-getters.d.ts","sourceRoot":"/","sources":["utils/token/token-getters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,iBAAiB,6EAM3B,qBAAqB,KAAG,QAAQ,MAAM,CAUxC,CAAC;AAEF,eAAO,MAAM,eAAe,6DAKzB,mBAAmB,KAAG,QAAQ,MAAM,CAQtC,CAAC;AAEF,eAAO,MAAM,aAAa,gCAGvB,iBAAiB,KAAG,QAAQ,MAAM,CASpC,CAAC"}
+{"version":3,"file":"token-getters.d.ts","sourceRoot":"/","sources":["utils/token/token-getters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,iBAAiB,6EAM3B,qBAAqB,KAAG,QAAQ,MAAM,CAUxC,CAAC"}

package/dist/utils/layerzero.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildOFTSendParamsToDepositInMA = void 0;
+var ethers_1 = require("ethers");
+var LzComposerOperationType;
+(function (LzComposerOperationType) {
+    LzComposerOperationType[LzComposerOperationType["NONE"] = 0] = "NONE";
+    LzComposerOperationType[LzComposerOperationType["DEPOSIT_SPOT_ACCOUNT"] = 1] = "DEPOSIT_SPOT_ACCOUNT";
+    LzComposerOperationType[LzComposerOperationType["DEPOSIT_ACCOUNT"] = 2] = "DEPOSIT_ACCOUNT";
+})(LzComposerOperationType || (LzComposerOperationType = {}));
+var buildComposeMsg = function (accountId, collateralAddressInReyaPeriphery) {
+    var opType = LzComposerOperationType.DEPOSIT_ACCOUNT;
+    var opData = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['uint128', 'address'], [accountId, collateralAddressInReyaPeriphery]);
+    var composeMsg = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['uint8', 'bytes'], [opType, opData]);
+    return composeMsg;
+};
+var buildOFTSendParamsToDepositInMA = function (params) {
+    var receiverBytes32 = ethers_1.ethers.zeroPadValue(params.receiverAddress, 32);
+    var composeMsg = buildComposeMsg(params.marginAccountId, params.collateralAddressInReyaPeriphery);
+    return {
+        dstEid: params.dstEid,
+        to: receiverBytes32,
+        amountLD: params.amount,
+        minAmountLD: params.amount,
+        extraOptions: params.extraOptions,
+        composeMsg: composeMsg,
+        oftCmd: '0x',
+    };
+};
+exports.buildOFTSendParamsToDepositInMA = buildOFTSendParamsToDepositInMA;
+//# sourceMappingURL=layerzero.js.map

package/dist/utils/layerzero.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layerzero.js","sourceRoot":"/","sources":["utils/layerzero.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAOhC,IAAK,uBAIJ;AAJD,WAAK,uBAAuB;IAC1B,qEAAQ,CAAA;IACR,qGAAwB,CAAA;IACxB,2FAAmB,CAAA;AACrB,CAAC,EAJI,uBAAuB,KAAvB,uBAAuB,QAI3B;AAYD,IAAM,eAAe,GAAG,UACtB,SAAiB,EACjB,gCAAwC;IAExC,IAAM,MAAM,GAAG,uBAAuB,CAAC,eAAe,CAAC;IACvD,IAAM,MAAM,GAAG,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACrD,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,CAAC,SAAS,EAAE,gCAAgC,CAAC,CAC9C,CAAC;IAEF,IAAM,UAAU,GAAG,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACzD,CAAC,OAAO,EAAE,OAAO,CAAC,EAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CACjB,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEK,IAAM,+BAA+B,GAAG,UAAC,MAO/C;IACC,IAAM,eAAe,GAAG,eAAM,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAExE,IAAM,UAAU,GAAG,eAAe,CAChC,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,gCAAgC,CACxC,CAAC;IAEF,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,EAAE,EAAE,eAAe;QACnB,QAAQ,EAAE,MAAM,CAAC,MAAM;QACvB,WAAW,EAAE,MAAM,CAAC,MAAM;QAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,YAAA;QACV,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,+BAA+B,mCAwB1C","sourcesContent":["import { ethers } from 'ethers';\n\nexport type OFTMessagingFee = {\n  nativeFee: string;\n  lzTokenFee: string;\n};\n\nenum LzComposerOperationType {\n  NONE = 0,\n  DEPOSIT_SPOT_ACCOUNT = 1,\n  DEPOSIT_ACCOUNT = 2,\n}\n\nexport type OFTSendParams = {\n  dstEid: number;\n  to: string;\n  amountLD: bigint;\n  minAmountLD: bigint;\n  extraOptions: string;\n  composeMsg: string;\n  oftCmd: string;\n};\n\nconst buildComposeMsg = (\n  accountId: number,\n  collateralAddressInReyaPeriphery: string,\n) => {\n  const opType = LzComposerOperationType.DEPOSIT_ACCOUNT;\n  const opData = ethers.AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'address'],\n    [accountId, collateralAddressInReyaPeriphery],\n  );\n\n  const composeMsg = ethers.AbiCoder.defaultAbiCoder().encode(\n    ['uint8', 'bytes'],\n    [opType, opData],\n  );\n\n  return composeMsg;\n};\n\nexport const buildOFTSendParamsToDepositInMA = (params: {\n  amount: bigint;\n  collateralAddressInReyaPeriphery: string;\n  dstEid: number;\n  extraOptions: string;\n  receiverAddress: string;\n  marginAccountId: number;\n}): OFTSendParams => {\n  const receiverBytes32 = ethers.zeroPadValue(params.receiverAddress, 32);\n\n  const composeMsg = buildComposeMsg(\n    params.marginAccountId,\n    params.collateralAddressInReyaPeriphery,\n  );\n\n  return {\n    dstEid: params.dstEid,\n    to: receiverBytes32,\n    amountLD: params.amount,\n    minAmountLD: params.amount,\n    extraOptions: params.extraOptions,\n    composeMsg,\n    oftCmd: '0x',\n  };\n};\n"]}

package/dist/utils/token/batch-token-getters.js

@@ -36,75 +36,24 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getERC20AllowanceBatch = exports.getERC20BalanceBatch = exports.getETHBalanceBatch = void 0;
+exports.getERC20AllowanceBatch = exports.getERC20BalanceBatch = void 0;
 var ethers_1 = require("ethers");
 var network_1 = require("../network");
-var retry_1 = require("../retry");
 var utils_1 = require("./utils");
-var getETHBalanceBatch = function (_a) {
-    var walletAddress = _a.walletAddress, chain = _a.chain;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var rpcUrls, lastError, _loop_1, _i, rpcUrls_1, url, state_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    rpcUrls = (0, network_1.getPublicRpcUrlsOrThrow)(chain);
-                    lastError = null;
-                    _loop_1 = function (url) {
-                        var provider_1, currentBalance, error_1;
-                        return __generator(this, function (_c) {
-                            switch (_c.label) {
-                                case 0:
-                                    _c.trys.push([0, 2, , 3]);
-                                    provider_1 = new ethers_1.ethers.JsonRpcProvider(url);
-                                    return [4 /*yield*/, (0, retry_1.exponentialBackoff)(function () {
-                                            return provider_1.getBalance(ethers_1.ethers.getAddress(walletAddress));
-                                        })];
-                                case 1:
-                                    currentBalance = _c.sent();
-                                    return [2 /*return*/, { value: (0, utils_1.descale)(18)(currentBalance) }];
-                                case 2:
-                                    error_1 = _c.sent();
-                                    lastError = error_1;
-                                    return [3 /*break*/, 3];
-                                case 3: return [2 /*return*/];
-                            }
-                        });
-                    };
-                    _i = 0, rpcUrls_1 = rpcUrls;
-                    _b.label = 1;
-                case 1:
-                    if (!(_i < rpcUrls_1.length)) return [3 /*break*/, 4];
-                    url = rpcUrls_1[_i];
-                    return [5 /*yield**/, _loop_1(url)];
-                case 2:
-                    state_1 = _b.sent();
-                    if (typeof state_1 === "object")
-                        return [2 /*return*/, state_1.value];
-                    _b.label = 3;
-                case 3:
-                    _i++;
-                    return [3 /*break*/, 1];
-                case 4: throw new Error('All RPC URLs failed; last error: ' + lastError);
-            }
-        });
-    });
-};
-exports.getETHBalanceBatch = getETHBalanceBatch;
 var getERC20BalanceBatch = function (_a) {
     var tokenAddress = _a.tokenAddress, tokenDecimals = _a.tokenDecimals, walletAddress = _a.walletAddress, chain = _a.chain;
     return __awaiter(void 0, void 0, void 0, function () {
-        var rpcUrls, lastError, _i, rpcUrls_2, url, provider, token, currentBalance, error_2;
+        var rpcUrls, lastError, _i, rpcUrls_1, url, provider, token, currentBalance, error_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     rpcUrls = (0, network_1.getPublicRpcUrlsOrThrow)(chain);
                     lastError = null;
-                    _i = 0, rpcUrls_2 = rpcUrls;
+                    _i = 0, rpcUrls_1 = rpcUrls;
                     _b.label = 1;
                 case 1:
-                    if (!(_i < rpcUrls_2.length)) return [3 /*break*/, 6];
-                    url = rpcUrls_2[_i];
+                    if (!(_i < rpcUrls_1.length)) return [3 /*break*/, 6];
+                    url = rpcUrls_1[_i];
                     _b.label = 2;
                 case 2:
                     _b.trys.push([2, 4, , 5]);
@@ -115,8 +64,8 @@ var getERC20BalanceBatch = function (_a) {
                     currentBalance = _b.sent();
                     return [2 /*return*/, (0, utils_1.descale)(tokenDecimals)(currentBalance)];
                 case 4:
-                    error_2 = _b.sent();
-                    lastError = error_2;
+                    error_1 = _b.sent();
+                    lastError = error_1;
                     return [3 /*break*/, 5];
                 case 5:
                     _i++;
@@ -130,17 +79,17 @@ exports.getERC20BalanceBatch = getERC20BalanceBatch;
 var getERC20AllowanceBatch = function (_a) {
     var tokenAddress = _a.tokenAddress, tokenDecimals = _a.tokenDecimals, walletAddress = _a.walletAddress, spenderAddress = _a.spenderAddress, chain = _a.chain;
     return __awaiter(void 0, void 0, void 0, function () {
-        var rpcUrls, lastError, _i, rpcUrls_3, url, provider, token, currentBalance, error_3;
+        var rpcUrls, lastError, _i, rpcUrls_2, url, provider, token, currentBalance, error_2;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     rpcUrls = (0, network_1.getPublicRpcUrlsOrThrow)(chain);
                     lastError = null;
-                    _i = 0, rpcUrls_3 = rpcUrls;
+                    _i = 0, rpcUrls_2 = rpcUrls;
                     _b.label = 1;
                 case 1:
-                    if (!(_i < rpcUrls_3.length)) return [3 /*break*/, 6];
-                    url = rpcUrls_3[_i];
+                    if (!(_i < rpcUrls_2.length)) return [3 /*break*/, 6];
+                    url = rpcUrls_2[_i];
                     _b.label = 2;
                 case 2:
                     _b.trys.push([2, 4, , 5]);
@@ -151,8 +100,8 @@ var getERC20AllowanceBatch = function (_a) {
                     currentBalance = _b.sent();
                     return [2 /*return*/, (0, utils_1.descale)(tokenDecimals)(currentBalance)];
                 case 4:
-                    error_3 = _b.sent();
-                    lastError = error_3;
+                    error_2 = _b.sent();
+                    lastError = error_2;
                     return [3 /*break*/, 5];
                 case 5:
                     _i++;

package/dist/utils/token/batch-token-getters.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch-token-getters.js","sourceRoot":"/","sources":["utils/token/batch-token-getters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAgC;AAEhC,sCAAqD;AACrD,kCAA8C;AAC9C,iCAAyD;AAsBlD,IAAM,kBAAkB,GAAG,UAAO,EAGhB;QAFvB,aAAa,mBAAA,EACb,KAAK,WAAA;;;;;;oBAEC,OAAO,GAAG,IAAA,iCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC3C,SAAS,GAAG,IAAI,CAAC;wCAEV,GAAG;;;;;;oCAEJ,aAAW,IAAI,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oCAC1B,qBAAM,IAAA,0BAAkB,EAAC;4CAC9C,OAAA,UAAQ,CAAC,UAAU,CAAC,eAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;wCAArD,CAAqD,CACtD,EAAA;;oCAFK,cAAc,GAAG,SAEtB;mEACM,IAAA,eAAO,EAAC,EAAE,CAAC,CAAC,cAAc,CAAC;;;oCAElC,SAAS,GAAG,OAAK,CAAC;;;;;;0BARG,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAd,GAAG;kDAAH,GAAG;;;;;;;oBAAI,IAAO,CAAA;;wBAYzB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;;;;CAClE,CAAC;AApBW,QAAA,kBAAkB,sBAoB7B;AAEK,IAAM,oBAAoB,GAAG,UAAO,EAKhB;QAJzB,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,KAAK,WAAA;;;;;;oBAEC,OAAO,GAAG,IAAA,iCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC3C,SAAS,GAAG,IAAI,CAAC;0BAEI,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAd,GAAG;;;;oBAEJ,QAAQ,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC3C,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACrC,qBAAM,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,EAAA;;oBAArD,cAAc,GAAG,SAAoC;oBAE3D,sBAAO,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,cAAc,CAAC,EAAC;;;oBAE9C,SAAS,GAAG,OAAK,CAAC;;;oBARJ,IAAO,CAAA;;wBAYzB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;;;;CAClE,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B;AAEK,IAAM,sBAAsB,GAAG,UAAO,EAMhB;QAL3B,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,cAAc,oBAAA,EACd,KAAK,WAAA;;;;;;oBAEC,OAAO,GAAG,IAAA,iCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC3C,SAAS,GAAG,IAAI,CAAC;0BAEI,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAd,GAAG;;;;oBAEJ,QAAQ,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC3C,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACrC,qBAAM,KAAK,CAAC,SAAS,CAC1C,aAAa,EACb,cAAc,CACf,EAAA;;oBAHK,cAAc,GAAG,SAGtB;oBAED,sBAAO,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,cAAc,CAAC,EAAC;;;oBAE9C,SAAS,GAAG,OAAK,CAAC;;;oBAXJ,IAAO,CAAA;;wBAezB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;;;;CAClE,CAAC;AA1BW,QAAA,sBAAsB,0BA0BjC","sourcesContent":["import { ethers } from 'ethers';\nimport { MoneyInOutChainId, ReyaChainId } from '../../types';\nimport { getPublicRpcUrlsOrThrow } from '../network';\nimport { exponentialBackoff } from '../retry';\nimport { descale, getERC20TokenContract } from './utils';\n\nexport type GetETHBalanceBatchArgs = {\n  walletAddress: string;\n  chain: MoneyInOutChainId | ReyaChainId;\n};\n\nexport type GetERC20BalanceBatchArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  chain: MoneyInOutChainId | ReyaChainId;\n};\n\nexport type GetERC20AllowanceBatchArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  spenderAddress: string;\n  chain: MoneyInOutChainId | ReyaChainId;\n};\n\nexport const getETHBalanceBatch = async ({\n  walletAddress,\n  chain,\n}: GetETHBalanceBatchArgs): Promise<number> => {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chain);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const currentBalance = await exponentialBackoff(() =>\n        provider.getBalance(ethers.getAddress(walletAddress)),\n      );\n      return descale(18)(currentBalance);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n};\n\nexport const getERC20BalanceBatch = async ({\n  tokenAddress,\n  tokenDecimals,\n  walletAddress,\n  chain,\n}: GetERC20BalanceBatchArgs): Promise<number> => {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chain);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const token = getERC20TokenContract(tokenAddress, provider);\n      const currentBalance = await token.balanceOf(walletAddress);\n\n      return descale(tokenDecimals)(currentBalance);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n};\n\nexport const getERC20AllowanceBatch = async ({\n  tokenAddress,\n  tokenDecimals,\n  walletAddress,\n  spenderAddress,\n  chain,\n}: GetERC20AllowanceBatchArgs): Promise<number> => {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chain);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const token = getERC20TokenContract(tokenAddress, provider);\n      const currentBalance = await token.allowance(\n        walletAddress,\n        spenderAddress,\n      );\n\n      return descale(tokenDecimals)(currentBalance);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n};\n"]}
+{"version":3,"file":"batch-token-getters.js","sourceRoot":"/","sources":["utils/token/batch-token-getters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAgC;AAEhC,sCAAqD;AACrD,iCAAyD;AAiBlD,IAAM,oBAAoB,GAAG,UAAO,EAKhB;QAJzB,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,KAAK,WAAA;;;;;;oBAEC,OAAO,GAAG,IAAA,iCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC3C,SAAS,GAAG,IAAI,CAAC;0BAEI,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAd,GAAG;;;;oBAEJ,QAAQ,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC3C,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACrC,qBAAM,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,EAAA;;oBAArD,cAAc,GAAG,SAAoC;oBAE3D,sBAAO,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,cAAc,CAAC,EAAC;;;oBAE9C,SAAS,GAAG,OAAK,CAAC;;;oBARJ,IAAO,CAAA;;wBAYzB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;;;;CAClE,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B;AAEK,IAAM,sBAAsB,GAAG,UAAO,EAMhB;QAL3B,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,cAAc,oBAAA,EACd,KAAK,WAAA;;;;;;oBAEC,OAAO,GAAG,IAAA,iCAAuB,EAAC,KAAK,CAAC,CAAC;oBAC3C,SAAS,GAAG,IAAI,CAAC;0BAEI,EAAP,mBAAO;;;yBAAP,CAAA,qBAAO,CAAA;oBAAd,GAAG;;;;oBAEJ,QAAQ,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC3C,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACrC,qBAAM,KAAK,CAAC,SAAS,CAC1C,aAAa,EACb,cAAc,CACf,EAAA;;oBAHK,cAAc,GAAG,SAGtB;oBAED,sBAAO,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,cAAc,CAAC,EAAC;;;oBAE9C,SAAS,GAAG,OAAK,CAAC;;;oBAXJ,IAAO,CAAA;;wBAezB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,SAAS,CAAC,CAAC;;;;CAClE,CAAC;AA1BW,QAAA,sBAAsB,0BA0BjC","sourcesContent":["import { ethers } from 'ethers';\nimport { MoneyInOutChainId, ReyaChainId } from '../../types';\nimport { getPublicRpcUrlsOrThrow } from '../network';\nimport { descale, getERC20TokenContract } from './utils';\n\nexport type GetERC20BalanceBatchArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  chain: MoneyInOutChainId | ReyaChainId;\n};\n\nexport type GetERC20AllowanceBatchArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  spenderAddress: string;\n  chain: MoneyInOutChainId | ReyaChainId;\n};\n\nexport const getERC20BalanceBatch = async ({\n  tokenAddress,\n  tokenDecimals,\n  walletAddress,\n  chain,\n}: GetERC20BalanceBatchArgs): Promise<number> => {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chain);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const token = getERC20TokenContract(tokenAddress, provider);\n      const currentBalance = await token.balanceOf(walletAddress);\n\n      return descale(tokenDecimals)(currentBalance);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n};\n\nexport const getERC20AllowanceBatch = async ({\n  tokenAddress,\n  tokenDecimals,\n  walletAddress,\n  spenderAddress,\n  chain,\n}: GetERC20AllowanceBatchArgs): Promise<number> => {\n  const rpcUrls = getPublicRpcUrlsOrThrow(chain);\n  let lastError = null;\n\n  for (const url of rpcUrls) {\n    try {\n      const provider = new ethers.JsonRpcProvider(url);\n      const token = getERC20TokenContract(tokenAddress, provider);\n      const currentBalance = await token.allowance(\n        walletAddress,\n        spenderAddress,\n      );\n\n      return descale(tokenDecimals)(currentBalance);\n    } catch (error) {\n      lastError = error;\n    }\n  }\n\n  throw new Error('All RPC URLs failed; last error: ' + lastError);\n};\n"]}

package/dist/utils/token/token-getters.js

@@ -36,8 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getETHBalance = exports.getERC20Balance = exports.getERC20Allowance = void 0;
-var ethers_1 = require("ethers");
+exports.getERC20Allowance = void 0;
 var retry_1 = require("../retry");
 var utils_1 = require("./utils");
 var getERC20Allowance = function (_a) {
@@ -61,44 +60,4 @@ var getERC20Allowance = function (_a) {
     });
 };
 exports.getERC20Allowance = getERC20Allowance;
-var getERC20Balance = function (_a) {
-    var tokenAddress = _a.tokenAddress, tokenDecimals = _a.tokenDecimals, walletAddress = _a.walletAddress, subject = _a.subject;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var token, currentBalance;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    token = (0, utils_1.getERC20TokenContract)(tokenAddress, subject);
-                    return [4 /*yield*/, (0, retry_1.exponentialBackoff)(function () {
-                            return token.balanceOf(walletAddress);
-                        })];
-                case 1:
-                    currentBalance = _b.sent();
-                    return [2 /*return*/, (0, utils_1.descale)(tokenDecimals)(currentBalance)];
-            }
-        });
-    });
-};
-exports.getERC20Balance = getERC20Balance;
-var getETHBalance = function (_a) {
-    var walletAddress = _a.walletAddress, subject = _a.subject;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var provider, currentBalance;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    provider = subject.provider;
-                    if (!provider)
-                        throw new Error("User's provider not found");
-                    return [4 /*yield*/, (0, retry_1.exponentialBackoff)(function () {
-                            return provider.getBalance(ethers_1.ethers.getAddress(walletAddress));
-                        })];
-                case 1:
-                    currentBalance = _b.sent();
-                    return [2 /*return*/, (0, utils_1.descale)(18)(currentBalance)];
-            }
-        });
-    });
-};
-exports.getETHBalance = getETHBalance;
 //# sourceMappingURL=token-getters.js.map

package/dist/utils/token/token-getters.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-getters.js","sourceRoot":"/","sources":["utils/token/token-getters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAgC;AAChC,kCAA8C;AAE9C,iCAAgE;AAsBzD,IAAM,iBAAiB,GAAG,UAAO,EAMhB;QALtB,aAAa,mBAAA,EACb,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,cAAc,oBAAA,EACd,OAAO,aAAA;;;;;;oBAED,aAAa,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAEjD,qBAAM,IAAA,0BAAkB,EAAC;4BACzC,OAAA,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;wBAAtD,CAAsD,CACvD,EAAA;;oBAFK,SAAS,GAAG,SAEjB;oBAED,sBAAO,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,aAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;4BACtE,CAAC,CAAC,MAAM,CAAC,gBAAgB;4BACzB,CAAC,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,SAAS,CAAC,EAAC;;;;CACvC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B;AAEK,IAAM,eAAe,GAAG,UAAO,EAKhB;QAJpB,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,OAAO,aAAA;;;;;;oBAED,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAEpC,qBAAM,IAAA,0BAAkB,EAAC;4BAC9C,OAAA,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC;wBAA9B,CAA8B,CAC/B,EAAA;;oBAFK,cAAc,GAAG,SAEtB;oBAED,sBAAO,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,cAAc,CAAC,EAAC;;;;CAC/C,CAAC;AAbW,QAAA,eAAe,mBAa1B;AAEK,IAAM,aAAa,GAAG,UAAO,EAGhB;QAFlB,aAAa,mBAAA,EACb,OAAO,aAAA;;;;;;oBAED,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;oBAClC,IAAI,CAAC,QAAQ;wBAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBAErC,qBAAM,IAAA,0BAAkB,EAAC;4BAC9C,OAAA,QAAQ,CAAC,UAAU,CAAC,eAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;wBAArD,CAAqD,CACtD,EAAA;;oBAFK,cAAc,GAAG,SAEtB;oBAED,sBAAO,IAAA,eAAO,EAAC,EAAE,CAAC,CAAC,cAAc,CAAC,EAAC;;;;CACpC,CAAC;AAZW,QAAA,aAAa,iBAYxB","sourcesContent":["import { ethers } from 'ethers';\nimport { exponentialBackoff } from '../retry';\nimport { LpPoolEntity } from '../../types';\nimport { getERC20TokenContract, scale, descale } from './utils';\n\nexport type GetERC20BalanceArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  subject: ethers.Signer | ethers.Provider;\n};\n\nexport type GetETHBalanceArgs = {\n  walletAddress: string;\n  subject: ethers.Signer | ethers.Provider;\n};\n\nexport type GetERC20AllowanceArgs = {\n  walletAddress: string;\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  tokenDecimals: number;\n  spenderAddress: string;\n  subject: ethers.Signer;\n};\n\nexport const getERC20Allowance = async ({\n  walletAddress,\n  tokenAddress,\n  tokenDecimals,\n  spenderAddress,\n  subject,\n}: GetERC20AllowanceArgs): Promise<number> => {\n  const tokenContract = getERC20TokenContract(tokenAddress, subject);\n\n  const allowance = await exponentialBackoff(() =>\n    tokenContract.allowance(walletAddress, spenderAddress),\n  );\n\n  return BigInt(allowance) > scale(tokenDecimals)(Number.MAX_SAFE_INTEGER)\n    ? Number.MAX_SAFE_INTEGER\n    : descale(tokenDecimals)(allowance);\n};\n\nexport const getERC20Balance = async ({\n  tokenAddress,\n  tokenDecimals,\n  walletAddress,\n  subject,\n}: GetERC20BalanceArgs): Promise<number> => {\n  const token = getERC20TokenContract(tokenAddress, subject);\n\n  const currentBalance = await exponentialBackoff(() =>\n    token.balanceOf(walletAddress),\n  );\n\n  return descale(tokenDecimals)(currentBalance);\n};\n\nexport const getETHBalance = async ({\n  walletAddress,\n  subject,\n}: GetETHBalanceArgs): Promise<number> => {\n  const provider = subject.provider;\n  if (!provider) throw new Error(\"User's provider not found\");\n\n  const currentBalance = await exponentialBackoff(() =>\n    provider.getBalance(ethers.getAddress(walletAddress)),\n  );\n\n  return descale(18)(currentBalance);\n};\n"]}
+{"version":3,"file":"token-getters.js","sourceRoot":"/","sources":["utils/token/token-getters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kCAA8C;AAE9C,iCAAgE;AAsBzD,IAAM,iBAAiB,GAAG,UAAO,EAMhB;QALtB,aAAa,mBAAA,EACb,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,cAAc,oBAAA,EACd,OAAO,aAAA;;;;;;oBAED,aAAa,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAEjD,qBAAM,IAAA,0BAAkB,EAAC;4BACzC,OAAA,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;wBAAtD,CAAsD,CACvD,EAAA;;oBAFK,SAAS,GAAG,SAEjB;oBAED,sBAAO,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,aAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;4BACtE,CAAC,CAAC,MAAM,CAAC,gBAAgB;4BACzB,CAAC,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,CAAC,SAAS,CAAC,EAAC;;;;CACvC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B","sourcesContent":["import { ethers } from 'ethers';\nimport { exponentialBackoff } from '../retry';\nimport { LpPoolEntity } from '../../types';\nimport { getERC20TokenContract, scale, descale } from './utils';\n\nexport type GetERC20BalanceArgs = {\n  tokenAddress: string;\n  tokenDecimals: number;\n  walletAddress: string;\n  subject: ethers.Signer | ethers.Provider;\n};\n\nexport type GetETHBalanceArgs = {\n  walletAddress: string;\n  subject: ethers.Signer | ethers.Provider;\n};\n\nexport type GetERC20AllowanceArgs = {\n  walletAddress: string;\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  tokenDecimals: number;\n  spenderAddress: string;\n  subject: ethers.Signer;\n};\n\nexport const getERC20Allowance = async ({\n  walletAddress,\n  tokenAddress,\n  tokenDecimals,\n  spenderAddress,\n  subject,\n}: GetERC20AllowanceArgs): Promise<number> => {\n  const tokenContract = getERC20TokenContract(tokenAddress, subject);\n\n  const allowance = await exponentialBackoff(() =>\n    tokenContract.allowance(walletAddress, spenderAddress),\n  );\n\n  return BigInt(allowance) > scale(tokenDecimals)(Number.MAX_SAFE_INTEGER)\n    ? Number.MAX_SAFE_INTEGER\n    : descale(tokenDecimals)(allowance);\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/common",
-  "version": "0.345.0",
+  "version": "0.347.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -45,5 +45,5 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "a6136adcd8689769525a0ea1db5062702fbc5826"
+  "gitHead": "e49d3e00d9af49fc29dac0ec48c4965ef585f947"
 }

package/src/trading-api-types.ts

@@ -1,5 +1,5 @@
 import { ParamsDictionary, Query } from 'express-serve-static-core';
-import { AssetPair, CollateralPrice, MarketPrice } from './types';
+import { Address, AssetPair, CollateralPrice, MarketPrice } from './types';
 import {
   AddressParam,
   ApiEndpoint,
@@ -532,6 +532,7 @@ export type TradingApiSource = {
     {
       og_discount: Decimal;
       vltz_discount: Decimal;
+      spread_discount: Decimal;
       referee_discount: Decimal;
       referrer_rebate: Decimal;
       affiliate_referrer_rebate: Decimal;
@@ -602,6 +603,12 @@ export type TradingApiSource = {
       address: string;
     }
   >;
+  'collaterals/definitions': TradingApiEndpoint<
+    {
+      collaterals: CollateralDefinition[];
+    },
+    never
+  >;
 };
 
 export type Req<P = ParamsDictionary, ReqQuery = Query> = {
@@ -723,6 +730,104 @@ type ReplicationMessage =
   | GenericReplicationMessage<spot_execution_bust, 'spot_execution_busts'>
   | GenericReplicationMessage<Order, 'orders'>;
 
+export type SocketDepositChainDetails = {
+  chainId: number;
+  chainName: string;
+  collateralAddress: Address;
+  collateralName: string;
+  collateralAddressInReyaPeriphery: Address;
+  vaultAddress: Address;
+  connectorAddress: Address;
+  msgGasLimit: string;
+  bridgeTime: number;
+};
+
+export type SocketWithdrawChainDetails = {
+  chainId: number;
+  chainName: string;
+  collateralAddress: Address;
+  collateralName: string;
+  collateralAddressInReyaCore: Address;
+  msgGasLimit: string;
+  bridgeFee: string;
+  bridgeTime: number;
+};
+
+export type LayerzeroDepositChainDetails = {
+  chainId: number;
+  chainName: string;
+  collateralAddress: Address;
+  collateralName: string;
+  collateralAddressInReyaPeriphery: Address;
+  dstEid: number;
+  extraOptions: string;
+  bridgeTime: number;
+};
+
+export type LayerzeroWithdrawChainDetails = {
+  chainId: number;
+  chainName: string;
+  collateralAddress: Address;
+  collateralName: string;
+  collateralAddressInReyaCore: Address;
+  dstEid: number;
+  bridgeFee: string;
+  bridgeTime: number;
+};
+
+export type SocketDepositInfo =
+  | { enabled: false }
+  | { enabled: true; chains: SocketDepositChainDetails[]; minAmount: number };
+
+export type SocketWithdrawInfo =
+  | { enabled: false }
+  | { enabled: true; chains: SocketWithdrawChainDetails[]; minAmount: number };
+
+export type LayerzeroDepositInfo =
+  | { enabled: false }
+  | {
+      enabled: true;
+      minAmount: number;
+      chains: LayerzeroDepositChainDetails[];
+    };
+
+export type LayerzeroWithdrawInfo =
+  | { enabled: false }
+  | {
+      enabled: true;
+      minAmount: number;
+      chains: LayerzeroWithdrawChainDetails[];
+    };
+
+export type TransferInfo = { enabled: boolean };
+
+export type SpotInfo =
+  | { enabled: false }
+  | { enabled: true; spotMarketSymbol: string };
+
+export type DisplayInfo = {
+  advertisedInSpot: boolean;
+  advertisedInPerp: boolean;
+  displayName: string;
+  displayDecimals: number;
+};
+
+export type CollateralDefinition = {
+  id: Uppercase<string>;
+  address: Address;
+  assetPairId: string;
+  priceHaircut: string;
+  liquidationDiscount: string;
+  decimals: number;
+  socketDepositInfo: SocketDepositInfo;
+  socketWithdrawInfo: SocketWithdrawInfo;
+  layerzeroDepositInfo: LayerzeroDepositInfo;
+  layerzeroWithdrawInfo: LayerzeroWithdrawInfo;
+  transferInfo: TransferInfo;
+  spotInfo: SpotInfo;
+  displayInfo: DisplayInfo;
+};
+
 export type Replication = {
   [K in ReplicationMessage as `replication:${K['model']}`]: Extract<
     ReplicationMessage,

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',
+  };
+};