feat: Corrected samples and tests for new version

Author: lynoferraz

.github/workflows/build-and-release.yml

@@ -59,7 +59,6 @@ jobs:
           cartesapp test --cartesi-machine --config-file "./cartesi.toml" --log-level debug \
             --drive-config "root.dockerfile=sample_apps/wallet_app/${{ matrix.images.image }}.dockerfile" \
             --drive-config "app.dockerfile=sample_apps/wallet_app/${{ matrix.images.image }}.dockerfile" \
-            --drive-config "state.dockerfile=sample_apps/wallet_app/${{ matrix.images.image }}.dockerfile" \
             sample_apps/tests/ledger/
 
       - name: Build Wheels

cartesi.toml

@@ -20,13 +20,9 @@ target = "app"
 build_args = ["WALLET_APP_CONFIG=config.py","APP_DIR=sample_apps/wallet_app","INSTALL_STEP=build-local"]
 
 [drives.state]
-builder = "docker"
-dockerfile = "sample_apps/wallet_app/alpine.dockerfile"
-target = "state"
-build_args=["WALLET_APP_CONFIG=config.py","APP_DIR=sample_apps/wallet_app","INSTALL_STEP=build-local"]
-format = "none"
-output_type = "local"
-#buildx = true
-user = "dapp"
+builder = "empty"
+size = "64Mb"
+mke2fs = "false"
 mount = "false"
-avoid_overwrite = "true"
+format = "raw"
+user = "dapp"

sample_apps/tests/ledger/test_erc721_wallet.py

