Merge remote-tracking branch 'origin/next' into ad/misc-kind-fixups

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: ludamad

.test_patterns.yml

@@ -343,12 +343,6 @@ tests:
     owners:
       - *adam
 
-  - regex: "validator-ha-signer/src/db/postgres.test.ts"
-    error_regex: "FailureMessage Object"
-    owners:
-      - *spyros
-      - *alex
-
   # http://ci.aztec-labs.com/e8228a36afda93b8
   # Test passed but there was an error on stopping
   - regex: "playground/scripts/run_test.sh"

docs/docs-developers/docs/resources/migration_notes.md

@@ -9,6 +9,78 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 ## TBD
 
+### [Aztec.js] Transaction sending API redesign
+
+The old chained `.send().wait()` pattern has been replaced with a single `.send(options)` call that handles both sending and waiting.
+
+```diff
++ import { Contract, NO_WAIT } from '@aztec/aztec.js/contracts';
+
+- const receipt = await contract.methods.transfer(recipient, amount).send().wait();
+
+// Send now waits by default
++ const receipt = await contract.methods.transfer(recipient, amount).send({ from: sender });
+
+// getTxHash() would confusingly send the transaction too
+- const txHash = await contract.methods.transfer(recipient, amount).send().getTxHash();
+
+// NO_WAIT to send the transaction and return TxHash immediately
++ const txHash = await contract.methods.transfer(recipient, amount).send({
++   from: sender,
++   wait: NO_WAIT
++ });
+```
+
+#### Deployment changes
+
+The old `.send().deployed()` method has been removed. Deployments now return the contract instance by default, or you can request the full receipt with `returnReceipt: true`:
+
+```diff
+- const contract = await MyContract.deploy(wallet, ...args).send().deployed();
+- const { contract, instance } = await MyContract.deploy(wallet, ...args).send().wait();
+
++ const contract = await MyContract.deploy(wallet, ...args).send({ from: deployer });
+
++ const { contract, instance } = await MyContract.deploy(wallet, ...args).send({
++   from: deployer,
++   wait: { returnReceipt: true },
++ });
+```
+
+#### Breaking changes to `Wallet` interface
+
+`getTxReceipt()` has been removed from the interface.
+
+`sendTx` method signature has changed to support the new wait behavior:
+
+```diff
+- sendTx(payload: ExecutionPayload, options: SendOptions): Promise<TxReceipt>
+
++ sendTx<W extends InteractionWaitOptions = undefined>(
++   payload: ExecutionPayload,
++   options: SendOptions<W>
++ ): Promise<SendReturn<W>>
+```
+
+#### Manual waiting with `waitForTx`
+
+When using `NO_WAIT` to send transactions, you can manually wait for confirmation using the `waitForTx` utility:
+
+```typescript
+import { waitForTx } from "@aztec/aztec.js/node";
+
+const txHash = await contract.methods.transfer(recipient, amount).send({
+  from: sender,
+  wait: NO_WAIT,
+});
+
+const receipt = await waitForTx(node, txHash, {
+  timeout: 60000, // Optional: timeout in ms
+  interval: 1000, // Optional: polling interval in ms
+  dontThrowOnRevert: true, // Optional: return receipt even if tx reverted
+});
+```
+
 ### [aztec-nr] Removal of intermediate modules
 
 Lots of unnecessary modules have been removed from the API, making imports shorter. These are the modules that contain just a single struct, in which the module has the same name as the struct.

l1-contracts/scripts/run_rollup_upgrade.sh

@@ -19,6 +19,14 @@ registry_address="${1:?registry_address is required}"
 echo "=== Deploying rollup upgrade ==="
 echo "Registry: $registry_address"
 
