Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
74b2d2b
Upgraded lerna
rpanic Feb 5, 2026
e8c94d5
.nx gitignore
rpanic Feb 5, 2026
5a94507
Removed --no-verify-access
rpanic Feb 5, 2026
fb121dd
versions
rpanic Feb 5, 2026
a8fa945
bump git head
rpanic Feb 5, 2026
bde3149
Merge branch 'develop' into release/canary-pre-devnet
rpanic Feb 5, 2026
5d967a3
package-lock
rpanic Feb 5, 2026
99e0289
Merge branch 'develop' into release/canary-pre-devnet
rpanic Feb 5, 2026
af934eb
package-lock 2
rpanic Feb 5, 2026
4ebe9ab
fix: add BridgingModule to appchain and fix network urls
saitunc Feb 5, 2026
5654998
chore(debug): add debug logs for method id registration
saitunc Feb 6, 2026
9143ce5
style: run lint fix
saitunc Feb 6, 2026
73a393f
Fixed linting in cli
rpanic Feb 9, 2026
9614cf4
Fixed and skipped test
rpanic Feb 9, 2026
e103b2d
refactor: separate TestBalances as utils
saitunc Feb 9, 2026
97a70cc
fix: add bridging module for deposit and redeem
saitunc Feb 9, 2026
0737f85
style: run lint fix
saitunc Feb 9, 2026
66817b9
Merge branch 'fix/fix-deploy-command' into release/canary-pre-devnet
rpanic Feb 9, 2026
b799f6a
refactor: move BridgingModule to settlementScript
saitunc Feb 9, 2026
3005eae
style: run lint fix
saitunc Feb 9, 2026
ca4b2bb
refactor: remove debug logs
saitunc Feb 9, 2026
8af4bf7
Fixed configurations
rpanic Feb 9, 2026
50abed0
Merge branch 'fix/fix-deploy-command' into release/canary-pre-devnet
rpanic Feb 9, 2026
e337140
Added missing Localtaskworker to settlementscript
rpanic Feb 9, 2026
91f95b5
Added missing Localtaskworker config
rpanic Feb 9, 2026
168512d
Revert lerna upgrade, fixed linting
rpanic Feb 9, 2026
b2aa069
Fixed bug in bridgecontract
rpanic Feb 9, 2026
8a7eca3
Merge remote-tracking branch 'origin/fix/add-mina-network-config' int…
rpanic Feb 9, 2026
98de08a
Bump version
rpanic Feb 10, 2026
a16eabc
Fixed hardcoded env
rpanic Feb 10, 2026
b278000
Merge remote-tracking branch 'origin/develop' into release/canary-pre…
rpanic Feb 10, 2026
a11e412
Fixed import
rpanic Feb 10, 2026
02f29a3
Fixes with network fetching
rpanic Feb 10, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ docs

# dependencies
node_modules
.nx

# IDEs and editors
/.idea
Expand Down Expand Up @@ -42,4 +43,4 @@ lerna-debug.log

docs/save
packages/research
packages/indexer/src/api/generated
packages/indexer/src/api/generated
2,097 changes: 1,567 additions & 530 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"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 --no-verify-access",
"publish:canary": "npx lerna publish prerelease --no-private --exact --yes --canary --preid develop --dist-tag latest --loglevel verbose --force-git-tag --force-publish",
"typedoc": "typedoc",
"coverage:merge": "istanbul-merge --out coverage/coverage-final.json $(find ./coverage -name \"coverage-final.json\" -print)",
"coverage:report": "nyc -t ./coverage report --reporter=text && nyc -t ./coverage report --reporter=text-summary",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"private": false,
"type": "module",
"version": "0.1.1-develop.833+397881ed",
"version": "0.1.1-develop.2137+8a7eca31",
"scripts": {
"build": "tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch",
Expand Down Expand Up @@ -57,5 +57,5 @@
"@types/lodash": "^4.14.194",
"@types/ws": "^8.5.4"
},
"gitHead": "397881ed5d8f98f5005bcd7be7f5a12b3bc6f956"
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
7 changes: 7 additions & 0 deletions packages/cli/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "../../.eslintrc",
"rules": {
"no-console": "off",
"func-names": "off"
}
}
5 changes: 3 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@proto-kit/cli",
"version": "0.1.0",
"version": "0.1.1-develop.2137+8a7eca31",
"type": "module",
"main": "./bin/protokit-cli.js",
"bin": {
Expand Down Expand Up @@ -48,5 +48,6 @@
"@types/inquirer": "^9.0.9",
"@types/node": "^20.19.24",
"@types/yargs": "17.0.32"
}
},
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/bridge/deposit.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
import { DispatchSmartContract } from "@proto-kit/protocol";

