@reyaxyz/sdk 0.5.0 → 0.7.0

package/dist/services/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkD;AAClD,gEAAwD;AACxD,0CAAkD;AASlD,SAAsB,WAAW,CAC/B,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAET,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAA1C,cAAc,GAAG,SAAyB;oBAC1C,eAAe,GACnB,eAAe,KAAK,wBAAe,CAAC,EAAE;wBACpC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC;wBAC3C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClC,EAAE,cACN,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,MAAA,IACD,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;;;;oBAKoB,qBAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAA;;oBAA1C,WAAW,GAAG,SAA4B;oBAChD,QAAQ,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;;;;oBAErC,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,OAAe,CAAC,CAAC;wBAEnC,4CAAY,EAAE,KAAE,QAAQ,UAAA,KAAG;;;;CAC5B;AA7BD,kCA6BC;AAED,SAAsB,kBAAkB,CACtC,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAEjB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,eAAe,CAChB,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAEoB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAjD,UAAU,GAAG,SAAoC;oBACrC,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;oBAAnC,SAAS,GAAG,SAAuB;oBACzC,sBAAO,SAAS,EAAC;;;oBAEjB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAtBD,gDAsBC","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport { getAddress } from '../utils/contractAddresses';\nimport { TransactionType } from '../utils/consts';\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  transactionType: TransactionType,\n): Promise<Transaction & { gasLimit: bigint }> {\n  const accountAddress = await signer.getAddress();\n  const contractAddress =\n    transactionType === TransactionType.LP\n      ? getAddress(chainId, 'passive_pool_proxy')\n      : getAddress(chainId, 'core_proxy');\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint;\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    console.warn(error);\n    throw new Error(error as string);\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  transactionType: TransactionType,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    transactionType,\n  );\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait(); // @todo Check what was reasoning behind this since this function waits until transaction is minted\n    return txReceipt;\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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAkD;AAClD,gEAAwD;AACxD,0CAAkD;AASlD,SAAsB,WAAW,CAC/B,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAET,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAA1C,cAAc,GAAG,SAAyB;oBAC1C,eAAe,GACnB,eAAe,KAAK,wBAAe,CAAC,EAAE;wBACpC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC;wBAC3C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAClC,EAAE,cACN,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,MAAA,IACD,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;;;;oBAKoB,qBAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAA;;oBAA1C,WAAW,GAAG,SAA4B;oBAChD,QAAQ,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;;;;oBAErC,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,OAAe,CAAC,CAAC;wBAEnC,4CAAY,EAAE,KAAE,QAAQ,UAAA,KAAG;;;;CAC5B;AA7BD,kCA6BC;AAED,SAAsB,kBAAkB,CACtC,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,eAAgC;;;;;wBAEjB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,eAAe,CAChB,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAEoB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAjD,UAAU,GAAG,SAAoC;oBACrC,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;oBAAnC,SAAS,GAAG,SAAuB;oBACzC,sBAAO,SAAS,EAAC;;;oBAEjB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAtBD,gDAsBC","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport { getAddress } from '../utils/contractAddresses';\nimport { TransactionType } from '../utils/consts';\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  transactionType: TransactionType,\n): Promise<Transaction & { gasLimit: bigint }> {\n  const accountAddress = await signer.getAddress();\n  const contractAddress =\n    transactionType === TransactionType.LP\n      ? getAddress(chainId, 'passive_pool_proxy')\n      : getAddress(chainId, 'core_proxy');\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint;\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    console.warn(error);\n    throw new Error(error as string);\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  transactionType: TransactionType,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    transactionType,\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"]}

package/dist/services/margin-accounts/account.js

@@ -41,15 +41,18 @@ var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
 var consts_1 = require("../../utils/consts");
 var createAccount = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, data, value, result;
+    var _a, data, value, chainId, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 _a = (0, encode_1.encodeCreateAccountCall)(params.ownerAddress), data = _a.calldata, value = _a.value;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, params.chainId, consts_1.TransactionType.CREATE_ACCOUNT)];
+                chainId = 80001;
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.CREATE_ACCOUNT)];
             case 1:
                 result = _b.sent();
-                return [2 /*return*/, result];
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
         }
     });
 }); };

