@ercworldio/blockchain-shared 1.0.3-dev.4-PROJ-1296.10 → 1.0.3-dev.6

package/build/contracts/EscrowErrors.js

@@ -6,25 +6,23 @@ const parseDecodedError = (decodedError) => {
         case "ContractPaused":
             return { name: decodedError.name, message: `Contract is currently paused by the administrators.` };
         case "ContractBusy":
-            return { name: decodedError.name, message: `Contract is busy with another transaction.` };
+            return { name: decodedError.name, message: `Contract is busy with another tranasction.` };
+        case "ContractBusy":
+            return { name: decodedError.name, message: `Contract is busy with another tranasction.` };
         case "DepositOnlyERC20":
-            return { name: decodedError.name, message: `Only ERC20 token deposits are allowed.` };
+            return { name: decodedError.name, message: `Only ERC20 tokend deposits are allowed.` };
         case "EtherDirectTransferNotAllowed":
-            return { name: decodedError.name, message: `Direct transfer of native token to the contract is not allowed. Please use the deposit methods instead.` };
+            return {
+                name: decodedError.name,
+                message: `Direct transfer of native token to the contract is not allowed. Please use the deposit methods instead.`
+            };
         case "InvalidSignature":
             return { name: decodedError.name, message: `Transaction signature does not match.` };
-        case "InvalidSignatures":
-            return { name: decodedError.name, message: `One or more signatures are invalid.` };
         case "InsufficientReserves":
             return { name: decodedError.name, message: `Contract token balance is low.` };
-        case "InsufficientExecutiveSigs": {
-            const [required, provided] = decodedError.args;
-            return { name: decodedError.name, message: `Insufficient executive signatures. Required: ${required}, provided: ${provided}.` };
-        }
-        case "InsufficientManagerSigs": {
-            const [required, provided] = decodedError.args;
-            return { name: decodedError.name, message: `Insufficient manager signatures. Required: ${required}, provided: ${provided}.` };
-        }
+        // case "InsufficientBalance":
+        //     const [holder, token, available, requested] = decodedError.args;
+        //     return { name: decodedError.name, message: `Balance of ${holder} of token: ${token} is low. Requested ${requested}, but has ${available}. ` }
         case "NotAuthorized":
             return { name: decodedError.name, message: `User is not authorized for this action.` };
         case "NotAdmin":
@@ -35,58 +33,15 @@ const parseDecodedError = (decodedError) => {
             return { name: decodedError.name, message: `Token transfer failed.` };
         case "SignatureAlreadyUsed":
             return { name: decodedError.name, message: `Transaction cannot be repeated.` };
-        case "TokenNotAllowed": {
+        case "TokenNotAllowed":
             const [tokenAddress] = decodedError.args;
             return { name: decodedError.name, message: `Transfer of token ${tokenAddress} is not allowed.` };
-        }
         case "ZeroAddress":
-            return { name: decodedError.name, message: `Transfer to the Ethereum zero address is not allowed.` };
+            return { name: decodedError.name, message: `Transfer to the Ethereum Zero Address is not allowed.` };
         case "ZeroValue":
             return { name: decodedError.name, message: `Token amount cannot be zero.` };
-        case "ExceedsMax":
-            return { name: decodedError.name, message: `Funding amount exceeded hard limit.` };
-        case "ExceedsLimit":
-            return { name: decodedError.name, message: `Batch exceeds max limit.` };
-        case "InvalidNonce":
-            return { name: decodedError.name, message: `Invalid transaction nonce.` };
-        case "InvalidOperation":
-            return { name: decodedError.name, message: `Operation type is not valid.` };
-        case "InvalidConfig":
-            return { name: decodedError.name, message: `Contract configuration is invalid.` };
-        case "InvalidMultiSig":
-            return { name: decodedError.name, message: `Multisig configuration or signatures are invalid.` };
-        case "RequireMultiSig":
-            return { name: decodedError.name, message: `This operation requires multisig approval.` };
-        case "RequireTreasuryReceiverRole":
-            return { name: decodedError.name, message: `Receiver address does not have the required treasury receiver role.` };
-        case "TimelockConfigGroupNotSet":
-            return { name: decodedError.name, message: `Timelock config group is not configured for this escrow.` };
-        case "TimelockConfigNotSet":
-            return { name: decodedError.name, message: `Timelock configuration is not set.` };
-        case "ConfigGroupNotSet":
-            return { name: decodedError.name, message: `Configuration group is not set for this escrow.` };
-        case "AdminMultisigConfigNotSet":
-            return { name: decodedError.name, message: `Admin multisig configuration is not set.` };
-        case "MultisigConfigNotSet":
-            return { name: decodedError.name, message: `Multisig configuration is not set.` };
-        case "TimelockNotExpired": {
-            const [unlockAt] = decodedError.args;
-            return { name: decodedError.name, message: `Timelock has not expired yet. Unlocks at: ${unlockAt}.` };
-        }
-        case "CommitmentNotFound": {
-            const [commitmentHash] = decodedError.args;
-            return { name: decodedError.name, message: `Commitment not found: ${commitmentHash}.` };
-        }
-        case "AlreadyCreatedTransaction": {
-            const [requestId] = decodedError.args;
-            return { name: decodedError.name, message: `Transaction already created for request id: ${requestId}.` };
-        }
-        case "AccountAlreadyHasSignerRole": {
-            const [signerAddress] = decodedError.args;
-            return { name: decodedError.name, message: `Account ${signerAddress} already has the signer role.` };
-        }
         default:
-            return { name: "UnknownError", message: "Unexpected error occurred." };
+            return { name: "UnknownError", message: "Unexpected error occured." };
     }
 };
 exports.parseDecodedError = parseDecodedError;

