@ercworldio/blockchain-shared 1.0.3-dev.3-PROJ-1296.37 → 1.0.3-dev.3-PROJ-1296.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -12,12 +12,10 @@ declare class ClaimJobsService {
|
|
|
12
12
|
private get_repo;
|
|
13
13
|
private get_history_repo;
|
|
14
14
|
private paginate;
|
|
15
|
-
get_available_jobs_no_timelock: (limit?: number, job_ttl_s?: number, max_retry_count?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ClaimJobWithDetails[]>;
|
|
16
|
-
/** @deprecated Use get_available_jobs_no_timelock instead. Kept for debugging. */
|
|
17
15
|
get_available_jobs_no_timelock_deprecated: (limit?: number, job_ttl_s?: number, max_retry_count?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ClaimJobWithDetails[]>;
|
|
18
|
-
|
|
19
|
-
/** @deprecated Use get_available_jobs_with_timelock instead. Kept for debugging. */
|
|
16
|
+
get_available_jobs_no_timelock: (limit?: number, job_ttl_s?: number, max_retry_count?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ClaimJobWithDetails[]>;
|
|
20
17
|
get_available_jobs_with_timelock_deprecated: (limit?: number, job_ttl_s?: number, max_retry_count?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ClaimJobWithDetails[]>;
|
|
18
|
+
get_available_jobs_with_timelock: (limit?: number, job_ttl_s?: number, max_retry_count?: number, lock_metadata?: ClaimJobLockMetadata) => Promise<ClaimJobWithDetails[]>;
|
|
21
19
|
requeue_expired_jobs: (current_status: JobStatus, ttl_seconds: number, limit: number, lock_owner: string, lock_reason: string, max_retries: number) => Promise<ClaimJobs[]>;
|
|
22
20
|
get_stale_jobs: (status: JobStatus, stale_time_mins: number, ttl_mins: number, lock_owner: string, lock_reason: string, limit?: number) => Promise<ClaimJobs[]>;
|
|
23
21
|
get_stale_jobs_deprecated: (status: JobStatus, stale_time_mins: number, limit?: number) => Promise<ClaimJobs[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClaimJobService.d.ts","sourceRoot":"","sources":["../../src/services/ClaimJobService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,SAAS,EAA0B,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAKlK,cAAM,gBAAgB;IAClB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,KAAK,CAAS;gBAGV,MAAM,EAAE,aAAa;IAMjC,OAAO,CAAC,QAAQ,CAIf;IAED,OAAO,CAAC,gBAAgB,CAIvB;IAED,OAAO,CAAC,QAAQ,CAsBf;IAEM,
|
|
1
|
+
{"version":3,"file":"ClaimJobService.d.ts","sourceRoot":"","sources":["../../src/services/ClaimJobService.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,14 +55,13 @@ class ClaimJobsService {
|
|
|
55
55
|
items: items || []
|
|
56
56
|
};
|
|
57
57
|
});
|
|
58
|
-
this.
|
|
58
|
+
this.get_available_jobs_no_timelock_deprecated = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
59
59
|
var _a;
|
|
60
60
|
const repo = this.get_repo();
|
|
61
61
|
const result = yield repo.query(`SELECT accounting.fn_get_available_claim_jobs_no_timelock($1::int, $2::int, $3::int, $4::text, $5::text)`, [limit, job_ttl_s, max_retry_count, lock_metadata.lock_owner, lock_metadata.lock_reason]);
|
|
62
62
|
return (_a = result[0].fn_get_available_claim_jobs_no_timelock) !== null && _a !== void 0 ? _a : [];
|
|
63
63
|
});
|
|
64
|
-
|
|
65
|
-
this.get_available_jobs_no_timelock_deprecated = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
64
|
+
this.get_available_jobs_no_timelock = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
66
65
|
const repo = this.get_repo();
|
|
67
66
|
const rows = yield repo.query(`
|
|
68
67
|
WITH candidates AS (
|
|
@@ -95,19 +94,45 @@ class ClaimJobsService {
|
|
|
95
94
|
WHERE cj.id = c.id
|
|
96
95
|
RETURNING cj.*
|
|
97
96
|
)
|
|
98
|
-
SELECT
|
|
97
|
+
SELECT
|
|
98
|
+
u.*,
|
|
99
|
+
NULL::text AS commitment_hash,
|
|
100
|
+
NULL::timestamptz AS execute_at,
|
|
101
|
+
(
|
|
102
|
+
SELECT COALESCE(json_agg(json_build_object(
|
|
103
|
+
'name', COALESCE(cr.role_alias, ''),
|
|
104
|
+
'signerAddress', cs.signer_address,
|
|
105
|
+
'contractAddress', cs.contract_address,
|
|
106
|
+
'createdAt', cs.created_at,
|
|
107
|
+
'updatedAt', cs.updated_at,
|
|
108
|
+
'operationType', cs.operation_type,
|
|
109
|
+
'v', cs.v,
|
|
110
|
+
'r', cs.r,
|
|
111
|
+
's', cs.s
|
|
112
|
+
)), '[]'::json)
|
|
113
|
+
FROM multisig.crypto_signatures cs
|
|
114
|
+
LEFT JOIN multisig.crypto_escrow_roles cer
|
|
115
|
+
ON LOWER(cer.wallet_address) = LOWER(cs.signer_address)
|
|
116
|
+
AND LOWER(cer.blockchain) = LOWER(cs.blockchain)
|
|
117
|
+
AND cer.chain_id = cs.chain_id
|
|
118
|
+
AND LOWER(cer.contract_address) = LOWER(cs.contract_address)
|
|
119
|
+
LEFT JOIN multisig.crypto_role cr ON cr.id = cer.role_id
|
|
120
|
+
WHERE cs.reference_id = u.request_id
|
|
121
|
+
AND cs.v IS NOT NULL
|
|
122
|
+
AND cs.r IS NOT NULL
|
|
123
|
+
AND cs.s IS NOT NULL
|
|
124
|
+
) AS multisig_signatures
|
|
99
125
|
FROM updated u;
|
|
100
126
|
`, [limit, job_ttl_s, (0, uuid_1.v4)(), lock_metadata.lock_owner, lock_metadata.lock_reason, max_retry_count]);
|
|
101
127
|
return rows;
|
|
102
128
|
});
|
|
103
|
-
this.
|
|
129
|
+
this.get_available_jobs_with_timelock_deprecated = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
104
130
|
var _a;
|
|
105
131
|
const repo = this.get_repo();
|
|
106
132
|
const result = yield repo.query(`SELECT accounting.fn_get_available_claim_jobs_with_timelock($1::int, $2::int, $3::int, $4::text, $5::text)`, [limit, job_ttl_s, max_retry_count, lock_metadata.lock_owner, lock_metadata.lock_reason]);
|
|
107
133
|
return (_a = result[0].fn_get_available_claim_jobs_with_timelock) !== null && _a !== void 0 ? _a : [];
|
|
108
134
|
});
|
|
109
|
-
|
|
110
|
-
this.get_available_jobs_with_timelock_deprecated = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
135
|
+
this.get_available_jobs_with_timelock = (...args_1) => __awaiter(this, [...args_1], void 0, function* (limit = 10, job_ttl_s = 120, max_retry_count = 5, lock_metadata = { lock_owner: "claim-worker", lock_reason: "process_queued" }) {
|
|
111
136
|
const repo = this.get_repo();
|
|
112
137
|
const rows = yield repo.query(`
|
|
113
138
|
WITH scheduled_status AS (
|
|
@@ -146,8 +171,33 @@ class ClaimJobsService {
|
|
|
146
171
|
WHERE cj.id = c.id
|
|
147
172
|
RETURNING cj.*
|
|
148
173
|
)
|
|
149
|
-
SELECT
|
|
150
|
-
|
|
174
|
+
SELECT
|
|
175
|
+
u.*,
|
|
176
|
+
cwc.commitment_hash,
|
|
177
|
+
cwc.execute_at,
|
|
178
|
+
(
|
|
179
|
+
SELECT COALESCE(json_agg(json_build_object(
|
|
180
|
+
'name', COALESCE(cr.role_alias, ''),
|
|
181
|
+
'signerAddress', cs.signer_address,
|
|
182
|
+
'contractAddress', cs.contract_address,
|
|
183
|
+
'createdAt', cs.created_at,
|
|
184
|
+
'updatedAt', cs.updated_at,
|
|
185
|
+
'operationType', cs.operation_type,
|
|
186
|
+
'v', cs.v,
|
|
187
|
+
'r', cs.r,
|
|
188
|
+
's', cs.s
|
|
189
|
+
)), '[]'::json)
|
|
190
|
+
FROM multisig.crypto_signatures cs
|
|
191
|
+
LEFT JOIN multisig.crypto_escrow_roles cer
|
|
192
|
+
ON LOWER(cer.wallet_address) = LOWER(cs.signer_address)
|
|
193
|
+
AND LOWER(cer.blockchain) = LOWER(cs.blockchain)
|
|
194
|
+
AND cer.chain_id = cs.chain_id
|
|
195
|
+
AND LOWER(cer.contract_address) = LOWER(cs.contract_address)
|
|
196
|
+
LEFT JOIN multisig.crypto_role cr ON cr.id = cer.role_id
|
|
197
|
+
WHERE cs.reference_id = u.request_id
|
|
198
|
+
) AS multisig_signatures
|
|
199
|
+
FROM updated u
|
|
200
|
+
LEFT JOIN multisig.crypto_withdrawal_commitment cwc ON cwc.request_id = u.request_id;
|
|
151
201
|
`, [limit, job_ttl_s, (0, uuid_1.v4)(), lock_metadata.lock_owner, lock_metadata.lock_reason, max_retry_count]);
|
|
152
202
|
return rows;
|
|
153
203
|
});
|
package/package.json
CHANGED