@reyaxyz/sdk 0.122.2 → 0.123.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-8.36%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-3.93%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4.81%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-7.85%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-8.37%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-3.76%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4.59%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-7.9%25-red.svg?style=flat) |
 

package/dist/config/index.js

@@ -51,7 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAlphaTermsModuleClient = exports.getTransactionModuleClient = exports.configureSDK = exports.getSdkEnvironment = exports.AlphaTermsModule = exports.TransactionModule = void 0;
+exports.getGeneralRestModuleClient = exports.getAlphaTermsModuleClient = exports.getTransactionModuleClient = exports.configureSDK = exports.getSdkEnvironment = exports.GeneralRestModule = exports.AlphaTermsModule = exports.TransactionModule = void 0;
 var common_1 = require("@reyaxyz/common");
 var TransactionModule = /** @class */ (function (_super) {
     __extends(TransactionModule, _super);
@@ -110,9 +110,25 @@ var AlphaTermsModule = /** @class */ (function (_super) {
     return AlphaTermsModule;
 }(common_1.RestClient));
 exports.AlphaTermsModule = AlphaTermsModule;
+var GeneralRestModule = /** @class */ (function (_super) {
+    __extends(GeneralRestModule, _super);
+    function GeneralRestModule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    GeneralRestModule.prototype.getSpotMarkets = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.get('/api/spot-markets')];
+            });
+        });
+    };
+    return GeneralRestModule;
+}(common_1.RestClient));
+exports.GeneralRestModule = GeneralRestModule;
 // Internal state
 var transactionModule = new TransactionModule(common_1.API_CLIENT_CONFIGS['test'].apiEndpoint);
 var alphaTermsModule = new AlphaTermsModule(common_1.API_CLIENT_CONFIGS['test'].apiEndpoint);
