bump emulator to 0.20

.github/actions/cartesi-machine/action.yml

@@ -4,7 +4,7 @@ inputs:
   version:
     description: 'Version of Cartesi Machine to install'
     required: false
-    default: 0.19.0
+    default: 0.20.0-test
   suffix-version:
     description: 'Suffix of Cartesi Machine to install'
     required: false

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Cartesi Machine
         uses: ./.github/actions/cartesi-machine
         with:
-          version: 0.19.0
+          version: 0.20.0-test
           suffix-version: ""
 
       - name: Setup env
@@ -71,7 +71,7 @@ jobs:
       - name: Install Cartesi Machine
         uses: ./.github/actions/cartesi-machine
         with:
-          version: 0.19.0
+          version: 0.20.0-test
       - name: Download PRT contracts
         working-directory: ./prt/contracts
         run: |
@@ -138,7 +138,7 @@ jobs:
         working-directory: ./machine/emulator
         run: |
           make bundle-boost
-          wget https://github.com/cartesi/machine-emulator/releases/download/v0.19.0/add-generated-files.diff
+          wget https://github.com/cartesi/machine-emulator/releases/download/v0.20.0-test/add-generated-files.diff
           git apply add-generated-files.diff
           make
           sudo make install

cartesi-rollups/contracts/src/DaveConsensus.sol

