@pyxisjs/chains 0.2.2 → 0.2.3

package/dist/index.d.mts

@@ -7123,8 +7123,10 @@ declare class EthereumChainAdapter extends BaseChainAdapter<PublicClient> implem
     buildWithdrawTx(args: BuildWithdrawTxArgs): Promise<TransactionPayload>;
     buildReclaimWithdrawalRequestTx(args: BuildReclaimWithdrawalRequestTxArgs): Promise<TransactionPayload>;
     buildCancelWithdrawalRequestTx(args: BuildCancelWithdrawalRequestTxArgs): Promise<TransactionPayload>;
-    getMinimumRequestAge(args: GetMinimumRequestAgeArgs): Promise<number>;
-    getUserWithdrawalRequests(_args: GetWithdrawalRequestsOfUserArgs): Promise<PyxisWithdrawalRequest[]>;
+    getMinimumRequestAge(_args: GetMinimumRequestAgeArgs): Promise<number>;
+    getUserWithdrawalRequests({ userAddress, flag, matchAll, }: GetWithdrawalRequestsOfUserArgs): Promise<PyxisWithdrawalRequest[]>;
+    private mapEVMWithdrawalRequest;
+    private viewSolveData;
 }
 
 interface ContractConfig {

package/dist/index.d.ts

@@ -7123,8 +7123,10 @@ declare class EthereumChainAdapter extends BaseChainAdapter<PublicClient> implem
     buildWithdrawTx(args: BuildWithdrawTxArgs): Promise<TransactionPayload>;
     buildReclaimWithdrawalRequestTx(args: BuildReclaimWithdrawalRequestTxArgs): Promise<TransactionPayload>;
     buildCancelWithdrawalRequestTx(args: BuildCancelWithdrawalRequestTxArgs): Promise<TransactionPayload>;
-    getMinimumRequestAge(args: GetMinimumRequestAgeArgs): Promise<number>;
-    getUserWithdrawalRequests(_args: GetWithdrawalRequestsOfUserArgs): Promise<PyxisWithdrawalRequest[]>;
+    getMinimumRequestAge(_args: GetMinimumRequestAgeArgs): Promise<number>;
+    getUserWithdrawalRequests({ userAddress, flag, matchAll, }: GetWithdrawalRequestsOfUserArgs): Promise<PyxisWithdrawalRequest[]>;
+    private mapEVMWithdrawalRequest;
+    private viewSolveData;
 }
 
 interface ContractConfig {

package/dist/index.js

@@ -6759,12 +6759,14 @@ var CONTRACTS = {
         cancel_withdrawal_request: "{address}::atomic_queue::cancel_atomic_request"
       },
       [import_core.ChainType.EVM]: {
-        get_minimum_request_age: "getMinimumRequestAge",
-        cancel_withdrawal_request: "cancelWithdrawalRequest",
-        reclaim_withdrawal_request: "reclaimWithdrawalRequest",
+        get_minimum_request_age: "minimumRequestAge",
+        cancel_atomic_request: "cancelAtomicRequest",
         update_atomic_request: "updateAtomicRequest",
         get_request_updated_at: "getRequestUpdatedAt",
-        get_user_atomic_requests: "getUserAtomicRequests"
+        get_user_atomic_requests: "getUserAtomicRequests",
+        get_all_atomic_requests: "getAtomicRequests",
+        // Private functions
+        view_solve_metadata: "viewSolveMetaData"
       }
     }
   },