@@ -159,4 +159,7 @@ def test_should_not_have_balance2(
     hex_payload = str2hex(json.dumps(payload))
     app_client.send_inspect(hex_payload=hex_payload)
 
-    assert not app_client.rollup.status # asset removed
+    assert app_client.rollup.status # asset removed
+
+    report = app_client.rollup.reports[-1]['data']['payload']
+    assert int(report,16) == 0

sample_apps/tests/test_config.py

@@ -1,5 +1,5 @@
-ETHER_PORTAL_ADDRESS = "0xA632c5c05812c6a6149B7af5C56117d1D2603828"
-ERC20_PORTAL_ADDRESS = "0xACA6586A0Cf05bD831f2501E7B4aea550dA6562D"
-ERC721_PORTAL_ADDRESS = "0x9E8851dadb2b77103928518846c4678d48b5e371"
-ERC1155_SINGLE_PORTAL_ADDRESS = "0x18558398Dd1a8cE20956287a4Da7B76aE7A96662"
-ERC1155_BATCH_PORTAL_ADDRESS = "0xe246Abb974B307490d9C6932F48EbE79de72338A"
+ETHER_PORTAL_ADDRESS = "0x8b53327575ac999bdfa8003f4b5134DFF9027516"
+ERC20_PORTAL_ADDRESS = "0x22E57511C30CcE6CDaa742E13CE3b774fDC663b1"
+ERC721_PORTAL_ADDRESS = "0xcA3a0a47915C12F020CF70B938aCC8e744414cb8"
+ERC1155_SINGLE_PORTAL_ADDRESS = "0x13663E193673756a02e84b724B8a3422A9a7aab4"
+ERC1155_BATCH_PORTAL_ADDRESS = "0x3649c5E2De91C69a7Bb80D864f0039da5E511096"

sample_apps/wallet_app/alpine.dockerfile

@@ -1,26 +1,26 @@
 # syntax=docker.io/docker/dockerfile:1
 ARG APT_UPDATE_SNAPSHOT=20260113T030400Z
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1-r1
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2-r1
 ARG MACHINE_GUEST_TOOLS_SHA256SUM=c077573dbcf0cdc146adf14b480bfe454ca63aa4d3e8408c5487f550a5b77a41
 ARG MACHINE_ASSET_TOOLS_VERSION=0.1.0-alpha.8
-ARG MACHINE_ASSET_TOOLS_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_musl_riscv64_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
-ARG MACHINE_ASSET_TOOLS_TAR_CHECKSUM=sha256:8c8b228c07fa822e63743c58307e28fe84adcfaff75663b6d341a44e6f797e54
+# ARG MACHINE_ASSET_TOOLS_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_musl_riscv64_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
+# ARG MACHINE_ASSET_TOOLS_TAR_CHECKSUM=sha256:b1f124b29d560dc7e489af97f1d992596e936aff1550e7735672e0be79879253
 ARG MACHINE_ASSET_TOOLS_DEV_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_musl_riscv64_dev_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
-ARG MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM=sha256:63a7de3880e5695f86c6598bc53e4ee4924902436f90252d78b7798a5501ded5
+ARG MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM=sha256:77af16a6fd7ba8fe0454701105a51dee5ce6f198036b6c0b8e7184982f9c0e06
 
 ARG APP_DIR=.
 ARG WALLET_APP_CONFIG=config.py
 ARG INSTALL_STEP=install
 ARG STATE_FILESIZE=67108864
 
 # ARG IMAGE_VERSION=3.13.12-alpine3.22
-ARG IMAGE_VERSION=3.12.12-alpine3.22
+ARG IMAGE_VERSION=3.12.13-alpine3.24
 FROM --platform=linux/riscv64 riscv64/python:${IMAGE_VERSION} AS base
 
 # Install tools
 ARG MACHINE_GUEST_TOOLS_VERSION
-ADD --chmod=644 https://edubart.github.io/linux-packages/apk/keys/cartesi-apk-key.rsa.pub /etc/apk/keys/cartesi-apk-key.rsa.pub
-RUN echo "https://edubart.github.io/linux-packages/apk/stable" >> /etc/apk/repositories
+ADD --chmod=644 https://cartesi.github.io/linux-packages/apk/keys/cartesi-apk-key.rsa.pub /etc/apk/keys/cartesi-apk-key.rsa.pub
+RUN echo "https://cartesi.github.io/linux-packages/apk/stable" >> /etc/apk/repositories
 RUN apk update && apk add cartesi-machine-guest-tools=$MACHINE_GUEST_TOOLS_VERSION
 
 # ARG MACHINE_ASSET_TOOLS_TAR
@@ -60,7 +60,7 @@ RUN <<EOF
 set -e
 apk update
 apk add \
-    build-base=0.5-r3 \
+    build-base=0.5-r4 \
     cartesi-machine-guest-libcmt-dev=${MACHINE_GUEST_TOOLS_VERSION}
 EOF
 
@@ -148,20 +148,5 @@ ARG WALLET_APP_CONFIG
 COPY ${APP_DIR}/app.py .
 COPY ${APP_DIR}/${WALLET_APP_CONFIG} .
 
-### State
-FROM --platform=linux/riscv64 rootfs AS state-builder
-
-COPY --from=app-scratch / /opt/cartesi/app
-
-WORKDIR /opt/cartesi/app/data
-
-ARG STATE_FILESIZE
-
-RUN /usr/local/bin/python3 /opt/cartesi/app/app.py /opt/cartesi/app/data/state.bin 1
-
-FROM --platform=linux/riscv64 scratch AS state
-
-COPY --from=state-builder /opt/cartesi/app/data/state.bin /
-
 ### App
 FROM --platform=linux/riscv64 app-scratch AS app

sample_apps/wallet_app/app.py

@@ -304,10 +304,6 @@ def handle_inspect(rollup, ledger):
 
     mem_file = sys.argv[1]
     create_file = False
-    if len(sys.argv) > 2:
-        create_file = True
-        with open(mem_file, "wb") as f:
-            f.truncate(LEDGER_OFFSET + MEMORY_SIZE)
 
     rollup = RollupCma()
     ledger = Ledger(
@@ -316,14 +312,10 @@ def handle_inspect(rollup, ledger):
         mem_length = MEMORY_SIZE,
         n_accounts = MAX_ACCOUNTS,
         n_assets = MAX_ASSETS,
-        n_balances = MAX_BALANCES,
-        initialize_memory = create_file
+        n_balances = MAX_BALANCES
     )
-    if create_file:
-        asset_info = ledger.retrieve_asset(base_token = True)
-        exit(0)
 
-    asset_info = ledger.retrieve_asset(base_token = True, force_find = True)
+    asset_info = ledger.retrieve_asset(base_token = True)
     EtherId.set(asset_info['asset_id'])
 
     accept_previous_request = True

sample_apps/wallet_app/cartesi.toml

@@ -19,13 +19,9 @@ target = "app"
 build_args=["WALLET_APP_CONFIG=config.py"]
 
 [drives.state]
-builder = "docker"
-dockerfile = "alpine.dockerfile"
-target = "state"
-build_args=["WALLET_APP_CONFIG=config.py"]
-format = "none"
-output_type = "local"
-#buildx = true
-user = "dapp"
+builder = "empty"
+size = "64Mb"
+mke2fs = "false"
 mount = "false"
-avoid_overwrite = "true"
+format = "raw"
+user = "dapp"

sample_apps/wallet_app/config.py

@@ -1,5 +1,5 @@
-ETHER_PORTAL_ADDRESS = "0xA632c5c05812c6a6149B7af5C56117d1D2603828"[2:].lower()
-ERC20_PORTAL_ADDRESS = "0xACA6586A0Cf05bD831f2501E7B4aea550dA6562D"[2:].lower()
-ERC721_PORTAL_ADDRESS = "0x9E8851dadb2b77103928518846c4678d48b5e371"[2:].lower()
-ERC1155_SINGLE_PORTAL_ADDRESS = "0x18558398Dd1a8cE20956287a4Da7B76aE7A96662"[2:].lower()
-ERC1155_BATCH_PORTAL_ADDRESS = "0xe246Abb974B307490d9C6932F48EbE79de72338A"[2:].lower()
+ETHER_PORTAL_ADDRESS = "0x8b53327575ac999bdfa8003f4b5134DFF9027516"[2:].lower()
+ERC20_PORTAL_ADDRESS = "0x22E57511C30CcE6CDaa742E13CE3b774fDC663b1"[2:].lower()
+ERC721_PORTAL_ADDRESS = "0xcA3a0a47915C12F020CF70B938aCC8e744414cb8"[2:].lower()
+ERC1155_SINGLE_PORTAL_ADDRESS = "0x13663E193673756a02e84b724B8a3422A9a7aab4"[2:].lower()
+ERC1155_BATCH_PORTAL_ADDRESS = "0x3649c5E2De91C69a7Bb80D864f0039da5E511096"[2:].lower()

sample_apps/wallet_app/requirements.txt

@@ -1,3 +1,3 @@
 --find-links https://prototyp3-dev.github.io/pip-wheels-riscv/wheels/
 pycmt >= 0.0.1
-pycma >= 0.0.1
+pycma >= 0.0.2

sample_apps/wallet_app/ubuntu.dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker.io/docker/dockerfile:1
-ARG APT_UPDATE_SNAPSHOT=20260113T030400Z
+ARG APT_UPDATE_SNAPSHOT=20260623T000000Z
 ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
-ARG MACHINE_GUEST_TOOLS_SHA256SUM=c077573dbcf0cdc146adf14b480bfe454ca63aa4d3e8408c5487f550a5b77a41
+ARG MACHINE_GUEST_TOOLS_SHA=sha256:4cabfd5cfd932367a5be35fa6c18a541f9044f04c48ffcb38bea3cebf88cc6a7
 ARG MACHINE_ASSET_TOOLS_VERSION=0.1.0-alpha.8
-ARG MACHINE_ASSET_TOOLS_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_glibc_riscv64_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
-ARG MACHINE_ASSET_TOOLS_TAR_CHECKSUM=sha256:639fc0915b5551eab8c2e91b3216e248cd94e546eca9dd50ba230a431e9c4e85
+# ARG MACHINE_ASSET_TOOLS_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_glibc_riscv64_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
+# ARG MACHINE_ASSET_TOOLS_TAR_CHECKSUM=sha256:f8ef6e1ca785c30059e58d18a5a93df2098f9d73de4b4489f477475c74f96029
 ARG MACHINE_ASSET_TOOLS_DEV_TAR=https://github.com/Mugen-Builders/machine-asset-tools/releases/download/v${MACHINE_ASSET_TOOLS_VERSION}/machine-asset-tools_glibc_riscv64_dev_v${MACHINE_ASSET_TOOLS_VERSION}.tar.gz
-ARG MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM=sha256:8b3d55ceb148bd843e1210c3be5545fb0e9074fd5b02ecc32cf8bbddc32790f5
+ARG MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM=sha256:5a1f3730add17ee29298cc7dfa81362bba6c0adef0581c130ed6427e40d8ed4d
 
 ARG APP_DIR=.
 ARG WALLET_APP_CONFIG=config.py
@@ -30,20 +30,9 @@ EOF
 
 # Install guest tools
 ARG MACHINE_GUEST_TOOLS_VERSION
-ARG MACHINE_GUEST_TOOLS_SHA256SUM
-ADD --checksum=sha256:${MACHINE_GUEST_TOOLS_SHA256SUM} \
-    https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb \
-    /tmp/machine-guest-tools_riscv64.deb
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN <<EOF
-set -e
-apt-get install -y --no-install-recommends \
-  busybox-static \
-  /tmp/machine-guest-tools_riscv64.deb
-
-rm /tmp/machine-guest-tools_riscv64.deb
-EOF
+ADD https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb /tmp/
+RUN apt-get install -y --no-install-recommends /tmp/machine-guest-tools_riscv64.deb
+RUN rm /tmp/machine-guest-tools_riscv64.deb
 
 # ARG MACHINE_ASSET_TOOLS_TAR
 # ARG MACHINE_ASSET_TOOLS_TAR_CHECKSUM
@@ -77,12 +66,27 @@ EOF
 
 FROM base AS builder
 
+# Install g++ 14
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    g++-14 build-essential
+
 RUN <<EOF
 set -e
-apt-get install -y --no-install-recommends \
-    build-essential gcc libc6-dev
+apt-get remove -y g++-13
+update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
+update-alternatives --config g++
 EOF
 
+# Install guest tools
+ARG MACHINE_GUEST_TOOLS_VERSION
+ARG MACHINE_GUEST_TOOLS_SHA
+ADD --checksum=${MACHINE_GUEST_TOOLS_SHA} \
+    https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.tar.gz \
+    /tmp/machine-guest-tools_riscv64.tar.gz
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN tar zxvf /tmp/machine-guest-tools_riscv64.tar.gz -C /
+
 ARG MACHINE_ASSET_TOOLS_DEV_TAR
 ARG MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM
 ADD --checksum=${MACHINE_ASSET_TOOLS_DEV_TAR_CHECKSUM} ${MACHINE_ASSET_TOOLS_DEV_TAR} /tmp/cma.tar.gz
@@ -157,8 +161,6 @@ find /usr/local/lib -type d -name __pycache__ -exec rm -r {} +
 find . -type d -name __pycache__ -exec rm -r {} +
 rm -rf /var/lib/apt/lists/* /var/log/* /var/cache/* /tmp/* /opt/install
 EOF
-### Rootfs
-FROM ${INSTALL_STEP} AS rootfs
 
 ### Rootfs
 FROM ${INSTALL_STEP} AS rootfs
@@ -170,20 +172,5 @@ ARG WALLET_APP_CONFIG
 COPY ${APP_DIR}/app.py .
 COPY ${APP_DIR}/${WALLET_APP_CONFIG} .
 
-### State
-FROM --platform=linux/riscv64 rootfs AS state-builder
-
-COPY --from=app-scratch / /opt/cartesi/app
-
-WORKDIR /opt/cartesi/app/data
-
-ARG STATE_FILESIZE
-
-RUN /usr/local/bin/python3 /opt/cartesi/app/app.py /opt/cartesi/app/data/state.bin 1
-
-FROM --platform=linux/riscv64 scratch AS state
-
-COPY --from=state-builder /opt/cartesi/app/data/state.bin /
-
 ### App
 FROM --platform=linux/riscv64 app-scratch AS app