refactor(sequencer): simplify canonicality guard and governance proposer API

Resolve the canonical rollup via getRollupAddress() instead of the getInstance()
wrapper, dropping the now-unused instance parameter threaded through
createSignalRequestWithSignature. Since the guard returns early when the configured
rollup is not canonical, round accounting and the EIP-712 digest can just use the
configured rollup address. Also drop the redundant sawExecuted flag from
getPayloadProposalStatus (the executed verdict is already memoized in the set).

Author: spalladino

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

@@ -21,7 +21,6 @@ export interface IEmpireBase {
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,
-    instance?: Hex,
   ): Promise<L1TxRequest>;
 }
 

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

@@ -325,8 +325,6 @@ export class ReadOnlyGovernanceContract {
     const block = await this.client.getBlock();
     const hardCutoff = block.timestamp - MAX_PROPOSAL_LIFETIME_SECONDS;
 
-    let sawExecuted = false;
-
     // Proposals are append-only with monotonically non-decreasing creation timestamps, so iterating
     // from newest -> oldest lets us early-stop as soon as we cross the lifetime cutoff.
     for (let id = proposalCount - 1n; id >= 0n; id--) {
@@ -350,16 +348,13 @@ export class ReadOnlyGovernanceContract {
       }
 
       if (proposal.state === ProposalState.Executed) {
-        sawExecuted = true;
         this.executedPayloads.add(target);
       }
+
       // Rejected/Dropped/Expired proposals allow re-proposing the same payload; keep scanning.
     }
 
-    if (sawExecuted || this.executedPayloads.has(target)) {
-      return 'executed';
-    }
-    return 'none';
+    return this.executedPayloads.has(target) ? 'executed' : 'none';
   }
 
   /**

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

@@ -38,16 +38,16 @@ export class GovernanceProposerContract implements IEmpireBase {
     this.proposer = getContract({ address, abi: GovernanceProposerAbi, client });
   }
 
-  public get address() {
+  public get address(): EthAddress {
     return EthAddress.fromString(this.proposer.address);
   }
 
-  public async getRollupAddress() {
+  public async getRollupAddress(): Promise<EthAddress> {
     return EthAddress.fromString(await this.proposer.read.getInstance());
   }
 
   @memoize
-  public async getRegistryAddress() {
+  public async getRegistryAddress(): Promise<EthAddress> {
     return EthAddress.fromString(await this.proposer.read.REGISTRY());
   }
 
@@ -59,10 +59,6 @@ export class GovernanceProposerContract implements IEmpireBase {
     return this.proposer.read.ROUND_SIZE();
   }
 
-  public getInstance() {
-    return this.proposer.read.getInstance();
-  }
-
   public computeRound(slot: SlotNumber): Promise<bigint> {
     return this.proposer.read.computeRound([BigInt(slot)]);
   }
@@ -102,13 +98,12 @@ export class GovernanceProposerContract implements IEmpireBase {
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,
-    instance?: Hex,
   ): Promise<L1TxRequest> {
     const signature = await signSignalWithSig(
       signer,
       payload,
       slot,
-      instance ?? (await this.getInstance()),
+      (await this.getRollupAddress()).toString(),
       this.address.toString(),
       chainId,
     );

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

@@ -157,7 +157,7 @@ describe('SequencerPublisher', () => {
 
     governanceProposerContract = mock<GovernanceProposerContract>();
     // By default the configured rollup is the canonical instance, so the canonicality guard passes.
-    governanceProposerContract.getInstance.mockResolvedValue(mockRollupAddress);
+    governanceProposerContract.getRollupAddress.mockResolvedValue(EthAddress.fromString(mockRollupAddress));
     governanceProposerContract.getPayloadProposalStatus.mockResolvedValue('none');
 
     epochCache = mock<EpochCache>();
@@ -1051,7 +1051,7 @@ describe('SequencerPublisher', () => {
 
   it('does not signal when the configured rollup is not canonical', async () => {
     const { govPayload } = mockGovernancePayload();
-    governanceProposerContract.getInstance.mockResolvedValue(EthAddress.random().toString());
+    governanceProposerContract.getRollupAddress.mockResolvedValue(EthAddress.random());
 
     expect(
       await publisher.enqueueGovernanceCastSignal(

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

@@ -961,37 +961,21 @@ export class SequencerPublisher {
       this.log.warn(`Cannot enqueue vote cast signal ${signalType} for address zero at slot ${slotNumber}`);
       return false;
     }
-    // Resolve the canonical rollup instance once and reuse it for round accounting and the EIP-712
-    // digest, so this signal can't straddle a canonical-rollup change between reads. Only the
-    // canonical rollup's current proposer can signal, so a non-canonical node would only waste gas
-    // on a reverting signal. Fail open (proceed with the configured rollup) if the lookup errors,
-    // for the same liveness reason as the proposal-status check below.
-    let canonicalInstance: Hex | undefined;
-    try {
-      canonicalInstance = await base.getInstance();
-    } catch (err) {
-      this.log.error(`Failed to resolve canonical rollup instance (signalling anyway)`, err, {
-        slotNumber,
-        signalType,
-      });
-    }
 
-    if (
-      canonicalInstance !== undefined &&
-      !EthAddress.fromString(canonicalInstance).equals(EthAddress.fromString(this.rollupContract.address.toString()))
-    ) {
+    const canonicalRollup = await base.getRollupAddress();
+    if (!canonicalRollup.equals(EthAddress.fromString(this.rollupContract.address))) {
       this.log.warn(`Rollup ${this.rollupContract.address} is not canonical, skipping governance signal`, {
         slotNumber,
         signalType,
-        canonicalInstance,
+        canonicalRollup,
+        targetRollup: this.rollupContract.address,
         payload: payload.toString(),
       });
       return false;
     }
 
-    const rollupForRound = canonicalInstance ?? this.rollupContract.address;
     const round = await base.computeRound(slotNumber);
-    const roundInfo = await base.getRoundInfo(rollupForRound, round);
+    const roundInfo = await base.getRoundInfo(this.rollupContract.address, round);
 
     if (roundInfo.quorumReached) {
       return false;
@@ -1051,7 +1035,6 @@ export class SequencerPublisher {
       this.config.l1ChainId,
       signerAddress.toString(),
       signer,
-      canonicalInstance,
     );
     this.log.debug(`Created ${action} request with signature`, {
       request,

yarn-project/sequencer-client/src/sequencer/checkpoint_voter.ha.integration.test.ts

@@ -72,8 +72,7 @@ describe('CheckpointVoter HA Integration', () => {
   function createMockGovernanceContract(): MockProxy<GovernanceProposerContract> {
     const contract = mock<GovernanceProposerContract>();
     Object.defineProperty(contract, 'address', { value: EthAddress.random(), writable: false });
-    // The configured rollup is the canonical instance, so the publisher's canonicality guard passes.
-    contract.getInstance.mockResolvedValue(rollupContract.address.toString() as `0x${string}`);
+    contract.getRollupAddress.mockResolvedValue(EthAddress.fromString(rollupContract.address));
     contract.getPayloadProposalStatus.mockResolvedValue('none');
     contract.getRoundInfo.mockResolvedValue({
       lastSignalSlot: SlotNumber(1),
@@ -179,7 +178,7 @@ describe('CheckpointVoter HA Integration', () => {
 
     // Set up mocks using helper functions
     rollupContract = mock<RollupContract>();
-    Object.defineProperty(rollupContract, 'address', { value: EthAddress.random(), writable: false });
+    Object.defineProperty(rollupContract, 'address', { value: EthAddress.random().toString(), writable: false });
     rollupContract.listenToSlasherChanged.mockReturnValue(undefined as any);
     rollupContract.getSlashingProposer.mockResolvedValue(undefined);
 
@@ -734,7 +733,6 @@ describe('CheckpointVoter HA Integration', () => {
         expect.any(Number), // chainId
         expect.any(String), // signerAddress
         expect.any(Function), // signer function
-        expect.any(String), // canonical rollup instance
       );
 
       // Verify Node A's request was sent to L1 via Multicall3.forward