package/dist/services/margin-accounts/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAAmD;AAEnD,6CAAqD;AAE9C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAGrB,KAA4B,IAAA,gCAAuB,EACvD,MAAM,CAAC,YAAY,CACpB,EAFiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAE3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,MAAM,CAAC,OAAO,EACd,wBAAe,CAAC,cAAc,CAC/B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO,MAAM,EAAC;;;KACf,CAAC;AAjBW,QAAA,aAAa,iBAiBxB","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams } from './types';\nimport { TransactionType } from '../../utils/consts';\n\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<unknown> => {\n  // @todo update type once we agree on the structure\n  const { calldata: data, value } = encodeCreateAccountCall(\n    params.ownerAddress,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    params.chainId,\n    TransactionType.CREATE_ACCOUNT,\n  );\n\n  return result;\n};\n"]}
+{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAAmD;AAEnD,6CAAqD;AAE9C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAErB,KAA4B,IAAA,gCAAuB,EACvD,MAAM,CAAC,YAAY,CACpB,EAFiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAE3B;gBAGI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,cAAc,CAC/B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAnBW,QAAA,aAAa,iBAmBxB","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { TransactionType } from '../../utils/consts';\n\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n  const { calldata: data, value } = encodeCreateAccountCall(\n    params.ownerAddress,\n  );\n\n  // @todo update it\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.CREATE_ACCOUNT,\n  );\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/margin-accounts/deposit.js

@@ -40,16 +40,25 @@ exports.deposit = void 0;
 var encode_1 = require("./encode");
 var executeTransaction_1 = require("../executeTransaction");
 var consts_1 = require("../../utils/consts");
+var common_1 = require("../token/common");
 var deposit = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, data, value, result;
+    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, chainId, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                _a = (0, encode_1.encodeDeposit)(params.accountId, params.token, params.amount, params.marketId, params.exchangeId), data = _a.calldata, value = _a.value;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, params.chainId, consts_1.TransactionType.DEPOSIT)];
+                tokenDecimals = (0, common_1.getTokenDetails)(params.token).tokenDecimals;
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                marketId = 0;
+                exchangeId = 0;
+                console.log(amount);
+                _a = (0, encode_1.encodeDeposit)(params.accountId, params.token, amount, marketId, exchangeId), data = _a.calldata, value = _a.value;
+                chainId = 80001;
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.DEPOSIT)];
             case 1:
                 result = _b.sent();
-                return [2 /*return*/, result];
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
         }
     });
 }); };

package/dist/services/margin-accounts/deposit.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,6CAAqD;AAE9C,IAAM,OAAO,GAAG,UAAO,MAAqB;;;;;gBAE3C,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,CAClB,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,MAAM,CAAC,OAAO,EACd,wBAAe,CAAC,OAAO,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO,MAAM,EAAC;;;KACf,CAAC;AAnBW,QAAA,OAAO,WAmBlB","sourcesContent":["import { DepositParams } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\n\nexport const deposit = async (params: DepositParams): Promise<unknown> => {\n  // @todo update type once we agree on the structure\n  const { calldata: data, value } = encodeDeposit(\n    params.accountId,\n    params.token,\n    params.amount,\n    params.marketId,\n    params.exchangeId,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    params.chainId,\n    TransactionType.DEPOSIT,\n  );\n\n  return result;\n};\n"]}
+{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,KAAK,CAAC,cAAlC,CAAmC;gBAClD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACd,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,EACN,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,OAAO,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA5BW,QAAA,OAAO,WA4BlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const { tokenDecimals } = getTokenDetails(params.token);\n  const amount = scale(tokenDecimals)(params.amount);\n  const marketId = 0;\n  const exchangeId = 0;\n  console.log(amount);\n  const { calldata: data, value } = encodeDeposit(\n    params.accountId,\n    params.token,\n    amount,\n    marketId,\n    exchangeId,\n  );\n\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.DEPOSIT,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/margin-accounts/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  ownerAddress: string;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  chainId: number;\n  accountId: number;\n  token: string;\n  amount: bigint;\n  marketId: number;\n  exchangeId: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  token: string;\n  amount: number;\n};\n\nexport type DepositResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  token: string;\n  amount: number;\n};\n\nexport type WithdrawResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/services/margin-accounts/withdraw.js

@@ -40,16 +40,24 @@ exports.withdraw = void 0;
 var encode_1 = require("./encode");
 var executeTransaction_1 = require("../executeTransaction");
 var consts_1 = require("../../utils/consts");
+var common_1 = require("../token/common");
 var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, data, value, result;
+    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, chainId, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                _a = (0, encode_1.encodeWithdraw)(params.accountId, params.token, params.amount, params.marketId, params.exchangeId), data = _a.calldata, value = _a.value;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, params.chainId, consts_1.TransactionType.WITHDRAW)];
+                tokenDecimals = (0, common_1.getTokenDetails)(params.token).tokenDecimals;
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                marketId = 0;
+                exchangeId = 0;
+                _a = (0, encode_1.encodeWithdraw)(params.accountId, params.token, BigInt(amount), marketId, exchangeId), data = _a.calldata, value = _a.value;
+                chainId = 80001;
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.WITHDRAW)];
             case 1:
                 result = _b.sent();
