Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/all-rings-care.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/devnet": patch
---

bump foundry to 1.2.1
5 changes: 5 additions & 0 deletions .changeset/fluffy-trams-create.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/cli": patch
---

bump rollups-contracts to 2.0.0
5 changes: 5 additions & 0 deletions .changeset/old-candies-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/sdk": patch
---

bump cartesi-rollups-node to 2.0.0-alpha.5
5 changes: 5 additions & 0 deletions .changeset/open-loops-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/sdk": patch
---

bump foundry to 1.2.1
5 changes: 5 additions & 0 deletions .changeset/real-guests-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/sdk": minor
---

bump machine-emulator to 0.19.0
2 changes: 1 addition & 1 deletion .github/workflows/devnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # 1.3.1
with:
version: v1.0.0
version: v1.2.1

- name: Install dependencies
run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@biomejs/biome": "catalog:",
"@cartesi/devnet": "2.0.0-alpha.5",
"@cartesi/rollups": "2.0.0-rc.17",
"@cartesi/rollups": "2.0.0",
"@types/bytes": "^3.1.5",
"@types/fs-extra": "^11.0.4",
"@types/inquirer": "^9.0.7",
Expand Down
1 change: 1 addition & 0 deletions apps/cli/src/compose/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CARTESI_LOG_LEVEL="${CARTESI_LOG_LEVEL:-info}"
CARTESI_FEATURE_INPUT_READER_ENABLED="${CARTESI_FEATURE_INPUT_READER_ENABLED:-true}"
CARTESI_FEATURE_CLAIM_SUBMISSION_ENABLED="${CARTESI_FEATURE_CLAIM_SUBMISSION_ENABLED:-true}"
CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED="${CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED:-true}"
CARTESI_SNAPSHOTS_DIR="/var/lib/cartesi-rollups-node/snapshots"

# rollups
CARTESI_EVM_READER_RETRY_POLICY_MAX_RETRIES="${CARTESI_EVM_READER_RETRY_POLICY_MAX_RETRIES:-3}"
Expand Down
5 changes: 5 additions & 0 deletions apps/cli/src/compose/docker-compose-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ services:
command: ["cartesi-rollups-node"]
env_file:
- ${CARTESI_BIN_PATH}/compose/default.env
volumes:
- snapshots:/var/lib/cartesi-rollups-node/snapshots
Copy link

Copilot AI Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The snapshot directory path is hardcoded here but also defined in default.env. Consider referencing the CARTESI_SNAPSHOTS_DIR variable to keep the path consistent and configurable.

Suggested change
- snapshots:/var/lib/cartesi-rollups-node/snapshots
- snapshots:${CARTESI_SNAPSHOTS_DIR}

Copilot uses AI. Check for mistakes.

proxy:
volumes:
- ./proxy/rollups-node.yaml:/etc/traefik/conf.d/rollups-node.yaml

volumes:
snapshots:
1 change: 1 addition & 0 deletions apps/cli/wagmi.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default defineConfig({
plugins: [
cannonDeployments({
directory: "node_modules/@cartesi/devnet/deployments",
includes: [/^cartesiRollups*/, /^Test*/],
}),
],
});
1 change: 1 addition & 0 deletions packages/sdk/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build.json
12 changes: 6 additions & 6 deletions packages/sdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

################################################################################
# https://github.com/EspressoSystems/espresso-sequencer/pkgs/container/espresso-sequencer%2Fespresso-dev-node
FROM ${ESPRESSO_DEV_NODE_BASE_IMAGE} AS espresso-dev-node

Check warning on line 9 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${ESPRESSO_DEV_NODE_BASE_IMAGE} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

################################################################################
# base image
FROM ${CARTESI_BASE_IMAGE} AS base

Check warning on line 13 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${CARTESI_BASE_IMAGE} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
ARG DEBIAN_FRONTEND=noninteractive
RUN <<EOF
Expand Down Expand Up @@ -173,15 +173,15 @@

# Install cartesi-machine emulator
RUN <<EOF
curl -fsSL https://github.com/cartesi/machine-emulator/releases/download/v${CARTESI_MACHINE_EMULATOR_VERSION}/cartesi-machine-v${CARTESI_MACHINE_EMULATOR_VERSION%%-*}_${TARGETARCH}.deb \
-o /tmp/cartesi-machine.deb
curl -fsSL https://github.com/cartesi/machine-emulator/releases/download/v${CARTESI_MACHINE_EMULATOR_VERSION}/machine-emulator_${TARGETARCH}.deb \
-o /tmp/machine-emulator.deb
case "${TARGETARCH}" in
amd64) echo "726c510632eedad51aec366634711f5062808c5aedf34b7fb7e6b2263de88e1f /tmp/cartesi-machine.deb" | sha256sum --check ;;
arm64) echo "45712294ddd9cef0130074066b800d3b090a5e576ec9215e1a16f3ddcb146d29 /tmp/cartesi-machine.deb" | sha256sum --check ;;
amd64) echo "adae6b030a8990e316997aad53d175192bfeaa84ad12ee19491366377073572b /tmp/machine-emulator.deb" | sha256sum --check ;;
arm64) echo "15ebb64d8cd3296564d2297dd809d1d72c13a938976bb4ecc5e5c82e71bb8069 /tmp/machine-emulator.deb" | sha256sum --check ;;
*) echo "unsupported architecture: $ARCH"; exit 1 ;;
esac
apt-get install -y --no-install-recommends /tmp/cartesi-machine.deb
rm /tmp/cartesi-machine.deb
apt-get install -y --no-install-recommends /tmp/machine-emulator.deb
rm /tmp/machine-emulator.deb
cartesi-machine --version-json
EOF

