@reyaxyz/sdk 0.2.1 → 0.4.0

package/dist/utils/lp.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expandLpAmount = exports.calculateMinOutForLp = exports.calculateMinSharesForLp = void 0;
+var bignumber_js_1 = __importDefault(require("bignumber.js"));
+function calculateMinSharesForLp(lpAmount) {
+    var amount = (0, bignumber_js_1.default)(lpAmount);
+    // Calculate 1% // @todo update this number once we have it
+    var offset = amount.times(0.99);
+    return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
+}
+exports.calculateMinSharesForLp = calculateMinSharesForLp;
+function calculateMinOutForLp(sharesAmount) {
+    var amount = (0, bignumber_js_1.default)(sharesAmount);
+    // Calculate 1% // @todo update once we have the exact number
+    var offset = amount.times(0.99);
+    return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
+}
+exports.calculateMinOutForLp = calculateMinOutForLp;
+function expandLpAmount(amount) {
+    var decimalFactor = (0, bignumber_js_1.default)('1000000'); // 10^6
+    var amountDenormalised = (0, bignumber_js_1.default)(amount).times(decimalFactor).toFixed(0);
+    return Number(amountDenormalised);
+}
+exports.expandLpAmount = expandLpAmount;
+//# sourceMappingURL=lp.js.map