import {
Expand Down Expand Up @@ -182,5 +180,3 @@ export default async function (

await appChain.close();
}
/* eslint-enable no-console */
/* eslint-enable func-names */
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/bridge/redeem.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
import {
loadEnvironmentVariables,
getRequiredEnv,
Expand Down Expand Up @@ -149,5 +147,3 @@ export default async function (

await appChain.close();
}
/* eslint-enable no-console */
/* eslint-enable func-names */
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/bridge/withdraw.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
import { loadEnvironmentVariables, LoadEnvOptions } from "../../utils/loadEnv";
import { loadUserModules } from "../../utils/loadUserModules";

Expand Down Expand Up @@ -74,5 +72,3 @@ export default async function (

await appChain.close();
}
/* eslint-enable no-console */
/* eslint-enable func-names */
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/env/create-environment.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
/* eslint-disable sonarjs/cognitive-complexity */
import * as fs from "fs";
import * as path from "path";
Expand Down Expand Up @@ -113,6 +111,4 @@ export default async function () {
process.exit(1);
}
}
/* eslint-enable no-console */
/* eslint-enable func-names */
/* eslint-enable sonarjs/cognitive-complexity */
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/explorer/start.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
import { spawn } from "child_process";
import path from "path";
import { fileURLToPath } from "url";
Expand Down Expand Up @@ -60,5 +58,3 @@ export default async function (args: {
});
});
}
/* eslint-enable no-console */
/* eslint-enable func-names */
3 changes: 0 additions & 3 deletions packages/cli/src/scripts/generateKeys.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */

import { PrivateKey } from "o1js";

export type GenerateKeysArgs = {
Expand All @@ -18,4 +16,3 @@ export default async function (args: GenerateKeysArgs) {
console.log("-".repeat(70));
}
}
/* eslint-enable no-console */
2 changes: 0 additions & 2 deletions packages/cli/src/scripts/graphqlDocs/generateGqlDocs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable no-console */
import { generateGqlDocs } from "../../utils/graphqlDocs";

export default async function (args: {
Expand Down Expand Up @@ -71,4 +70,3 @@ export default async function (args: {
await generateGqlDocs(args.url);
}
}
/* eslint-enable no-console */
3 changes: 0 additions & 3 deletions packages/cli/src/scripts/lightnet/faucet.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable func-names */

import "reflect-metadata";
import { getRequiredEnv } from "../../utils/loadEnv";

Expand Down Expand Up @@ -70,4 +68,3 @@ export default async function (publicKey: string) {
publicKey: pair.publicKey.toBase58(),
});
}
/* eslint-enable func-names */
3 changes: 0 additions & 3 deletions packages/cli/src/scripts/lightnet/lightnetInitialize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */

import {
LoadEnvOptions,
getRequiredEnv,
Expand Down Expand Up @@ -31,4 +29,3 @@ export default async function (options: LoadEnvOptions) {
"Lightnet initialization complete! Settlement contracts are deployed."
);
}
/* eslint-enable no-console */
5 changes: 0 additions & 5 deletions packages/cli/src/scripts/lightnet/wait-for-network.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */

import { LoadEnvOptions } from "../../utils/loadEnv";

const maxAttempts = 24;
Expand Down Expand Up @@ -36,5 +33,3 @@ export default async function (options: LoadEnvOptions) {

Provable.log("Network is ready", lastBlock);
}
/* eslint-enable no-console */
/* eslint-enable func-names */
4 changes: 0 additions & 4 deletions packages/cli/src/scripts/settlement/deploy-token.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */
/* eslint-disable func-names */
import { DispatchSmartContract } from "@proto-kit/protocol";
import "reflect-metadata";
import { container } from "tsyringe";
Expand Down Expand Up @@ -263,5 +261,3 @@ export default async function (

await appChain.close();
}
/* eslint-enable no-console */
/* eslint-enable func-names */
18 changes: 12 additions & 6 deletions packages/cli/src/scripts/settlement/deploy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* eslint-disable no-console */
/* eslint-disable func-names */

import "reflect-metadata";
import { container } from "tsyringe";
import type { Environment } from "@proto-kit/stack";

import {
loadEnvironmentVariables,
Expand All @@ -17,6 +15,7 @@ export default async function (options: LoadEnvOptions) {
const { Protocol } = await import("@proto-kit/protocol");
const { AppChain, Sequencer, SettlementModule, InMemoryDatabase } =
await import("@proto-kit/sequencer");

const { DefaultModules, DefaultConfigs } = await import("@proto-kit/stack");
loadEnvironmentVariables(options);
const { runtime, protocol } = await loadUserModules();
Expand All @@ -40,7 +39,16 @@ export default async function (options: LoadEnvOptions) {
},
Sequencer: {
...DefaultConfigs.inMemoryDatabase(),
...DefaultConfigs.settlementScript({ preset: "development" }),
...DefaultConfigs.settlementScript({
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
preset: options.env as Environment,
}),
SettlementModule: {
addresses: undefined,
},
BridgingModule: {
addresses: undefined,
},
},
});

