@ercworldio/blockchain-shared 1.0.3-dev.6 → 1.0.5-dev.0

package/build/chains/Provider.js

@@ -67,7 +67,7 @@ class Provider extends errors_1.default {
                 case RpcProviderType.ALCHEMY:
                     if (!this.config.config.alchemyApiKey)
                         throw new Error(this.RequireParameter("secret: alchemyApiKey"));
-                    let alchemy_network_name = (0, alchemy_1.get_alchemy_chain_name)(chain_id).toLowerCase();
+                    let alchemy_network_name = (0, alchemy_1.get_alchemy_chain_name)(chain_id, false).toLowerCase();
                     if (alchemy_network_name.includes("_")) {
                         alchemy_network_name = alchemy_network_name.replace("_", "-");
                     }

package/build/chains/networks_dev.json

@@ -46,7 +46,7 @@
             "treasury_receiver": "TN4tXH5F36BxWEe8UQuUeMr1EuPwJjNUFJ",
             "overflow_treasury_receiver": "TCdE3ZGvBjUcqVCreT25SWwF36gkiLYTGD",
             "overflow_threshold_decimal": 100000,
-            "min_funding_wallet_balance_usd": 5,
+            "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
                 "TCdE3ZGvBjUcqVCreT25SWwF36gkiLYTGD"
             ]
@@ -120,7 +120,7 @@
             "treasury_receiver": "AAuFzrm6H4Vv7UyJi8R5Gsm4ixtR2yVmqzLmuyUTS5cu",
             "overflow_treasury_receiver": "GLfRJqsRtTNDVvYVccXrz8RCKNnad2hqQfgFaApAKXCq",
             "overflow_threshold_decimal": 100000,
-            "min_funding_wallet_balance_usd": 5,
+            "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
                 "AAuFzrm6H4Vv7UyJi8R5Gsm4ixtR2yVmqzLmuyUTS5cu"
             ]
@@ -223,7 +223,7 @@
             "treasury_receiver": "0xaD372aCDd0F14A9430Af29DaEc8229A9F109d7F5",
             "overflow_treasury_receiver": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
             "overflow_threshold_decimal": 100000,
-            "min_funding_wallet_balance_usd": 5,
+            "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
                 "0xaD372aCDd0F14A9430Af29DaEc8229A9F109d7F5"
             ]
