diff --git a/.cargo/config b/.cargo/config deleted file mode 100644 index 8c46df4..0000000 --- a/.cargo/config +++ /dev/null @@ -1,16 +0,0 @@ -[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", -] diff --git a/Cargo.lock b/Cargo.lock index 296dab5..fc91577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f783611babedbbe90db3478c120fb5f5daacceffc210b39adc0af4fe0da70bad" dependencies = [ "bytes", - "cfg-if 1.0.0", + "cfg-if", "const-hex", "derive_more", "hex-literal", @@ -112,12 +112,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -130,7 +124,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "hex", "proptest", @@ -312,20 +306,13 @@ version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "mini-alloc" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9993556d3850cdbd0da06a3dc81297edcfa050048952d84d75e8b944e8f5af" +checksum = "14eacc4bfcf10da9b6d5185ef51b2dc75434afac34b4d8aabe40f6b141ee071c" dependencies = [ - "cfg-if 1.0.0", - "wee_alloc", + "cfg-if", ] [[package]] @@ -536,21 +523,20 @@ dependencies = [ [[package]] name = "stylus-hello-world-minimal" -version = "0.1.1" +version = "0.1.2" dependencies = [ - "mini-alloc", "stylus-sdk", ] [[package]] name = "stylus-proc" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a4d5f8deb863602ac0a2f2e38de55844ab51608a1df66d093c52c68d90bccf" +checksum = "9fd02e91dffe7b73df84a861c992494d6b72054bc9a17fe73e147e34e9a64ef3" dependencies = [ "alloy-primitives", "alloy-sol-types", - "cfg-if 1.0.0", + "cfg-if", "convert_case 0.6.0", "lazy_static", "proc-macro2", @@ -563,17 +549,18 @@ dependencies = [ [[package]] name = "stylus-sdk" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d056f9b4125d93c7b85e6b3e1176542132d1334dac38885a70735b86293af62" +checksum = "26042693706e29fb7e3cf3d71c99534ac97fca98b6f81ba77ab658022ab2e210" dependencies = [ "alloy-primitives", "alloy-sol-types", - "cfg-if 1.0.0", + "cfg-if", "derivative", "hex", "keccak-const", "lazy_static", + "mini-alloc", "regex", "stylus-proc", ] @@ -657,40 +644,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "zeroize" version = "1.6.0" diff --git a/Cargo.toml b/Cargo.toml index 4e00e12..d08da46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,10 @@ [package] name = "stylus-hello-world-minimal" -version = "0.1.1" +version = "0.1.2" edition = "2021" [dependencies] -stylus-sdk = "0.5.1" -mini-alloc = "0.4.2" +stylus-sdk = "0.6.0" [features] export-abi = ["stylus-sdk/export-abi"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..4d2dee8 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.80.0" diff --git a/src/lib.rs b/src/lib.rs index 1b070bb..7abd939 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,12 +1,7 @@ #![no_main] -#![no_std] extern crate alloc; -#[global_allocator] -static ALLOC: mini_alloc::MiniAlloc = mini_alloc::MiniAlloc::INIT; - use alloc::vec::Vec; - use stylus_sdk::stylus_proc::entrypoint; #[entrypoint]