Finished signed settlement

Author: rpanic

.eslintrc

@@ -95,7 +95,7 @@
 
   "overrides": [
     {
-      "files": ["*.test.ts"],
+      "files": ["*.test.ts", "**/test/**/*.ts"],
       "rules": {
         "no-console": "off",
         "import/no-extraneous-dependencies": "off",

packages/protocol/src/settlement/contracts/SettlementSmartContract.ts

@@ -97,7 +97,7 @@ export class SettlementSmartContract
   };
 
   @state(Field) public sequencerKey = State<Field>();
-  @state(UInt32) public lastSettlementL1Block = State<UInt32>();
+  @state(UInt32) public lastSettlementL1BlockHeight = State<UInt32>();
 
   @state(Field) public stateRoot = State<Field>();
   @state(Field) public networkStateHash = State<Field>();
@@ -148,8 +148,8 @@ export class SettlementSmartContract
     const networkStateHash = this.networkStateHash.getAndRequireEquals();
     const blockHashRoot = this.blockHashRoot.getAndRequireEquals();
     const sequencerKey = this.sequencerKey.getAndRequireEquals();
-    const lastSettlementL1Block =
-      this.lastSettlementL1Block.getAndRequireEquals();
+    const lastSettlementL1BlockHeight =
+      this.lastSettlementL1BlockHeight.getAndRequireEquals();
     const onChainDispatchContractAddressX =
       this.dispatchContractAddressX.getAndRequireEquals();
 
@@ -168,11 +168,11 @@ export class SettlementSmartContract
     const promisedMessagesHash = dispatchContract.promisedMessagesHash.get();
 
     // Get block height and use the lower bound for all ops
-    const minBlockIncluded = this.network.globalSlotSinceGenesis.get();
-    this.network.globalSlotSinceGenesis.requireBetween(
-      minBlockIncluded,
+    const minBlockHeightIncluded = this.network.blockchainLength.get();
+    this.network.blockchainLength.requireBetween(
+      minBlockHeightIncluded,
       // 5 because that is the length the newPromisedMessagesHash will be valid
-      minBlockIncluded.add(4)
+      minBlockHeightIncluded.add(4)
     );
 
     // Check signature/escape catch
@@ -182,22 +182,18 @@ export class SettlementSmartContract
     );
     const signatureValid = signature.verify(publicKey, [
       BATCH_SIGNATURE_PREFIX,
-      lastSettlementL1Block.value,
+      lastSettlementL1BlockHeight.value,
     ]);
-    const escapeHatchActivated = lastSettlementL1Block
+    const escapeHatchActivated = lastSettlementL1BlockHeight
       .add(UInt32.from(escapeHatchSlotsInterval))
-      .lessThan(minBlockIncluded);
+      .lessThan(minBlockHeightIncluded);
     signatureValid
       .or(escapeHatchActivated)
       .assertTrue(
         "Sequencer signature not valid and escape hatch not activated"
       );
 
     // Assert correctness of networkState witness
-    Provable.log("Network State Hash ", networkStateHash);
-    Provable.log("input Hash ", inputNetworkState.hash());
-    Provable.log("equals ", inputNetworkState.hash().equals(networkStateHash));
-
     inputNetworkState
       .hash()
       .assertEquals(networkStateHash, "InputNetworkState witness not valid");
@@ -218,7 +214,7 @@ export class SettlementSmartContract
       blockHashRoot,
       stateRoot,
       networkStateHash,
-      lastSettlementL1Block,
+      lastSettlementL1BlockHeight,
       sequencerKey: publicKey,
     };
     const inputs: SettlementHookInputs = {
@@ -227,7 +223,7 @@ export class SettlementSmartContract
       newPromisedMessagesHash,
       fromNetworkState: inputNetworkState,
       toNetworkState: outputNetworkState,
-      currentL1Block: minBlockIncluded,
+      currentL1BlockHeight: minBlockHeightIncluded,
     };
     await mapSequential(hooks, async (hook) => {
       await hook.beforeSettlement(this, inputs);
@@ -238,9 +234,6 @@ export class SettlementSmartContract
       blockProof.publicInput.stateRoot,
       "Input state root not matching"
     );
-    Provable.log("Network State Hash ", networkStateHash);
-    Provable.log("input Hash ", inputNetworkState.hash());
-    Provable.log("Proof Hash ", blockProof.publicInput.networkStateHash);
 
     networkStateHash.assertEquals(
       blockProof.publicInput.networkStateHash,
@@ -270,7 +263,7 @@ export class SettlementSmartContract
       newPromisedMessagesHash
     );
 
-    this.lastSettlementL1Block.set(minBlockIncluded);
+    this.lastSettlementL1BlockHeight.set(minBlockHeightIncluded);
   }
 
   @method

packages/protocol/src/settlement/modularity/ProvableSettlementHook.ts

@@ -7,7 +7,7 @@ import type { SettlementSmartContract } from "../contracts/SettlementSmartContra
 
 export type SettlementStateRecord = {
   sequencerKey: PublicKey;
-  lastSettlementL1Block: UInt32;
+  lastSettlementL1BlockHeight: UInt32;
 
   stateRoot: Field;
   networkStateHash: Field;
@@ -20,7 +20,7 @@ export type SettlementHookInputs = {
   toNetworkState: NetworkState;
   newPromisedMessagesHash: Field;
   contractState: SettlementStateRecord;
-  currentL1Block: UInt32;
+  currentL1BlockHeight: UInt32;
 };
 
 export abstract class ProvableSettlementHook<

packages/protocol/src/settlement/modules/NetworkStateSettlementModule.ts

@@ -19,14 +19,14 @@ export class NetworkStateSettlementModule extends ProvableSettlementHook<Network
       fromNetworkState,
       toNetworkState,
       contractState,
-      currentL1Block,
+      currentL1BlockHeight,
     }: SettlementHookInputs
   ) {
-    const { lastSettlementL1Block } = contractState;
+    const { lastSettlementL1BlockHeight } = contractState;
 
     const blocksPerL1Block = this.config.blocksPerL1Block.toConstant();
 
-    const numL1Blocks = currentL1Block.sub(lastSettlementL1Block);
+    const numL1Blocks = currentL1BlockHeight.sub(lastSettlementL1BlockHeight);
     const expectedHeightDiff = numL1Blocks.toUInt64().mul(blocksPerL1Block);
 
     const actualHeightDiff = toNetworkState.block.height.sub(

packages/sequencer/src/protocol/baselayer/accounts/MinaBlockchainAccounts.ts

@@ -1,9 +1,10 @@
 import { injectable, inject } from "tsyringe";
 import { range } from "@proto-kit/common";
-import { BaseLayer } from "../BaseLayer";
-import { MinaBaseLayer } from "../MinaBaseLayer";
 import { PrivateKey, Mina, Lightnet, PublicKey, AccountUpdate } from "o1js";
+
 import { MinaTransactionSender } from "../../../settlement/transactions/MinaTransactionSender";
+import { BaseLayer } from "../BaseLayer";
+import { MinaBaseLayer } from "../MinaBaseLayer";
 import { FeeStrategy } from "../fees/FeeStrategy";
 
 type LocalBlockchain = Awaited<ReturnType<typeof Mina.LocalBlockchain>>;

packages/sequencer/src/protocol/baselayer/fees/ConstantFeeStrategy.ts

@@ -1,8 +1,10 @@
+import { noop } from "@proto-kit/common";
+
 import {
   sequencerModule,
   SequencerModule,
 } from "../../../sequencer/builder/SequencerModule";
-import { noop } from "@proto-kit/common";
+
 import { FeeStrategy } from "./FeeStrategy";
 
 export type ConstantFeeStrategyConfig = {

packages/sequencer/src/settlement/SettlementModule.ts

@@ -269,12 +269,15 @@ export class SettlementModule
 
   private async fetchContractAccounts() {
     const contracts = this.getContracts();
-    if (contracts !== undefined) {
-      const c1 = await fetchAccount({
+    if (
+      contracts !== undefined &&
+      this.baseLayer.config.network.type !== "local"
+    ) {
+      await fetchAccount({
         publicKey: contracts.settlement.address,
         tokenId: contracts.settlement.tokenId,
       });
-      const c2 = await fetchAccount({
+      await fetchAccount({
         publicKey: contracts.dispatch.address,
         tokenId: contracts.dispatch.tokenId,
       });

packages/sequencer/src/settlement/messages/MinaIncomingMessageAdapter.ts

@@ -102,10 +102,6 @@ export class MinaIncomingMessageAdapter implements IncomingMessageAdapter {
       );
     }
 
-    if (actions.length > 0) {
-      console.log(params.fromL1BlockHeight);
-    }
-
     const events = await network.fetchEvents(address, undefined, {
       from: UInt32.from(Math.max(params.fromL1BlockHeight - 5, 0)),
     });

packages/sequencer/src/settlement/transactions/MinaTransactionSender.ts

@@ -24,16 +24,36 @@ interface TxEvents extends EventsRecord {
   rejected: [any];
 }
 
-class OnceEventEmitter<
+class OnceReplayingEventEmitter<
   Events extends EventsRecord,
 > extends EventEmitter<Events> {
+  public emitted: Partial<Events> = {};
+
   public emit<Key extends keyof Events>(
     event: Key,
     ...parameters: Events[Key]
   ) {
     super.emit(event, ...parameters);
+    this.emitted[event] = parameters;
     this.listeners[event] = [];
   }
+
+  public onAll(listener: (event: keyof Events, args: unknown[]) => void) {
+    Object.entries(this.emitted).forEach(([key, params]) => {
+      if (params !== undefined) listener(key, params);
+    });
+    super.onAll(listener);
+  }
+
+  public on<Key extends keyof Events>(
+    event: Key,
+    listener: (...args: Events[Key]) => void
+  ) {
+    if (this.emitted[event] !== undefined) {
+      listener(...this.emitted[event]!);
+    }
+    super.on(event, listener);
+  }
 }
 
 @injectable()
@@ -111,7 +131,7 @@ export class MinaTransactionSender {
     // eslint-disable-next-line no-plusplus
     const id = this.txIdCursor++;
     this.cache.push({ tx, id });
-    const eventEmitter = new OnceEventEmitter<TxEvents>();
+    const eventEmitter = new OnceReplayingEventEmitter<TxEvents>();
     this.txStatusEmitters[id] = eventEmitter;
 
     let removedLastIteration = 0;

packages/sequencer/test/TestingSequencer.ts

@@ -14,6 +14,7 @@ import {
   BlockProducerModule,
   VanillaTaskWorkerModules,
 } from "../src";
+import { ConstantFeeStrategy } from "../src/protocol/baselayer/fees/ConstantFeeStrategy";
 
 export interface DefaultTestingSequencerModules extends SequencerModulesRecord {
   Database: typeof InMemoryDatabase;
@@ -24,6 +25,7 @@ export interface DefaultTestingSequencerModules extends SequencerModulesRecord {
   BlockProducerModule: typeof BlockProducerModule;
   BlockTrigger: typeof ManualBlockTrigger;
   TaskQueue: typeof LocalTaskQueue;
+  FeeStrategy: typeof ConstantFeeStrategy;
 }
 
 export function testingSequencerFromModules<
@@ -38,7 +40,6 @@ export function testingSequencerFromModules<
     ...additionalTaskWorkerModules,
   });
 
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const defaultModules: DefaultTestingSequencerModules = {
     Database: InMemoryDatabase,
     Mempool: PrivateMempool,
@@ -48,6 +49,7 @@ export function testingSequencerFromModules<
     BlockProducerModule,
     BlockTrigger: ManualBlockTrigger,
     TaskQueue: LocalTaskQueue,
+    FeeStrategy: ConstantFeeStrategy,
   } as DefaultTestingSequencerModules;
 
   return Sequencer.from({