-                return [2 /*return*/, result];
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
         }
     });
 }); };

package/dist/services/margin-accounts/withdraw.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,6CAAqD;AAE9C,IAAM,QAAQ,GAAG,UAAO,MAAsB;;;;;gBAE7C,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,CAClB,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,MAAM,CAAC,OAAO,EACd,wBAAe,CAAC,QAAQ,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO,MAAM,EAAC;;;KACf,CAAC;AAnBW,QAAA,QAAQ,YAmBnB","sourcesContent":["import { WithdrawParams } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\n\nexport const withdraw = async (params: WithdrawParams): Promise<unknown> => {\n  // @todo update type once we agree on the structure\n  const { calldata: data, value } = encodeWithdraw(\n    params.accountId,\n    params.token,\n    params.amount,\n    params.marketId,\n    params.exchangeId,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    params.chainId,\n    TransactionType.WITHDRAW,\n  );\n\n  return result;\n};\n"]}
+{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;gBAEd,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,KAAK,CAAC,cAAlC,CAAmC;gBAClD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACf,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,CAAC,EACd,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,QAAQ,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA5BW,QAAA,QAAQ,YA4BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const { tokenDecimals } = getTokenDetails(params.token);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const marketId = 0;\n  const exchangeId = 0;\n  const { calldata: data, value } = encodeWithdraw(\n    params.accountId,\n    params.token,\n    BigInt(amount),\n    marketId,\n    exchangeId,\n  );\n\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.WITHDRAW,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/token/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./approve"), exports);
 __exportStar(require("./getAllowance"), exports);
+__exportStar(require("./getBalance"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B","sourcesContent":["export * from './types';\nexport * from './approve';\nexport * from './getAllowance';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B;AAC/B,+CAA6B","sourcesContent":["export * from './types';\nexport * from './approve';\nexport * from './getAllowance';\nexport * from './getBalance';\n"]}

package/dist/types/services/margin-accounts/account.d.ts

@@ -1,3 +1,3 @@
-import { CreateAccountParams } from './types';
-export declare const createAccount: (params: CreateAccountParams) => Promise<unknown>;
+import { CreateAccountParams, CreateAccountResult } from './types';
+export declare const createAccount: (params: CreateAccountParams) => Promise<CreateAccountResult>;
 //# sourceMappingURL=account.d.ts.map

package/dist/types/services/margin-accounts/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG9C,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,OAAO,CAejB,CAAC"}
+{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,CAiB7B,CAAC"}

package/dist/types/services/margin-accounts/deposit.d.ts

@@ -1,3 +1,3 @@
-import { DepositParams } from './types';
-export declare const deposit: (params: DepositParams) => Promise<unknown>;
+import { DepositParams, DepositResult } from './types';
+export declare const deposit: (params: DepositParams) => Promise<DepositResult>;
 //# sourceMappingURL=deposit.d.ts.map

package/dist/types/services/margin-accounts/deposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKxC,eAAO,MAAM,OAAO,WAAkB,aAAa,KAAG,QAAQ,OAAO,CAmBpE,CAAC"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CA0BvB,CAAC"}

package/dist/types/services/margin-accounts/types.d.ts

@@ -1,25 +1,27 @@
 import { JsonRpcSigner, Signer } from 'ethers';
 export type CreateAccountParams = {
     signer: Signer | JsonRpcSigner;
-    chainId: number;
     ownerAddress: string;
 };
+export type CreateAccountResult = {
+    transactionHash: string | null;
+};
 export type DepositParams = {
     signer: Signer | JsonRpcSigner;
-    chainId: number;
     accountId: number;
     token: string;
-    amount: bigint;
-    marketId: number;
-    exchangeId: number;
+    amount: number;
+};
+export type DepositResult = {
+    transactionHash: string | null;
 };
 export type WithdrawParams = {
     signer: Signer | JsonRpcSigner;
-    chainId: number;
     accountId: number;
     token: string;
-    amount: bigint;
-    marketId: number;
-    exchangeId: number;
+    amount: number;
+};
+export type WithdrawResult = {
+    transactionHash: string | null;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/services/margin-accounts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

package/dist/types/services/margin-accounts/withdraw.d.ts

@@ -1,3 +1,3 @@
-import { WithdrawParams } from './types';
-export declare const withdraw: (params: WithdrawParams) => Promise<unknown>;
+import { WithdrawParams, WithdrawResult } from './types';
+export declare const withdraw: (params: WithdrawParams) => Promise<WithdrawResult>;
 //# sourceMappingURL=withdraw.d.ts.map

package/dist/types/services/margin-accounts/withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,eAAO,MAAM,QAAQ,WAAkB,cAAc,KAAG,QAAQ,OAAO,CAmBtE,CAAC"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAMzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CA0BxB,CAAC"}

package/dist/types/services/token/index.d.ts

@@ -1,4 +1,5 @@
 export * from './types';
 export * from './approve';
 export * from './getAllowance';
+export * from './getBalance';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,5 +33,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "a0f4533458ea795570332768e5b2a49a5ec92afb"
+  "gitHead": "c949888ceea20a14fb1ffbe8e4406f6554d5b7f7"
 }

package/src/services/executeTransaction.ts

@@ -57,7 +57,7 @@ export async function executeTransaction(
   );
   try {
     const txResponse = await signer.sendTransaction(txData);
-    const txReceipt = await txResponse.wait(); // @todo Check what was reasoning behind this since this function waits until transaction is minted
+    const txReceipt = await txResponse.wait();
     return txReceipt;
   } catch (error) {
     console.warn(error);

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

@@ -1,23 +1,25 @@
 import { executeTransaction } from '../executeTransaction';
 import { encodeCreateAccountCall } from './encode';
-import { CreateAccountParams } from './types';
+import { CreateAccountParams, CreateAccountResult } from './types';
 import { TransactionType } from '../../utils/consts';
 
 export const createAccount = async (
   params: CreateAccountParams,
-): Promise<unknown> => {
-  // @todo update type once we agree on the structure
+): Promise<CreateAccountResult> => {
   const { calldata: data, value } = encodeCreateAccountCall(
     params.ownerAddress,
   );
 
+  // @todo update it
+  const chainId = 80001;
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.CREATE_ACCOUNT,
   );
-
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };

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

@@ -1,25 +1,35 @@
-import { DepositParams } from './types';
+import { DepositParams, DepositResult } from './types';
 import { encodeDeposit } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
+import { getTokenDetails, scale } from '../token/common';
 
-export const deposit = async (params: DepositParams): Promise<unknown> => {
-  // @todo update type once we agree on the structure
+export const deposit = async (
+  params: DepositParams,
+): Promise<DepositResult> => {
+  const { tokenDecimals } = getTokenDetails(params.token);
+  const amount = scale(tokenDecimals)(params.amount);
+  const marketId = 0;
+  const exchangeId = 0;
+  console.log(amount);
   const { calldata: data, value } = encodeDeposit(
     params.accountId,
     params.token,
-    params.amount,
-    params.marketId,
-    params.exchangeId,
+    amount,
+    marketId,
+    exchangeId,
   );
 
+  const chainId = 80001;
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.DEPOSIT,
   );
 
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };

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

@@ -2,26 +2,31 @@ import { JsonRpcSigner, Signer } from 'ethers';
 
 export type CreateAccountParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
   ownerAddress: string;
 };
 
+export type CreateAccountResult = {
+  transactionHash: string | null;
+};
+
 export type DepositParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
   accountId: number;
   token: string;
-  amount: bigint;
-  marketId: number;
-  exchangeId: number;
+  amount: number;
+};
+
+export type DepositResult = {
+  transactionHash: string | null;
 };
 
 export type WithdrawParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: number;
   accountId: number;
   token: string;
-  amount: bigint;
-  marketId: number;
-  exchangeId: number;
+  amount: number;
+};
+
+export type WithdrawResult = {
+  transactionHash: string | null;
 };

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

