review changes

Author: just-mitch

spartan/scripts/test_kind.sh

@@ -86,10 +86,10 @@ fi
 free_ports=$(find_ports 4)
 
 # Extract the free ports from the list
-pxe_port=$(echo $free_ports | awk '{print $1}')
-anvil_port=$(echo $free_ports | awk '{print $2}')
-metrics_port=$(echo $free_ports | awk '{print $3}')
-node_port=$(echo $free_ports | awk '{print $4}')
+forwarded_pxe_port=$(echo $free_ports | awk '{print $1}')
+forwarded_anvil_port=$(echo $free_ports | awk '{print $2}')
+forwarded_metrics_port=$(echo $free_ports | awk '{print $3}')
+forwarded_node_port=$(echo $free_ports | awk '{print $4}')
 
 if [ "$install_metrics" = "true" ]; then
   grafana_password=$(kubectl get secrets -n metrics metrics-grafana -o jsonpath='{.data.admin-password}' | base64 --decode)
@@ -115,13 +115,13 @@ if [ "$use_docker" = "true" ]; then
     -e INSTANCE_NAME="spartan" \
     -e SPARTAN_DIR="/usr/src/spartan" \
     -e NAMESPACE="$namespace" \
-    -e HOST_PXE_PORT=$pxe_port \
+    -e HOST_PXE_PORT=$forwarded_pxe_port \
     -e CONTAINER_PXE_PORT=8081 \
-    -e HOST_ETHEREUM_PORT=$anvil_port \
+    -e HOST_ETHEREUM_PORT=$forwarded_anvil_port \
     -e CONTAINER_ETHEREUM_PORT=8545 \
-    -e HOST_NODE_PORT=$node_port \
+    -e HOST_NODE_PORT=$forwarded_node_port \
     -e CONTAINER_NODE_PORT=8080 \
-    -e HOST_METRICS_PORT=$metrics_port \
+    -e HOST_METRICS_PORT=$forwarded_metrics_port \
     -e CONTAINER_METRICS_PORT=80 \
     -e GRAFANA_PASSWORD=$grafana_password \
     -e DEBUG=${DEBUG:-""} \
@@ -139,13 +139,13 @@ else
   export INSTANCE_NAME="spartan"
   export SPARTAN_DIR="$(pwd)/.."
   export NAMESPACE="$namespace"
-  export HOST_PXE_PORT="$pxe_port"
+  export HOST_PXE_PORT="$forwarded_pxe_port"
   export CONTAINER_PXE_PORT="8081"
-  export HOST_ETHEREUM_PORT="$anvil_port"
+  export HOST_ETHEREUM_PORT="$forwarded_anvil_port"
   export CONTAINER_ETHEREUM_PORT="8545"
-  export HOST_NODE_PORT="$node_port"
+  export HOST_NODE_PORT="$forwarded_node_port"
   export CONTAINER_NODE_PORT="8080"
-  export HOST_METRICS_PORT="$metrics_port"
+  export HOST_METRICS_PORT="$forwarded_metrics_port"
   export CONTAINER_METRICS_PORT="80"
   export GRAFANA_PASSWORD="$grafana_password"
   export DEBUG="${DEBUG:-""}"

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

