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

Author: mpolitzer

Dockerfile

@@ -3,7 +3,7 @@
 
 # syntax=docker.io/docker/dockerfile:1
 
-ARG EMULATOR_VERSION=0.20.0
+ARG EMULATOR_VERSION=0.21.0-test5
 
 # Build directories.
 ARG GO_BUILD_PATH=/build/cartesi/go
@@ -29,8 +29,8 @@ RUN <<EOF
     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 "46b2f37b889091df3b89a8909467935f8dd4a1426eeb0491b6a346a12f0c341c  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
-        arm64) echo "27ea10571335ad174b75388e7de54a3d3434bd607554d8c0bdf6abca47ceae0d  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
+        amd64) echo "ab6e93c9bb7b9911c59a2ea8ed879f5f8d54b8c9cfa577534f7d3df2d87fdd5b  /tmp/cartesi-machine-emulator.deb" | sha256sum --check ;;
+        arm64) echo "aaae49bc9362e81c00f081e09ad5ad16c9916dd32d355ea016494b7d4e6cee26  /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

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

@@ -165,7 +165,7 @@ func replayInputsBatch(ctx context.Context, opts replayOptions, tmp string, inpu
 
 	args := []string{
 		"--quiet",
-		"--no-rollback",
+		"--no-revert",
 		"--load=" + opts.Template,
 		fmt.Sprintf("--cmio-advance-state=input:%s,input_index_begin:0,input_index_end:%d",
 			filepath.Join(tmp, "input-%i.bin"), len(inputs)),
@@ -374,7 +374,7 @@ func generateMachineProof(
 
 	args := []string{
 		"--quiet",
-		"--no-rollback",
+		"--no-revert",
 		"--load=" + snapshot,
 		fmt.Sprintf("--initial-proof=address:0x%x,log2_size:%d,filename:%s", address, log2Size, tmpPath),
 		"--",

control.template

@@ -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.20.0), cartesi-machine-emulator (<< 0.21.0)
+Depends: cartesi-machine-emulator (>= 0.21.0), cartesi-machine-emulator (<< 0.22.0)
 Section: net
 Priority: optional
 Multi-Arch: no

pkg/emulator/emulator.go

@@ -8,7 +8,7 @@ package emulator
 
 // #cgo LDFLAGS: -lcartesi -lcartesi_jsonrpc
 // #include <stdlib.h>
-// #include "cartesi-machine/jsonrpc-machine-c-api.h"
+// #include "cartesi-machine/cm-jsonrpc.h"
 import "C"
 
 import (

pkg/emulator/machine.go

@@ -8,7 +8,7 @@ package emulator
 
 // #include <stdlib.h>
 // #include <string.h>
-// #include "cartesi-machine/machine-c-api.h"
+// #include "cartesi-machine/cm.h"
 import "C"
 
 import (
@@ -383,16 +383,22 @@ func (m *Machine) CollectMCycleRootHashes(mcycleEnd, mcyclePeriod, mcyclePhase u
 }
 
 // collect_uarch_cycle_root_hashes
-func (m *Machine) CollectUarchCycleRootHashes(mcycleEnd uint64, log2BundleMcycleCount int32) ([]byte, error) {
+func (m *Machine) CollectUarchCycleRootHashes(mcycleEnd uint64, log2BundleUarchCycleCount int32, revertUarchTail string) ([]byte, error) {
 	var err error
 	var result []byte
 
 	m.callCAPI(func() {
 		var cResult *C.char
+		var revertUarchTailC *C.char
+		if revertUarchTail != "" {
+			revertUarchTailC = C.CString(revertUarchTail)
+			defer C.free(unsafe.Pointer(revertUarchTailC))
+		}
 		err = newError(C.cm_collect_uarch_cycle_root_hashes(
 			m.ptr,
 			C.uint64_t(mcycleEnd),
-			C.int32_t(log2BundleMcycleCount),
+			C.int32_t(log2BundleUarchCycleCount),
+			revertUarchTailC,
 			&cResult))
 		result = []byte(C.GoString(cResult))
 	})
@@ -404,7 +410,7 @@ func (m *Machine) CollectUarchCycleRootHashes(mcycleEnd uint64, log2BundleMcycle
 }
 
 // send_cmio_response
-func (m *Machine) SendCmioResponse(reason uint16, data []byte) error {
+func (m *Machine) SendCmioResponse(revertRootHash Hash, reason uint16, data []byte) error {
 	var err error
 
 	m.callCAPI(func() {
@@ -413,9 +419,10 @@ func (m *Machine) SendCmioResponse(reason uint16, data []byte) error {
 		if sizeData > 0 {
 			ptrData = (*C.uint8_t)(unsafe.Pointer(&data[0]))
 		}
-
+		//var cHash C.cm_hash = revertRootHash
 		err = newError(C.cm_send_cmio_response(
 			m.ptr,
+			(*[32]C.uint8_t)(unsafe.Pointer(&revertRootHash)),
 			C.uint16_t(reason),
 			ptrData,
 			sizeData,

pkg/emulator/remote.go

@@ -7,7 +7,7 @@
 package emulator
 
 // #include <stdlib.h>
-// #include "cartesi-machine/jsonrpc-machine-c-api.h"
+// #include "cartesi-machine/cm-jsonrpc.h"
 import "C"
 
 import (

pkg/emulator/types.go

@@ -7,7 +7,7 @@
 package emulator
 
 // #include <stdlib.h>
-// #include "cartesi-machine/jsonrpc-machine-c-api.h"
+// #include "cartesi-machine/cm-jsonrpc.h"
 import "C"
 import "fmt"
 
@@ -18,18 +18,18 @@ import "fmt"
 type ErrorCode int32
 
 const (
-	ErrCodeOk                ErrorCode = C.CM_ERROR_OK
-	ErrCodeInvalidArgument   ErrorCode = C.CM_ERROR_INVALID_ARGUMENT
-	ErrCodeDomainError       ErrorCode = C.CM_ERROR_DOMAIN_ERROR
-	ErrCodeLengthError       ErrorCode = C.CM_ERROR_LENGTH_ERROR
-	ErrCodeOutOfRange        ErrorCode = C.CM_ERROR_OUT_OF_RANGE
-	ErrCodeLogicError        ErrorCode = C.CM_ERROR_LOGIC_ERROR
-	ErrCodeRuntimeError      ErrorCode = C.CM_ERROR_RUNTIME_ERROR
-	ErrCodeRangeError        ErrorCode = C.CM_ERROR_RANGE_ERROR
-	ErrCodeOverflowError     ErrorCode = C.CM_ERROR_OVERFLOW_ERROR
-	ErrCodeUnderflowError    ErrorCode = C.CM_ERROR_UNDERFLOW_ERROR
-	ErrCodeRegexError        ErrorCode = C.CM_ERROR_REGEX_ERROR
-	ErrCodeSystemError       ErrorCode = C.CM_ERROR_SYSTEM_ERROR
+	ErrCodeOk              ErrorCode = C.CM_ERROR_OK
+	ErrCodeInvalidArgument ErrorCode = C.CM_ERROR_INVALID_ARGUMENT
+	ErrCodeDomainError     ErrorCode = C.CM_ERROR_DOMAIN_ERROR
+	ErrCodeLengthError     ErrorCode = C.CM_ERROR_LENGTH_ERROR
+	ErrCodeOutOfRange      ErrorCode = C.CM_ERROR_OUT_OF_RANGE
+	ErrCodeLogicError      ErrorCode = C.CM_ERROR_LOGIC_ERROR
+	ErrCodeRuntimeError    ErrorCode = C.CM_ERROR_RUNTIME_ERROR
+	ErrCodeRangeError      ErrorCode = C.CM_ERROR_RANGE_ERROR
+	ErrCodeOverflowError   ErrorCode = C.CM_ERROR_OVERFLOW_ERROR
+	ErrCodeUnderflowError  ErrorCode = C.CM_ERROR_UNDERFLOW_ERROR
+	//ErrCodeRegexError        ErrorCode = C.CM_ERROR_REGEX_ERROR
+	//ErrCodeSystemError       ErrorCode = C.CM_ERROR_SYSTEM_ERROR
 	ErrCodeBadTypeid         ErrorCode = C.CM_ERROR_BAD_TYPEID
 	ErrCodeBadCast           ErrorCode = C.CM_ERROR_BAD_CAST
 	ErrCodeBadAnyCast        ErrorCode = C.CM_ERROR_BAD_ANY_CAST
@@ -123,23 +123,23 @@ type (
 
 const (
 	// type
-	YieldAutomatic CmioYieldCommand = C.CM_CMIO_YIELD_COMMAND_AUTOMATIC
-	YieldManual    CmioYieldCommand = C.CM_CMIO_YIELD_COMMAND_MANUAL
+	YieldAutomatic CmioYieldCommand = C.CM_HTIF_YIELD_CMD_AUTOMATIC
+	YieldManual    CmioYieldCommand = C.CM_HTIF_YIELD_CMD_MANUAL
 
 	// NOTE: these values do not form an enum (e.g., automatic-progress == manual-accepted).
 
 	// reason - request
-	AutomaticYieldReasonProgress CmioYieldReason = C.CM_CMIO_YIELD_AUTOMATIC_REASON_PROGRESS
-	AutomaticYieldReasonOutput   CmioYieldReason = C.CM_CMIO_YIELD_AUTOMATIC_REASON_TX_OUTPUT
-	AutomaticYieldReasonReport   CmioYieldReason = C.CM_CMIO_YIELD_AUTOMATIC_REASON_TX_REPORT
+	AutomaticYieldReasonProgress CmioYieldReason = C.CM_HTIF_YIELD_AUTOMATIC_REASON_PROGRESS
+	AutomaticYieldReasonOutput   CmioYieldReason = C.CM_HTIF_YIELD_AUTOMATIC_REASON_TX_OUTPUT
+	AutomaticYieldReasonReport   CmioYieldReason = C.CM_HTIF_YIELD_AUTOMATIC_REASON_TX_REPORT
 
-	ManualYieldReasonAccepted  CmioYieldReason = C.CM_CMIO_YIELD_MANUAL_REASON_RX_ACCEPTED
-	ManualYieldReasonRejected  CmioYieldReason = C.CM_CMIO_YIELD_MANUAL_REASON_RX_REJECTED
-	ManualYieldReasonException CmioYieldReason = C.CM_CMIO_YIELD_MANUAL_REASON_TX_EXCEPTION
+	ManualYieldReasonAccepted  CmioYieldReason = C.CM_HTIF_YIELD_MANUAL_REASON_RX_ACCEPTED
+	ManualYieldReasonRejected  CmioYieldReason = C.CM_HTIF_YIELD_MANUAL_REASON_RX_REJECTED
+	ManualYieldReasonException CmioYieldReason = C.CM_HTIF_YIELD_MANUAL_REASON_TX_EXCEPTION
 
 	// reason - reply
-	YieldReasonAdvanceState CmioYieldReason = C.CM_CMIO_YIELD_REASON_ADVANCE_STATE
-	YieldReasonInspectState CmioYieldReason = C.CM_CMIO_YIELD_REASON_INSPECT_STATE
+	YieldReasonAdvanceState CmioYieldReason = C.CM_HTIF_YIELD_REASON_ADVANCE_STATE
+	YieldReasonInspectState CmioYieldReason = C.CM_HTIF_YIELD_REASON_INSPECT_STATE
 )
 
 // cm_reg addresses/CSRs
@@ -257,41 +257,41 @@ const (
 	REG_HTIF_ICONSOLE  RegID = C.CM_REG_HTIF_ICONSOLE
 	REG_HTIF_IYIELD    RegID = C.CM_REG_HTIF_IYIELD
 	// Microarchitecture registers
-	REG_UARCH_X0        RegID = C.CM_REG_UARCH_X0
-	REG_UARCH_X1        RegID = C.CM_REG_UARCH_X1
-	REG_UARCH_X2        RegID = C.CM_REG_UARCH_X2
-	REG_UARCH_X3        RegID = C.CM_REG_UARCH_X3
-	REG_UARCH_X4        RegID = C.CM_REG_UARCH_X4
-	REG_UARCH_X5        RegID = C.CM_REG_UARCH_X5
-	REG_UARCH_X6        RegID = C.CM_REG_UARCH_X6
-	REG_UARCH_X7        RegID = C.CM_REG_UARCH_X7
-	REG_UARCH_X8        RegID = C.CM_REG_UARCH_X8
-	REG_UARCH_X9        RegID = C.CM_REG_UARCH_X9
-	REG_UARCH_X10       RegID = C.CM_REG_UARCH_X10
-	REG_UARCH_X11       RegID = C.CM_REG_UARCH_X11
-	REG_UARCH_X12       RegID = C.CM_REG_UARCH_X12
-	REG_UARCH_X13       RegID = C.CM_REG_UARCH_X13
-	REG_UARCH_X14       RegID = C.CM_REG_UARCH_X14
-	REG_UARCH_X15       RegID = C.CM_REG_UARCH_X15
-	REG_UARCH_X16       RegID = C.CM_REG_UARCH_X16
-	REG_UARCH_X17       RegID = C.CM_REG_UARCH_X17
-	REG_UARCH_X18       RegID = C.CM_REG_UARCH_X18
-	REG_UARCH_X19       RegID = C.CM_REG_UARCH_X19
-	REG_UARCH_X20       RegID = C.CM_REG_UARCH_X20
-	REG_UARCH_X21       RegID = C.CM_REG_UARCH_X21
-	REG_UARCH_X22       RegID = C.CM_REG_UARCH_X22
-	REG_UARCH_X23       RegID = C.CM_REG_UARCH_X23
-	REG_UARCH_X24       RegID = C.CM_REG_UARCH_X24
-	REG_UARCH_X25       RegID = C.CM_REG_UARCH_X25
-	REG_UARCH_X26       RegID = C.CM_REG_UARCH_X26
-	REG_UARCH_X27       RegID = C.CM_REG_UARCH_X27
-	REG_UARCH_X28       RegID = C.CM_REG_UARCH_X28
-	REG_UARCH_X29       RegID = C.CM_REG_UARCH_X29
-	REG_UARCH_X30       RegID = C.CM_REG_UARCH_X30
-	REG_UARCH_X31       RegID = C.CM_REG_UARCH_X31
-	REG_UARCH_PC        RegID = C.CM_REG_UARCH_PC
-	REG_UARCH_CYCLE     RegID = C.CM_REG_UARCH_CYCLE
-	REG_UARCH_HALT_FLAG RegID = C.CM_REG_UARCH_HALT_FLAG
+	REG_UARCH_X0    RegID = C.CM_REG_UARCH_X0
+	REG_UARCH_X1    RegID = C.CM_REG_UARCH_X1
+	REG_UARCH_X2    RegID = C.CM_REG_UARCH_X2
+	REG_UARCH_X3    RegID = C.CM_REG_UARCH_X3
+	REG_UARCH_X4    RegID = C.CM_REG_UARCH_X4
+	REG_UARCH_X5    RegID = C.CM_REG_UARCH_X5
+	REG_UARCH_X6    RegID = C.CM_REG_UARCH_X6
+	REG_UARCH_X7    RegID = C.CM_REG_UARCH_X7
+	REG_UARCH_X8    RegID = C.CM_REG_UARCH_X8
+	REG_UARCH_X9    RegID = C.CM_REG_UARCH_X9
+	REG_UARCH_X10   RegID = C.CM_REG_UARCH_X10
+	REG_UARCH_X11   RegID = C.CM_REG_UARCH_X11
+	REG_UARCH_X12   RegID = C.CM_REG_UARCH_X12
+	REG_UARCH_X13   RegID = C.CM_REG_UARCH_X13
+	REG_UARCH_X14   RegID = C.CM_REG_UARCH_X14
+	REG_UARCH_X15   RegID = C.CM_REG_UARCH_X15
+	REG_UARCH_X16   RegID = C.CM_REG_UARCH_X16
+	REG_UARCH_X17   RegID = C.CM_REG_UARCH_X17
+	REG_UARCH_X18   RegID = C.CM_REG_UARCH_X18
+	REG_UARCH_X19   RegID = C.CM_REG_UARCH_X19
+	REG_UARCH_X20   RegID = C.CM_REG_UARCH_X20
+	REG_UARCH_X21   RegID = C.CM_REG_UARCH_X21
+	REG_UARCH_X22   RegID = C.CM_REG_UARCH_X22
+	REG_UARCH_X23   RegID = C.CM_REG_UARCH_X23
+	REG_UARCH_X24   RegID = C.CM_REG_UARCH_X24
+	REG_UARCH_X25   RegID = C.CM_REG_UARCH_X25
+	REG_UARCH_X26   RegID = C.CM_REG_UARCH_X26
+	REG_UARCH_X27   RegID = C.CM_REG_UARCH_X27
+	REG_UARCH_X28   RegID = C.CM_REG_UARCH_X28
+	REG_UARCH_X29   RegID = C.CM_REG_UARCH_X29
+	REG_UARCH_X30   RegID = C.CM_REG_UARCH_X30
+	REG_UARCH_X31   RegID = C.CM_REG_UARCH_X31
+	REG_UARCH_PC    RegID = C.CM_REG_UARCH_PC
+	REG_UARCH_CYCLE RegID = C.CM_REG_UARCH_CYCLE
+	REG_UARCH_HALT  RegID = C.CM_REG_UARCH_HALT
 	// Views of registers
 	REG_HTIF_TOHOST_DEV      RegID = C.CM_REG_HTIF_TOHOST_DEV
 	REG_HTIF_TOHOST_CMD      RegID = C.CM_REG_HTIF_TOHOST_CMD

pkg/machine/backend.go

@@ -41,7 +41,7 @@ type Backend interface {
 	IsAtManualYield(timeout time.Duration) (bool, error)
 	ReadMCycle(timeout time.Duration) (uint64, error)
 
-	SendCmioResponse(reason uint16, data []byte, timeout time.Duration) error
+	SendCmioResponse(revertRootHash Hash, reason uint16, data []byte, timeout time.Duration) error
 	ReceiveCmioRequest(timeout time.Duration) (cmd uint8, reason uint16, data []byte, err error)
 
 	WriteMemory(address uint64, data []byte, timeout time.Duration) error

pkg/machine/backend_test.go

@@ -40,8 +40,8 @@ func (m *MockBackend) ReadMCycle(timeout time.Duration) (uint64, error) {
 	return args.Get(0).(uint64), args.Error(1)
 }
 
-func (m *MockBackend) SendCmioResponse(reason uint16, data []byte, timeout time.Duration) error {
-	args := m.Called(reason, data, timeout)
+func (m *MockBackend) SendCmioResponse(revertRootHash Hash, reason uint16, data []byte, timeout time.Duration) error {
+	args := m.Called(revertRootHash, reason, data, timeout)
 	return args.Error(0)
 }
 
@@ -105,7 +105,8 @@ func randomFakeHash() Hash {
 // SetupAccepted configures the mock for a successful advance/inspect operation
 func (m *MockBackend) SetupAccepted(reqType requestType) {
 	hash := randomFakeHash()
-	m.On("SendCmioResponse", uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
+	m.On("GetRootHash", mock.AnythingOfType("time.Duration")).Return(hash, nil)
+	m.On("SendCmioResponse", hash, uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
 	m.On("Run", mock.AnythingOfType("uint64"), mock.AnythingOfType("time.Duration")).Return(YieldedManually, nil)
 	m.On("ReadMCycle", mock.AnythingOfType("time.Duration")).Return(uint64(0), nil)
 	m.On("ReceiveCmioRequest", mock.AnythingOfType("time.Duration")).Return(
@@ -116,7 +117,8 @@ func (m *MockBackend) SetupAccepted(reqType requestType) {
 // SetupRejected configures the mock for a rejected advance/inspect operation
 func (m *MockBackend) SetupRejected(reqType requestType) {
 	hash := randomFakeHash()
-	m.On("SendCmioResponse", uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
+	m.On("GetRootHash", mock.AnythingOfType("time.Duration")).Return(hash, nil)
+	m.On("SendCmioResponse", hash, uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
 	m.On("Run", mock.AnythingOfType("uint64"), mock.AnythingOfType("time.Duration")).Return(YieldedManually, nil)
 	m.On("ReadMCycle", mock.AnythingOfType("time.Duration")).Return(uint64(0), nil)
 	m.On("ReceiveCmioRequest", mock.AnythingOfType("time.Duration")).Return(
@@ -126,7 +128,9 @@ func (m *MockBackend) SetupRejected(reqType requestType) {
 
 // SetupException configures the mock for an exception during advance/inspect
 func (m *MockBackend) SetupException(reqType requestType) {
-	m.On("SendCmioResponse", uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
+	hash := randomFakeHash()
+	m.On("GetRootHash", mock.AnythingOfType("time.Duration")).Return(hash, nil)
+	m.On("SendCmioResponse", hash, uint16(reqType), mock.Anything, mock.AnythingOfType("time.Duration")).Return(nil)
 	m.On("Run", mock.AnythingOfType("uint64"), mock.AnythingOfType("time.Duration")).Return(YieldedManually, nil)
 	m.On("ReadMCycle", mock.AnythingOfType("time.Duration")).Return(uint64(0), nil)
 	m.On("ReceiveCmioRequest", mock.AnythingOfType("time.Duration")).Return(

pkg/machine/implementation.go

@@ -357,7 +357,13 @@ func (m *machineImpl) process(
 		return false, nil, nil, nil, 0, nil, ErrPayloadLengthLimitExceeded
 	}
 
-	err := m.backend.SendCmioResponse(uint16(reqType), request, m.params.FastDeadline)
+	// TODO: cache this?
+	revertRootHash, err := m.backend.GetRootHash(m.params.LoadDeadline)
+	if err != nil {
+		return false, nil, nil, nil, 0, nil, err
+	}
+
+	err = m.backend.SendCmioResponse(revertRootHash, uint16(reqType), request, m.params.FastDeadline)
 	if err != nil {
 		return false, nil, nil, nil, 0, nil, err
 	}