feat: bump emulator to v0.20.0

Author: mpolitzer

Dockerfile

@@ -3,12 +3,12 @@
 
 # syntax=docker.io/docker/dockerfile:1
 
-ARG EMULATOR_VERSION=0.19.0
+ARG EMULATOR_VERSION=0.20.0
 
 # Build directories.
 ARG GO_BUILD_PATH=/build/cartesi/go
 
-FROM debian:bookworm-20250407 AS common-env
+FROM debian:trixie-20250811 AS common-env
 
 USER root
 
@@ -22,13 +22,13 @@ RUN <<EOF
     apt-get update
     apt-get install -y --no-install-recommends \
         ca-certificates curl wget build-essential pkg-config libssl-dev
-    addgroup --system --gid 102 cartesi
-    adduser --system --uid 102 --ingroup cartesi --disabled-login --no-create-home --home /nonexistent --gecos "cartesi user" --shell /bin/false cartesi
+    groupadd --system --gid 102 cartesi
+    useradd --system --uid 102 --gid cartesi --shell /usr/sbin/nologin --no-create-home cartesi
     ARCH=$(dpkg --print-architecture)
     wget -O /tmp/cartesi-machine-emulator.deb "https://github.com/cartesi/machine-emulator/releases/download/v${EMULATOR_VERSION}/machine-emulator_${ARCH}.deb"
     case "$ARCH" in
-        amd64) echo "adae6b030a8990e316997aad53d175192bfeaa84ad12ee19491366377073572b  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
-        arm64) echo "15ebb64d8cd3296564d2297dd809d1d72c13a938976bb4ecc5e5c82e71bb8069  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
+        amd64) echo "46b2f37b889091df3b89a8909467935f8dd4a1426eeb0491b6a346a12f0c341c  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
+        arm64) echo "27ea10571335ad174b75388e7de54a3d3434bd607554d8c0bdf6abca47ceae0d  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
         *) echo "unsupported architecture: $ARCH"; exit 1 ;;
     esac
     apt-get install -y --no-install-recommends /tmp/cartesi-machine-emulator.deb
@@ -146,7 +146,7 @@ RUN make build-debian-package DESTDIR=$PWD/_install
 # (This stage copies the binaries from previous stages.)
 # =============================================================================
 
-FROM debian:bookworm-20250407 AS rollups-node
+FROM debian:trixie-20250811 AS rollups-node
 
 ARG NODE_RUNTIME_DIR=/var/lib/cartesi-rollups-node
 ARG GO_BUILD_PATH
@@ -164,8 +164,8 @@ COPY --from=debian-packager \
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
     set -e
-    addgroup --system --gid 102 cartesi
-    adduser --system --uid 102 --ingroup cartesi --disabled-login --no-create-home --home /nonexistent --gecos "cartesi user" --shell /bin/false cartesi
+    groupadd --system --gid 102 cartesi
+    useradd --system --uid 102 --gid cartesi --shell /usr/sbin/nologin --no-create-home cartesi
     apt-get update
     apt-get install -y --no-install-recommends \
         ca-certificates \

Makefile

@@ -123,11 +123,11 @@ env:
 	@echo export CARTESI_BLOCKCHAIN_HTTP_ENDPOINT="http://localhost:8545"
 	@echo export CARTESI_BLOCKCHAIN_WS_ENDPOINT="ws://localhost:8545"
 	@echo export CARTESI_BLOCKCHAIN_ID="31337"
-	@echo export CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="0x1b51e2992A2755Ba4D6F7094032DF91991a0Cfac"
+	@echo export CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="0x606c3Ab81a862BEA826Fb3C9395F328f0E465294"
 	@echo export CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS="0x5E96408CFE423b01dADeD3bc867E6013135990cc"
 	@echo export CARTESI_CONTRACTS_APPLICATION_FACTORY_ADDRESS="0x26E758238CB6eC5aB70ce0dd52aF2d7b82e1972E"
 	@echo export CARTESI_CONTRACTS_SELF_HOSTED_APPLICATION_FACTORY_ADDRESS="0x010D3CbB4223F5bCc7b7B03cEE59f3aAea8eDb8A"
-	@echo export CARTESI_CONTRACTS_DAVE_APP_FACTORY_ADDRESS="0xfC2DBC639b5FB9AfE66A8696eC14EaD9FbFBC404"
+	@echo export CARTESI_CONTRACTS_DAVE_APP_FACTORY_ADDRESS="0xbE70ae667546d5C0C57a0c96018C327bCb0fe796"
 	@echo export CARTESI_AUTH_MNEMONIC=\"test test test test test test test test test test test junk\"
 	@echo export CARTESI_DATABASE_CONNECTION="postgres://postgres:password@localhost:5432/rollupsdb?sslmode=disable"
 	@echo export CARTESI_SNAPSHOTS_DIR="snapshots"

cmd/cartesi-rollups-cli/root/app/register/register.go