@@ -191,9 +191,9 @@ describe('e2e_p2p_governance_proposer', () => {
     const proposal = await governance.read.getProposal([0n]);
 
     const timeToActive = proposal.creation + proposal.config.votingDelay;
-    t.logger.info(`Warpping to ${timeToActive + 1n}`);
+    t.logger.info(`Warping to ${timeToActive + 1n}`);
     await t.ctx.cheatCodes.eth.warp(Number(timeToActive + 1n));
-    t.logger.info(`Warpped to ${timeToActive + 1n}`);
+    t.logger.info(`Warped to ${timeToActive + 1n}`);
     await waitL1Block();
 
     t.logger.info(`Voting`);
@@ -202,9 +202,9 @@ describe('e2e_p2p_governance_proposer', () => {
     t.logger.info(`Voted`);
 
     const timeToExecutable = timeToActive + proposal.config.votingDuration + proposal.config.executionDelay + 1n;
-    t.logger.info(`Warpping to ${timeToExecutable}`);
+    t.logger.info(`Warping to ${timeToExecutable}`);
     await t.ctx.cheatCodes.eth.warp(Number(timeToExecutable));
-    t.logger.info(`Warpped to ${timeToExecutable}`);
+    t.logger.info(`Warped to ${timeToExecutable}`);
     await waitL1Block();
 
     t.logger.info(`Checking governance proposer`);

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

@@ -33,13 +33,11 @@ describe('Forwarder', () => {
 
   let vkTreeRoot: Fr;
   let protocolContractTreeRoot: Fr;
-  // let initialValidators: EthAddress[];
   let l2FeeJuiceAddress: AztecAddress;
   let walletClient: L1Clients['walletClient'];
   let publicClient: L1Clients['publicClient'];
   let forwarder: ForwarderContract;
   let l1TxUtils: L1TxUtils;
-  // let rollupAddress: EthAddress;
   let govProposerAddress: EthAddress;
   let tokenAddress: EthAddress;
   let tokenContract: GetContractReturnType<typeof TestERC20Abi, PublicClient<HttpTransport, Chain>>;
@@ -49,7 +47,6 @@ describe('Forwarder', () => {
     privateKey = privateKeyToAccount('0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba');
     vkTreeRoot = Fr.random();
     protocolContractTreeRoot = Fr.random();
-    // initialValidators = times(3, EthAddress.random);
     l2FeeJuiceAddress = await AztecAddress.random();
 
     ({ anvil, rpcUrl } = await startAnvil());
@@ -65,7 +62,6 @@ describe('Forwarder', () => {
     });
 
     govProposerAddress = deployed.l1ContractAddresses.governanceProposerAddress;
-    // rollupAddress = deployed.l1ContractAddresses.rollupAddress;
 
     forwarder = await ForwarderContract.create(
       privateKey.address,

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

@@ -117,7 +117,7 @@ export class ForwarderContract {
                 address: this.rollupAddress,
                 stateDiff: [
                   {
-                    slot: toHex(RollupContract.checkBlobSlot, true),
+                    slot: toHex(RollupContract.checkBlobStorageSlot, true),
                     value: toHex(0n, true),
                   },
                 ],

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

@@ -45,10 +45,10 @@ export type EpochProofQuoteViemArgs = {
 export class RollupContract {
   private readonly rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>;
 
-  static get checkBlobSlot(): bigint {
+  static get checkBlobStorageSlot(): bigint {
     const asString = RollupStorage.find(storage => storage.label === 'checkBlob')?.slot;
     if (asString === undefined) {
-      throw new Error('checkBlobSlot not found');
+      throw new Error('checkBlobStorageSlot not found');
     }
     return BigInt(asString);
   }

yarn-project/ethereum/src/l1_tx_utils.ts

@@ -663,21 +663,15 @@ export class L1TxUtils {
       address: Hex;
     },
     blobInputs: (L1BlobInputs & { maxFeePerBlobGas: bigint }) | undefined,
-    stateOverride: {
-      address: `0x${string}`;
-      stateDiff: {
-        slot: `0x${string}`;
-        value: `0x${string}`;
-      }[];
-    }[] = [],
+    stateOverride: StateOverride = [],
   ) {
     try {
       await this.publicClient.simulateContract({
         ...args,
         account: this.walletClient.account,
         stateOverride,
       });
-      this.logger?.info('Simulated blob tx', { blobInputs });
+      this.logger?.trace('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
@@ -696,9 +690,9 @@ export class L1TxUtils {
             to: args.address,
             data,
           };
-      this.logger?.info('Preparing tx', { request });
+      this.logger?.trace('Preparing tx', { request });
       await this.walletClient.prepareTransactionRequest(request);
-      this.logger?.info('Prepared tx');
+      this.logger?.trace('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/prover-node/src/prover-node-publisher.ts

@@ -237,8 +237,8 @@ export class ProverNodePublisher {
           abi: RollupAbi,
           address: this.rollupContract.address,
         },
-        undefined,
-        [],
+        /*blobInputs*/ undefined,
+        /*stateOverride*/ [],
       );
       this.log.error(`Rollup submit epoch proof tx reverted. ${errorMsg}`);
       return undefined;

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

@@ -29,7 +29,6 @@ import { SequencerPublisher, VoteType } from './sequencer-publisher.js';
 
 const mockRollupAddress = EthAddress.random().toString();
 const mockGovernanceProposerAddress = EthAddress.random().toString();
-// const mockSlashingProposerAddress = EthAddress.random().toString();
 const mockForwarderAddress = EthAddress.random().toString();
 const BLOB_SINK_PORT = 50525;
 const BLOB_SINK_URL = `http://localhost:${BLOB_SINK_PORT}`;

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

@@ -403,7 +403,7 @@ export class SequencerPublisher {
       }
       return { payload: slashPayload, base: this.slashingProposerContract };
     }
-    throw new Error('Invalid vote type');
+    throw new Error('Unreachable: Invalid vote type');
   }
 
   /**
@@ -606,7 +606,7 @@ export class SequencerPublisher {
             // @note we override checkBlob to false since blobs are not part simulate()
             stateDiff: [
               {
-                slot: toHex(RollupContract.checkBlobSlot, true),
+                slot: toHex(RollupContract.checkBlobStorageSlot, true),
                 value: toHex(0n, true),
               },
             ],