package/build/contracts/artifacts/Escrow.json

@@ -434,6 +434,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "address",
+                "name": "caller",
+                "type": "address"
+            },
             {
                 "indexed": false,
                 "internalType": "address",
@@ -770,6 +776,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "address",
+                "name": "caller",
+                "type": "address"
+            },
             {
                 "indexed": false,
                 "internalType": "address",

package/build/contracts/contract-events/AccessControlEvents.d.ts

@@ -2,19 +2,9 @@ import { GrantRoleEventData, RevokeRoleEventData } from "./types/AccessControlEv
 declare enum Roles {
     DEFAULT_ADMIN_ROLE = "Contract Super Admin",
     OPERATOR_ROLE = "Signature Admin",
-    WITHDRAW_ROLE = "Contract Accounting Admin",
-    ADMIN_TREASURY_MANAGER_ROLE = "",
-    ADMIN_TREASURY_EXECUTIVE_ROLE = "",
-    TREASURY_RECEIVER_ROLE = "",
-    TREASURY_MANAGER_ROLE = "",
-    TREASURY_EXECUTIVE_ROLE = "",
-    TREASURY_DISPATCH_ROLE = "",
-    CONFIG_MANAGER_ROLE = "",
-    CONFIG_EXECUTIVE_ROLE = "",
-    TIMELOCK_CONFIG_MANAGER_ROLE = "",
-    TIMELOCK_CONFIG_EXECUTIVE_ROLE = ""
+    WITHDRAW_ROLE = "Contract Accounting Admin"
 }
-type RoleName = "DEFAULT_ADMIN_ROLE" | "OPERATOR_ROLE" | "WITHDRAW_ROLE" | "ADMIN_TREASURY_MANAGER_ROLE" | "ADMIN_TREASURY_EXECUTIVE_ROLE" | "TREASURY_RECEIVER_ROLE" | "TREASURY_MANAGER_ROLE" | "TREASURY_EXECUTIVE_ROLE" | "TREASURY_DISPATCH_ROLE" | "CONFIG_MANAGER_ROLE" | "CONFIG_EXECUTIVE_ROLE" | "TIMELOCK_CONFIG_MANAGER_ROLE" | "TIMELOCK_CONFIG_EXECUTIVE_ROLE";
+type RoleName = "DEFAULT_ADMIN_ROLE" | "OPERATOR_ROLE" | "WITHDRAW_ROLE";
 /**
  * Class for handling events related to the `AccessControl` contract.
  */

package/build/contracts/contract-events/AccessControlEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccessControlEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/AccessControlEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGtF,aAAK,KAAK;IACN,kBAAkB,yBAAyB;IAC3C,aAAa,oBAAoB;IACjC,aAAa,8BAA8B;IAC3C,2BAA2B,KAAK;IAChC,6BAA6B,KAAK;IAClC,sBAAsB,KAAK;IAC3B,qBAAqB,KAAK;IAC1B,uBAAuB,KAAK;IAC5B,sBAAsB,KAAK;IAC3B,mBAAmB,KAAK;IACxB,qBAAqB,KAAK;IAC1B,4BAA4B,KAAK;IACjC,8BAA8B,KAAK;CACtC;AAED,KAAK,QAAQ,GAAG,oBAAoB,GAAG,eAAe,GAAG,eAAe,GACpE,6BAA6B,GAC7B,+BAA+B,GAC/B,wBAAwB,GACxB,uBAAuB,GACvB,yBAAyB,GACzB,wBAAwB,GACxB,qBAAqB,GACrB,uBAAuB,GACvB,8BAA8B,GAC9B,gCAAgC,CAAA;AAEpC;;GAEG;AACH,cAAM,mBAAmB;IACrB,gDAAgD;IAChD,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IACnD,oDAAoD;IAC7C,uBAAuB,EAAE,QAAQ,EAAE,CAcxC;IAEF,mDAAmD;IACnD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO;IAkBP;;;OAGG;IACH,MAAM,CAAC,WAAW;IAQlB;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM;IAQ7B;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,kBAAkB;IASrE;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB;CAQ1E;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"AccessControlEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/AccessControlEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGtF,aAAK,KAAK;IACN,kBAAkB,yBAAyB;IAC3C,aAAa,oBAAoB;IACjC,aAAa,8BAA8B;CAC9C;AAED,KAAK,QAAQ,GAAG,oBAAoB,GAAG,eAAe,GAAG,eAAe,CAAC;AAEzE;;GAEG;AACH,cAAM,mBAAmB;IACrB,gDAAgD;IAChD,MAAM,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IACnD,oDAAoD;IAC7C,uBAAuB,EAAE,QAAQ,EAAE,CAA4D;IACtG,mDAAmD;IACnD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO;IAkBP;;;OAGG;IACH,MAAM,CAAC,WAAW;IAQlB;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM;IAIjC;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM;IAQ7B;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,kBAAkB;IASrE;;;;OAIG;IACH,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,GAAG,mBAAmB;CAQ1E;AAED,eAAe,mBAAmB,CAAC"}