@@ -395,12 +395,12 @@
         "targetConfirmations": 10,
         "accounting": {
             "funding_wallet": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
-            "treasury_receiver": "0x89DecB6b265D7714A69EE05E3Bc50Fd829D7Ef90",
+            "treasury_receiver": "0x81E612A63f7e1E8435fdbaE04a81ac84638D25f3",
             "overflow_treasury_receiver": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
             "overflow_threshold_decimal": 100000,
-            "min_funding_wallet_balance_usd": 5,
+            "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
-                "0x89DecB6b265D7714A69EE05E3Bc50Fd829D7Ef90"
+                "0x81E612A63f7e1E8435fdbaE04a81ac84638D25f3"
             ]
         },
         "custodialAlchemyWebhooks": [
@@ -436,7 +436,7 @@
                     }
                 ],
                 "addresses": [
-                    "0x89DecB6b265D7714A69EE05E3Bc50Fd829D7Ef90"
+                    "0x81E612A63f7e1E8435fdbaE04a81ac84638D25f3"
                 ]
             },
             {
@@ -506,12 +506,12 @@
         "targetConfirmations": 10,
         "accounting": {
             "funding_wallet": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
-            "treasury_receiver": "0xEA8Ad078561B83724EEcDBb5b5A4f03369115Cf8",
+            "treasury_receiver": "0x296d7BfECCa7Fa59157b012e12Bab48859F11b32",
             "overflow_treasury_receiver": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
             "overflow_threshold_decimal": 100000,
-            "min_funding_wallet_balance_usd": 5,
+            "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
-                "0xEA8Ad078561B83724EEcDBb5b5A4f03369115Cf8"
+                "0x296d7BfECCa7Fa59157b012e12Bab48859F11b32"
             ]
         },
         "custodialAlchemyWebhooks": [
@@ -547,7 +547,7 @@
                     }
                 ],
                 "addresses": [
-                    "0xEA8Ad078561B83724EEcDBb5b5A4f03369115Cf8"
+                    "0x296d7BfECCa7Fa59157b012e12Bab48859F11b32"
                 ]
             },
             {
@@ -603,12 +603,12 @@
         "targetConfirmations": 10,
         "accounting": {
             "funding_wallet": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
-            "treasury_receiver": "0x69E1F9316E03Da502B52f4682b0349d36CFBfFfD",
+            "treasury_receiver": "0x32fDf51e2EdbCD58f10A721Bd2A815e64135B815",
             "overflow_treasury_receiver": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
             "overflow_threshold_decimal": 100000,
             "min_funding_wallet_balance_usd": 1,
             "allowed_receivers": [
-                "0x69E1F9316E03Da502B52f4682b0349d36CFBfFfD"
+                "0x32fDf51e2EdbCD58f10A721Bd2A815e64135B815"
             ]
         },
         "custodialAlchemyWebhooks": [
@@ -644,7 +644,7 @@
                     }
                 ],
                 "addresses": [
-                    "0x69E1F9316E03Da502B52f4682b0349d36CFBfFfD"
+                    "0x32fDf51e2EdbCD58f10A721Bd2A815e64135B815"
                 ]
             },
             {
@@ -699,12 +699,12 @@
         "targetConfirmations": 10,
         "accounting": {
             "funding_wallet": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
-            "treasury_receiver": "0xf4BE5695F5eCd281171ab625ceb59bEee081e14f",
+            "treasury_receiver": "0x5cAb2AE411442130eAD1d6d7C0219b19Bdd00C6b",
             "overflow_treasury_receiver": "0xF84a78E56fBACAADd73E59eDAe02b3b80e4966C8",
             "overflow_threshold_decimal": 100000,
             "min_funding_wallet_balance_usd": 0.5,
             "allowed_receivers": [
-                "0xf4BE5695F5eCd281171ab625ceb59bEee081e14f"
+                "0x5cAb2AE411442130eAD1d6d7C0219b19Bdd00C6b"
             ]
         },
         "custodialAlchemyWebhooks": [
@@ -747,7 +747,7 @@
                     }
                 ],
                 "addresses": [
-                    "0xf4BE5695F5eCd281171ab625ceb59bEee081e14f"
+                    "0x5cAb2AE411442130eAD1d6d7C0219b19Bdd00C6b"
                 ]
             },
             {

package/build/chains/networks_prod-dz.json

@@ -30,13 +30,6 @@
             }
         ],
         "quicknodeNotificationConfig": [
-            {
-                "name": "escrow-eth-prod-dz",
-                "network": "ethereum-mainnet",
-                "template": "evmWalletFilter",
-                "source": "contract",
-                "chain_id": 1
-            },
             {
                 "name": "qn-custodial-webhook-eth-prod-dz",
                 "network": "ethereum-mainnet",
@@ -162,13 +155,6 @@
             }
         ],
         "quicknodeNotificationConfig": [
-            {
-                "name": "escrow-bnb-prod-dz",
-                "network": "bnbchain-mainnet",
-                "template": "evmWalletFilter",
-                "source": "contract",
-                "chain_id": 56
-            },
             {
                 "name": "qn-custodial-webhook-bnb-prod-dz",
                 "network": "bnbchain-mainnet",
@@ -384,13 +370,6 @@
             }
         ],
         "quicknodeNotificationConfig": [
-            {
-                "name": "escrow-pol-prod-dz",
-                "network": "polygon-mainnet",
-                "template": "evmWalletFilter",
-                "source": "contract",
-                "chain_id": 137
-            },
             {
                 "name": "qn-custodial-webhook-pol-prod-dz",
                 "network": "bnbchain-mainnet",
@@ -488,13 +467,6 @@
             }
         ],
         "quicknodeNotificationConfig": [
-            {
-                "name": "escrow-mon-prod-dz",
-                "network": "monad-mainnet",
-                "template": "evmWalletFilter",
-                "source": "contract",
-                "chain_id": 143
-            },
             {
                 "name": "qn-custodial-webhook-mon-prod-dz",
                 "network": "monad-mainnet",
@@ -578,13 +550,6 @@
             }
         ],
         "quicknodeNotificationConfig": [
-            {
-                "name": "escrow-avax-prod-dz",
-                "network": "avalanche-mainnet",
-                "template": "evmWalletFilter",
-                "source": "contract",
-                "chain_id": 43114
-            },
             {
                 "name": "qn-custodial-webhook-avax-prod-dz",
                 "network": "avalanche-mainnet",

package/build/chains/networks_prod-sh.json

@@ -48,7 +48,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 24496423,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "1",
+                        "network_symbol": "eth",
+                        "network": "ETH_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0xB28BE79Ffe7CC1f352a8EFF3E3E8f4faFD05a881"
                 ]
@@ -157,7 +166,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 82263026,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "56",
+                        "network_symbol": "bnb",
+                        "network": "BNB_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0xa4f0f80b1f4b2dBDD7cE553342Ad5542ba7758Ec"
                 ]
