feat(cli): cli changes to align with rollups-node [upcoming changes]

.changeset/brave-foxes-climb.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Pass `--claim-staging-period` to the node for every consensus type. It was dropped when deploying with `--prt`, so a value given alongside that flag was silently ignored.

.changeset/busy-bags-sing.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Add `TestUsdc` to the devnet address book, and `RefundOutputBuilder` and `UsdWithdrawalOutputBuilderFactory` to the common one.

.changeset/busy-olives-press.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Read the machine snapshot hash with the project's SDK image. Without a local `cartesi-machine-stored-hash`, `cartesi run`, `cartesi hash` and the commands that look up the deployed application read the snapshot in the default SDK image, whose emulator may not load a snapshot built by the `sdk` configured in `cartesi.toml`.

.changeset/eleven-actors-spend.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Fix `cartesi deposit` for ERC-20, ERC-721 and ERC-1155 against the renamed portal functions.

.changeset/great-doors-sing.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Warn in `cartesi run` when the application stops being healthy, reporting the node's reason instead of letting it go quiet while inputs keep being accepted on-chain.

.changeset/lemon-geese-wander.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Allow the node's six `CARTESI_AUTH_*` claimer variables to be overridden from the host environment, matching the PRT set. Without `CARTESI_AUTH_KIND` only plain-mnemonic signing was reachable.

.changeset/lucky-birds-wave.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Colour the application status in `cartesi status`, distinguishing the recoverable `FAILED` state from the terminal ones, and print the node's reason beneath the table.

.changeset/olive-games-tap.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Stop waiting for a service whose container has exited, so a crash loop reports immediately instead of retrying until the timeout.

.changeset/olive-moons-repeat.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Recognize the four terminal application states the node reports (`GUEST_EXCEPTION`, `MACHINE_HALTED`, `MCYCLE_OVERFLOW`, `UNEXPECTED_YIELD`) and surface the node's `reason` diagnostic alongside them.

.changeset/quiet-pugs-search.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Bound the wait for services to become healthy. The backoff had no upper limit, so a service that never started held `cartesi run` for up to 19 hours instead of failing.

.changeset/rotten-roses-write.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Fix fork validation against rollups-contracts 3.0.0-alpha.10 and dave 3.0.0-alpha.5.

.changeset/shiny-hounds-rest.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Pass the devnet mnemonic to the node as `CARTESI_PRT_AUTH_MNEMONIC`. The node starts its PRT service on every run and, with claim submission enabled by default, that service requires its own signer, for which PRT has no default.

.changeset/thick-experts-notice.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Generate contracts from the rollups-contracts and dave releases instead of `@cartesi/devnet`.

.changeset/tidy-pears-shave.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Allow the node's six `CARTESI_PRT_AUTH_*` variables to be overridden from the host environment.

.github/workflows/cli.yaml

@@ -4,6 +4,7 @@ on:
         paths:
             - ".github/workflows/cli.yaml"
             - "apps/cli/**"
+            - "packages/sdk/**"
             - "packages/tsconfig/**"
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -18,6 +19,12 @@ jobs:
         env:
             TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
             TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+            # TEMPORARY: run the integration tests against the SDK image sdk.yaml
+            # builds for this PR, instead of the released cartesi/sdk version.
+            CARTESI_TEST_SDK: ghcr.io/cartesi/sdk:pr-${{ github.event.number }}
+            # TEMPORARY: compose parameterises only the image tag, never the
+            # cartesi/ prefix, so the PR images are retagged below and picked by tag.
+            CARTESI_TEST_RUNTIME_VERSION: pr-${{ github.event.number }}
         steps:
             - name: Checkout
               uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -30,17 +37,30 @@ jobs:
 
             - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
 
-            - name: Install Foundry
-              uses: foundry-rs/foundry-toolchain@908c540300062bd5a7e473851cdb4282204cee09 # v1.9.1
-              with:
-                  version: v1.4.3
-
             - name: Install dependencies
               run: bun install --frozen-lockfile
 
             - name: Build
               run: bun run build --filter @cartesi/cli
 
+            # TEMPORARY: needed to pull the PR-tagged SDK image referenced by CARTESI_TEST_SDK.
+            - name: Login to GitHub Container Registry
+              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            # TEMPORARY: docker compose resolves cartesi/<name>:<tag> from Docker Hub,
+            # which has no PR tags, so the ghcr images are retagged locally.
+            - name: Retag the PR-built images for docker compose
+              run: |
+                  for t in sdk rollups-runtime rollups-database; do
+                      docker pull "ghcr.io/cartesi/$t:pr-${{ github.event.number }}"
+                      docker tag "ghcr.io/cartesi/$t:pr-${{ github.event.number }}" \
+                          "cartesi/$t:pr-${{ github.event.number }}"
+                  done
+
             - name: Test
               run: bun test apps/cli/
 

apps/cli/package.json