+# Force rebuild with production profile for mainnet/sepolia to ensure correct BlobLib
+# This covers edge cases where cached code from non-production builds may remain
+if [ "${L1_CHAIN_ID:-}" = "1" ] || [ "${L1_CHAIN_ID:-}" = "11155111" ]; then
+  echo "Mainnet/Sepolia detected - forcing production build..."
+  FOUNDRY_PROFILE=production forge build script/deploy/DeployRollupForUpgrade.s.sol --force
+  export FOUNDRY_PROFILE=production
+fi
+
 REGISTRY_ADDRESS="$registry_address" \
      REAL_VERIFIER="${REAL_VERIFIER:-true}" \
      forge script script/deploy/DeployRollupForUpgrade.s.sol:DeployRollupForUpgrade \

spartan/scripts/deploy_rollup_upgrade.sh

@@ -40,6 +40,7 @@ if [[ -z "${L1_CHAIN_ID:-}" ]]; then
   network_defaults="${repo_root}/spartan/environments/network-defaults.yml"
   L1_CHAIN_ID=$(yq "explode(.) | .networks.$NETWORK.L1_CHAIN_ID" "$network_defaults")
 fi
+export L1_CHAIN_ID
 
 log "Starting rollup upgrade deployment"
 log "L1 Chain ID: $L1_CHAIN_ID"

yarn-project/archiver/src/store/kv_archiver_store.test.ts

