use mini-alloc by default and hide panic handler when std

OpenZeppelin · Oct 20, 2024 · 0fafa5a · 0fafa5a
1 parent ca1f26a
commit 0fafa5a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,7 +63,7 @@ all = "warn"
 
 [workspace.dependencies]
 # stylus-related
-stylus-sdk = { version = "=0.6.0", default-features = false }
+stylus-sdk = "0.6.0"
 stylus-proc = { version = "=0.6.0", default-features = false }
 mini-alloc = "0.4.2"
 

diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
@@ -22,6 +22,7 @@ Once defined as a dependency, use one of our pre-defined implementations by
 importing them:
 
 ```ignore
+use stylus_sdk::prelude::*;
 use openzeppelin_stylus::token::erc20::Erc20;
 
 sol_storage! {
@@ -43,14 +44,11 @@ impl MyContract { }
 #![deny(rustdoc::broken_intra_doc_links)]
 extern crate alloc;
 
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
-
 pub mod access;
 pub mod token;
 pub mod utils;
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", not(feature = "std")))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
  loop {}

diff --git a/examples/merkle-proofs/src/lib.rs b/examples/merkle-proofs/src/lib.rs
@@ -14,9 +14,6 @@ use stylus_sdk::{
  prelude::{entrypoint, public, sol_storage},
 };
 
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
-
 #[cfg(target_arch = "wasm32")]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {