Added settlement-only test

Author: rpanic

packages/sequencer/src/protocol/baselayer/MinaBaseLayer.ts

@@ -2,7 +2,6 @@ import {
   AreProofsEnabled,
   DependencyFactory,
   ModuleContainerLike,
-  DependencyRecord,
 } from "@proto-kit/common";
 import { Mina } from "o1js";
 import { match } from "ts-pattern";
@@ -15,7 +14,6 @@ import {
 } from "../../sequencer/builder/SequencerModule";
 import { MinaTransactionSender } from "../../settlement/transactions/MinaTransactionSender";
 import { DefaultOutgoingMessageAdapter } from "../../settlement/messages/outgoing/DefaultOutgoingMessageAdapter";
-import { IncomingMessagesService } from "../../settlement/messages/IncomingMessagesService";
 
 import { BaseLayer } from "./BaseLayer";
 import { LocalBlockchainUtils } from "./network-utils/LocalBlockchainUtils";
@@ -64,14 +62,6 @@ export class MinaBaseLayer
     super();
   }
 
-  public static dependencies() {
-    return {
-      IncomingMessagesService: {
-        useClass: IncomingMessagesService,
-      },
-    } satisfies DependencyRecord;
-  }
-
   public dependencies() {
     const NetworkUtilsClass = match(this.config.network.type)
       .with("local", () => LocalBlockchainUtils)
@@ -151,5 +141,3 @@ export class MinaBaseLayer
     this.network = Network;
   }
 }
-
-MinaBaseLayer satisfies DependencyFactory;

packages/sequencer/src/sequencer/SettlementStartupModule.ts

@@ -39,39 +39,38 @@ export class SettlementStartupModule {
     return artifacts;
   }
 
