@ercworldio/blockchain-shared 1.0.3-dev.3-PROJ-1296.28 → 1.0.3-dev.3-PROJ-1296.30

package/build/contracts/EscrowErrors.d.ts

@@ -59,6 +59,90 @@ export interface NotAuthorizedError {
     name: "NotAuthorized";
     args: [];
 }
+export interface ExceedsLimitError {
+    name: "ExceedsLimit";
+    args: [];
+}
+export interface ExceedsMaxError {
+    name: "ExceedsMax";
+    args: [];
+}
+export interface UnknownError {
+    name: "UnknownError";
+    args: [];
+}
+export interface InvalidNonceError {
+    name: "InvalidNonce";
+    args: [];
+}
+export interface TimelockConfigGroupNotSetError {
+    name: "TimelockConfigGroupNotSet";
+    args: [];
+}
+export interface ConfigGroupNotSetError {
+    name: "ConfigGroupNotSet";
+    args: [];
+}
+export interface TimelockConfigNotSetError {
+    name: "TimelockConfigNotSet";
+    args: [];
+}
+export interface CommitmentNotFoundError {
+    name: "CommitmentNotFound";
+    args: [string];
+}
+export interface AlreadyCreatedTransactionError {
+    name: "AlreadyCreatedTransaction";
+    args: [number];
+}
+export interface AccountAlreadyHasSignerRoleError {
+    name: "AccountAlreadyHasSignerRole";
+    args: [string];
+}
+export interface InvalidOperationError {
+    name: "InvalidOperation";
+    args: [];
+}
+export interface InvalidConfigError {
+    name: "InvalidConfig";
+    args: [];
+}
+export interface InvalidSignaturesError {
+    name: "InvalidSignatures";
+    args: [];
+}
+export interface AdminMultisigConfigNotSetError {
+    name: "AdminMultisigConfigNotSet";
+    args: [];
+}
+export interface MultisigConfigNotSetError {
+    name: "MultisigConfigNotSet";
+    args: [];
+}
+export interface RequireTreasuryReceiverRoleError {
+    name: "RequireTreasuryReceiverRole";
+    args: [];
+}
+export interface InvalidMultiSigError {
+    name: "InvalidMultiSig";
+    args: [];
+}
+export interface RequireMultiSigError {
+    name: "RequireMultiSig";
+    args: [];
+}
+export interface TimelockNotExpiredError {
+    name: "TimelockNotExpired";
+    args: [number];
+}
+export interface InsufficientExecutiveSigsError {
+    name: "InsufficientExecutiveSigs";
+    args: [number, number];
+}
+export interface InsufficientManagerSigsError {
+    name: "InsufficientManagerSigs";
+    args: [number, number];
+}
 type ErrorName = "NotAuthorized" | "NotAdmin" | "TransferError" | "InsufficientReserves" | "InsufficientBalance" | "TokenNotAllowed" | "DepositOnlyERC20" | "EtherDirectTransferNotAllowed" | "RequestAlreadyFulfilled" | "ZeroAddress" | "ZeroValue" | "SignatureAlreadyUsed" | "InvalidSignature" | "ContractPaused" | "ContractBusy" | "ExceedsLimit" | "ExceedsMax" | "UnknownError" | "InvalidNonce" | "TimelockConfigGroupNotSet" | "ConfigGroupNotSet" | "TimelockConfigNotSet" | "CommitmentNotFound" | "AlreadyCreatedTransaction" | "AccountAlreadyHasSignerRole" | "InvalidOperation" | "InvalidConfig" | "InvalidSignatures" | "AdminMultisigConfigNotSet" | "MultisigConfigNotSet" | "RequireTreasuryReceiverRole" | "InvalidMultiSig" | "RequireMultiSig" | "TimelockNotExpired" | "InsufficientExecutiveSigs" | "InsufficientManagerSigs";
 export interface EscrowErrorMessage {
     name: ErrorName;

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

@@ -1 +1 @@
-{"version":3,"file":"EscrowErrors.d.ts","sourceRoot":"","sources":["../../src/contracts/EscrowErrors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EscrowErrors.d.ts","sourceRoot":"","sources":["../../src/contracts/EscrowErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAE1C,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,4BAA4B;IACzC,IAAI,EAAE,yBAAyB,CAAC;IAChC,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,kCAAkC;IAC/C,IAAI,EAAE,+BAA+B,CAAC;IACtC,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,oBAAoB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,8BAA8B;IAC3C,IAAI,EAAE,2BAA2B,CAAC;IAClC,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC3C,IAAI,EAAE,2BAA2B,CAAC;IAClC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,gCAAgC;IAC7C,IAAI,EAAE,6BAA6B,CAAC;IACpC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IAClC,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,8BAA8B;IAC3C,IAAI,EAAE,2BAA2B,CAAC;IAClC,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,gCAAgC;IAC7C,IAAI,EAAE,6BAA6B,CAAC;IACpC,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,oBAAoB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,oBAAoB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC3C,IAAI,EAAE,2BAA2B,CAAC;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IACzC,IAAI,EAAE,yBAAyB,CAAC;IAChC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1B;AAID,KAAK,SAAS,GACR,eAAe,GACf,UAAU,GACV,eAAe,GACf,sBAAsB,GACtB,qBAAqB,GACrB,iBAAiB,GACjB,kBAAkB,GAClB,+BAA+B,GAC/B,yBAAyB,GACzB,aAAa,GACb,WAAW,GACX,sBAAsB,GACtB,kBAAkB,GAClB,gBAAgB,GAChB,cAAc,GACd,cAAc,GACd,YAAY,GACZ,cAAc,GACd,cAAc,GACd,2BAA2B,GAC3B,mBAAmB,GACnB,sBAAsB,GACtB,oBAAoB,GACpB,2BAA2B,GAC3B,6BAA6B,GAC7B,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,2BAA2B,GAC3B,sBAAsB,GACtB,6BAA6B,GAC7B,iBAAiB,GACjB,iBAAiB,GACjB,oBAAoB,GACpB,2BAA2B,GAC3B,yBAAyB,CAAA;AAE/B,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iBAAiB,GAAI,cAAc,gBAAgB,KAAG,kBAuFlE,CAAC"}

package/build/contracts/EscrowErrors.js

@@ -6,23 +6,25 @@ 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 tranasction.` };
-        case "ContractBusy":
-            return { name: decodedError.name, message: `Contract is busy with another tranasction.` };
+            return { name: decodedError.name, message: `Contract is busy with another transaction.` };
         case "DepositOnlyERC20":
-            return { name: decodedError.name, message: `Only ERC20 tokend deposits are allowed.` };
+            return { name: decodedError.name, message: `Only ERC20 token 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 "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 "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 "NotAuthorized":
             return { name: decodedError.name, message: `User is not authorized for this action.` };
         case "NotAdmin":
@@ -33,19 +35,58 @@ 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." };
+            return { name: decodedError.name, message: `Funding amount exceeded hard limit.` };
         case "ExceedsLimit":
-            return { name: decodedError.name, message: "Batch exceeds max limit" };
+            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 occured." };
+            return { name: "UnknownError", message: "Unexpected error occurred." };
     }
 };
 exports.parseDecodedError = parseDecodedError;

package/build/services/db/timelock/ScheduleTransactionService.d.ts

@@ -5,7 +5,7 @@ import { OperationType } from "../../../contracts/types/escrow";
 import { MarkCompleteScheduleJob, ScheduleTransactionJobWithDetails } from "../../types/db";
 declare class ScheduleTransactionService {
     static get_and_lock_available_jobs: (pool: Pool, limit?: number, job_ttl_s?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ScheduleTransactionJob[]>;
-    /** Same as get_available_jobs but joins withdrawal details from accounting for each job. */
+    /** Locks and returns available jobs with full withdrawal details via DB function. */
     static get_and_lock_available_jobs_with_details: (pool: Pool, limit?: number, job_ttl_s?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ScheduleTransactionJobWithDetails[]>;
     /**
      * Requeues all jobs in the given status to "queued"

package/build/services/db/timelock/ScheduleTransactionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScheduleTransactionService.d.ts","sourceRoot":"","sources":["../../../../src/services/db/timelock/ScheduleTransactionService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AAE5F,cAAM,0BAA0B;IAE5B,MAAM,CAAC,2BAA2B,GAAU,MAAM,IAAI,EAAE,QAAO,MAAW,EAAE,YAAW,MAAY,EAAE,gBAAe,oBAA0F,KAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA4CjP;IAGD,4FAA4F;IAC5F,MAAM,CAAC,wCAAwC,GAAU,MAAM,IAAI,EAAE,QAAO,MAAW,EAAE,YAAW,MAAY,EAAE,gBAAe,oBAA0F,KAAG,OAAO,CAAC,iCAAiC,EAAE,CAAC,CAiDzQ;IAGD;;OAEG;IACH,MAAM,CAAC,oBAAoB,GACvB,MAAM,IAAI,EACV,gBAAgB,iBAAiB,EACjC,OAAO,MAAM,EACb,YAAY,MAAM,EAClB,aAAa,MAAM,EACnB,aAAa,MAAM,KACpB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA8ClC;IAGF,MAAM,CAAC,mBAAmB,GAAU,MAAM,IAAI,EAAE,gBAAgB,aAAa,EAAE,aAAa,MAAM,EAAE,EAAE,YAAY,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAAC,CASjJ;IAGF,MAAM,CAAC,wBAAwB,GAC3B,MAAM,IAAI,EACV,gBAAgB,aAAa,EAC7B,aAAa,MAAM,EAAE,EACrB,YAAY,iBAAiB,EAC7B,gBAAgB,MAAM,EACtB,YAAY,OAAO,KACpB,OAAO,CAAC,IAAI,CAAC,CAwBd;IAGF,MAAM,CAAC,qCAAqC,GACxC,MAAM,IAAI,EACV,gBAAgB,aAAa,EAC7B,MAAM;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,iBAAiB,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,EAAE,KACzG,OAAO,CAAC,IAAI,CAAC,CA8Bf;IAGD,MAAM,CAAC,0BAA0B,GAC7B,MAAM,IAAI,EACV,MAAM;QAAE,cAAc,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,EAAE,KAC9F,OAAO,CAAC,IAAI,CAAC,CAwBd;IAGF,MAAM,CAAC,aAAa,GAAU,MAAM,IAAI,EAAE,UAAU,uBAAuB,EAAE,KAAG,OAAO,CAAC,IAAI,CAAC,CAmB5F;CAEJ;AAED,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"ScheduleTransactionService.d.ts","sourceRoot":"","sources":["../../../../src/services/db/timelock/ScheduleTransactionService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AAE5F,cAAM,0BAA0B;IAE5B,MAAM,CAAC,2BAA2B,GAAU,MAAM,IAAI,EAAE,QAAO,MAAW,EAAE,YAAW,MAAY,EAAE,gBAAe,oBAA0F,KAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA4CjP;IAGD,qFAAqF;IACrF,MAAM,CAAC,wCAAwC,GAC3C,MAAM,IAAI,EACV,QAAO,MAAW,EAClB,YAAW,MAAY,EACvB,gBAAe,oBAA0F,KAC1G,OAAO,CAAC,iCAAiC,EAAE,CAAC,CAQ9C;IAGD;;OAEG;IACH,MAAM,CAAC,oBAAoB,GACvB,MAAM,IAAI,EACV,gBAAgB,iBAAiB,EACjC,OAAO,MAAM,EACb,YAAY,MAAM,EAClB,aAAa,MAAM,EACnB,aAAa,MAAM,KACpB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA8ClC;IAGF,MAAM,CAAC,mBAAmB,GAAU,MAAM,IAAI,EAAE,gBAAgB,aAAa,EAAE,aAAa,MAAM,EAAE,EAAE,YAAY,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAAC,CASjJ;IAGF,MAAM,CAAC,wBAAwB,GAC3B,MAAM,IAAI,EACV,gBAAgB,aAAa,EAC7B,aAAa,MAAM,EAAE,EACrB,YAAY,iBAAiB,EAC7B,gBAAgB,MAAM,EACtB,YAAY,OAAO,KACpB,OAAO,CAAC,IAAI,CAAC,CAwBd;IAGF,MAAM,CAAC,qCAAqC,GACxC,MAAM,IAAI,EACV,gBAAgB,aAAa,EAC7B,MAAM;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,iBAAiB,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,EAAE,KACzG,OAAO,CAAC,IAAI,CAAC,CA8Bf;IAGD,MAAM,CAAC,0BAA0B,GAC7B,MAAM,IAAI,EACV,MAAM;QAAE,cAAc,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,EAAE,KAC9F,OAAO,CAAC,IAAI,CAAC,CAwBd;IAGF,MAAM,CAAC,aAAa,GAAU,MAAM,IAAI,EAAE,UAAU,uBAAuB,EAAE,KAAG,OAAO,CAAC,IAAI,CAAC,CAmB5F;CAEJ;AAED,eAAe,0BAA0B,CAAC"}

package/build/services/db/timelock/ScheduleTransactionService.js

@@ -52,50 +52,11 @@ ScheduleTransactionService.get_and_lock_available_jobs = (pool_1, ...args_1) =>
       `, [limit, ttlSeconds, lock_metadata.lock_owner, lock_metadata.lock_reason]);
     return res.rows;
 });
-/** Same as get_available_jobs but joins withdrawal details from accounting for each job. */
+/** Locks and returns available jobs with full withdrawal details via DB function. */
 ScheduleTransactionService.get_and_lock_available_jobs_with_details = (pool_1, ...args_1) => __awaiter(void 0, [pool_1, ...args_1], void 0, function* (pool, limit = 10, job_ttl_s = 120, lock_metadata = { lock_owner: "schedule-tx-worker", lock_reason: "process_queued" }) {
-    const ttlSeconds = job_ttl_s;
-    const res = yield pool.query(`
-      WITH status_ids AS (
-          SELECT
-            MAX(CASE WHEN status = 'queued'     THEN id END) AS queued_id,
-            MAX(CASE WHEN status = 'processing' THEN id END) AS processing_id
-          FROM multisig.schedule_job_statuses
-      ),
-      candidates AS (
-        SELECT cj.id
-        FROM multisig.schedule_transaction_jobs cj, status_ids
-        WHERE cj.status_id = status_ids.queued_id
-          AND (cj.lock_expires_at IS NULL OR cj.lock_expires_at < now())
-        ORDER BY cj.blockchain, cj.chain_id ASC
-        LIMIT $1
-        FOR UPDATE SKIP LOCKED
-      ),
-      updated AS (
-        UPDATE multisig.schedule_transaction_jobs cj
-        SET
-          status_id       = si.processing_id,
-          locked_at       = now(),
-          lock_expires_at = now() + ($2 || ' seconds')::interval,
-          metadata = jsonb_set(
-                          jsonb_set(
-                              coalesce(cj.metadata, '{}'::jsonb),
-                              '{lock_owner}',
-                              to_jsonb($3::text)
-                          ),
-                          '{lock_reason}',
-                          to_jsonb($4::text)
-                      ),
-          updated_at = now()
-        FROM candidates c, status_ids si
-        WHERE cj.id = c.id
-        RETURNING cj.*
-      )
-      SELECT u.*, sjs.status, accounting.fn_get_crypto_withdrawal_details(u.request_id) AS withdrawal_details
-      FROM updated u
-      JOIN multisig.schedule_job_statuses sjs ON sjs.id = u.status_id
-      `, [limit, ttlSeconds, lock_metadata.lock_owner, lock_metadata.lock_reason]);
-    return res.rows;
+    var _b;
+    const result = yield pool.query(`SELECT multisig.fn_get_available_schedule_jobs_with_details($1::int, $2::int, $3::text, $4::text)`, [limit, job_ttl_s, lock_metadata.lock_owner, lock_metadata.lock_reason]);
+    return (_b = result.rows[0].fn_get_available_schedule_jobs_with_details) !== null && _b !== void 0 ? _b : [];
 });
 /**
  * Requeues all jobs in the given status to "queued"

package/build/services/types/db/timelock.d.ts

@@ -1,11 +1,28 @@
 import { OperationType } from "../../../contracts/types/escrow";
-import { ScheduleTransactionJob } from "../../../entities/ScheduleTransactionJob";
 import { WithdrawRequestDetails } from "../claim";
 export interface MarkCompleteScheduleJob {
     requestId: number;
     operationType: OperationType;
 }
-export interface ScheduleTransactionJobWithDetails extends ScheduleTransactionJob {
-    withdrawal_details: WithdrawRequestDetails | null;
+export interface ScheduleTransactionJobWithDetails {
+    id: number;
+    requestId: number;
+    operationType: OperationType;
+    status: string;
+    blockchain: string;
+    chainId: string;
+    batchGroupId: string;
+    lockExpiresAt: string | null;
+    lockedAt: string | null;
+    txHash: string | null;
+    sentAt: string | null;
+    confirmedAt: string | null;
+    retryCount: number;
+    errorMessage: string | null;
+    lastErrorAt: string | null;
+    metadata: Record<string, unknown> | null;
+    createdAt: string;
+    updatedAt: string;
+    withdrawalDetails: WithdrawRequestDetails | null;
 }
 //# sourceMappingURL=timelock.d.ts.map

package/build/services/types/db/timelock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timelock.d.ts","sourceRoot":"","sources":["../../../../src/services/types/db/timelock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElD,MAAM,WAAW,uBAAuB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,iCAAkC,SAAQ,sBAAsB;IAC7E,kBAAkB,EAAE,sBAAsB,GAAG,IAAI,CAAC;CACrD"}
+{"version":3,"file":"timelock.d.ts","sourceRoot":"","sources":["../../../../src/services/types/db/timelock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAElD,MAAM,WAAW,uBAAuB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;CAChC;AAED,MAAM,WAAW,iCAAiC;IAC9C,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,sBAAsB,GAAG,IAAI,CAAC;CACpD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercworldio/blockchain-shared",
-  "version": "1.0.3-dev.3-PROJ-1296.28",
+  "version": "1.0.3-dev.3-PROJ-1296.30",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",