@@ -357,7 +375,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 82937871,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "137",
+                        "network_symbol": "pol",
+                        "network": "MATIC_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0x0074D8ed3168bEF415337064670e0bf90981A1F5"
                 ]
@@ -452,7 +479,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 78523433,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "43114",
+                        "network_symbol": "avax",
+                        "network": "AVAX_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0x28DE9CeCd83D9b20Ee6A438d39114Add08ED5FF7"
                 ]

package/build/chains/networks_prod-yb.json

@@ -48,7 +48,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 24754256,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "1",
+                        "network_symbol": "eth",
+                        "network": "ETH_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0xBC88D756b866854C02410c8d3e62E5648279dc70"
                 ]
@@ -157,7 +166,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 89178576,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "56",
+                        "network_symbol": "bnb",
+                        "network": "BNB_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0x0074D8ed3168bEF415337064670e0bf90981A1F5"
                 ]
@@ -357,7 +375,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 84779780,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "137",
+                        "network_symbol": "pol",
+                        "network": "MATIC_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0x251824258e218293d79036Be1423388bf3476Ef4"
                 ]
@@ -452,7 +479,16 @@
                 "type": "Escrow",
                 "version": "1",
                 "startingBlock": 81474572,
-                "escrowAlchemyWebhooks": [],
+                "escrowAlchemyWebhooks": [
+                    {
+                        "chainId": "43114",
+                        "network_symbol": "avax",
+                        "network": "AVAX_MAINNET",
+                        "type": "GRAPHQL",
+                        "endpoint": "webhook/alchemy/escrow-events",
+                        "source": "contract"
+                    }
+                ],
                 "addresses": [
                     "0x6d47B7230F5D466677795E271db3aEE4C59c0B47"
                 ]

package/build/contracts/Escrow.d.ts

@@ -2,7 +2,7 @@ import { escrow } from "./typechain-types/contracts";
 import { Signer, Provider, ethers } from "ethers";
 import { ErrorObject, EscrowErrorMessage } from "./EscrowErrors";
 import Errors from "../errors/TransactionsErrors";
