Update ERC20 Example + Eliminate Solc Warnings on Exports

examples/erc20/.cargo/config

@@ -1,7 +1,23 @@
-[build]
-target = "wasm32-unknown-unknown"
-
 [target.wasm32-unknown-unknown]
 rustflags = [
   "-C", "link-arg=-zstack-size=32768",
 ]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+"-C", "link-arg=-undefined",
+"-C", "link-arg=dynamic_lookup",
+]
+
+[target.x86_64-apple-darwin]
+rustflags = [
+"-C", "link-arg=-undefined",
+"-C", "link-arg=dynamic_lookup",
+]
+
+[profile.release]
+codegen-units = 1
+strip = true
+lto = true
+panic = "abort"
+opt-level = "s"

examples/erc20/Cargo.toml

@@ -11,12 +11,13 @@ mini-alloc = { path = "../../mini-alloc" }
 
 [features]
 export-abi = ["stylus-sdk/export-abi"]
+debug = ["stylus-sdk/debug"]
 
-[profile.release]
-codegen-units = 1
-strip = true
-lto = true
-panic = "abort"
-opt-level = "s"
+[[bin]]
+name = "erc20"
+path = "src/main.rs"
+
+[lib]
+crate-type = ["lib", "cdylib"]
 
-[workspace]
+[workspace]

examples/erc20/src/lib.rs

@@ -0,0 +1,66 @@
+#![cfg_attr(not(feature = "export-abi"), no_main, no_std)]
+extern crate alloc;
+
+use crate::erc20::{Erc20, Erc20Params};
+use alloc::{string::String, vec::Vec};
+use stylus_sdk::{alloy_primitives::U256, call, msg, prelude::*};
+
+#[cfg(target_arch = "wasm32")]
+#[global_allocator]
+static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
+
+mod erc20;
+
+struct WethParams;
+
+/// Immutable definitions
+impl Erc20Params for WethParams {
+    const NAME: &'static str = "Wrapped Ether Example";
+    const SYMBOL: &'static str = "WETH";
+    const DECIMALS: u8 = 18;
+}
+
+// The contract
+sol_storage! {
+    #[entrypoint] // Makes Weth the entrypoint
+    struct Weth {
+        #[borrow] // Allows erc20 to access Weth's storage and make calls
+        Erc20<WethParams> erc20;
+    }
+}
+
+// Another contract we'd like to call
+sol_interface! {
+    interface IMath {
+        function sum(uint256[] values) pure returns (string, uint256);
+    }
+}
+
+#[external]
+#[inherit(Erc20<WethParams>)]
+impl Weth {
+    #[payable]
+    pub fn deposit(&mut self) -> Result<(), Vec<u8>> {
+        self.erc20.mint(msg::sender(), msg::value());
+        Ok(())
+    }
+
+    pub fn withdraw(&mut self, amount: U256) -> Result<(), Vec<u8>> {
+        self.erc20.burn(msg::sender(), amount)?;
+
+        // send the user their funds
+        call::transfer_eth(msg::sender(), amount)
+    }
+
+    // sums numbers
+    pub fn sum(values: Vec<U256>) -> Result<(String, U256), Vec<u8>> {
+        Ok(("sum".into(), values.iter().sum()))
+    }
+
+    // calls the sum() 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)?;
+        assert_eq!(&text, "sum");
+        Ok(sum)
+    }
+}

examples/erc20/src/main.rs

@@ -1,66 +1,6 @@
-#![cfg_attr(not(feature = "export-abi"), no_main, no_std)]
-extern crate alloc;
+#![cfg_attr(not(feature = "export-abi"), no_main)]
 
-use crate::erc20::{Erc20, Erc20Params};
-use alloc::{string::String, vec::Vec};
-use stylus_sdk::{alloy_primitives::U256, call, msg, prelude::*};
-
-#[cfg(target_arch = "wasm32")]
-#[global_allocator]
-static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT;
-
-mod erc20;
-
-struct WethParams;
-
-/// Immutable definitions
-impl Erc20Params for WethParams {
-    const NAME: &'static str = "Wrapped Ether Example";
-    const SYMBOL: &'static str = "WETH";
-    const DECIMALS: u8 = 18;
-}
-
-// The contract
-sol_storage! {
-    #[entrypoint] // Makes Weth the entrypoint
-    struct Weth {
-        #[borrow] // Allows erc20 to access Weth's storage and make calls
-        Erc20<WethParams> erc20;
-    }
-}
-
-// Another contract we'd like to call
-sol_interface! {
-    interface IMath {
-        function sum(uint256[] values) pure returns (string, uint256);
-    }
-}
-
-#[external]
-#[inherit(Erc20<WethParams>)]
-impl Weth {
-    #[payable]
-    pub fn deposit(&mut self) -> Result<(), Vec<u8>> {
-        self.erc20.mint(msg::sender(), msg::value());
-        Ok(())
-    }
-
-    pub fn withdraw(&mut self, amount: U256) -> Result<(), Vec<u8>> {
-        self.erc20.burn(msg::sender(), amount)?;
-
-        // send the user their funds
-        call::transfer_eth(msg::sender(), amount)
-    }
-
-    // sums numbers
-    pub fn sum(values: Vec<U256>) -> Result<(String, U256), Vec<u8>> {
-        Ok(("sum".into(), values.iter().sum()))
-    }
-
-    // calls the sum() 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)?;
-        assert_eq!(&text, "sum");
-        Ok(sum)
-    }
+#[cfg(feature = "export-abi")]
+fn main() {
+    erc20::main();
 }

stylus-sdk/src/abi/export.rs

@@ -40,6 +40,8 @@ pub fn print_abi<T: GenerateAbi>() {
     println!(" * For more information, please see [The Stylus SDK](https://github.com/OffchainLabs/stylus-sdk-rs).");
     println!(" */");
     println!();
+    println!("// SPDX-License-Identifier: TODO");
+    println!("pragma solidity ^0.8.23;");
     print!("{}", AbiPrinter::<T>(PhantomData));
 }