@cartesi/cli 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/exec/rollups.js

@@ -14,12 +14,12 @@ export const getDeployments = async (options) => {
             "list",
         ]);
         return JSON.parse(stdout).map((deployment) => ({
-            id: deployment.ID,
-            name: deployment.Name,
-            address: deployment.IApplicationAddress,
-            templateHash: deployment.TemplateHash,
-            epochLength: deployment.EpochLength,
-            state: deployment.State,
+            id: deployment.id,
+            name: deployment.name,
+            address: deployment.iapplication_address,
+            templateHash: deployment.template_hash,
+            epochLength: deployment.epoch_lenght,
+            state: deployment.state,
         }));
     }
     catch (e) {

package/dist/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,OAAO,EACP,KAAK,EACL,GAAG,EAEH,YAAY,EAEZ,YAAY,EAKf,MAAM,MAAM,CAAC;AAiBd,MAAM,MAAM,sBAAsB,GAAG;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,sBAAsB,KAAG,KAAK,EAoBvE,CAAC;AAEF,eAAO,MAAM,uBAAuB,gEAC6B,CAAC;AAElE,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,aAAa,CAAC;AAiCpD,MAAM,WAAW,qBAAqB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC5B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,KACzB,OAAO,CAAC,OAAO,CAAC,CAAC;AA0LtB,QAAA,MAAM,aAAa,GACf,SAAS,qBAAqB,KAC/B,OAAO,CAAC;IACP,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC9B,CAuBA,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,OAAO,EACP,KAAK,EACL,GAAG,EAEH,YAAY,EAEZ,YAAY,EAKf,MAAM,MAAM,CAAC;AAiBd,MAAM,MAAM,sBAAsB,GAAG;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,sBAAsB,KAAG,KAAK,EAoBvE,CAAC;AAEF,eAAO,MAAM,uBAAuB,gEAC6B,CAAC;AAElE,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,aAAa,CAAC;AA2CpD,MAAM,WAAW,qBAAqB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC5B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,KACzB,OAAO,CAAC,OAAO,CAAC,CAAC;AAoMtB,QAAA,MAAM,aAAa,GACf,SAAS,qBAAqB,KAC/B,OAAO,CAAC;IACP,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC9B,CAuBA,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/wallet.js

@@ -2,7 +2,7 @@ import input from "@inquirer/input";
 import chalk from "chalk";
 import { formatUnits, http, createPublicClient as viemCreatePublicClient, createWalletClient as viemCreateWalletClient, } from "viem";
 import { mnemonicToAccount, privateKeyToAccount } from "viem/accounts";
-import { anvil, arbitrum, arbitrumSepolia, base, baseSepolia, mainnet, optimism, optimismSepolia, sepolia, } from "viem/chains";
+import { arbitrum, arbitrumSepolia, base, baseSepolia, cannon, mainnet, optimism, optimismSepolia, sepolia, } from "viem/chains";
 import { hexInput, selectAuto } from "./prompts.js";
 export const supportedChains = (options) => {
     options = options || {
@@ -14,7 +14,7 @@ export const supportedChains = (options) => {
     options.includeMainnets = options.includeMainnets ?? true; // default is true if not specified
     const chains = [];
     if (options.includeDevnet) {
-        chains.push(anvil);
+        chains.push(cannon);
     }
     if (options.includeTestnets) {
         chains.push(arbitrumSepolia, baseSepolia, optimismSepolia, sepolia);
@@ -26,7 +26,7 @@ export const supportedChains = (options) => {
 };
 export const DEFAULT_DEVNET_MNEMONIC = "test test test test test test test test test test test junk";
 const walletChoices = (chain) => {
-    const dev = chain.id === anvil.id;
+    const dev = chain.id === cannon.id;
     return [
         {
             name: `Mnemonic${dev ? "" : chalk.red(" (UNSAFE)")}`,
@@ -39,14 +39,15 @@ const walletChoices = (chain) => {
     ];
 };
 /**
- * Test if the default RPC URL for a chain is working
+ * Test if a RPC URL for a chain is working
  * @param chain chain to test
- * @returns true if the default RPC URL is valid, false otherwise
+ * @param url url to test
+ * @returns true if the RPC URL is valid and chainId matches, false otherwise
  */
-const testDefaultPublicClient = async (chain) => {
+const testChainUrl = async (chain, url) => {
     try {
         const publicClient = viemCreatePublicClient({
-            transport: http(chain.rpcUrls.default.http[0]),
+            transport: http(url),
             chain,
         });
         const chainId = await publicClient.getChainId();
@@ -56,6 +57,14 @@ const testDefaultPublicClient = async (chain) => {
         return false;
     }
 };
+/**
+ * Test if the default RPC URL for a chain is working
+ * @param chain chain to test
+ * @returns true if the default RPC URL is valid, false otherwise
+ */
+const testDefaultPublicClient = async (chain) => {
+    return testChainUrl(chain, chain.rpcUrls.default.http[0]);
+};
 const selectChain = async (options) => {
     // if development mode, include anvil as an option
     const chains = supportedChains({ includeDevnet: true });
@@ -87,9 +96,16 @@ const selectTransport = async (options, chain) => {
     }
     else {
         const defaultUrl = chain.rpcUrls.default.http[0];
-        // if the chain is anvil and the default URL is valid, use it without asking the user
-        if (chain.id === anvil.id && (await testDefaultPublicClient(chain))) {
-            return http(defaultUrl);
+        // if the chain is cannon and URL is valid, use it without asking the user
+        if (chain.id === cannon.id) {
+            const port = 8080; // XXX: how to get environment port?
+            const url = `http://127.0.0.1:${port}/anvil`;
+            if (await testChainUrl(chain, url)) {
+                return http(url);
+            }
+            if (await testDefaultPublicClient(chain)) {
+                return http(defaultUrl);
+            }
         }
         const url = await input({
             message: "RPC URL",
@@ -165,7 +181,9 @@ const createWalletClient = async (options, chain, publicClient, publicTransport)
             // use the publicClient transport
             const mnemonic = await input({
                 message: "Mnemonic",
-                default: chain.id === anvil.id ? DEFAULT_DEVNET_MNEMONIC : undefined,
+                default: chain.id === cannon.id
+                    ? DEFAULT_DEVNET_MNEMONIC
+                    : undefined,
             });
             // select account from mnemonic
             if (options.mnemonicIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartesi/cli",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "Cartesi CLI",
   "author": "Danilo Tuler <tuler@pobox.com>",
   "bin": {
@@ -42,7 +42,8 @@
     "viem": "^2.23.6"
   },
   "devDependencies": {
-    "@sunodo/wagmi-plugin-hardhat-deploy": "^0.3.0",
+    "@cartesi/devnet": "2.0.0-alpha.5",
+    "@cartesi/rollups": "2.0.0-rc.17",
     "@types/bytes": "^3.1.5",
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
@@ -62,7 +63,6 @@
     "tslib": "^2.8.1",
     "typescript": "^5.8.2",
     "vitest": "^2.1.3",
-    "@cartesi/devnet": "2.0.0-alpha.3",
     "@cartesi/eslint-config": "0.0.0",
     "tsconfig": "0.0.0"
   },

package/dist/compose/rollups/proxy/espresso-reader.yaml

@@ -1,17 +0,0 @@
-http:
-    routers:
-        espresso-reader:
-            rule: "PathPrefix(`/espresso/reader`)"
-            middlewares:
-                - "remove-espresso-reader-prefix"
-            service: espresso-reader
-    middlewares:
-        remove-espresso-reader-prefix:
-            replacePathRegex:
-                regex: "^/espresso/reader/(.*)"
-                replacement: "/$1"
-    services:
-        espresso-reader:
-            loadBalancer:
-                servers:
-                    - url: "http://espresso_reader:8081"