wip: further debug

Author: just-mitch

l1-contracts/bootstrap.sh

@@ -33,6 +33,9 @@ function build {
     # Step 1: Build everything in src.
     forge build $(find src test -name '*.sol')
 
+    # Step 1.5: Output storage information for the rollup contract.
+    forge inspect src/core/Rollup.sol:Rollup storage > ./out/Rollup.sol/storage.json
+
     # Step 2: Build the the generated verifier contract with optimization.
     forge build $(find generated -name '*.sol') \
       --optimize \

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

@@ -863,7 +863,7 @@ export class AztecNodeService implements AztecNode, Traceable {
     );
     const fork = await this.worldStateSynchronizer.fork();
 
-    this.log.verbose(`Simulating public calls for tx ${tx.getTxHash()}`, {
+    this.log.verbose(`Simulating public calls for tx ${txHash}`, {
       globalVariables: newGlobalVariables.toInspect(),
       txHash,
       blockNumber,
@@ -876,7 +876,7 @@ export class AztecNodeService implements AztecNode, Traceable {
       const [processedTxs, failedTxs, returns] = await processor.process([tx]);
       // REFACTOR: Consider returning the error rather than throwing
       if (failedTxs.length) {
-        this.log.warn(`Simulated tx ${tx.getTxHash()} fails: ${failedTxs[0].error}`, { txHash });
+        this.log.warn(`Simulated tx ${txHash} fails: ${failedTxs[0].error}`, { txHash });
         throw failedTxs[0].error;
       }
 

yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts

@@ -191,7 +191,11 @@ describe('L1Publisher integration', () => {
     );
     const l1TxUtils = new L1TxUtilsWithBlobs(sequencerPublicClient, sequencerWalletClient, logger, config);
     const rollupContract = new RollupContract(sequencerPublicClient, l1ContractAddresses.rollupAddress.toString());
-    const forwarderContract = await createForwarderContract(config, sequencerPK);
+    const forwarderContract = await createForwarderContract(
+      config,
+      sequencerPK,
+      l1ContractAddresses.rollupAddress.toString(),
+    );
     const slashingProposerAddress = await rollupContract.getSlashingProposerAddress();
     const slashingProposerContract = new SlashingProposerContract(
       sequencerPublicClient,

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

@@ -408,10 +408,8 @@ describe('e2e_synching', () => {
       logger,
       config,
     );
-    const rollupContract = new RollupContract(
-      deployL1ContractsValues.publicClient,
-      deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-    );
+    const rollupAddress = deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString();
+    const rollupContract = new RollupContract(deployL1ContractsValues.publicClient, rollupAddress);
     const governanceProposerContract = new GovernanceProposerContract(
       deployL1ContractsValues.publicClient,
       config.l1Contracts.governanceProposerAddress.toString(),
@@ -421,7 +419,7 @@ describe('e2e_synching', () => {
       deployL1ContractsValues.publicClient,
       slashingProposerAddress.toString(),
     );
-    const forwarderContract = await createForwarderContract(config, sequencerPK);
+    const forwarderContract = await createForwarderContract(config, sequencerPK, rollupAddress);
     const epochCache = await EpochCache.create(config.l1Contracts.rollupAddress, config, {
       dateProvider: new TestDateProvider(),
     });

yarn-project/end-to-end/src/fixtures/utils.ts

@@ -767,13 +767,18 @@ function createDelayedL1TxUtils(aztecNodeConfig: AztecNodeConfig, privateKey: `0
   return l1TxUtils;
 }
 
-export async function createForwarderContract(aztecNodeConfig: AztecNodeConfig, privateKey: `0x${string}`) {
+export async function createForwarderContract(
+  aztecNodeConfig: AztecNodeConfig,
+  privateKey: `0x${string}`,
+  rollupAddress: Hex,
+) {
   const { walletClient, publicClient } = createL1Clients(aztecNodeConfig.l1RpcUrl, privateKey, foundry);
   const forwarderContract = await ForwarderContract.create(
     walletClient.account.address,
     walletClient,
     publicClient,
     createLogger('forwarder'),
+    rollupAddress,
   );
   return forwarderContract;
 }

yarn-project/end-to-end/src/spartan/upgrade_governance_proposer.test.ts

@@ -68,12 +68,12 @@ describe('spartan_upgrade_governance_proposer', () => {
     // check the balance of the account
     const balance = await validatorWalletClient.getBalance({ address: account.address });
     debugLogger.info(`deployer balance: ${balance}`);
-    if (balance <= parseEther('0.5')) {
+    if (balance <= parseEther('5')) {
       debugLogger.info('sending some eth to the deployer account');
       // send some eth to the account
       const tx = await validatorWalletClient.sendTransaction({
         to: account.address,
-        value: parseEther('1'),
+        value: parseEther('10'),
       });
       const receipt = await validatorWalletClient.waitForTransactionReceipt({ hash: tx });
       debugLogger.info(`receipt: ${stringify(receipt)}`);
@@ -149,16 +149,17 @@ describe('spartan_upgrade_governance_proposer', () => {
       debugLogger.info(`Waiting for round ${executableRound + 1n}`);
 
       while (info.round === executableRound) {
-        await sleep(12000);
+        await sleep(12500);
         info = await govInfo();
         debugLogger.info(`slot: ${info.slot}`);
       }
 
       expect(info.round).toBeGreaterThan(executableRound);
 
       debugLogger.info(`Executing proposal ${info.round}`);
+
       const l1TxUtils = new L1TxUtils(l1PublicClient, l1WalletClient, debugLogger);
-      const { receipt } = await governanceProposer.executeProposal(info.round, l1TxUtils);
+      const { receipt } = await governanceProposer.executeProposal(executableRound, l1TxUtils);
       expect(receipt).toBeDefined();
       expect(receipt.status).toEqual('success');
       debugLogger.info(`Executed proposal ${info.round}`);

yarn-project/ethereum/src/contracts/forwarder.ts

@@ -1,3 +1,4 @@
+import { toHex } from '@aztec/foundation/bigint-buffer';
 import { type Logger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode } from '@aztec/l1-artifacts';
 
@@ -15,11 +16,12 @@ import {
 
 import { type L1Clients, deployL1Contract } from '../deploy_l1_contracts.js';
 import { type L1BlobInputs, type L1GasConfig, type L1TxRequest, type L1TxUtils } from '../l1_tx_utils.js';
+import { RollupContract } from './rollup.js';
 
 export class ForwarderContract {
   private readonly forwarder: GetContractReturnType<typeof ForwarderAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(public readonly client: L1Clients['publicClient'], address: Hex) {
+  constructor(public readonly client: L1Clients['publicClient'], address: Hex, public readonly rollupAddress: Hex) {
     this.forwarder = getContract({ address, abi: ForwarderAbi, client });
   }
 
@@ -28,6 +30,7 @@ export class ForwarderContract {
     walletClient: WalletClient<HttpTransport, Chain, Account>,
     publicClient: PublicClient<HttpTransport, Chain>,
     logger: Logger,
+    rollupAddress: Hex,
   ) {
     logger.info('Deploying forwarder contract');
 
@@ -48,7 +51,7 @@ export class ForwarderContract {
 
     logger.info(`Forwarder contract deployed at ${address} with owner ${owner}`);
 
-    return new ForwarderContract(publicClient, address.toString());
+    return new ForwarderContract(publicClient, address.toString(), rollupAddress);
   }
 
   public getAddress() {
@@ -60,6 +63,7 @@ export class ForwarderContract {
     l1TxUtils: L1TxUtils,
     gasConfig: L1GasConfig | undefined,
     blobConfig: L1BlobInputs | undefined,
+    logger: Logger,
   ) {
     requests = requests.filter(request => request.to !== null);
     const toArgs = requests.map(request => request.to!);
@@ -83,6 +87,7 @@ export class ForwarderContract {
       const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
       return { receipt, gasPrice, stats };
     } else {
+      logger.error('Forwarder transaction failed', { receipt });
       const args = {
         args: [toArgs, dataArgs],
         functionName: 'forward',
@@ -97,14 +102,30 @@ export class ForwarderContract {
         if (maxFeePerBlobGas === undefined) {
           errorMsg = 'maxFeePerBlobGas is required to get the error message';
         } else {
-          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(data, args, {
-            blobs: blobConfig.blobs,
-            kzg: blobConfig.kzg,
-            maxFeePerBlobGas,
-          });
+          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(
+            data,
+            args,
+            {
+              blobs: blobConfig.blobs,
+              kzg: blobConfig.kzg,
+              maxFeePerBlobGas,
+            },
+            [
+              {
+                address: this.rollupAddress,
+                stateDiff: [
+                  {
+                    slot: toHex(RollupContract.checkBlobSlot, true),
+                    value: toHex(0n, true),
+                  },
+                ],
+              },
+            ],
+          );
         }
       } else {
-        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(data, args);
+        logger.info('Trying to get error from reverted tx without blob config');
+        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(data, args, undefined, []);
       }
 
       return { receipt, gasPrice, errorMsg };

yarn-project/ethereum/src/contracts/rollup.ts

@@ -1,7 +1,7 @@
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { ViemSignature } from '@aztec/foundation/eth-signature';
-import { RollupAbi, SlasherAbi } from '@aztec/l1-artifacts';
+import { RollupAbi, RollupStorage, SlasherAbi } from '@aztec/l1-artifacts';
 
 import {
   type Account,
@@ -45,6 +45,14 @@ export type EpochProofQuoteViemArgs = {
 export class RollupContract {
   private readonly rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
 
+  static get checkBlobSlot(): bigint {
+    const asString = RollupStorage.find(storage => storage.label === 'checkBlob')?.slot;
+    if (asString === undefined) {
+      throw new Error('checkBlobSlot not found');
+    }
+    return BigInt(asString);
+  }
+
   static getFromL1ContractsValues(deployL1ContractsValues: DeployL1Contracts) {
     const {
       publicClient,

yarn-project/ethereum/src/l1_tx_utils.ts

@@ -1,4 +1,3 @@
-import { toHex } from '@aztec/foundation/bigint-buffer';
 import { compactArray, times } from '@aztec/foundation/collection';
 import {
   type ConfigMappingsType,
@@ -663,27 +662,24 @@ export class L1TxUtils {
       abi: Abi;
       address: Hex;
     },
-    blobInputs?: L1BlobInputs & { maxFeePerBlobGas: bigint },
+    blobInputs: (L1BlobInputs & { maxFeePerBlobGas: bigint }) | undefined,
+    stateOverride: {
+      address: `0x${string}`;
+      stateDiff: {
+        slot: `0x${string}`;
+        value: `0x${string}`;
+      }[];
+    }[] = [],
   ) {
     try {
       // NB: If this fn starts unexpectedly giving incorrect blob hash errors, it may be because the checkBlob
       // bool is no longer at the slot below. To find the slot, run: forge inspect src/core/Rollup.sol:Rollup storage
-      const checkBlobSlot = 9n;
       await this.publicClient.simulateContract({
         ...args,
         account: this.walletClient.account,
-        stateOverride: [
-          {
-            address: args.address,
-            stateDiff: [
-              {
-                slot: toHex(checkBlobSlot, true),
-                value: toHex(0n, true),
-              },
-            ],
-          },
-        ],
+        stateOverride,
       });
+      this.logger?.info('Simulated blob tx', { blobInputs });
       // If the above passes, we have a blob error. We cannot simulate blob txs, and failed txs no longer throw errors.
       // Strangely, the only way to throw the revert reason as an error and provide blobs is prepareTransactionRequest.
       // See: https://github.com/wevm/viem/issues/2075
@@ -702,7 +698,9 @@ export class L1TxUtils {
             to: args.address,
             data,
           };
+      this.logger?.info('Preparing tx', { request });
       await this.walletClient.prepareTransactionRequest(request);
+      this.logger?.info('Prepared tx');
       return undefined;
     } catch (simulationErr: any) {
       // If we don't have a ContractFunctionExecutionError, we have a blob related error => use getContractError to get the error msg.

yarn-project/l1-artifacts/scripts/generate-artifacts.sh

@@ -108,4 +108,17 @@ for contract_name in "${contracts[@]}"; do
   echo "export * from './${contract_name}Bytecode.js';" >>"generated/index.ts"
 done
 
+# Generate RollupStorage.ts
+(
+  echo "/**"
+  echo " * Rollup storage."
+  echo " */"
+  echo -n "export const RollupStorage = "
+  jq -j '.storage' "../../l1-contracts/out/Rollup.sol/storage.json"
+  echo " as const;"
+) >"generated/RollupStorage.ts"
+
+# Update index.ts exports
+echo "export * from './RollupStorage.js';" >>"generated/index.ts"
+
 echo "Successfully generated TS artifacts!"

yarn-project/p2p/src/services/libp2p/libp2p_service.ts

@@ -584,7 +584,7 @@ export class LibP2PService<T extends P2PClientType> extends WithTracer implement
   }
 
   private async processTxFromPeer(tx: Tx): Promise<void> {
-    const txHash = tx.getTxHash();
+    const txHash = await tx.getTxHash();
     const txHashString = txHash.toString();
     this.logger.verbose(`Received tx ${txHashString} from external peer.`);
     await this.mempools.txPool.addTxs([tx]);

yarn-project/prover-node/src/prover-node-publisher.ts

@@ -229,12 +229,17 @@ export class ProverNodePublisher {
       return receipt;
     } catch (err) {
       this.log.error(`Rollup submit epoch proof failed`, err);
-      const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(data, {
-        args: [...txArgs],
-        functionName: 'submitEpochRootProof',
-        abi: RollupAbi,
-        address: this.rollupContract.address,
-      });
+      const errorMsg = await this.l1TxUtils.tryGetErrorFromRevertedTx(
+        data,
+        {
+          args: [...txArgs],
+          functionName: 'submitEpochRootProof',
+          abi: RollupAbi,
+          address: this.rollupContract.address,
+        },
+        undefined,
+        [],
+      );
       this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
       return undefined;
     }

yarn-project/sequencer-client/src/client/sequencer-client.ts

@@ -86,8 +86,18 @@ export class SequencerClient {
     ] as const);
     const forwarderContract =
       config.customForwarderContractAddress && config.customForwarderContractAddress !== EthAddress.ZERO
-        ? new ForwarderContract(publicClient, config.customForwarderContractAddress.toString())
-        : await ForwarderContract.create(walletClient.account.address, walletClient, publicClient, log);
+        ? new ForwarderContract(
+            publicClient,
+            config.customForwarderContractAddress.toString(),
+            config.l1Contracts.rollupAddress.toString(),
+          )
+        : await ForwarderContract.create(
+            walletClient.account.address,
+            walletClient,
+            publicClient,
+            log,
+            config.l1Contracts.rollupAddress.toString(),
+          );
 
     const governanceProposerContract = new GovernanceProposerContract(
       publicClient,

yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts

@@ -228,6 +228,7 @@ export class SequencerPublisher {
         this.l1TxUtils,
         gasConfig,
         blobConfig,
+        this.log,
       );
       this.callbackBundledTransactions(validRequests, result);
       return result;