@@ -1,25 +1,35 @@
-import { WithdrawParams } from './types';
+import { WithdrawParams, WithdrawResult } from './types';
 import { encodeWithdraw } from './encode';
 import { executeTransaction } from '../executeTransaction';
 import { TransactionType } from '../../utils/consts';
+import { getTokenDetails, scale } from '../token/common';
 
-export const withdraw = async (params: WithdrawParams): Promise<unknown> => {
-  // @todo update type once we agree on the structure
+export const withdraw = async (
+  params: WithdrawParams,
+): Promise<WithdrawResult> => {
+  const { tokenDecimals } = getTokenDetails(params.token);
+  const amount = scale(tokenDecimals)(params.amount);
+
+  const marketId = 0;
+  const exchangeId = 0;
   const { calldata: data, value } = encodeWithdraw(
     params.accountId,
     params.token,
-    params.amount,
-    params.marketId,
-    params.exchangeId,
+    BigInt(amount),
+    marketId,
+    exchangeId,
   );
 
+  const chainId = 80001;
   const result = await executeTransaction(
     params.signer,
     data,
     value,
-    params.chainId,
+    chainId,
     TransactionType.WITHDRAW,
   );
 
-  return result;
+  return {
+    transactionHash: result?.hash || null,
+  };
 };

package/src/services/token/index.ts

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './approve';
 export * from './getAllowance';
+export * from './getBalance';