ox 0.14.29 → 0.14.31

package/tempo/e2e.test.ts

@@ -14,7 +14,6 @@ import { chain, client, fundAddress, nodeEnv } from '../../test/tempo/config.js'
 import {
   AuthorizationTempo,
   KeyAuthorization,
-  MultisigConfig,
   Period,
   SignatureEnvelope,
 } from './index.js'
@@ -87,6 +86,7 @@ test('behavior: default (secp256k1)', async () => {
       from,
       keyAuthorization: __,
       nonce,
+      gasPrice,
       maxFeePerGas,
       maxPriorityFeePerGas,
       signature,
@@ -100,6 +100,7 @@ test('behavior: default (secp256k1)', async () => {
     expect(chainId).toBe(chainId)
     expect(hash).toBe(receipt.transactionHash)
     expect(from).toBe(address)
+    expect(gasPrice).toBeDefined()
     expect(maxFeePerGas).toBeDefined()
     expect(maxPriorityFeePerGas).toBeDefined()
     expect(nonce).toBeDefined()
@@ -119,7 +120,6 @@ test('behavior: default (secp256k1)', async () => {
         "data": undefined,
         "feePayerSignature": null,
         "gas": 500000n,
-        "gasPrice": 20000000000n,
         "nonceKey": 0n,
         "type": "tempo",
         "validAfter": null,
@@ -133,6 +133,7 @@ test('behavior: default (secp256k1)', async () => {
     blockNumber,
     blockHash,
     cumulativeGasUsed,
+    effectiveGasPrice,
     feePayer,
     feeToken: _,
     from,
@@ -147,6 +148,7 @@ test('behavior: default (secp256k1)', async () => {
   expect(blockNumber).toBeDefined()
   expect(blockHash).toBeDefined()
   expect(cumulativeGasUsed).toBeDefined()
+  expect(effectiveGasPrice).toBeDefined()
   expect(feePayer).toBeDefined()
   expect(from).toBe(address)
   expect(gasUsed).toBeDefined()
@@ -159,7 +161,6 @@ test('behavior: default (secp256k1)', async () => {
       "blobGasPrice": undefined,
       "blobGasUsed": undefined,
       "contractAddress": null,
-      "effectiveGasPrice": 20000000000n,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
       "type": "0x76",
@@ -298,6 +299,7 @@ test('behavior: default (p256)', async () => {
       keyAuthorization: __,
       hash,
       nonce,
+      gasPrice,
       maxFeePerGas,
       maxPriorityFeePerGas,
       signature,
@@ -312,6 +314,7 @@ test('behavior: default (p256)', async () => {
     expect(from).toBe(address)
     expect(hash).toBe(receipt.transactionHash)
     expect(nonce).toBeDefined()
+    expect(gasPrice).toBeDefined()
     expect(maxFeePerGas).toBeDefined()
     expect(maxPriorityFeePerGas).toBeDefined()
     expect(signature).toBeDefined()
@@ -330,7 +333,6 @@ test('behavior: default (p256)', async () => {
         "data": undefined,
         "feePayerSignature": null,
         "gas": 500000n,
-        "gasPrice": 20000000000n,
         "nonceKey": 0n,
         "type": "tempo",
         "validAfter": null,
@@ -344,6 +346,7 @@ test('behavior: default (p256)', async () => {
     blockNumber,
     blockHash,
     cumulativeGasUsed,
+    effectiveGasPrice,
     feePayer,
     feeToken: _,
     from,
@@ -358,6 +361,7 @@ test('behavior: default (p256)', async () => {
   expect(blockNumber).toBeDefined()
   expect(blockHash).toBeDefined()
   expect(cumulativeGasUsed).toBeDefined()
+  expect(effectiveGasPrice).toBeDefined()
   expect(feePayer).toBeDefined()
   expect(from).toBe(address)
   expect(gasUsed).toBeDefined()
@@ -370,7 +374,6 @@ test('behavior: default (p256)', async () => {
       "blobGasPrice": undefined,
       "blobGasUsed": undefined,
       "contractAddress": null,
-      "effectiveGasPrice": 20000000000n,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
       "type": "0x76",
@@ -441,6 +444,7 @@ test('behavior: default (p256 - webcrypto)', async () => {
       keyAuthorization: __,
       hash,
       nonce,
+      gasPrice,
       maxFeePerGas,
       maxPriorityFeePerGas,
       signature,
@@ -455,6 +459,7 @@ test('behavior: default (p256 - webcrypto)', async () => {
     expect(from).toBeDefined()
     expect(hash).toBe(receipt.transactionHash)
     expect(nonce).toBeDefined()
+    expect(gasPrice).toBeDefined()
     expect(maxFeePerGas).toBeDefined()
     expect(maxPriorityFeePerGas).toBeDefined()
     expect(signature).toBeDefined()
@@ -473,7 +478,6 @@ test('behavior: default (p256 - webcrypto)', async () => {
         "data": undefined,
         "feePayerSignature": null,
         "gas": 500000n,
-        "gasPrice": 20000000000n,
         "nonceKey": 0n,
         "type": "tempo",
         "validAfter": null,
@@ -487,6 +491,7 @@ test('behavior: default (p256 - webcrypto)', async () => {
     blockNumber,
     blockHash,
     cumulativeGasUsed,
+    effectiveGasPrice,
     feePayer,
     feeToken: _,
     from,
@@ -501,6 +506,7 @@ test('behavior: default (p256 - webcrypto)', async () => {
   expect(blockNumber).toBeDefined()
   expect(blockHash).toBeDefined()
   expect(cumulativeGasUsed).toBeDefined()
+  expect(effectiveGasPrice).toBeDefined()
   expect(feePayer).toBeDefined()
   expect(from).toBeDefined()
   expect(gasUsed).toBeDefined()
@@ -513,7 +519,6 @@ test('behavior: default (p256 - webcrypto)', async () => {
       "blobGasPrice": undefined,
       "blobGasUsed": undefined,
       "contractAddress": null,
-      "effectiveGasPrice": 20000000000n,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
       "type": "0x76",
@@ -591,6 +596,7 @@ test('behavior: default (webauthn)', async () => {
       keyAuthorization: __,
       hash,
       nonce,
+      gasPrice,
       maxFeePerGas,
       maxPriorityFeePerGas,
       transactionIndex,
@@ -605,6 +611,7 @@ test('behavior: default (webauthn)', async () => {
     expect(from).toBeDefined()
     expect(hash).toBe(receipt.transactionHash)
     expect(nonce).toBeDefined()
+    expect(gasPrice).toBeDefined()
     expect(maxFeePerGas).toBeDefined()
     expect(maxPriorityFeePerGas).toBeDefined()
     expect(signature).toBeDefined()
@@ -623,7 +630,6 @@ test('behavior: default (webauthn)', async () => {
         "data": undefined,
         "feePayerSignature": null,
         "gas": 500000n,
-        "gasPrice": 20000000000n,
         "nonceKey": 0n,
         "type": "tempo",
         "validAfter": null,
@@ -637,6 +643,7 @@ test('behavior: default (webauthn)', async () => {
     blockNumber,
     blockHash,
     cumulativeGasUsed,
+    effectiveGasPrice,
     feePayer,
     feeToken: _,
     from,
@@ -651,6 +658,7 @@ test('behavior: default (webauthn)', async () => {
   expect(blockNumber).toBeDefined()
   expect(blockHash).toBeDefined()
   expect(cumulativeGasUsed).toBeDefined()
+  expect(effectiveGasPrice).toBeDefined()
   expect(feePayer).toBeDefined()
   expect(from).toBe(address)
   expect(gasUsed).toBeDefined()
@@ -663,7 +671,6 @@ test('behavior: default (webauthn)', async () => {
       "blobGasPrice": undefined,
       "blobGasUsed": undefined,
       "contractAddress": null,
-      "effectiveGasPrice": 20000000000n,
       "status": "success",
       "to": "0x0000000000000000000000000000000000000000",
       "type": "0x76",
@@ -745,6 +752,7 @@ test('behavior: feePayerSignature (user → feePayer)', async () => {
       blockNumber,
       blockHash,
       cumulativeGasUsed,
+      effectiveGasPrice,
       feePayer,
       feeToken: _,
       from,
@@ -759,6 +767,7 @@ test('behavior: feePayerSignature (user → feePayer)', async () => {
     expect(blockNumber).toBeDefined()
     expect(blockHash).toBeDefined()
     expect(cumulativeGasUsed).toBeDefined()
+    expect(effectiveGasPrice).toBeDefined()
     expect(feePayer).toBe(feePayerAddress)
     expect(from).toBe(senderAddress)
     expect(gasUsed).toBeDefined()
@@ -771,7 +780,6 @@ test('behavior: feePayerSignature (user → feePayer)', async () => {
         "blobGasPrice": undefined,
         "blobGasUsed": undefined,
         "contractAddress": null,
-        "effectiveGasPrice": 20000000000n,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
         "type": "0x76",
@@ -1019,6 +1027,7 @@ describe('behavior: keyAuthorization', () => {
       blockNumber,
       blockHash,
       cumulativeGasUsed,
+      effectiveGasPrice,
       feePayer,
       feeToken,
       from,
@@ -1033,6 +1042,7 @@ describe('behavior: keyAuthorization', () => {
     expect(blockNumber).toBeDefined()
     expect(blockHash).toBeDefined()
     expect(cumulativeGasUsed).toBeDefined()
+    expect(effectiveGasPrice).toBeDefined()
     expect(feeToken).toBeDefined()
     expect(feePayer).toBeDefined()
     expect(gasUsed).toBeDefined()
@@ -1046,7 +1056,6 @@ describe('behavior: keyAuthorization', () => {
         "blobGasPrice": undefined,
         "blobGasUsed": undefined,
         "contractAddress": null,
-        "effectiveGasPrice": 20000000000n,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
         "type": "0x76",
@@ -1238,6 +1247,7 @@ describe('behavior: keyAuthorization', () => {
       blockNumber,
       blockHash,
       cumulativeGasUsed,
+      effectiveGasPrice,
       feePayer,
       feeToken,
       from,
@@ -1252,6 +1262,7 @@ describe('behavior: keyAuthorization', () => {
     expect(blockNumber).toBeDefined()
     expect(blockHash).toBeDefined()
     expect(cumulativeGasUsed).toBeDefined()
+    expect(effectiveGasPrice).toBeDefined()
     expect(feePayer).toBeDefined()
     expect(feeToken).toBeDefined()
     expect(from).toBeDefined()
@@ -1265,7 +1276,6 @@ describe('behavior: keyAuthorization', () => {
         "blobGasPrice": undefined,
         "blobGasUsed": undefined,
         "contractAddress": null,
-        "effectiveGasPrice": 20000000000n,
         "status": "success",
         "to": "0x0000000000000000000000000000000000000000",
         "type": "0x76",
@@ -2999,198 +3009,3 @@ describe('behavior: keyAuthorization', () => {
     },
   )
 })
-
-// TODO: unskip once TIP-1061 native multisig is deployed to the standard
-// localnet/testnet nodes. Until then these only pass against the dedicated
-// PR-5178 devnet (run with VITE_TEMPO_RPC_URL pointed at it).
-describe.skip('behavior: multisig (TIP-1061)', () => {
-  // Helper: builds a fresh set of secp256k1 owners + the derived config.
-  function setup(parameters: { count: number; threshold: number }) {
-    const { count, threshold } = parameters
-    const ownerKeys = Array.from({ length: count }, () => {
-      const privateKey = Secp256k1.randomPrivateKey()
-      const address = Address.fromPublicKey(
-        Secp256k1.getPublicKey({ privateKey }),
-      )
-      return { address, privateKey } as const
-    })
-
-    const genesisConfig = MultisigConfig.from({
-      // A fresh random salt yields a distinct account each run, exercising the
-      // salt-inclusive config-ID derivation against the node.
-      salt: Hex.random(32),
-      threshold,
-      owners: ownerKeys.map((key) => ({
-        owner: key.address,
-        weight: 1,
-      })),
-    })
-    const account = MultisigConfig.getAddress(genesisConfig)
-
-    return { account, genesisConfig, ownerKeys } as const
-  }
-
-  // Signs the multisig owner digest with the provided owner keys, returning
-  // primitive approval envelopes ordered strictly ascending by recovered owner
-  // address (required by the node: "recovered owners must be strictly
-  // ascending").
-  function approve(parameters: {
-    genesisConfig: MultisigConfig.Config
-    payload: Hex.Hex
-    signers: readonly { privateKey: Hex.Hex }[]
-  }) {
-    const { genesisConfig, payload, signers } = parameters
-    const digest = MultisigConfig.getSignPayload({ payload, genesisConfig })
-    const signatures = signers.map((signer) =>
-      SignatureEnvelope.from(
-        Secp256k1.sign({ payload: digest, privateKey: signer.privateKey }),
-      ),
-    )
-    return SignatureEnvelope.sortMultisigApprovals({
-      genesisConfig,
-      payload,
-      signatures,
-    })
-  }
-
-  test('behavior: bootstrap + spend (2-of-3 secp256k1)', async () => {
-    const { account, genesisConfig, ownerKeys } = setup({
-      count: 3,
-      threshold: 2,
-    })
-
-    // The derived multisig account pays its own fees.
-    await fundAddress(client, { address: account })
-
-    // Bootstrap (first transaction): the bootstrap config travels in the
-    // multisig signature `init`, nonce 0.
-    const bootstrap = TxEnvelopeTempo.from({
-      calls: [{ to: '0x0000000000000000000000000000000000000000' }],
-      chainId,
-      feeToken: '0x20c0000000000000000000000000000000000001',
-      nonce: 0n,
-      gas: 2_000_000n,
-      maxFeePerGas: Value.fromGwei('20'),
-      maxPriorityFeePerGas: Value.fromGwei('10'),
-    })
-
-    const bootstrap_signed = TxEnvelopeTempo.serialize(bootstrap, {
-      signature: SignatureEnvelope.from({
-        genesisConfig,
-        // Initialize multisig.
-        init: true,
-        // Approve with 2 of the 3 owners to satisfy the threshold.
-        signatures: approve({
-          genesisConfig,
-          payload: TxEnvelopeTempo.getSignPayload(bootstrap),
-          signers: [ownerKeys[0]!, ownerKeys[1]!],
-        }),
-      }),
-    })
-
-    const bootstrap_receipt = (await client
-      .request({
-        method: 'eth_sendRawTransactionSync',
-        params: [bootstrap_signed],
-      })
-      .then((tx) => TransactionReceipt.fromRpc(tx as any)))!
-    expect(bootstrap_receipt).toBeDefined()
-    expect(bootstrap_receipt.status).toBe('success')
-    expect(bootstrap_receipt.from).toBe(account)
-
-    {
-      const response = await client
-        .request({
-          method: 'eth_getTransactionByHash',
-          params: [bootstrap_receipt.transactionHash],
-        })
-        .then((tx) => Transaction.fromRpc(tx as any))
-      if (!response) throw new Error()
-      expect(response.from).toBe(account)
-      expect(response.signature?.type).toBe('multisig')
-      // The bootstrap config is carried by the multisig signature `init`.
-      expect(
-        (response.signature as SignatureEnvelope.Multisig | undefined)?.init,
-      ).toEqual(genesisConfig)
-    }
-
-    // Spend (subsequent transaction): no signature `init`, nonce 1, uses the
-    // stored config loaded by the node.
-    const nonce = await getTransactionCount(client, {
-      address: account,
-      blockTag: 'pending',
-    })
-
-    const spend = TxEnvelopeTempo.from({
-      calls: [{ to: '0x0000000000000000000000000000000000000000' }],
-      chainId,
-      feeToken: '0x20c0000000000000000000000000000000000001',
-      nonce: BigInt(nonce),
-      gas: 2_000_000n,
-      maxFeePerGas: Value.fromGwei('20'),
-      maxPriorityFeePerGas: Value.fromGwei('10'),
-    })
-
-    const spend_signed = TxEnvelopeTempo.serialize(spend, {
-      signature: SignatureEnvelope.from({
-        genesisConfig,
-        // A different 2-of-3 subset still authorizes the transaction.
-        signatures: approve({
-          genesisConfig,
-          payload: TxEnvelopeTempo.getSignPayload(spend),
-          signers: [ownerKeys[1]!, ownerKeys[2]!],
-        }),
-      }),
-    })
-
-    const spend_receipt = (await client
-      .request({
-        method: 'eth_sendRawTransactionSync',
-        params: [spend_signed],
-      })
-      .then((tx) => TransactionReceipt.fromRpc(tx as any)))!
-    expect(spend_receipt).toBeDefined()
-    expect(spend_receipt.status).toBe('success')
-    expect(spend_receipt.from).toBe(account)
-  })
-
-  test('behavior: rejects below-threshold approvals', async () => {
-    const { account, genesisConfig, ownerKeys } = setup({
-      count: 3,
-      threshold: 2,
-    })
-
-    await fundAddress(client, { address: account })
-
-    const bootstrap = TxEnvelopeTempo.from({
-      calls: [{ to: '0x0000000000000000000000000000000000000000' }],
-      chainId,
-      feeToken: '0x20c0000000000000000000000000000000000001',
-      nonce: 0n,
-      gas: 2_000_000n,
-      maxFeePerGas: Value.fromGwei('20'),
-      maxPriorityFeePerGas: Value.fromGwei('10'),
-    })
-
-    const serialized_signed = TxEnvelopeTempo.serialize(bootstrap, {
-      signature: SignatureEnvelope.from({
-        genesisConfig,
-        // Opt into bootstrap: writes `genesisConfig` into the signature `init`.
-        init: true,
-        // Only one approval — below the threshold of 2.
-        signatures: approve({
-          genesisConfig,
-          payload: TxEnvelopeTempo.getSignPayload(bootstrap),
-          signers: [ownerKeys[0]!],
-        }),
-      }),
-    })
-
-    await expect(
-      client.request({
-        method: 'eth_sendRawTransactionSync',
-        params: [serialized_signed],
-      }),
-    ).rejects.toThrow()
-  })
-})

package/tempo/index.ts

@@ -105,8 +105,8 @@ export * as KeyAuthorization from './KeyAuthorization.js'
 /**
  * Native multisig account utilities (TIP-1061).
  *
- * Derives stable multisig account addresses and permanent config IDs from a weighted
- * owner configuration, and computes the owner approval digest that owners sign.
+ * Derives stable multisig account addresses from a weighted owner
+ * configuration, and computes the owner approval digest that owners sign.
  *
  * [TIP-1061](https://tips.sh/1061)
  *