package/dist/utils/lp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lp.js","sourceRoot":"/","sources":["utils/lp.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,uBAAuB,CAAC,QAAgB;IACtD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,QAAQ,CAAC,CAAC;IAEnC,2DAA2D;IAC3D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,0DAOC;AAED,SAAgB,oBAAoB,CAAC,YAAoB;IACvD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,CAAC;IAEvC,6DAA6D;IAC7D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,oDAOC;AAED,SAAgB,cAAc,CAAC,MAAc;IAC3C,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IAEnD,IAAM,kBAAkB,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACpC,CAAC;AAND,wCAMC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculateMinSharesForLp(lpAmount: number): number {\n  const amount = BigNumber(lpAmount);\n\n  // Calculate 1% // @todo update this number once we have it\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function calculateMinOutForLp(sharesAmount: number): number {\n  const amount = BigNumber(sharesAmount);\n\n  // Calculate 1% // @todo update once we have the exact number\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function expandLpAmount(amount: number): number {\n  const decimalFactor = BigNumber('1000000'); // 10^6\n\n  const amountDenormalised = BigNumber(amount).times(decimalFactor).toFixed(0);\n\n  return Number(amountDenormalised);\n}\n"]}

package/dist/utils/trade.js

@@ -1,27 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateOrderBaseFromOrderSize = exports.calculatePriceLimitForTrade = void 0;
-function calculatePriceLimitForTrade(orderPrice, size) {
+var bignumber_js_1 = __importDefault(require("bignumber.js"));
+function calculatePriceLimitForTrade(orderPrice, amount) {
     // Ensure orderPrice is BigInt
-    var orderPriceBigInt = BigInt(orderPrice);
+    var orderPriceBigInt = (0, bignumber_js_1.default)(orderPrice);
     // Calculate 50% of the order price
-    var offset = orderPriceBigInt / BigInt(2);
-    // Determine if the size is positive or negative and adjust the price accordingly
-    if (size > 0) {
+    var offset = orderPriceBigInt.div(2);
+    // Determine if the amount is positive or negative and adjust the price accordingly
+    if (amount > 0) {
         // Trade is long, so add
-        return (orderPriceBigInt + offset) * BigInt(1e18);
+        return BigInt((0, bignumber_js_1.default)(orderPriceBigInt).plus(offset).times(1e18).toFixed(0));
     }
     else {
-        // Trade is short, so subtract
-        return (orderPriceBigInt - offset) * BigInt(1e18);
+        return BigInt((0, bignumber_js_1.default)(orderPriceBigInt).minus(offset).times(1e18).toFixed(0));
     }
 }
 exports.calculatePriceLimitForTrade = calculatePriceLimitForTrade;
 function calculateOrderBaseFromOrderSize(orderSize, currentPrice) {
-    var decimalFactor = BigInt('1000000'); // 10^6
-    // @todo check decimal places handling
-    var orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);
-    return orderBase;
+    var decimalFactor = (0, bignumber_js_1.default)('1000000'); // 10^6
+    // @todo check decimal places handling if this should stay hardcoded to 6
+    var orderBase = (0, bignumber_js_1.default)(orderSize)
+        .times(decimalFactor)
+        .div(currentPrice)
+        .toFixed(0);
+    return BigInt(orderBase);
 }
 exports.calculateOrderBaseFromOrderSize = calculateOrderBaseFromOrderSize;
 //# sourceMappingURL=trade.js.map

package/dist/utils/trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;AAAA,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,IAAY;IAEZ,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAE5C,iFAAiF;IACjF,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACb,wBAAwB;QACxB,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,8BAA8B;QAC9B,OAAO,CAAC,gBAAgB,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;AACH,CAAC;AAlBD,kEAkBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IAChD,sCAAsC;IAEtC,IAAM,SAAS,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAErE,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,0EAUC","sourcesContent":["export function calculatePriceLimitForTrade(\n  orderPrice: number,\n  size: bigint,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigInt(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt / BigInt(2);\n\n  // Determine if the size is positive or negative and adjust the price accordingly\n  if (size > 0) {\n    // Trade is long, so add\n    return (orderPriceBigInt + offset) * BigInt(1e18);\n  } else {\n    // Trade is short, so subtract\n    return (orderPriceBigInt - offset) * BigInt(1e18);\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: bigint,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigInt('1000000'); // 10^6\n  // @todo check decimal places handling\n\n  const orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);\n\n  return orderBase;\n}\n"]}
+{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IACnD,yEAAyE;IAEzE,IAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC;SACnC,KAAK,CAAC,aAAa,CAAC;SACpB,GAAG,CAAC,YAAY,CAAC;SACjB,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAbD,0EAaC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: number,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigNumber('1000000'); // 10^6\n  // @todo check decimal places handling if this should stay hardcoded to 6\n\n  const orderBase = BigNumber(orderSize)\n    .times(decimalFactor)\n    .div(currentPrice)\n    .toFixed(0);\n\n  return BigInt(orderBase);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,8 +29,9 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
+    "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "c93a765b3c4e44a13d3f96237342d0508fe55a71"
+  "gitHead": "87e449e615b82a9bcd2e38296f2c2c0daa09a61b"
 }

package/src/services/lp/lp.ts

@@ -3,48 +3,81 @@ import {
   encodeProvideLiquidityCall,
   encodeRemoveLiquidityCall,
 } from './encode';
-import { ProvideLiquidityArgs, RemoveLiquidityArgs } from './types';
+import {
+  ProvideLiquidityParams,
+  ProvideLiquidityResult,
+  RemoveLiquidityParams,
+  RemoveLiquidityResult,
+} from './types';
 import { TransactionType } from '../../utils/consts';
+import {
+  calculateMinOutForLp,
+  calculateMinSharesForLp,
+  expandLpAmount,
+} from '../../utils/lp';
 
 export const provideLiquidity = async (
-  params: ProvideLiquidityArgs,
-): Promise<unknown> => {
-  // @todo update type once we agree on the structure
+  params: ProvideLiquidityParams,
+): Promise<ProvideLiquidityResult> => {
+  const ownerAddrees = await params.signer.getAddress();
+  // @todo we might not have chainId for reya network, update once we have information
+  const chainId = 80001;
+  const minShares = calculateMinSharesForLp(params.amount);
+
+  if (params.amount === 0) {
+    throw new Error('LP amount can not be 0');
+  }
+
+  const amount = expandLpAmount(params.amount);
+
   const { calldata: data, value } = encodeProvideLiquidityCall(
     params.poolId,
-    params.owner,
-    params.amount,
-    params.minShares,
+    ownerAddrees,
+    amount,
+    minShares,
   );
 
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.LP,
   );
 
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };
 
 export const removeLiquidity = async (
-  params: RemoveLiquidityArgs,
-): Promise<unknown> => {
-  // @todo update type once we agree on the structure
+  params: RemoveLiquidityParams,
+): Promise<RemoveLiquidityResult> => {
+  // @todo we might not have chainId for reya nework, update once we have information
+  const chainId = 80001;
+
+  if (params.sharesAmount === 0) {
+    throw new Error('Shares amount can not be 0');
+  }
+
+  const minOut = calculateMinOutForLp(params.sharesAmount);
+
+  const amount = expandLpAmount(params.sharesAmount);
   const { calldata: data, value } = encodeRemoveLiquidityCall(
     params.poolId,
-    params.sharesAmount,
-    params.minOut,
+    amount,
+    minOut,
   );
 
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.LP,
   );
 
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };

package/src/services/lp/types.ts

@@ -1,18 +1,21 @@
 import { JsonRpcSigner, Signer } from 'ethers';
 
-export type ProvideLiquidityArgs = {
+export type ProvideLiquidityParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
-  poolId: number;
-  owner: string;
   amount: number;
-  minShares: number;
+  poolId: number;
 };
 
-export type RemoveLiquidityArgs = {
+export type RemoveLiquidityParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
   poolId: number;
   sharesAmount: number;
-  minOut: number;
+};
+
+export type ProvideLiquidityResult = {
+  transactionHash: string | null;
+};
+
+export type RemoveLiquidityResult = {
+  transactionHash: string | null;
 };

package/src/services/margin-accounts/account.ts

@@ -1,10 +1,10 @@
 import { executeTransaction } from '../executeTransaction';
 import { encodeCreateAccountCall } from './encode';
-import { CreateAccountArgs } from './types';
+import { CreateAccountParams } from './types';
 import { TransactionType } from '../../utils/consts';
 
 export const createAccount = async (
-  params: CreateAccountArgs,
+  params: CreateAccountParams,
 ): Promise<unknown> => {
   // @todo update type once we agree on the structure
   const { calldata: data, value } = encodeCreateAccountCall(

package/src/services/margin-accounts/deposit.ts

@@ -1,9 +1,9 @@
-import { DepositArgs } from './types';
+import { DepositParams } from './types';
 import { encodeDeposit } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
 
-export const deposit = async (params: DepositArgs): Promise<unknown> => {
+export const deposit = async (params: DepositParams): Promise<unknown> => {
   // @todo update type once we agree on the structure
   const { calldata: data, value } = encodeDeposit(
     params.accountId,

package/src/services/margin-accounts/types.ts

@@ -1,12 +1,12 @@
 import { JsonRpcSigner, Signer } from 'ethers';
 
-export type CreateAccountArgs = {
+export type CreateAccountParams = {
   signer: Signer | JsonRpcSigner;
   chainId: number;
   ownerAddress: string;
 };
 
-export type DepositArgs = {
+export type DepositParams = {
   signer: Signer | JsonRpcSigner;
   chainId: number;
   accountId: number;
@@ -16,7 +16,7 @@ export type DepositArgs = {
   exchangeId: number;
 };
 
-export type WithdrawArgs = {
+export type WithdrawParams = {
   signer: Signer | JsonRpcSigner;
   chainId: number;
   accountId: number;

package/src/services/margin-accounts/withdraw.ts

@@ -1,9 +1,9 @@
-import { WithdrawArgs } from './types';
+import { WithdrawParams } from './types';
 import { encodeWithdraw } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
 
-export const withdraw = async (params: WithdrawArgs): Promise<unknown> => {
+export const withdraw = async (params: WithdrawParams): Promise<unknown> => {
   // @todo update type once we agree on the structure
   const { calldata: data, value } = encodeWithdraw(
     params.accountId,

package/src/services/orders/order.ts

@@ -1,4 +1,9 @@
-import { MatchOrderArgs, MatchOrderResult } from './types';
+import {
+  CloseOrderParams,
+  CloseOrderResult,
+  MatchOrderParams,
+  MatchOrderResult,
+} from './types';
 import { encodeMatchOrder } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
@@ -6,11 +11,12 @@ import {
   calculateOrderBaseFromOrderSize,
   calculatePriceLimitForTrade,
 } from '../../utils/trade';
+import BigNumber from 'bignumber.js';
 
 export const matchOrder = async (
-  params: MatchOrderArgs,
+  params: MatchOrderParams,
 ): Promise<MatchOrderResult> => {
-  if (params.orderSize === BigInt(0)) {
+  if (params.orderSize === 0) {
     throw new Error('Position size can not be 0');
   }
   const orderPriceLimit = calculatePriceLimitForTrade(
@@ -46,3 +52,41 @@ export const matchOrder = async (
     transactionHash: result?.hash || null,
   };
 };
+
+export const closeOrder = async (
+  params: CloseOrderParams,
+): Promise<CloseOrderResult> => {
+  if (params.orderBase === 0) {
+    throw new Error('Position base can not be 0');
+  }
+
+  const base = BigNumber(params.orderBase).negated().toNumber(); // when closing position we are doing trade in the opposite direction
+
+  const orderPriceLimit = calculatePriceLimitForTrade(
+    params.market.currentPrice,
+    base,
+  );
+
+  const { calldata: data, value } = encodeMatchOrder(
+    params.marginAccountId,
+    BigInt(base),
+    orderPriceLimit,
+    params.market.counterpartyAccountIds,
+    params.market.id,
+    params.market.exchangeId,
+  );
+
+  // @todo update it
+  const chainId = 80001;
+  const result = await executeTransaction(
+    params.signer,
+    data,
+    value,
+    chainId,
+    TransactionType.TRADE,
+  );
+
+  return {
+    transactionHash: result?.hash || null,
+  };
+};

package/src/services/orders/types.ts

@@ -1,19 +1,30 @@
 import { Signer, JsonRpcSigner } from 'ethers';
 
-export type MarketArg = {
+export type MarketParams = {
   id: number;
   exchangeId: number;
   counterpartyAccountIds: number[];
   currentPrice: number;
 };
 
-export type MatchOrderArgs = {
+export type MatchOrderParams = {
   signer: Signer | JsonRpcSigner;
   marginAccountId: number;
-  orderSize: bigint;
-  market: MarketArg;
+  orderSize: number;
+  market: MarketParams;
+};
+
+export type CloseOrderParams = {
+  signer: Signer | JsonRpcSigner;
+  marginAccountId: number;
+  orderBase: number; // PositionEntity[base]
+  market: MarketParams;
 };
 
 export type MatchOrderResult = {
   transactionHash: string | null;
 };
+
+export type CloseOrderResult = {
+  transactionHash: string | null;
+};

package/src/services/token/approve.ts

@@ -1,12 +1,15 @@
-import { ApprovalType, ApproveTokenArgs } from './types';
+import { ApprovalType, ApproveTokenParams } from './types';
 import { getERC20Allowance, getERC20TokenContract } from './common';
 import { getAddress } from '../../utils/contractAddresses';
 
 export const approveTokenSpending = async (
-  params: ApproveTokenArgs,
+  params: ApproveTokenParams,
 ): Promise<number> => {
   const underLyingTokenAddress = params.token;
 
+  // @todo update once we know this
+  const chainId = 80001;
+
   const tokenContract = getERC20TokenContract(
     underLyingTokenAddress,
     params.signer,
@@ -14,8 +17,8 @@ export const approveTokenSpending = async (
 
   const contractProxyAddress =
     params.type === ApprovalType.DEPOSIT
-      ? getAddress(params.chainId, 'core_proxy')
-      : getAddress(params.chainId, 'passive_pool_proxy');
+      ? getAddress(chainId, 'core_proxy')
+      : getAddress(chainId, 'passive_pool_proxy');
 
   // @todo validate if maxAllowance should be passed from UI
   const maxUint256Bn = BigInt(

package/src/services/token/common.ts

@@ -1,7 +1,7 @@
 import { Contract, ethers, Signer } from 'ethers';
 import { tokenDetails } from './consts';
 import { exponentialBackoff } from '../../utils/retry';
-import { GetERC20AllowanceArgs } from './types';
+import { GetERC20AllowanceParams } from './types';
 
 export const descale = (tokenDecimals: number) => {
   const f = (value: bigint) => {
@@ -70,7 +70,7 @@ export const getERC20Allowance = async ({
   tokenAddress,
   spenderAddress,
   subject,
-}: GetERC20AllowanceArgs): Promise<number> => {
+}: GetERC20AllowanceParams): Promise<number> => {
   const tokenContract = getERC20TokenContract(tokenAddress, subject);
   const { tokenDecimals } = getTokenDetails(tokenAddress);
 

package/src/services/token/getAllowance.ts

@@ -1,16 +1,19 @@
-import { ApprovalType, GetAllowanceArgs } from './types';
+import { ApprovalType, GetAllowanceParams } from './types';
 import { getERC20Allowance } from './common';
 import { getAddress } from '../../utils/contractAddresses';
 
 export const getAllowance = async (
-  params: GetAllowanceArgs,
+  params: GetAllowanceParams,
 ): Promise<number> => {
   const underLyingTokenAddress = params.token;
 
+  // @todo update
+  const chainId = 80001;
+
   const contractProxyAddress =
     params.type === ApprovalType.DEPOSIT
-      ? getAddress(params.chainId, 'core_proxy')
-      : getAddress(params.chainId, 'passive_pool_proxy');
+      ? getAddress(chainId, 'core_proxy')
+      : getAddress(chainId, 'passive_pool_proxy');
   const walletAddress: string = await params.signer.getAddress();
 
   const allowance = await getERC20Allowance({

package/src/services/token/types.ts

@@ -5,23 +5,21 @@ export enum ApprovalType {
   DEPOSIT,
 }
 
-export type ApproveTokenArgs = {
+export type ApproveTokenParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
-  token: string;
+  token: string; // token address
   type: ApprovalType;
 };
 
-export type GetAllowanceArgs = {
+export type GetAllowanceParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
-  token: string;
+  token: string; //  token address
   type: ApprovalType;
 };
 
-export type GetERC20AllowanceArgs = {
+export type GetERC20AllowanceParams = {
   walletAddress: string;
-  tokenAddress: string;
+  tokenAddress: string; // LP POOL entity tokean address
   spenderAddress: string;
   subject: Signer;
 };

package/src/utils/lp.ts

@@ -0,0 +1,27 @@
+import BigNumber from 'bignumber.js';
+
+export function calculateMinSharesForLp(lpAmount: number): number {
+  const amount = BigNumber(lpAmount);
+
+  // Calculate 1% // @todo update this number once we have it
+  const offset = amount.times(0.99);
+
+  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
+}
+
+export function calculateMinOutForLp(sharesAmount: number): number {
+  const amount = BigNumber(sharesAmount);
+
+  // Calculate 1% // @todo update once we have the exact number
+  const offset = amount.times(0.99);
+
+  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
+}
+
+export function expandLpAmount(amount: number): number {
+  const decimalFactor = BigNumber('1000000'); // 10^6
+
+  const amountDenormalised = BigNumber(amount).times(decimalFactor).toFixed(0);
+
+  return Number(amountDenormalised);
+}

package/src/utils/trade.ts

@@ -1,31 +1,39 @@
+import BigNumber from 'bignumber.js';
+
 export function calculatePriceLimitForTrade(
   orderPrice: number,
-  size: bigint,
+  amount: number,
 ): bigint {
   // Ensure orderPrice is BigInt
-  const orderPriceBigInt = BigInt(orderPrice);
+  const orderPriceBigInt = BigNumber(orderPrice);
 
   // Calculate 50% of the order price
-  const offset = orderPriceBigInt / BigInt(2);
+  const offset = orderPriceBigInt.div(2);
 
-  // Determine if the size is positive or negative and adjust the price accordingly
-  if (size > 0) {
+  // Determine if the amount is positive or negative and adjust the price accordingly
+  if (amount > 0) {
     // Trade is long, so add
-    return (orderPriceBigInt + offset) * BigInt(1e18);
+    return BigInt(
+      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),
+    );
   } else {
-    // Trade is short, so subtract
-    return (orderPriceBigInt - offset) * BigInt(1e18);
+    return BigInt(
+      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),
+    );
   }
 }
 
 export function calculateOrderBaseFromOrderSize(
-  orderSize: bigint,
+  orderSize: number,
   currentPrice: number,
 ): bigint {
-  const decimalFactor = BigInt('1000000'); // 10^6
-  // @todo check decimal places handling
+  const decimalFactor = BigNumber('1000000'); // 10^6
+  // @todo check decimal places handling if this should stay hardcoded to 6
 
-  const orderBase = (orderSize * decimalFactor) / BigInt(currentPrice);
+  const orderBase = BigNumber(orderSize)
+    .times(decimalFactor)
+    .div(currentPrice)
+    .toFixed(0);
 
-  return orderBase;
+  return BigInt(orderBase);
 }