Merge branch 'master' into update-aws-sdk-go-v2

OffchainLabs · Oct 4, 2024 · 75fa525 · 75fa525
2 parents 30abdc5 + 956c5d9
commit 75fa525
Show file tree

Hide file tree

Showing 7 changed files with 1,334 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -149,8 +149,10 @@ stylus_test_erc20_wasm = $(call get_stylus_test_wasm,erc20)
 stylus_test_erc20_src = $(call get_stylus_test_rust,erc20)
 stylus_test_read-return-data_wasm = $(call get_stylus_test_wasm,read-return-data)
 stylus_test_read-return-data_src = $(call get_stylus_test_rust,read-return-data)
+stylus_test_hostio-test_wasm = $(call get_stylus_test_wasm,hostio-test)
+stylus_test_hostio-test_src = $(call get_stylus_test_rust,hostio-test)
 
-stylus_test_wasms = $(stylus_test_keccak_wasm) $(stylus_test_keccak-100_wasm) $(stylus_test_fallible_wasm) $(stylus_test_storage_wasm) $(stylus_test_multicall_wasm) $(stylus_test_log_wasm) $(stylus_test_create_wasm) $(stylus_test_math_wasm) $(stylus_test_sdk-storage_wasm) $(stylus_test_erc20_wasm) $(stylus_test_read-return-data_wasm) $(stylus_test_evm-data_wasm) $(stylus_test_bfs:.b=.wasm)
+stylus_test_wasms = $(stylus_test_keccak_wasm) $(stylus_test_keccak-100_wasm) $(stylus_test_fallible_wasm) $(stylus_test_storage_wasm) $(stylus_test_multicall_wasm) $(stylus_test_log_wasm) $(stylus_test_create_wasm) $(stylus_test_math_wasm) $(stylus_test_sdk-storage_wasm) $(stylus_test_erc20_wasm) $(stylus_test_read-return-data_wasm) $(stylus_test_evm-data_wasm) $(stylus_test_hostio-test_wasm) $(stylus_test_bfs:.b=.wasm)
 stylus_benchmarks = $(wildcard $(stylus_dir)/*.toml $(stylus_dir)/src/*.rs) $(stylus_test_wasms)
 
 # user targets
@@ -482,6 +484,10 @@ $(stylus_test_erc20_wasm): $(stylus_test_erc20_src)
  $(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
  @touch -c $@ # cargo might decide to not rebuild the binary
 
+$(stylus_test_hostio-test_wasm): $(stylus_test_hostio-test_src)
+ $(cargo_nightly) --manifest-path $< --release --config $(stylus_cargo)
+ @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