Expand All @@ -207,7 +207,7 @@

################################################################################
# postgresql initdb
FROM ${POSTGRES_BASE_IMAGE} AS postgresql-initdb

Check warning on line 210 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${POSTGRES_BASE_IMAGE} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

ARG DEBIAN_FRONTEND=noninteractive
RUN <<EOF
Expand All @@ -223,7 +223,7 @@
COPY --from=graphql-migration /usr/share/cartesi/rollups-graphql/migrations /usr/share/cartesi/rollups-graphql/migrations
COPY --from=espresso-reader-migration /usr/share/cartesi/rollups-espresso-reader/migrations /usr/share/cartesi/rollups-espresso-reader/migrations

ARG POSTGRES_PASSWORD=password

Check warning on line 226 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "POSTGRES_PASSWORD") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

# create rollupsdb, graphql and espresso databases
COPY <<EOF /docker-entrypoint-initdb.d/00-createdb.sql
Expand Down Expand Up @@ -259,12 +259,12 @@

################################################################################
# rollups-database image
FROM ${POSTGRES_BASE_IMAGE} AS rollups-database

Check warning on line 262 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${POSTGRES_BASE_IMAGE} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
COPY --from=postgresql-initdb /var/lib/postgresql/data /var/lib/postgresql/data

################################################################################
# alto build
FROM node:${NODE_VERSION} AS alto

Check warning on line 267 in packages/sdk/Dockerfile

View workflow job for this annotation

GitHub Actions / build

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG node:${NODE_VERSION} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
ARG ALTO_VERSION
ARG NODE_VERSION
ARG FOUNDRY_VERSION
Expand Down
8 changes: 4 additions & 4 deletions packages/sdk/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ target "default" {
args = {
ALTO_VERSION = "1.2.5"
ALTO_PACKAGE_VERSION = "0.0.18"
CARTESI_BASE_IMAGE = "docker.io/library/debian:bookworm-20250428-slim@sha256:4b50eb66f977b4062683ff434ef18ac191da862dbe966961bc11990cf5791a8d"
CARTESI_BASE_IMAGE = "docker.io/library/debian:bookworm-20250520-slim@sha256:90522eeb7e5923ee2b871c639059537b30521272f10ca86fdbbbb2b75a8c40cd"
CARTESI_DEVNET_VERSION = "2.0.0-alpha.6"
CARTESI_ESPRESSO_READER_VERSION = "0.3.0"
CARTESI_IMAGE_KERNEL_VERSION = "0.20.0"
CARTESI_LINUX_KERNEL_VERSION = "6.5.13-ctsi-1-v0.20.0"
CARTESI_MACHINE_EMULATOR_VERSION = "0.19.0-alpha3"
CARTESI_MACHINE_EMULATOR_VERSION = "0.19.0"
CARTESI_PASSKEY_SERVER_VERSION = "1.0.1"
CARTESI_PAYMASTER_VERSION = "0.2.0"
CARTESI_ROLLUPS_GRAPHQL_VERSION = "2.3.14"
CARTESI_ROLLUPS_NODE_VERSION = "2.0.0-alpha.4"
CARTESI_ROLLUPS_NODE_VERSION = "2.0.0-alpha.5"
CRANE_VERSION = "0.19.1"
ESPRESSO_DEV_NODE_BASE_IMAGE = "ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:20250428-dev-node-decaf-pos@sha256:78024bc092d51b47e81c0f715dc7a87ac9da81f62a4f8bf3165b3a199f9867fb"
FOUNDRY_VERSION = "1.0.0"
FOUNDRY_VERSION = "1.2.1"
GO_MIGRATE_VERSION = "4.18.2"
NODE_VERSION = "22.15.1"
NVM_VERSION = "977563e97ddc66facf3a8e31c6cff01d236f09bd" # 0.40.3
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"private": true,
"version": "0.12.0-alpha.17",
"scripts": {
"build": "docker buildx bake --load"
"build": "docker buildx bake --load --metadata-file=build.json"
}
}
8 changes: 8 additions & 0 deletions packages/sdk/turbo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": ["//"],
"tasks": {
"build": {
"outputs": ["build.json"]
}
}
}
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading