@reyaxyz/sdk 0.41.0 → 0.42.0

package/dist/config/index.js

@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -71,12 +60,11 @@ var TransactionModule = /** @class */ (function (_super) {
     }
     TransactionModule.prototype.executeTransaction = function (txData, contractType, metadata) {
         return __awaiter(this, void 0, void 0, function () {
-            var tx, uri;
+            var uri;
             return __generator(this, function (_a) {
-                tx = __assign(__assign({}, txData), { gasLimit: String(txData.gasLimit), maxPriorityFeePerGas: String(txData.maxPriorityFeePerGas), maxFeePerGas: String(txData.maxFeePerGas) });
                 uri = "/api/transaction/execute";
                 return [2 /*return*/, this.post(uri, {}, {
-                        txData: tx,
+                        txData: txData,
                         contractType: contractType,
                         metadata: metadata,
                     })];

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAgF;AAehF;IAAuC,qCAAU;IAAjD;;IAwBA,CAAC;IAvBO,8CAAkB,GAAxB,UACE,MAAc,EACd,YAAoB,EACpB,QAAsC;;;;gBAGhC,EAAE,yBACH,MAAM,KACT,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EACjC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,EACzD,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAC1C,CAAC;gBACI,GAAG,GAAG,0BAA0B,CAAC;gBACvC,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,MAAM,EAAE,EAAE;wBACV,YAAY,cAAA;wBACZ,QAAQ,UAAA;qBACT,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAxBD,CAAuC,mBAAU,GAwBhD;AAxBY,8CAAiB;AA0B9B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,IAAM,MAAM,GAAG,2BAAkB,CAAC,WAAW,CAAC,IAAI,2BAAkB,CAAC,MAAM,CAAC,CAAC;IAC7E,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB;AAEK,IAAM,0BAA0B,GAAG;IACxC,IAAI,CAAC,iBAAiB;QACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC","sourcesContent":["import { API_CLIENT_CONFIGS, RestClient, ServiceConfig } from '@reyaxyz/common';\n\nexport type BroadcastTransactionMetadata = {\n  accountName?: string;\n};\n\nexport type TxData = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n  gasLimit: bigint;\n  maxPriorityFeePerGas?: bigint;\n  maxFeePerGas?: bigint;\n};\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractType: string,\n    metadata: BroadcastTransactionMetadata,\n  ) {\n    // convert from big number\n    const tx = {\n      ...txData,\n      gasLimit: String(txData.gasLimit),\n      maxPriorityFeePerGas: String(txData.maxPriorityFeePerGas),\n      maxFeePerGas: String(txData.maxFeePerGas),\n    };\n    const uri = `/api/transaction/execute`;\n    return this.post<{ txHash: string }>(\n      uri,\n      {},\n      {\n        txData: tx,\n        contractType,\n        metadata,\n      },\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  const config = API_CLIENT_CONFIGS[environment] || API_CLIENT_CONFIGS['test'];\n  transactionModule = new TransactionModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAgF;AAUhF;IAAuC,qCAAU;IAAjD;;IAiBA,CAAC;IAhBO,8CAAkB,GAAxB,UACE,MAAc,EACd,YAAoB,EACpB,QAAsC;;;;gBAEhC,GAAG,GAAG,0BAA0B,CAAC;gBACvC,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,MAAM,EAAE,MAAM;wBACd,YAAY,cAAA;wBACZ,QAAQ,UAAA;qBACT,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAjBD,CAAuC,mBAAU,GAiBhD;AAjBY,8CAAiB;AAmB9B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,IAAM,MAAM,GAAG,2BAAkB,CAAC,WAAW,CAAC,IAAI,2BAAkB,CAAC,MAAM,CAAC,CAAC;IAC7E,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB;AAEK,IAAM,0BAA0B,GAAG;IACxC,IAAI,CAAC,iBAAiB;QACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC","sourcesContent":["import { API_CLIENT_CONFIGS, RestClient, ServiceConfig } from '@reyaxyz/common';\n\nexport type BroadcastTransactionMetadata = {\n  accountName?: string;\n};\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractType: string,\n    metadata: BroadcastTransactionMetadata,\n  ) {\n    const uri = `/api/transaction/execute`;\n    return this.post<{ txHash: string }>(\n      uri,\n      {},\n      {\n        txData: txData,\n        contractType,\n        metadata,\n      },\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  const config = API_CLIENT_CONFIGS[environment] || API_CLIENT_CONFIGS['test'];\n  transactionModule = new TransactionModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n"]}

package/dist/services/encode.js

@@ -17,7 +17,7 @@ var encodeSingleWithdraw = function (token, amount, multiAction) {
 };
 exports.encodeSingleWithdraw = encodeSingleWithdraw;
 var encodeSingleTransferMargin = function (toMarginAccountId, token, amount, multiAction) {
-    multiAction.newAction((0, routerCommands_1.getCommand)(routerCommands_1.CommandType.TRANSFER_MARGIN_ACCOUNT, [toMarginAccountId, token, amount], 0, 0));
+    multiAction.newAction((0, routerCommands_1.getCommand)(routerCommands_1.CommandType.TRANSFER_MARGIN_ACCOUNT, [[toMarginAccountId, token, amount]], 0, 0));
 };
 exports.encodeSingleTransferMargin = encodeSingleTransferMargin;
 var encodeSingleTrade = function (counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction) {

package/dist/services/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,0DAAkE;AAClE,iCAA6C;AAC7C,qEAAmD;AACnD,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CAAC,IAAA,2BAAU,EAAC,4BAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,IAAM,0BAA0B,GAAG,UACxC,iBAAyB,EACzB,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,uBAAuB,EACnC,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,EAClC,CAAC,EACD,CAAC,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction } from '../utils/action';\nimport { CommandType, getCommand } from '../utils/routerCommands';\nimport { AbiCoder, Interface } from 'ethers';\nimport { abi } from '../abis/ExecutionModule.json';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [toMarginAccountId, token, amount],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,0DAAkE;AAClE,iCAA6C;AAC7C,qEAAmD;AACnD,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CAAC,IAAA,2BAAU,EAAC,4BAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,IAAM,0BAA0B,GAAG,UACxC,iBAAyB,EACzB,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,uBAAuB,EACnC,CAAC,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EACpC,CAAC,EACD,CAAC,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction } from '../utils/action';\nimport { CommandType, getCommand } from '../utils/routerCommands';\nimport { AbiCoder, Interface } from 'ethers';\nimport { abi } from '../abis/ExecutionModule.json';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [[toMarginAccountId, token, amount]],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}

package/dist/services/executeTransaction.js

@@ -120,25 +120,26 @@ function executeTransaction(signer, data, value, chainId, targetContract) {
 exports.executeTransaction = executeTransaction;
 function signAndBroadcastTransaction(signer, data, value, chainId, targetContract, metadata) {
     return __awaiter(this, void 0, void 0, function () {
-        var txData, transactionModuleClient, txHash, error_3;
+        var contractAddress, transactionModuleClient, txHash, error_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, estimateGas(signer, data, value, chainId, targetContract)];
+                case 0:
+                    contractAddress = Object.values(contractAddresses_1.ContractType).includes(targetContract)
+                        ? (0, contractAddresses_1.getAddress)(chainId, targetContract)
+                        : targetContract;
+                    _a.label = 1;
                 case 1:
-                    txData = _a.sent();
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
+                    _a.trys.push([1, 3, , 4]);
                     transactionModuleClient = (0, config_1.getTransactionModuleClient)();
-                    return [4 /*yield*/, transactionModuleClient.executeTransaction(txData, targetContract, metadata)];
-                case 3:
+                    return [4 /*yield*/, transactionModuleClient.executeTransaction({ to: contractAddress, data: data }, targetContract, metadata)];
+                case 2:
                     txHash = (_a.sent()).txHash;
                     return [2 /*return*/, { hash: txHash }];
-                case 4:
+                case 3:
                     error_3 = _a.sent();
                     console.warn(error_3);
                     throw new Error('Transaction Execution Error');
-                case 5: return [2 /*return*/];
+                case 4: return [2 /*return*/];
             }
         });
     });

package/dist/services/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\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  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, // @todo Update with relayer address\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    // sentry error & thorw\n    console.warn(error);\n    throw new Error('Error executing transaction'); // @todo introduce error parsing\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('0');\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 estimateGas(\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}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string }> {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash } = await transactionModuleClient.executeTransaction(\n      txData,\n      targetContract,\n      metadata,\n    );\n    return { hash: txHash };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}
+{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\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  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, // @todo Update with relayer address\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    // sentry error & thorw\n    console.warn(error);\n    throw new Error('Error executing transaction'); // @todo introduce error parsing\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('0');\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 estimateGas(\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}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string }> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash } = await transactionModuleClient.executeTransaction(\n      { to: contractAddress, data: data },\n      targetContract,\n      metadata,\n    );\n    return { hash: txHash };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}

package/dist/services/lp/bridgeAndDepositPassivePool.js

@@ -41,6 +41,7 @@ var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
+var common_2 = require("@reyaxyz/common");
 var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var network, moneyInOutChainId, tokenInfo, amount, socketConnectors, peripheryAddress, _a, data, value, result;
     var _b;
@@ -51,6 +52,9 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
                 network = _c.sent();
                 moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 tokenInfo = (0, common_1.getTokenInfoByAddress)(params.pool.tokenAddress);
+                if (tokenInfo.name === 'RUSD') {
+                    tokenInfo = (0, common_2.getTokenInfoByName)('USDC', moneyInOutChainId);
+                }
                 amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,

package/dist/services/lp/bridgeAndDepositPassivePool.js.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAQyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5D,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC,CAAC;gBAEG,gBAAgB,GAAG,IAAA,8BAAU,EACjC,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,EACtD,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;qBAC1B,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAhDW,QAAA,2BAA2B,+BAgDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getTokenInfoByAddress,\n  getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenInfo.name,\n  });\n\n  const peripheryAddress = getAddress(\n    getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAQyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA6D;AAK7D,0CAAqD;AAE9C,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAGlE,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChE,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC9B,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAC5D,CAAC;gBAEK,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC,CAAC;gBAEG,gBAAgB,GAAG,IAAA,8BAAU,EACjC,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,EACtD,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;qBAC1B,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AArDW,QAAA,2BAA2B,+BAqDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getTokenInfoByAddress,\n  getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n} from './types';\nimport { getTokenInfoByName } from '@reyaxyz/common';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  // todo: to be removed once lp form in offchain/UI is fixed\n  let tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n  if (tokenInfo.name === 'RUSD') {\n    tokenInfo = getTokenInfoByName('USDC', moneyInOutChainId);\n  }\n\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenInfo.name,\n  });\n\n  const peripheryAddress = getAddress(\n    getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/token/approve.js

