Clear atomicity units

packages/api/package.json

@@ -49,7 +49,8 @@
     "@proto-kit/module": "*",
     "@proto-kit/protocol": "*",
     "@proto-kit/sequencer": "*",
-    "o1js": "^2.10.0",
+    "o1js": "2.10.0-dev.6d3a3",
+    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/api/src/graphql/modules/LinkedMerkleWitnessResolver.ts

@@ -6,6 +6,7 @@ import {
 } from "@proto-kit/common";
 import {
   AsyncLinkedLeafStore,
+  AsyncMerkleTreeStore,
   CachedLinkedLeafStore,
 } from "@proto-kit/sequencer";
 
@@ -42,7 +43,9 @@ export class LinkedMerkleWitnessDTO {
 export class LinkedMerkleWitnessResolver extends GraphqlModule<object> {
   public constructor(
     @inject("AsyncLinkedLeafStore")
-    private readonly treeStore: AsyncLinkedLeafStore
+    private readonly leafStore: AsyncLinkedLeafStore,
+    @inject("AsyncTreeStore")
+    private readonly treeStore: AsyncMerkleTreeStore
   ) {
     super();
   }
@@ -52,7 +55,10 @@ export class LinkedMerkleWitnessResolver extends GraphqlModule<object> {
       "Allows retrieval of merkle witnesses corresponding to a specific path in the appchain's state tree. These proves are generally retrieved from the current 'proven' state",
   })
   public async witness(@Arg("path") path: string) {
-    const syncStore = await CachedLinkedLeafStore.new(this.treeStore);
+    const syncStore = await CachedLinkedLeafStore.new(
+      this.leafStore,
+      this.treeStore
+    );
 
     const tree = new LinkedMerkleTree(syncStore.treeStore, syncStore);
     await syncStore.preloadKey(BigInt(path));

packages/api/src/graphql/modules/MerkleWitnessResolver.ts

@@ -9,6 +9,7 @@ import {
 } from "@proto-kit/common";
 import {
   AsyncLinkedLeafStore,
+  AsyncMerkleTreeStore,
   CachedLinkedLeafStore,
 } from "@proto-kit/sequencer";
 
@@ -92,7 +93,9 @@ export class LinkedTreeWitnessDTO {
 export class MerkleWitnessResolver extends GraphqlModule<object> {
   public constructor(
     @inject("AsyncLinkedLeafStore")
-    private readonly treeStore: AsyncLinkedLeafStore
+    private readonly leafStore: AsyncLinkedLeafStore,
+    @inject("AsyncTreeStore")
+    private readonly treeStore: AsyncMerkleTreeStore
   ) {
     super();
   }
@@ -102,7 +105,10 @@ export class MerkleWitnessResolver extends GraphqlModule<object> {
       "Allows retrieval of merkle witnesses corresponding to a specific path in the appchain's state tree. These proves are generally retrieved from the current 'proven' state",
   })
   public async witness(@Arg("path") path: string) {
-    const syncStore = await CachedLinkedLeafStore.new(this.treeStore);
+    const syncStore = await CachedLinkedLeafStore.new(
+      this.leafStore,
+      this.treeStore
+    );
     await syncStore.preloadKey(BigInt(path));
 
     const tree = new LinkedMerkleTree(syncStore.treeStore, syncStore);

packages/cli/package.json

@@ -41,7 +41,8 @@
     "@proto-kit/sequencer": "*",
     "@proto-kit/stack": "*",
     "@proto-kit/indexer": "*",
-    "o1js": "^2.10.0",
+    "o1js": "2.10.0-dev.6d3a3",
+    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/cli/src/scripts/settlement/deploy.ts

@@ -1,6 +1,5 @@
 import "reflect-metadata";
 import { container } from "tsyringe";
-import type { Environment } from "@proto-kit/stack";
 
 import {
   loadEnvironmentVariables,
@@ -11,14 +10,28 @@ import { loadUserModules } from "../../utils/loadUserModules";
 
 export default async function (options: LoadEnvOptions) {
   try {
-    const { Provable, PublicKey } = await import("o1js");
+    loadEnvironmentVariables(options);
+    const { Provable, PublicKey, PrivateKey } = await import("o1js");
     const { Runtime } = await import("@proto-kit/module");
     const { Protocol } = await import("@proto-kit/protocol");
-    const { AppChain, Sequencer, SettlementModule, InMemoryDatabase } =
-      await import("@proto-kit/sequencer");
+    const {
+      AppChain,
+      Sequencer,
+      SettlementModule,
+      InMemoryDatabase,
+      BatchProducerModule,
+      BridgingModule,
+      ConstantFeeStrategy,
+      InMemoryMinaSigner,
+      MinaBaseLayer,
+      PrivateMempool,
+      LocalTaskQueue,
+      LocalTaskWorkerModule,
+      VanillaTaskWorkerModules,
+      SequencerStartupModule,
+    } = await import("@proto-kit/sequencer");
 
-    const { DefaultModules, DefaultConfigs } = await import("@proto-kit/stack");
-    loadEnvironmentVariables(options);
+    const { DefaultConfigs } = await import("@proto-kit/stack");
     const { runtime, protocol } = await loadUserModules();
     const appChain = AppChain.from({
       Runtime: Runtime.from(runtime.modules),
@@ -28,7 +41,18 @@ export default async function (options: LoadEnvOptions) {
       }),
       Sequencer: Sequencer.from({
         Database: InMemoryDatabase,
-        ...DefaultModules.settlementScript(),
+        BaseLayer: MinaBaseLayer,
+        FeeStrategy: ConstantFeeStrategy,
+        BatchProducerModule,
+        SettlementModule,
+        SettlementSigner: InMemoryMinaSigner,
+        BridgingModule,
+        Mempool: PrivateMempool,
+        TaskQueue: LocalTaskQueue,
+        LocalTaskWorker: LocalTaskWorkerModule.from(
+          VanillaTaskWorkerModules.allTasks()
+        ),
+        SequencerStartupModule,
       }),
     });
 
@@ -40,16 +64,46 @@ export default async function (options: LoadEnvOptions) {
       },
       Sequencer: {
         ...DefaultConfigs.inMemoryDatabase(),
-        ...DefaultConfigs.settlementScript({
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          preset: options.env as Environment,
-        }),
+        BaseLayer: {
+          network: {
+            // eslint-disable-next-line max-len
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions,@typescript-eslint/no-unsafe-assignment
+            type: process.env.MINA_NETWORK as any,
+            graphql: process.env.MINA_NODE_GRAPHQL!,
+            archive: process.env.MINA_ARCHIVE_GRAPHQL!,
+            accountManager: process.env.MINA_ACCOUNT_MANAGER!,
+          },
+        },
+        SettlementSigner: {
+          feepayer: PrivateKey.fromBase58(
+            process.env.PROTOKIT_SEQUENCER_PRIVATE_KEY!
+          ),
+          contractKeys: [
+            PrivateKey.fromBase58(
+              process.env.PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY!
+            ),
+            PrivateKey.fromBase58(
+              process.env.PROTOKIT_DISPATCHER_CONTRACT_PRIVATE_KEY!
+            ),
+            PrivateKey.fromBase58(
+              process.env.PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY!
+            ),
+          ],
+        },
+        FeeStrategy: {},
+        BatchProducerModule: {},
         SettlementModule: {
           addresses: undefined,
         },
         BridgingModule: {
           addresses: undefined,
         },
+        SequencerStartupModule: {},
+        TaskQueue: {
+          simulatedDuration: 0,
+        },
+        LocalTaskWorker: VanillaTaskWorkerModules.defaultConfig(),
+        Mempool: {},
       },
     });
 

packages/common/package.json

@@ -26,7 +26,8 @@
     "typescript-memoize": "^1.1.1"
   },
   "peerDependencies": {
-    "o1js": "^2.10.0",
+    "o1js": "2.10.0-dev.6d3a3",
+    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/common/src/cache/ProxyCache.ts

@@ -9,8 +9,6 @@ export class ProxyCache implements O1Cache {
 
   debug = false;
 
-  cacheDirectory = this.realCache.cacheDirectory;
-
   public read(header: CacheHeader): Uint8Array | undefined {
     return this.realCache.read(header);
   }

packages/common/src/compiling/services/ChildVerificationKeyService.ts

@@ -23,4 +23,12 @@ export class ChildVerificationKeyService {
     }
     return artifact.verificationKey;
   }
+
+  public getAsConstant(name: string) {
+    const vk = this.getVerificationKey(name);
+    if (!vk.hash.isConstant()) {
+      throw new Error("Sanity check - vk hash has to be constant");
+    }
+    return vk;
+  }
 }

packages/common/src/utils.ts

@@ -311,3 +311,10 @@ export function assertDefined<T>(
     throw new Error(msg ?? "Value is undefined");
   }
 }
+
+export function takeFirst<T>(arr: T[]): T {
+  if (arr.length === 0) {
+    throw new Error("takeFirst called with empty array");
+  }
+  return arr[0];
+}

packages/common/src/zkProgrammable/FeatureFlagsExtension.ts

@@ -0,0 +1,27 @@
+import { FeatureFlags } from "o1js";
+
+function combineFeatureFlag(a: boolean | undefined, b: boolean | undefined) {
+  if (a === true || b === true) {
+    return true;
+  } else if (a === undefined || b === undefined) {
+    return undefined;
+  } else {
+    return false;
+  }
+}
+
+export function combineFeatureFlags(
+  a: FeatureFlags,
+  b: FeatureFlags
+): FeatureFlags {
+  return {
+    xor: combineFeatureFlag(a.xor, b.xor),
+    rot: combineFeatureFlag(a.rot, b.rot),
+    lookup: combineFeatureFlag(a.lookup, b.lookup),
+    foreignFieldAdd: combineFeatureFlag(a.foreignFieldAdd, b.foreignFieldAdd),
+    foreignFieldMul: combineFeatureFlag(a.foreignFieldMul, b.foreignFieldMul),
+    rangeCheck0: combineFeatureFlag(a.rangeCheck0, b.rangeCheck0),
+    rangeCheck1: combineFeatureFlag(a.rangeCheck1, b.rangeCheck1),
+    runtimeTables: combineFeatureFlag(a.runtimeTables, b.runtimeTables),
+  };
+}