@@ -7447,6 +7449,7 @@ var AptosAnalyticsClient = class {
 var import_core4 = require("@pyxisjs/core");
 var import_viem = require("viem");
 var import_chains = require("viem/chains");
+var import_dayjs2 = __toESM(require_dayjs_min());
 var viemChainMap = {
   [import_core4.ChainId.ETHEREUM_MAINNET]: import_chains.mainnet,
   [import_core4.ChainId.ETHEREUM_SEPOLIA]: import_chains.sepolia,
@@ -7713,11 +7716,18 @@ var EthereumChainAdapter = class extends import_core4.BaseChainAdapter {
       to: this.getContractAddress("atomicQueue"),
       function: functionSignature,
       arguments: [
-        args.offerAsset,
-        args.wantAsset,
-        args.offerAmount,
-        args.price,
-        args.deadline
+        [
+          args.user,
+          args.offerAsset,
+          args.wantAsset,
+          Number(args.deadline),
+          Number(args.price),
+          Number(args.offerAmount),
+          false,
+          // inSolve: Default false
+          (0, import_dayjs2.default)().unix()
+          // UpdatedAt: current unix timestamp
+        ]
       ],
       abi
     });
@@ -7725,7 +7735,7 @@ var EthereumChainAdapter = class extends import_core4.BaseChainAdapter {
   async buildReclaimWithdrawalRequestTx(args) {
     const functionSignature = this.getFunctionSignature(
       "atomicQueue",
-      "reclaim_withdrawal_request"
+      "cancel_atomic_request"
     );
     const abi = this.getContractABI("atomicQueue");
     return await this.buildPayload({
@@ -7738,7 +7748,7 @@ var EthereumChainAdapter = class extends import_core4.BaseChainAdapter {
   async buildCancelWithdrawalRequestTx(args) {
     const functionSignature = this.getFunctionSignature(
       "atomicQueue",
-      "cancel_withdrawal_request"
+      "cancel_atomic_request"
     );
     const abi = this.getContractABI("atomicQueue");
     return await this.buildPayload({
@@ -7748,7 +7758,7 @@ var EthereumChainAdapter = class extends import_core4.BaseChainAdapter {
       abi
     });
   }
-  async getMinimumRequestAge(args) {
+  async getMinimumRequestAge(_args) {
     const functionSignature = this.getFunctionSignature(
       "atomicQueue",
       "get_minimum_request_age"
@@ -7756,13 +7766,71 @@ var EthereumChainAdapter = class extends import_core4.BaseChainAdapter {
     const result = await this.viewContract({
       address: this.getContractAddress("atomicQueue"),
       function: functionSignature,
-      arguments: [args.vault],
+      arguments: [],
       abi: this.getContractABI("atomicQueue")
     });
     return Number(result);
   }
-  async getUserWithdrawalRequests(_args) {
-    return [];
+  async getUserWithdrawalRequests({
+    userAddress,
+    flag,
+    matchAll
+  }) {
+    const requestFlag = import_core4.PyxisUtils.buildRequestFlags(flag);
+    const getAllWithdrawalRequestFn = this.getFunctionSignature(
+      "atomicQueue",
+      "get_all_atomic_requests"
+    );
+    const withdrawalRequests = await this.viewContract({
+      address: this.getContractAddress("atomicQueue"),
+      function: getAllWithdrawalRequestFn,
+      arguments: [0, Number.MAX_SAFE_INTEGER, requestFlag, matchAll],
+      abi: this.getContractABI("atomicQueue")
+    });
+    const userRequests = withdrawalRequests.filter(
+      (request) => request.user === userAddress
+    );
+    return Promise.all(
+      userRequests.map((request) => this.mapEVMWithdrawalRequest(request))
+    );
+  }
+  async mapEVMWithdrawalRequest(request) {
+    const solveData = await this.viewSolveData({
+      offerAsset: request.offerToken,
+      wantAsset: request.wantToken,
+      user: request.user
+    });
+    return {
+      atomicPrice: request.atomicPrice,
+      deadline: request.deadline,
+      flags: import_core4.PyxisUtils.parseRequestFlags(solveData.flags),
+      offerAmount: request.offerAmount,
+      offerToken: request.offerToken,
+      userAddress: request.user,
+      wantToken: request.wantToken,
+      wantAmount: String(solveData.assetsForWant),
+      updatedAt: request.updatedAt
+    };
+  }
+  async viewSolveData({
+    offerAsset,
+    wantAsset,
+    user
+  }) {
+    const functionSignature = this.getFunctionSignature(
+      "atomicQueue",
+      "view_solve_metadata"
+    );
+    const [requestMetadata] = await this.viewContract({
+      address: this.getContractAddress("atomicQueue"),
+      function: functionSignature,
+      arguments: [offerAsset, wantAsset, [user]],
+      abi: this.getContractABI("atomicQueue")
+    });
+    if (!requestMetadata[0]) {
+      throw new Error("Solve metadata not found");
+    }
+    return requestMetadata[0];
   }
 };
 // Annotate the CommonJS export names for ESM import in node: