From 4471500c764749265e9aa2161a49eb14a581428c Mon Sep 17 00:00:00 2001
From: Huang-Ming Huang <huangming.huang@gmail.com>
Date: Tue, 21 Jul 2026 20:13:57 +0000
Subject: [PATCH 1/3] Provision Anvil Ethereum transaction policy

---
 packages/cluster-tool/README.md               |  47 ++++++
 .../outputs/OperatorDaemonArtifacts.ts        |   4 +-
 .../ethereum/EthereumTransactionPolicy.ts     | 149 ++++++++++++++++++
 .../cluster-tool/src/tools/ethereum/index.ts  |   1 +
 .../src/tools/wire/OperatorDaemonTool.ts      |  33 +++-
 .../processes/NodeopProcessSteps.test.ts      |   9 +-
 .../EthereumTransactionPolicy.test.ts         | 130 +++++++++++++++
 .../tools/wire/OperatorDaemonTool.test.ts     |  51 +++++-
 8 files changed, 417 insertions(+), 7 deletions(-)
 create mode 100644 packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
 create mode 100644 packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts

diff --git a/packages/cluster-tool/README.md b/packages/cluster-tool/README.md
index 4b4912f6..763d1894 100644
--- a/packages/cluster-tool/README.md
+++ b/packages/cluster-tool/README.md
@@ -233,6 +233,7 @@ After `create` completes:
     ├── anvil/                       # anvil state + pid + logs (if --ethereum-path)
     ├── solana_validator/            # solana-test-validator ledger + pid + logs (if --solana-path)
     ├── eth-abis/                    # deployed contract ABIs (OPP, OPPInbound, BAR)
+    ├── ethereum-transaction-policy.json # generated SEC-131 Anvil signing limits
     ├── solana-idls/                 # Anchor IDLs (opp_outpost.json)
     ├── opp-debugging/               # envelope .data/.metadata pairs (debugging server writes)
     └── tui/logs/                    # wire-debugging-client-tool-tui writes here (see companion)
@@ -240,6 +241,52 @@ After `create` completes:
 
 Every managed process writes `<dataPath>/<label>.pid` (e.g. `data/node_00/node-00.pid`) on spawn and removes it on clean exit. The TUI's Process Monitor iterates these.
 
+### Generated Ethereum transaction policy
+
+Cluster artifact preparation writes `data/ethereum-transaction-policy.json`
+and passes it to every generated Ethereum signing client through
+`--outpost-ethereum-transaction-policy-file`. The file contains exactly one
+SEC-131 policy for the stable `eth-default` client id. Batch operators,
+underwriters, flow-provisioned operators, and saved-cluster relaunches all use
+the same shared argument builder; bios and producer-only nodes receive neither
+an Ethereum signing client nor an orphaned policy option.
+
+The source of truth is `AnvilEthereumTransactionPolicy` in
+`packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts`:
+
+| Limit | Anvil value |
+|---|---:|
+| Maximum priority fee per gas | `2,000,000,000` wei (2 gwei) |
+| Maximum fee per gas | `100,000,000,000` wei (100 gwei) |
+| Maximum final gas limit | `2,000,000` |
+| Maximum total native cost | `250,000,000,000,000,000` wei (0.25 ETH) |
+
+The final-gas limit applies after nodeop's 20% estimate buffer. SEC-131 bounds
+`gas limit × maximum fee per gas + transaction value`; after the full
+`2,000,000 × 100 gwei = 0.2 ETH` gas bound, the 0.25 ETH total-cost cap leaves
+0.05 ETH for transaction value. The fee ceiling leaves deterministic headroom
+for Anvil's EIP-1559 base-fee movement while remaining finite.
+
+A canonical bidirectional `flow-swap-with-underwriting` run against the paired
+SEC-131 Release build measured the policy-governed Ethereum transactions below.
+The maximum-cost column is `transaction gas limit × maxFeePerGas + value`, not
+the smaller receipt cost based on gas actually used.
+
+| Transaction | Receipts | Maximum gas used | Maximum gas limit | Maximum bounded cost |
+|---|---:|---:|---:|---:|
+| `OPPInbound.epochIn` | 13 | `1,247,570` | `1,637,942` | `1,637,942,022,931,188` wei |
+| `OperatorRegistry.commit` | 2 | `724,434` | `960,904` | `960,904,013,452,656` wei |
+
+Those receipts used `maxFeePerGas = 1,000,000,014` wei, a 7-wei block base fee,
+and zero transaction value. The flow completed both ETH→SOL and SOL→ETH
+payouts without a policy rejection. It produced no standalone
+`emitOutboundEnvelope` transaction: steady-state Ethereum outbound emission is
+an internal call on the consensus-reaching `epochIn`, so its gas is included in
+the delivery measurements above.
+
+These development-cluster limits are not production recommendations.
+Production policy selection happens outside `wire-tools-ts`.
+
 ---
 
 ## Programmatic usage
diff --git a/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts b/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
index 99a2107f..0fa0f01b 100644
--- a/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
+++ b/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
@@ -11,6 +11,8 @@ export interface OperatorDaemonArtifacts {
   readonly ethereumAbiFiles: string[]
   /** Deployed Ethereum outpost addresses (from `outpost-addrs.json`). */
   readonly ethereumAddresses: Record<string, string>
+  /** Generated SEC-131 transaction-policy JSON for the Anvil Ethereum client. */
+  readonly ethereumTransactionPolicyFile: string
   /** The OPP outpost program id (base58) — `liqsol_core`'s `declare_id`. */
   readonly solanaProgramId: string
   /** Cluster-local verbatim copy of the `liqsol_core` (OPP outpost) IDL. */
@@ -20,5 +22,5 @@ export interface OperatorDaemonArtifacts {
 /** Typed cross-step handle to the prepared {@link OperatorDaemonArtifacts}. */
 export const OperatorDaemonArtifactsKey: OutputKey<OperatorDaemonArtifacts> = outputKey(
   "cluster.operatorDaemonArtifacts",
-  "outpost deploy artifacts for operator daemon command lines (ETH ABIs + addrs, SOL program id + IDL)"
+  "outpost artifacts for operator daemon command lines (ETH ABIs + policy, SOL program id + IDL)"
 )
diff --git a/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts b/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
new file mode 100644
index 00000000..a599b1b9
--- /dev/null
+++ b/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
@@ -0,0 +1,149 @@
+import Assert from "node:assert"
+
+/** One SEC-131 Ethereum signing-client transaction policy. */
+export interface EthereumTransactionPolicy {
+  /** Stable client id also used by `--outpost-ethereum-client`. */
+  readonly client_id: string
+  /** Canonical positive decimal EVM chain id. */
+  readonly chain_id: string
+  /** Maximum EIP-1559 priority fee per gas, in wei. */
+  readonly max_priority_fee_per_gas_wei: string
+  /** Maximum EIP-1559 fee per gas, in wei. */
+  readonly max_fee_per_gas_wei: string
+  /** Maximum final gas limit after nodeop applies its estimation headroom. */
+  readonly max_gas_limit: string
+  /** Maximum `gas limit × maximum fee per gas + transaction value`, in wei. */
+  readonly max_total_native_cost_wei: string
+}
+
+/** Versioned JSON file consumed by SEC-131's Ethereum outpost client plugin. */
+export interface EthereumTransactionPolicyFile {
+  /** SEC-131 policy schema version. */
+  readonly version: number
+  /** Policies keyed by the matching Ethereum outpost client id. */
+  readonly policies: readonly EthereumTransactionPolicy[]
+}
+
+const CanonicalPositiveDecimal = /^[1-9][0-9]*$/,
+  SafeClientIdentifier = /^[A-Za-z0-9._-]{1,64}$/,
+  MaximumUint32 = (1n << 32n) - 1n,
+  MaximumUint256 = (1n << 256n) - 1n
+
+/**
+ * Anvil-only SEC-131 transaction limits for generated cluster operator daemons.
+ * These development-cluster bounds are not production recommendations.
+ */
+export namespace AnvilEthereumTransactionPolicy {
+  /** SEC-131 JSON policy schema version. */
+  export const SchemaVersion = 1
+  /** Anvil priority-fee cap: 2 gwei. */
+  export const MaximumPriorityFeePerGasWei = 2_000_000_000n
+  /** Anvil maximum-fee cap: 100 gwei, leaving ample local EIP-1559 base-fee headroom. */
+  export const MaximumFeePerGasWei = 100_000_000_000n
+  /** Anvil final gas-limit cap for Ethereum OPP delivery and underwriter transactions. */
+  export const MaximumGasLimit = 2_000_000n
+  /**
+   * Anvil total native-cost cap: 0.25 ETH. After the full 0.2 ETH
+   * `MaximumGasLimit × MaximumFeePerGasWei` gas bound, 0.05 ETH remains for
+   * transaction value.
+   */
+  export const MaximumTotalNativeCostWei = 250_000_000_000_000_000n
+
+  /**
+   * Create the single-client policy file used by generated Anvil operator daemons.
+   *
+   * @param clientId - Stable id used by the matching Ethereum client argument.
+   * @param chainId - Positive uint32 Anvil chain id.
+   * @returns A validated SEC-131 policy file with canonical decimal strings.
+   */
+  export function create(
+    clientId: string,
+    chainId: number
+  ): EthereumTransactionPolicyFile {
+    const file: EthereumTransactionPolicyFile = {
+      version: SchemaVersion,
+      policies: [
+        {
+          client_id: clientId,
+          chain_id: String(chainId),
+          max_priority_fee_per_gas_wei: MaximumPriorityFeePerGasWei.toString(),
+          max_fee_per_gas_wei: MaximumFeePerGasWei.toString(),
+          max_gas_limit: MaximumGasLimit.toString(),
+          max_total_native_cost_wei: MaximumTotalNativeCostWei.toString()
+        }
+      ]
+    }
+    assertValid(file)
+    return file
+  }
+
+  /**
+   * Assert a generated policy file is canonical and satisfies SEC-131 plus
+   * cluster-tool's full maximum-cost relationship.
+   *
+   * @param file - Policy file to validate before it is written or referenced.
+   * @throws An assertion error naming the invalid policy field or relationship.
+   */
+  export function assertValid(file: EthereumTransactionPolicyFile): void {
+    Assert.equal(
+      file.version,
+      SchemaVersion,
+      `Ethereum transaction policy version must be ${SchemaVersion}`
+    )
+    Assert.equal(
+      file.policies.length,
+      1,
+      "Anvil Ethereum transaction policy must contain exactly one client policy"
+    )
+
+    const [policy] = file.policies
+    Assert.match(
+      policy.client_id,
+      SafeClientIdentifier,
+      "Ethereum transaction policy client_id must be 1-64 ASCII letters, digits, '.', '_', or '-'"
+    )
+    const chainId = positiveUint256(policy.chain_id, "chain_id")
+    Assert.ok(
+      chainId <= MaximumUint32,
+      "Ethereum transaction policy chain_id must fit uint32"
+    )
+
+    const maximumPriorityFeePerGas = positiveUint256(
+        policy.max_priority_fee_per_gas_wei,
+        "max_priority_fee_per_gas_wei"
+      ),
+      maximumFeePerGas = positiveUint256(
+        policy.max_fee_per_gas_wei,
+        "max_fee_per_gas_wei"
+      ),
+      maximumGasLimit = positiveUint256(policy.max_gas_limit, "max_gas_limit"),
+      maximumTotalNativeCost = positiveUint256(
+        policy.max_total_native_cost_wei,
+        "max_total_native_cost_wei"
+      )
+
+    Assert.ok(
+      maximumPriorityFeePerGas <= maximumFeePerGas,
+      "Ethereum transaction policy priority-fee cap must not exceed maximum-fee cap"
+    )
+    Assert.ok(
+      maximumTotalNativeCost >= maximumGasLimit * maximumFeePerGas,
+      "Ethereum transaction policy total-cost cap must cover gas-limit × maximum-fee caps"
+    )
+  }
+}
+
+/** Parse one SEC-131 canonical positive uint256 decimal field. */
+function positiveUint256(value: string, field: string): bigint {
+  Assert.match(
+    value,
+    CanonicalPositiveDecimal,
+    `Ethereum transaction policy ${field} must be a canonical positive decimal string`
+  )
+  const parsed = BigInt(value)
+  Assert.ok(
+    parsed <= MaximumUint256,
+    `Ethereum transaction policy ${field} must fit uint256`
+  )
+  return parsed
+}
diff --git a/packages/cluster-tool/src/tools/ethereum/index.ts b/packages/cluster-tool/src/tools/ethereum/index.ts
index fdfd6284..e0c3283c 100644
--- a/packages/cluster-tool/src/tools/ethereum/index.ts
+++ b/packages/cluster-tool/src/tools/ethereum/index.ts
@@ -3,3 +3,4 @@ export * from "./EthereumCollateralTool.js"
 export * from "./EthereumSwapTool.js"
 export * from "./EthereumYieldEmitterTool.js"
 export * from "./EthereumNodeOwnerNftTool.js"
+export * from "./EthereumTransactionPolicy.js"
diff --git a/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts b/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
index f0d72ded..fb8cfdf0 100644
--- a/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
+++ b/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
@@ -41,6 +41,7 @@ import {
 } from "../../orchestration/outputs/OperatorDaemonArtifacts.js"
 import { Report } from "../../report/Report.js"
 import { StepExtraRecorder } from "../../report/tools/StepExtraRecorder.js"
+import { AnvilEthereumTransactionPolicy } from "../ethereum/EthereumTransactionPolicy.js"
 import { SolanaOutpostProgramTool } from "../solana/SolanaOutpostProgramTool.js"
 import { mkdirs } from "../../utils/fsUtils.js"
 import { scaleTimeoutMs } from "../../utils/asyncUtils.js"
@@ -118,6 +119,9 @@ export namespace OperatorDaemonTool {
   ] as const
   /** Cluster-data subpath holding the generated `{contractName, address, abi}` files. */
   export const EthereumAbiSubpath = "eth-abis"
+  /** Cluster-data filename for the generated SEC-131 Anvil transaction policy. */
+  export const EthereumTransactionPolicyFilename =
+    "ethereum-transaction-policy.json"
   /** Cluster-data subpath holding the copied OPP outpost IDL. */
   export const SolanaIdlSubpath = "solana-idls"
   /** The OPP outpost IDL filename (cluster-local verbatim copy). */
@@ -151,8 +155,9 @@ export namespace OperatorDaemonTool {
    * Prepare the artifacts every operator daemon's command line references:
    * generate `<dataPath>/eth-abis/<Name>.json` (`{contractName, address, abi}`,
    * from the wire-ethereum hardhat artifacts + `outpost-addrs.json`), copy the
-   * `liqsol_core` (OPP outpost) IDL to `<dataPath>/solana-idls/`, resolve the SOL program id,
-   * and store the typed {@link OperatorDaemonArtifacts}. Runs ONCE, after both
+   * `liqsol_core` (OPP outpost) IDL to `<dataPath>/solana-idls/`, generate the
+   * SEC-131 Anvil transaction-policy file, resolve the SOL program id, and
+   * store the typed {@link OperatorDaemonArtifacts}. Runs ONCE, after both
    * outpost deploys, before any operator node starts.
    */
   export function planArtifactPreparation<
@@ -254,9 +259,26 @@ export namespace OperatorDaemonTool {
     )
     Fs.copyFileSync(idlSource, solanaIdlFile)
 
+    // SEC-131 fails closed when an Ethereum signing client has no matching
+    // policy. Generate the file from typed Anvil-only limits on every create /
+    // run so existing cluster state needs no schema migration.
+    const ethereumTransactionPolicyFile = Path.join(
+        dataPath,
+        EthereumTransactionPolicyFilename
+      ),
+      ethereumTransactionPolicy = AnvilEthereumTransactionPolicy.create(
+        EthereumClientId,
+        AnvilProcess.DefaultChainId
+      )
+    Fs.writeFileSync(
+      ethereumTransactionPolicyFile,
+      JSON.stringify(ethereumTransactionPolicy, null, 2)
+    )
+
     ctx.outputs.set(OperatorDaemonArtifactsKey, {
       ethereumAbiFiles,
       ethereumAddresses,
+      ethereumTransactionPolicyFile,
       solanaProgramId,
       solanaIdlFile
     })
@@ -265,9 +287,10 @@ export namespace OperatorDaemonTool {
     StepExtraRecorder.record({
       client: "harness",
       kind: "artifact",
-      text: "address-embedded ETH ABI files + liqsol_core (OPP outpost) IDL prepared for the operator daemons",
+      text: "address-embedded ETH ABIs + SEC-131 Anvil policy + liqsol_core IDL prepared for the operator daemons",
       ethereumAbiFiles,
       ethereumAddresses,
+      ethereumTransactionPolicyFile,
       solanaProgramId,
       solanaIdlFile
     })
@@ -314,6 +337,10 @@ export namespace OperatorDaemonTool {
           String(network.ethereumChainId)
         ].join(",")
       ),
+      ...pair(
+        "--outpost-ethereum-transaction-policy-file",
+        artifacts.ethereumTransactionPolicyFile
+      ),
       ...artifacts.ethereumAbiFiles.flatMap(file =>
         pair("--ethereum-abi-file", file)
       ),
diff --git a/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts b/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
index 2d0df131..0395e101 100644
--- a/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
+++ b/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
@@ -52,6 +52,7 @@ const artifactsFixture: OperatorDaemonArtifacts = {
     OperatorRegistry: "0x3333333333333333333333333333333333333333",
     ReserveManager: "0x4444444444444444444444444444444444444444"
   },
+  ethereumTransactionPolicyFile: "/cluster/data/ethereum-transaction-policy.json",
   solanaProgramId: "GrqvbZLCLkfeSQqvE7rL8XKHVWjNhAG2faLsY8yr9tD5",
   solanaIdlFile: "/cluster/data/solana-idls/liqsol_core.json"
 }
@@ -241,7 +242,9 @@ describe("Steps.processes.nodeop", () => {
           "--batch-enabled",
           "true",
           "--batch-operator-account",
-          "batchopaaaa"
+          "batchopaaaa",
+          "--outpost-ethereum-transaction-policy-file",
+          artifactsFixture.ethereumTransactionPolicyFile
         ])
       )
     })
@@ -257,7 +260,9 @@ describe("Steps.processes.nodeop", () => {
           "--underwriter-enabled",
           "true",
           "--underwriter-account",
-          "underwriteraaaa"
+          "underwriteraaaa",
+          "--outpost-ethereum-transaction-policy-file",
+          artifactsFixture.ethereumTransactionPolicyFile
         ])
       )
     })
diff --git a/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts b/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts
new file mode 100644
index 00000000..862b9a51
--- /dev/null
+++ b/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts
@@ -0,0 +1,130 @@
+import {
+  AnvilEthereumTransactionPolicy,
+  type EthereumTransactionPolicy,
+  type EthereumTransactionPolicyFile
+} from "@wireio/cluster-tool/tools/ethereum"
+
+const ClientId = "eth-default",
+  ChainId = 31_337
+
+/** A valid generated file with one policy field replaced for rejection tests. */
+function policyFileWith(
+  changes: Partial<EthereumTransactionPolicy>
+): EthereumTransactionPolicyFile {
+  const file = AnvilEthereumTransactionPolicy.create(ClientId, ChainId)
+  return {
+    ...file,
+    policies: [{ ...file.policies[0], ...changes }]
+  }
+}
+
+describe("AnvilEthereumTransactionPolicy", () => {
+  it("defines every finite Anvil limit exactly in canonical decimal form", () => {
+    expect(AnvilEthereumTransactionPolicy.SchemaVersion).toBe(1)
+    expect(
+      AnvilEthereumTransactionPolicy.MaximumPriorityFeePerGasWei.toString()
+    ).toBe("2000000000")
+    expect(AnvilEthereumTransactionPolicy.MaximumFeePerGasWei.toString()).toBe(
+      "100000000000"
+    )
+    expect(AnvilEthereumTransactionPolicy.MaximumGasLimit.toString()).toBe(
+      "2000000"
+    )
+    expect(
+      AnvilEthereumTransactionPolicy.MaximumTotalNativeCostWei.toString()
+    ).toBe("250000000000000000")
+  })
+
+  it("creates the exact SEC-131 single-client JSON schema", () => {
+    expect(AnvilEthereumTransactionPolicy.create(ClientId, ChainId)).toEqual({
+      version: 1,
+      policies: [
+        {
+          client_id: "eth-default",
+          chain_id: "31337",
+          max_priority_fee_per_gas_wei: "2000000000",
+          max_fee_per_gas_wei: "100000000000",
+          max_gas_limit: "2000000",
+          max_total_native_cost_wei: "250000000000000000"
+        }
+      ]
+    })
+  })
+
+  it("keeps fee and full maximum-cost relationships valid", () => {
+    expect(
+      AnvilEthereumTransactionPolicy.MaximumPriorityFeePerGasWei
+    ).toBeLessThanOrEqual(AnvilEthereumTransactionPolicy.MaximumFeePerGasWei)
+    expect(
+      AnvilEthereumTransactionPolicy.MaximumTotalNativeCostWei
+    ).toBeGreaterThanOrEqual(
+      AnvilEthereumTransactionPolicy.MaximumGasLimit *
+        AnvilEthereumTransactionPolicy.MaximumFeePerGasWei
+    )
+  })
+
+  it("accepts the SEC-131 client-id boundary and rejects unsafe identifiers", () => {
+    expect(
+      AnvilEthereumTransactionPolicy.create("a".repeat(64), ChainId).policies[0]
+        .client_id
+    ).toHaveLength(64)
+    expect(() => AnvilEthereumTransactionPolicy.create("", ChainId)).toThrow(
+      /client_id must be 1-64 ASCII/
+    )
+    expect(() =>
+      AnvilEthereumTransactionPolicy.create("bad,id", ChainId)
+    ).toThrow(/client_id must be 1-64 ASCII/)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.create("a".repeat(65), ChainId)
+    ).toThrow(/client_id must be 1-64 ASCII/)
+  })
+
+  it("rejects a non-uint32 chain id", () => {
+    expect(() =>
+      AnvilEthereumTransactionPolicy.create(ClientId, 2 ** 32)
+    ).toThrow(/chain_id must fit uint32/)
+  })
+
+  it("rejects non-canonical, zero, and uint256-overflowing fields", () => {
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid(
+        policyFileWith({ max_gas_limit: "02000000" })
+      )
+    ).toThrow(/max_gas_limit must be a canonical positive decimal string/)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid(
+        policyFileWith({ max_gas_limit: "0" })
+      )
+    ).toThrow(/max_gas_limit must be a canonical positive decimal string/)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid(
+        policyFileWith({ max_gas_limit: (1n << 256n).toString() })
+      )
+    ).toThrow(/max_gas_limit must fit uint256/)
+  })
+
+  it("rejects inconsistent fee and total-cost relationships", () => {
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid(
+        policyFileWith({
+          max_priority_fee_per_gas_wei: "100000000001"
+        })
+      )
+    ).toThrow(/priority-fee cap must not exceed maximum-fee cap/)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid(
+        policyFileWith({ max_total_native_cost_wei: "199999999999999999" })
+      )
+    ).toThrow(/total-cost cap must cover gas-limit × maximum-fee caps/)
+  })
+
+  it("rejects a wrong schema version or policy count", () => {
+    const file = AnvilEthereumTransactionPolicy.create(ClientId, ChainId)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid({ ...file, version: 2 })
+    ).toThrow(/version must be 1/)
+    expect(() =>
+      AnvilEthereumTransactionPolicy.assertValid({ ...file, policies: [] })
+    ).toThrow(/must contain exactly one client policy/)
+  })
+})
diff --git a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
index d59e7845..7ab474e8 100644
--- a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
+++ b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
@@ -9,6 +9,7 @@ import {
   NodeopProcess,
   ProcessManager
 } from "@wireio/cluster-tool/cluster/processes"
+import { AnvilEthereumTransactionPolicy } from "@wireio/cluster-tool/tools/ethereum"
 import { OperatorDaemonTool } from "@wireio/cluster-tool/tools/wire"
 import { SolanaOutpostProgramTool } from "@wireio/cluster-tool/tools/solana"
 import {
@@ -49,6 +50,7 @@ const artifacts: OperatorDaemonArtifacts = {
     OperatorRegistry: "0x3333333333333333333333333333333333333333",
     ReserveManager: "0x4444444444444444444444444444444444444444"
   },
+  ethereumTransactionPolicyFile: "/cluster/data/ethereum-transaction-policy.json",
   solanaProgramId: "GrqvbZLCLkfeSQqvE7rL8XKHVWjNhAG2faLsY8yr9tD5",
   solanaIdlFile: "/cluster/data/solana-idls/liqsol_core.json"
 }
@@ -90,7 +92,11 @@ describe("OperatorDaemonTool", () => {
           ctx.processManager,
           expect.objectContaining({
             operator,
-            extraArgs: expect.arrayContaining(["--batch-enabled"])
+            extraArgs: expect.arrayContaining([
+              "--batch-enabled",
+              "--outpost-ethereum-transaction-policy-file",
+              artifacts.ethereumTransactionPolicyFile
+            ])
           })
         )
       } finally {
@@ -128,6 +134,9 @@ describe("OperatorDaemonTool", () => {
       expect(valuesOf(args, "--outpost-ethereum-client")).toEqual([
         `eth-default,eth-batchopaaaa,${network.ethereumRpcUrl},31337`
       ])
+      expect(valuesOf(args, "--outpost-ethereum-transaction-policy-file")).toEqual([
+        artifacts.ethereumTransactionPolicyFile
+      ])
       expect(valuesOf(args, "--outpost-solana-client")).toEqual([
         `sol-default,sol-batchopaaaa,${network.solanaRpcUrl}`
       ])
@@ -196,6 +205,22 @@ describe("OperatorDaemonTool", () => {
       expect(valuesOf(args, "--solana-outpost-program-name")).toEqual([
         SolanaOutpostProgramTool.ProgramName
       ])
+      expect(valuesOf(args, "--outpost-ethereum-transaction-policy-file")).toEqual([
+        artifacts.ethereumTransactionPolicyFile
+      ])
+    })
+
+    it("keeps signer ids distinct while every operator references the same policy", () => {
+      const secondArgs = OperatorDaemonTool.underwriterArgs(
+        operatorAccount("uwritbbbbbb", OperatorType.UNDERWRITER),
+        artifacts,
+        network
+      )
+      expect(valuesOf(args, "--signature-provider")[1]).toMatch(/^eth-uwritaaaaaa,/)
+      expect(valuesOf(secondArgs, "--signature-provider")[1]).toMatch(/^eth-uwritbbbbbb,/)
+      expect(valuesOf(secondArgs, "--outpost-ethereum-transaction-policy-file")).toEqual(
+        valuesOf(args, "--outpost-ethereum-transaction-policy-file")
+      )
     })
 
     it("wires each outpost with one consolidated per-chain CSV spec", () => {
@@ -288,6 +313,30 @@ describe("OperatorDaemonTool", () => {
         address: "0xaaa0000000000000000000000000000000000aaa",
         abi: [{ type: "event", name: "OPPEnvelope" }]
       })
+      expect(Path.basename(prepared.ethereumTransactionPolicyFile)).toBe(
+        OperatorDaemonTool.EthereumTransactionPolicyFilename
+      )
+      expect(JSON.parse(Fs.readFileSync(prepared.ethereumTransactionPolicyFile, "utf-8"))).toEqual(
+        AnvilEthereumTransactionPolicy.create(
+          OperatorDaemonTool.EthereumClientId,
+          network.ethereumChainId
+        )
+      )
+
+      // Saved-cluster `run` invokes the same preparation runner. A regenerated
+      // policy must overwrite stale disk content without a state migration.
+      Fs.writeFileSync(prepared.ethereumTransactionPolicyFile, JSON.stringify({ stale: true }))
+      await OperatorDaemonTool.runArtifactPreparation(
+        ctx,
+        null,
+        new AbortController().signal
+      )
+      expect(JSON.parse(Fs.readFileSync(prepared.ethereumTransactionPolicyFile, "utf-8"))).toEqual(
+        AnvilEthereumTransactionPolicy.create(
+          OperatorDaemonTool.EthereumClientId,
+          network.ethereumChainId
+        )
+      )
     })
 
     it("rejects an IDL missing a daemon-invoked instruction (wrong/stale IDL guard)", async () => {

From dc3b5bdc0d719c484f8834c739bc168ab4c2f6b0 Mon Sep 17 00:00:00 2001
From: Huang-Ming Huang <huangming.huang@gmail.com>
Date: Tue, 21 Jul 2026 21:39:16 +0000
Subject: [PATCH 2/3] Generate unified Ethereum client configuration

---
 packages/cluster-tool/README.md               |  62 ++----
 .../outputs/OperatorDaemonArtifacts.ts        |  13 +-
 .../ethereum/EthereumClientConfiguration.ts   | 130 +++++++++++
 .../ethereum/EthereumTransactionPolicy.ts     | 149 -------------
 .../cluster-tool/src/tools/ethereum/index.ts  |   2 +-
 .../src/tools/wire/OperatorDaemonTool.ts      |  61 +++--
 .../processes/NodeopProcessSteps.test.ts      | 124 +++++++++--
 .../EthereumClientConfiguration.test.ts       | 137 ++++++++++++
 .../EthereumTransactionPolicy.test.ts         | 130 -----------
 .../tools/wire/OperatorDaemonTool.test.ts     | 209 +++++++++++++-----
 10 files changed, 569 insertions(+), 448 deletions(-)
 create mode 100644 packages/cluster-tool/src/tools/ethereum/EthereumClientConfiguration.ts
 delete mode 100644 packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
 create mode 100644 packages/cluster-tool/tests/tools/ethereum/EthereumClientConfiguration.test.ts
 delete mode 100644 packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts

diff --git a/packages/cluster-tool/README.md b/packages/cluster-tool/README.md
index 763d1894..8ce25ade 100644
--- a/packages/cluster-tool/README.md
+++ b/packages/cluster-tool/README.md
@@ -233,7 +233,7 @@ After `create` completes:
     ├── anvil/                       # anvil state + pid + logs (if --ethereum-path)
     ├── solana_validator/            # solana-test-validator ledger + pid + logs (if --solana-path)
     ├── eth-abis/                    # deployed contract ABIs (OPP, OPPInbound, BAR)
-    ├── ethereum-transaction-policy.json # generated SEC-131 Anvil signing limits
+    ├── ethereum-client.json          # shared unified Ethereum client config for operator daemons
     ├── solana-idls/                 # Anchor IDLs (opp_outpost.json)
     ├── opp-debugging/               # envelope .data/.metadata pairs (debugging server writes)
     └── tui/logs/                    # wire-debugging-client-tool-tui writes here (see companion)
@@ -241,50 +241,22 @@ After `create` completes:
 
 Every managed process writes `<dataPath>/<label>.pid` (e.g. `data/node_00/node-00.pid`) on spawn and removes it on clean exit. The TUI's Process Monitor iterates these.
 
-### Generated Ethereum transaction policy
-
-Cluster artifact preparation writes `data/ethereum-transaction-policy.json`
-and passes it to every generated Ethereum signing client through
-`--outpost-ethereum-transaction-policy-file`. The file contains exactly one
-SEC-131 policy for the stable `eth-default` client id. Batch operators,
-underwriters, flow-provisioned operators, and saved-cluster relaunches all use
-the same shared argument builder; bios and producer-only nodes receive neither
-an Ethereum signing client nor an orphaned policy option.
-
-The source of truth is `AnvilEthereumTransactionPolicy` in
-`packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts`:
-
-| Limit | Anvil value |
-|---|---:|
-| Maximum priority fee per gas | `2,000,000,000` wei (2 gwei) |
-| Maximum fee per gas | `100,000,000,000` wei (100 gwei) |
-| Maximum final gas limit | `2,000,000` |
-| Maximum total native cost | `250,000,000,000,000,000` wei (0.25 ETH) |
-
-The final-gas limit applies after nodeop's 20% estimate buffer. SEC-131 bounds
-`gas limit × maximum fee per gas + transaction value`; after the full
-`2,000,000 × 100 gwei = 0.2 ETH` gas bound, the 0.25 ETH total-cost cap leaves
-0.05 ETH for transaction value. The fee ceiling leaves deterministic headroom
-for Anvil's EIP-1559 base-fee movement while remaining finite.
-
-A canonical bidirectional `flow-swap-with-underwriting` run against the paired
-SEC-131 Release build measured the policy-governed Ethereum transactions below.
-The maximum-cost column is `transaction gas limit × maxFeePerGas + value`, not
-the smaller receipt cost based on gas actually used.
-
-| Transaction | Receipts | Maximum gas used | Maximum gas limit | Maximum bounded cost |
-|---|---:|---:|---:|---:|
-| `OPPInbound.epochIn` | 13 | `1,247,570` | `1,637,942` | `1,637,942,022,931,188` wei |
-| `OperatorRegistry.commit` | 2 | `724,434` | `960,904` | `960,904,013,452,656` wei |
-
-Those receipts used `maxFeePerGas = 1,000,000,014` wei, a 7-wei block base fee,
-and zero transaction value. The flow completed both ETH→SOL and SOL→ETH
-payouts without a policy rejection. It produced no standalone
-`emitOutboundEnvelope` transaction: steady-state Ethereum outbound emission is
-an internal call on the consensus-reaching `epochIn`, so its gas is included in
-the delivery measurements above.
-
-These development-cluster limits are not production recommendations.
+### Generated Ethereum client configuration
+
+Artifact preparation writes one `data/ethereum-client.json`, and every operator
+daemon passes it through `--outpost-ethereum-client-config-file`. The versioned
+file combines the stable `eth-default` client id and signature-provider id with
+the Anvil RPC URL and chain id. Signature-provider ids are process-local, so each
+daemon can register its own Ethereum private key as `eth-default` while safely
+sharing the same client configuration file. Daemon argument builders remain
+pure and reuse the artifact on create, run, restart, and flow-provisioned starts.
+
+Generated development-cluster files omit `transaction_policy`. Nodeop therefore
+assigns its maximum-`uint256` default caps, preserving the pre-policy behavior
+for local clusters. The schema supports an explicit nested policy when finite
+cluster limits are wanted later. Bios and producer-only nodes receive neither an
+Ethereum signing client nor an orphaned client-config option.
+
 Production policy selection happens outside `wire-tools-ts`.
 
 ---
diff --git a/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts b/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
index 0fa0f01b..2978db51 100644
--- a/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
+++ b/packages/cluster-tool/src/orchestration/outputs/OperatorDaemonArtifacts.ts
@@ -11,8 +11,8 @@ export interface OperatorDaemonArtifacts {
   readonly ethereumAbiFiles: string[]
   /** Deployed Ethereum outpost addresses (from `outpost-addrs.json`). */
   readonly ethereumAddresses: Record<string, string>
-  /** Generated SEC-131 transaction-policy JSON for the Anvil Ethereum client. */
-  readonly ethereumTransactionPolicyFile: string
+  /** Generated unified Ethereum client JSON shared by operator daemon processes. */
+  readonly ethereumClientConfigurationFile: string
   /** The OPP outpost program id (base58) — `liqsol_core`'s `declare_id`. */
   readonly solanaProgramId: string
   /** Cluster-local verbatim copy of the `liqsol_core` (OPP outpost) IDL. */
@@ -20,7 +20,8 @@ export interface OperatorDaemonArtifacts {
 }
 
 /** Typed cross-step handle to the prepared {@link OperatorDaemonArtifacts}. */
-export const OperatorDaemonArtifactsKey: OutputKey<OperatorDaemonArtifacts> = outputKey(
-  "cluster.operatorDaemonArtifacts",
-  "outpost artifacts for operator daemon command lines (ETH ABIs + policy, SOL program id + IDL)"
-)
+export const OperatorDaemonArtifactsKey: OutputKey<OperatorDaemonArtifacts> =
+  outputKey(
+    "cluster.operatorDaemonArtifacts",
+    "outpost artifacts for operator daemon command lines (ETH ABIs + client configs, SOL program id + IDL)"
+  )
diff --git a/packages/cluster-tool/src/tools/ethereum/EthereumClientConfiguration.ts b/packages/cluster-tool/src/tools/ethereum/EthereumClientConfiguration.ts
new file mode 100644
index 00000000..1068cf0c
--- /dev/null
+++ b/packages/cluster-tool/src/tools/ethereum/EthereumClientConfiguration.ts
@@ -0,0 +1,130 @@
+import Assert from "node:assert"
+
+/** Optional finite limits for one Ethereum signing client. */
+export interface EthereumTransactionPolicy {
+  readonly max_priority_fee_per_gas_wei: string
+  readonly max_fee_per_gas_wei: string
+  readonly max_gas_limit: string
+  readonly max_total_native_cost_wei: string
+}
+
+/** One connection in the unified nodeop Ethereum client configuration. */
+export interface EthereumClientEntry {
+  readonly client_id: string
+  readonly signature_provider_id: string
+  readonly rpc_url: string
+  readonly chain_id: string
+  readonly transaction_policy?: EthereumTransactionPolicy
+}
+
+/** Versioned JSON file consumed by `--outpost-ethereum-client-config-file`. */
+export interface EthereumClientConfigurationFile {
+  readonly version: number
+  readonly clients: readonly EthereumClientEntry[]
+}
+
+const CanonicalPositiveDecimal = /^[1-9][0-9]*$/,
+  SafeIdentifier = /^[A-Za-z0-9._-]{1,64}$/,
+  MaximumUint32 = (1n << 32n) - 1n,
+  MaximumUint256 = (1n << 256n) - 1n
+
+/** Build and validate the single-client config used by one cluster operator daemon. */
+export namespace EthereumClientConfiguration {
+  export const SchemaVersion = 1
+
+  export interface CreateOptions {
+    readonly clientId: string
+    readonly signatureProviderId: string
+    readonly rpcUrl: string
+    readonly chainId: number
+    readonly transactionPolicy?: EthereumTransactionPolicy
+  }
+
+  /** Create one unified client file; omitted policy means nodeop's maximum-value defaults. */
+  export function create(
+    options: CreateOptions
+  ): EthereumClientConfigurationFile {
+    const client: EthereumClientEntry = {
+      client_id: options.clientId,
+      signature_provider_id: options.signatureProviderId,
+      rpc_url: options.rpcUrl,
+      chain_id: String(options.chainId),
+      ...(options.transactionPolicy == null
+        ? {}
+        : { transaction_policy: options.transactionPolicy })
+    }
+    const file: EthereumClientConfigurationFile = {
+      version: SchemaVersion,
+      clients: [client]
+    }
+    assertValid(file)
+    return file
+  }
+
+  /** Assert a generated client file matches nodeop's strict schema and numeric domains. */
+  export function assertValid(file: EthereumClientConfigurationFile): void {
+    Assert.equal(
+      file.version,
+      SchemaVersion,
+      `Ethereum client configuration version must be ${SchemaVersion}`
+    )
+    Assert.equal(
+      file.clients.length,
+      1,
+      "Operator daemon Ethereum configuration must contain exactly one client"
+    )
+
+    const [client] = file.clients
+    Assert.match(
+      client.client_id,
+      SafeIdentifier,
+      "Ethereum client_id must be 1-64 ASCII letters, digits, '.', '_', or '-'"
+    )
+    Assert.ok(
+      client.signature_provider_id.length > 0,
+      "Ethereum signature_provider_id must not be empty"
+    )
+    const rpcUrl = new URL(client.rpc_url)
+    Assert.ok(
+      rpcUrl.protocol === "http:" || rpcUrl.protocol === "https:",
+      "Ethereum rpc_url must use http or https"
+    )
+    const chainId = positiveUint(client.chain_id, "chain_id", MaximumUint32)
+
+    if (client.transaction_policy == null) return
+    const policy = client.transaction_policy,
+      maximumPriorityFeePerGas = positiveUint(
+        policy.max_priority_fee_per_gas_wei,
+        "max_priority_fee_per_gas_wei",
+        MaximumUint256
+      ),
+      maximumFeePerGas = positiveUint(
+        policy.max_fee_per_gas_wei,
+        "max_fee_per_gas_wei",
+        MaximumUint256
+      )
+    positiveUint(policy.max_gas_limit, "max_gas_limit", MaximumUint256)
+    positiveUint(
+      policy.max_total_native_cost_wei,
+      "max_total_native_cost_wei",
+      MaximumUint256
+    )
+    Assert.ok(chainId > 0n)
+    Assert.ok(
+      maximumPriorityFeePerGas <= maximumFeePerGas,
+      "Ethereum priority-fee cap must not exceed maximum-fee cap"
+    )
+  }
+}
+
+/** Parse one canonical positive unsigned decimal bounded by `maximum`. */
+function positiveUint(value: string, field: string, maximum: bigint): bigint {
+  Assert.match(
+    value,
+    CanonicalPositiveDecimal,
+    `Ethereum ${field} must be a canonical positive decimal string`
+  )
+  const parsed = BigInt(value)
+  Assert.ok(parsed <= maximum, `Ethereum ${field} exceeds its supported domain`)
+  return parsed
+}
diff --git a/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts b/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
deleted file mode 100644
index a599b1b9..00000000
--- a/packages/cluster-tool/src/tools/ethereum/EthereumTransactionPolicy.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import Assert from "node:assert"
-
-/** One SEC-131 Ethereum signing-client transaction policy. */
-export interface EthereumTransactionPolicy {
-  /** Stable client id also used by `--outpost-ethereum-client`. */
-  readonly client_id: string
-  /** Canonical positive decimal EVM chain id. */
-  readonly chain_id: string
-  /** Maximum EIP-1559 priority fee per gas, in wei. */
-  readonly max_priority_fee_per_gas_wei: string
-  /** Maximum EIP-1559 fee per gas, in wei. */
-  readonly max_fee_per_gas_wei: string
-  /** Maximum final gas limit after nodeop applies its estimation headroom. */
-  readonly max_gas_limit: string
-  /** Maximum `gas limit × maximum fee per gas + transaction value`, in wei. */
-  readonly max_total_native_cost_wei: string
-}
-
-/** Versioned JSON file consumed by SEC-131's Ethereum outpost client plugin. */
-export interface EthereumTransactionPolicyFile {
-  /** SEC-131 policy schema version. */
-  readonly version: number
-  /** Policies keyed by the matching Ethereum outpost client id. */
-  readonly policies: readonly EthereumTransactionPolicy[]
-}
-
-const CanonicalPositiveDecimal = /^[1-9][0-9]*$/,
-  SafeClientIdentifier = /^[A-Za-z0-9._-]{1,64}$/,
-  MaximumUint32 = (1n << 32n) - 1n,
-  MaximumUint256 = (1n << 256n) - 1n
-
-/**
- * Anvil-only SEC-131 transaction limits for generated cluster operator daemons.
- * These development-cluster bounds are not production recommendations.
- */
-export namespace AnvilEthereumTransactionPolicy {
-  /** SEC-131 JSON policy schema version. */
-  export const SchemaVersion = 1
-  /** Anvil priority-fee cap: 2 gwei. */
-  export const MaximumPriorityFeePerGasWei = 2_000_000_000n
-  /** Anvil maximum-fee cap: 100 gwei, leaving ample local EIP-1559 base-fee headroom. */
-  export const MaximumFeePerGasWei = 100_000_000_000n
-  /** Anvil final gas-limit cap for Ethereum OPP delivery and underwriter transactions. */
-  export const MaximumGasLimit = 2_000_000n
-  /**
-   * Anvil total native-cost cap: 0.25 ETH. After the full 0.2 ETH
-   * `MaximumGasLimit × MaximumFeePerGasWei` gas bound, 0.05 ETH remains for
-   * transaction value.
-   */
-  export const MaximumTotalNativeCostWei = 250_000_000_000_000_000n
-
-  /**
-   * Create the single-client policy file used by generated Anvil operator daemons.
-   *
-   * @param clientId - Stable id used by the matching Ethereum client argument.
-   * @param chainId - Positive uint32 Anvil chain id.
-   * @returns A validated SEC-131 policy file with canonical decimal strings.
-   */
-  export function create(
-    clientId: string,
-    chainId: number
-  ): EthereumTransactionPolicyFile {
-    const file: EthereumTransactionPolicyFile = {
-      version: SchemaVersion,
-      policies: [
-        {
-          client_id: clientId,
-          chain_id: String(chainId),
-          max_priority_fee_per_gas_wei: MaximumPriorityFeePerGasWei.toString(),
-          max_fee_per_gas_wei: MaximumFeePerGasWei.toString(),
-          max_gas_limit: MaximumGasLimit.toString(),
-          max_total_native_cost_wei: MaximumTotalNativeCostWei.toString()
-        }
-      ]
-    }
-    assertValid(file)
-    return file
-  }
-
-  /**
-   * Assert a generated policy file is canonical and satisfies SEC-131 plus
-   * cluster-tool's full maximum-cost relationship.
-   *
-   * @param file - Policy file to validate before it is written or referenced.
-   * @throws An assertion error naming the invalid policy field or relationship.
-   */
-  export function assertValid(file: EthereumTransactionPolicyFile): void {
-    Assert.equal(
-      file.version,
-      SchemaVersion,
-      `Ethereum transaction policy version must be ${SchemaVersion}`
-    )
-    Assert.equal(
-      file.policies.length,
-      1,
-      "Anvil Ethereum transaction policy must contain exactly one client policy"
-    )
-
-    const [policy] = file.policies
-    Assert.match(
-      policy.client_id,
-      SafeClientIdentifier,
-      "Ethereum transaction policy client_id must be 1-64 ASCII letters, digits, '.', '_', or '-'"
-    )
-    const chainId = positiveUint256(policy.chain_id, "chain_id")
-    Assert.ok(
-      chainId <= MaximumUint32,
-      "Ethereum transaction policy chain_id must fit uint32"
-    )
-
-    const maximumPriorityFeePerGas = positiveUint256(
-        policy.max_priority_fee_per_gas_wei,
-        "max_priority_fee_per_gas_wei"
-      ),
-      maximumFeePerGas = positiveUint256(
-        policy.max_fee_per_gas_wei,
-        "max_fee_per_gas_wei"
-      ),
-      maximumGasLimit = positiveUint256(policy.max_gas_limit, "max_gas_limit"),
-      maximumTotalNativeCost = positiveUint256(
-        policy.max_total_native_cost_wei,
-        "max_total_native_cost_wei"
-      )
-
-    Assert.ok(
-      maximumPriorityFeePerGas <= maximumFeePerGas,
-      "Ethereum transaction policy priority-fee cap must not exceed maximum-fee cap"
-    )
-    Assert.ok(
-      maximumTotalNativeCost >= maximumGasLimit * maximumFeePerGas,
-      "Ethereum transaction policy total-cost cap must cover gas-limit × maximum-fee caps"
-    )
-  }
-}
-
-/** Parse one SEC-131 canonical positive uint256 decimal field. */
-function positiveUint256(value: string, field: string): bigint {
-  Assert.match(
-    value,
-    CanonicalPositiveDecimal,
-    `Ethereum transaction policy ${field} must be a canonical positive decimal string`
-  )
-  const parsed = BigInt(value)
-  Assert.ok(
-    parsed <= MaximumUint256,
-    `Ethereum transaction policy ${field} must fit uint256`
-  )
-  return parsed
-}
diff --git a/packages/cluster-tool/src/tools/ethereum/index.ts b/packages/cluster-tool/src/tools/ethereum/index.ts
index e0c3283c..cdd3f5e5 100644
--- a/packages/cluster-tool/src/tools/ethereum/index.ts
+++ b/packages/cluster-tool/src/tools/ethereum/index.ts
@@ -3,4 +3,4 @@ export * from "./EthereumCollateralTool.js"
 export * from "./EthereumSwapTool.js"
 export * from "./EthereumYieldEmitterTool.js"
 export * from "./EthereumNodeOwnerNftTool.js"
-export * from "./EthereumTransactionPolicy.js"
+export * from "./EthereumClientConfiguration.js"
diff --git a/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts b/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
index fb8cfdf0..74f57e1f 100644
--- a/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
+++ b/packages/cluster-tool/src/tools/wire/OperatorDaemonTool.ts
@@ -8,7 +8,7 @@
  * {@link planArtifactPreparation} is a Step (run once, after both outpost deploys) that
  * writes the cluster-local artifact files and stores the typed
  * {@link OperatorDaemonArtifacts}; {@link batchOperatorArgs} /
- * {@link underwriterArgs} are PURE value builders the operator-node start runner
+ * {@link underwriterArgs} are pure value builders the operator-node start runner
  * composes into `NodeopProcess` extra args.
  */
 
@@ -41,7 +41,7 @@ import {
 } from "../../orchestration/outputs/OperatorDaemonArtifacts.js"
 import { Report } from "../../report/Report.js"
 import { StepExtraRecorder } from "../../report/tools/StepExtraRecorder.js"
-import { AnvilEthereumTransactionPolicy } from "../ethereum/EthereumTransactionPolicy.js"
+import { EthereumClientConfiguration } from "../ethereum/EthereumClientConfiguration.js"
 import { SolanaOutpostProgramTool } from "../solana/SolanaOutpostProgramTool.js"
 import { mkdirs } from "../../utils/fsUtils.js"
 import { scaleTimeoutMs } from "../../utils/asyncUtils.js"
@@ -85,6 +85,8 @@ export namespace OperatorDaemonTool {
   export const UnderwriterActionTimeoutMs = 30_000
   /** The single ethereum outpost client id every plugin arg references. */
   export const EthereumClientId = "eth-default"
+  /** Process-local signature-provider id referenced by the shared Ethereum client file. */
+  export const EthereumSignatureProviderId = "eth-default"
   /** The single solana outpost client id every plugin arg references. */
   export const SolanaClientId = "sol-default"
   /** The `sysio.chains` codename keying the ETH outpost wiring specs. */
@@ -119,9 +121,8 @@ export namespace OperatorDaemonTool {
   ] as const
   /** Cluster-data subpath holding the generated `{contractName, address, abi}` files. */
   export const EthereumAbiSubpath = "eth-abis"
-  /** Cluster-data filename for the generated SEC-131 Anvil transaction policy. */
-  export const EthereumTransactionPolicyFilename =
-    "ethereum-transaction-policy.json"
+  /** Cluster-data filename for the shared unified Ethereum client configuration. */
+  export const EthereumClientConfigurationFilename = "ethereum-client.json"
   /** Cluster-data subpath holding the copied OPP outpost IDL. */
   export const SolanaIdlSubpath = "solana-idls"
   /** The OPP outpost IDL filename (cluster-local verbatim copy). */
@@ -156,7 +157,7 @@ export namespace OperatorDaemonTool {
    * generate `<dataPath>/eth-abis/<Name>.json` (`{contractName, address, abi}`,
    * from the wire-ethereum hardhat artifacts + `outpost-addrs.json`), copy the
    * `liqsol_core` (OPP outpost) IDL to `<dataPath>/solana-idls/`, generate the
-   * SEC-131 Anvil transaction-policy file, resolve the SOL program id, and
+   * unified Ethereum client file, resolve the SOL program id, and
    * store the typed {@link OperatorDaemonArtifacts}. Runs ONCE, after both
    * outpost deploys, before any operator node starts.
    */
@@ -259,26 +260,27 @@ export namespace OperatorDaemonTool {
     )
     Fs.copyFileSync(idlSource, solanaIdlFile)
 
-    // SEC-131 fails closed when an Ethereum signing client has no matching
-    // policy. Generate the file from typed Anvil-only limits on every create /
-    // run so existing cluster state needs no schema migration.
-    const ethereumTransactionPolicyFile = Path.join(
+    // Signature-provider ids are process-local, so every daemon can register
+    // its own key under the stable name referenced by this shared client file.
+    const ethereumClientConfigurationFile = Path.join(
         dataPath,
-        EthereumTransactionPolicyFilename
+        EthereumClientConfigurationFilename
       ),
-      ethereumTransactionPolicy = AnvilEthereumTransactionPolicy.create(
-        EthereumClientId,
-        AnvilProcess.DefaultChainId
-      )
+      ethereumClientConfiguration = EthereumClientConfiguration.create({
+        clientId: EthereumClientId,
+        signatureProviderId: EthereumSignatureProviderId,
+        rpcUrl: networkFromConfig(ctx.config).ethereumRpcUrl,
+        chainId: AnvilProcess.DefaultChainId
+      })
     Fs.writeFileSync(
-      ethereumTransactionPolicyFile,
-      JSON.stringify(ethereumTransactionPolicy, null, 2)
+      ethereumClientConfigurationFile,
+      JSON.stringify(ethereumClientConfiguration, null, 2)
     )
 
     ctx.outputs.set(OperatorDaemonArtifactsKey, {
       ethereumAbiFiles,
       ethereumAddresses,
-      ethereumTransactionPolicyFile,
+      ethereumClientConfigurationFile,
       solanaProgramId,
       solanaIdlFile
     })
@@ -287,10 +289,10 @@ export namespace OperatorDaemonTool {
     StepExtraRecorder.record({
       client: "harness",
       kind: "artifact",
-      text: "address-embedded ETH ABIs + SEC-131 Anvil policy + liqsol_core IDL prepared for the operator daemons",
+      text: "address-embedded ETH ABIs + unified Ethereum client config + liqsol_core IDL prepared for the operator daemons",
       ethereumAbiFiles,
       ethereumAddresses,
-      ethereumTransactionPolicyFile,
+      ethereumClientConfigurationFile,
       solanaProgramId,
       solanaIdlFile
     })
@@ -315,13 +317,13 @@ export namespace OperatorDaemonTool {
     )
   }
 
-  /** The outpost signature-provider + client specs shared by both daemon types. */
+  /** The outpost signature-provider + client configuration shared by both daemon types. */
   function outpostClientArgs(
     operator: OperatorAccount,
     artifacts: OperatorDaemonArtifacts,
     network: OperatorDaemonNetwork
   ): string[] {
-    const ethereumProvider = `eth-${operator.account}`,
+    const ethereumProvider = EthereumSignatureProviderId,
       solanaProvider = `sol-${operator.account}`
     return [
       ...pair(
@@ -329,17 +331,8 @@ export namespace OperatorDaemonTool {
         KeyGenerator.toSignatureProvider(operator.ethereum, ethereumProvider)
       ),
       ...pair(
-        "--outpost-ethereum-client",
-        [
-          EthereumClientId,
-          ethereumProvider,
-          network.ethereumRpcUrl,
-          String(network.ethereumChainId)
-        ].join(",")
-      ),
-      ...pair(
-        "--outpost-ethereum-transaction-policy-file",
-        artifacts.ethereumTransactionPolicyFile
+        "--outpost-ethereum-client-config-file",
+        artifacts.ethereumClientConfigurationFile
       ),
       ...artifacts.ethereumAbiFiles.flatMap(file =>
         pair("--ethereum-abi-file", file)
@@ -389,7 +382,7 @@ export namespace OperatorDaemonTool {
       // Per-chain outpost bindings (repeatable CSV specs; replaced the removed
       // --batch-eth-{client-id,opp-addr,opp-inbound-addr} / --batch-sol-program-id —
       // the EVM RPC client is auto-selected by matching the chains row's
-      // external_chain_id against the --outpost-ethereum-client chain ids):
+      // external_chain_id against the configured Ethereum client chain ids):
       //   EVM: <chain_code>,<opp_addr>,<opp_inbound_addr>
       //   SVM: <chain_code>,<opp_outpost_program_id>
       ...pair(
diff --git a/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts b/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
index 0395e101..52d94986 100644
--- a/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
+++ b/packages/cluster-tool/tests/orchestration/steps/processes/NodeopProcessSteps.test.ts
@@ -17,7 +17,8 @@ import { ethereumKeyPairFromWallet } from "@wireio/cluster-tool/utils"
 import { fixtureContext } from "../../../config/clusterBuildContextFixture.js"
 
 /** anvil's deterministic mnemonic — HD-derived wallets are stable + well-known. */
-const AnvilMnemonic = "test test test test test test test test test test test junk"
+const AnvilMnemonic =
+  "test test test test test test test test test test test junk"
 
 /**
  * A fully-keyed OperatorAccount fixture for the given account/type — REAL
@@ -33,7 +34,11 @@ function operatorAccount(account: string, type: OperatorType): OperatorAccount {
   return {
     account,
     type,
-    wire: { type: KeyType.K1, publicKey: `PUB_K1_${account}`, privateKey: `PVT_K1_${account}` },
+    wire: {
+      type: KeyType.K1,
+      publicKey: `PUB_K1_${account}`,
+      privateKey: `PVT_K1_${account}`
+    },
     ethereum: ethereumKeyPairFromWallet(wallet),
     solana: {
       type: KeyType.ED,
@@ -52,7 +57,7 @@ const artifactsFixture: OperatorDaemonArtifacts = {
     OperatorRegistry: "0x3333333333333333333333333333333333333333",
     ReserveManager: "0x4444444444444444444444444444444444444444"
   },
-  ethereumTransactionPolicyFile: "/cluster/data/ethereum-transaction-policy.json",
+  ethereumClientConfigurationFile: "/cluster/data/ethereum-client.json",
   solanaProgramId: "GrqvbZLCLkfeSQqvE7rL8XKHVWjNhAG2faLsY8yr9tD5",
   solanaIdlFile: "/cluster/data/solana-idls/liqsol_core.json"
 }
@@ -132,7 +137,10 @@ describe("Steps.processes.nodeop", () => {
       expect(recoverySpy).toHaveBeenCalledWith(
         ctx.processManager,
         expect.objectContaining({
-          node: expect.objectContaining({ name: bios.name, role: NodeRole.bios })
+          node: expect.objectContaining({
+            name: bios.name,
+            role: NodeRole.bios
+          })
         })
       )
     } finally {
@@ -156,7 +164,11 @@ describe("Steps.processes.nodeop", () => {
       ctx.keyStore.pushNodes({
         index: 1,
         keys: {
-          k1: { type: KeyType.K1, publicKey: "PUB_K1_node1", privateKey: "PVT_K1_node1" },
+          k1: {
+            type: KeyType.K1,
+            publicKey: "PUB_K1_node1",
+            privateKey: "PVT_K1_node1"
+          },
           bls: {
             type: KeyType.BLS,
             publicKey: "PUB_BLS_node1",
@@ -165,7 +177,9 @@ describe("Steps.processes.nodeop", () => {
           }
         }
       })
-      const node = testNode(ctx, NodeRole.producer, 1, "node_01", ["defproducera"])
+      const node = testNode(ctx, NodeRole.producer, 1, "node_01", [
+        "defproducera"
+      ])
       const operator = Steps.processes.nodeop.resolveOperator(ctx, node)
       expect(operator.account).toBe("defproducera")
       expect(operator.type).toBe(OperatorType.PRODUCER)
@@ -177,16 +191,38 @@ describe("Steps.processes.nodeop", () => {
       const ctx = fixtureContext()
       const provisioned = operatorAccount("batchopaaaa", OperatorType.BATCH)
       ctx.keyStore.setOperator(provisioned)
-      const node = testNode(ctx, NodeRole.operator, 2, "node_02", [], "batchopaaaa")
-      expect(Steps.processes.nodeop.resolveOperator(ctx, node)).toBe(provisioned)
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        2,
+        "node_02",
+        [],
+        "batchopaaaa"
+      )
+      expect(Steps.processes.nodeop.resolveOperator(ctx, node)).toBe(
+        provisioned
+      )
     })
 
     it("operator node (underwriter) resolves the provisioned account from ctx.keyStore", () => {
       const ctx = fixtureContext()
-      const provisioned = operatorAccount("underwriteraaaa", OperatorType.UNDERWRITER)
+      const provisioned = operatorAccount(
+        "underwriteraaaa",
+        OperatorType.UNDERWRITER
+      )
       ctx.keyStore.setOperator(provisioned)
-      const node = testNode(ctx, NodeRole.operator, 3, "node_03", [], null, "underwriteraaaa")
-      expect(Steps.processes.nodeop.resolveOperator(ctx, node)).toBe(provisioned)
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        3,
+        "node_03",
+        [],
+        null,
+        "underwriteraaaa"
+      )
+      expect(Steps.processes.nodeop.resolveOperator(ctx, node)).toBe(
+        provisioned
+      )
     })
 
     it("throws when an operator node names no batch/underwriter account", () => {
@@ -199,7 +235,14 @@ describe("Steps.processes.nodeop", () => {
 
     it("throws when the named operator account has not been provisioned in ctx.keyStore", () => {
       const ctx = fixtureContext()
-      const node = testNode(ctx, NodeRole.operator, 5, "node_05", [], "unprovisioned")
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        5,
+        "node_05",
+        [],
+        "unprovisioned"
+      )
       expect(() => Steps.processes.nodeop.resolveOperator(ctx, node)).toThrow(
         /has not been provisioned/
       )
@@ -221,7 +264,9 @@ describe("Steps.processes.nodeop", () => {
 
     it("returns [] for a producer node", () => {
       const ctx = fixtureContext()
-      const node = testNode(ctx, NodeRole.producer, 1, "node_01", ["defproducera"])
+      const node = testNode(ctx, NodeRole.producer, 1, "node_01", [
+        "defproducera"
+      ])
       expect(
         Steps.processes.nodeop.resolveOperatorDaemonArgs(
           ctx,
@@ -235,16 +280,27 @@ describe("Steps.processes.nodeop", () => {
       const ctx = fixtureContext()
       ctx.outputs.set(OperatorDaemonArtifactsKey, artifactsFixture)
       const account = operatorAccount("batchopaaaa", OperatorType.BATCH)
-      const node = testNode(ctx, NodeRole.operator, 2, "node_02", [], "batchopaaaa")
-      const args = Steps.processes.nodeop.resolveOperatorDaemonArgs(ctx, node, account)
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        2,
+        "node_02",
+        [],
+        "batchopaaaa"
+      )
+      const args = Steps.processes.nodeop.resolveOperatorDaemonArgs(
+        ctx,
+        node,
+        account
+      )
       expect(args).toEqual(
         expect.arrayContaining([
           "--batch-enabled",
           "true",
           "--batch-operator-account",
           "batchopaaaa",
-          "--outpost-ethereum-transaction-policy-file",
-          artifactsFixture.ethereumTransactionPolicyFile
+          "--outpost-ethereum-client-config-file",
+          artifactsFixture.ethereumClientConfigurationFile
         ])
       )
     })
@@ -252,17 +308,32 @@ describe("Steps.processes.nodeop", () => {
     it("builds underwriter daemon args for an operator node with an underwriterAccount", () => {
       const ctx = fixtureContext()
       ctx.outputs.set(OperatorDaemonArtifactsKey, artifactsFixture)
-      const account = operatorAccount("underwriteraaaa", OperatorType.UNDERWRITER)
-      const node = testNode(ctx, NodeRole.operator, 3, "node_03", [], null, "underwriteraaaa")
-      const args = Steps.processes.nodeop.resolveOperatorDaemonArgs(ctx, node, account)
+      const account = operatorAccount(
+        "underwriteraaaa",
+        OperatorType.UNDERWRITER
+      )
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        3,
+        "node_03",
+        [],
+        null,
+        "underwriteraaaa"
+      )
+      const args = Steps.processes.nodeop.resolveOperatorDaemonArgs(
+        ctx,
+        node,
+        account
+      )
       expect(args).toEqual(
         expect.arrayContaining([
           "--underwriter-enabled",
           "true",
           "--underwriter-account",
           "underwriteraaaa",
-          "--outpost-ethereum-transaction-policy-file",
-          artifactsFixture.ethereumTransactionPolicyFile
+          "--outpost-ethereum-client-config-file",
+          artifactsFixture.ethereumClientConfigurationFile
         ])
       )
     })
@@ -270,7 +341,14 @@ describe("Steps.processes.nodeop", () => {
     it("throws when the operator daemon artifacts have not been prepared yet", () => {
       const ctx = fixtureContext()
       const account = operatorAccount("batchopbbbb", OperatorType.BATCH)
-      const node = testNode(ctx, NodeRole.operator, 4, "node_04", [], "batchopbbbb")
+      const node = testNode(
+        ctx,
+        NodeRole.operator,
+        4,
+        "node_04",
+        [],
+        "batchopbbbb"
+      )
       expect(() =>
         Steps.processes.nodeop.resolveOperatorDaemonArgs(ctx, node, account)
       ).toThrow(/Missing asserted output/)
diff --git a/packages/cluster-tool/tests/tools/ethereum/EthereumClientConfiguration.test.ts b/packages/cluster-tool/tests/tools/ethereum/EthereumClientConfiguration.test.ts
new file mode 100644
index 00000000..3bf2d28c
--- /dev/null
+++ b/packages/cluster-tool/tests/tools/ethereum/EthereumClientConfiguration.test.ts
@@ -0,0 +1,137 @@
+import {
+  EthereumClientConfiguration,
+  type EthereumClientConfigurationFile,
+  type EthereumTransactionPolicy
+} from "@wireio/cluster-tool/tools/ethereum"
+
+const BaseOptions: EthereumClientConfiguration.CreateOptions = {
+  clientId: "eth-default",
+  signatureProviderId: "eth-batchopaaaa",
+  rpcUrl: "http://127.0.0.1:8545",
+  chainId: 31_337
+}
+
+const FinitePolicy: EthereumTransactionPolicy = {
+  max_priority_fee_per_gas_wei: "2000000000",
+  max_fee_per_gas_wei: "100000000000",
+  max_gas_limit: "2000000",
+  max_total_native_cost_wei: "250000000000000000"
+}
+
+function fileWith(
+  changes: Partial<EthereumClientConfigurationFile["clients"][number]>
+): EthereumClientConfigurationFile {
+  const file = EthereumClientConfiguration.create(BaseOptions)
+  return { ...file, clients: [{ ...file.clients[0], ...changes }] }
+}
+
+describe("EthereumClientConfiguration", () => {
+  it("creates the unified schema without a policy so nodeop applies permissive defaults", () => {
+    expect(EthereumClientConfiguration.create(BaseOptions)).toEqual({
+      version: 1,
+      clients: [
+        {
+          client_id: "eth-default",
+          signature_provider_id: "eth-batchopaaaa",
+          rpc_url: "http://127.0.0.1:8545",
+          chain_id: "31337"
+        }
+      ]
+    })
+  })
+
+  it("includes and validates an explicitly requested finite policy", () => {
+    expect(
+      EthereumClientConfiguration.create({
+        ...BaseOptions,
+        transactionPolicy: FinitePolicy
+      }).clients[0].transaction_policy
+    ).toEqual(FinitePolicy)
+  })
+
+  it("accepts identifier boundaries and rejects unsafe client ids", () => {
+    expect(
+      EthereumClientConfiguration.create({
+        ...BaseOptions,
+        clientId: "a".repeat(64)
+      }).clients[0].client_id
+    ).toHaveLength(64)
+    expect(() =>
+      EthereumClientConfiguration.create({ ...BaseOptions, clientId: "" })
+    ).toThrow(/client_id must be 1-64 ASCII/)
+    expect(() =>
+      EthereumClientConfiguration.create({ ...BaseOptions, clientId: "bad,id" })
+    ).toThrow(/client_id must be 1-64 ASCII/)
+  })
+
+  it("rejects missing providers, unsupported URLs, and non-uint32 chain ids", () => {
+    expect(() =>
+      EthereumClientConfiguration.create({
+        ...BaseOptions,
+        signatureProviderId: ""
+      })
+    ).toThrow(/signature_provider_id must not be empty/)
+    expect(() =>
+      EthereumClientConfiguration.create({
+        ...BaseOptions,
+        rpcUrl: "ws://127.0.0.1:8545"
+      })
+    ).toThrow(/rpc_url must use http or https/)
+    expect(() =>
+      EthereumClientConfiguration.create({ ...BaseOptions, chainId: 2 ** 32 })
+    ).toThrow(/chain_id exceeds its supported domain/)
+  })
+
+  it("rejects non-canonical, overflowing, and inconsistent finite policies", () => {
+    expect(() =>
+      EthereumClientConfiguration.assertValid(
+        fileWith({
+          transaction_policy: { ...FinitePolicy, max_gas_limit: "02000000" }
+        })
+      )
+    ).toThrow(/max_gas_limit must be a canonical positive decimal string/)
+    expect(() =>
+      EthereumClientConfiguration.assertValid(
+        fileWith({
+          transaction_policy: {
+            ...FinitePolicy,
+            max_gas_limit: (1n << 256n).toString()
+          }
+        })
+      )
+    ).toThrow(/max_gas_limit exceeds its supported domain/)
+    expect(() =>
+      EthereumClientConfiguration.assertValid(
+        fileWith({
+          transaction_policy: {
+            ...FinitePolicy,
+            max_priority_fee_per_gas_wei: "100000000001"
+          }
+        })
+      )
+    ).toThrow(/priority-fee cap must not exceed maximum-fee cap/)
+  })
+
+  it("accepts an independent total-cost cap below the gas and fee caps' product", () => {
+    expect(() =>
+      EthereumClientConfiguration.assertValid(
+        fileWith({
+          transaction_policy: {
+            ...FinitePolicy,
+            max_total_native_cost_wei: "1"
+          }
+        })
+      )
+    ).not.toThrow()
+  })
+
+  it("rejects a wrong schema version or client count", () => {
+    const file = EthereumClientConfiguration.create(BaseOptions)
+    expect(() =>
+      EthereumClientConfiguration.assertValid({ ...file, version: 2 })
+    ).toThrow(/version must be 1/)
+    expect(() =>
+      EthereumClientConfiguration.assertValid({ ...file, clients: [] })
+    ).toThrow(/must contain exactly one client/)
+  })
+})
diff --git a/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts b/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts
deleted file mode 100644
index 862b9a51..00000000
--- a/packages/cluster-tool/tests/tools/ethereum/EthereumTransactionPolicy.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import {
-  AnvilEthereumTransactionPolicy,
-  type EthereumTransactionPolicy,
-  type EthereumTransactionPolicyFile
-} from "@wireio/cluster-tool/tools/ethereum"
-
-const ClientId = "eth-default",
-  ChainId = 31_337
-
-/** A valid generated file with one policy field replaced for rejection tests. */
-function policyFileWith(
-  changes: Partial<EthereumTransactionPolicy>
-): EthereumTransactionPolicyFile {
-  const file = AnvilEthereumTransactionPolicy.create(ClientId, ChainId)
-  return {
-    ...file,
-    policies: [{ ...file.policies[0], ...changes }]
-  }
-}
-
-describe("AnvilEthereumTransactionPolicy", () => {
-  it("defines every finite Anvil limit exactly in canonical decimal form", () => {
-    expect(AnvilEthereumTransactionPolicy.SchemaVersion).toBe(1)
-    expect(
-      AnvilEthereumTransactionPolicy.MaximumPriorityFeePerGasWei.toString()
-    ).toBe("2000000000")
-    expect(AnvilEthereumTransactionPolicy.MaximumFeePerGasWei.toString()).toBe(
-      "100000000000"
-    )
-    expect(AnvilEthereumTransactionPolicy.MaximumGasLimit.toString()).toBe(
-      "2000000"
-    )
-    expect(
-      AnvilEthereumTransactionPolicy.MaximumTotalNativeCostWei.toString()
-    ).toBe("250000000000000000")
-  })
-
-  it("creates the exact SEC-131 single-client JSON schema", () => {
-    expect(AnvilEthereumTransactionPolicy.create(ClientId, ChainId)).toEqual({
-      version: 1,
-      policies: [
-        {
-          client_id: "eth-default",
-          chain_id: "31337",
-          max_priority_fee_per_gas_wei: "2000000000",
-          max_fee_per_gas_wei: "100000000000",
-          max_gas_limit: "2000000",
-          max_total_native_cost_wei: "250000000000000000"
-        }
-      ]
-    })
-  })
-
-  it("keeps fee and full maximum-cost relationships valid", () => {
-    expect(
-      AnvilEthereumTransactionPolicy.MaximumPriorityFeePerGasWei
-    ).toBeLessThanOrEqual(AnvilEthereumTransactionPolicy.MaximumFeePerGasWei)
-    expect(
-      AnvilEthereumTransactionPolicy.MaximumTotalNativeCostWei
-    ).toBeGreaterThanOrEqual(
-      AnvilEthereumTransactionPolicy.MaximumGasLimit *
-        AnvilEthereumTransactionPolicy.MaximumFeePerGasWei
-    )
-  })
-
-  it("accepts the SEC-131 client-id boundary and rejects unsafe identifiers", () => {
-    expect(
-      AnvilEthereumTransactionPolicy.create("a".repeat(64), ChainId).policies[0]
-        .client_id
-    ).toHaveLength(64)
-    expect(() => AnvilEthereumTransactionPolicy.create("", ChainId)).toThrow(
-      /client_id must be 1-64 ASCII/
-    )
-    expect(() =>
-      AnvilEthereumTransactionPolicy.create("bad,id", ChainId)
-    ).toThrow(/client_id must be 1-64 ASCII/)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.create("a".repeat(65), ChainId)
-    ).toThrow(/client_id must be 1-64 ASCII/)
-  })
-
-  it("rejects a non-uint32 chain id", () => {
-    expect(() =>
-      AnvilEthereumTransactionPolicy.create(ClientId, 2 ** 32)
-    ).toThrow(/chain_id must fit uint32/)
-  })
-
-  it("rejects non-canonical, zero, and uint256-overflowing fields", () => {
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid(
-        policyFileWith({ max_gas_limit: "02000000" })
-      )
-    ).toThrow(/max_gas_limit must be a canonical positive decimal string/)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid(
-        policyFileWith({ max_gas_limit: "0" })
-      )
-    ).toThrow(/max_gas_limit must be a canonical positive decimal string/)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid(
-        policyFileWith({ max_gas_limit: (1n << 256n).toString() })
-      )
-    ).toThrow(/max_gas_limit must fit uint256/)
-  })
-
-  it("rejects inconsistent fee and total-cost relationships", () => {
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid(
-        policyFileWith({
-          max_priority_fee_per_gas_wei: "100000000001"
-        })
-      )
-    ).toThrow(/priority-fee cap must not exceed maximum-fee cap/)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid(
-        policyFileWith({ max_total_native_cost_wei: "199999999999999999" })
-      )
-    ).toThrow(/total-cost cap must cover gas-limit × maximum-fee caps/)
-  })
-
-  it("rejects a wrong schema version or policy count", () => {
-    const file = AnvilEthereumTransactionPolicy.create(ClientId, ChainId)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid({ ...file, version: 2 })
-    ).toThrow(/version must be 1/)
-    expect(() =>
-      AnvilEthereumTransactionPolicy.assertValid({ ...file, policies: [] })
-    ).toThrow(/must contain exactly one client policy/)
-  })
-})
diff --git a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
index 7ab474e8..fc24152f 100644
--- a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
+++ b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
@@ -9,7 +9,6 @@ import {
   NodeopProcess,
   ProcessManager
 } from "@wireio/cluster-tool/cluster/processes"
-import { AnvilEthereumTransactionPolicy } from "@wireio/cluster-tool/tools/ethereum"
 import { OperatorDaemonTool } from "@wireio/cluster-tool/tools/wire"
 import { SolanaOutpostProgramTool } from "@wireio/cluster-tool/tools/solana"
 import {
@@ -21,7 +20,8 @@ import { fixtureContext } from "../../config/clusterBuildContextFixture.js"
 import { ethereumKeyPairFromWallet } from "@wireio/cluster-tool/utils"
 
 /** anvil's deterministic mnemonic — HD-derived wallets are stable + well-known. */
-const AnvilMnemonic = "test test test test test test test test test test test junk"
+const AnvilMnemonic =
+  "test test test test test test test test test test test junk"
 
 function operatorAccount(account: string, type: OperatorType): OperatorAccount {
   const wallet = ethers.HDNodeWallet.fromMnemonic(
@@ -32,7 +32,11 @@ function operatorAccount(account: string, type: OperatorType): OperatorAccount {
   return {
     account,
     type,
-    wire: { type: KeyType.K1, publicKey: `PUB_K1_${account}`, privateKey: `PVT_K1_${account}` },
+    wire: {
+      type: KeyType.K1,
+      publicKey: `PUB_K1_${account}`,
+      privateKey: `PVT_K1_${account}`
+    },
     ethereum: ethereumKeyPairFromWallet(wallet),
     solana: {
       type: KeyType.ED,
@@ -43,14 +47,17 @@ function operatorAccount(account: string, type: OperatorType): OperatorAccount {
 }
 
 const artifacts: OperatorDaemonArtifacts = {
-  ethereumAbiFiles: ["/cluster/data/eth-abis/OPP.json", "/cluster/data/eth-abis/OPPInbound.json"],
+  ethereumAbiFiles: [
+    "/cluster/data/eth-abis/OPP.json",
+    "/cluster/data/eth-abis/OPPInbound.json"
+  ],
   ethereumAddresses: {
     OPP: "0x1111111111111111111111111111111111111111",
     OPPInbound: "0x2222222222222222222222222222222222222222",
     OperatorRegistry: "0x3333333333333333333333333333333333333333",
     ReserveManager: "0x4444444444444444444444444444444444444444"
   },
-  ethereumTransactionPolicyFile: "/cluster/data/ethereum-transaction-policy.json",
+  ethereumClientConfigurationFile: "/cluster/data/ethereum-client.json",
   solanaProgramId: "GrqvbZLCLkfeSQqvE7rL8XKHVWjNhAG2faLsY8yr9tD5",
   solanaIdlFile: "/cluster/data/solana-idls/liqsol_core.json"
 }
@@ -83,7 +90,10 @@ describe("OperatorDaemonTool", () => {
       try {
         await OperatorDaemonTool.runDaemonStart(
           ctx,
-          { kind: "OperatorDaemonTool.StartDaemonInput", account: "batchopbbbb" },
+          {
+            kind: "OperatorDaemonTool.StartDaemonInput",
+            account: "batchopbbbb"
+          },
           new AbortController().signal
         )
         // A flow rerun reuses the daemon's data dir, so this launch must go
@@ -94,8 +104,8 @@ describe("OperatorDaemonTool", () => {
             operator,
             extraArgs: expect.arrayContaining([
               "--batch-enabled",
-              "--outpost-ethereum-transaction-policy-file",
-              artifacts.ethereumTransactionPolicyFile
+              "--outpost-ethereum-client-config-file",
+              artifacts.ethereumClientConfigurationFile
             ])
           })
         )
@@ -107,11 +117,17 @@ describe("OperatorDaemonTool", () => {
 
   describe("batchOperatorArgs", () => {
     const operator = operatorAccount("batchopaaaa", OperatorType.BATCH)
-    const args = OperatorDaemonTool.batchOperatorArgs(operator, artifacts, network)
+    const args = OperatorDaemonTool.batchOperatorArgs(
+      operator,
+      artifacts,
+      network
+    )
 
     it("loads the batch plugin set at irreversible read-mode", () => {
       expect(valuesOf(args, "--read-mode")).toEqual(["irreversible"])
-      expect(valuesOf(args, "--plugin")).toEqual([...OperatorDaemonTool.BatchOperatorPlugins])
+      expect(valuesOf(args, "--plugin")).toEqual([
+        ...OperatorDaemonTool.BatchOperatorPlugins
+      ])
     })
 
     it("signs WIRE with the operator's OWN unique wire key (account active)", () => {
@@ -121,28 +137,40 @@ describe("OperatorDaemonTool", () => {
       )
       // + the ETH and SOL outpost providers, named per-operator
       expect(providers.length).toBe(3)
-      expect(providers[1]).toMatch(/^eth-batchopaaaa,ethereum,ethereum,0x[0-9a-fA-F]{128},KEY:0x/)
+      expect(providers[1]).toMatch(
+        /^eth-default,ethereum,ethereum,0x[0-9a-fA-F]{128},KEY:0x/
+      )
       expect(providers[2]).toMatch(/^sol-batchopaaaa,solana,solana,/)
     })
 
     it("configures the batch plugin + both outpost clients + artifacts", () => {
       expect(valuesOf(args, "--batch-enabled")).toEqual(["true"])
-      expect(valuesOf(args, "--batch-operator-account")).toEqual(["batchopaaaa"])
-      expect(valuesOf(args, "--batch-epoch-poll-ms")).toEqual([String(OperatorDaemonTool.BatchEpochPollMs)])
-      expect(valuesOf(args, "--batch-delivery-timeout-ms")).toEqual([String(OperatorDaemonTool.BatchDeliveryTimeoutMs)])
-      expect(valuesOf(args, "--ext-debugging-server")).toEqual([network.debuggingServerUrl])
-      expect(valuesOf(args, "--outpost-ethereum-client")).toEqual([
-        `eth-default,eth-batchopaaaa,${network.ethereumRpcUrl},31337`
+      expect(valuesOf(args, "--batch-operator-account")).toEqual([
+        "batchopaaaa"
+      ])
+      expect(valuesOf(args, "--batch-epoch-poll-ms")).toEqual([
+        String(OperatorDaemonTool.BatchEpochPollMs)
+      ])
+      expect(valuesOf(args, "--batch-delivery-timeout-ms")).toEqual([
+        String(OperatorDaemonTool.BatchDeliveryTimeoutMs)
+      ])
+      expect(valuesOf(args, "--ext-debugging-server")).toEqual([
+        network.debuggingServerUrl
       ])
-      expect(valuesOf(args, "--outpost-ethereum-transaction-policy-file")).toEqual([
-        artifacts.ethereumTransactionPolicyFile
+      expect(valuesOf(args, "--outpost-ethereum-client")).toEqual([])
+      expect(valuesOf(args, "--outpost-ethereum-client-config-file")).toEqual([
+        artifacts.ethereumClientConfigurationFile
       ])
       expect(valuesOf(args, "--outpost-solana-client")).toEqual([
         `sol-default,sol-batchopaaaa,${network.solanaRpcUrl}`
       ])
-      expect(valuesOf(args, "--ethereum-abi-file")).toEqual(artifacts.ethereumAbiFiles)
+      expect(valuesOf(args, "--ethereum-abi-file")).toEqual(
+        artifacts.ethereumAbiFiles
+      )
       expect(valuesOf(args, "--batch-sol-client-id")).toEqual(["sol-default"])
-      expect(valuesOf(args, "--solana-idl-file")).toEqual([artifacts.solanaIdlFile])
+      expect(valuesOf(args, "--solana-idl-file")).toEqual([
+        artifacts.solanaIdlFile
+      ])
       // The cleanroom hosts the outpost interface in liqsol_core — nodeop's
       // IDL-name gate must be pointed at it.
       expect(valuesOf(args, "--solana-outpost-program-name")).toEqual([
@@ -157,7 +185,10 @@ describe("OperatorDaemonTool", () => {
           artifacts.ethereumAddresses.OPP,
           artifacts.ethereumAddresses.OPPInbound
         ].join(","),
-        [OperatorDaemonTool.SolanaChainCodename, artifacts.solanaProgramId].join(",")
+        [
+          OperatorDaemonTool.SolanaChainCodename,
+          artifacts.solanaProgramId
+        ].join(",")
       ])
     })
 
@@ -181,12 +212,20 @@ describe("OperatorDaemonTool", () => {
 
   describe("underwriterArgs", () => {
     const operator = operatorAccount("uwritaaaaaa", OperatorType.UNDERWRITER)
-    const args = OperatorDaemonTool.underwriterArgs(operator, artifacts, network)
+    const args = OperatorDaemonTool.underwriterArgs(
+      operator,
+      artifacts,
+      network
+    )
 
     it("passes the SCALED action timeout (flow timing scale reaches the daemon)", () => {
       process.env.WIRE_FLOW_TIMEOUT_SCALE = "4"
       try {
-        const scaled = OperatorDaemonTool.underwriterArgs(operator, artifacts, network)
+        const scaled = OperatorDaemonTool.underwriterArgs(
+          operator,
+          artifacts,
+          network
+        )
         expect(valuesOf(scaled, "--underwriter-action-timeout-ms")).toEqual([
           String(OperatorDaemonTool.UnderwriterActionTimeoutMs * 4)
         ])
@@ -196,31 +235,41 @@ describe("OperatorDaemonTool", () => {
     })
 
     it("loads the underwriter plugin set + source-deposit verification targets", () => {
-      expect(valuesOf(args, "--plugin")).toEqual([...OperatorDaemonTool.UnderwriterPlugins])
+      expect(valuesOf(args, "--plugin")).toEqual([
+        ...OperatorDaemonTool.UnderwriterPlugins
+      ])
       expect(valuesOf(args, "--underwriter-enabled")).toEqual(["true"])
       expect(valuesOf(args, "--underwriter-account")).toEqual(["uwritaaaaaa"])
-      expect(valuesOf(args, "--underwriter-eth-source-deposit-function")).toEqual(["requestSwap"])
-      expect(valuesOf(args, "--underwriter-sol-source-deposit-instruction")).toEqual(["request_swap"])
-      expect(valuesOf(args, "--solana-idl-file")).toEqual([artifacts.solanaIdlFile])
+      expect(
+        valuesOf(args, "--underwriter-eth-source-deposit-function")
+      ).toEqual(["requestSwap"])
+      expect(
+        valuesOf(args, "--underwriter-sol-source-deposit-instruction")
+      ).toEqual(["request_swap"])
+      expect(valuesOf(args, "--solana-idl-file")).toEqual([
+        artifacts.solanaIdlFile
+      ])
       expect(valuesOf(args, "--solana-outpost-program-name")).toEqual([
         SolanaOutpostProgramTool.ProgramName
       ])
-      expect(valuesOf(args, "--outpost-ethereum-transaction-policy-file")).toEqual([
-        artifacts.ethereumTransactionPolicyFile
-      ])
+      expect(
+        valuesOf(args, "--outpost-ethereum-client-config-file")
+      ).toHaveLength(1)
     })
 
-    it("keeps signer ids distinct while every operator references the same policy", () => {
+    it("reuses the shared config and process-local provider id across daemons", () => {
       const secondArgs = OperatorDaemonTool.underwriterArgs(
         operatorAccount("uwritbbbbbb", OperatorType.UNDERWRITER),
         artifacts,
         network
       )
-      expect(valuesOf(args, "--signature-provider")[1]).toMatch(/^eth-uwritaaaaaa,/)
-      expect(valuesOf(secondArgs, "--signature-provider")[1]).toMatch(/^eth-uwritbbbbbb,/)
-      expect(valuesOf(secondArgs, "--outpost-ethereum-transaction-policy-file")).toEqual(
-        valuesOf(args, "--outpost-ethereum-transaction-policy-file")
+      expect(valuesOf(args, "--signature-provider")[1]).toMatch(/^eth-default,/)
+      expect(valuesOf(secondArgs, "--signature-provider")[1]).toMatch(
+        /^eth-default,/
       )
+      expect(
+        valuesOf(secondArgs, "--outpost-ethereum-client-config-file")
+      ).toEqual(valuesOf(args, "--outpost-ethereum-client-config-file"))
     })
 
     it("wires each outpost with one consolidated per-chain CSV spec", () => {
@@ -263,7 +312,13 @@ describe("OperatorDaemonTool", () => {
         Path.join(ethereumDeploymentsPath, "outpost-addrs.json"),
         JSON.stringify({ OPP: "0xaaa0000000000000000000000000000000000aaa" })
       )
-      const oppArtifactDir = Path.join(ethereumPath, "artifacts", "contracts", "outpost", "OPP.sol")
+      const oppArtifactDir = Path.join(
+        ethereumPath,
+        "artifacts",
+        "contracts",
+        "outpost",
+        "OPP.sol"
+      )
       Fs.mkdirSync(oppArtifactDir, { recursive: true })
       Fs.writeFileSync(
         Path.join(oppArtifactDir, "OPP.json"),
@@ -283,7 +338,9 @@ describe("OperatorDaemonTool", () => {
         Path.join(solanaPath, "target", "idl", "liqsol_core.json"),
         JSON.stringify({
           metadata: { name: "liqsol_core" },
-          instructions: OperatorDaemonTool.RequiredSolanaIdlInstructions.map(name => ({ name }))
+          instructions: OperatorDaemonTool.RequiredSolanaIdlInstructions.map(
+            name => ({ name })
+          )
         })
       )
 
@@ -296,47 +353,69 @@ describe("OperatorDaemonTool", () => {
         ethereumPath,
         solanaPath
       })
-      await OperatorDaemonTool.runArtifactPreparation(ctx, null, new AbortController().signal)
+      await OperatorDaemonTool.runArtifactPreparation(
+        ctx,
+        null,
+        new AbortController().signal
+      )
 
       const prepared = ctx.outputs.assert(OperatorDaemonArtifactsKey)
       expect(prepared.solanaProgramId).toBe(programKeypair.publicKey.toBase58())
       expect(Fs.existsSync(prepared.solanaIdlFile)).toBe(true)
       // Verbatim copy under the liqsol_core filename — metadata.name is NOT
       // rewritten (nodeop is pointed at it via --solana-outpost-program-name).
-      expect(Path.basename(prepared.solanaIdlFile)).toBe(OperatorDaemonTool.SolanaIdlFilename)
-      const copiedIdl = JSON.parse(Fs.readFileSync(prepared.solanaIdlFile, "utf-8"))
+      expect(Path.basename(prepared.solanaIdlFile)).toBe(
+        OperatorDaemonTool.SolanaIdlFilename
+      )
+      const copiedIdl = JSON.parse(
+        Fs.readFileSync(prepared.solanaIdlFile, "utf-8")
+      )
       expect(copiedIdl.metadata.name).toBe(SolanaOutpostProgramTool.ProgramName)
       expect(prepared.ethereumAbiFiles.length).toBe(1)
-      const abi = JSON.parse(Fs.readFileSync(prepared.ethereumAbiFiles[0], "utf-8"))
+      const abi = JSON.parse(
+        Fs.readFileSync(prepared.ethereumAbiFiles[0], "utf-8")
+      )
       expect(abi).toEqual({
         contractName: "OPP",
         address: "0xaaa0000000000000000000000000000000000aaa",
         abi: [{ type: "event", name: "OPPEnvelope" }]
       })
-      expect(Path.basename(prepared.ethereumTransactionPolicyFile)).toBe(
-        OperatorDaemonTool.EthereumTransactionPolicyFilename
+      expect(Path.basename(prepared.ethereumClientConfigurationFile)).toBe(
+        OperatorDaemonTool.EthereumClientConfigurationFilename
       )
-      expect(JSON.parse(Fs.readFileSync(prepared.ethereumTransactionPolicyFile, "utf-8"))).toEqual(
-        AnvilEthereumTransactionPolicy.create(
-          OperatorDaemonTool.EthereumClientId,
-          network.ethereumChainId
+      expect(
+        JSON.parse(
+          Fs.readFileSync(prepared.ethereumClientConfigurationFile, "utf-8")
         )
-      )
+      ).toEqual({
+        version: 1,
+        clients: [
+          {
+            client_id: "eth-default",
+            signature_provider_id: "eth-default",
+            rpc_url: OperatorDaemonTool.networkFromConfig(ctx.config)
+              .ethereumRpcUrl,
+            chain_id: "31337"
+          }
+        ]
+      })
 
-      // Saved-cluster `run` invokes the same preparation runner. A regenerated
-      // policy must overwrite stale disk content without a state migration.
-      Fs.writeFileSync(prepared.ethereumTransactionPolicyFile, JSON.stringify({ stale: true }))
+      // Saved-cluster `run` invokes the same preparation runner and overwrites
+      // stale content without a state migration.
+      Fs.writeFileSync(
+        prepared.ethereumClientConfigurationFile,
+        JSON.stringify({ stale: true })
+      )
       await OperatorDaemonTool.runArtifactPreparation(
         ctx,
         null,
         new AbortController().signal
       )
-      expect(JSON.parse(Fs.readFileSync(prepared.ethereumTransactionPolicyFile, "utf-8"))).toEqual(
-        AnvilEthereumTransactionPolicy.create(
-          OperatorDaemonTool.EthereumClientId,
-          network.ethereumChainId
-        )
-      )
+      expect(
+        JSON.parse(
+          Fs.readFileSync(prepared.ethereumClientConfigurationFile, "utf-8")
+        ).clients[0].signature_provider_id
+      ).toBe("eth-default")
     })
 
     it("rejects an IDL missing a daemon-invoked instruction (wrong/stale IDL guard)", async () => {
@@ -349,7 +428,13 @@ describe("OperatorDaemonTool", () => {
         Path.join(ethereumDeploymentsPath, "outpost-addrs.json"),
         JSON.stringify({ OPP: "0xaaa0000000000000000000000000000000000aaa" })
       )
-      const oppArtifactDir = Path.join(ethereumPath, "artifacts", "contracts", "outpost", "OPP.sol")
+      const oppArtifactDir = Path.join(
+        ethereumPath,
+        "artifacts",
+        "contracts",
+        "outpost",
+        "OPP.sol"
+      )
       Fs.mkdirSync(oppArtifactDir, { recursive: true })
       Fs.writeFileSync(
         Path.join(oppArtifactDir, "OPP.json"),
@@ -378,7 +463,11 @@ describe("OperatorDaemonTool", () => {
         solanaPath
       })
       await expect(
-        OperatorDaemonTool.runArtifactPreparation(ctx, null, new AbortController().signal)
+        OperatorDaemonTool.runArtifactPreparation(
+          ctx,
+          null,
+          new AbortController().signal
+        )
       ).rejects.toThrow(/missing the 'epoch_in' instruction/)
     })
   })

From 8494a588a77c96f50eb77593de41dca08339e37e Mon Sep 17 00:00:00 2001
From: Huang-Ming Huang <huangming.huang@gmail.com>
Date: Tue, 21 Jul 2026 21:41:11 +0000
Subject: [PATCH 3/3] Clarify operator provider identifiers

---
 .../cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
index fc24152f..414a99f4 100644
--- a/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
+++ b/packages/cluster-tool/tests/tools/wire/OperatorDaemonTool.test.ts
@@ -135,7 +135,7 @@ describe("OperatorDaemonTool", () => {
       expect(providers[0]).toBe(
         "wire-PUB_K1_batchopaaaa,wire,wire,PUB_K1_batchopaaaa,KEY:PVT_K1_batchopaaaa"
       )
-      // + the ETH and SOL outpost providers, named per-operator
+      // ETH uses a process-local stable id; SOL keeps its per-operator id.
       expect(providers.length).toBe(3)
       expect(providers[1]).toMatch(
         /^eth-default,ethereum,ethereum,0x[0-9a-fA-F]{128},KEY:0x/