@@ -42,8 +42,7 @@
         "yaml": "^2.8.2"
     },
     "devDependencies": {
-        "@cartesi/devnet": "2.0.0-alpha.14",
-        "@sunodo/wagmi-plugin-hardhat-deploy": "^0.4.0",
+        "@cartesi/wagmi-plugin": "1.0.0-alpha.7",
         "@types/bun": "^1.3.6",
         "@types/bytes": "^3.1.5",
         "@types/fs-extra": "^11.0.4",

apps/cli/src/base.ts

@@ -22,11 +22,14 @@ import {
     erc721PortalAddress,
     etherPortalAddress,
     inputBoxAddress,
+    refundOutputBuilderAddress,
     selfHostedApplicationFactoryAddress,
     testFungibleTokenAddress,
     testMultiTokenAddress,
     testNonFungibleTokenAddress,
+    testUsdcAddress,
     testUsdWithdrawalOutputBuilderAddress,
+    usdWithdrawalOutputBuilderFactoryAddress,
 } from "./contracts.js";
 import { cartesiMachineStoredHash } from "./exec";
 import { getApplicationAddress, getForkConfig } from "./exec/rollups.js";
@@ -37,11 +40,34 @@ export const getContextPath = (...paths: string[]): string => {
     return path.join(".cartesi", ...paths);
 };
 
-export const getMachineHash = async (): Promise<Hash | undefined> => {
-    // read hash of the cartesi machine snapshot, if one exists
+/**
+ * SDK image of the project, which built its machine snapshot
+ */
+const getProjectSdk = (): string | undefined => {
+    try {
+        return getApplicationConfig(["cartesi.toml"]).sdk;
+    } catch {
+        // an invalid config is reported by the commands that build with it
+        return undefined;
+    }
+};
+
+/**
+ * Read the hash of the cartesi machine snapshot, if one exists. Without a
+ * local cartesi-machine-stored-hash, it runs in the SDK image the snapshot was
+ * built with, as an emulator of another version may not load it.
+ * @param options sdk image of the project, read from cartesi.toml if not given
+ */
+export const getMachineHash = async (options?: {
+    sdk?: string;
+}): Promise<Hash | undefined> => {
     const imagePath = getContextPath("image");
     if (fs.existsSync(imagePath)) {
-        return await cartesiMachineStoredHash.computeHash(imagePath);
+        const image = options?.sdk ?? getProjectSdk();
+        return await cartesiMachineStoredHash.computeHash(
+            imagePath,
+            image ? { image } : undefined,
+        );
     }
     return undefined;
 };
@@ -118,6 +144,7 @@ export const getAddressBook = async (options: {
         TestToken: testFungibleTokenAddress,
         TestNFT: testNonFungibleTokenAddress,
         TestMultiToken: testMultiTokenAddress,
+        TestUsdc: testUsdcAddress,
         TestUsdWithdrawalOutputBuilder: testUsdWithdrawalOutputBuilderAddress,
     };
 
@@ -132,7 +159,10 @@ export const getAddressBook = async (options: {
         ERC721Portal: erc721PortalAddress,
         EtherPortal: etherPortalAddress,
         InputBox: inputBoxAddress,
+        RefundOutputBuilder: refundOutputBuilderAddress,
         SelfHostedApplicationFactory: selfHostedApplicationFactoryAddress,
+        UsdWithdrawalOutputBuilderFactory:
+            usdWithdrawalOutputBuilderFactoryAddress,
     };
 
     // gather all contracts, depending whether is fork or devnet
@@ -166,6 +196,9 @@ export const getServiceInfo = async (options: {
         "--project-name",
         projectName,
         "ps",
+        // --all so an exited container is still reported, instead of the
+        // service simply vanishing from the output
+        "--all",
         service,
         "--format",
         "json",

apps/cli/src/commands/deposit/erc1155.ts

@@ -146,7 +146,7 @@ export const createErc1155SingleCommand = () => {
                 abi: erc1155SinglePortalAbi,
                 account,
                 address: erc1155SinglePortalAddress,
-                functionName: "depositSingleERC1155Token",
+                functionName: "depositSingleErc1155Token",
                 args: [
                     token.address,
                     application,
@@ -311,7 +311,7 @@ export const createErc1155BatchCommand = () => {
                 abi: erc1155BatchPortalAbi,
                 account,
                 address: erc1155BatchPortalAddress,
-                functionName: "depositBatchERC1155Token",
+                functionName: "depositBatchErc1155Token",
                 args: [
                     token.address,
                     application,

apps/cli/src/commands/deposit/erc20.ts

@@ -164,7 +164,7 @@ export const createErc20Command = () => {
                 abi: erc20PortalAbi,
                 account,
                 address: erc20PortalAddress,
-                functionName: "depositERC20Tokens",
+                functionName: "depositErc20Tokens",
                 args: [token.address, application, amount, execLayerData],
             });
 

apps/cli/src/commands/deposit/erc721.ts

@@ -182,7 +182,7 @@ export const createErc721Command = () => {
                 abi: erc721PortalAbi,
                 account,
                 address: erc721PortalAddress,
-                functionName: "depositERC721Token",
+                functionName: "depositErc721Token",
                 args: [
                     token.address,
                     application,