Further improvements to Merkleization

Makefile

@@ -428,10 +428,10 @@ $(stylus_test_erc20_wasm): $(stylus_test_erc20_src)
 	@touch -c $@ # cargo might decide to not rebuild the binary
 
 contracts/test/prover/proofs/float%.json: $(arbitrator_cases)/float%.wasm $(prover_bin) $(output_latest)/soft-float.wasm
-	$(prover_bin) $< -l $(output_latest)/soft-float.wasm -o $@ -b --allow-hostapi --require-success --always-merkleize
+	$(prover_bin) $< -l $(output_latest)/soft-float.wasm -o $@ -b --allow-hostapi --require-success
 
 contracts/test/prover/proofs/no-stack-pollution.json: $(arbitrator_cases)/no-stack-pollution.wasm $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --require-success --always-merkleize
+	$(prover_bin) $< -o $@ --allow-hostapi --require-success
 
 target/testdata/preimages.bin:
 	mkdir -p `dirname $@`
@@ -455,19 +455,19 @@ contracts/test/prover/proofs/global-state.json:
 	echo "[]" > $@
 
 contracts/test/prover/proofs/forward-test.json: $(arbitrator_cases)/forward-test.wasm $(arbitrator_tests_forward_deps) $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --always-merkleize $(patsubst %,-l %, $(arbitrator_tests_forward_deps))
+	$(prover_bin) $< -o $@ --allow-hostapi $(patsubst %,-l %, $(arbitrator_tests_forward_deps))
 
 contracts/test/prover/proofs/link.json: $(arbitrator_cases)/link.wasm $(arbitrator_tests_link_deps) $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --always-merkleize --stylus-modules $(arbitrator_tests_link_deps) --require-success
+	$(prover_bin) $< -o $@ --allow-hostapi --stylus-modules $(arbitrator_tests_link_deps) --require-success
 
 contracts/test/prover/proofs/dynamic.json: $(patsubst %,$(arbitrator_cases)/%.wasm, dynamic user) $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --always-merkleize --stylus-modules $(arbitrator_cases)/user.wasm --require-success
+	$(prover_bin) $< -o $@ --allow-hostapi --stylus-modules $(arbitrator_cases)/user.wasm --require-success
 
 contracts/test/prover/proofs/bulk-memory.json: $(patsubst %,$(arbitrator_cases)/%.wasm, bulk-memory) $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --always-merkleize --stylus-modules $(arbitrator_cases)/user.wasm -b
+	$(prover_bin) $< -o $@ --allow-hostapi --stylus-modules $(arbitrator_cases)/user.wasm -b
 
 contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(prover_bin)
-	$(prover_bin) $< -o $@ --allow-hostapi --always-merkleize
+	$(prover_bin) $< -o $@ --allow-hostapi
 
 # strategic rules to minimize dependency building
 

arbitrator/bench/Cargo.toml

@@ -12,12 +12,15 @@ name = "benchbin"
 path = "src/bin.rs"
 
 [dependencies]
-hex = "0.4.3"
+hex = { version = "0.4.3", features = ["serde"] }
 eyre = "0.6.5"
 prover = { path = "../prover" }
 arbutil = { path = "../arbutil" }
 clap = { version = "4.4.8", features = ["derive"] }
 gperftools = { version = "0.2.0", optional = true }
+serde = { version = "1.0.130", features = ["derive", "rc"] }
+serde_json = "1.0.67"
+serde_with = { version = "3.8.1", features = ["base64"] }
 
 [features]
 counters = []