@@ -221,7 +221,7 @@ contract DaveConsensus is IDaveConsensus, ERC165 {
 
         require(proof.length == Memory.LOG2_MAX_SIZE, InvalidOutputsMerkleRootProofSize(proof.length));
         bytes32 allegedStateHash = proof.merkleRootAfterReplacement(
-            EmulatorConstants.PMA_CMIO_TX_BUFFER_START >> EmulatorConstants.TREE_LOG2_WORD_SIZE,
+            EmulatorConstants.AR_CMIO_TX_BUFFER_START >> EmulatorConstants.HASH_TREE_LOG2_WORD_SIZE,
             keccak256(abi.encode(outputsMerkleRoot))
         );
 

cartesi-rollups/contracts/test/DaveConsensus.t.sol

@@ -601,7 +601,7 @@ contract DaveConsensusTest is Test {
 
         bytes32 root = new LibMerkle32Wrapper()
             .merkleRootAfterReplacement(
-                siblings, EmulatorConstants.PMA_CMIO_TX_BUFFER_START >> EmulatorConstants.TREE_LOG2_WORD_SIZE, leaf
+                siblings, EmulatorConstants.AR_CMIO_TX_BUFFER_START >> EmulatorConstants.TREE_LOG2_WORD_SIZE, leaf
             );
         assertEq(current, root);
 

cartesi-rollups/node/blockchain-reader/src/lib.rs

@@ -569,7 +569,10 @@ mod blockchain_reader_tests {
         let mut machine = Machine::create(
             &MachineConfig::new_with_ram(RAMConfig {
                 length: 134217728,
-                image_filename: "../../../test/programs/linux.bin".into(),
+                backing_store: cartesi_machine::config::machine::BackingStoreConfig {
+                    data_filename: "../../../test/programs/linux.bin".into(),
+                    ..Default::default()
+                },
             }),
             &RuntimeConfig::default(),
         )

cartesi-rollups/node/blockchain-reader/src/test_utils.rs

@@ -13,7 +13,7 @@ use cartesi_rollups_contracts::i_input_box::IInputBox;
 use serde::Deserialize;
 use std::{
     fs::{self, File},
-    io::Read,
+    io::{Read, Seek},
     path::PathBuf,
 };
 
@@ -77,8 +77,11 @@ pub async fn spawn_anvil_and_provider() -> Result<(AnvilInstance, DynProvider, A
     let dave_app_factory = deployment_address("DaveAppFactory");
 
     let initial_hash = {
-        // $ xxd -p -c32 test/programs/echo/machine-image/hash
-        let mut file = File::open(program_path.join("machine-image").join("hash")).unwrap();
+        // Root hash is stored in hash_tree.sht at offset 0x60 (node 1's hash in sparse tree).
+        // Equivalent to: xxd -seek 0x60 -l 0x20 -c 0x20 -p .../machine-image/hash_tree.sht
+        let mut file =
+            File::open(program_path.join("machine-image").join("hash_tree.sht")).unwrap();
+        file.seek(std::io::SeekFrom::Start(0x60)).unwrap();
         let mut buffer = [0u8; 32];
         file.read_exact(&mut buffer).unwrap();
         buffer

cartesi-rollups/node/state-manager/src/persistent_state_access.rs

@@ -330,7 +330,10 @@ mod tests {
         let mut machine = Machine::create(
             &MachineConfig::new_with_ram(RAMConfig {
                 length: 134217728,
-                image_filename: "../../../test/programs/linux.bin".into(),
+                backing_store: cartesi_machine::config::machine::BackingStoreConfig {
+                    data_filename: "../../../test/programs/linux.bin".into(),
+                    ..Default::default()
+                },
             }),
             &RuntimeConfig::default(),
         )

cartesi-rollups/node/state-manager/src/sql/test_helper.rs

@@ -21,7 +21,10 @@ pub fn setup_db() -> (TempDir, Connection) {
     let mut machine = Machine::create(
         &MachineConfig::new_with_ram(RAMConfig {
             length: 134217728,
-            image_filename: "../../../test/programs/linux.bin".into(),
+            backing_store: cartesi_machine::config::machine::BackingStoreConfig {
+                data_filename: "../../../test/programs/linux.bin".into(),
+                ..Default::default()
+            },
         }),
         &RuntimeConfig::default(),
     )

justfile

@@ -1,7 +1,7 @@
 update-submodules:
   git submodule update --recursive --init
 
-apply-generated-files-diff VERSION="v0.19.0":
+apply-generated-files-diff VERSION="v0.20.0-test":
   cd machine/emulator && \
     wget https://github.com/cartesi/machine-emulator/releases/download/{{VERSION}}/add-generated-files.diff && \
     git apply add-generated-files.diff
@@ -16,7 +16,7 @@ clean-contracts: clean-consensus-contracts clean-prt-contracts clean-bindings cl
   make -C machine/emulator clean depclean distclean
 
 setup: update-submodules clean-emulator clean-contracts bundle-boost apply-generated-files-diff
-  make -C machine/emulator # Requires docker, necessary for machine bindings
+  make -C machine/emulator -j8 # Requires docker, necessary for machine bindings
 
 # Run this once after cloning, if using a docker environment
 setup-docker: setup build-docker-image

machine/rust-bindings/Cargo.toml

@@ -8,7 +8,7 @@ members = [
 
 
 [workspace.package]
-version = "0.19.0"
+version = "0.20.0-test"
 edition = "2021"
 
 license = "Apache-2.0"

machine/rust-bindings/cartesi-machine-sys/build.rs

@@ -39,6 +39,28 @@ fn main() {
         }
     }
 
+    // OpenMP linker configuration (cross-platform)
+    if cfg!(target_os = "macos") {
+        // macOS: Try Homebrew first, then MacPorts
+        let homebrew_libomp = PathBuf::from("/opt/homebrew/opt/libomp");
+        if homebrew_libomp.exists() {
+            println!("cargo:rustc-link-search={}/lib", homebrew_libomp.display());
+            println!("cargo:rustc-link-lib=omp");
+        } else {
+            let macports_libomp = PathBuf::from("/opt/local/lib/libomp");
+            if macports_libomp.exists() {
+                println!("cargo:rustc-link-search=/opt/local/lib/libomp");
+                println!("cargo:rustc-link-lib=gomp");
+            } else {
+                // Fallback: let system linker find it
+                println!("cargo:rustc-link-lib=omp");
+            }
+        }
+    } else {
+        // Linux and other Unix-like systems: libgomp comes with GCC
+        println!("cargo:rustc-link-lib=gomp");
+    }
+
     //
     //  Generate bindings
     //
@@ -197,7 +219,7 @@ mod build_cm {
             process::{Command, Stdio},
         };
 
-        const VERSION_STRING: &str = "v0.19.0";
+        const VERSION_STRING: &str = "v0.20.0-test";
 
         pub fn download(machine_dir_path: &Path) {
             let patch_file = machine_dir_path.join("add-generated-files.diff");