fixup! feat(emulator): bump emulator (v0.21.0) and rootfs (v0.18.0). make it build

Author: mpolitzer

cmd/cartesi-rollups-machine-tool/replay_dave.lua

@@ -3,8 +3,6 @@
 
 local cartesi = require("cartesi")
 
-local checkpoint_address = 0xfe0
-
 local function usage(message)
     if message then io.stderr:write(message, "\n") end
     io.stderr:write(
@@ -74,17 +72,16 @@ local function ensure_manual_yield(machine)
 end
 
 local function advance_one(machine, input_path, input_number)
-    local checkpoint = machine:get_root_hash()
-    machine:write_memory(checkpoint_address, checkpoint)
-    machine:send_cmio_response(cartesi.CMIO_YIELD_REASON_ADVANCE_STATE, read_all(input_path))
+    local revert_root_hash = machine:get_root_hash()
+    machine:send_cmio_response(revert_root_hash, cartesi.HTIF_YIELD_REASON_ADVANCE_STATE, read_all(input_path))
     run_until_manual_yield(machine)
 
     local _, reason, data = machine:receive_cmio_request()
-    if reason == cartesi.CMIO_YIELD_MANUAL_REASON_RX_REJECTED then
+    if reason == cartesi.HTIF_YIELD_MANUAL_REASON_RX_REJECTED then
         error(string.format("Dave replay input %d was rejected", input_number))
-    elseif reason == cartesi.CMIO_YIELD_MANUAL_REASON_TX_EXCEPTION then
+    elseif reason == cartesi.HTIF_YIELD_MANUAL_REASON_TX_EXCEPTION then
         error(string.format("Dave replay input %d raised an exception", input_number))
-    elseif reason ~= cartesi.CMIO_YIELD_MANUAL_REASON_RX_ACCEPTED then
+    elseif reason ~= cartesi.HTIF_YIELD_MANUAL_REASON_RX_ACCEPTED then
         error(string.format("Dave replay input %d ended with unexpected yield reason %s", input_number, tostring(reason)))
     end
     if #data ~= 32 then

test/integration/withdrawal_lifecycle_test.go

@@ -20,6 +20,7 @@ import (
 	"strings"
 	"testing"
 	"time"
+	"encoding/base64"
 
 	"github.com/cartesi/rollups-node/internal/config"
 	"github.com/cartesi/rollups-node/internal/jsonrpc/api"
@@ -581,7 +582,9 @@ func (s *WithdrawalLifecycleSuite) generateWithdrawalProofs(
 		MachineRoot string `json:"machine_root"`
 	}
 	r.NoError(json.Unmarshal([]byte(replayOut), &replaySummary), "parse machine replay summary")
-	r.Equal(strings.ToLower(finalEpoch.MachineHash.Hex()), strings.ToLower(replaySummary.MachineRoot),
+	rawMachineRoot, err := base64.StdEncoding.DecodeString(replaySummary.MachineRoot)
+	r.NoError(err)
+	r.Equal(finalEpoch.MachineHash, rawMachineRoot,
 		"replayed machine root must match finalized epoch machine hash")
 
 	driveProofPath := filepath.Join(tmp, "drive-root-proof.json")