@jinn-network/client 0.1.9-canary.51d228bc → 0.1.9-canary.5c19fc6d
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.
- package/README.md +6 -0
- package/deployments/deployment-phase1b-mech-baseSepolia-fast.json +3 -3
- package/deployments/deployment-stolas-l2-baseSepolia-fast.json +23 -3
- package/deployments/deployment-task-coordinator-router-v3-baseSepolia-fast.json +34 -6
- package/dist/adapters/mech/adapter.js +30 -42
- package/dist/adapters/mech/adapter.js.map +1 -1
- package/dist/adapters/mech/contracts.d.ts +174 -13
- package/dist/adapters/mech/contracts.js +37 -21
- package/dist/adapters/mech/contracts.js.map +1 -1
- package/dist/adapters/mech/safe.js +74 -2
- package/dist/adapters/mech/safe.js.map +1 -1
- package/dist/adapters/mech/types.d.ts +4 -42
- package/dist/adapters/mech/types.js +8 -20
- package/dist/adapters/mech/types.js.map +1 -1
- package/dist/api/gather-status.d.ts +18 -15
- package/dist/api/gather-status.js +30 -401
- package/dist/api/gather-status.js.map +1 -1
- package/dist/api/harness-auth-status-endpoint.d.ts +21 -0
- package/dist/api/harness-auth-status-endpoint.js +17 -0
- package/dist/api/harness-auth-status-endpoint.js.map +1 -0
- package/dist/api/rewards-build.d.ts +8 -1
- package/dist/api/rewards-build.js +32 -4
- package/dist/api/rewards-build.js.map +1 -1
- package/dist/api/rewards-endpoint.d.ts +12 -0
- package/dist/api/rewards-endpoint.js +46 -0
- package/dist/api/rewards-endpoint.js.map +1 -0
- package/dist/api/server.d.ts +6 -16
- package/dist/api/server.js +29 -26
- package/dist/api/server.js.map +1 -1
- package/dist/api/setup-endpoints.d.ts +9 -0
- package/dist/api/setup-endpoints.js +164 -21
- package/dist/api/setup-endpoints.js.map +1 -1
- package/dist/api/status-build.d.ts +31 -64
- package/dist/api/status-build.js +8 -51
- package/dist/api/status-build.js.map +1 -1
- package/dist/bin/jinn-layer.js +9315 -0
- package/dist/build-info.json +4 -4
- package/dist/build-meta.json +1 -1
- package/dist/captures/live-publisher.d.ts +9 -0
- package/dist/captures/live-publisher.js +1 -0
- package/dist/captures/live-publisher.js.map +1 -1
- package/dist/captures/publish.d.ts +11 -0
- package/dist/captures/publish.js +15 -5
- package/dist/captures/publish.js.map +1 -1
- package/dist/cli/commands/doctor.js +2 -5
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/eval.d.ts +11 -0
- package/dist/cli/commands/eval.js +103 -23
- package/dist/cli/commands/eval.js.map +1 -1
- package/dist/cli/commands/rewards.js +17 -15
- package/dist/cli/commands/rewards.js.map +1 -1
- package/dist/cli/commands/update.js +8 -0
- package/dist/cli/commands/update.js.map +1 -1
- package/dist/cli/commands/version.js +4 -0
- package/dist/cli/commands/version.js.map +1 -1
- package/dist/cli/introspection-context.js +0 -3
- package/dist/cli/introspection-context.js.map +1 -1
- package/dist/config.d.ts +111 -545
- package/dist/config.js +97 -193
- package/dist/config.js.map +1 -1
- package/dist/corpus/acquire.d.ts +7 -6
- package/dist/corpus/acquire.js +10 -10
- package/dist/corpus/acquire.js.map +1 -1
- package/dist/corpus/fetch-artifact.d.ts +21 -0
- package/dist/corpus/fetch-artifact.js +33 -0
- package/dist/corpus/fetch-artifact.js.map +1 -0
- package/dist/corpus/index.d.ts +2 -2
- package/dist/corpus/route-resolver.d.ts +3 -3
- package/dist/corpus/route-resolver.js +3 -3
- package/dist/daemon/creator.d.ts +1 -0
- package/dist/daemon/creator.js +24 -14
- package/dist/daemon/creator.js.map +1 -1
- package/dist/daemon/daemon.d.ts +0 -10
- package/dist/daemon/daemon.js +1 -25
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/delivery-watcher.d.ts +9 -0
- package/dist/daemon/delivery-watcher.js +24 -1
- package/dist/daemon/delivery-watcher.js.map +1 -1
- package/dist/daemon/loop-heartbeat.d.ts +1 -1
- package/dist/daemon/loop-heartbeat.js +0 -1
- package/dist/daemon/loop-heartbeat.js.map +1 -1
- package/dist/daemon/skip-log-dedup.d.ts +1 -1
- package/dist/daemon/skip-log-dedup.js +3 -0
- package/dist/daemon/skip-log-dedup.js.map +1 -1
- package/dist/dashboard/assets/{index-fvzQ1q4j.js → index-BsrAAmvC.js} +29 -29
- package/dist/dashboard/assets/index-DQOWJ2SF.css +1 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/discovery/http.d.ts +10 -0
- package/dist/discovery/http.js +55 -1
- package/dist/discovery/http.js.map +1 -1
- package/dist/discovery/onchain.js +3 -1
- package/dist/discovery/onchain.js.map +1 -1
- package/dist/earning/bootstrap.js +2 -2
- package/dist/earning/bootstrap.js.map +1 -1
- package/dist/earning/contracts.d.ts +0 -229
- package/dist/earning/contracts.js +4 -184
- package/dist/earning/contracts.js.map +1 -1
- package/dist/earning/faucet-topup-store.d.ts +41 -0
- package/dist/earning/faucet-topup-store.js +89 -0
- package/dist/earning/faucet-topup-store.js.map +1 -0
- package/dist/earning/stolas-claim.js +3 -3
- package/dist/earning/stolas-claim.js.map +1 -1
- package/dist/earning/{jinn-rewards.d.ts → stolas-staking.d.ts} +4 -8
- package/dist/earning/{jinn-rewards.js → stolas-staking.js} +6 -10
- package/dist/earning/stolas-staking.js.map +1 -0
- package/dist/earning/testnet-setup-migration.d.ts +1 -0
- package/dist/earning/testnet-setup-migration.js +7 -2
- package/dist/earning/testnet-setup-migration.js.map +1 -1
- package/dist/earning/viem-clients.d.ts +3 -19
- package/dist/earning/viem-clients.js +4 -31
- package/dist/earning/viem-clients.js.map +1 -1
- package/dist/eval/orchestrator.d.ts +64 -3
- package/dist/eval/orchestrator.js +37 -19
- package/dist/eval/orchestrator.js.map +1 -1
- package/dist/harnesses/auth-source.d.ts +51 -0
- package/dist/harnesses/auth-source.js +155 -0
- package/dist/harnesses/auth-source.js.map +1 -0
- package/dist/harnesses/engine/engine.d.ts +8 -0
- package/dist/harnesses/engine/engine.js +4 -0
- package/dist/harnesses/engine/engine.js.map +1 -1
- package/dist/harnesses/engine/packaging.js +4 -4
- package/dist/harnesses/engine/packaging.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/harness.d.ts +8 -0
- package/dist/harnesses/impls/hermes-agent/harness.js +21 -0
- package/dist/harnesses/impls/hermes-agent/harness.js.map +1 -1
- package/dist/harnesses/impls/index.js +8 -1
- package/dist/harnesses/impls/index.js.map +1 -1
- package/dist/harnesses/impls/jinn-repo-evaluator/eval-runner.d.ts +34 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/eval-runner.js +111 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/eval-runner.js.map +1 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/evaluator.d.ts +24 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/evaluator.js +19 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/evaluator.js.map +1 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/harness.d.ts +64 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/harness.js +125 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/harness.js.map +1 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/repro.d.ts +32 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/repro.js +73 -0
- package/dist/harnesses/impls/jinn-repo-evaluator/repro.js.map +1 -0
- package/dist/harnesses/impls/learner/adapters/codex-code.d.ts +8 -0
- package/dist/harnesses/impls/learner/adapters/codex-code.js +91 -11
- package/dist/harnesses/impls/learner/adapters/codex-code.js.map +1 -1
- package/dist/harnesses/impls/learner/harness.d.ts +12 -0
- package/dist/harnesses/impls/learner/harness.js +34 -0
- package/dist/harnesses/impls/learner/harness.js.map +1 -1
- package/dist/harnesses/impls/learner/harvest.js +44 -0
- package/dist/harnesses/impls/learner/harvest.js.map +1 -1
- package/dist/harnesses/impls/stub.d.ts +2 -2
- package/dist/harnesses/impls/stub.js +2 -2
- package/dist/harnesses/readiness-registry.d.ts +6 -0
- package/dist/harnesses/readiness-registry.js +15 -6
- package/dist/harnesses/readiness-registry.js.map +1 -1
- package/dist/harnesses/types.d.ts +12 -0
- package/dist/main.js +33 -97
- package/dist/main.js.map +1 -1
- package/dist/mcp/acquire-artifact.d.ts +3 -3
- package/dist/mcp/acquire-artifact.js +3 -3
- package/dist/mcp/server.js +4 -5
- package/dist/mcp/server.js.map +1 -1
- package/dist/observability/emit-event.d.ts +1 -1
- package/dist/observability/emit-event.js +0 -4
- package/dist/observability/emit-event.js.map +1 -1
- package/dist/preflight/deployment-readiness.d.ts +2 -22
- package/dist/preflight/deployment-readiness.js +1 -59
- package/dist/preflight/deployment-readiness.js.map +1 -1
- package/dist/rpc/transport.d.ts +7 -5
- package/dist/rpc/transport.js +8 -6
- package/dist/rpc/transport.js.map +1 -1
- package/dist/solver-nets/registry.js +3 -0
- package/dist/solver-nets/registry.js.map +1 -1
- package/dist/solver-types/_jinn-repo-pool.d.ts +27 -0
- package/dist/solver-types/_jinn-repo-pool.js +27 -0
- package/dist/solver-types/_jinn-repo-pool.js.map +1 -0
- package/dist/solver-types/index.js +2 -0
- package/dist/solver-types/index.js.map +1 -1
- package/dist/solver-types/jinn-repo-admit.d.ts +17 -0
- package/dist/solver-types/jinn-repo-admit.js +16 -0
- package/dist/solver-types/jinn-repo-admit.js.map +1 -0
- package/dist/solver-types/jinn-repo-auto.d.ts +60 -0
- package/dist/solver-types/jinn-repo-auto.js +163 -0
- package/dist/solver-types/jinn-repo-auto.js.map +1 -0
- package/dist/solver-types/jinn-repo-definition.d.ts +15 -0
- package/dist/solver-types/jinn-repo-definition.js +34 -0
- package/dist/solver-types/jinn-repo-definition.js.map +1 -0
- package/dist/solver-types/jinn-repo-extract.d.ts +16 -0
- package/dist/solver-types/jinn-repo-extract.js +32 -0
- package/dist/solver-types/jinn-repo-extract.js.map +1 -0
- package/dist/solver-types/jinn-repo.d.ts +21 -0
- package/dist/solver-types/jinn-repo.js +23 -0
- package/dist/solver-types/jinn-repo.js.map +1 -0
- package/dist/solvernets/launched-record-dispatcher.d.ts +2 -0
- package/dist/solvernets/launched-record-dispatcher.js +8 -1
- package/dist/solvernets/launched-record-dispatcher.js.map +1 -1
- package/dist/spend/usage.js +39 -3
- package/dist/spend/usage.js.map +1 -1
- package/dist/store/store.d.ts +1 -0
- package/dist/store/store.js +14 -0
- package/dist/store/store.js.map +1 -1
- package/dist/trajectory/emit.d.ts +6 -0
- package/dist/trajectory/emit.js +9 -1
- package/dist/trajectory/emit.js.map +1 -1
- package/dist/trajectory/scrub/build.d.ts +27 -0
- package/dist/trajectory/scrub/build.js +51 -0
- package/dist/trajectory/scrub/build.js.map +1 -0
- package/dist/trajectory/scrub/emit-scrub.d.ts +41 -0
- package/dist/trajectory/scrub/emit-scrub.js +88 -0
- package/dist/trajectory/scrub/emit-scrub.js.map +1 -0
- package/dist/trajectory/scrub/key-policy.d.ts +20 -0
- package/dist/trajectory/scrub/key-policy.js +43 -0
- package/dist/trajectory/scrub/key-policy.js.map +1 -0
- package/dist/trajectory/scrub/ml-pii-stage.d.ts +24 -0
- package/dist/trajectory/scrub/ml-pii-stage.js +43 -0
- package/dist/trajectory/scrub/ml-pii-stage.js.map +1 -0
- package/dist/trajectory/scrub/openredaction-stage.d.ts +51 -0
- package/dist/trajectory/scrub/openredaction-stage.js +85 -0
- package/dist/trajectory/scrub/openredaction-stage.js.map +1 -0
- package/dist/trajectory/scrub/pii-build.d.ts +31 -0
- package/dist/trajectory/scrub/pii-build.js +64 -0
- package/dist/trajectory/scrub/pii-build.js.map +1 -0
- package/dist/trajectory/scrub/pipeline.d.ts +16 -0
- package/dist/trajectory/scrub/pipeline.js +26 -0
- package/dist/trajectory/scrub/pipeline.js.map +1 -0
- package/dist/trajectory/scrub/plain-patterns-stage.d.ts +18 -0
- package/dist/trajectory/scrub/plain-patterns-stage.js +55 -0
- package/dist/trajectory/scrub/plain-patterns-stage.js.map +1 -0
- package/dist/trajectory/scrub/secretlint-stage.d.ts +16 -0
- package/dist/trajectory/scrub/secretlint-stage.js +159 -0
- package/dist/trajectory/scrub/secretlint-stage.js.map +1 -0
- package/dist/trajectory/scrub/transformers-detector.d.ts +35 -0
- package/dist/trajectory/scrub/transformers-detector.js +68 -0
- package/dist/trajectory/scrub/transformers-detector.js.map +1 -0
- package/dist/trajectory/scrub/types.d.ts +25 -0
- package/dist/trajectory/scrub/types.js +2 -0
- package/dist/trajectory/scrub/types.js.map +1 -0
- package/dist/tx-retry.d.ts +12 -0
- package/dist/tx-retry.js +41 -12
- package/dist/tx-retry.js.map +1 -1
- package/dist/types/payloads/index.js +6 -0
- package/dist/types/payloads/index.js.map +1 -1
- package/dist/types/task-document.d.ts +314 -0
- package/dist/types/task-document.js +8 -0
- package/dist/types/task-document.js.map +1 -1
- package/dist/types/task.d.ts +28 -0
- package/dist/vendor/@jinn-network/sdk/dist/contracts.d.ts +2 -1
- package/dist/vendor/@jinn-network/sdk/dist/contracts.js +49 -0
- package/dist/vendor/@jinn-network/sdk/dist/jinn-repo.d.ts +44 -0
- package/dist/vendor/@jinn-network/sdk/dist/jinn-repo.js +25 -0
- package/dist/vendor/@jinn-network/sdk/dist/payloads/jinn-repo.d.ts +38 -0
- package/dist/vendor/@jinn-network/sdk/dist/payloads/jinn-repo.js +22 -0
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/jinn-repo.d.ts +4 -0
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/jinn-repo.js +2 -0
- package/dist/vendor/@jinn-network/sdk/package.json +4 -0
- package/package.json +17 -9
- package/plugins/jinn-repo-runtime/.claude-plugin/plugin.json +5 -0
- package/plugins/jinn-repo-runtime/.codex-plugin/plugin.json +39 -0
- package/plugins/jinn-repo-runtime/README.md +27 -0
- package/plugins/jinn-repo-runtime/hooks/hooks.json +16 -0
- package/plugins/jinn-repo-runtime/hooks/session-start +73 -0
- package/plugins/jinn-repo-runtime/jinn.plugin.json +11 -0
- package/plugins/jinn-repo-runtime/skills/task/SKILL.md +92 -0
- package/deployments/deployment-jinn-mvi-l1-sepolia-fast.json +0 -55
- package/deployments/deployment-jinn-mvi-l1-sepolia.json +0 -55
- package/deployments/deployment-jinn-mvi-l2-baseSepolia.json +0 -13
- package/deployments/deployment-jinn-testnet-faucet-baseSepolia-fast.json +0 -15
- package/dist/daemon/jinn-claim-loop-canonical.d.ts +0 -207
- package/dist/daemon/jinn-claim-loop-canonical.js +0 -296
- package/dist/daemon/jinn-claim-loop-canonical.js.map +0 -1
- package/dist/daemon/jinn-claim-loop-mock.d.ts +0 -61
- package/dist/daemon/jinn-claim-loop-mock.js +0 -122
- package/dist/daemon/jinn-claim-loop-mock.js.map +0 -1
- package/dist/daemon/jinn-claim-loop-wiring.d.ts +0 -33
- package/dist/daemon/jinn-claim-loop-wiring.js +0 -40
- package/dist/daemon/jinn-claim-loop-wiring.js.map +0 -1
- package/dist/daemon/jinn-claim-loop.d.ts +0 -130
- package/dist/daemon/jinn-claim-loop.js +0 -331
- package/dist/daemon/jinn-claim-loop.js.map +0 -1
- package/dist/dashboard/assets/index-8tAiMbUV.css +0 -1
- package/dist/earning/jinn-rewards.js.map +0 -1
- package/dist/scripts/donation-consumption-acceptance.d.ts +0 -85
- package/dist/scripts/donation-consumption-acceptance.js +0 -1382
- package/dist/scripts/donation-consumption-acceptance.js.map +0 -1
- package/dist/x402/acquire.d.ts +0 -17
- package/dist/x402/acquire.js +0 -49
- package/dist/x402/acquire.js.map +0 -1
- package/dist/x402/facilitator.d.ts +0 -11
- package/dist/x402/facilitator.js +0 -52
- package/dist/x402/facilitator.js.map +0 -1
- package/dist/x402/handler.d.ts +0 -27
- package/dist/x402/handler.js +0 -236
- package/dist/x402/handler.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { encodeFunctionData, decodeEventLog, } from 'viem';
|
|
1
|
+
import { encodeFunctionData, decodeEventLog, getAbiItem, } from 'viem';
|
|
2
2
|
import { MECH_MARKETPLACE_ABI, MECH_ABI, JINN_ROUTER_ABI, JINN_ROUTER_CLAIM_DELIVERY_V1_ABI, JINN_ROUTER_CLAIM_DELIVERY_V2_ABI, } from './types.js';
|
|
3
3
|
import { STAKING_ABI, STOLAS_DISTRIBUTOR_ABI } from '../../earning/contracts.js';
|
|
4
4
|
import { isUnauthorizedAccountError } from '../../errors/unauthorized-account.js';
|
|
@@ -17,6 +17,11 @@ const TASK_COORDINATOR_ABI = [
|
|
|
17
17
|
inputs: [{ name: 'taskId', type: 'uint256' }],
|
|
18
18
|
outputs: [
|
|
19
19
|
{
|
|
20
|
+
// Tokenless-OLAS pivot: TaskCoordinator.TaskRecord trimmed — policy is
|
|
21
|
+
// `maxClaims` + `allowSolverSelfEvaluation`; the window/lease/quorum/
|
|
22
|
+
// EvaluationPolicy fields are gone and the final flag is `creatorCredited`
|
|
23
|
+
// (was `taskCreationCredited`). `creator` then `taskCidDigest` MUST stay
|
|
24
|
+
// components 0/1 — getTaskCidDigest decodes positionally.
|
|
20
25
|
name: 'record',
|
|
21
26
|
type: 'tuple',
|
|
22
27
|
components: [
|
|
@@ -28,30 +33,14 @@ const TASK_COORDINATOR_ABI = [
|
|
|
28
33
|
name: 'policy',
|
|
29
34
|
type: 'tuple',
|
|
30
35
|
components: [
|
|
31
|
-
{ name: '
|
|
32
|
-
{ name: '
|
|
33
|
-
{ name: 'submissionDeadline', type: 'uint64' },
|
|
34
|
-
{ name: 'claimLeaseTtlSeconds', type: 'uint32' },
|
|
35
|
-
{ name: 'maxClaims', type: 'uint16' },
|
|
36
|
-
{ name: 'maxClaimsPerOperator', type: 'uint16' },
|
|
37
|
-
{ name: 'policyHook', type: 'address' },
|
|
38
|
-
{
|
|
39
|
-
name: 'evaluationPolicy',
|
|
40
|
-
type: 'tuple',
|
|
41
|
-
components: [
|
|
42
|
-
{ name: 'requiredVerdicts', type: 'uint16' },
|
|
43
|
-
{ name: 'passThreshold', type: 'uint16' },
|
|
44
|
-
{ name: 'evaluationDeadline', type: 'uint64' },
|
|
45
|
-
{ name: 'maxVerdictsPerEvaluator', type: 'uint16' },
|
|
46
|
-
{ name: 'disallowSolverSelfEvaluation', type: 'bool' },
|
|
47
|
-
],
|
|
48
|
-
},
|
|
36
|
+
{ name: 'maxClaims', type: 'uint32' },
|
|
37
|
+
{ name: 'allowSolverSelfEvaluation', type: 'bool' },
|
|
49
38
|
],
|
|
50
39
|
},
|
|
51
40
|
{ name: 'claimCount', type: 'uint32' },
|
|
52
41
|
{ name: 'submittedCount', type: 'uint32' },
|
|
53
42
|
{ name: 'finalizedAttemptCount', type: 'uint32' },
|
|
54
|
-
{ name: '
|
|
43
|
+
{ name: 'creatorCredited', type: 'bool' },
|
|
55
44
|
],
|
|
56
45
|
},
|
|
57
46
|
],
|
|
@@ -168,8 +157,12 @@ export async function submitTask(publicClient, walletClient, safeAddress, router
|
|
|
168
157
|
responseTimeout,
|
|
169
158
|
],
|
|
170
159
|
});
|
|
160
|
+
// Tokenless-OLAS pivot: the trimmed JinnRouterV3.createTask escrows
|
|
161
|
+
// `solutionBudget + verdictBudget` where each side = rate * maxClaims (the
|
|
162
|
+
// per-verdict `requiredVerdicts` multiplier is gone). msg.value must match
|
|
163
|
+
// exactly or createTask reverts with RouterInsufficientTaskBudget.
|
|
171
164
|
const taskBudget = solutionMaxDeliveryRateWei * BigInt(policy.maxClaims) +
|
|
172
|
-
verdictMaxDeliveryRateWei * BigInt(policy.maxClaims)
|
|
165
|
+
verdictMaxDeliveryRateWei * BigInt(policy.maxClaims);
|
|
173
166
|
let lastError;
|
|
174
167
|
for (let attempt = 0; attempt < TASK_CREATED_SUBMIT_ATTEMPTS; attempt++) {
|
|
175
168
|
try {
|
|
@@ -511,6 +504,27 @@ export async function pollDeliverEvents(publicClient, mechAddress, fromBlock, to
|
|
|
511
504
|
toBlock,
|
|
512
505
|
});
|
|
513
506
|
}
|
|
507
|
+
// ── Event-specific log filters (#116) ───────────────────────────────────────
|
|
508
|
+
// The Task-native polling path fetches only the router/mech events it actually
|
|
509
|
+
// decodes, instead of scanning the address and decode-discarding the rest. These
|
|
510
|
+
// ABI event items are passed as viem `getLogs({ event })` / `getLogs({ events })`
|
|
511
|
+
// so the provider filters by topic0 server-side. `getAbiItem` throws if a name is
|
|
512
|
+
// absent, so a future ABI rename fails loud rather than silently emptying a filter.
|
|
513
|
+
export const ROUTER_TASK_CREATED_EVENT = getAbiItem({ abi: JINN_ROUTER_ABI, name: 'TaskCreated' });
|
|
514
|
+
export const ROUTER_TASK_ATTEMPT_CREATED_EVENT = getAbiItem({
|
|
515
|
+
abi: JINN_ROUTER_ABI,
|
|
516
|
+
name: 'TaskAttemptCreated',
|
|
517
|
+
});
|
|
518
|
+
export const ROUTER_SOLUTION_DELIVERY_CLAIMED_EVENT = getAbiItem({
|
|
519
|
+
abi: JINN_ROUTER_ABI,
|
|
520
|
+
name: 'SolutionDeliveryClaimed',
|
|
521
|
+
});
|
|
522
|
+
export const MECH_DELIVER_EVENT = getAbiItem({ abi: MECH_ABI, name: 'Deliver' });
|
|
523
|
+
/** The two router events the Task-native poll loop needs per pass. */
|
|
524
|
+
export const ROUTER_DISCOVERY_EVENTS = [
|
|
525
|
+
ROUTER_TASK_CREATED_EVENT,
|
|
526
|
+
ROUTER_SOLUTION_DELIVERY_CLAIMED_EVENT,
|
|
527
|
+
];
|
|
514
528
|
export async function scanTasks(publicClient, routerAddress, creator, fromBlock, toBlock) {
|
|
515
529
|
const results = [];
|
|
516
530
|
const chunkSize = 1000n; // see LOG_SCAN_CHUNK rationale (#807): small chunks fit every provider's getLogs cap + keep responses small
|
|
@@ -518,6 +532,7 @@ export async function scanTasks(publicClient, routerAddress, creator, fromBlock,
|
|
|
518
532
|
const end = start + chunkSize > toBlock ? toBlock : start + chunkSize;
|
|
519
533
|
const logs = await publicClient.getLogs({
|
|
520
534
|
address: routerAddress,
|
|
535
|
+
event: ROUTER_TASK_CREATED_EVENT,
|
|
521
536
|
fromBlock: start,
|
|
522
537
|
toBlock: end,
|
|
523
538
|
});
|
|
@@ -692,6 +707,7 @@ export async function scanLatestDeliveryDataByRid(publicClient, mechContractAddr
|
|
|
692
707
|
const end = start + LOG_SCAN_CHUNK > toBlock ? toBlock : start + LOG_SCAN_CHUNK;
|
|
693
708
|
const logs = await publicClient.getLogs({
|
|
694
709
|
address: mechContractAddress,
|
|
710
|
+
event: MECH_DELIVER_EVENT,
|
|
695
711
|
fromBlock: start,
|
|
696
712
|
toBlock: end,
|
|
697
713
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/adapters/mech/contracts.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/adapters/mech/contracts.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { createPublicClient, createWalletClient, } from 'viem';
|
|
|
2
2
|
import { privateKeyToAccount } from 'viem/accounts';
|
|
3
3
|
import { base } from 'viem/chains';
|
|
4
4
|
import { SAFE_ABI } from './types.js';
|
|
5
|
-
import { isNonceTooLowError, withNonceLedger, withRecoverableRetry, } from '../../tx-retry.js';
|
|
5
|
+
import { isNonceTooLowError, isReplacementUnderpricedError, withNonceLedger, withRecoverableRetry, } from '../../tx-retry.js';
|
|
6
6
|
import { SafeInnerRevertError, decodeSafeInnerRevert, formatDecodedRevert, } from './safe-revert.js';
|
|
7
7
|
import { buildFallbackTransport, parseRpcUrls } from '../../rpc/transport.js';
|
|
8
8
|
export function buildSafeSignature(signerAddress) {
|
|
@@ -101,7 +101,63 @@ async function executeSafeTransactionInner(publicClient, walletClient, params, o
|
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
103
|
catch (writeErr) {
|
|
104
|
-
|
|
104
|
+
const nonceTooLow = isNonceTooLowError(writeErr);
|
|
105
|
+
const replacementUnderpriced = isReplacementUnderpricedError(writeErr);
|
|
106
|
+
// Issue #897: before re-signing at a fresh nonce, reconcile against the
|
|
107
|
+
// tx already submitted at the currently-pinned nonce. The original EOA
|
|
108
|
+
// tx may have mined mid-retry (nonce-too-low = it mined; replacement-
|
|
109
|
+
// underpriced = it is still pending but the bump was too small and it
|
|
110
|
+
// may mine before the next attempt). Re-signing a NEW Safe
|
|
111
|
+
// execTransaction at the advanced Safe nonce is NOT idempotent — it
|
|
112
|
+
// re-attempts the delivery and reverts as already-claimed. So if the
|
|
113
|
+
// original receipt is already a success, short-circuit and return it;
|
|
114
|
+
// otherwise refresh the pinned nonce so the next attempt bumps fees
|
|
115
|
+
// against the fresh value and detects a mid-retry mine on the following
|
|
116
|
+
// pass.
|
|
117
|
+
if (nonceTooLow || replacementUnderpriced) {
|
|
118
|
+
// The ledger lookup MUST use the ORIGINAL pinned nonce
|
|
119
|
+
// (nonceLedger.nonce) — read it here, before refreshNonce() below
|
|
120
|
+
// advances it. Moving refreshNonce() earlier would break
|
|
121
|
+
// reconciliation by looking up the wrong (advanced) nonce key.
|
|
122
|
+
const existing = await nonceLedger.ledger.getTxSubmission({
|
|
123
|
+
chainId: nonceLedger.chainId,
|
|
124
|
+
from: nonceLedger.from,
|
|
125
|
+
nonce: nonceLedger.nonce,
|
|
126
|
+
});
|
|
127
|
+
// The tx-submission ledger is SHARED across every logical Safe tx the
|
|
128
|
+
// daemon broadcasts from this one agent EOA (claim, deliver,
|
|
129
|
+
// setMetadata, reStake) and is keyed only on the EOA nonce. A
|
|
130
|
+
// stuck-then-mined UNRELATED tx at the same nonce would otherwise let
|
|
131
|
+
// us return a foreign tx's hash and false-mark THIS delivery as
|
|
132
|
+
// landed. Gate the reconcile on the ledger entry actually being this
|
|
133
|
+
// call's own transaction: recordSubmitted stores `to: safeAddress`
|
|
134
|
+
// and `data: params.data`, so require both to match before trusting
|
|
135
|
+
// existing.hash. On mismatch, fall through to refresh + re-sign
|
|
136
|
+
// exactly as if no success receipt were found. (`to`/safeAddress are
|
|
137
|
+
// addresses — compare case-insensitively; data is calldata hex —
|
|
138
|
+
// normalize both to be safe.)
|
|
139
|
+
const entryMatchesThisTx = existing?.to?.toLowerCase() === params.safeAddress.toLowerCase() &&
|
|
140
|
+
existing?.data?.toLowerCase() === params.data.toLowerCase();
|
|
141
|
+
if (existing?.hash && entryMatchesThisTx) {
|
|
142
|
+
try {
|
|
143
|
+
const reconciled = await publicClient.getTransactionReceipt({ hash: existing.hash });
|
|
144
|
+
if (reconciled.status === 'success') {
|
|
145
|
+
console.error(`[safe/viem] execTransaction reconciled: original tx ${existing.hash} mined ` +
|
|
146
|
+
`at pinned nonce ${nonceLedger.nonce} — delivery already landed`);
|
|
147
|
+
await nonceLedger.markResolved();
|
|
148
|
+
return existing.hash;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
catch (receiptErr) {
|
|
152
|
+
// TransactionReceiptNotFoundError: the original is not yet mined.
|
|
153
|
+
// Any other failure (transient RPC fault) is also tolerated —
|
|
154
|
+
// we fall through to refresh + re-sign rather than rethrow — but
|
|
155
|
+
// log it so a persistent fault is observable, not masked.
|
|
156
|
+
const reason = receiptErr instanceof Error ? receiptErr.message : String(receiptErr);
|
|
157
|
+
console.error(`[safe/viem] execTransaction reconcile receipt lookup for ${existing.hash} ` +
|
|
158
|
+
`failed (${reason}) — treating as not-yet-mined, refreshing nonce`);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
105
161
|
const refreshed = await nonceLedger.refreshNonce();
|
|
106
162
|
console.error(`[safe/viem] execTransaction refreshed pinned nonce -> ${refreshed}`);
|
|
107
163
|
}
|
|
@@ -115,6 +171,11 @@ async function executeSafeTransactionInner(publicClient, walletClient, params, o
|
|
|
115
171
|
const formatted = formatDecodedRevert(inner.decodedName, inner.decodedArgs);
|
|
116
172
|
throw new SafeInnerRevertError(`Safe execTransaction inner revert (estimate): ${formatted}`, inner.innerSelector, inner.innerData, inner.decodedName, inner.decodedArgs, null);
|
|
117
173
|
}
|
|
174
|
+
if (inner.innerSelector) {
|
|
175
|
+
// Deterministic inner revert with an undecoded selector — terminal.
|
|
176
|
+
// Surface it structurally so tx-retry does not retry the GS013.
|
|
177
|
+
throw new SafeInnerRevertError(`Safe execTransaction inner revert (estimate, undecoded selector ${inner.innerSelector})`, inner.innerSelector, inner.innerData, null, null, null);
|
|
178
|
+
}
|
|
118
179
|
}
|
|
119
180
|
throw writeErr;
|
|
120
181
|
}
|
|
@@ -138,6 +199,17 @@ async function executeSafeTransactionInner(publicClient, walletClient, params, o
|
|
|
138
199
|
const formatted = formatDecodedRevert(inner.decodedName, inner.decodedArgs);
|
|
139
200
|
throw new SafeInnerRevertError(`Safe execTransaction inner revert: ${formatted} (txHash=${hash})`, inner.innerSelector, inner.innerData, inner.decodedName, inner.decodedArgs, hash);
|
|
140
201
|
}
|
|
202
|
+
if (inner.innerSelector) {
|
|
203
|
+
// The inner call reverts deterministically with a selector we don't
|
|
204
|
+
// decode (e.g. a newer custom error like TACTaskAlreadyCredited).
|
|
205
|
+
// Surface it as a SafeInnerRevertError — even without a decoded name —
|
|
206
|
+
// so tx-retry classifies it non-recoverable instead of retrying the
|
|
207
|
+
// wrapping GS013 forever. Re-running the same inner call reverts
|
|
208
|
+
// identically.
|
|
209
|
+
throw new SafeInnerRevertError(`Safe execTransaction inner revert (undecoded selector ${inner.innerSelector}, txHash=${hash})`, inner.innerSelector, inner.innerData, null, null, hash);
|
|
210
|
+
}
|
|
211
|
+
// No inner revert on re-simulation: the on-chain failure was a
|
|
212
|
+
// signature/owner (GS026) nonce race — retryable, self-heals on re-sign.
|
|
141
213
|
throw new Error(`Safe execTransaction reverted (GS026/GS013 possible stale nonce, txHash=${hash})`);
|
|
142
214
|
}
|
|
143
215
|
await nonceLedger.markResolved();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe.js","sourceRoot":"","sources":["../../../src/adapters/mech/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,GAMnB,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"safe.js","sourceRoot":"","sources":["../../../src/adapters/mech/safe.ts"],"names":[],"mappings":"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"}
|
|
@@ -302,45 +302,11 @@ export declare const JINN_ROUTER_ABI: readonly [{
|
|
|
302
302
|
readonly name: "policy";
|
|
303
303
|
readonly type: "tuple";
|
|
304
304
|
readonly components: readonly [{
|
|
305
|
-
readonly name: "claimWindowStart";
|
|
306
|
-
readonly type: "uint64";
|
|
307
|
-
}, {
|
|
308
|
-
readonly name: "claimWindowEnd";
|
|
309
|
-
readonly type: "uint64";
|
|
310
|
-
}, {
|
|
311
|
-
readonly name: "submissionDeadline";
|
|
312
|
-
readonly type: "uint64";
|
|
313
|
-
}, {
|
|
314
|
-
readonly name: "claimLeaseTtlSeconds";
|
|
315
|
-
readonly type: "uint32";
|
|
316
|
-
}, {
|
|
317
305
|
readonly name: "maxClaims";
|
|
318
|
-
readonly type: "
|
|
319
|
-
}, {
|
|
320
|
-
readonly name: "maxClaimsPerOperator";
|
|
321
|
-
readonly type: "uint16";
|
|
322
|
-
}, {
|
|
323
|
-
readonly name: "policyHook";
|
|
324
|
-
readonly type: "address";
|
|
306
|
+
readonly type: "uint32";
|
|
325
307
|
}, {
|
|
326
|
-
readonly name: "
|
|
327
|
-
readonly type: "
|
|
328
|
-
readonly components: readonly [{
|
|
329
|
-
readonly name: "requiredVerdicts";
|
|
330
|
-
readonly type: "uint16";
|
|
331
|
-
}, {
|
|
332
|
-
readonly name: "passThreshold";
|
|
333
|
-
readonly type: "uint16";
|
|
334
|
-
}, {
|
|
335
|
-
readonly name: "evaluationDeadline";
|
|
336
|
-
readonly type: "uint64";
|
|
337
|
-
}, {
|
|
338
|
-
readonly name: "maxVerdictsPerEvaluator";
|
|
339
|
-
readonly type: "uint16";
|
|
340
|
-
}, {
|
|
341
|
-
readonly name: "disallowSolverSelfEvaluation";
|
|
342
|
-
readonly type: "bool";
|
|
343
|
-
}];
|
|
308
|
+
readonly name: "allowSolverSelfEvaluation";
|
|
309
|
+
readonly type: "bool";
|
|
344
310
|
}];
|
|
345
311
|
}, {
|
|
346
312
|
readonly name: "solutionMaxDeliveryRate";
|
|
@@ -395,11 +361,7 @@ export declare const JINN_ROUTER_ABI: readonly [{
|
|
|
395
361
|
readonly indexed: false;
|
|
396
362
|
}, {
|
|
397
363
|
readonly name: "maxClaims";
|
|
398
|
-
readonly type: "
|
|
399
|
-
readonly indexed: false;
|
|
400
|
-
}, {
|
|
401
|
-
readonly name: "requiredVerdicts";
|
|
402
|
-
readonly type: "uint16";
|
|
364
|
+
readonly type: "uint32";
|
|
403
365
|
readonly indexed: false;
|
|
404
366
|
}, {
|
|
405
367
|
readonly name: "solutionBudget";
|
|
@@ -162,27 +162,16 @@ export const JINN_ROUTER_ABI = [
|
|
|
162
162
|
{ name: 'taskCidDigest', type: 'bytes32' },
|
|
163
163
|
{ name: 'manifestDigest', type: 'bytes32' },
|
|
164
164
|
{
|
|
165
|
+
// Tokenless-OLAS pivot: TaskCoordinator.TaskPolicy is `maxClaims` plus
|
|
166
|
+
// `allowSolverSelfEvaluation` (default false → self-evaluation blocked,
|
|
167
|
+
// the independent-evaluation invariant; a testnet SolverNet sets it true
|
|
168
|
+
// so one operator can close the loop solo). Off-chain scheduling intent
|
|
169
|
+
// (windows / lease / quorum) stays off-chain in the task.v1 `claimPolicy`.
|
|
165
170
|
name: 'policy',
|
|
166
171
|
type: 'tuple',
|
|
167
172
|
components: [
|
|
168
|
-
{ name: '
|
|
169
|
-
{ name: '
|
|
170
|
-
{ name: 'submissionDeadline', type: 'uint64' },
|
|
171
|
-
{ name: 'claimLeaseTtlSeconds', type: 'uint32' },
|
|
172
|
-
{ name: 'maxClaims', type: 'uint16' },
|
|
173
|
-
{ name: 'maxClaimsPerOperator', type: 'uint16' },
|
|
174
|
-
{ name: 'policyHook', type: 'address' },
|
|
175
|
-
{
|
|
176
|
-
name: 'evaluationPolicy',
|
|
177
|
-
type: 'tuple',
|
|
178
|
-
components: [
|
|
179
|
-
{ name: 'requiredVerdicts', type: 'uint16' },
|
|
180
|
-
{ name: 'passThreshold', type: 'uint16' },
|
|
181
|
-
{ name: 'evaluationDeadline', type: 'uint64' },
|
|
182
|
-
{ name: 'maxVerdictsPerEvaluator', type: 'uint16' },
|
|
183
|
-
{ name: 'disallowSolverSelfEvaluation', type: 'bool' },
|
|
184
|
-
],
|
|
185
|
-
},
|
|
173
|
+
{ name: 'maxClaims', type: 'uint32' },
|
|
174
|
+
{ name: 'allowSolverSelfEvaluation', type: 'bool' },
|
|
186
175
|
],
|
|
187
176
|
},
|
|
188
177
|
{ name: 'solutionMaxDeliveryRate', type: 'uint256' },
|
|
@@ -212,8 +201,7 @@ export const JINN_ROUTER_ABI = [
|
|
|
212
201
|
{ name: 'taskId', type: 'uint256', indexed: true },
|
|
213
202
|
{ name: 'manifestDigest', type: 'bytes32', indexed: true },
|
|
214
203
|
{ name: 'taskCidDigest', type: 'bytes32', indexed: false },
|
|
215
|
-
{ name: 'maxClaims', type: '
|
|
216
|
-
{ name: 'requiredVerdicts', type: 'uint16', indexed: false },
|
|
204
|
+
{ name: 'maxClaims', type: 'uint32', indexed: false },
|
|
217
205
|
{ name: 'solutionBudget', type: 'uint256', indexed: false },
|
|
218
206
|
{ name: 'verdictBudget', type: 'uint256', indexed: false },
|
|
219
207
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/adapters/mech/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/adapters/mech/types.ts"],"names":[],"mappings":"AAuDA,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,SAAS;QAC1B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE;YACtC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5C,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;YACxC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5C,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE;SACvC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KAClD;IACD;QACE,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAChD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAChD,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;SACzC;KACF;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACxD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACrD,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACxD,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE;YACzD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;SAC1D;KACF;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB;QACE,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE;YACzC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;SACnC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;KACzD;IACD;QACE,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC/C,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KACtC;IACD;QACE,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAChD,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAC/D,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACtD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACzD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;SAChD;KACF;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE;YACzC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE;SAC7C;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;KACzD;CACO,CAAC;AAEX,+CAA+C;AAC/C,MAAM,CAAC,MAAM,iCAAiC,GAAG;IAC/C;QACE,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAChD,OAAO,EAAE,EAAE;KACZ;CACO,CAAC;AAEX,+CAA+C;AAC/C,MAAM,CAAC,MAAM,iCAAiC,GAAG;IAC/C;QACE,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;SAC1C;QACD,OAAO,EAAE,EAAE;KACZ;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B;QACE,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,SAAS;QAC1B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;YAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C;gBACE,uEAAuE;gBACvE,wEAAwE;gBACxE,yEAAyE;gBACzE,wEAAwE;gBACxE,2EAA2E;gBAC3E,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACrC,EAAE,IAAI,EAAE,2BAA2B,EAAE,IAAI,EAAE,MAAM,EAAE;iBACpD;aACF;YACD,EAAE,IAAI,EAAE,yBAAyB,EAAE,IAAI,EAAE,SAAS,EAAE;YACpD,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE;YACnD,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;SAC7C;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KAC/C;IACD;QACE,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACnC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;SAC1C;QACD,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;SACvC;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACnD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAClD,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAC1D,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1D,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;YACrD,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC3D,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;SAC3D;KACF;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAClD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;YACvD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACrD,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACrD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACzD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;SAC1D;KACF;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;YACnC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;YAC1C,EAAE,IAAI,EAAE,yBAAyB,EAAE,IAAI,EAAE,SAAS,EAAE;SACrD;QACD,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE;SAC9C;KACF;IACD;QACE,IAAI,EAAE,0BAA0B;QAChC,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAClD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;YACvD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;YACvD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACtD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACtD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACzD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;SAC1D;KACF;IACD;QACE,IAAI,EAAE,uBAAuB;QAC7B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;SAC5C;QACD,OAAO,EAAE,EAAE;KACZ;IACD;QACE,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC7C,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;YAC1C,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE;SACvC;QACD,OAAO,EAAE,EAAE;KACZ;IACD;QACE,IAAI,EAAE,yBAAyB;QAC/B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACpD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAClD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;SACzD;KACF;IACD;QACE,IAAI,EAAE,wBAAwB;QAC9B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACrD,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YACrD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;YAClD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;YACxD,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;YACxD,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;SACvD;KACF;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAChD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KACtC;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;YACpC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;SACpC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,SAAS;QAC1B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;YACpC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;SACtC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KAC7C;CACO,CAAC;AAEX,uBAAuB;AACvB,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;YACtC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;YACvC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5C,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE;YACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;SAC7C;QACD,OAAO,EAAE,EAAE;KACZ;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC;QACE,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;YACvC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE;YACtC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;SACvC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KAC9C;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAkB,4CAA4C,CAAC;AAClG,MAAM,CAAC,MAAM,0BAA0B,GAAkB,4CAA4C,CAAC;AAEtG,MAAM,CAAC,MAAM,mBAAmB,GAAG,oEAA6E,CAAC;AAEjH,6EAA6E;AAC7E,wCAAwC;AACxC,gFAAgF;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,+CAAwD,CAAC"}
|
|
@@ -20,26 +20,23 @@ import type { HarnessReadinessSnapshot, JoinedHarnessSpec } from '../harnesses/r
|
|
|
20
20
|
* restart. (jinn-mono-l2zl.15.4.12)
|
|
21
21
|
*/
|
|
22
22
|
export declare function invalidatePredictionOperatorStatusCache(config: JinnConfig): void;
|
|
23
|
+
/**
|
|
24
|
+
* Keystore-password provenance descriptor threaded from `main.ts`'s
|
|
25
|
+
* `resolveOrGenerateKeystorePassword()` (issue #441). `gatherGatheredStatusRaw`
|
|
26
|
+
* uses it to resolve `security.lastPasswordRotationAt`:
|
|
27
|
+
* - `source: 'file' | 'generated'` with a `filePath` → statSync(filePath).mtime ISO
|
|
28
|
+
* - `source: 'env'` (or no `filePath`) → null
|
|
29
|
+
*/
|
|
30
|
+
export interface PasswordRotationConfig {
|
|
31
|
+
source: 'env' | 'file' | 'generated';
|
|
32
|
+
filePath?: string;
|
|
33
|
+
}
|
|
23
34
|
export interface StatusGatherConfig {
|
|
24
35
|
earningDir: string;
|
|
25
36
|
rpcUrl: string;
|
|
26
|
-
/**
|
|
27
|
-
* tJINN ERC-20 token address — resolved from the bundled JINN MVI L1
|
|
28
|
-
* deployment artifact in `main.ts` (single source of truth). Optional so
|
|
29
|
-
* test callers can omit it; gather-status falls back to the artifact-derived
|
|
30
|
-
* default when absent.
|
|
31
|
-
*/
|
|
32
|
-
tjinnTokenAddress?: string;
|
|
33
|
-
/** tJINN chain id — resolved from the same artifact as `tjinnTokenAddress`. */
|
|
34
|
-
tjinnChainId?: number;
|
|
35
|
-
/** JinnDistributor address used for real operator lifetime claimed totals. */
|
|
36
|
-
tjinnDistributorAddress?: string;
|
|
37
37
|
/**
|
|
38
38
|
* stOLAS L2 distributor address (`CHAIN_CONFIG.distributorAddress`). Used
|
|
39
|
-
* solely to mirror `main.ts`'s `evictionCheck` predicate (issue #651).
|
|
40
|
-
* tJINN distributor on L1 is a different contract — do not substitute one
|
|
41
|
-
* for the other even though they happen to bundle together in our current
|
|
42
|
-
* testnet deployment.
|
|
39
|
+
* solely to mirror `main.ts`'s `evictionCheck` predicate (issue #651).
|
|
43
40
|
*/
|
|
44
41
|
stOlasDistributorAddress?: string;
|
|
45
42
|
network: 'mainnet' | 'testnet';
|
|
@@ -78,6 +75,12 @@ export interface StatusGatherConfig {
|
|
|
78
75
|
snapshot: HarnessReadinessSnapshot;
|
|
79
76
|
joinedHarnessesByCid: Record<string, JoinedHarnessSpec>;
|
|
80
77
|
} | null;
|
|
78
|
+
/**
|
|
79
|
+
* Keystore-password provenance — threaded from `main.ts`. Drives
|
|
80
|
+
* `security.lastPasswordRotationAt` on `/v1/status`. Optional: test callers
|
|
81
|
+
* and sqlite-only contexts omit it ⇒ `null` (issue #441).
|
|
82
|
+
*/
|
|
83
|
+
passwordRotation?: PasswordRotationConfig;
|
|
81
84
|
}
|
|
82
85
|
export declare function sumPendingStakingRewards(rpcUrl: string, network: 'mainnet' | 'testnet', fleet: FleetState): Promise<{
|
|
83
86
|
sum: string;
|