@ercworldio/blockchain-shared 1.0.3-dev.3-PROJ-1296.27 → 1.0.3-dev.3-PROJ-1296.29

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,CA8CjP;IAGD,4FAA4F;IAC5F,MAAM,CAAC,wCAAwC,GAAU,MAAM,IAAI,EAAE,QAAO,MAAW,EAAE,YAAW,MAAY,EAAE,gBAAe,oBAA0F,KAAG,OAAO,CAAC,iCAAiC,EAAE,CAAC,CAmDzQ;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

@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const uuid_1 = require("uuid");
 class ScheduleTransactionService {
 }
 _a = ScheduleTransactionService;
 ScheduleTransactionService.get_and_lock_available_jobs = (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 batchGroupId = (0, uuid_1.v4)();
     const res = yield pool.query(`
       WITH status_ids AS (
           SELECT
@@ -38,69 +36,27 @@ ScheduleTransactionService.get_and_lock_available_jobs = (pool_1, ...args_1) =>
         status_id       = si.processing_id,
         locked_at       = now(),
         lock_expires_at = now() + ($2 || ' seconds')::interval,
-        batch_group_id  = $3,
         metadata = jsonb_set(
                         jsonb_set(
                             coalesce(cj.metadata, '{}'::jsonb),
                             '{lock_owner}',
-                            to_jsonb($4::text)
+                            to_jsonb($3::text)
                         ),
                         '{lock_reason}',
-                        to_jsonb($5::text)
+                        to_jsonb($4::text)
                     ),
         updated_at = now()
       FROM candidates c, status_ids si
       WHERE cj.id = c.id
       RETURNING cj.*;
-      `, [limit, ttlSeconds, batchGroupId, lock_metadata.lock_owner, lock_metadata.lock_reason]);
+      `, [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 batchGroupId = (0, uuid_1.v4)();
-    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,
-          batch_group_id  = $3,
-          metadata = jsonb_set(
-                          jsonb_set(
-                              coalesce(cj.metadata, '{}'::jsonb),
-                              '{lock_owner}',
-                              to_jsonb($4::text)
-                          ),
-                          '{lock_reason}',
-                          to_jsonb($5::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, batchGroupId, 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.27",
+  "version": "1.0.3-dev.3-PROJ-1296.29",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",