@aztec/sequencer-client 0.59.0 → 0.61.0

package/src/sequencer/sequencer.ts

@@ -40,7 +40,7 @@ import { inspect } from 'util';
 import { type BlockBuilderFactory } from '../block_builder/index.js';
 import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type L1Publisher } from '../publisher/l1-publisher.js';
-import { prettyLogViemError } from '../publisher/utils.js';
+import { prettyLogViemErrorMsg } from '../publisher/utils.js';
 import { type TxValidatorFactory } from '../tx_validator/tx_validator_factory.js';
 import { type SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
@@ -137,6 +137,10 @@ export class Sequencer {
     if (config.allowedInTeardown) {
       this.allowedInTeardown = config.allowedInTeardown;
     }
+    if (config.gerousiaPayload) {
+      this.publisher.setPayload(config.gerousiaPayload);
+    }
+
     // TODO: Just read everything from the config object as needed instead of copying everything into local vars.
     this.config = config;
   }
@@ -223,6 +227,15 @@ export class Sequencer {
       return;
     }
 
+    const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(
+      new Fr(newBlockNumber),
+      this._coinbase,
+      this._feeRecipient,
+      slot,
+    );
+
+    void this.publisher.castVote(slot, newGlobalVariables.timestamp.toBigInt());
+
     if (!this.shouldProposeBlock(historicalHeader, {})) {
       return;
     }
@@ -237,13 +250,6 @@ export class Sequencer {
     }
     this.log.debug(`Retrieved ${pendingTxs.length} txs from P2P pool`);
 
-    const newGlobalVariables = await this.globalsBuilder.buildGlobalVariables(
-      new Fr(newBlockNumber),
-      this._coinbase,
-      this._feeRecipient,
-      slot,
-    );
-
     // If I created a "partial" header here that should make our job much easier.
     const proposalHeader = new Header(
       new AppendOnlyTreeSnapshot(Fr.fromBuffer(chainTipArchive), 1),
@@ -309,8 +315,10 @@ export class Sequencer {
       this.log.debug(`Can propose block ${proposalBlockNumber} at slot ${slot}`);
       return slot;
     } catch (err) {
-      this.log.verbose(`Rejected from being able to propose at next block with ${tipArchive}`);
-      prettyLogViemError(err, this.log);
+      const msg = prettyLogViemErrorMsg(err);
+      this.log.verbose(
+        `Rejected from being able to propose at next block with ${tipArchive.toString('hex')}: ${msg ? `${msg}` : ''}`,
+      );
       throw err;
     }
   }
@@ -548,20 +556,12 @@ export class Sequencer {
   protected async createProofClaimForPreviousEpoch(slotNumber: bigint): Promise<EpochProofQuote | undefined> {
     try {
       // Find out which epoch we are currently in
-      const epochForBlock = await this.publisher.getEpochForSlotNumber(slotNumber);
-      if (epochForBlock < 1n) {
-        // It's the 0th epoch, nothing to be proven yet
-        this.log.verbose(`First epoch has no claim`);
-        return undefined;
-      }
-      const epochToProve = epochForBlock - 1n;
-      // Find out the next epoch that can be claimed
-      const canClaim = await this.publisher.nextEpochToClaim();
-      if (canClaim != epochToProve) {
-        // It's not the one we are looking to claim
-        this.log.verbose(`Unable to claim previous epoch (${canClaim} != ${epochToProve})`);
+      const epochToProve = await this.publisher.getClaimableEpoch();
+      if (epochToProve === undefined) {
+        this.log.verbose(`No epoch to prove`);
         return undefined;
       }
+
       // Get quotes for the epoch to be proven
       const quotes = await this.p2pClient.getEpochProofQuotes(epochToProve);
       this.log.verbose(`Retrieved ${quotes.length} quotes, slot: ${slotNumber}, epoch to prove: ${epochToProve}`);

package/src/tx_validator/gas_validator.ts

@@ -61,14 +61,13 @@ export class GasTxValidator implements TxValidator<Tx> {
     const setupFns = EnqueuedCallsProcessor.getExecutionRequestsByPhase(tx, PublicKernelPhase.SETUP);
     const claimFunctionCall = setupFns.find(
       fn =>
-        fn.contractAddress.equals(this.#feeJuiceAddress) &&
+        fn.callContext.contractAddress.equals(this.#feeJuiceAddress) &&
         fn.callContext.msgSender.equals(this.#feeJuiceAddress) &&
         fn.args.length > 2 &&
         // Public functions get routed through the dispatch function, whose first argument is the target function selector.
         fn.args[0].equals(FunctionSelector.fromSignature('_increase_public_balance((Field),Field)').toField()) &&
         fn.args[1].equals(feePayer) &&
-        !fn.callContext.isStaticCall &&
-        !fn.callContext.isDelegateCall,
+        !fn.callContext.isStaticCall,
     );
 
     const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[2]) : initialBalance;

package/src/tx_validator/phases_validator.ts

@@ -50,7 +50,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
         this.#log.warn(
           `Rejecting tx ${Tx.getHash(tx)} because it calls setup function not on allow list: ${
-            setupFn.contractAddress
+            setupFn.callContext.contractAddress
           }:${setupFn.callContext.functionSelector}`,
         );
 
@@ -66,10 +66,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       return true;
     }
 
-    const {
-      contractAddress,
-      callContext: { functionSelector },
-    } = publicCall;
+    const { contractAddress, functionSelector } = publicCall.callContext;
 
     // do these checks first since they don't require the contract class
     for (const entry of allowList) {
@@ -88,7 +85,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       const contractClass = await this.contractDataSource.getContractInstance(contractAddress);
 
       if (!contractClass) {
-        throw new Error(`Contract not found: ${publicCall.contractAddress.toString()}`);
+        throw new Error(`Contract not found: ${contractAddress}`);
       }
 
       if ('classId' in entry && !('selector' in entry)) {

package/src/tx_validator/test_utils.ts

@@ -25,20 +25,20 @@ function patchFn(
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
 ): { address: AztecAddress; selector: FunctionSelector } {
   const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1)!;
-  fn.contractAddress = overrides.address ?? fn.contractAddress;
+  fn.callContext.contractAddress = overrides.address ?? fn.callContext.contractAddress;
   fn.callContext.functionSelector = overrides.selector;
   fn.args = overrides.args ?? fn.args;
   fn.callContext.msgSender = overrides.msgSender ?? fn.callContext.msgSender;
   tx.enqueuedPublicFunctionCalls[index] = fn;
 
   const request = tx.data.forPublic![where].publicCallStack[index];
-  request.contractAddress = fn.contractAddress;
+  request.callContext.contractAddress = fn.callContext.contractAddress;
   request.callContext = fn.callContext;
   request.argsHash = computeVarArgsHash(fn.args);
   tx.data.forPublic![where].publicCallStack[index] = request;
 
   return {
-    address: fn.contractAddress,
+    address: fn.callContext.contractAddress,
     selector: fn.callContext.functionSelector,
   };
 }