Expand Down Expand Up @@ -75,5 +83,3 @@ export default async function (options: LoadEnvOptions) {

await appChain.close();
}
/* eslint-enable no-console */
/* eslint-enable func-names */
3 changes: 0 additions & 3 deletions packages/cli/src/utils/create-environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import { cyan, green, blue, gray, bold } from "kleur/colors";

import { resolveChainPath } from "./pathResolver";

/* eslint-disable no-console */

export const icons = {
checkmark: figuresLib.tick,
cross: figuresLib.cross,
Expand Down Expand Up @@ -442,4 +440,3 @@ export function copyAndUpdateEnvFile(
return false;
}
}
/* eslint-enable no-console */
3 changes: 0 additions & 3 deletions packages/cli/src/utils/graphqlDocs.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */

import { spawn } from "child_process";
import fs from "fs";
import path from "path";
Expand Down Expand Up @@ -115,4 +113,3 @@ export async function generateGqlDocs(gqlUrl: string) {
console.log("Docs generated successfully!");
cleanUp(generatedPath);
}
/* eslint-enable no-console */
3 changes: 0 additions & 3 deletions packages/cli/src/utils/loadEnv.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-console */

import path from "path";
import fs from "fs";

Expand Down Expand Up @@ -61,4 +59,3 @@ export function parseEnvArgs(args: string[]): Record<string, string> {

return envVars;
}
/* eslint-enable no-console */
4 changes: 0 additions & 4 deletions packages/cli/src/utils/loadUserModules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import { Withdrawals } from "@proto-kit/library";

import { resolveChainPath } from "./pathResolver";

/* eslint-disable no-console */

type AppRuntimeModules = RuntimeModulesRecord & {
Withdrawals: typeof Withdrawals;
};
Expand Down Expand Up @@ -56,5 +54,3 @@ export async function loadUserModules(): Promise<LoadedModules> {
throw error;
}
}

/* eslint-enable no-console */
8 changes: 4 additions & 4 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"private": false,
"type": "module",
"version": "0.1.1-develop.833+397881ed",
"version": "0.1.1-develop.2137+8a7eca31",
"scripts": {
"build": "tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch",
Expand All @@ -21,8 +21,8 @@
"lodash": "^4.17.21",
"loglevel": "^1.8.1",
"reflect-metadata": "^0.1.13",
"typescript-memoize": "^1.1.1",
"ts-mixer": "^6.0.3"
"ts-mixer": "^6.0.3",
"typescript-memoize": "^1.1.1"
},
"peerDependencies": {
"o1js": "^2.10.0",
Expand All @@ -32,5 +32,5 @@
"@jest/globals": "^29.5.0",
"@types/lodash": "^4.14.194"
},
"gitHead": "397881ed5d8f98f5005bcd7be7f5a12b3bc6f956"
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
2 changes: 1 addition & 1 deletion packages/deployment/docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18
FROM node:22
LABEL authors="protokit.dev"

WORKDIR /src
Expand Down
4 changes: 2 additions & 2 deletions packages/deployment/docker/development-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18
FROM node:22

COPY . /framework/

Expand All @@ -8,4 +8,4 @@ RUN npm i
# extra step required here, the prisma client is required for the indexer to build
# TODO: move this to indexer's pre:build
RUN cd packages/indexer && npm run prisma:generate
RUN npm run build
RUN npm run build
4 changes: 2 additions & 2 deletions packages/deployment/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"private": false,
"type": "module",
"version": "0.1.1-develop.833+397881ed",
"version": "0.1.1-develop.2137+8a7eca31",
"scripts": {
"build": "tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch",
Expand Down Expand Up @@ -37,5 +37,5 @@
"@jest/globals": "^29.5.0",
"cachedir": "^2.4.0"
},
"gitHead": "397881ed5d8f98f5005bcd7be7f5a12b3bc6f956"
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
8 changes: 6 additions & 2 deletions packages/explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"name": "@proto-kit/explorer",
"version": "0.1.0",
"version": "0.1.1-develop.2137+8a7eca31",
"private": false,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@hookform/resolvers": "^3.6.0",
"@radix-ui/react-checkbox": "^1.1.0",
Expand Down Expand Up @@ -42,5 +45,6 @@
"postcss": "^8",
"tailwindcss": "^3.4.1",
"typescript": "^5"
}
},
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
4 changes: 2 additions & 2 deletions packages/indexer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"private": false,
"type": "module",
"version": "0.1.1-develop.267+b252853",
"version": "0.1.1-develop.2137+8a7eca31",
"scripts": {
"prebuild": "npm run prisma:generate",
"build": "tsc -p tsconfig.json",
Expand Down Expand Up @@ -63,5 +63,5 @@
"@types/react": "^18.2.34",
"@types/ws": "^8.5.4"
},
"gitHead": "b2528538c73747d000cc3ea99ee26ee415d8248d"
"gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"
}
Loading
Loading