package/build/contracts/contract-events/AccessControlEvents.js

@@ -6,16 +6,6 @@ var Roles;
     Roles["DEFAULT_ADMIN_ROLE"] = "Contract Super Admin";
     Roles["OPERATOR_ROLE"] = "Signature Admin";
     Roles["WITHDRAW_ROLE"] = "Contract Accounting Admin";
-    Roles["ADMIN_TREASURY_MANAGER_ROLE"] = "";
-    Roles["ADMIN_TREASURY_EXECUTIVE_ROLE"] = "";
-    Roles["TREASURY_RECEIVER_ROLE"] = "";
-    Roles["TREASURY_MANAGER_ROLE"] = "";
-    Roles["TREASURY_EXECUTIVE_ROLE"] = "";
-    Roles["TREASURY_DISPATCH_ROLE"] = "";
-    Roles["CONFIG_MANAGER_ROLE"] = "";
-    Roles["CONFIG_EXECUTIVE_ROLE"] = "";
-    Roles["TIMELOCK_CONFIG_MANAGER_ROLE"] = "";
-    Roles["TIMELOCK_CONFIG_EXECUTIVE_ROLE"] = "";
 })(Roles || (Roles = {}));
 /**
  * Class for handling events related to the `AccessControl` contract.
@@ -23,21 +13,7 @@ var Roles;
 class AccessControlEvents {
     constructor() {
         /** Array of role names supported by the contract */
