Merge branch 'develop' into feature/st-prover-3

# Conflicts:
#	packages/protocol/test/BlockProver.test.ts
#	packages/sequencer/src/worker/worker/LocalTaskWorkerModule.ts

Author: rpanic

.github/workflows/pull-request-develop.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22.9.0
           # This only caches ~/.npm, therefore each subsequent
           # job needs to run `npm ci` to install deps from npm cache
           # alternative is to cache `node_modules` directly
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22.9.0
           cache: npm
 
       - name: "Install dependencies"
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22.9.0
           cache: npm
 
       - name: "Install dependencies"
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22.9.0
           cache: npm
 
       - name: "Install dependencies"
@@ -135,7 +135,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 22.9.0
           cache: npm
 
       - name: "Install dependencies"
@@ -145,7 +145,7 @@ jobs:
         run: npm run build
 
       - name: "Migrate DB"
-        run: npm run migrate
+        run: npm run prisma:migrate
 
       - name: "Wait for lightnet readiness"
         uses: o1-labs/wait-for-mina-network-action@v1

nx.json

@@ -5,6 +5,7 @@
       "options": {
         "cacheableOperations": [
           "build",
+          "prisma:generate",
           "lint",
           "test",
           "integration"
@@ -13,6 +14,12 @@
     }
   },
   "targetDefaults": {
+    "prisma:generate": {
+      "inputs": [
+        "{projectRoot}/package.json",
+        "{projectRoot}/prisma/**/*"
+      ]
+    },
     "build": {
       "dependsOn": [
         "^build"

package.json

@@ -5,17 +5,17 @@
   "type": "module",
   "scripts": {
     "dev": "npx lerna run dev",
-    "build": "npx lerna run build",
+    "build": "npm run prisma:generate && lerna run build",
     "build:clean": "npx nx reset && npm run build",
     "build-docker": "docker build -t protokit-base -f ./packages/deployment/docker/base/Dockerfile .",
     "lint": "npx lerna run lint",
     "lint:staged": "eslint",
     "test": "npx lerna run test -- --passWithNoTests",
-    "test:ci": "npx lerna run test -- --passWithNoTests --forceExit",
-    "test:integration": "npx lerna run test:integration -- --passWithNoTests --forceExit",
+    "test:ci": "npx lerna run test --concurrency=1 -- --passWithNoTests --forceExit",
+    "test:integration": "npx lerna run test:integration --concurrency=1 -- --passWithNoTests --forceExit",
     "test:watch": "npx lerna run test:watch",
-    "migrate": "npx lerna run prisma-migrate",
-    "prisma-generate": "npx lerna run prisma-generate",
+    "prisma:migrate": "npx lerna run prisma:migrate",
+    "prisma:generate": "npx lerna run prisma:generate",
     "commit": "cz",
     "publish:canary": "npx lerna publish prerelease --no-private --exact --yes --canary --preid develop --dist-tag latest --loglevel verbose --force-git-tag --force-publish"
   },

packages/api/package.json

@@ -8,7 +8,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
-    "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
+    "test:file": "node --experimental-vm-modules --experimental-wasm-modules ../../node_modules/jest/bin/jest.js",
     "test": "npm run test:file -- ./test/**",
     "test:watch": "npm run test:file -- ./test/** --watch"
   },

packages/common/package.json

@@ -8,7 +8,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
-    "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
+    "test:file": "node --experimental-vm-modules --experimental-wasm-modules ../../node_modules/jest/bin/jest.js",
     "test": "npm run test:file -- ./test/**",
     "test:watch": "npm run test:file -- ./test/** --watch"
   },

packages/common/src/config/ModuleContainer.ts

@@ -4,7 +4,7 @@ import {
   DependencyContainer,
   Frequency,
   InjectionToken,
-  instancePerContainerCachingFactory,
+  instanceCachingFactory,
   isClassProvider,
   isFactoryProvider,
   isTokenProvider,
@@ -417,9 +417,7 @@ export class ModuleContainer<
           // this enables us to have a singletoned factory
           // that returns the same instance for each resolve
           this.container.register(key, {
-            useFactory: instancePerContainerCachingFactory(
-              declaration.useFactory
-            ),
+            useFactory: instanceCachingFactory(declaration.useFactory),
           });
         } else if (isClassProvider(declaration)) {
           this.container.register(key, declaration, {

packages/common/test/zkProgrammable/ZkProgrammable.test.ts

@@ -6,14 +6,12 @@ import { Field, Struct, Proof, ZkProgram } from "o1js";
 import {
   MOCK_PROOF,
   provableMethod,
-} from "../../src/zkProgrammable/provableMethod";
-import {
   AreProofsEnabled,
   CompileArtifact,
   MOCK_VERIFICATION_KEY,
   ZkProgrammable,
-} from "../../src/zkProgrammable/ZkProgrammable";
-import { ProvableMethodExecutionContext } from "../../src/zkProgrammable/ProvableMethodExecutionContext";
+  ProvableMethodExecutionContext,
+} from "../../src";
 
 const appChainMock: AreProofsEnabled = {
   areProofsEnabled: false,
@@ -86,6 +84,7 @@ class TestProgrammable extends ZkProgrammable<
 
     return [
       {
+        name: program.name,
         compile: program.compile.bind(program),
         verify: program.verify.bind(program),
         analyzeMethods: program.analyzeMethods.bind(program),
@@ -129,6 +128,7 @@ class OtherTestProgrammable extends ZkProgrammable<undefined, void> {
 
     return [
       {
+        name: program.name,
         compile: program.compile.bind(program),
         verify: program.verify.bind(program),
         analyzeMethods: program.analyzeMethods.bind(program),

packages/deployment/package.json

@@ -8,7 +8,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
-    "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
+    "test:file": "node --experimental-vm-modules --experimental-wasm-modules ../../node_modules/jest/bin/jest.js",
     "test": "npm run test:file -- ./test/**",
     "test:watch": "npm run test:file -- ./test/** --watch"
   },

packages/indexer/.env

@@ -1 +1 @@
-DATABASE_URL=postgresql://admin:password@localhost:5432/protokit?schema=public
+INDEXER_DATABASE_URL=postgresql://admin:password@localhost:5432/protokit-indexer?schema=public

packages/indexer/package.json

@@ -9,7 +9,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
-    "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
+    "test:file": "node --experimental-vm-modules --experimental-wasm-modules ../../node_modules/jest/bin/jest.js",
     "test": "npm run test:file -- ./src/** ./test/**",
     "test:watch": "npm run test:file -- ./src/** ./test/** --watch",
     "prisma:generate": "prisma generate --schema=./prisma/schema.prisma",