Merge pull request #150 from OffchainLabs/adopt-sdk-0.3.0

Adopt SDK v0.3.0
OffchainLabs · Sep 12, 2023 · a9f2096 · a9f2096
2 parents f47fec1 + 3a9b7be
commit a9f2096
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 42 deletions.
diff --git a/arbitrator/langs/rust b/arbitrator/langs/rust
diff --git a/arbitrator/stylus/tests/create/Cargo.lock b/arbitrator/stylus/tests/create/Cargo.lock
diff --git a/arbitrator/stylus/tests/erc20/Cargo.lock b/arbitrator/stylus/tests/erc20/Cargo.lock
diff --git a/arbitrator/stylus/tests/erc20/Cargo.toml b/arbitrator/stylus/tests/erc20/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 alloy-primitives = "0.3.1"
 alloy-sol-types = "0.3.1"
-stylus-sdk = { path = "../../../langs/rust/stylus-sdk" }
+stylus-sdk = { path = "../../../langs/rust/stylus-sdk", features = ["reentrant"] }
 hex = "0.4.3"
 wee_alloc = "0.4.5"
 

diff --git a/arbitrator/stylus/tests/erc20/src/main.rs b/arbitrator/stylus/tests/erc20/src/main.rs
@@ -36,7 +36,7 @@ sol_storage! {
 // Another contract we'd like to call
 sol_interface! {
     interface IMath {
-        function sum(uint256[] values) pure returns (string, uint256);
+        function sumValues(uint256[] values) pure returns (string, uint256);
     }
 }
 
@@ -57,13 +57,13 @@ impl Weth {
     }
 
     // sums numbers
-    pub fn sum(values: Vec<U256>) -> Result<(String, U256), Vec<u8>> {
+    pub fn sum_values(values: Vec<U256>) -> Result<(String, U256), Vec<u8>> {
         Ok(("sum".into(), values.iter().sum()))
     }
 
-    // calls the sum() method from the interface
+    // calls the sum_values() method from the interface
     pub fn sum_with_helper(&self, helper: IMath, values: Vec<U256>) -> Result<U256, Vec<u8>> {
-        let (text, sum) = helper.sum(self, values)?;
+        let (text, sum) = helper.sum_values(self, values)?;
         assert_eq!(&text, "sum");
         Ok(sum)
     }

diff --git a/arbitrator/stylus/tests/evm-data/Cargo.lock b/arbitrator/stylus/tests/evm-data/Cargo.lock
diff --git a/arbitrator/stylus/tests/evm-data/src/main.rs b/arbitrator/stylus/tests/evm-data/src/main.rs
@@ -42,7 +42,7 @@ fn user_main(input: Vec<u8>) -> Result<Vec<u8>, Vec<u8>> {
     // Call burnArbGas
     let gas_left_before = evm::gas_left();
     let ink_left_before = evm::ink_left();
-    unsafe { RawCall::new().call(arb_test_addr, burn_call_data)? };
+    RawCall::new().call(arb_test_addr, burn_call_data)?;
     let gas_left_after = evm::gas_left();
     let ink_left_after = evm::ink_left();
 

diff --git a/arbitrator/stylus/tests/fallible/Cargo.lock b/arbitrator/stylus/tests/fallible/Cargo.lock
diff --git a/arbitrator/stylus/tests/keccak-100/Cargo.lock b/arbitrator/stylus/tests/keccak-100/Cargo.lock
diff --git a/arbitrator/stylus/tests/keccak/Cargo.lock b/arbitrator/stylus/tests/keccak/Cargo.lock
diff --git a/arbitrator/stylus/tests/log/Cargo.lock b/arbitrator/stylus/tests/log/Cargo.lock
diff --git a/arbitrator/stylus/tests/multicall/Cargo.lock b/arbitrator/stylus/tests/multicall/Cargo.lock
diff --git a/arbitrator/stylus/tests/multicall/Cargo.toml b/arbitrator/stylus/tests/multicall/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-stylus-sdk = { path = "../../../langs/rust/stylus-sdk" }
+stylus-sdk = { path = "../../../langs/rust/stylus-sdk", features = ["reentrant"] }
 hex = "0.4.3"
 
 [profile.release]

diff --git a/arbitrator/stylus/tests/multicall/src/main.rs b/arbitrator/stylus/tests/multicall/src/main.rs
@@ -10,7 +10,7 @@ use stylus_sdk::{
     prelude::*,
 };
 
-#[entrypoint(allow_reentrancy = true)]
+#[entrypoint]
 fn user_main(input: Vec<u8>) -> Result<Vec<u8>, Vec<u8>> {
     let mut input = input.as_slice();
     let count = input[0];

diff --git a/arbitrator/stylus/tests/read-return-data/Cargo.lock b/arbitrator/stylus/tests/read-return-data/Cargo.lock
diff --git a/arbitrator/stylus/tests/read-return-data/src/main.rs b/arbitrator/stylus/tests/read-return-data/src/main.rs
@@ -40,21 +40,17 @@ fn user_main(input: Vec<u8>) -> Result<Vec<u8>, Vec<u8>> {
     let safe_offset = offset.min(call_data.len());
 
     if call_type == 2 {
-        unsafe {
-            RawCall::new()
-                .limit_return_data(offset, size)
-                .call(precompile, call_data)?
-        };
+        RawCall::new()
+            .limit_return_data(offset, size)
+            .call(precompile, call_data)?;
     }
 
     for _ in 0..count {
         let data = match call_type {
-            0 => unsafe { RawCall::new().call(precompile, call_data)? },
-            1 => unsafe {
-                RawCall::new()
-                    .limit_return_data(offset, size)
-                    .call(precompile, call_data)?
-            },
+            0 => RawCall::new().call(precompile, call_data)?,
+            1 => RawCall::new()
+                .limit_return_data(offset, size)
+                .call(precompile, call_data)?,
             2 => contract::read_return_data(offset, Some(size)),
             _ => error!("unknown call_type {call_type}"),
         };

diff --git a/arbitrator/stylus/tests/sdk-storage/Cargo.lock b/arbitrator/stylus/tests/sdk-storage/Cargo.lock
diff --git a/arbitrator/stylus/tests/storage/Cargo.lock b/arbitrator/stylus/tests/storage/Cargo.lock