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

Author: mpolitzer

cmd/cartesi-rollups-machine-tool/main.go

@@ -6,6 +6,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -19,6 +20,7 @@ import (
 	"github.com/cartesi/rollups-node/internal/model"
 	"github.com/cartesi/rollups-node/internal/repository"
 	"github.com/cartesi/rollups-node/internal/repository/factory"
+	//"github.com/davecgh/go-spew/spew"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/spf13/cobra"
@@ -392,6 +394,23 @@ func generateMachineProof(
 	if err := json.Unmarshal(raw, &proof); err != nil {
 		return nil, fmt.Errorf("parse machine proof: %w", err)
 	}
+
+	// convert the file hashes from base64 to hex
+	proof.RootHash, err = base64ToHex(proof.RootHash)
+	if err != nil {
+		return nil, err
+	}
+	proof.TargetHash, err = base64ToHex(proof.TargetHash)
+	if err != nil {
+		return nil, err
+	}
+	for i := range proof.SiblingHashes {
+		proof.SiblingHashes[i], err = base64ToHex(proof.SiblingHashes[i])
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return &proof, nil
 }
 
@@ -478,3 +497,11 @@ func ensure0x(s string) string {
 func strip0x(s string) string {
 	return strings.TrimPrefix(strings.TrimPrefix(s, "0x"), "0X")
 }
+
+func base64ToHex(s string) (string, error) {
+	raw, err := base64.StdEncoding.DecodeString(s)
+	if err != nil {
+		return "", fmt.Errorf("expected %s to be a hash in base64. %w",  s, err)
+	}
+	return common.Hash(raw).Hex(), nil
+}

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(
@@ -75,16 +73,15 @@ 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))
+    machine:send_cmio_response(checkpoint, 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

@@ -9,6 +9,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"math/big"
@@ -28,6 +29,7 @@ import (
 	"github.com/cartesi/rollups-node/pkg/contracts/ierc20metadata"
 	"github.com/cartesi/rollups-node/pkg/contracts/iquorum"
 	"github.com/cartesi/rollups-node/pkg/ethutil"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -580,7 +582,9 @@ func (s *WithdrawalLifecycleSuite) generateWithdrawalProofs(
 	var replaySummary struct {
 		MachineRoot string `json:"machine_root"`
 	}
+	fmt.Print("1.", string(replayOut))
 	r.NoError(json.Unmarshal([]byte(replayOut), &replaySummary), "parse machine replay summary")
+	spew.Dump(replaySummary)
 	r.Equal(strings.ToLower(finalEpoch.MachineHash.Hex()), strings.ToLower(replaySummary.MachineRoot),
 		"replayed machine root must match finalized epoch machine hash")
 
@@ -600,7 +604,9 @@ func (s *WithdrawalLifecycleSuite) generateWithdrawalProofs(
 		AccountIndex string `json:"account_index"`
 		MachineRoot  string `json:"machine_root"`
 	}
+	fmt.Print("2.", string(proveOut))
 	r.NoError(json.Unmarshal([]byte(proveOut), &proveSummary), "parse accounts-drive proof summary")
+	spew.Dump(proveSummary)
 	r.Equal(strings.ToLower(finalEpoch.MachineHash.Hex()), strings.ToLower(proveSummary.MachineRoot),
 		"proof machine root must match finalized epoch machine hash")
 	r.NotEmpty(proveSummary.AccountIndex, "proof summary must include account index")
@@ -827,3 +833,11 @@ func listWithdrawals(
 	}
 	return rpcResp.Result, nil
 }
+
+func base64ToHex(s string) (string, error) {
+	raw, err := base64.StdEncoding.DecodeString(s)
+	if err != nil {
+		return "", fmt.Errorf("expected %s to be a hash in base64. %w",  s, err)
+	}
+	return common.Hash(raw).Hex(), nil
+}