@@ -12,11 +12,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/root/app/util"
 	"github.com/cartesi/rollups-node/internal/config"
 	"github.com/cartesi/rollups-node/internal/model"
 	"github.com/cartesi/rollups-node/internal/repository/factory"
 	"github.com/cartesi/rollups-node/pkg/contracts/dataavailability"
+	"github.com/cartesi/rollups-node/pkg/emulator"
 	"github.com/cartesi/rollups-node/pkg/ethutil"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -143,12 +143,11 @@ func run(cmd *cobra.Command, args []string) {
 		checkEnabled, err := config.GetFeatureMachineHashCheckEnabled()
 		cobra.CheckErr(err)
 		if checkEnabled {
-			templateHash, err := util.ReadHash(templatePath)
+			snapshotTemplateHash, err := emulator.ReadHash(templatePath)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Read machine template hash failed: %v\n", err)
 				os.Exit(1)
 			}
-			snapshotTemplateHash := common.HexToHash(templateHash)
 			if parsedTemplateHash != snapshotTemplateHash {
 				fmt.Fprintf(os.Stderr, "Template hash mismatch: contract has %s but machine has %s\n",
 					parsedTemplateHash.Hex(), snapshotTemplateHash.Hex())

cmd/cartesi-rollups-cli/root/app/util/machine.go

@@ -8,14 +8,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path"
 	"strings"
 
 	"github.com/cartesi/rollups-node/internal/config"
 	"github.com/cartesi/rollups-node/internal/config/auth"
 	"github.com/cartesi/rollups-node/internal/model"
 	"github.com/cartesi/rollups-node/internal/repository/factory"
 	"github.com/cartesi/rollups-node/pkg/contracts/iconsensus"
+	"github.com/cartesi/rollups-node/pkg/emulator"
 	"github.com/cartesi/rollups-node/pkg/ethutil"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -360,7 +360,7 @@ func buildSelfhostedApplicationDeployment(
 
 	if !cmd.Flags().Changed("template-hash") {
 		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
-			request.TemplateHash, err = readHash(args[1])
+			request.TemplateHash, err = emulator.ReadHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
 		}
@@ -435,7 +435,7 @@ func buildApplicationOnlyDeployment(
 
 	if !cmd.Flags().Changed("template-hash") {
 		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
-			request.TemplateHash, err = readHash(args[1])
+			request.TemplateHash, err = emulator.ReadHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
 		}
@@ -515,7 +515,7 @@ func buildPrtApplicationDeployment(
 
 	if !cmd.Flags().Changed("template-hash") {
 		if len(args) >= 2 { // args[1] is mandatory if `template-hash` was absent
-			request.TemplateHash, err = readHash(args[1])
+			request.TemplateHash, err = emulator.ReadHash(args[1])
 		} else {
 			err = fmt.Errorf("missing argument. One of `template-path` or `template-hash` is required")
 		}
@@ -535,23 +535,6 @@ func buildPrtApplicationDeployment(
 	return request, nil
 }
 
-// read the hash value from the cartesi machine hash file
-func readHash(machineDir string) (common.Hash, error) {
-	zero := common.Hash{}
-	path := path.Join(machineDir, "hash")
-	hash, err := os.ReadFile(path)
-	if err != nil {
-		return zero, fmt.Errorf("read hash: %w", err)
-	} else if len(hash) != common.HashLength {
-		return zero, fmt.Errorf(
-			"read hash: wrong size; expected %v bytes but read %v",
-			common.HashLength,
-			len(hash),
-		)
-	}
-	return common.BytesToHash(hash), nil
-}
-
 func parseHexHash(hash string) (common.Hash, error) {
 	out := common.Hash{}
 	return out, out.UnmarshalText([]byte(hash))

cmd/cartesi-rollups-cli/root/deploy/application.go

@@ -5,7 +5,7 @@ Homepage: https://docs.cartesi.io/cartesi-rollups/
 Architecture: ARG_ARCH
 Maintainer: Node Reference Unit <https://discord.com/channels/600597137524391947/1110564973115097179>
 Provides: cartesi-rollups-node
-Depends: cartesi-machine-emulator (>= 0.19.0), cartesi-machine-emulator (<< 0.20.0)
+Depends: cartesi-machine-emulator (>= 0.20.0), cartesi-machine-emulator (<< 0.21.0)
 Section: net
 Priority: optional
 Multi-Arch: no

control.template

@@ -50,6 +50,6 @@ func SpawnServer(address string, timeout time.Duration) (*RemoteMachine, string,
 
 func CreateMachine(config, runtimeConfig string) (*Machine, error) {
 	machine := &Machine{}
-	err := machine.Create(config, runtimeConfig)
+	err := machine.Create(config, runtimeConfig, "")
 	return machine, err
 }

pkg/emulator/emulator.go

@@ -19,6 +19,14 @@ import (
 
 const HashSize = C.sizeof_cm_hash
 
+type SharingMode = C.cm_sharing_mode
+
+const (
+	SharingNone SharingMode = iota
+	SharingConfig
+	SharingAll
+)
+
 // Common type aliases
 type Hash = [HashSize]byte
 
@@ -58,11 +66,12 @@ func (m *Machine) Delete() {
 }
 
 // create
-func (m *Machine) Create(config, runtimeConfig string) error {
+func (m *Machine) Create(config, runtimeConfig, dir string) error {
 	var err error
 	m.callCAPI(func() {
 		var cConfig *C.char
 		var cRuntime *C.char
+		var cDir *C.char
 		if config != "" {
 			cConfig = C.CString(config)
 			defer C.free(unsafe.Pointer(cConfig))
@@ -71,7 +80,11 @@ func (m *Machine) Create(config, runtimeConfig string) error {
 			cRuntime = C.CString(runtimeConfig)
 			defer C.free(unsafe.Pointer(cRuntime))
 		}
-		err = newError(C.cm_create_new(cConfig, cRuntime, &m.ptr))
+		if dir != "" {
+			cDir = C.CString(dir)
+			defer C.free(unsafe.Pointer(cDir))
+		}
+		err = newError(C.cm_create_new(cConfig, cRuntime, cDir, &m.ptr))
 	})
 	return err
 }
@@ -119,35 +132,14 @@ func (m *Machine) GetInitialConfig() (string, error) {
 	return res, nil
 }
 
-// get_memory_ranges
-func (m *Machine) GetMemoryRanges() (string, error) {
-	var ranges *C.char
-	var err error
-	var res string
-
-	m.callCAPI(func() {
-		err = newError(C.cm_get_memory_ranges(m.ptr, &ranges))
-		if err != nil || ranges == nil {
-			return
-		}
-		res = C.GoString(ranges)
-		// no need to free 'ranges' here, as it is a static string
-	})
-
-	if err != nil {
-		return "", err
-	}
-	return res, nil
-}
-
 // get_proof
 func (m *Machine) GetProof(address uint64, log2size int32) (string, error) {
 	var proof *C.char
 	var err error
 	var res string
 
 	m.callCAPI(func() {
-		err = newError(C.cm_get_proof(m.ptr, C.uint64_t(address), C.int32_t(log2size), &proof))
+		err = newError(C.cm_get_proof(m.ptr, C.uint64_t(address), C.int32_t(log2size), C.int32_t(HashTreeLog2RootSize), &proof))
 		if err != nil || proof == nil {
 			return
 		}
@@ -241,7 +233,7 @@ func (m *Machine) Load(dir string, runtimeConfig string) error {
 			cRuntime = C.CString(runtimeConfig)
 			defer C.free(unsafe.Pointer(cRuntime))
 		}
-		err = newError(C.cm_load(m.ptr, cDir, cRuntime))
+		err = newError(C.cm_load(m.ptr, cDir, cRuntime, SharingNone))
 	})
 
 	return err
@@ -369,6 +361,53 @@ func (m *Machine) Run(mcycleEnd uint64) (BreakReason, error) {
 	return BreakReason(br), nil
 }
 
+// collect_mcycle_root_hashes
+func (m *Machine) CollectMCycleRootHashes(mcycleEnd, mcyclePeriod, mcyclePhase uint64, log2BundleMcycleCount int32, previousBackTree string) ([]byte, error) {
+	var err error
+	var result *C.char
+
+	m.callCAPI(func() {
+		var previousBackTreeC *C.char
+		if previousBackTree != "" {
+			previousBackTreeC = C.CString(previousBackTree)
+			defer C.free(unsafe.Pointer(previousBackTreeC))
+		}
+		err = newError(C.cm_collect_mcycle_root_hashes(
+			m.ptr,
+			C.uint64_t(mcycleEnd),
+			C.uint64_t(mcyclePeriod),
+			C.uint64_t(mcyclePhase),
+			C.int32_t(log2BundleMcycleCount),
+			previousBackTreeC,
+			&result))
+	})
+
+	if err != nil {
+		return []byte{}, err
+	}
+	return []byte(C.GoString(result)), nil
+}
+
+// collect_uarch_cycle_root_hashes
+func (m *Machine) CollectUarchCycleRootHashes(mcycleEnd uint64, log2BundleMcycleCount int32) ([]byte, error) {
+	var err error
+	var result *C.char
+
+	m.callCAPI(func() {
+		err = newError(C.cm_collect_uarch_cycle_root_hashes(
+			m.ptr,
+			C.uint64_t(mcycleEnd),
+			C.int32_t(log2BundleMcycleCount),
+			&result))
+	})
+
+	if err != nil {
+		return []byte{}, err
+	}
+	return []byte(C.GoString(result)), nil
+}
+
+
 // send_cmio_response
 func (m *Machine) SendCmioResponse(reason uint16, data []byte) error {
 	var err error
@@ -414,7 +453,7 @@ func (m *Machine) Store(directory string) error {
 	m.callCAPI(func() {
 		cDir := C.CString(directory)
 		defer C.free(unsafe.Pointer(cDir))
-		err = newError(C.cm_store(m.ptr, cDir))
+		err = newError(C.cm_store(m.ptr, cDir, SharingAll))
 	})
 
 	return err