feat: changes for upcoming rollups-node alpha.14

.changeset/seven-moments-prove.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": minor
+---
+
+Require cartesi-machine 0.22. Machines stored by 0.21 can't be loaded by 0.22: rebuild and redeploy every application.

.changeset/strict-grapes-do.md

@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+Use the Dave 3.0.0-alpha.6 PRT contracts. Every PRT address moves, including the devnet DaveAppFactory. The rollups contract addresses are unchanged.

.github/workflows/cli.yaml

@@ -3,7 +3,9 @@ on:
     pull_request:
         paths:
             - ".github/workflows/cli.yaml"
+            - ".github/workflows/sdk.yaml"
             - "apps/cli/**"
+            - "packages/sdk/**"
             - "packages/tsconfig/**"
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -13,11 +15,21 @@ permissions:
     packages: write
     pull-requests: write
 jobs:
+    sdk:
+        uses: ./.github/workflows/sdk.yaml
+        secrets: inherit
+        permissions:
+            contents: read
+            packages: write
+            id-token: write
+            actions: write
     build:
+        needs: sdk
         runs-on: ubuntu-latest
         env:
             TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
             TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+            SDK_TAG: pr-${{ github.event.pull_request.number }}
         steps:
             - name: Checkout
               uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -28,6 +40,20 @@ jobs:
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
 
+            - 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 }}
+
+            - name: Retag SDK images
+              run: |
+                  for image in sdk rollups-runtime rollups-database; do
+                      docker pull "ghcr.io/cartesi/$image:$SDK_TAG"
+                      docker tag "ghcr.io/cartesi/$image:$SDK_TAG" "cartesi/$image:$SDK_TAG"
+                  done
+
             - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
 
             - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
@@ -45,6 +71,9 @@ jobs:
 
             - name: Test
               run: bun test apps/cli/
+              env:
+                  CARTESI_TEST_SDK: cartesi/sdk:${{ env.SDK_TAG }}
+                  CARTESI_TEST_RUNTIME_VERSION: ${{ env.SDK_TAG }}
 
             - name: Coverage Report
               uses: 70-10/bun-coverage-report-action@6173866ce2a31456a726ff3f4c91f230bd94a9e9 # v1.0.3

.github/workflows/sdk.yaml

@@ -6,12 +6,8 @@ on:
                 required: true
             DOCKERHUB_TOKEN:
                 required: true
-    pull_request:
-        paths:
-            - ".github/workflows/sdk.yaml"
-            - "packages/sdk/**"
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+    group: sdk-${{ github.ref }}
     cancel-in-progress: true
 permissions:
     contents: read
@@ -83,6 +79,12 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+            - name: Fetch rollups-node packages
+              run: ./packages/sdk/scripts/fetch-rollups-node.sh
+              env:
+                  # rollups-node#815 (chore/bump-version-alpha14) at e9eebb72
+                  ROLLUPS_NODE_RUN_ID: "41211121596"
+
             - name: Build and push
               uses: docker/bake-action@018cb6412ab401ebaa809aa5f85966b74628600f # v7.4.0
               if: ${{ !startsWith(github.ref, 'refs/tags/sdk@') }}

apps/cli/package.json