+var generalRestModule = new GeneralRestModule(common_1.API_CLIENT_CONFIGS['test'].apiEndpoint);
 var sdkEnv = 'test';
 var getSdkEnvironment = function () {
     return sdkEnv;
@@ -124,6 +140,7 @@ var configureSDK = function (environment) {
     sdkEnv = environment;
     transactionModule = new TransactionModule(config.apiEndpoint);
     alphaTermsModule = new AlphaTermsModule(config.apiEndpoint);
+    generalRestModule = new GeneralRestModule(config.apiEndpoint);
 };
 exports.configureSDK = configureSDK;
 var getTransactionModuleClient = function () {
@@ -138,4 +155,10 @@ var getAlphaTermsModuleClient = function () {
     return alphaTermsModule;
 };
 exports.getAlphaTermsModuleClient = getAlphaTermsModuleClient;
+var getGeneralRestModuleClient = function () {
+    if (!transactionModule)
+        throw new Error('SDK is not configured! Call configureSDK()');
+    return generalRestModule;
+};
+exports.getGeneralRestModuleClient = getGeneralRestModuleClient;
 //# sourceMappingURL=index.js.map

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AAYzB;IAAuC,qCAAU;IAAjD;;IAwCA,CAAC;IAvCO,8CAAkB,GAAxB,UACE,MAAc,EACd,eAAuB,EACvB,QAAsC;;;;gBAEhC,GAAG,GAAG,uCAAuC,CAAC;gBACpD,uFAAuF;gBACvF,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,MAAM,EAAE,MAAM;wBACd,eAAe,iBAAA;wBACf,QAAQ,UAAA;qBACT,CACF,EAAC;;;KACH;IAEK,kDAAsB,GAA5B,UACE,eAAuB,EACvB,eAAuB,EACvB,aAAqB,EACrB,MAAc,EACd,OAAe,EACf,IAAY;;;;gBAEN,GAAG,GAAG,wBAAiB,eAAe,8BAA2B,CAAC;gBACxE,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,OAAO,EAAE,eAAe;wBACxB,eAAe,EAAE,aAAa;wBAC9B,MAAM,QAAA;wBACN,QAAQ,EAAE,OAAO;wBACjB,IAAI,EAAE,IAAI;qBACX,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAxCD,CAAuC,mBAAU,GAwChD;AAxCY,8CAAiB;AA0C9B;IAAsC,oCAAU;IAAhD;;IAUA,CAAC;IATO,iDAAsB,GAA5B,UAA6B,MAAsB;;;;gBAE3C,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;gBAChC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;gBACvD,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBAErC,GAAG,GAAG,2BAA2B,CAAC;gBACxC,sBAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAC;;;KACvD;IACH,uBAAC;AAAD,CAAC,AAVD,CAAsC,mBAAU,GAU/C;AAVY,4CAAgB;AAY7B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AACF,IAAI,gBAAgB,GAAqB,IAAI,gBAAgB,CAC3D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,IAAI,MAAM,GAAiC,MAAM,CAAC;AAE3C,IAAM,iBAAiB,GAAG;IAC/B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B;AACF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,IAAM,MAAM,GAAG,2BAAkB,CAAC,WAAW,CAAC,IAAI,2BAAkB,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,GAAG,WAAW,CAAC;IACrB,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9D,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9D,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB;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;AAEK,IAAM,yBAAyB,GAAG;IACvC,IAAI,CAAC,gBAAgB;QACnB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAJW,QAAA,yBAAyB,6BAIpC","sourcesContent":["import {\n  Address,\n  API_CLIENT_CONFIGS,\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\ntype AlphaTermsData = {\n  walletAddress: Address;\n  link: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ) {\n    const uri = `/api/transaction-gelato/executeGelato`;\n    // const uri = `/api/transaction/execute`; //switch between Gelato and internal relayer\n    return this.post<TransactionExecutionOutput>(\n      uri,\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class AlphaTermsModule extends RestClient {\n  async registerAlphaSignature(params: AlphaTermsData): Promise<void> {\n    // Build formData object.\n    const formData = new FormData();\n    formData.append('walletAddress', params.walletAddress);\n    formData.append('signedLink', params.link);\n\n    const uri = '/api/tos/alpha-signatures';\n    return this.post(uri, undefined, formData, undefined);\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\nlet alphaTermsModule: AlphaTermsModule = new AlphaTermsModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\nlet sdkEnv: ServiceConfig['environment'] = 'test';\n\nexport const getSdkEnvironment = (): ServiceConfig['environment'] => {\n  return sdkEnv;\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  sdkEnv = environment;\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  alphaTermsModule = new AlphaTermsModule(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\nexport const getAlphaTermsModuleClient = (): AlphaTermsModule => {\n  if (!alphaTermsModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return alphaTermsModule;\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Address,\n  API_CLIENT_CONFIGS,\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n  SpotMarketEntity,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\ntype AlphaTermsData = {\n  walletAddress: Address;\n  link: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ) {\n    const uri = `/api/transaction-gelato/executeGelato`;\n    // const uri = `/api/transaction/execute`; //switch between Gelato and internal relayer\n    return this.post<TransactionExecutionOutput>(\n      uri,\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class AlphaTermsModule extends RestClient {\n  async registerAlphaSignature(params: AlphaTermsData): Promise<void> {\n    // Build formData object.\n    const formData = new FormData();\n    formData.append('walletAddress', params.walletAddress);\n    formData.append('signedLink', params.link);\n\n    const uri = '/api/tos/alpha-signatures';\n    return this.post(uri, undefined, formData, undefined);\n  }\n}\n\nexport class GeneralRestModule extends RestClient {\n  async getSpotMarkets(): Promise<SpotMarketEntity[]> {\n    return this.get<SpotMarketEntity[]>('/api/spot-markets');\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\nlet alphaTermsModule: AlphaTermsModule = new AlphaTermsModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\nlet generalRestModule: GeneralRestModule = new GeneralRestModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\nlet sdkEnv: ServiceConfig['environment'] = 'test';\n\nexport const getSdkEnvironment = (): ServiceConfig['environment'] => {\n  return sdkEnv;\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  sdkEnv = environment;\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  alphaTermsModule = new AlphaTermsModule(config.apiEndpoint);\n  generalRestModule = new GeneralRestModule(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\nexport const getAlphaTermsModuleClient = (): AlphaTermsModule => {\n  if (!alphaTermsModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return alphaTermsModule;\n};\n\nexport const getGeneralRestModuleClient = (): GeneralRestModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return generalRestModule;\n};\n"]}

package/dist/services/swaps/encode.js

@@ -62,19 +62,23 @@ var encodeSwap = function (signer, chainId, coreSigNonce, accountId, amountIn, a
 }); };
 exports.encodeSwap = encodeSwap;
 var encodeSwapSimulation = function (signer, chainId, coreSigNonce, accountId, amountIn, amountOut, path, adapters, recipients, marketId, exchangeId, publisherAddress) { return __awaiter(void 0, void 0, void 0, function () {
-    var multiAction, _a, eip712Signature, eip712Payload, value, functionSignature, parameters, INTERFACE, calldata;
+    var multiAction, emptyBytes, _a, eip712Signature, eip712Payload, value, functionSignature, parameters, INTERFACE, calldata;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 multiAction = new common_1.MultiAction();
                 (0, encode_1.encodeSingleSwap)(amountIn, amountOut, path, adapters, recipients, marketId, exchangeId, multiAction);
-                return [4 /*yield*/, (0, common_1.signCoreCommands)(signer, chainId, (0, common_1.convertToAddress)(publisherAddress), accountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.CORE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
+                emptyBytes = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode([], []);
+                return [4 /*yield*/, (0, common_1.signCoreCommands)(signer, chainId, (0, common_1.convertToAddress)(publisherAddress), accountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.CORE_DEADLINE_IN_SECONDS, emptyBytes)];
             case 1:
                 _a = _b.sent(), eip712Signature = _a.signature, eip712Payload = _a.payload;
                 value = BigInt(0);
                 functionSignature = 'executeBySig';
                 parameters = [
-                    { accountId: accountId, commands: multiAction.commands, sig: eip712Signature },
+                    accountId,
+                    multiAction.commands,
+                    eip712Signature,
+                    emptyBytes,
                 ];
                 INTERFACE = new ethers_1.Interface(common_1.CoreAbi);
                 calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

package/dist/services/swaps/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/swaps/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { ethers, Interface, Signer } from 'ethers';\nimport { MethodParametersAndEIP712Payload } from '../orders';\nimport {\n  ContractType,\n  convertToAddress,\n  CoreAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  getAddress,\n  getCurrentTimestampInSeconds,\n  MultiAction,\n  signCoreCommands,\n} from '@reyaxyz/common';\nimport { encodeSingleSwap } from '../encode';\n\nexport const encodeSwap = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  amountIn: number,\n  amountOut: number,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParametersAndEIP712Payload> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleSwap(\n    amountIn,\n    amountOut,\n    path,\n    adapters,\n    recipients,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const { signature: eip712Signature, payload: eip712Payload } =\n    await signCoreCommands(\n      signer,\n      chainId,\n      getAddress(chainId, ContractType.PERIPHERY_PROXY),\n      accountId,\n      multiAction.commands,\n      coreSigNonce + 1,\n      getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n      ethers.AbiCoder.defaultAbiCoder().encode([], []),\n    );\n\n  const value = BigInt(0);\n\n  return {\n    calldata: '', // not sending calldata to API anymore\n    value: BigInt(value).toString(10),\n    signature: eip712Signature,\n    payload: eip712Payload,\n  };\n};\n\nexport const encodeSwapSimulation = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  amountIn: number,\n  amountOut: number,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n  publisherAddress: string,\n): Promise<MethodParametersAndEIP712Payload> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleSwap(\n    amountIn,\n    amountOut,\n    path,\n    adapters,\n    recipients,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const { signature: eip712Signature, payload: eip712Payload } =\n    await signCoreCommands(\n      signer,\n      chainId,\n      convertToAddress(publisherAddress),\n      accountId,\n      multiAction.commands,\n      coreSigNonce + 1,\n      getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n      ethers.AbiCoder.defaultAbiCoder().encode([], []), // @todo check this\n    );\n\n  const value = BigInt(0);\n\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\n  ];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n    signature: eip712Signature,\n    payload: eip712Payload,\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/swaps/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { ethers, Interface, Signer } from 'ethers';\nimport { MethodParametersAndEIP712Payload } from '../orders';\nimport {\n  ContractType,\n  convertToAddress,\n  CoreAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  getAddress,\n  getCurrentTimestampInSeconds,\n  MultiAction,\n  signCoreCommands,\n} from '@reyaxyz/common';\nimport { encodeSingleSwap } from '../encode';\n\nexport const encodeSwap = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  amountIn: number,\n  amountOut: number,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParametersAndEIP712Payload> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleSwap(\n    amountIn,\n    amountOut,\n    path,\n    adapters,\n    recipients,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const { signature: eip712Signature, payload: eip712Payload } =\n    await signCoreCommands(\n      signer,\n      chainId,\n      getAddress(chainId, ContractType.PERIPHERY_PROXY),\n      accountId,\n      multiAction.commands,\n      coreSigNonce + 1,\n      getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n      ethers.AbiCoder.defaultAbiCoder().encode([], []),\n    );\n\n  const value = BigInt(0);\n\n  return {\n    calldata: '', // not sending calldata to API anymore\n    value: BigInt(value).toString(10),\n    signature: eip712Signature,\n    payload: eip712Payload,\n  };\n};\n\nexport const encodeSwapSimulation = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  amountIn: number,\n  amountOut: number,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n  publisherAddress: string,\n): Promise<MethodParametersAndEIP712Payload> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleSwap(\n    amountIn,\n    amountOut,\n    path,\n    adapters,\n    recipients,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const emptyBytes = ethers.AbiCoder.defaultAbiCoder().encode([], []);\n\n  const { signature: eip712Signature, payload: eip712Payload } =\n    await signCoreCommands(\n      signer,\n      chainId,\n      convertToAddress(publisherAddress),\n      accountId,\n      multiAction.commands,\n      coreSigNonce + 1,\n      getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n      emptyBytes,\n    );\n\n  const value = BigInt(0);\n\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    accountId,\n    multiAction.commands,\n    eip712Signature,\n    emptyBytes,\n  ];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n    signature: eip712Signature,\n    payload: eip712Payload,\n  };\n};\n"]}

package/dist/services/swaps/simulation.js

@@ -145,7 +145,7 @@ exports.findBestPath = findBestPath;
 // Simulates sending the swap directly to Core using the publisher as msg.sender
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var simulateCoreCamelotSwap = function (params, bestPath) { return __awaiter(void 0, void 0, void 0, function () {
-    var env, chainId, provider, data, tx, result, iface, decodedResult;
+    var env, chainId, provider, data, tx, result, iface, decodedResult, executedPrice;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -159,37 +159,63 @@ var simulateCoreCamelotSwap = function (params, bestPath) { return __awaiter(voi
                 data = (_a.sent()).calldata;
                 tx = {
                     from: common_1.PUBLISHER_ACCOUNT,
-                    to: common_1.ContractType.CORE_PROXY,
+                    to: (0, common_1.getAddress)(chainId, common_1.ContractType.CORE_PROXY),
                     data: data,
                 };
                 return [4 /*yield*/, provider.call(tx)];
             case 2:
                 result = _a.sent();
-                iface = new ethers_1.ethers.Interface(common_1.PeripheryAbi);
+                iface = new ethers_1.ethers.Interface(common_1.CoreAbi);
                 decodedResult = iface.decodeFunctionResult('executeBySig', result);
+                executedPrice = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode(['uint256'], decodedResult[0][0])[0];
                 return [2 /*return*/, {
-                        marginRatio: (0, bignumber_js_1.default)(decodedResult.usdNodeMarginInfo.liquidationMarginRequirement)
-                            .div(decodedResult.usdNodeMarginInfo.marginBalance)
+                        marginRatio: (0, bignumber_js_1.default)(decodedResult[1][9])
+                            .div(decodedResult[1][1])
                             .toNumber(),
-                        executedPrice: Number(ethers_1.ethers.toBigInt(ethers_1.ethers.getBytes(decodedResult.output[0]))),
+                        executedPrice: (0, common_1.descale)(18)(executedPrice),
                     }];
         }
     });
 }); };
 var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var bestPathResult;
+    var bestPathResult, simulation, restModule, markets, market, estimatedSlippage, marketReversed;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, exports.findBestPath)(params.amountFrom, params.tokenFrom, params.tokenTo)];
             case 1:
                 bestPathResult = _a.sent();
-                // todo: uncomment after testing
-                // const simulation = await simulateCoreCamelotSwap(params, bestPathResult);
+                return [4 /*yield*/, simulateCoreCamelotSwap(params, bestPathResult)];
+            case 2:
+                simulation = _a.sent();
+                restModule = (0, config_1.getGeneralRestModuleClient)();
+                return [4 /*yield*/, restModule.getSpotMarkets()];
+            case 3:
+                markets = _a.sent();
+                market = markets.find(function (m) {
+                    return (m.quoteToken.address == params.tokenFrom.toLowerCase() &&
+                        m.underlyingAsset.address == params.tokenTo.toLowerCase());
+                });
+                estimatedSlippage = 0;
+                if (market != undefined) {
+                    estimatedSlippage =
+                        (market.price - simulation.executedPrice) / market.price;
+                }
+                else {
+                    marketReversed = markets.find(function (m) {
+                        return (m.underlyingAsset.address == params.tokenFrom.toLowerCase() &&
+                            m.quoteToken.address == params.tokenTo.toLowerCase());
+                    });
+                    if (marketReversed != undefined) {
+                        estimatedSlippage =
+                            (1 / marketReversed.price - simulation.executedPrice) /
+                                (1 / marketReversed.price);
+                    }
+                }
                 return [2 /*return*/, {
                         bestPath: bestPathResult,
-                        estimatedSlippage: 0.013, // TODO: IR
-                        marginRatio: 0.013,
-                        marginRatioHealth: common_1.ExposureCommand.evaluateHealthStatus(0.013),
+                        estimatedSlippage: estimatedSlippage,
+                        marginRatio: simulation.marginRatio,
+                        marginRatioHealth: common_1.ExposureCommand.evaluateHealthStatus(simulation.marginRatio),
                     }];
         }
     });

package/dist/services/swaps/simulation.js.map

@@ -1 +1 @@
-{"version":3,"file":"simulation.js","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAWyB;AACzB,iCAA0C;AAO1C,uCAAiD;AACjD,mCAAgD;AAChD,8DAAqC;AACrC,IAAM,UAAU,GAAG;IACjB;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,WAAW;aAClB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE;YACP;gBACE,UAAU,EAAE;oBACV;wBACE,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,WAAW;qBAClB;oBACD;wBACE,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,WAAW;qBAClB;oBACD;wBACE,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,WAAW;qBAClB;oBACD;wBACE,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,WAAW;qBAClB;oBACD;wBACE,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,SAAS;qBAChB;iBACF;gBACD,YAAY,EAAE,uBAAuB;gBACrC,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;aACd;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAEK,IAAM,YAAY,GAAG,UAC1B,UAAkB,EAClB,SAAiB,EACjB,OAAe,EACf,QAAiB;;;;;gBAEX,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACvE,QAAQ,GAAG,eAAM,CAAC,kBAAkB,CACxC,6BAAoB,CAAC,OAAO,CAAW,CACxC,CAAC;gBACI,cAAc,GAAG,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,kBAAkB,CAAC,CAAC;gBACtE,OAAO,GAAG,IAAI,iBAAQ,CAAC,cAAc,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAE7D,aAAa,GAAG,IAAA,8BAAqB,EAAC,SAAS,CAAC,CAAC;gBACjD,WAAW,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;gBAC7C,gBAAgB,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC;gBAOpD,qBAAM,OAAO,CAAC,YAAY,CACvC,gBAAgB,EAChB,SAAS,EACT,OAAO,EACP,EAAE,EACF,QAAQ,IAAI,CAAC,CACd,EAAA;;gBANK,MAAM,GAAG,SAMd;gBACD,sBAAO;wBACL,UAAU,EAAE,IAAA,gBAAO,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC9D,QAAQ,EAAE,IAAA,gBAAO,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC1D,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;wBAC/B,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;wBAChC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC/B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC3B,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;qBAClC,EAAC;;;KACH,CAAC;AAvCW,QAAA,YAAY,gBAuCvB;AAEF,gFAAgF;AAChF,6DAA6D;AAC7D,IAAM,uBAAuB,GAAG,UAC9B,MAA0B,EAC1B,QAA4B;;;;;gBAEtB,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBACvE,QAAQ,GAAG,eAAM,CAAC,kBAAkB,CACxC,6BAAoB,CAAC,OAAO,CAAW,CACxC,CAAC;gBAEyB,qBAAM,IAAA,6BAAoB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,eAAe,EACtB,QAAQ,CAAC,YAAY,EACrB,QAAQ,CAAC,aAAa,EACtB,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,UAAU,EACnB,CAAC,EAAE,iBAAiB;oBACpB,CAAC,EAAE,mBAAmB;oBACtB,0BAAiB,CAClB,EAAA;;gBAbiB,IAAI,GAAK,CAAA,SAa1B,CAAA,SAbqB;gBAehB,EAAE,GAAG;oBACT,IAAI,EAAE,0BAAiB;oBACvB,EAAE,EAAE,qBAAY,CAAC,UAAU;oBAC3B,IAAI,MAAA;iBACL,CAAC;gBAEa,qBAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAA;;gBAAhC,MAAM,GAAG,SAAuB;gBAChC,KAAK,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,qBAAY,CAAC,CAAC;gBAC3C,aAAa,GAAG,KAAK,CAAC,oBAAoB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;gBAEzE,sBAAO;wBACL,WAAW,EAAE,IAAA,sBAAS,EACpB,aAAa,CAAC,iBAAiB,CAAC,4BAA4B,CAC7D;6BACE,GAAG,CAAC,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC;6BAClD,QAAQ,EAAE;wBACb,aAAa,EAAE,MAAM,CACnB,eAAM,CAAC,QAAQ,CAAC,eAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAC1D;qBACF,EAAC;;;KACH,CAAC;AAEK,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;oBAEH,qBAAM,IAAA,oBAAY,EACvC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,OAAO,CACf,EAAA;;gBAJK,cAAc,GAAG,SAItB;gBAED,gCAAgC;gBAChC,4EAA4E;gBAE5E,sBAAO;wBACL,QAAQ,EAAE,cAAc;wBACxB,iBAAiB,EAAE,KAAK,EAAE,WAAW;wBACrC,WAAW,EAAE,KAAK;wBAClB,iBAAiB,EAAE,wBAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC;qBAC/D,EAAC;;;KACH,CAAC;AAlBW,QAAA,YAAY,gBAkBvB","sourcesContent":["import {\n  ContractType,\n  descale,\n  getAddress,\n  getReyaNetwork,\n  getTokenInfoByAddress,\n  scale,\n  reyaChainIdRPCMapper,\n  ExposureCommand,\n  PeripheryAbi,\n  PUBLISHER_ACCOUNT,\n} from '@reyaxyz/common';\nimport { Contract, ethers } from 'ethers';\nimport {\n  FindBestPathResult,\n  SimulateCoreCamelotSwapResult,\n  SimulateSwapParams,\n  SimulateSwapResult,\n} from './types';\nimport { getSdkEnvironment } from '../../config';\nimport { encodeSwapSimulation } from './encode';\nimport BigNumber from 'bignumber.js';\nconst CamelotAbi = [\n  {\n    inputs: [\n      {\n        internalType: 'uint256',\n        name: '_amountIn',\n        type: 'uint256',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenIn',\n        type: 'address',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenOut',\n        type: 'address',\n      },\n      {\n        internalType: 'address[]',\n        name: '_trustedTokens',\n        type: 'address[]',\n      },\n      {\n        internalType: 'uint256',\n        name: '_maxSteps',\n        type: 'uint256',\n      },\n    ],\n    name: 'findBestPath',\n    outputs: [\n      {\n        components: [\n          {\n            internalType: 'uint256[]',\n            name: 'amounts',\n            type: 'uint256[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'adapters',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'path',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'recipients',\n            type: 'address[]',\n          },\n          {\n            internalType: 'uint256',\n            name: 'gasEstimate',\n            type: 'uint256',\n          },\n        ],\n        internalType: 'struct FormattedOffer',\n        name: '',\n        type: 'tuple',\n      },\n    ],\n    stateMutability: 'view',\n    type: 'function',\n  },\n];\n\nexport const findBestPath = async (\n  amountFrom: number,\n  tokenFrom: string,\n  tokenTo: string,\n  maxSteps?: number,\n): Promise<FindBestPathResult> => {\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const camelotAddress = getAddress(chainId, ContractType.CAMELOT_YAK_ROUTER);\n  const camelot = new Contract(camelotAddress, CamelotAbi, provider);\n\n  const tokenInfoFrom = getTokenInfoByAddress(tokenFrom);\n  const tokenInfoTo = getTokenInfoByAddress(tokenTo);\n  const amountFromScaled = scale(tokenInfoFrom.decimals)(amountFrom);\n\n  // amountFrom\n  // tokenFrom\n  // tokenTo\n  // trustedTokens\n  // maxSteps\n  const result = await camelot.findBestPath(\n    amountFromScaled,\n    tokenFrom,\n    tokenTo,\n    [],\n    maxSteps || 4,\n  );\n  return {\n    amountFrom: descale(tokenInfoFrom.decimals)(result.amounts[0]),\n    amountTo: descale(tokenInfoTo.decimals)(result.amounts[1]),\n    amountInBase: result.amounts[0],\n    amountOutBase: result.amounts[1],\n    adapters: Array.from(result[1]),\n    path: Array.from(result[2]),\n    recipients: Array.from(result[3]),\n  };\n};\n\n// Simulates sending the swap directly to Core using the publisher as msg.sender\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst simulateCoreCamelotSwap = async (\n  params: SimulateSwapParams,\n  bestPath: FindBestPathResult,\n): Promise<SimulateCoreCamelotSwapResult> => {\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n\n  const { calldata: data } = await encodeSwapSimulation(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    bestPath.amountInBase,\n    bestPath.amountOutBase,\n    bestPath.path,\n    bestPath.adapters,\n    bestPath.recipients,\n    0, // 0 for marketID\n    0, // 0 for exchangeID\n    PUBLISHER_ACCOUNT, // publish\n  );\n\n  const tx = {\n    from: PUBLISHER_ACCOUNT,\n    to: ContractType.CORE_PROXY,\n    data,\n  };\n\n  const result = await provider.call(tx);\n  const iface = new ethers.Interface(PeripheryAbi);\n  const decodedResult = iface.decodeFunctionResult('executeBySig', result);\n\n  return {\n    marginRatio: BigNumber(\n      decodedResult.usdNodeMarginInfo.liquidationMarginRequirement,\n    )\n      .div(decodedResult.usdNodeMarginInfo.marginBalance)\n      .toNumber(),\n    executedPrice: Number(\n      ethers.toBigInt(ethers.getBytes(decodedResult.output[0])),\n    ),\n  };\n};\n\nexport const simulateSwap = async (\n  params: SimulateSwapParams,\n): Promise<SimulateSwapResult> => {\n  const bestPathResult = await findBestPath(\n    params.amountFrom,\n    params.tokenFrom,\n    params.tokenTo,\n  );\n\n  // todo: uncomment after testing\n  // const simulation = await simulateCoreCamelotSwap(params, bestPathResult);\n\n  return {\n    bestPath: bestPathResult,\n    estimatedSlippage: 0.013, // TODO: IR\n    marginRatio: 0.013,\n    marginRatioHealth: ExposureCommand.evaluateHealthStatus(0.013),\n  };\n};\n"]}
+{"version":3,"file":"simulation.js","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ContractType,\n  descale,\n  getAddress,\n  getReyaNetwork,\n  getTokenInfoByAddress,\n  scale,\n  reyaChainIdRPCMapper,\n  ExposureCommand,\n  CoreAbi,\n  PUBLISHER_ACCOUNT,\n  SpotMarketEntity,\n} from '@reyaxyz/common';\nimport { Contract, ethers } from 'ethers';\nimport {\n  FindBestPathResult,\n  SimulateCoreCamelotSwapResult,\n  SimulateSwapParams,\n  SimulateSwapResult,\n} from './types';\nimport { getGeneralRestModuleClient, getSdkEnvironment } from '../../config';\nimport { encodeSwapSimulation } from './encode';\nimport BigNumber from 'bignumber.js';\nconst CamelotAbi = [\n  {\n    inputs: [\n      {\n        internalType: 'uint256',\n        name: '_amountIn',\n        type: 'uint256',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenIn',\n        type: 'address',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenOut',\n        type: 'address',\n      },\n      {\n        internalType: 'address[]',\n        name: '_trustedTokens',\n        type: 'address[]',\n      },\n      {\n        internalType: 'uint256',\n        name: '_maxSteps',\n        type: 'uint256',\n      },\n    ],\n    name: 'findBestPath',\n    outputs: [\n      {\n        components: [\n          {\n            internalType: 'uint256[]',\n            name: 'amounts',\n            type: 'uint256[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'adapters',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'path',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'recipients',\n            type: 'address[]',\n          },\n          {\n            internalType: 'uint256',\n            name: 'gasEstimate',\n            type: 'uint256',\n          },\n        ],\n        internalType: 'struct FormattedOffer',\n        name: '',\n        type: 'tuple',\n      },\n    ],\n    stateMutability: 'view',\n    type: 'function',\n  },\n];\n\nexport const findBestPath = async (\n  amountFrom: number,\n  tokenFrom: string,\n  tokenTo: string,\n  maxSteps?: number,\n): Promise<FindBestPathResult> => {\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const camelotAddress = getAddress(chainId, ContractType.CAMELOT_YAK_ROUTER);\n  const camelot = new Contract(camelotAddress, CamelotAbi, provider);\n\n  const tokenInfoFrom = getTokenInfoByAddress(tokenFrom);\n  const tokenInfoTo = getTokenInfoByAddress(tokenTo);\n  const amountFromScaled = scale(tokenInfoFrom.decimals)(amountFrom);\n\n  // amountFrom\n  // tokenFrom\n  // tokenTo\n  // trustedTokens\n  // maxSteps\n  const result = await camelot.findBestPath(\n    amountFromScaled,\n    tokenFrom,\n    tokenTo,\n    [],\n    maxSteps || 4,\n  );\n  return {\n    amountFrom: descale(tokenInfoFrom.decimals)(result.amounts[0]),\n    amountTo: descale(tokenInfoTo.decimals)(result.amounts[1]),\n    amountInBase: result.amounts[0],\n    amountOutBase: result.amounts[1],\n    adapters: Array.from(result[1]),\n    path: Array.from(result[2]),\n    recipients: Array.from(result[3]),\n  };\n};\n\n// Simulates sending the swap directly to Core using the publisher as msg.sender\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst simulateCoreCamelotSwap = async (\n  params: SimulateSwapParams,\n  bestPath: FindBestPathResult,\n): Promise<SimulateCoreCamelotSwapResult> => {\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n\n  const { calldata: data } = await encodeSwapSimulation(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    bestPath.amountInBase,\n    bestPath.amountOutBase,\n    bestPath.path,\n    bestPath.adapters,\n    bestPath.recipients,\n    0, // 0 for marketID\n    0, // 0 for exchangeID\n    PUBLISHER_ACCOUNT, // publish\n  );\n\n  const tx = {\n    from: PUBLISHER_ACCOUNT,\n    to: getAddress(chainId, ContractType.CORE_PROXY),\n    data,\n  };\n\n  const result = await provider.call(tx);\n\n  const iface = new ethers.Interface(CoreAbi);\n  const decodedResult = iface.decodeFunctionResult('executeBySig', result);\n\n  const executedPrice = ethers.AbiCoder.defaultAbiCoder().decode(\n    ['uint256'],\n    decodedResult[0][0],\n  )[0];\n\n  return {\n    marginRatio: BigNumber(decodedResult[1][9])\n      .div(decodedResult[1][1])\n      .toNumber(),\n    executedPrice: descale(18)(executedPrice),\n  };\n};\n\nexport const simulateSwap = async (\n  params: SimulateSwapParams,\n): Promise<SimulateSwapResult> => {\n  const bestPathResult = await findBestPath(\n    params.amountFrom,\n    params.tokenFrom,\n    params.tokenTo,\n  );\n\n  const simulation = await simulateCoreCamelotSwap(params, bestPathResult);\n\n  // slippage calculation\n  const restModule = getGeneralRestModuleClient();\n  const markets: SpotMarketEntity[] = await restModule.getSpotMarkets();\n\n  const market = markets.find((m) => {\n    return (\n      m.quoteToken.address == params.tokenFrom.toLowerCase() &&\n      m.underlyingAsset.address == params.tokenTo.toLowerCase()\n    );\n  });\n  let estimatedSlippage = 0;\n  if (market != undefined) {\n    estimatedSlippage =\n      (market.price - simulation.executedPrice) / market.price;\n  } else {\n    const marketReversed = markets.find((m) => {\n      return (\n        m.underlyingAsset.address == params.tokenFrom.toLowerCase() &&\n        m.quoteToken.address == params.tokenTo.toLowerCase()\n      );\n    });\n    if (marketReversed != undefined) {\n      estimatedSlippage =\n        (1 / marketReversed.price - simulation.executedPrice) /\n        (1 / marketReversed.price);\n    }\n  }\n\n  return {\n    bestPath: bestPathResult,\n    estimatedSlippage: estimatedSlippage,\n    marginRatio: simulation.marginRatio,\n    marginRatioHealth: ExposureCommand.evaluateHealthStatus(\n      simulation.marginRatio,\n    ),\n  };\n};\n"]}

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

@@ -1,4 +1,4 @@
-import { Address, RestClient, ServiceConfig, TransactionExecutionMetadata, TransactionExecutionOutput } from '@reyaxyz/common';
+import { Address, RestClient, ServiceConfig, TransactionExecutionMetadata, TransactionExecutionOutput, SpotMarketEntity } from '@reyaxyz/common';
 export type TxData = {
     to: string;
     data: string;
@@ -16,9 +16,13 @@ export declare class TransactionModule extends RestClient {
 export declare class AlphaTermsModule extends RestClient {
     registerAlphaSignature(params: AlphaTermsData): Promise<void>;
 }
+export declare class GeneralRestModule extends RestClient {
+    getSpotMarkets(): Promise<SpotMarketEntity[]>;
+}
 export declare const getSdkEnvironment: () => ServiceConfig['environment'];
 export declare const configureSDK: (environment: ServiceConfig['environment']) => void;
 export declare const getTransactionModuleClient: () => TransactionModule;
 export declare const getAlphaTermsModuleClient: () => AlphaTermsModule;
+export declare const getGeneralRestModuleClient: () => GeneralRestModule;
 export {};
 //# sourceMappingURL=index.d.ts.map

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,EACL,OAAO,EAEP,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B;IAelC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,gBAAiB,SAAQ,UAAU;IACxC,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CASpE;AAYD,eAAO,MAAM,iBAAiB,QAAO,aAAa,CAAC,aAAa,CAE/D,CAAC;AAEF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAKF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,gBAI5C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B;IAelC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,gBAAiB,SAAQ,UAAU;IACxC,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CASpE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,cAAc,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAGpD;AAgBD,eAAO,MAAM,iBAAiB,QAAO,aAAa,CAAC,aAAa,CAE/D,CAAC;AAEF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,gBAI5C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}

package/dist/types/services/swaps/encode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/swaps/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAC;AAa7D,eAAO,MAAM,UAAU,WACb,MAAM,WACL,MAAM,gBACD,MAAM,aACT,MAAM,YACP,MAAM,aACL,MAAM,QACX,MAAM,EAAE,YACJ,MAAM,EAAE,cACN,MAAM,EAAE,YACV,MAAM,cACJ,MAAM,KACjB,QAAQ,gCAAgC,CAkC1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,aACT,MAAM,YACP,MAAM,aACL,MAAM,QACX,MAAM,EAAE,YACJ,MAAM,EAAE,cACN,MAAM,EAAE,YACV,MAAM,cACJ,MAAM,oBACA,MAAM,KACvB,QAAQ,gCAAgC,CAyC1C,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/swaps/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAC;AAa7D,eAAO,MAAM,UAAU,WACb,MAAM,WACL,MAAM,gBACD,MAAM,aACT,MAAM,YACP,MAAM,aACL,MAAM,QACX,MAAM,EAAE,YACJ,MAAM,EAAE,cACN,MAAM,EAAE,YACV,MAAM,cACJ,MAAM,KACjB,QAAQ,gCAAgC,CAkC1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,aACT,MAAM,YACP,MAAM,aACL,MAAM,QACX,MAAM,EAAE,YACJ,MAAM,EAAE,cACN,MAAM,EAAE,YACV,MAAM,cACJ,MAAM,oBACA,MAAM,KACvB,QAAQ,gCAAgC,CA8C1C,CAAC"}

package/dist/types/services/swaps/simulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simulation.d.ts","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAyEjB,eAAO,MAAM,YAAY,eACX,MAAM,aACP,MAAM,WACR,MAAM,aACJ,MAAM,KAChB,QAAQ,kBAAkB,CAkC5B,CAAC;AAmDF,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,kBAAkB,CAgB5B,CAAC"}
+{"version":3,"file":"simulation.d.ts","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAyEjB,eAAO,MAAM,YAAY,eACX,MAAM,aACP,MAAM,WACR,MAAM,aACJ,MAAM,KAChB,QAAQ,kBAAkB,CAkC5B,CAAC;AAqDF,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,kBAAkB,CA6C5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.122.2",
+  "version": "0.123.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.226.1",
+    "@reyaxyz/common": "0.227.0",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "f912d3f6aa61898ef2ce5585947b37e9f0071396"
+  "gitHead": "91dd075f23175b638c64e935c9bfe246380e5c50"
 }

package/src/config/index.ts

@@ -5,6 +5,7 @@ import {
   ServiceConfig,
   TransactionExecutionMetadata,
   TransactionExecutionOutput,
+  SpotMarketEntity,
 } from '@reyaxyz/common';
 
 export type TxData = {
@@ -71,6 +72,12 @@ export class AlphaTermsModule extends RestClient {
   }
 }
 
+export class GeneralRestModule extends RestClient {
+  async getSpotMarkets(): Promise<SpotMarketEntity[]> {
+    return this.get<SpotMarketEntity[]>('/api/spot-markets');
+  }
+}
+
 // Internal state
 let transactionModule: TransactionModule = new TransactionModule(
   API_CLIENT_CONFIGS['test'].apiEndpoint,
@@ -79,6 +86,10 @@ let alphaTermsModule: AlphaTermsModule = new AlphaTermsModule(
   API_CLIENT_CONFIGS['test'].apiEndpoint,
 );
 
+let generalRestModule: GeneralRestModule = new GeneralRestModule(
+  API_CLIENT_CONFIGS['test'].apiEndpoint,
+);
+
 let sdkEnv: ServiceConfig['environment'] = 'test';
 
 export const getSdkEnvironment = (): ServiceConfig['environment'] => {
@@ -92,6 +103,7 @@ export const configureSDK = (
   sdkEnv = environment;
   transactionModule = new TransactionModule(config.apiEndpoint);
   alphaTermsModule = new AlphaTermsModule(config.apiEndpoint);
+  generalRestModule = new GeneralRestModule(config.apiEndpoint);
 };
 
 export const getTransactionModuleClient = (): TransactionModule => {
@@ -105,3 +117,9 @@ export const getAlphaTermsModuleClient = (): AlphaTermsModule => {
     throw new Error('SDK is not configured! Call configureSDK()');
   return alphaTermsModule;
 };
+
+export const getGeneralRestModuleClient = (): GeneralRestModule => {
+  if (!transactionModule)
+    throw new Error('SDK is not configured! Call configureSDK()');
+  return generalRestModule;
+};

package/src/services/swaps/encode.ts

@@ -87,6 +87,8 @@ export const encodeSwapSimulation = async (
     multiAction,
   );
 
+  const emptyBytes = ethers.AbiCoder.defaultAbiCoder().encode([], []);
+
   const { signature: eip712Signature, payload: eip712Payload } =
     await signCoreCommands(
       signer,
@@ -96,14 +98,17 @@ export const encodeSwapSimulation = async (
       multiAction.commands,
       coreSigNonce + 1,
       getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,
-      ethers.AbiCoder.defaultAbiCoder().encode([], []), // @todo check this
+      emptyBytes,
     );
 
   const value = BigInt(0);
 
   const functionSignature = 'executeBySig';
   const parameters = [
-    { accountId, commands: multiAction.commands, sig: eip712Signature },
+    accountId,
+    multiAction.commands,
+    eip712Signature,
+    emptyBytes,
   ];
 
   const INTERFACE = new Interface(CoreAbi);

package/src/services/swaps/simulation.ts

@@ -7,8 +7,9 @@ import {
   scale,
   reyaChainIdRPCMapper,
   ExposureCommand,
-  PeripheryAbi,
+  CoreAbi,
   PUBLISHER_ACCOUNT,
+  SpotMarketEntity,
 } from '@reyaxyz/common';
 import { Contract, ethers } from 'ethers';
 import {
@@ -17,7 +18,7 @@ import {
   SimulateSwapParams,
   SimulateSwapResult,
 } from './types';
-import { getSdkEnvironment } from '../../config';
+import { getGeneralRestModuleClient, getSdkEnvironment } from '../../config';
 import { encodeSwapSimulation } from './encode';
 import BigNumber from 'bignumber.js';
 const CamelotAbi = [
@@ -159,23 +160,25 @@ const simulateCoreCamelotSwap = async (
 
   const tx = {
     from: PUBLISHER_ACCOUNT,
-    to: ContractType.CORE_PROXY,
+    to: getAddress(chainId, ContractType.CORE_PROXY),
     data,
   };
 
   const result = await provider.call(tx);
-  const iface = new ethers.Interface(PeripheryAbi);
+
+  const iface = new ethers.Interface(CoreAbi);
   const decodedResult = iface.decodeFunctionResult('executeBySig', result);
 
+  const executedPrice = ethers.AbiCoder.defaultAbiCoder().decode(
+    ['uint256'],
+    decodedResult[0][0],
+  )[0];
+
   return {
-    marginRatio: BigNumber(
-      decodedResult.usdNodeMarginInfo.liquidationMarginRequirement,
-    )
-      .div(decodedResult.usdNodeMarginInfo.marginBalance)
+    marginRatio: BigNumber(decodedResult[1][9])
+      .div(decodedResult[1][1])
       .toNumber(),
-    executedPrice: Number(
-      ethers.toBigInt(ethers.getBytes(decodedResult.output[0])),
-    ),
+    executedPrice: descale(18)(executedPrice),
   };
 };
 
@@ -188,13 +191,42 @@ export const simulateSwap = async (
     params.tokenTo,
   );
 
-  // todo: uncomment after testing
-  // const simulation = await simulateCoreCamelotSwap(params, bestPathResult);
+  const simulation = await simulateCoreCamelotSwap(params, bestPathResult);
+
+  // slippage calculation
+  const restModule = getGeneralRestModuleClient();
+  const markets: SpotMarketEntity[] = await restModule.getSpotMarkets();
+
+  const market = markets.find((m) => {
+    return (
+      m.quoteToken.address == params.tokenFrom.toLowerCase() &&
+      m.underlyingAsset.address == params.tokenTo.toLowerCase()
+    );
+  });
+  let estimatedSlippage = 0;
+  if (market != undefined) {
+    estimatedSlippage =
+      (market.price - simulation.executedPrice) / market.price;
+  } else {
+    const marketReversed = markets.find((m) => {
+      return (
+        m.underlyingAsset.address == params.tokenFrom.toLowerCase() &&
+        m.quoteToken.address == params.tokenTo.toLowerCase()
+      );
+    });
+    if (marketReversed != undefined) {
+      estimatedSlippage =
+        (1 / marketReversed.price - simulation.executedPrice) /
+        (1 / marketReversed.price);
+    }
+  }
 
   return {
     bestPath: bestPathResult,
-    estimatedSlippage: 0.013, // TODO: IR
-    marginRatio: 0.013,
-    marginRatioHealth: ExposureCommand.evaluateHealthStatus(0.013),
+    estimatedSlippage: estimatedSlippage,
+    marginRatio: simulation.marginRatio,
+    marginRatioHealth: ExposureCommand.evaluateHealthStatus(
+      simulation.marginRatio,
+    ),
   };
 };