-        this.accessControlEventNames = [
-            "DEFAULT_ADMIN_ROLE",
-            "OPERATOR_ROLE",
-            "WITHDRAW_ROLE",
-            "ADMIN_TREASURY_MANAGER_ROLE",
-            "ADMIN_TREASURY_EXECUTIVE_ROLE",
-            "TREASURY_RECEIVER_ROLE",
-            "TREASURY_MANAGER_ROLE",
-            "TREASURY_EXECUTIVE_ROLE",
-            "TREASURY_DISPATCH_ROLE",
-            "CONFIG_MANAGER_ROLE",
-            "CONFIG_EXECUTIVE_ROLE",
-            "TIMELOCK_CONFIG_MANAGER_ROLE",
-            "TIMELOCK_CONFIG_EXECUTIVE_ROLE"
-        ];
+        this.accessControlEventNames = ["DEFAULT_ADMIN_ROLE", "OPERATOR_ROLE", "WITHDRAW_ROLE"];
         // Create a map of role hashes to role names
         this.roleMap = new Map(this.accessControlEventNames.map(name => {
             if (name.includes("DEFAULT_ADMIN_ROLE")) {
@@ -89,8 +65,8 @@ class AccessControlEvents {
      * @returns The parsed event with role mapped to human-readable name and gasUsed converted to number
      */
     mutateRoleGrantedEvent(event) {
-        const roleName = this.getRoleName(event.role);
-        return Object.assign(Object.assign({}, event), { gasUsed: Number(event.gasUsed), roleName });
+        const role = this.getRoleName(event.role);
+        return Object.assign(Object.assign({}, event), { gasUsed: Number(event.gasUsed), role });
     }
     /**
      * Parses the RoleRevoked event object.
@@ -98,8 +74,8 @@ class AccessControlEvents {
      * @returns The parsed event with role mapped to human-readable name and gasUsed converted to number
      */
     mutateRoleRevokedEvent(event) {
-        const roleName = this.getRoleName(event.role);
-        return Object.assign(Object.assign({}, event), { gasUsed: Number(event.gasUsed), roleName });
+        const role = this.getRoleName(event.role);
+        return Object.assign(Object.assign({}, event), { gasUsed: Number(event.gasUsed), role });
     }
 }
 /** Singleton instance of AccessControlEvents */

package/build/contracts/contract-events/EscrowEvents.d.ts

@@ -1,7 +1,7 @@
 import { Result } from "ethers";
-import { ChainId, EventObject } from "../../interfaces";
+import { EventObject } from "../../interfaces";
 import { IConfig } from "../../interfaces/config";
-import { AdminWithdrawEventData, ConfigureAdminMultisigEventData, ConfigureTokenMultisigEventData, LowReservesEventData, SetTimelockGranularEventData, SetTokenTimelockEventData, WithdrawalExecutedEventData, WithdrawalScheduledEventData } from "./types/events";
+import { LowReservesEventData } from "./types/events";
 /**
  * Handles the mutation of deposit and withdrawal events before they are used to produce events to the event hub
  */
@@ -32,136 +32,6 @@ declare class EscrowEvents {
         user: string;
         requestedToken: string;
     };
-    mutateSetTokenTimelockEvent(chainId: string, baseEvent: SetTokenTimelockEventData, eventArgs: Result): {
-        thresholdAmount: number;
-        thresholdAmountWei: string;
-        durationBelow: number;
-        durationAbove: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        tokenAddress: string;
-    };
-    mutateTimelockGranularEvent(baseEvent: SetTimelockGranularEventData, eventArgs: Result): {
-        duration: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        receiverAddress: string;
-    };
-    mutateConfigureTokenMultiSig(chainId: string, baseEvent: ConfigureTokenMultisigEventData, eventArgs: Result): {
-        thresholdAmount: number;
-        thresholdAmountWei: string;
-        sigsExecutiveBelow: number;
-        sigsExecutiveAbove: number;
-        sigsManagerBelow: number;
-        sigsManagerAbove: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        opType: bigint;
-        tokenAddress: string;
-    };
-    mutateConfigureAdminMultisig(baseEvent: ConfigureAdminMultisigEventData, eventArgs: Result): {
-        sigsManagerRequired: number;
-        sigsExecutiveRequired: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        opType: bigint;
-    };
-    mutateAdminWithdraw(chainId: string, baseEvent: AdminWithdrawEventData, eventArgs: Result): {
-        amount: number;
-        amountWei: string;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        receiver: string;
-        tokenAddress: string;
-        requestId: bigint;
-    };
-    mutateWithdrawalScheduled(chainId: string, baseEvent: WithdrawalScheduledEventData, eventArgs: Result): {
-        amount: number;
-        amountWei: string;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        commitmentHash: string;
-        requestId: bigint;
-        tokenAddress: string;
-        receiverAddress: string;
-        executeAt: bigint;
-    };
-    mutateWithdrawalExecuted(baseEvent: WithdrawalExecutedEventData, eventArgs: Result): {
-        requestId: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        commitmentHash: string;
-    };
-    mutateWithdrawalCancelled(baseEvent: WithdrawalExecutedEventData, eventArgs: Result): {
-        requestId: number;
-        gasUsed: number;
-        eventName: string;
-        confirmed: boolean;
-        blockchain: import("../../interfaces").BlockchainType;
-        parentContract: string;
-        caller?: string;
-        timestamp: number | bigint;
-        blockNumber?: number;
-        txHash: string;
-        chainId: number;
-        commitmentHash: string;
-    };
     mutateDirectDepositEvent(chainId: string, baseEvent: EventObject, tokenAddress: string, amount: bigint): EventObject[];
     /**
      * Mutates the base event object with the respective payment token details
@@ -189,8 +59,6 @@ declare class EscrowEvents {
      * @returns Array of mutated event objects
      */
     private mutatePaymentEvent;
-    /** Converts from wei to decimals */
-    formatTokenAmount(chainId: ChainId, token: string, amount: bigint): number;
 }
 export default EscrowEvents;
 //# sourceMappingURL=EscrowEvents.d.ts.map

package/build/contracts/contract-events/EscrowEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EscrowEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/EscrowEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAe,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAA0B,sBAAsB,EAAmC,+BAA+B,EAAmC,+BAA+B,EAA4D,oBAAoB,EAAgC,4BAA4B,EAA6B,yBAAyB,EAAuG,2BAA2B,EAAgC,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAIplB;;GAEG;AACH,cAAM,YAAY;IACd,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAQ;IAC5C,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO;IAIP,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO;IAOlC;;;;OAIG;IACH,OAAO,CAAC,iCAAiC;IA6BzC,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;IA6B1F,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;IAcpG,2BAA2B,CAAC,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAStF,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,+BAA+B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IAgB3G,4BAA4B,CAAC,SAAS,EAAE,+BAA+B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;IAU1F,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;IAYzF,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAYrG,wBAAwB,CAAC,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAWlF,yBAAyB,CAAC,SAAS,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;IAWnF,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAUtG;;;;;;OAMG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAc7F;;;;;;OAMG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAiBhG;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAsB1B,oCAAoC;IACpC,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAcpE;AAGD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"EscrowEvents.d.ts","sourceRoot":"","sources":["../../../src/contracts/contract-events/EscrowEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAe,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAA4D,oBAAoB,EAA4C,MAAM,gBAAgB,CAAC;AAI1J;;GAEG;AACH,cAAM,YAAY;IACd,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAQ;IAC5C,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO;IAIP,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO;IAOlC;;;;OAIG;IACH,OAAO,CAAC,iCAAiC;IA6BzC,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM;;;;;;;;;;;;;;;;IA6B1F,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAUtG;;;;;;OAMG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAc7F;;;;;;OAMG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE;IAiBhG;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;CAqB7B;AAGD,eAAe,YAAY,CAAC"}

package/build/contracts/contract-events/EscrowEvents.js

@@ -45,59 +45,23 @@ class EscrowEvents {
     }
     mutateLowReservesEvent(chainId, baseEvent, eventArgs) {
         const _eventArgs = eventArgs;
-        let amountRequested = this.formatTokenAmount(chainId, _eventArgs.requestedToken, _eventArgs.amountRequested);
-        let availableReserves = this.formatTokenAmount(chainId, _eventArgs.requestedToken, _eventArgs.availableReserves);
-        // if (_eventArgs.requestedToken === ethers.ZeroAddress) {
-        //     amountRequested = Number(ethers.formatEther(_eventArgs.amountRequested));
-        //     availableReserves = Number(ethers.formatEther(_eventArgs.availableReserves));
-        // }
-        // else {
-        //     const paymentTokens = ChainManager.getInstance(this.config).getPaymentTokensForChain(parseInt(chainId));
-        //     const targetToken = paymentTokens?.find((t: PaymentToken) => t.address === _eventArgs.requestedToken);
-        //     if (!targetToken) {
-        //         throw new Error(`Failed to find target payment token for ${chainId}`);
-        //     }
-        //     amountRequested = Number(ethers.formatUnits(_eventArgs.amountRequested, targetToken.decimals));
-        //     availableReserves = Number(ethers.formatUnits(_eventArgs.availableReserves, targetToken.decimals));
-        // }
+        let amountRequested = 0;
+        let availableReserves = 0;
+        if (_eventArgs.requestedToken === ethers_1.ethers.ZeroAddress) {
+            amountRequested = Number(ethers_1.ethers.formatEther(_eventArgs.amountRequested));
+            availableReserves = Number(ethers_1.ethers.formatEther(_eventArgs.availableReserves));
+        }
+        else {
+            const paymentTokens = ChainManager_1.default.getInstance(this.config).getPaymentTokensForChain(parseInt(chainId));
+            const targetToken = paymentTokens === null || paymentTokens === void 0 ? void 0 : paymentTokens.find((t) => t.address === _eventArgs.requestedToken);
+            if (!targetToken) {
+                throw new Error(`Failed to find target payment token for ${chainId}`);
+            }
+            amountRequested = Number(ethers_1.ethers.formatUnits(_eventArgs.amountRequested, targetToken.decimals));
+            availableReserves = Number(ethers_1.ethers.formatUnits(_eventArgs.availableReserves, targetToken.decimals));
+        }
         return Object.assign(Object.assign({}, baseEvent), { amountRequested,
-            availableReserves, gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateSetTokenTimelockEvent(chainId, baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        let thresholdAmountDecimals = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.thresholdAmount);
-        return Object.assign(Object.assign({}, baseEvent), { thresholdAmount: thresholdAmountDecimals, thresholdAmountWei: _eventArgs.thresholdAmount.toString(), durationBelow: Number(_eventArgs.durationBelow), durationAbove: Number(_eventArgs.durationAbove), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateTimelockGranularEvent(baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        return Object.assign(Object.assign({}, baseEvent), { duration: Number(_eventArgs.duration), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateConfigureTokenMultiSig(chainId, baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        let thresholdAmountDecimals = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.thresholdAmount);
-        return Object.assign(Object.assign({}, baseEvent), { thresholdAmount: thresholdAmountDecimals, thresholdAmountWei: _eventArgs.thresholdAmount.toString(), sigsExecutiveBelow: Number(_eventArgs.sigsExecutiveBelow), sigsExecutiveAbove: Number(_eventArgs.sigsExecutiveAbove), sigsManagerBelow: Number(_eventArgs.sigsManagerBelow), sigsManagerAbove: Number(_eventArgs.sigsManagerAbove), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateConfigureAdminMultisig(baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        return Object.assign(Object.assign({}, baseEvent), { sigsManagerRequired: Number(_eventArgs.sigsManagerRequired), sigsExecutiveRequired: Number(_eventArgs.sigsExecutiveRequired), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateAdminWithdraw(chainId, baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        let amount = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.amount);
-        return Object.assign(Object.assign({}, baseEvent), { amount, amountWei: _eventArgs.amount.toString(), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateWithdrawalScheduled(chainId, baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        let amount = this.formatTokenAmount(chainId, _eventArgs.tokenAddress, _eventArgs.amount);
-        return Object.assign(Object.assign({}, baseEvent), { amount, amountWei: _eventArgs.amount.toString(), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateWithdrawalExecuted(baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        return Object.assign(Object.assign({}, baseEvent), { requestId: Number(_eventArgs.requestId), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
-    }
-    mutateWithdrawalCancelled(baseEvent, eventArgs) {
-        const _eventArgs = eventArgs;
-        return Object.assign(Object.assign({}, baseEvent), { requestId: Number(_eventArgs.requestId), gasUsed: Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0) });
+            availableReserves, gasUsed: Number(baseEvent.gasUsed) });
     }
     mutateDirectDepositEvent(chainId, baseEvent, tokenAddress, amount) {
         const chainManager = ChainManager_1.default.getInstance(this.config);
@@ -160,7 +124,7 @@ class EscrowEvents {
         if (token) {
             const decimals = token.decimals;
             const formattedAmount = ethers_1.ethers.formatUnits(amount, decimals);
-            baseEvent.gasUsed = Number(baseEvent.gasUsed ? baseEvent.gasUsed : 0);
+            baseEvent.gasUsed = Number(baseEvent.gasUsed);
             baseEvent.amount = Number(formattedAmount);
             baseEvent.isDirectDeposit = isDirectDeposit;
             // Push to events list
@@ -173,20 +137,6 @@ class EscrowEvents {
         }
         return events;
     }
-    /** Converts from wei to decimals */
-    formatTokenAmount(chainId, token, amount) {
-        if (token === ethers_1.ethers.ZeroAddress) {
-            return Number(ethers_1.ethers.formatEther(amount));
-        }
-        else {
-            const paymentTokens = ChainManager_1.default.getInstance(this.config).getPaymentTokensForChain(parseInt(chainId));
-            const targetToken = paymentTokens === null || paymentTokens === void 0 ? void 0 : paymentTokens.find((t) => t.address === token);
-            if (!targetToken) {
-                throw new Error(`Failed to find target payment token for ${chainId}`);
-            }
-            return Number(ethers_1.ethers.formatUnits(amount, targetToken.decimals));
-        }
-    }
 }
 EscrowEvents.instance = null;
 exports.default = EscrowEvents;

package/build/contracts/contract-events/types/events.d.ts

@@ -1,6 +1,6 @@
 import { EventHeader } from "../../../interfaces";
 import { TransferEvent } from "../../typechain-types/@openzeppelin/contracts/token/ERC20/ERC20";
-import { ConfigureTokenMultisigEvent, ConfigureAdminMultisigEvent, RoleGrantedEvent, RoleRevokedEvent, DepositEvent, WithdrawalEvent, LowReservesEvent, SetTimelockGranularEvent, SetTokenTimelockEvent, AdminWithdrawEvent, WithdrawalScheduledEvent, WithdrawalExecutedEvent, WithdrawalCancelledEvent } from "../../typechain-types/contracts/escrow/Escrow";
+import { RoleGrantedEvent, RoleRevokedEvent, DepositEvent, WithdrawalEvent, LowReservesEvent } from "../../typechain-types/contracts/escrow/Escrow";
 export interface GrantRoleEventData extends EventHeader, RoleGrantedEvent.OutputObject {
 }
 export interface RevokeRoleEventData extends EventHeader, RoleRevokedEvent.OutputObject {
@@ -9,50 +9,16 @@ export interface RenounceRoleEventData extends RevokeRoleEventData {
 }
 export interface TransferEventArgs extends TransferEvent.OutputObject {
 }
-/** Event payload*/
 export interface DepositEventData extends EventHeader, DepositEvent.OutputObject {
 }
 export interface WithdrawalEventData extends EventHeader, WithdrawalEvent.OutputObject {
 }
 export interface LowReservesEventData extends EventHeader, LowReservesEvent.OutputObject {
 }
-export interface SetTokenTimelockEventData extends EventHeader, SetTokenTimelockEvent.OutputObject {
-}
-export interface SetTimelockGranularEventData extends EventHeader, SetTimelockGranularEvent.OutputObject {
-}
-export interface ConfigureTokenMultisigEventData extends EventHeader, ConfigureTokenMultisigEvent.OutputObject {
-}
-export interface ConfigureAdminMultisigEventData extends EventHeader, ConfigureAdminMultisigEvent.OutputObject {
-}
-export interface AdminWithdrawEventData extends EventHeader, AdminWithdrawEvent.OutputObject {
-}
-export interface WithdrawalScheduledEventData extends EventHeader, WithdrawalScheduledEvent.OutputObject {
-}
-export interface WithdrawalExecutedEventData extends EventHeader, WithdrawalExecutedEvent.OutputObject {
-}
-export interface WithdrawalCancelledEventData extends EventHeader, WithdrawalCancelledEvent.OutputObject {
-}
-/** Event args */
 export interface DepositEventArgs extends DepositEvent.OutputObject {
 }
 export interface WithdrawalEventArgs extends WithdrawalEvent.OutputObject {
 }
 export interface LowReservesEventArgs extends LowReservesEvent.OutputObject {
 }
-export interface SetTokenTimelockEventArgs extends SetTokenTimelockEvent.OutputObject {
-}
-export interface SetTimelockGranularEventArgs extends SetTimelockGranularEvent.OutputObject {
-}
-export interface ConfigureTokenMultisigEventArgs extends ConfigureTokenMultisigEvent.OutputObject {
-}
-export interface ConfigureAdminMultisigEventArgs extends ConfigureAdminMultisigEvent.OutputObject {
-}
-export interface AdminWithdrawEventArgs extends AdminWithdrawEvent.OutputObject {
-}
-export interface WithdrawalScheduledEventArgs extends WithdrawalScheduledEvent.OutputObject {
-}
-export interface WithdrawalExecutedEventArgs extends WithdrawalExecutedEvent.OutputObject {
-}
-export interface WithdrawalCancelledEventArgs extends WithdrawalCancelledEvent.OutputObject {
-}
 //# sourceMappingURL=events.d.ts.map

package/build/contracts/contract-events/types/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../src/contracts/contract-events/types/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAChG,OAAO,EACH,2BAA2B,EAC3B,2BAA2B,EAC3B,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EAClB,wBAAwB,EACxB,uBAAuB,EACvB,wBAAwB,EAC3B,MAAM,+CAA+C,CAAC;AAGvD,MAAM,WAAW,kBAAmB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC1F,MAAM,WAAW,mBAAoB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC3F,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;CAAI;AACtE,MAAM,WAAW,iBAAkB,SAAQ,aAAa,CAAC,YAAY;CAAI;AAEzE,mBAAmB;AACnB,MAAM,WAAW,gBAAiB,SAAQ,WAAW,EAAE,YAAY,CAAC,YAAY;CAAI;AACpF,MAAM,WAAW,mBAAoB,SAAQ,WAAW,EAAE,eAAe,CAAC,YAAY;CAAI;AAC1F,MAAM,WAAW,oBAAqB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC5F,MAAM,WAAW,yBAA0B,SAAQ,WAAW,EAAE,qBAAqB,CAAC,YAAY;CAAI;AACtG,MAAM,WAAW,4BAA6B,SAAQ,WAAW,EAAE,wBAAwB,CAAC,YAAY;CAAI;AAC5G,MAAM,WAAW,+BAAgC,SAAQ,WAAW,EAAE,2BAA2B,CAAC,YAAY;CAAI;AAClH,MAAM,WAAW,+BAAgC,SAAQ,WAAW,EAAE,2BAA2B,CAAC,YAAY;CAAI;AAClH,MAAM,WAAW,sBAAuB,SAAQ,WAAW,EAAE,kBAAkB,CAAC,YAAY;CAAI;AAChG,MAAM,WAAW,4BAA6B,SAAQ,WAAW,EAAE,wBAAwB,CAAC,YAAY;CAAI;AAC5G,MAAM,WAAW,2BAA4B,SAAQ,WAAW,EAAE,uBAAuB,CAAC,YAAY;CAAI;AAC1G,MAAM,WAAW,4BAA6B,SAAQ,WAAW,EAAE,wBAAwB,CAAC,YAAY;CAAI;AAE5G,iBAAiB;AACjB,MAAM,WAAW,gBAAiB,SAAQ,YAAY,CAAC,YAAY;CAAI;AACvE,MAAM,WAAW,mBAAoB,SAAQ,eAAe,CAAC,YAAY;CAAI;AAC7E,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB,CAAC,YAAY;CAAI;AAC/E,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB,CAAC,YAAY;CAAI;AACzF,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB,CAAC,YAAY;CAAI;AAC/F,MAAM,WAAW,+BAAgC,SAAQ,2BAA2B,CAAC,YAAY;CAAI;AACrG,MAAM,WAAW,+BAAgC,SAAQ,2BAA2B,CAAC,YAAY;CAAI;AACrG,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB,CAAC,YAAY;CAAI;AACnF,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB,CAAC,YAAY;CAAI;AAC/F,MAAM,WAAW,2BAA4B,SAAQ,uBAAuB,CAAC,YAAY;CAAI;AAC7F,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB,CAAC,YAAY;CAAI"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../../src/contracts/contract-events/types/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAGpJ,MAAM,WAAW,kBAAmB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC1F,MAAM,WAAW,mBAAoB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC3F,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;CAAI;AACtE,MAAM,WAAW,iBAAkB,SAAQ,aAAa,CAAC,YAAY;CAAI;AAEzE,MAAM,WAAW,gBAAiB,SAAQ,WAAW,EAAE,YAAY,CAAC,YAAY;CAAI;AACpF,MAAM,WAAW,mBAAoB,SAAQ,WAAW,EAAE,eAAe,CAAC,YAAY;CAAI;AAC1F,MAAM,WAAW,oBAAqB,SAAQ,WAAW,EAAE,gBAAgB,CAAC,YAAY;CAAI;AAC5F,MAAM,WAAW,gBAAiB,SAAQ,YAAY,CAAC,YAAY;CAAI;AACvE,MAAM,WAAW,mBAAoB,SAAQ,eAAe,CAAC,YAAY;CAAI;AAC7E,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB,CAAC,YAAY;CAAI"}

package/build/contracts/typechain-types/contracts/escrow/Escrow.d.ts

@@ -442,18 +442,21 @@ export interface EscrowInterface extends Interface {
 }
 export declare namespace AdminWithdrawEvent {
     type InputTuple = [
+        caller: AddressLike,
         receiver: AddressLike,
         amount: BigNumberish,
         tokenAddress: AddressLike,
         requestId: BigNumberish
     ];
     type OutputTuple = [
+        caller: string,
         receiver: string,
         amount: bigint,
         tokenAddress: string,
         requestId: bigint
     ];
     interface OutputObject {
+        caller: string;
         receiver: string;
         amount: bigint;
         tokenAddress: string;
@@ -1495,7 +1498,7 @@ export interface Escrow extends BaseContract {
     getEvent(key: "WithdrawalExecuted"): TypedContractEvent<WithdrawalExecutedEvent.InputTuple, WithdrawalExecutedEvent.OutputTuple, WithdrawalExecutedEvent.OutputObject>;
     getEvent(key: "WithdrawalScheduled"): TypedContractEvent<WithdrawalScheduledEvent.InputTuple, WithdrawalScheduledEvent.OutputTuple, WithdrawalScheduledEvent.OutputObject>;
     filters: {
-        "AdminWithdraw(address,uint256,address,uint256)": TypedContractEvent<AdminWithdrawEvent.InputTuple, AdminWithdrawEvent.OutputTuple, AdminWithdrawEvent.OutputObject>;
+        "AdminWithdraw(address,address,uint256,address,uint256)": TypedContractEvent<AdminWithdrawEvent.InputTuple, AdminWithdrawEvent.OutputTuple, AdminWithdrawEvent.OutputObject>;
         AdminWithdraw: TypedContractEvent<AdminWithdrawEvent.InputTuple, AdminWithdrawEvent.OutputTuple, AdminWithdrawEvent.OutputObject>;
         "ConfigureAdminMultisig(uint8,uint256,uint256)": TypedContractEvent<ConfigureAdminMultisigEvent.InputTuple, ConfigureAdminMultisigEvent.OutputTuple, ConfigureAdminMultisigEvent.OutputObject>;
         ConfigureAdminMultisig: TypedContractEvent<ConfigureAdminMultisigEvent.InputTuple, ConfigureAdminMultisigEvent.OutputTuple, ConfigureAdminMultisigEvent.OutputObject>;