-  private async getArtifacts(retry: boolean): Promise<{
-    SettlementSmartContract: CompileArtifact;
-    DispatchSmartContract: CompileArtifact;
-  }> {
-    const settlementVerificationKey =
-      this.compileRegistry.getArtifact("SettlementContract");
-    const dispatchVerificationKey = this.compileRegistry.getArtifact(
-      "DispatchSmartContract"
+  private async getArtifacts<Contracts extends Record<string, true>>(
+    contracts: Contracts,
+    retry: boolean
+  ): Promise<Record<keyof Contracts, CompileArtifact>> {
+    const artifacts = Object.entries(contracts).map(
+      ([contract]) =>
+        [contract, this.compileRegistry.getArtifact(contract)] as const
     );
 
-    if (
-      settlementVerificationKey === undefined ||
-      dispatchVerificationKey === undefined
-    ) {
+    if (artifacts.some((x) => x[1] === undefined)) {
       if (retry) {
         log.info(
           "Settlement Contracts not yet compiled, initializing compilation"
         );
         await this.compile();
-        return await this.getArtifacts(false);
+        return await this.getArtifacts(contracts, false);
       }
       throw new Error(
         "Settlement contract verification keys not available for deployment"
       );
     }
 
-    return {
-      SettlementSmartContract: settlementVerificationKey,
-      DispatchSmartContract: dispatchVerificationKey,
-    };
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return Object.fromEntries(artifacts) as Record<
+      keyof Contracts,
+      CompileArtifact
+    >;
   }
 
-  public async retrieveVerificationKeys() {
-    return await this.getArtifacts(true);
+  public async retrieveVerificationKeys<Contracts extends Record<string, true>>(
+    contracts: Contracts
+  ) {
+    return await this.getArtifacts(contracts, true);
   }
 }

packages/sequencer/src/settlement/BridgingModule.ts

@@ -36,6 +36,7 @@ import {
   UInt32,
 } from "o1js";
 import {
+  DependencyRecord,
   filterNonUndefined,
   LinkedMerkleTree,
   log,
@@ -65,6 +66,7 @@ import { MinaSigner } from "./MinaSigner";
 import { SignedSettlementPermissions } from "./permissions/SignedSettlementPermissions";
 import { ProvenSettlementPermissions } from "./permissions/ProvenSettlementPermissions";
 import { AddressRegistry } from "./interactions/AddressRegistry";
+import { IncomingMessagesService } from "./messages/IncomingMessagesService";
 
 export type SettlementTokenConfig = Record<
   string,
@@ -126,6 +128,14 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
     this.utils = new SettlementUtils(baseLayer, signer);
   }
 
+  public dependencies() {
+    return {
+      IncomingMessagesService: {
+        useClass: IncomingMessagesService,
+      },
+    } satisfies DependencyRecord;
+  }
+
   public getDispatchContract() {
     if (this.dispatchContract === undefined) {
       const address = this.getDispatchContractAddress();
@@ -685,3 +695,5 @@ export class BridgingModule extends SequencerModule<BridgingModuleConfig> {
   }
   /* eslint-enable no-await-in-loop */
 }
+
+// BridgingModule satisfies DependencyFactory;

packages/sequencer/src/settlement/interactions/bridging/BridgingDeployInteraction.ts

@@ -71,7 +71,10 @@ export class BridgingDeployInteraction implements DeployInteraction {
     });
 
     const verificationsKeys =
-      await this.settlementStartupModule.retrieveVerificationKeys();
+      await this.settlementStartupModule.retrieveVerificationKeys({
+        SettlementContract: true,
+        DispatchSmartContract: true,
+      });
 
     const utils = new SettlementUtils(this.baseLayer, this.signer);
     await utils.fetchContractAccounts(settlementContract, dispatchContract);
@@ -102,7 +105,7 @@ export class BridgingDeployInteraction implements DeployInteraction {
         await settlementContract.deployAndInitialize(
           {
             verificationKey:
-              verificationsKeys.SettlementSmartContract.verificationKey,
+              verificationsKeys.SettlementContract.verificationKey,
           },
           permissions.settlementContract(),
           feepayer,

packages/sequencer/src/settlement/interactions/vanilla/VanillaDeployInteraction.ts

@@ -73,7 +73,9 @@ export class VanillaDeployInteraction implements DeployInteraction {
     await utils.fetchContractAccounts(settlementContract);
 
     const verificationsKeys =
-      await this.settlementStartupModule.retrieveVerificationKeys();
+      await this.settlementStartupModule.retrieveVerificationKeys({
+        SettlementContract: true,
+      });
 
     const permissions = this.baseLayer.isSignedSettlement()
       ? new SignedSettlementPermissions()
@@ -87,12 +89,12 @@ export class VanillaDeployInteraction implements DeployInteraction {
         memo: "Protokit settlement deploy",
       },
       async () => {
-        AccountUpdate.fundNewAccount(feepayer, 2);
+        AccountUpdate.fundNewAccount(feepayer, 1);
 
         await settlementContract.deployAndInitialize(
           {
             verificationKey:
-              verificationsKeys.SettlementSmartContract.verificationKey,
+              verificationsKeys.SettlementContract.verificationKey,
           },
           permissions.settlementContract(),
           feepayer,

packages/sequencer/src/settlement/interactions/vanilla/VanillaSettlementInteraction.ts

@@ -1,4 +1,4 @@
-import { inject } from "tsyringe";
+import { inject, injectable } from "tsyringe";
 import { Field, Mina } from "o1js";
 import {
   BATCH_SIGNATURE_PREFIX,
@@ -21,6 +21,7 @@ import { SettleableBatch } from "../../../storage/model/Batch";
 import { Settlement } from "../../../storage/model/Settlement";
 import { SettleInteraction } from "../SettleInteraction";
 
+@injectable()
 export class VanillaSettlementInteraction implements SettleInteraction {
   public constructor(
     @inject("AddressRegistry")

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

@@ -5,7 +5,7 @@ import { SettlementStorage } from "../../storage/repositories/SettlementStorage"
 import { MessageStorage } from "../../storage/repositories/MessageStorage";
 import { BlockStorage } from "../../storage/repositories/BlockStorage";
 import { PendingTransaction } from "../../mempool/PendingTransaction";
-import { BridgingModule } from "../BridgingModule";
+import type { BridgingModule } from "../BridgingModule";
 
 import { IncomingMessageAdapter } from "./IncomingMessageAdapter";