Switching back chainId from 13370 to 31337 (CLI)

.changeset/clean-boxes-hope.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/sdk": patch
+---
+
+switching back chainId from 13370 to 31337

.changeset/good-turkeys-speak.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+migrate format from prettier to biome

.changeset/neat-meals-wash.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+switching back chainId from 13370 to 31337

.github/workflows/cli.yaml

@@ -30,7 +30,7 @@ jobs:
                   version: v1.4.3
 
             - name: Install dependencies
-              run: bun install
+              run: bun install --frozen-lockfile
 
             - name: Build
               run: bun run build --filter @cartesi/cli

.github/workflows/devnet.yaml

@@ -29,7 +29,7 @@ jobs:
                   version: v1.4.3
 
             - name: Install dependencies
-              run: bun install
+              run: bun install --frozen-lockfile
 
             - name: Build
               run: bun run build --filter @cartesi/devnet

.github/workflows/lint.yaml

@@ -16,7 +16,7 @@ jobs:
             - uses: oven-sh/setup-bun@b7a1c7ccf290d58743029c4f6903da283811b979 # v2.1.0
 
             - name: Install dependencies
-              run: bun install
+              run: bun install --frozen-lockfile
 
             - name: Lint
               run: bun run lint

.github/workflows/paymaster.yaml

@@ -29,7 +29,7 @@ jobs:
                   version: v1.4.3
 
             - name: Install dependencies
-              run: bun install
+              run: bun install --frozen-lockfile
 
             - name: Build
               run: bun run build --filter @cartesi/mock-verifying-paymaster

.github/workflows/release.yaml

@@ -40,7 +40,7 @@ jobs:
                   version: v1.4.3
 
             - name: Install Dependencies
-              run: bun install
+              run: bun install --frozen-lockfile
 
             - name: Build
               run: bun run build

.vscode/settings.json

@@ -1,11 +1,11 @@
 {
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.defaultFormatter": "biomejs.biome",
     "editor.codeActionsOnSave": {
         "source.organizeImports": "explicit"
     },
     "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "biomejs.biome"
     }
 }

apps/cli/biome.json

@@ -1,16 +1,12 @@
 {
     "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
-    "extends": ["../../biome.json"],
+    "root": false,
+    "extends": "//",
     "linter": {
         "rules": {
             "complexity": {
                 "noBannedTypes": "off"
             }
         }
-    },
-    "vcs": {
-        "enabled": true,
-        "clientKind": "git",
-        "useIgnoreFile": true
     }
 }

apps/cli/package.json