@@ -14,7 +14,7 @@
         "/dist"
     ],
     "devDependencies": {
-        "@cartesi/wagmi-plugin": "1.0.0-alpha.7",
+        "@cartesi/wagmi-plugin": "1.0.0-alpha.9",
         "@commander-js/extra-typings": "^15.0.0",
         "@inquirer/confirm": "^6.3.3",
         "@inquirer/core": "^12.0.4",

apps/cli/src/exec/cartesi-machine.ts

@@ -4,7 +4,7 @@ import {
     type ExecaOptionsDockerFallback,
 } from "./util.js";
 
-export const requiredVersion = new Range("^0.21.0");
+export const requiredVersion = new Range("^0.22.0");
 
 export const boot = (
     args: readonly string[],

apps/cli/tests/integration/commands/fixtures/accounts-withdrawal-layouts.ts

@@ -21,9 +21,6 @@ export type Layout = {
         at: number; // offset of data, the rest is zeros
         data: Buffer;
     };
-    // TODO: the machine-tool of rollups-node v2.0.0-alpha.13 only looks for the
-    // accounts drive among the flash drives, unskip once it finds nvrams too
-    skip?: boolean;
 };
 
 const scratchDrive = `
@@ -76,7 +73,6 @@ accounts_drive = true
 `,
         label: "accounts",
         device: "/dev/uio0",
-        skip: true,
     },
     {
         name: "the beginning of a larger nvram",
@@ -96,7 +92,6 @@ accounts_drive_size = "4Mi"
         label: "state",
         device: "/dev/uio1",
         accountsSize: 4 * MiB,
-        skip: true,
     },
     {
         // like a DEX, which memory-maps its state after the accounts, from an image
@@ -118,6 +113,5 @@ accounts_drive_size = "4Mi"
             at: 4 * MiB,
             data: Buffer.alloc(8 * MiB, 0xab),
         },
-        skip: true,
     },
 ];

apps/cli/tests/integration/commands/fixtures/accounts-withdrawal/dapp.sh

@@ -106,8 +106,8 @@ handle_erc20_deposit() {
   [[ "$token" == "$trusted_token" ]] || return 1
   [[ "${amount_hex:0:49}" =~ ^0{48}[0-7]$ ]] || return 1
 
+  # a zero deposit opens an account with no balance, as one emptied by a debit would be
   amount="$(uint64_be_to_dec "${amount_hex:48:16}")"
-  (( amount > 0 )) || return 1
   credit_account "$sender" "$amount"
 }
 

apps/cli/tests/integration/commands/recovery.test.ts

@@ -42,8 +42,10 @@
  * The runtime must ship a rollups node with the refund command, as the
  * default SDK does.
  *
- * Inputs: alice (0), bob (1) and erin (2) are finalized in epoch 0; carol (3)
- * and dave (4) stay in the open epoch 1 and are refunded.
+ * Inputs: alice (0), bob (1), erin (2) and frank (3) are finalized in epoch 0;
+ * carol (4) and dave (5) stay in the open epoch 1 and are refunded. frank
+ * deposits nothing, leaving an account with no balance in the drive, which
+ * must not stop the other accounts from being proven.
  */
 
 const EPOCH_LENGTH = 720;
@@ -56,13 +58,21 @@
 const carol = devnetAccount(3);
 const dave = devnetAccount(4);
 const erin = devnetAccount(5);
+const frank = devnetAccount(6);
 
 // the guardian comes from a mnemonic the node doesn't sign with
 const guardianMnemonic =
     "legal winner thank year wave sausage worth useful legal winner thank yellow";
 const guardian = mnemonicToAccount(guardianMnemonic).address;
 
-const amounts = { alice: 100n, bob: 50n, carol: 25n, dave: 15n, erin: 10n };
+const amounts = {
+    alice: 100n,
+    bob: 50n,
+    carol: 25n,
+    dave: 15n,
+    erin: 10n,
+    frank: 0n,
+};
 
 const count = (text: string, part: string) => text.split(part).length - 1;
 
@@ -139,7 +149,7 @@
 
         console.log("! Building the accounts-withdrawal application...");
         const build = await buildApplication(appDir);
         expect(build.exitCode, build.all).toBe(0);
         console.log("✓ Built the accounts-withdrawal application");
 
         ({ application, run } = await startApplication({
@@ -177,6 +187,7 @@
             await deposit(alice, amounts.alice);
             await deposit(bob, amounts.bob);
             await deposit(erin, amounts.erin);
+            await deposit(frank, amounts.frank);
 
             // close the first epoch and wait for its claim to be accepted
             await anvil.mine({ blocks: EPOCH_LENGTH });
@@ -193,7 +204,7 @@
             await deposit(carol, amounts.carol);
             await deposit(dave, amounts.dave);
             await waitFor(() =>
-                getNodeInput({ application, inputIndex: 4n, projectName }),
+                getNodeInput({ application, inputIndex: 5n, projectName }),
             );
         },
         TIMEOUT,
@@ -203,7 +214,7 @@
         it(
             "should pass the node's NotForeclosed error through on refund",
             async () => {
-                const refund = await cli(["refund", "3", "--yes"]);
+                const refund = await cli(["refund", "4", "--yes"]);
                 expect(refund.exitCode).not.toBe(0);
                 expect(refund.all).toContain("NotForeclosed");
             },
@@ -273,10 +284,10 @@
             "should refund a deposit that was not finalized",
             async () => {
                 expect(await usdcBalance(carol)).toBe(0n);
-                const refund = await cli(["refund", "3", "--yes", "--json"]);
+                const refund = await cli(["refund", "4", "--yes", "--json"]);
                 expect(refund.exitCode, refund.all).toBe(0);
                 expect(JSON.parse(refund.stdout)).toMatchObject({
-                    input_index: "3",
+                    input_index: "4",
                 });
                 expect(await usdcBalance(carol)).toBe(amounts.carol);
             },
@@ -288,15 +299,15 @@
             async () => {
                 const rawData = await getNodeInput({
                     application,
-                    inputIndex: 4n,
+                    inputIndex: 5n,
                     projectName,
                 });
                 const inputFile = path.join(appDir, "dave-input.hex");
                 await fs.writeFile(inputFile, rawData);
                 expect(await usdcBalance(dave)).toBe(0n);
                 const refund = await cli([
                     "refund",
-                    "4",
+                    "5",
                     "--input-file",
                     inputFile,
                     "--yes",

apps/cli/tests/integration/commands/withdrawal-layouts.test.ts

@@ -65,9 +65,7 @@
 };
 
 layouts.forEach((layout, index) => {
-    const describeLayout = layout.skip ? describe.skip : describe;
-
-    describeLayout(`emergency withdrawal from ${layout.name}`, () => {
+    describe(`emergency withdrawal from ${layout.name}`, () => {
         const projectName = `layouts-${index}-${process.pid}`;
         let appDir: string;
         let cleanup: () => void;
@@ -87,7 +85,7 @@
 
             console.log(`! Building an application with ${layout.name}...`);
             const build = await buildLayout(appDir, layout);
             expect(build.exitCode, build.all).toBe(0);
             const output = stripVTControlCharacters(build.all ?? "");
             expect(output).toContain(
                 `accounts drive  ${layout.label} (${layout.device.startsWith("/dev/uio") ? "nvram" : "flash drive"}) → ${layout.device}`,

apps/cli/tests/unit/exec/cartesi-machine.test.ts

@@ -9,11 +9,11 @@ import {
 const semver = (version: string) => parse(version) as SemVer;
 
 describe("requiredVersion", () => {
-    it.each(["0.21.0", "0.21.3"])("should accept %s", (version) => {
+    it.each(["0.22.0", "0.22.3"])("should accept %s", (version) => {
         expect(satisfies(version, requiredVersion)).toBeTruthy();
     });
 
-    it.each(["0.20.0", "0.20.9", "0.22.0", "1.0.0"])(
+    it.each(["0.21.0", "0.21.9", "0.23.0", "1.0.0"])(
         "should reject %s",
         (version) => {
             expect(satisfies(version, requiredVersion)).toBeFalsy();
@@ -22,11 +22,11 @@ describe("requiredVersion", () => {
 });
 
 describe("assertSupported", () => {
-    it.each(["0.21.0", "0.21.3"])("should accept %s", (version) => {
+    it.each(["0.22.0", "0.22.3"])("should accept %s", (version) => {
         expect(() => assertSupported(semver(version))).not.toThrow();
     });
 
-    it.each(["0.20.0", "0.22.0"])("should reject %s", (version) => {
+    it.each(["0.21.0", "0.23.0"])("should reject %s", (version) => {
         expect(() => assertSupported(semver(version))).toThrowError(
             new UnsupportedVersionError(semver(version)),
         );

packages/sdk/.gitignore

@@ -1 +1,2 @@
 build.json
+rollups-node/