@@ -40,20 +40,22 @@ exports.approveTokenSpending = void 0;
 var types_1 = require("./types");
 var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_2 = require("@reyaxyz/common");
 var approveTokenSpending = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var underLyingTokenAddress, network, chainId, tokenContract, tokenInfo, contractProxyAddress, maxUint256Bn, approvalTransaction, error_1, _a, error_2;
+    var network, chainId, tokenInfo, tokenContract, contractProxyAddress, maxUint256Bn, approvalTransaction, error_1, _a, error_2;
     var _b;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
-            case 0:
-                underLyingTokenAddress = params.tokenAddress;
-                return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
+            case 0: return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
             case 1:
                 network = _d.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                tokenContract = (0, common_1.getERC20TokenContract)(underLyingTokenAddress, params.signer);
-                tokenInfo = (0, common_1.getTokenInfoByAddress)(underLyingTokenAddress);
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
+                if (types_1.ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
+                    tokenInfo = (0, common_2.getTokenInfoByName)('USDC', chainId);
+                }
+                tokenContract = (0, common_1.getERC20TokenContract)(tokenInfo.address, params.signer);
                 switch (params.type) {
                     case types_1.ApprovalType.DEPOSIT:
                         contractProxyAddress = (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.CORE_PROXY);
@@ -64,7 +66,7 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
                     case types_1.ApprovalType.BRIDGE:
                         contractProxyAddress = (0, common_1.getSocketVault)({
                             moneyInOutChainId: chainId,
-                            tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,
+                            tokenName: tokenInfo.name,
                         });
                         break;
                     default:
@@ -97,7 +99,7 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
                 _b = {};
                 return [4 /*yield*/, params.signer.getAddress()];
             case 7: return [4 /*yield*/, _a.apply(void 0, [(_b.walletAddress = _d.sent(),
-                        _b.tokenAddress = underLyingTokenAddress,
+                        _b.tokenAddress = tokenInfo.address,
                         _b.spenderAddress = contractProxyAddress,
                         _b.subject = params.signer,
                         _b)])];

package/dist/services/token/approve.js.map

@@ -1 +1 @@
-{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAMyB;AACzB,mEAAyE;AAElE,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEnC,aAAa,GAAG,IAAA,8BAAqB,EACzC,sBAAsB,EACtB,MAAM,CAAC,MAAM,CACd,CAAC;gBAEI,SAAS,GAAG,IAAA,8BAAqB,EAAC,sBAAsB,CAAC,CAAC;gBAGhE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;yBACvC,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACxE,CAAC;gBAGK,YAAY,GAAG,MAAM,CACzB,gFAAgF,CACjF,CAAC;gBAE0B,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC;yBAC3C,KAAK,CAAC,UAAC,KAAK;wBACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBACpD,CAAC,CAAC,EAAA;;gBANE,mBAAmB,GAAG,SAMxB;;;;gBAEF,qBAAM,mBAAmB,CAAC,IAAI,EAAE,EAAA;;gBAAhC,SAAgC,CAAC;;;;gBAEjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;;;gBAI5B,KAAA,0BAAiB,CAAA;;gBACb,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;oBAD1C,qBAAM,mBACX,gBAAa,GAAE,SAAgC;wBAC/C,eAAY,GAAE,sBAAsB;wBACpC,iBAAc,GAAE,oBAAoB;wBACpC,UAAO,GAAE,MAAM,CAAC,MAAM;6BACtB,EAAA;oBALF,sBAAO,SAKL,EAAC;;;gBAEH,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;;qBAG5C,sBAAO,CAAC,EAAC;;;KACV,CAAC;AAnEW,QAAA,oBAAoB,wBAmE/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport {\n  getERC20Allowance,\n  getERC20TokenContract,\n  getSocketVault,\n  GetSocketVaultParams,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const approveTokenSpending = async (\n  params: ApproveTokenParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.tokenAddress;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const tokenContract = getERC20TokenContract(\n    underLyingTokenAddress,\n    params.signer,\n  );\n\n  const tokenInfo = getTokenInfoByAddress(underLyingTokenAddress);\n\n  let contractProxyAddress;\n  switch (params.type) {\n    case ApprovalType.DEPOSIT:\n      contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n      break;\n    case ApprovalType.LP:\n      contractProxyAddress = getAddress(\n        chainId,\n        ContractType.PASSIVE_POOL_PROXY,\n      );\n      break;\n    case ApprovalType.BRIDGE:\n      contractProxyAddress = getSocketVault({\n        moneyInOutChainId: chainId,\n        tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,\n      } as GetSocketVaultParams);\n      break;\n    default:\n      throw new Error('Unexpected approval type in approveTokenSpending');\n  }\n\n  // @todo validate if maxAllowance should be passed from UI\n  const maxUint256Bn = BigInt(\n    '115792089237316195423570985008687907853269984665640564039457584007913129639935',\n  );\n\n  const approvalTransaction = await tokenContract\n    .approve(contractProxyAddress, maxUint256Bn)\n    .catch((error) => {\n      console.warn('Transaction Confirmation Error');\n      console.error(error);\n      throw new Error('Transaction Confirmation Error');\n    });\n  try {\n    await approvalTransaction.wait();\n  } catch (error) {\n    console.warn('Token approval failed');\n    throw new Error('Token approval failed');\n  }\n\n  try {\n    return await getERC20Allowance({\n      walletAddress: await params.signer.getAddress(),\n      tokenAddress: underLyingTokenAddress,\n      spenderAddress: contractProxyAddress,\n      subject: params.signer,\n    });\n  } catch (error) {\n    console.warn('Fetching allowance failed');\n  }\n\n  return 0;\n};\n"]}
+{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAMyB;AACzB,mEAAyE;AACzE,0CAAqD;AAE9C,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;oBAEV,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAGrC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,oBAAY,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACrD,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;gBAEK,aAAa,GAAG,IAAA,8BAAqB,EAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAG9E,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI;yBACF,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACxE,CAAC;gBAGK,YAAY,GAAG,MAAM,CACzB,gFAAgF,CACjF,CAAC;gBAE0B,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC;yBAC3C,KAAK,CAAC,UAAC,KAAK;wBACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBACpD,CAAC,CAAC,EAAA;;gBANE,mBAAmB,GAAG,SAMxB;;;;gBAEF,qBAAM,mBAAmB,CAAC,IAAI,EAAE,EAAA;;gBAAhC,SAAgC,CAAC;;;;gBAEjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;;;gBAI5B,KAAA,0BAAiB,CAAA;;gBACb,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;oBAD1C,qBAAM,mBACX,gBAAa,GAAE,SAAgC;wBAC/C,eAAY,GAAE,SAAS,CAAC,OAAO;wBAC/B,iBAAc,GAAE,oBAAoB;wBACpC,UAAO,GAAE,MAAM,CAAC,MAAM;6BACtB,EAAA;oBALF,sBAAO,SAKL,EAAC;;;gBAEH,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;;qBAG5C,sBAAO,CAAC,EAAC;;;KACV,CAAC;AAlEW,QAAA,oBAAoB,wBAkE/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport {\n  getERC20Allowance,\n  getERC20TokenContract,\n  getSocketVault,\n  GetSocketVaultParams,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { getTokenInfoByName } from '@reyaxyz/common';\n\nexport const approveTokenSpending = async (\n  params: ApproveTokenParams,\n): Promise<number> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  // todo: to be removed once lp form in offchain/UI is fixed\n  let tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {\n    tokenInfo = getTokenInfoByName('USDC', chainId);\n  }\n\n  const tokenContract = getERC20TokenContract(tokenInfo.address, params.signer);\n\n  let contractProxyAddress;\n  switch (params.type) {\n    case ApprovalType.DEPOSIT:\n      contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n      break;\n    case ApprovalType.LP:\n      contractProxyAddress = getAddress(\n        chainId,\n        ContractType.PASSIVE_POOL_PROXY,\n      );\n      break;\n    case ApprovalType.BRIDGE:\n      contractProxyAddress = getSocketVault({\n        moneyInOutChainId: chainId,\n        tokenName: tokenInfo.name,\n      } as GetSocketVaultParams);\n      break;\n    default:\n      throw new Error('Unexpected approval type in approveTokenSpending');\n  }\n\n  // @todo validate if maxAllowance should be passed from UI\n  const maxUint256Bn = BigInt(\n    '115792089237316195423570985008687907853269984665640564039457584007913129639935',\n  );\n\n  const approvalTransaction = await tokenContract\n    .approve(contractProxyAddress, maxUint256Bn)\n    .catch((error) => {\n      console.warn('Transaction Confirmation Error');\n      console.error(error);\n      throw new Error('Transaction Confirmation Error');\n    });\n  try {\n    await approvalTransaction.wait();\n  } catch (error) {\n    console.warn('Token approval failed');\n    throw new Error('Token approval failed');\n  }\n\n  try {\n    return await getERC20Allowance({\n      walletAddress: await params.signer.getAddress(),\n      tokenAddress: tokenInfo.address,\n      spenderAddress: contractProxyAddress,\n      subject: params.signer,\n    });\n  } catch (error) {\n    console.warn('Fetching allowance failed');\n  }\n\n  return 0;\n};\n"]}

package/dist/services/token/getAllowance.js

@@ -40,18 +40,20 @@ exports.getAllowance = void 0;
 var types_1 = require("./types");
 var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_2 = require("@reyaxyz/common");
 var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var underLyingTokenAddress, network, chainId, tokenInfo, contractProxyAddress, walletAddress, allowance;
+    var network, chainId, tokenInfo, contractProxyAddress, walletAddress, allowance;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0:
-                underLyingTokenAddress = params.tokenAddress;
-                return [4 /*yield*/, ((_a = params.signer.provider) === null || _a === void 0 ? void 0 : _a.getNetwork())];
+            case 0: return [4 /*yield*/, ((_a = params.signer.provider) === null || _a === void 0 ? void 0 : _a.getNetwork())];
             case 1:
                 network = _b.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                tokenInfo = (0, common_1.getTokenInfoByAddress)(underLyingTokenAddress);
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
+                if (types_1.ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
+                    tokenInfo = (0, common_2.getTokenInfoByName)('USDC', chainId);
+                }
                 switch (params.type) {
                     case types_1.ApprovalType.DEPOSIT:
                         contractProxyAddress = (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.CORE_PROXY);
@@ -62,7 +64,7 @@ var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0,
                     case types_1.ApprovalType.BRIDGE:
                         contractProxyAddress = (0, common_1.getSocketVault)({
                             moneyInOutChainId: chainId,
-                            tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,
+                            tokenName: tokenInfo.name,
                         });
                         break;
                     default:
@@ -73,7 +75,7 @@ var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0,
                 walletAddress = _b.sent();
                 return [4 /*yield*/, (0, common_1.getERC20Allowance)({
                         walletAddress: walletAddress,
-                        tokenAddress: underLyingTokenAddress,
+                        tokenAddress: tokenInfo.address,
                         spenderAddress: contractProxyAddress,
                         subject: params.signer,
                     })];

package/dist/services/token/getAllowance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAKyB;AACzB,mEAAyE;AAElE,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEnC,SAAS,GAAG,IAAA,8BAAqB,EAAC,sBAAsB,CAAC,CAAC;gBAGhE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;yBACvC,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAChE,CAAC;gBAE6B,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,sBAAsB;wBACpC,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAzCW,QAAA,YAAY,gBAyCvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport {\n  GetSocketVaultParams,\n  getERC20Allowance,\n  getSocketVault,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const getAllowance = async (\n  params: GetAllowanceParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.tokenAddress;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const tokenInfo = getTokenInfoByAddress(underLyingTokenAddress);\n\n  let contractProxyAddress;\n  switch (params.type) {\n    case ApprovalType.DEPOSIT:\n      contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n      break;\n    case ApprovalType.LP:\n      contractProxyAddress = getAddress(\n        chainId,\n        ContractType.PASSIVE_POOL_PROXY,\n      );\n      break;\n    case ApprovalType.BRIDGE:\n      contractProxyAddress = getSocketVault({\n        moneyInOutChainId: chainId,\n        tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,\n      } as GetSocketVaultParams);\n      break;\n    default:\n      throw new Error('Unexpected approval type in getAllowance');\n  }\n\n  const walletAddress: string = await params.signer.getAddress();\n\n  const allowance = await getERC20Allowance({\n    walletAddress,\n    tokenAddress: underLyingTokenAddress,\n    spenderAddress: contractProxyAddress,\n    subject: params.signer,\n  });\n\n  return allowance;\n};\n"]}
+{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAKyB;AACzB,mEAAyE;AACzE,0CAAqD;AAE9C,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;oBAEV,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAGrC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,oBAAY,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACrD,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;gBAGD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI;yBACF,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAChE,CAAC;gBAE6B,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,SAAS,CAAC,OAAO;wBAC/B,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AA3CW,QAAA,YAAY,gBA2CvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport {\n  GetSocketVaultParams,\n  getERC20Allowance,\n  getSocketVault,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { getTokenInfoByName } from '@reyaxyz/common';\n\nexport const getAllowance = async (\n  params: GetAllowanceParams,\n): Promise<number> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  // todo: to be removed once lp form in offchain/UI is fixed\n  let tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {\n    tokenInfo = getTokenInfoByName('USDC', chainId);\n  }\n\n  let contractProxyAddress;\n  switch (params.type) {\n    case ApprovalType.DEPOSIT:\n      contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n      break;\n    case ApprovalType.LP:\n      contractProxyAddress = getAddress(\n        chainId,\n        ContractType.PASSIVE_POOL_PROXY,\n      );\n      break;\n    case ApprovalType.BRIDGE:\n      contractProxyAddress = getSocketVault({\n        moneyInOutChainId: chainId,\n        tokenName: tokenInfo.name,\n      } as GetSocketVaultParams);\n      break;\n    default:\n      throw new Error('Unexpected approval type in getAllowance');\n  }\n\n  const walletAddress: string = await params.signer.getAddress();\n\n  const allowance = await getERC20Allowance({\n    walletAddress,\n    tokenAddress: tokenInfo.address,\n    spenderAddress: contractProxyAddress,\n    subject: params.signer,\n  });\n\n  return allowance;\n};\n"]}

package/dist/types/config/index.d.ts

@@ -3,13 +3,8 @@ export type BroadcastTransactionMetadata = {
     accountName?: string;
 };
 export type TxData = {
-    from: string;
     to: string;
     data: string;
-    value?: string;
-    gasLimit: bigint;
-    maxPriorityFeePerGas?: bigint;
-    maxFeePerGas?: bigint;
 };
 export declare class TransactionModule extends RestClient {
     executeTransaction(txData: TxData, contractType: string, metadata: BroadcastTransactionMetadata): Promise<{

package/dist/types/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,4BAA4B;gBAUX,MAAM;;CAUpC;AAQD,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAGF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,4BAA4B;gBAGX,MAAM;;CAUpC;AAQD,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAGF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAGnB,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;AAEF,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,CAiCA;AAED,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,uDAkBtC;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAoB3B"}
+{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAGnB,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;AAEF,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,CAiCA;AAED,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,uDAkBtC;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAkB3B"}

package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CA8C3C,CAAC"}
+{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAmD3C,CAAC"}

package/dist/types/services/token/approve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approve.d.ts","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAU3D,eAAO,MAAM,oBAAoB,WACvB,kBAAkB,KACzB,QAAQ,MAAM,CAiEhB,CAAC"}
+{"version":3,"file":"approve.d.ts","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW3D,eAAO,MAAM,oBAAoB,WACvB,kBAAkB,KACzB,QAAQ,MAAM,CAgEhB,CAAC"}

package/dist/types/services/token/getAllowance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAllowance.d.ts","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAS3D,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,MAAM,CAuChB,CAAC"}
+{"version":3,"file":"getAllowance.d.ts","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAU3D,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,MAAM,CAyChB,CAAC"}

package/dist/utils/routerCommands.js

@@ -23,7 +23,7 @@ var ABI_DEFINITION = (_a = {},
     _a[CommandType.MATCH_ORDER] = ['uint128[]', 'bytes'],
     _a[CommandType.PROPAGATE_CACHE_FLOW] = [],
     _a[CommandType.DUTCH_LIQUIDATION] = [],
-    _a[CommandType.TRANSFER_MARGIN_ACCOUNT] = [],
+    _a[CommandType.TRANSFER_MARGIN_ACCOUNT] = ['tuple(uint128,address,uint256)'],
     _a);
 function createCommand(type, parameters, marketId, exchangeId) {
     var encodedInput = ethers_1.AbiCoder.defaultAbiCoder().encode(ABI_DEFINITION[type], parameters);

package/dist/utils/routerCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,qDAAQ,CAAA;IACR,uEAAiB,CAAA;IACjB,2DAAW,CAAA;IACX,6EAAoB,CAAA;IACpB,mFAAuB,CAAA;AACzB,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,IAAM,cAAc;IAClB,GAAC,WAAW,CAAC,OAAO,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC7C,GAAC,WAAW,CAAC,QAAQ,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9C,GAAC,WAAW,CAAC,WAAW,IAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACjD,GAAC,WAAW,CAAC,oBAAoB,IAAG,EAAE;IACtC,GAAC,WAAW,CAAC,iBAAiB,IAAG,EAAE;IACnC,GAAC,WAAW,CAAC,uBAAuB,IAAG,EAAE;OAC1C,CAAC;AASF,SAAgB,aAAa,CAC3B,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,YAAY,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACpD,cAAc,CAAC,IAAI,CAAC,EACpB,UAAU,CACX,CAAC;IACF,OAAO,EAAE,IAAI,MAAA,EAAE,YAAY,cAAA,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CACxB,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;KACF,CAAC;AACJ,CAAC;AAfD,gCAeC","sourcesContent":["import { AbiCoder } from 'ethers';\nimport { SingleAction } from './action';\n\n/**\n * CommandTypes\n * @description Flags that modify a command's execution\n * @enum {number}\n */\nexport enum CommandType {\n  DEPOSIT,\n  WITHDRAW,\n  DUTCH_LIQUIDATION,\n  MATCH_ORDER,\n  PROPAGATE_CACHE_FLOW,\n  TRANSFER_MARGIN_ACCOUNT,\n}\n\nconst ABI_DEFINITION: { [key in CommandType]: string[] } = {\n  [CommandType.DEPOSIT]: ['address', 'uint256'],\n  [CommandType.WITHDRAW]: ['address', 'uint256'],\n  [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],\n  [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct\n  [CommandType.DUTCH_LIQUIDATION]: [], // @todo update once needed\n  [CommandType.TRANSFER_MARGIN_ACCOUNT]: [], // @todo update once needed\n};\n\nexport type RouterCommand = {\n  type: CommandType;\n  encodedInput: string;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport function createCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): RouterCommand {\n  const encodedInput = AbiCoder.defaultAbiCoder().encode(\n    ABI_DEFINITION[type],\n    parameters,\n  );\n  return { type, encodedInput, marketId, exchangeId };\n}\n\nexport function getCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): SingleAction {\n  const command = createCommand(type, parameters, marketId, exchangeId);\n  return {\n    command: {\n      commandType: command.type,\n      inputs: command.encodedInput,\n      marketId: command.marketId,\n      exchangeId: command.exchangeId,\n    },\n  };\n}\n"]}
+{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,qDAAQ,CAAA;IACR,uEAAiB,CAAA;IACjB,2DAAW,CAAA;IACX,6EAAoB,CAAA;IACpB,mFAAuB,CAAA;AACzB,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,IAAM,cAAc;IAClB,GAAC,WAAW,CAAC,OAAO,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC7C,GAAC,WAAW,CAAC,QAAQ,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9C,GAAC,WAAW,CAAC,WAAW,IAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACjD,GAAC,WAAW,CAAC,oBAAoB,IAAG,EAAE;IACtC,GAAC,WAAW,CAAC,iBAAiB,IAAG,EAAE;IACnC,GAAC,WAAW,CAAC,uBAAuB,IAAG,CAAC,gCAAgC,CAAC;OAC1E,CAAC;AASF,SAAgB,aAAa,CAC3B,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,YAAY,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACpD,cAAc,CAAC,IAAI,CAAC,EACpB,UAAU,CACX,CAAC;IACF,OAAO,EAAE,IAAI,MAAA,EAAE,YAAY,cAAA,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CACxB,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;KACF,CAAC;AACJ,CAAC;AAfD,gCAeC","sourcesContent":["import { AbiCoder } from 'ethers';\nimport { SingleAction } from './action';\n\n/**\n * CommandTypes\n * @description Flags that modify a command's execution\n * @enum {number}\n */\nexport enum CommandType {\n  DEPOSIT,\n  WITHDRAW,\n  DUTCH_LIQUIDATION,\n  MATCH_ORDER,\n  PROPAGATE_CACHE_FLOW,\n  TRANSFER_MARGIN_ACCOUNT,\n}\n\nconst ABI_DEFINITION: { [key in CommandType]: string[] } = {\n  [CommandType.DEPOSIT]: ['address', 'uint256'],\n  [CommandType.WITHDRAW]: ['address', 'uint256'],\n  [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],\n  [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct\n  [CommandType.DUTCH_LIQUIDATION]: [], // @todo update once needed\n  [CommandType.TRANSFER_MARGIN_ACCOUNT]: ['tuple(uint128,address,uint256)'], // @todo update once needed\n};\n\nexport type RouterCommand = {\n  type: CommandType;\n  encodedInput: string;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport function createCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): RouterCommand {\n  const encodedInput = AbiCoder.defaultAbiCoder().encode(\n    ABI_DEFINITION[type],\n    parameters,\n  );\n  return { type, encodedInput, marketId, exchangeId };\n}\n\nexport function getCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): SingleAction {\n  const command = createCommand(type, parameters, marketId, exchangeId);\n  return {\n    command: {\n      commandType: command.type,\n      inputs: command.encodedInput,\n      marketId: command.marketId,\n      exchangeId: command.exchangeId,\n    },\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -15,7 +15,7 @@
   ],
   "scripts": {
     "prebuild": "rm -rf node_modules && rm -rf dist",
-    "build": "tsc -p tsconfig.build.json",
+    "build": "rm -rf dist && tsc -p tsconfig.build.json",
     "ts:check-types": "npx tsc --noEmit",
     "ts:circular-check": "dpdm --no-output --no-tree --no-warning --exit-code circular:1 -T src/index.ts",
     "ts:check": "pnpm ts:check-types && pnpm ts:circular-check",
@@ -29,10 +29,10 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.49.0",
+    "@reyaxyz/common": "0.49.1",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "33916d67f37134f5c53d55c95753bb7ea13d4e58"
+  "gitHead": "89a27e4a2c7e29c5f99496218fa8f57c141da7d0"
 }

package/src/config/index.ts

@@ -5,13 +5,8 @@ export type BroadcastTransactionMetadata = {
 };
 
 export type TxData = {
-  from: string;
   to: string;
   data: string;
-  value?: string;
-  gasLimit: bigint;
-  maxPriorityFeePerGas?: bigint;
-  maxFeePerGas?: bigint;
 };
 export class TransactionModule extends RestClient {
   async executeTransaction(
@@ -19,19 +14,12 @@ export class TransactionModule extends RestClient {
     contractType: string,
     metadata: BroadcastTransactionMetadata,
   ) {
-    // convert from big number
-    const tx = {
-      ...txData,
-      gasLimit: String(txData.gasLimit),
-      maxPriorityFeePerGas: String(txData.maxPriorityFeePerGas),
-      maxFeePerGas: String(txData.maxFeePerGas),
-    };
     const uri = `/api/transaction/execute`;
     return this.post<{ txHash: string }>(
       uri,
       {},
       {
-        txData: tx,
+        txData: txData,
         contractType,
         metadata,
       },

package/src/services/encode.ts

@@ -34,7 +34,7 @@ export const encodeSingleTransferMargin = (
   multiAction.newAction(
     getCommand(
       CommandType.TRANSFER_MARGIN_ACCOUNT,
-      [toMarginAccountId, token, amount],
+      [[toMarginAccountId, token, amount]],
       0,
       0,
     ),

package/src/services/executeTransaction.ts

@@ -94,17 +94,15 @@ export async function signAndBroadcastTransaction(
   targetContract: ContractType | string,
   metadata: BroadcastTransactionMetadata,
 ): Promise<{ hash: string }> {
-  const txData = await estimateGas(
-    signer,
-    data,
-    value,
-    chainId,
-    targetContract,
-  );
+  const contractAddress = Object.values(ContractType).includes(
+    targetContract as ContractType,
+  )
+    ? getAddress(chainId, targetContract as ContractType)
+    : targetContract;
   try {
     const transactionModuleClient = getTransactionModuleClient();
     const { txHash } = await transactionModuleClient.executeTransaction(
-      txData,
+      { to: contractAddress, data: data },
       targetContract,
       metadata,
     );

package/src/services/lp/bridgeAndDepositPassivePool.ts

@@ -14,6 +14,7 @@ import {
   BridgeAndDepositPassivePoolParams,
   BridgeAndDepositPassivePoolResult,
 } from './types';
+import { getTokenInfoByName } from '@reyaxyz/common';
 
 export const bridgeAndDepositPassivePool = async (
   params: BridgeAndDepositPassivePoolParams,
@@ -21,7 +22,12 @@ export const bridgeAndDepositPassivePool = async (
   const network = await params.signer.provider?.getNetwork();
   const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);
 
-  const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
+  // todo: to be removed once lp form in offchain/UI is fixed
+  let tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
+  if (tokenInfo.name === 'RUSD') {
+    tokenInfo = getTokenInfoByName('USDC', moneyInOutChainId);
+  }
+
   const amount = scale(tokenInfo.decimals)(params.amount);
 
   const socketConnectors = getSocketConnectors({

package/src/services/token/approve.ts

@@ -7,21 +7,21 @@ import {
   getTokenInfoByAddress,
 } from '@reyaxyz/common';
 import { ContractType, getAddress } from '../../utils/contractAddresses';
+import { getTokenInfoByName } from '@reyaxyz/common';
 
 export const approveTokenSpending = async (
   params: ApproveTokenParams,
 ): Promise<number> => {
-  const underLyingTokenAddress = params.tokenAddress;
-
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);
 
-  const tokenContract = getERC20TokenContract(
-    underLyingTokenAddress,
-    params.signer,
-  );
+  // todo: to be removed once lp form in offchain/UI is fixed
+  let tokenInfo = getTokenInfoByAddress(params.tokenAddress);
+  if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
+    tokenInfo = getTokenInfoByName('USDC', chainId);
+  }
 
-  const tokenInfo = getTokenInfoByAddress(underLyingTokenAddress);
+  const tokenContract = getERC20TokenContract(tokenInfo.address, params.signer);
 
   let contractProxyAddress;
   switch (params.type) {
@@ -37,7 +37,7 @@ export const approveTokenSpending = async (
     case ApprovalType.BRIDGE:
       contractProxyAddress = getSocketVault({
         moneyInOutChainId: chainId,
-        tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,
+        tokenName: tokenInfo.name,
       } as GetSocketVaultParams);
       break;
     default:
@@ -66,7 +66,7 @@ export const approveTokenSpending = async (
   try {
     return await getERC20Allowance({
       walletAddress: await params.signer.getAddress(),
-      tokenAddress: underLyingTokenAddress,
+      tokenAddress: tokenInfo.address,
       spenderAddress: contractProxyAddress,
       subject: params.signer,
     });

package/src/services/token/getAllowance.ts

@@ -6,16 +6,19 @@ import {
   getTokenInfoByAddress,
 } from '@reyaxyz/common';
 import { ContractType, getAddress } from '../../utils/contractAddresses';
+import { getTokenInfoByName } from '@reyaxyz/common';
 
 export const getAllowance = async (
   params: GetAllowanceParams,
 ): Promise<number> => {
-  const underLyingTokenAddress = params.tokenAddress;
-
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);
 
-  const tokenInfo = getTokenInfoByAddress(underLyingTokenAddress);
+  // todo: to be removed once lp form in offchain/UI is fixed
+  let tokenInfo = getTokenInfoByAddress(params.tokenAddress);
+  if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
+    tokenInfo = getTokenInfoByName('USDC', chainId);
+  }
 
   let contractProxyAddress;
   switch (params.type) {
@@ -31,7 +34,7 @@ export const getAllowance = async (
     case ApprovalType.BRIDGE:
       contractProxyAddress = getSocketVault({
         moneyInOutChainId: chainId,
-        tokenName: tokenInfo.name === 'RUSD' ? 'USDC' : tokenInfo.name,
+        tokenName: tokenInfo.name,
       } as GetSocketVaultParams);
       break;
     default:
@@ -42,7 +45,7 @@ export const getAllowance = async (
 
   const allowance = await getERC20Allowance({
     walletAddress,
-    tokenAddress: underLyingTokenAddress,
+    tokenAddress: tokenInfo.address,
     spenderAddress: contractProxyAddress,
     subject: params.signer,
   });

package/src/utils/routerCommands.ts

@@ -21,7 +21,7 @@ const ABI_DEFINITION: { [key in CommandType]: string[] } = {
   [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],
   [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct
   [CommandType.DUTCH_LIQUIDATION]: [], // @todo update once needed
-  [CommandType.TRANSFER_MARGIN_ACCOUNT]: [], // @todo update once needed
+  [CommandType.TRANSFER_MARGIN_ACCOUNT]: ['tuple(uint128,address,uint256)'], // @todo update once needed
 };
 
 export type RouterCommand = {