checks and updates examples against cargo-stylus v0.4.2, and v0.5.00

OffchainLabs · Aug 28, 2024 · ba3d773 · ba3d773
1 parent 17fc86a
commit ba3d773
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 28 deletions.
diff --git a/examples/erc20/Cargo.lock b/examples/erc20/Cargo.lock
diff --git a/examples/erc20/rust-toolchain.toml b/examples/erc20/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.80.0"
diff --git a/examples/erc20/src/erc20.rs b/examples/erc20/src/erc20.rs
@@ -134,7 +134,7 @@ impl<T: Erc20Params> Erc20<T> {
 
 // These methods are external to other contracts
 // Note: modifying storage will become much prettier soon
-#[external]
+#[public]
 impl<T: Erc20Params> Erc20<T> {
     /// Immutable token name
     pub fn name() -> String {

diff --git a/examples/erc20/src/lib.rs b/examples/erc20/src/lib.rs
@@ -12,10 +12,6 @@ use stylus_sdk::{
 };
 use crate::erc20::{Erc20, Erc20Params, Erc20Error};
 
-/// Initializes a custom, global allocator for Rust programs compiled to WASM.
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
-
 /// Immutable definitions
 struct StylusTestTokenParams;
 impl Erc20Params for StylusTestTokenParams {
@@ -36,7 +32,7 @@ sol_storage! {
     }
 }
 
-#[external]
+#[public]
 #[inherit(Erc20<StylusTestTokenParams>)]
 impl StylusTestToken {
     /// Mints tokens

diff --git a/examples/erc721/Cargo.lock b/examples/erc721/Cargo.lock
diff --git a/examples/erc721/rust-toolchain.toml b/examples/erc721/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.80.0"
diff --git a/examples/erc721/src/erc721.rs b/examples/erc721/src/erc721.rs
@@ -222,7 +222,7 @@ impl<T: Erc721Params> Erc721<T> {
 }
 
 // these methods are external to other contracts
-#[external]
+#[public]
 impl<T: Erc721Params> Erc721<T> {
     /// Immutable NFT name.
     pub fn name() -> Result<String, Erc721Error> {

diff --git a/examples/erc721/src/lib.rs b/examples/erc721/src/lib.rs
@@ -12,10 +12,6 @@ use stylus_sdk::{
 };
 use crate::erc721::{Erc721, Erc721Params, Erc721Error};
 
-/// Initializes a custom, global allocator for Rust programs compiled to WASM.
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
-
 /// Immutable definitions
 struct StylusTestNFTParams;
 impl Erc721Params for StylusTestNFTParams {
@@ -38,7 +34,7 @@ sol_storage! {
     }
 }
 
-#[external]
+#[public]
 #[inherit(Erc721<StylusTestNFTParams>)]
 impl StylusTestNFT {
     /// Mints an NFT

diff --git a/examples/single_call/Cargo.lock b/examples/single_call/Cargo.lock
diff --git a/examples/single_call/rust-toolchain.toml b/examples/single_call/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.80.0"
diff --git a/examples/single_call/src/lib.rs b/examples/single_call/src/lib.rs
@@ -1,16 +1,14 @@
 #![cfg_attr(not(feature = "export-abi"), no_main)]
 extern crate alloc;
 
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
 
 use stylus_sdk::{abi::Bytes, alloy_primitives::Address, call::RawCall, prelude::*};
 
-#[solidity_storage]
+#[storage]
 #[entrypoint]
 pub struct SingleCall;
 
-#[external]
+#[public]
 impl SingleCall {
     pub fn execute(&self, target: Address, data: Bytes) -> Bytes {
         let result = RawCall::new().call(target, data.to_vec().as_slice());