@cartesi/cli 0.15.1 → 0.16.0

package/dist/baseCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,MAAM,CAAC;AAmB7C,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CAClE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,WAAW,IAAI;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACvE,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAC;cAET,eAAe,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe9B,SAAS,CAAC,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAIpD,SAAS,CAAC,cAAc,IAAI,IAAI,GAAG,SAAS;IAY5C,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;cAItD,qBAAqB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAKrD,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IA0BzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAYrC"}
+{"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,MAAM,CAAC;AAmB7C,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CAClE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,WAAW,IAAI;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACvE,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAC;cAET,eAAe,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe9B,SAAS,CAAC,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAIpD,SAAS,CAAC,cAAc,IAAI,IAAI,GAAG,SAAS;IAY5C,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;cAItD,qBAAqB,IAAI,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAKrD,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAoCzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAYrC"}

package/dist/baseCommand.js

@@ -47,16 +47,26 @@ export class BaseCommand extends Command {
             AuthorityHistoryPairFactory: authorityHistoryPairFactoryAddress,
             CartesiDAppFactory: cartesiDAppFactoryAddress,
             DAppAddressRelay: dAppAddressRelayAddress,
+            EntryPointV06: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
+            EntryPointV07: "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
             ERC1155BatchPortal: erc1155BatchPortalAddress,
             ERC1155SinglePortal: erc1155SinglePortalAddress,
             ERC20Portal: erc20PortalAddress,
             ERC721Portal: erc721PortalAddress,
             EtherPortal: etherPortalAddress,
             InputBox: inputBoxAddress,
+            LightAccountFactory: "0x00004EC70002a32400f8ae005A26081065620D20",
             SelfHostedApplicationFactory: selfHostedApplicationFactoryAddress,
+            SimpleAccountFactory: "0x9406Cc6185a346906296840746125a0E44976454",
+            SmartAccountFactory: "0x000000a56Aaca3e9a4C479ea6b6CD0DbcB6634F5",
+            KernelFactoryV2: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
+            KernelFactoryV3: "0x6723b44Abeec4E71eBE3232BD5B455805baDD22f",
+            KernelFactoryV3_1: "0xaac5D4240AF87249B3f71BC8E4A2cae074A3E419",
             TestToken: testTokenAddress,
             TestNFT: testNftAddress,
             TestMultiToken: testMultiTokenAddress,
+            VerifyingPaymasterV06: "0x28ec0633192d0cBd9E1156CE05D5FdACAcB93947",
+            VerifyingPaymasterV07: "0xc5c97885C67F7361aBAfD2B95067a5bBdA603608",
         };
         // get dapp address
         const applicationAddress = await this.getApplicationAddress();

package/dist/commands/deploy/build.d.ts

@@ -6,7 +6,10 @@ export default class DeployBuild extends BaseCommand<typeof DeployBuild> {
     static flags: {
         platform: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
+    static enableJsonFlag: boolean;
     private buildRollupsImage;
-    run(): Promise<string>;
+    run(): Promise<{
+        image: string;
+    }>;
 }
 //# sourceMappingURL=build.d.ts.map

package/dist/commands/deploy/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/build.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IACpE,MAAM,CAAC,OAAO,SAAmD;IAEjE,MAAM,CAAC,WAAW,SACoD;IAEtE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;MAOV;YAEY,iBAAiB;IA6BlB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;CAwBtC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/build.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IACpE,MAAM,CAAC,OAAO,SAAmD;IAEjE,MAAM,CAAC,WAAW,SACoD;IAEtE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;MAOV;IAEF,OAAc,cAAc,UAAQ;YAEtB,iBAAiB;IA6BlB,GAAG;;;CAwBnB"}

package/dist/commands/deploy/build.js

@@ -45,7 +45,7 @@ class DeployBuild extends BaseCommand {
             title: "Application node Docker image",
             value: image,
         });
-        return image;
+        return { image };
     }
 }
 DeployBuild.summary = "Build deployment Docker image of application.";
@@ -58,4 +58,5 @@ DeployBuild.flags = {
         description: "Select the target platform for the produced Docker image. It depends on the platform where the application node will be deployed.",
     }),
 };
+DeployBuild.enableJsonFlag = true;
 export default DeployBuild;

package/dist/commands/run.d.ts