@@ -335,7 +335,7 @@ describe('KVArchiverDataStore', () => {
       await store.addCheckpoints(publishedCheckpoints);
       const lastCheckpoint = publishedCheckpoints[publishedCheckpoints.length - 1];
       const lastBlock = lastCheckpoint.checkpoint.blocks[0];
-      const blockHash = await lastBlock.header.hash();
+      const blockHash = (await lastBlock.header.hash()).toField();
       const archive = lastBlock.archive.root;
 
       // Verify block and header exist before removing
@@ -639,7 +639,7 @@ describe('KVArchiverDataStore', () => {
       // Check each block by its hash
       for (let i = 0; i < checkpoint.checkpoint.blocks.length; i++) {
         const block = checkpoint.checkpoint.blocks[i];
-        const blockHash = await block.header.hash();
+        const blockHash = (await block.header.hash()).toField();
         const retrievedBlock = await store.getCheckpointedBlockByHash(blockHash);
 
         expect(retrievedBlock).toBeDefined();
@@ -797,8 +797,8 @@ describe('KVArchiverDataStore', () => {
       await store.addProposedBlocks([block1, block2]);
 
       // getBlockByHash should work for uncheckpointed blocks
-      const hash1 = await block1.header.hash();
-      const hash2 = await block2.header.hash();
+      const hash1 = (await block1.header.hash()).toField();
+      const hash2 = (await block2.header.hash()).toField();
 
       const retrieved1 = await store.getBlockByHash(hash1);
       expect(retrieved1!.equals(block1)).toBe(true);
@@ -874,7 +874,7 @@ describe('KVArchiverDataStore', () => {
       });
       await store.addProposedBlocks([block1]);
 
-      const hash = await block1.header.hash();
+      const hash = (await block1.header.hash()).toField();
 
       // getCheckpointedBlockByHash should return undefined
       expect(await store.getCheckpointedBlockByHash(hash)).toBeUndefined();
@@ -1666,7 +1666,7 @@ describe('KVArchiverDataStore', () => {
     it('retrieves a block by its hash', async () => {
       const expectedCheckpoint = publishedCheckpoints[5];
       const expectedBlock = expectedCheckpoint.checkpoint.blocks[0];
-      const blockHash = await expectedBlock.header.hash();
+      const blockHash = (await expectedBlock.header.hash()).toField();
       const retrievedBlock = await store.getCheckpointedBlockByHash(blockHash);
 
       expect(retrievedBlock).toBeDefined();
@@ -1707,7 +1707,7 @@ describe('KVArchiverDataStore', () => {
 
     it('retrieves a block header by its hash', async () => {
       const expectedBlock = publishedCheckpoints[7].checkpoint.blocks[0];
-      const blockHash = await expectedBlock.header.hash();
+      const blockHash = (await expectedBlock.header.hash()).toField();
       const retrievedHeader = await store.getBlockHeaderByHash(blockHash);
 
       expect(retrievedHeader).toBeDefined();
@@ -1833,7 +1833,7 @@ describe('KVArchiverDataStore', () => {
       const expectedTx: IndexedTxEffect = {
         data,
         l2BlockNumber: block.number,
-        l2BlockHash: L2BlockHash.fromField(await block.header.hash()),
+        l2BlockHash: await block.header.hash(),
         txIndexInBlock,
       };
       const actualTx = await store.getTxEffect(data.txHash);
@@ -2732,7 +2732,7 @@ describe('KVArchiverDataStore', () => {
 
     it('returns block hash on public log ids', async () => {
       const targetBlock = publishedCheckpoints[0].checkpoint.blocks[0];
-      const expectedBlockHash = L2BlockHash.fromField(await targetBlock.header.hash());
+      const expectedBlockHash = await targetBlock.header.hash();
 
       const logs = (await store.getPublicLogs({ fromBlock: targetBlock.number, toBlock: targetBlock.number + 1 })).logs;
 
@@ -2790,7 +2790,7 @@ describe('KVArchiverDataStore', () => {
       const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
       const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
       const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
-      const targetBlockHash = L2BlockHash.fromField(await targetBlock.header.hash());
+      const targetBlockHash = await targetBlock.header.hash();
 
       const afterLog = new LogId(
         BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
@@ -2882,7 +2882,7 @@ describe('KVArchiverDataStore', () => {
       const targetTxIndex = randomInt(getTxsPerBlock(targetBlock));
       const numLogsInTx = targetBlock.body.txEffects[targetTxIndex].publicLogs.length;
       const targetLogIndex = numLogsInTx > 0 ? randomInt(numLogsInTx) : 0;
-      const targetBlockHash = L2BlockHash.fromField(await targetBlock.header.hash());
+      const targetBlockHash = await targetBlock.header.hash();
 
       const afterLog = new LogId(
         BlockNumber(targetBlockIndex + INITIAL_L2_BLOCK_NUM),
@@ -2935,7 +2935,7 @@ describe('KVArchiverDataStore', () => {
       expect(result.logs).toHaveLength(1);
 
       const [{ id, log }] = result.logs;
-      const expectedBlockHash = L2BlockHash.fromField(await targetBlock.header.hash());
+      const expectedBlockHash = await targetBlock.header.hash();
 
       expect(id.blockHash.equals(expectedBlockHash)).toBe(true);
       expect(id.blockNumber).toEqual(targetBlock.number);
@@ -3320,7 +3320,7 @@ describe('KVArchiverDataStore', () => {
       await store.addProposedBlocks([block1, block2]);
 
       // Verify block2 is retrievable by hash and archive before removal
-      const block2Hash = await block2.header.hash();
+      const block2Hash = (await block2.header.hash()).toField();
       const block2Archive = block2.archive.root;
 
       expect(await store.getBlockByHash(block2Hash)).toBeDefined();
@@ -3346,7 +3346,7 @@ describe('KVArchiverDataStore', () => {
       }
 
       // Verify block1's data is still intact
-      const block1Hash = await block1.header.hash();
+      const block1Hash = (await block1.header.hash()).toField();
       const block1Archive = block1.archive.root;
 
       expect(await store.getBlockByHash(block1Hash)).toBeDefined();

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -1411,11 +1411,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
   #getInitialHeaderHash(): Promise<L2BlockHash> {
     if (!this.initialHeaderHashPromise) {
-      this.initialHeaderHashPromise = this.worldStateSynchronizer
-        .getCommitted()
-        .getInitialHeader()
-        .hash()
-        .then(hash => L2BlockHash.fromField(hash));
+      this.initialHeaderHashPromise = this.worldStateSynchronizer.getCommitted().getInitialHeader().hash();
     }
     return this.initialHeaderHashPromise;
   }

yarn-project/end-to-end/src/e2e_simple.test.ts

@@ -7,7 +7,6 @@ import type { AztecNode } from '@aztec/aztec.js/node';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { StatefulTestContractArtifact } from '@aztec/noir-test-contracts.js/StatefulTest';
-import { L2BlockHash } from '@aztec/stdlib/block';
 
 import { jest } from '@jest/globals';
 import 'jest-extended';
@@ -57,15 +56,15 @@ describe('e2e_simple', () => {
       const initialHeader = await aztecNode.getBlockHeader(BlockNumber.ZERO);
       expect(initialHeader).toBeDefined();
       const initialHeaderHash = await initialHeader!.hash();
-      const initialBlockByHash = await aztecNode.getBlock(L2BlockHash.fromField(initialHeaderHash));
+      const initialBlockByHash = await aztecNode.getBlock(initialHeaderHash);
       expect(initialBlockByHash).toBeDefined();
       const initialBlockHash = await initialBlockByHash!.hash();
-      expect(initialBlockHash.equals(initialHeaderHash)).toBeTrue();
+      expect(initialBlockHash.equals(initialHeaderHash.toField())).toBeTrue();
       expect(initialBlockByHash?.body.txEffects.length).toBe(0);
       const initialBlockByNumber = await aztecNode.getBlock(BlockNumber.ZERO);
       expect(initialBlockByNumber).toBeDefined();
       const initialBlockByNumberHash = await initialBlockByNumber!.hash();
-      expect(initialBlockByNumberHash.equals(initialHeaderHash)).toBeTrue();
+      expect(initialBlockByNumberHash.equals(initialHeaderHash.toField())).toBeTrue();
       expect(initialBlockByNumber?.body.txEffects.length).toBe(0);
     });
 

yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.test.ts

@@ -322,9 +322,10 @@ describe('KV TX pool', () => {
     // modify tx1 to return no archive indices
     tx1.data.constants.anchorBlockHeader.globalVariables.blockNumber = BlockNumber(1);
     const tx1HeaderHash = await tx1.data.constants.anchorBlockHeader.hash();
+    const tx1HeaderHashFr = tx1HeaderHash.toField();
     db.findLeafIndices.mockImplementation((tree, leaves) => {
       if (tree === MerkleTreeId.ARCHIVE) {
-        return Promise.resolve((leaves as Fr[]).map(l => (l.equals(tx1HeaderHash) ? undefined : 1n)));
+        return Promise.resolve((leaves as Fr[]).map(l => (l.equals(tx1HeaderHashFr) ? undefined : 1n)));
       }
       return Promise.resolve([]);
     });

yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.test.ts

@@ -27,11 +27,12 @@ describe('BlockHeaderTxValidator', () => {
     );
 
     const goodTx = await mockTxForRollup();
-    archiveSource.getArchiveIndices.mockImplementation(async (archives: Fr[]) => {
-      if (archives[0].equals(await goodTx.data.constants.anchorBlockHeader.hash())) {
-        return [1n];
+    const goodTxHeaderHash = (await goodTx.data.constants.anchorBlockHeader.hash()).toField();
+    archiveSource.getArchiveIndices.mockImplementation((archives: Fr[]) => {
+      if (archives[0].equals(goodTxHeaderHash)) {
+        return Promise.resolve([1n]);
       } else {
-        return [undefined];
+        return Promise.resolve([undefined]);
       }
     });
     await expect(txValidator.validateTx(goodTx)).resolves.toEqual({ result: 'valid' } satisfies TxValidationResult);

yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.ts

@@ -15,7 +15,9 @@ export class BlockHeaderTxValidator<T extends AnyTx> implements TxValidator<T> {
   }
 
   async validateTx(tx: T): Promise<TxValidationResult> {
-    const [index] = await this.#archiveSource.getArchiveIndices([await tx.data.constants.anchorBlockHeader.hash()]);
+    const [index] = await this.#archiveSource.getArchiveIndices([
+      (await tx.data.constants.anchorBlockHeader.hash()).toField(),
+    ]);
     if (index === undefined) {
       this.#log.verbose(`Rejecting tx ${'txHash' in tx ? tx.txHash : tx.hash} for referencing an unknown block header`);
       return { result: 'invalid', reason: [TX_ERROR_BLOCK_HEADER] };