@@ -41,7 +41,6 @@
         "yaml": "^2.8.2"
     },
     "devDependencies": {
-        "@biomejs/biome": "^2.2.4",
         "@cartesi/devnet": "2.0.0-alpha.9",
         "@cartesi/rollups": "2.1.1",
         "@types/bun": "^1.3.5",
@@ -69,8 +68,6 @@
         "codegen": "run-p codegen:wagmi",
         "codegen:wagmi": "wagmi generate",
         "compile": "bun build.ts",
-        "lint": "biome lint",
-        "posttest": "bun lint",
         "test": "vitest"
     },
     "engines": {

apps/cli/src/compose/explorer.ts

@@ -1,3 +1,4 @@
+import { anvil } from "viem/chains";
 import type { ComposeFile, Config, Service } from "../types/compose.js";
 import { DEFAULT_HEALTHCHECK } from "./common.js";
 
@@ -75,19 +76,21 @@ export const squidProcessorService = (options: ServiceOptions): Service => {
     const databasePassword = options.databasePassword;
     const databaseHost = options.databaseHost ?? "database";
     const databasePort = options.databasePort ?? 5432;
+    const chain = anvil;
+    const environment: Record<string, string | number> = {
+        DB_HOST: databaseHost,
+        DB_NAME: "explorer",
+        DB_PASS: databasePassword,
+        DB_PORT: databasePort.toString(),
+        CHAIN_IDS: chain.id.toString(),
+    };
+    environment[`RPC_URL_${chain.id}`] = `http://anvil:8545`;
+    environment[`BLOCK_CONFIRMATIONS_${chain.id}`] = 0;
+    environment[`GENESIS_BLOCK_${chain.id}`] = 1;
 
     return {
         image: `cartesi/rollups-explorer-api:${imageTag}`,
-        environment: {
-            DB_HOST: databaseHost,
-            DB_NAME: "explorer",
-            DB_PASS: databasePassword,
-            DB_PORT: databasePort.toString(),
-            CHAIN_IDS: "13370",
-            RPC_URL_13370: "http://anvil:8545",
-            BLOCK_CONFIRMATIONS_13370: 0,
-            GENESIS_BLOCK_13370: 1,
-        },
+        environment,
         command: ["sqd", "process:prod"],
         depends_on: {
             database: { condition: "service_healthy" },
@@ -106,8 +109,9 @@ export const explorerService = (options: ServiceOptions): Service => {
     return {
         image: `cartesi/rollups-explorer:${imageTag}`,
         environment: {
-            NODE_RPC_URL: nodeRpcUrl,
+            CHAIN_ID: 31337,
             EXPLORER_API_URL: explorerApiUrl,
+            NODE_RPC_URL: nodeRpcUrl,
         },
         expose: ["3000"],
         depends_on: {

apps/cli/src/compose/node.ts

@@ -1,3 +1,4 @@
+import { anvil } from "viem/chains";
 import {
     daveAppFactoryAddress,
     inputBoxAddress,
@@ -60,7 +61,7 @@ const service = (options: ServiceOptions): Service => {
             CARTESI_AUTH_MNEMONIC: mnemonic,
             CARTESI_BLOCKCHAIN_DEFAULT_BLOCK: defaultBlock,
             CARTESI_BLOCKCHAIN_HTTP_ENDPOINT: "http://anvil:8545",
-            CARTESI_BLOCKCHAIN_ID: "13370",
+            CARTESI_BLOCKCHAIN_ID: anvil.id.toString(),
             CARTESI_BLOCKCHAIN_WS_ENDPOINT: "ws://anvil:8545",
             CARTESI_CONTRACTS_DAVE_APP_FACTORY_ADDRESS: daveAppFactoryAddress,
             CARTESI_CONTRACTS_INPUT_BOX_ADDRESS: inputBoxAddress,

apps/cli/src/config.ts

@@ -73,7 +73,7 @@ export class InvalidStringArrayError extends Error {
  */
 const DEFAULT_FORMAT = "ext2";
 const DEFAULT_RAM = "128Mi";
-export const DEFAULT_SDK_VERSION = "0.12.0-alpha.30";
+export const DEFAULT_SDK_VERSION = "0.12.0-alpha.31";
 export const DEFAULT_SDK_IMAGE = "cartesi/sdk";
 export const PREFERRED_PORT = 6751;
 

apps/cli/src/exec/index.ts

@@ -1,4 +1,3 @@
 export * as cartesiMachine from "./cartesi-machine.js";
 export * as genext2fs from "./genext2fs.js";
 export * as mksquashfs from "./mksquashfs.js";
-

apps/cli/src/wallet.ts

@@ -6,13 +6,13 @@ import {
     publicActions,
     walletActions,
 } from "viem";
-import { cannon } from "viem/chains";
+import { anvil } from "viem/chains";
 import { getProjectName } from "./base.js";
 import { PREFERRED_PORT } from "./config.js";
 import { getProjectPort } from "./exec/rollups.js";
 
 export const cartesi = defineChain({
-    ...cannon,
+    ...anvil,
     name: "Cartesi Devnet",
     testnet: true,
 });

apps/cli/wagmi.config.ts

@@ -2,13 +2,16 @@ import { type Plugin, defineConfig } from "@wagmi/cli";
 import { readFileSync, readdirSync } from "node:fs";
 import path from "node:path";
 
-interface CannonOptions {
+interface DeploymentsOptions {
     directory: string;
     includes?: RegExp[];
     excludes?: RegExp[];
 }
 
-const shouldIncludeFile = (name: string, config: CannonOptions): boolean => {
+const shouldIncludeFile = (
+    name: string,
+    config: DeploymentsOptions,
+): boolean => {
     if (config.excludes) {
         // if there is a list of excludes, then if the name matches any of them, then exclude
         for (const exclude of config.excludes) {
@@ -30,11 +33,11 @@ const shouldIncludeFile = (name: string, config: CannonOptions): boolean => {
     return true;
 };
 
-const cannonDeployments = (config: CannonOptions): Plugin => {
+const deployments = (config: DeploymentsOptions): Plugin => {
     return {
-        name: "cannon",
+        name: "cartesi",
         contracts: () => {
-            // list all files exported by cannon in directory
+            // list all files exported by devnet in directory
             const files = readdirSync(config.directory).filter((file) =>
                 shouldIncludeFile(file, config),
             );
@@ -60,7 +63,7 @@ const cannonDeployments = (config: CannonOptions): Plugin => {
 export default defineConfig({
     out: "src/contracts.ts",
     plugins: [
-        cannonDeployments({
+        deployments({
             directory: "node_modules/@cartesi/devnet/deployments",
         }),
     ],

biome.json

@@ -8,12 +8,20 @@
         }
     },
     "formatter": {
-        "enabled": false
+        "enabled": true,
+        "includes": ["**", "!.changeset/pre.json"],
+        "indentStyle": "space",
+        "indentWidth": 4
     },
     "linter": {
         "enabled": true,
         "rules": {
             "recommended": true
         }
+    },
+    "vcs": {
+        "enabled": true,
+        "clientKind": "git",
+        "useIgnoreFile": true
     }
 }

bun.lock

@@ -8,13 +8,12 @@
         "@biomejs/biome": "^2.3.11",
         "@changesets/cli": "^2.29.8",
         "@types/bun": "^1.3.5",
-        "prettier": "^3.7.4",
         "turbo": "^2.7.4",
       },
     },
     "apps/cli": {
       "name": "@cartesi/cli",
-      "version": "2.0.0-alpha.23",
+      "version": "2.0.0-alpha.24",
       "bin": {
         "cartesi": "./dist/index.js",
       },
@@ -45,7 +44,6 @@
         "yaml": "^2.8.2",
       },
       "devDependencies": {
-        "@biomejs/biome": "^2.2.4",
         "@cartesi/devnet": "2.0.0-alpha.9",
         "@cartesi/rollups": "2.1.1",
         "@types/bun": "^1.3.5",

package.json

@@ -7,19 +7,17 @@
         "build": "turbo run build",
         "clean": "turbo run clean",
         "dev": "turbo run dev --parallel",
-        "lint": "turbo run lint",
-        "format": "prettier --write \"**/*.{cjs,css,json,md,mjs,ts,tsx}\"",
+        "lint": "biome ci",
         "publish-packages": "bun changeset publish && git push --follow-tags",
         "test": "turbo test"
     },
     "devDependencies": {
         "@biomejs/biome": "^2.3.11",
         "@changesets/cli": "^2.29.8",
         "@types/bun": "^1.3.5",
-        "prettier": "^3.7.4",
         "turbo": "^2.7.4"
     },
-    "packageManager": "bun@1.3.5",
+    "packageManager": "bun@1.3.6",
     "workspaces": [
         "apps/*",
         "packages/*"

packages/mock-verifying-paymaster/src/relay.ts

@@ -68,7 +68,7 @@ const handleMethodV06 = async (
     if (estimateGas) {
         let gasEstimates:
             | EstimateUserOperationGasReturnType<ENTRYPOINT_ADDRESS_V06_TYPE>
-            | undefined = undefined;
+            | undefined;
         try {
             gasEstimates = await altoBundlerV06.estimateUserOperationGas({
                 userOperation: op,
@@ -171,7 +171,7 @@ const handleMethodV07 = async (
     if (estimateGas) {
         let gasEstimates:
             | EstimateUserOperationGasReturnType<ENTRYPOINT_ADDRESS_V07_TYPE>
-            | undefined = undefined;
+            | undefined;
         try {
             gasEstimates = await altoBundlerV07.estimateUserOperationGas({
                 userOperation: op,
@@ -445,12 +445,9 @@ export const createRpcHandler = (
             console.log(`JSON.stringify(err): ${util.inspect(err)}`);
 
             const error = {
-                // biome-ignore lint/suspicious/noExplicitAny:
-                message: (err as any).message,
-                // biome-ignore lint/suspicious/noExplicitAny:
-                data: (err as any).data,
-                // biome-ignore lint/suspicious/noExplicitAny:
-                code: (err as any).code ?? -32603,
+                message: (err as unknown as { message: string }).message,
+                data: (err as unknown as { data: unknown }).data,
+                code: (err as unknown as { code: number }).code ?? -32603,
             };
 
             return {

packages/sdk/devnet

@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
 jq -rs '. | map({contractName,address}) | unique_by(.address) | sort_by(.contractName) | .[] | "\(.address) \(.contractName)"' /usr/share/cartesi/deployments/*.json
-exec anvil --chain-id 13370 --load-state /usr/share/cartesi/anvil_state.json "$@"
+exec anvil --load-state /usr/share/cartesi/anvil_state.json "$@"

turbo.json

@@ -23,7 +23,6 @@
             "cache": false,
             "persistent": true
         },
-        "lint": {},
         "start": {
             "dependsOn": ["^build"]
         },