added settlement module keys config, and worker startup signed settle…

…ment to the payload
proto-kit · Dec 9, 2024 · ffd08ec · ffd08ec
1 parent 22e6c1d
commit ffd08ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/packages/sequencer/src/sequencer/SequencerStartupModule.ts b/packages/sequencer/src/sequencer/SequencerStartupModule.ts
@@ -19,6 +19,7 @@ import {
   CompilerTaskParams,
 } from "../protocol/production/tasks/CircuitCompilerTask";
 import { VerificationKeyService } from "../protocol/runtime/RuntimeVerificationKeyService";
+import { SettlementModule } from "../settlement/SettlementModule";
 
 import { SequencerModule, sequencerModule } from "./builder/SequencerModule";
 
@@ -31,7 +32,8 @@ export class SequencerStartupModule extends SequencerModule {
     private readonly compileTask: CircuitCompilerTask,
     private readonly verificationKeyService: VerificationKeyService,
     private readonly registrationFlow: WorkerRegistrationFlow,
-    private readonly compileRegistry: CompileRegistry
+    private readonly compileRegistry: CompileRegistry,
+    private readonly settlementModule: SettlementModule
   ) {
     super();
   }
@@ -140,6 +142,7 @@ export class SequencerStartupModule extends SequencerModule {
       runtimeVerificationKeyRoot: root,
       bridgeContractVerificationKey: bridgeVk?.verificationKey,
       compiledArtifacts: this.compileRegistry.getAllArtifacts(),
+      signedSettlements: this.settlementModule.utils.isSignedSettlement(),
     });
 
     log.info("Protocol circuits compiled successfully, commencing startup");

diff --git a/packages/sequencer/src/settlement/SettlementModule.ts b/packages/sequencer/src/settlement/SettlementModule.ts
@@ -59,6 +59,7 @@ export interface SettlementModuleConfig {
   keys?: {
     settlement: PrivateKey;
     dispatch: PrivateKey;
+    minaBridge: PrivateKey;
   };
 }
 
@@ -428,6 +429,8 @@ export class SettlementModule
   }
 
   public async start(): Promise<void> {
+    this.keys = this.config.keys;
+    this.addresses = this.config.addresses;
     const contractArgs = SettlementSmartContractBase.args;
 
     SettlementSmartContractBase.args = {

diff --git a/packages/sequencer/src/worker/worker/startup/WorkerRegistrationTask.ts b/packages/sequencer/src/worker/worker/startup/WorkerRegistrationTask.ts
@@ -24,6 +24,7 @@ import {
   ArtifactRecordSerializer,
   SerializedArtifactRecord,
 } from "../../../protocol/production/tasks/CircuitCompilerTask";
+import { SettlementModule } from "../../../settlement/SettlementModule";
 
 import { CloseWorkerError } from "./CloseWorkerError";
 
@@ -32,6 +33,7 @@ export type WorkerStartupPayload = {
   // This has to be nullable, since
   bridgeContractVerificationKey?: VerificationKey;
   compiledArtifacts: ArtifactRecord;
+  signedSettlements: boolean;
 };
 
 @injectable()
@@ -44,6 +46,7 @@ export class WorkerRegistrationTask
 
   public constructor(
     @inject("Protocol") private readonly protocol: Protocol<any>,
+    @inject("SettlementModule") settlementModule: SettlementModule,
     private readonly compileRegistry: CompileRegistry
   ) {
     super();
@@ -71,6 +74,9 @@ export class WorkerRegistrationTask
         input.bridgeContractVerificationKey;
     }
 
+    SettlementSmartContractBase.args.signedSettlements =
+      input.signedSettlements;
+
     this.compileRegistry.addArtifactsRaw(input.compiledArtifacts);
     this.protocol.dependencyContainer
       .resolve(ChildVerificationKeyService)
@@ -87,6 +93,7 @@ export class WorkerRegistrationTask
       runtimeVerificationKeyRoot: string;
       bridgeContractVerificationKey: VerificationKeyJSON | undefined;
       compiledArtifacts: SerializedArtifactRecord;
+      signedSettlements: boolean;
     };
 
     const artifactSerializer = new ArtifactRecordSerializer();
@@ -104,6 +111,7 @@ export class WorkerRegistrationTask
           compiledArtifacts: artifactSerializer.toJSON(
             payload.compiledArtifacts
           ),
+          signedSettlements: payload.signedSettlements,
         } satisfies WorkerStartupPayloadJSON);
       },
       fromJSON: (payload: string) => {
@@ -122,6 +130,7 @@ export class WorkerRegistrationTask
           compiledArtifacts: artifactSerializer.fromJSON(
             jsonObject.compiledArtifacts
           ),
+          signedSettlements: jsonObject.signedSettlements,
         };
       },
     };