-import { BatchSweepErc20Payload, BatchWithdrawPayload, FundWalletsPayload, OpType, TransactionStatus } from "./types/escrow";
+import { BatchSweepErc20Payload, BatchWithdrawPayload, ExecuteWithdrawalPayload, FundWalletsPayload, OpType, TransactionStatus } from "./types/escrow";
 /**
  * Class to interact with the escrow contract
  * @author @0xgio - Georgio Diab
@@ -44,7 +44,7 @@ declare class EscrowInteraction extends Errors {
         transactionHash: null;
         receipt: null;
         error: {
-            name: "ContractBusy" | "ContractPaused" | "DepositOnlyERC20" | "EtherDirectTransferNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "InvalidSignature" | "NotAdmin" | "NotAuthorized" | "RequestAlreadyFulfilled" | "SignatureAlreadyUsed" | "TokenNotAllowed" | "TransferError" | "ZeroAddress" | "ZeroValue" | "UnknownError";
+            name: "ContractBusy" | "ContractPaused" | "InvalidSignature" | "SignatureAlreadyUsed" | "ZeroValue" | "ZeroAddress" | "RequestAlreadyFulfilled" | "EtherDirectTransferNotAllowed" | "DepositOnlyERC20" | "TokenNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "TransferError" | "NotAdmin" | "NotAuthorized" | "ExceedsLimit" | "ExceedsMax" | "UnknownError" | "InvalidNonce" | "TimelockConfigGroupNotSet" | "ConfigGroupNotSet" | "TimelockConfigNotSet" | "CommitmentNotFound" | "AlreadyCreatedTransaction" | "AccountAlreadyHasSignerRole" | "InvalidOperation" | "InvalidConfig" | "InvalidSignatures" | "AdminMultisigConfigNotSet" | "MultisigConfigNotSet" | "RequireTreasuryReceiverRole" | "InvalidMultiSig" | "RequireMultiSig" | "TimelockNotExpired" | "InsufficientExecutiveSigs" | "InsufficientManagerSigs" | "InvalidMultiSigForRequest" | "InsufficientManagerSigsForRequest" | "InsufficientExecutiveSigsForRequest";
             message: string;
             data?: any;
         };
@@ -61,14 +61,14 @@ declare class EscrowInteraction extends Errors {
         transactionHash: null;
         receipt: null;
         error: {
-            name: "ContractBusy" | "ContractPaused" | "DepositOnlyERC20" | "EtherDirectTransferNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "InvalidSignature" | "NotAdmin" | "NotAuthorized" | "RequestAlreadyFulfilled" | "SignatureAlreadyUsed" | "TokenNotAllowed" | "TransferError" | "ZeroAddress" | "ZeroValue" | "UnknownError";
+            name: "ContractBusy" | "ContractPaused" | "InvalidSignature" | "SignatureAlreadyUsed" | "ZeroValue" | "ZeroAddress" | "RequestAlreadyFulfilled" | "EtherDirectTransferNotAllowed" | "DepositOnlyERC20" | "TokenNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "TransferError" | "NotAdmin" | "NotAuthorized" | "ExceedsLimit" | "ExceedsMax" | "UnknownError" | "InvalidNonce" | "TimelockConfigGroupNotSet" | "ConfigGroupNotSet" | "TimelockConfigNotSet" | "CommitmentNotFound" | "AlreadyCreatedTransaction" | "AccountAlreadyHasSignerRole" | "InvalidOperation" | "InvalidConfig" | "InvalidSignatures" | "AdminMultisigConfigNotSet" | "MultisigConfigNotSet" | "RequireTreasuryReceiverRole" | "InvalidMultiSig" | "RequireMultiSig" | "TimelockNotExpired" | "InsufficientExecutiveSigs" | "InsufficientManagerSigs" | "InvalidMultiSigForRequest" | "InsufficientManagerSigsForRequest" | "InsufficientExecutiveSigsForRequest";
             message: string;
             data?: any;
         };
         fee?: undefined;
     }>;
     get_used_request_ids(ids: number[]): Promise<number[]>;
-    admin_batch_withdraw(payloads: BatchWithdrawPayload[], token_price: number): Promise<{
+    batch_withdraw(payloads: BatchWithdrawPayload[], token_price: number): Promise<{
         status: TransactionStatus;
         transactionHash: null;
         receipt: null;
@@ -108,7 +108,7 @@ declare class EscrowInteraction extends Errors {
         receipt: null;
         executed_at: Date;
         error: {
-            name: "ContractBusy" | "ContractPaused" | "DepositOnlyERC20" | "EtherDirectTransferNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "InvalidSignature" | "NotAdmin" | "NotAuthorized" | "RequestAlreadyFulfilled" | "SignatureAlreadyUsed" | "TokenNotAllowed" | "TransferError" | "ZeroAddress" | "ZeroValue" | "UnknownError";
+            name: "ContractBusy" | "ContractPaused" | "InvalidSignature" | "SignatureAlreadyUsed" | "ZeroValue" | "ZeroAddress" | "RequestAlreadyFulfilled" | "EtherDirectTransferNotAllowed" | "DepositOnlyERC20" | "TokenNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "TransferError" | "NotAdmin" | "NotAuthorized" | "ExceedsLimit" | "ExceedsMax" | "UnknownError" | "InvalidNonce" | "TimelockConfigGroupNotSet" | "ConfigGroupNotSet" | "TimelockConfigNotSet" | "CommitmentNotFound" | "AlreadyCreatedTransaction" | "AccountAlreadyHasSignerRole" | "InvalidOperation" | "InvalidConfig" | "InvalidSignatures" | "AdminMultisigConfigNotSet" | "MultisigConfigNotSet" | "RequireTreasuryReceiverRole" | "InvalidMultiSig" | "RequireMultiSig" | "TimelockNotExpired" | "InsufficientExecutiveSigs" | "InsufficientManagerSigs" | "InvalidMultiSigForRequest" | "InsufficientManagerSigsForRequest" | "InsufficientExecutiveSigsForRequest";
             message: string;
             data?: any;
         };
@@ -124,6 +124,16 @@ declare class EscrowInteraction extends Errors {
         feePerTxUsd?: undefined;
         feePerTxUsdDecimals?: undefined;
     }>;
+    execute_withdrawal(payload: ExecuteWithdrawalPayload): Promise<{
+        status: TransactionStatus;
+        transactionHash: string;
+        fee: bigint;
+    }>;
+    batch_execute_withdrawal(payload: ExecuteWithdrawalPayload[]): Promise<{
+        status: TransactionStatus;
+        transactionHash: string;
+        fee: bigint;
+    }>;
     /**
      * Entry point for withdraw, requires signer to be set
      * @param amount Amount of tokens to withdraw in decimal format. e.g: 1.5 ETH
@@ -148,7 +158,7 @@ declare class EscrowInteraction extends Errors {
         transactionHash: null;
         receipt: null;
         error: {
-            name: "ContractBusy" | "ContractPaused" | "DepositOnlyERC20" | "EtherDirectTransferNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "InvalidSignature" | "NotAdmin" | "NotAuthorized" | "RequestAlreadyFulfilled" | "SignatureAlreadyUsed" | "TokenNotAllowed" | "TransferError" | "ZeroAddress" | "ZeroValue" | "UnknownError";
+            name: "ContractBusy" | "ContractPaused" | "InvalidSignature" | "SignatureAlreadyUsed" | "ZeroValue" | "ZeroAddress" | "RequestAlreadyFulfilled" | "EtherDirectTransferNotAllowed" | "DepositOnlyERC20" | "TokenNotAllowed" | "InsufficientBalance" | "InsufficientReserves" | "TransferError" | "NotAdmin" | "NotAuthorized" | "ExceedsLimit" | "ExceedsMax" | "UnknownError" | "InvalidNonce" | "TimelockConfigGroupNotSet" | "ConfigGroupNotSet" | "TimelockConfigNotSet" | "CommitmentNotFound" | "AlreadyCreatedTransaction" | "AccountAlreadyHasSignerRole" | "InvalidOperation" | "InvalidConfig" | "InvalidSignatures" | "AdminMultisigConfigNotSet" | "MultisigConfigNotSet" | "RequireTreasuryReceiverRole" | "InvalidMultiSig" | "RequireMultiSig" | "TimelockNotExpired" | "InsufficientExecutiveSigs" | "InsufficientManagerSigs" | "InvalidMultiSigForRequest" | "InsufficientManagerSigsForRequest" | "InsufficientExecutiveSigsForRequest";
             message: string;
             data?: any;
         };

package/build/contracts/Escrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Escrow.d.ts","sourceRoot":"","sources":["../../src/contracts/Escrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAqC,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAG9G,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAC;AACpF,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAiB,kBAAkB,EAAiB,MAAM,EAAa,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGtK;;;GAGG;AACH,cAAM,iBAAkB,SAAQ,MAAM;IAClC,OAAO,CAAC,MAAM,CAAuB;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,aAAa,CAAa;gBAEf,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAU7E;;;OAGG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM;IAK/B,uBAAuB;IAEvB;;;;OAIG;IACU,mBAAmB,CAAC,WAAW,EAAE,MAAM;IAYpD;;;;;OAKG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAgBzD,uBAAuB;IAEV,WAAW,CAAC,OAAO,EAAE,kBAAkB;;;;;;;;;;;;;;;;;IAiCvC,eAAe,CAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM;;;;;;;;;;;;;;;;;IA6BnE,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAYtD,oBAAoB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,EAAE,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoEvF;;;;;;;;OAQG;IACU,QAAQ,CACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;YAyCpC,aAAa;YAiCb,aAAa;IA0C3B,iBAAiB,CAAC,KAAK,EAAE,WAAW;CAkBvC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"Escrow.d.ts","sourceRoot":"","sources":["../../src/contracts/Escrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAqC,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAG9G,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAC;AACpF,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAiB,wBAAwB,EAAE,kBAAkB,EAAiB,MAAM,EAAa,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGhM;;;GAGG;AACH,cAAM,iBAAkB,SAAQ,MAAM;IAClC,OAAO,CAAC,MAAM,CAAuB;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,CAAC,QAAQ,CAAyB;IACzC,OAAO,CAAC,aAAa,CAAa;gBAEf,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAU7E;;;OAGG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM;IAK/B,uBAAuB;IAEvB;;;;OAIG;IACU,mBAAmB,CAAC,WAAW,EAAE,MAAM;IAYpD;;;;;OAKG;IACU,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAgBzD,uBAAuB;IAEV,WAAW,CAAC,OAAO,EAAE,kBAAkB;;;;;;;;;;;;;;;;;IAiCvC,eAAe,CAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,QAAQ,EAAE,MAAM;;;;;;;;;;;;;;;;;IA6BnE,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAatD,cAAc,CAAC,QAAQ,EAAE,oBAAoB,EAAE,EAAE,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuEpE,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;IAsBpD,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,EAAE;;;;;IA2FzE;;;;;;;;OAQG;IACU,QAAQ,CACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;YAyCpC,aAAa;YAiCb,aAAa;IA0C3B,iBAAiB,CAAC,KAAK,EAAE,WAAW;CAkBvC;AAED,eAAe,iBAAiB,CAAC"}

package/build/contracts/Escrow.js

@@ -97,7 +97,7 @@ class EscrowInteraction extends TransactionsErrors_1.default {
                     throw new Error("Signer not connected to contract.");
                 }
                 const tx = yield this.escrowContract.fundWallets(payload.wallets, payload.amount);
-                const receipt = yield tx.wait();
+                const receipt = yield tx.wait(this.CONFIRMATIONS);
                 if (!receipt)
                     throw new Error("Failed to send transaction");
                 return {
@@ -162,7 +162,8 @@ class EscrowInteraction extends TransactionsErrors_1.default {
             }
         });
     }
-    admin_batch_withdraw(payloads, token_price) {
+    /// Withdrawal requests with no timelock (no scheduling needed)
+    batch_withdraw(payloads, token_price) {
         return __awaiter(this, void 0, void 0, function* () {
             let success = [];
             let failed = [];
@@ -184,7 +185,7 @@ class EscrowInteraction extends TransactionsErrors_1.default {
                             cancel
                         }
                     };
-                let tx = yield this.escrowContract.batch_withdraw(payloads);
+                let tx = yield this.escrowContract.batchWithdrawWithTimelock(payloads);
                 let receipt = yield tx.wait(this.CONFIRMATIONS);
                 if (!receipt)
                     throw new Error(this.UnexpectedError("Failed to retrieve transaction receipt"));
@@ -229,6 +230,113 @@ class EscrowInteraction extends TransactionsErrors_1.default {
             }
         });
     }
+    // Execute a withdrawal that has a timelock (scheduling needed)
+    execute_withdrawal(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!this.signer)
+                    throw new Error("Signer not set");
+                const tx = yield this.escrowContract.executeWithdrawal(payload.committedAmount, payload.netAmount, payload.requestId, payload.tokenAddress, payload.receiverAddress, payload.executeAt);
+                const receipt = yield tx.wait(this.CONFIRMATIONS);
+                if (!receipt)
+                    throw new Error(this.UnexpectedError("Failed to retrieve transaction receipt"));
+                return {
+                    status: escrow_1.TransactionStatus.SUCCESS,
+                    transactionHash: tx.hash,
+                    fee: receipt.fee,
+                };
+            }
+            catch (e) {
+                const errorResult = this.decodeRevertError(e);
+                throw errorResult;
+            }
+        });
+    }
+    // Execute a withdrawal that has a timelock (scheduling needed)
+    batch_execute_withdrawal(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!this.signer)
+                    throw new Error("Signer not set");
+                const tx = yield this.escrowContract.batchExecuteWithdrawal(payload);
+                const receipt = yield tx.wait(this.CONFIRMATIONS);
+                if (!receipt)
+                    throw new Error(this.UnexpectedError("Failed to retrieve transaction receipt"));
+                return {
+                    status: escrow_1.TransactionStatus.SUCCESS,
+                    transactionHash: tx.hash,
+                    fee: receipt.fee,
+                };
+            }
+            catch (e) {
+                const errorResult = this.decodeRevertError(e);
+                throw errorResult;
+            }
+        });
+    }
+    // public async admin_batch_withdraw(payloads: BatchWithdrawPayload[], token_price: number) {
+    //     let success: number[] = [];
+    //     let failed: number[] = [];
+    //     let dropped: number[] = [];
+    //     let cancel: number[] = [];
+    //     const executed_at = new Date();
+    //     try {
+    //         if (!this.signer) throw new Error("Signer not set");
+    //         if (!payloads.length) return {
+    //             status: TransactionStatus.FAILED,
+    //             transactionHash: null,
+    //             receipt: null,
+    //             data: {
+    //                 success,
+    //                 failed,
+    //                 dropped,
+    //                 cancel
+    //             }
+    //         }
+    //         let tx = await this.escrowContract.batch_withdraw(payloads);
+    //         let receipt = await tx.wait(this.CONFIRMATIONS);
+    //         if (!receipt) throw new Error(this.UnexpectedError("Failed to retrieve transaction receipt"));
+    //         success = payloads.map(p => p.requestId);
+    //         const fee_per_transaction = receipt.fee / BigInt(payloads.length);
+    //         const fee_per_tx_decimals = parseFloat(formatEther(fee_per_transaction));
+    //         const fee_per_tx_usd_decimals = fee_per_tx_decimals * token_price;
+    //         const fee_per_tx_usd = parseUnits(fee_per_tx_decimals.toFixed(5), 6);
+    //         return {
+    //             status: TransactionStatus.SUCCESS,
+    //             transactionHash: tx.hash,
+    //             fee: receipt.fee,
+    //             feePerTx: fee_per_transaction,
+    //             feePerTxDecimals: fee_per_tx_decimals,
+    //             feePerTxUsd: fee_per_tx_usd,
+    //             feePerTxUsdDecimals: fee_per_tx_usd_decimals,
+    //             receipt,
+    //             executed_at,
+    //             data: {
+    //                 success,
+    //                 failed,
+    //                 dropped,
+    //                 cancel
+    //             }
+    //         }
+    //     } catch (e) {
+    //         const errorResult = this.decodeRevertError(e as ErrorObject);
+    //         return {
+    //             status: TransactionStatus.FAILED,
+    //             transactionHash: null,
+    //             receipt: null,
+    //             executed_at,
+    //             error: {
+    //                 ...errorResult
+    //             },
+    //             data: {
+    //                 success,
+    //                 failed,
+    //                 dropped,
+    //                 cancel
+    //             }
+    //         };
+    //     }
+    // }
     /**
      * Entry point for withdraw, requires signer to be set
      * @param amount Amount of tokens to withdraw in decimal format. e.g: 1.5 ETH
@@ -341,7 +449,7 @@ class EscrowInteraction extends TransactionsErrors_1.default {
     }
     decodeRevertError(error) {
         // Decode error data
-        if (error.data) {
+        if (error.data && error.data !== "0x") {
             const decodedError = this.escrowContract.interface.parseError(error.data);
             if (decodedError) {
                 // Decoded error