@@ -5,6 +5,9 @@ export default class Run extends BaseCommand<typeof Run> {
     static examples: string[];
     static flags: {
         "block-time": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        "disable-explorer": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        "disable-bundler": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        "disable-paymaster": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "epoch-length": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         "no-backend": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         verbose: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/dist/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACpD,MAAM,CAAC,OAAO,SAA2B;IAEzC,MAAM,CAAC,WAAW,SAAmD;IAErE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;;;;;MAwBV;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAwHpC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACpD,MAAM,CAAC,OAAO,SAA2B;IAEzC,MAAM,CAAC,WAAW,SAAmD;IAErE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;;;;;;;;MA0CV;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmIpC"}

package/dist/commands/run.js

@@ -52,7 +52,17 @@ class Run extends BaseCommand {
         // anvil
         composeFiles.push("docker-compose-anvil.yaml");
         // explorer
-        composeFiles.push("docker-compose-explorer.yaml");
+        if (!flags["disable-explorer"]) {
+            composeFiles.push("docker-compose-explorer.yaml");
+        }
+        // account abstraction
+        if (!flags["disable-bundler"]) {
+            composeFiles.push("docker-compose-bundler.yaml");
+        }
+        if (!flags["disable-paymaster"] && !flags["disable-bundler"]) {
+            // only add paymaster if bundler is enabled
+            composeFiles.push("docker-compose-paymaster.yaml");
+        }
         // load the no-backend compose file
         if (flags["no-backend"]) {
             composeFiles.push("docker-compose-host.yaml");
@@ -115,6 +125,21 @@ Run.flags = {
         description: "interval between blocks (in seconds)",
         default: 5,
     }),
+    "disable-explorer": Flags.boolean({
+        default: false,
+        description: "disable local explorer service to save machine resources",
+        summary: "disable explorer service",
+    }),
+    "disable-bundler": Flags.boolean({
+        default: false,
+        description: "disable local bundler service to save machine resources",
+        summary: "disable bundler service",
+    }),
+    "disable-paymaster": Flags.boolean({
+        default: false,
+        description: "disable local paymaster service to save machine resources",
+        summary: "disable paymaster service",
+    }),
     "epoch-length": Flags.integer({
         description: "length of an epoch (in blocks)",
         default: 720,

package/dist/commands/shell.js

@@ -11,7 +11,7 @@ class Shell extends BaseCommand {
         const ext2 = path.join(containerDir, path.basename(ext2Path));
         const ramSize = "128Mi";
         const driveLabel = "root";
-        const sdkImage = "cartesi/sdk:0.9.0"; // XXX: how to resolve sdk version?
+        const sdkImage = "cartesi/sdk:0.10.0"; // XXX: how to resolve sdk version?
         const args = [
             "run",
             "--interactive",

package/dist/node/docker-compose-anvil.yaml

@@ -1,6 +1,6 @@
 services:
     anvil:
-        image: cartesi/sdk:0.9.0
+        image: cartesi/sdk:0.10.0
         command:
             [
                 "devnet",
@@ -19,7 +19,7 @@ services:
             - 8545:8545
 
     dapp_deployer:
-        image: cartesi/sdk:0.9.0
+        image: cartesi/sdk:0.10.0
         restart: on-failure
         depends_on:
             anvil:

package/dist/node/docker-compose-bundler.yaml

@@ -0,0 +1,57 @@
+services:
+    alto:
+        image: cartesi/sdk:0.10.0
+        command:
+            - "alto"
+            - "--entrypoints"
+            - "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789,0x0000000071727De22E5E9d8BAf0edAc6f37da032"
+            - "--log-level"
+            - "info"
+            - "--entrypoint-simulation-contract"
+            - "0x74Cb5e4eE81b86e70f9045036a1C5477de69eE87"
+            - "--rpc-url"
+            - "http://anvil:8545"
+            - "--min-executor-balance"
+            - "0"
+            - "--utility-private-key"
+            - "0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97"
+            - "--executor-private-keys"
+            - "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6,0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356,0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e,0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba,0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a"
+            - "--max-block-range"
+            - "10000"
+            - "--safe-mode"
+            - "false"
+            - "--port"
+            - "4337"
+            - "--public-client-log-level"
+            - "error"
+            - "--wallet-client-log-level"
+            - "error"
+            - "--polling-interval"
+            - "100"
+            - "--enable-debug-endpoints"
+    prompt:
+        image: debian:bookworm-slim
+        environment:
+            PROMPT_TXT_06_BUNDLER: "Bundler running at http://localhost:${CARTESI_LISTEN_PORT}/bundler/rpc"
+
+    traefik-config-generator:
+        environment:
+            TRAEFIK_CONFIG_BUNDLER: |
+                http:
+                    routers:
+                        bundler:
+                            rule: "PathPrefix(`/bundler`)"
+                            middlewares:
+                                - "remove-bundler-prefix"
+                            service: bundler
+                    middlewares:
+                        remove-bundler-prefix:
+                            replacePathRegex:
+                                regex: "^/bundler/(.*)"
+                                replacement: "/$1"
+                    services:
+                        bundler:
+                            loadBalancer:
+                                servers:
+                                    - url: "http://alto:4337"

package/dist/node/docker-compose-database.yaml

@@ -8,8 +8,3 @@ services:
             retries: 5
         environment:
             - POSTGRES_PASSWORD=password
-
-    database_creator:
-        depends_on:
-            database:
-                condition: service_healthy

package/dist/node/docker-compose-explorer.yaml

@@ -2,6 +2,9 @@ services:
     database_creator:
         image: postgres:15-alpine
         command: ["createdb", "squid"]
+        depends_on:
+            database:
+                condition: service_healthy
         environment:
             PGHOST: ${PGHOST:-database}
             PGPORT: ${PGPORT:-5432}
@@ -30,7 +33,6 @@ services:
             CHAIN_ID: ${CHAIN_ID:-31337}
             RPC_URL_31337: ${RPC_URL:-http://anvil:8545}
             BLOCK_CONFIRMATIONS_31337: 0
-            GENESIS_BLOCK_31337: 22
             DB_NAME: ${PGDATABASE:-squid}
             DB_PORT: ${PGPORT:-5432}
             DB_HOST: ${PGHOST:-database}

package/dist/node/docker-compose-paymaster.yaml

@@ -0,0 +1,33 @@
+services:
+    mock-verifying-paymaster:
+        image: cartesi/sdk:0.10.0
+        command: "mock-verifying-paymaster"
+        environment:
+            - ALTO_RPC=http://alto:4337
+            - ANVIL_RPC=http://anvil:8545
+
+    prompt:
+        image: debian:bookworm-slim
+        environment:
+            PROMPT_TXT_07_PAYMASTER: "Paymaster running at http://localhost:${CARTESI_LISTEN_PORT}/paymaster/"
+
+    traefik-config-generator:
+        environment:
+            TRAEFIK_CONFIG_PAYMASTER: |
+                http:
+                    routers:
+                        paymaster:
+                            rule: "PathPrefix(`/paymaster`)"
+                            middlewares:
+                                - "remove-paymaster-prefix"
+                            service: paymaster
+                    middlewares:
+                        remove-paymaster-prefix:
+                            replacePathRegex:
+                                regex: "^/paymaster/(.*)"
+                                replacement: "/$1"
+                    services:
+                        paymaster:
+                            loadBalancer:
+                                servers:
+                                    - url: "http://mock-verifying-paymaster:3000"

package/oclif.manifest.json

@@ -222,6 +222,27 @@
           "multiple": false,
           "type": "option"
         },
+        "disable-explorer": {
+          "description": "disable local explorer service to save machine resources",
+          "name": "disable-explorer",
+          "summary": "disable explorer service",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "disable-bundler": {
+          "description": "disable local bundler service to save machine resources",
+          "name": "disable-bundler",
+          "summary": "disable bundler service",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "disable-paymaster": {
+          "description": "disable local paymaster service to save machine resources",
+          "name": "disable-paymaster",
+          "summary": "disable paymaster service",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "epoch-length": {
           "description": "length of an epoch (in blocks)",
           "name": "epoch-length",
@@ -311,6 +332,13 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "platform": {
           "description": "Select the target platform for the produced Docker image. It depends on the platform where the application node will be deployed.",
           "name": "platform",
@@ -332,6 +360,7 @@
       "pluginType": "core",
       "strict": true,
       "summary": "Build deployment Docker image of application.",
+      "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -883,5 +912,5 @@
       ]
     }
   },
-  "version": "0.15.1"
+  "version": "0.16.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartesi/cli",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "Cartesi CLI",
   "author": "Danilo Tuler <tuler@pobox.com>",
   "bin": {
@@ -63,8 +63,8 @@
     "tslib": "^2.6.3",
     "typescript": "^5.5.4",
     "vitest": "^2.0.4",
-    "@cartesi/eslint-config": "0.0.0",
     "@cartesi/devnet": "1.8.0",
+    "@cartesi/eslint-config": "0.0.0",
     "tsconfig": "0.0.0"
   },
   "oclif": {