diff --git a/Cargo.lock b/Cargo.lock index f0c36a567..e773d86b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,8 +121,6 @@ source = "git+https://github.com/aurora-is-near/aurora-bn.git#8f1743884061981cac dependencies = [ "byteorder", "getrandom 0.2.2", - "rand 0.8.3", - "serde", ] [[package]] @@ -1736,9 +1734,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ "serde", ] @@ -2468,7 +2466,7 @@ dependencies = [ "near-vm-errors", "ripemd160", "serde", - "sha2 0.8.2", + "sha2 0.9.5", "sha3 0.9.1", ] @@ -2706,9 +2704,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "oorandom" diff --git a/Makefile b/Makefile index c8222ae4c..34488d368 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,6 @@ target/wasm32-unknown-unknown/release/aurora_engine.wasm: Cargo.toml Cargo.lock --release \ --verbose \ -p aurora-engine \ - --no-default-features \ --features=$(FEATURES)$(ADDITIONAL_FEATURES) \ -Z avoid-dev-deps @@ -71,7 +70,6 @@ target/wasm32-unknown-unknown/debug/aurora_engine.wasm: Cargo.toml Cargo.lock $( $(CARGO) build \ --target wasm32-unknown-unknown \ -p aurora-engine \ - --no-default-features \ --features=$(FEATURES)$(ADDITIONAL_FEATURES) \ -Z avoid-dev-deps diff --git a/engine-precompiles/Cargo.toml b/engine-precompiles/Cargo.toml index b05e074b3..8a316b839 100644 --- a/engine-precompiles/Cargo.toml +++ b/engine-precompiles/Cargo.toml @@ -13,11 +13,11 @@ publish = false autobenches = false [dependencies] -aurora-engine-types = { path = "../engine-types", default-features = false } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } base64 = { version = "0.13.0", default-features = false, features = ["alloc"] } aurora-blake2 = { git = "https://github.com/aurora-is-near/aurora-blake2.git", version = "0.9.1", default-features = false } -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" bn = { package = "aurora-bn", git = "https://github.com/aurora-is-near/aurora-bn.git", default-features = false } evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } @@ -28,7 +28,7 @@ ripemd160 = { version = "0.9.1", default-features = false } sha2 = { version = "0.9.3", default-features = false } sha3 = { version = "0.9.1", default-features = false } ethabi = { git = "https://github.com/darwinia-network/ethabi", branch = "xavier-no-std", default-features = false } -hex = { version = "0.4", default-features = false, features = ["alloc"] } +hex = "0.4" [dev-dependencies] serde = { version = "1", features = ["derive"] } @@ -36,7 +36,6 @@ serde_json = "1" rand = "0.7.3" [features] -std = ["aurora-engine-types/std", "aurora-engine-sdk/std", "borsh/std", "aurora-blake2/std", "bn/std", "evm/std", "evm-core/std", "libsecp256k1/std", "ripemd160/std", "sha2/std", "sha3/std", "ethabi/std"] contract = [] log = [] error_refund = [] diff --git a/engine-precompiles/src/lib.rs b/engine-precompiles/src/lib.rs index c24286a17..dfb3e76a3 100644 --- a/engine-precompiles/src/lib.rs +++ b/engine-precompiles/src/lib.rs @@ -1,6 +1,4 @@ #![allow(dead_code)] -#![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] pub mod account_ids; pub mod blake2; diff --git a/engine-sdk/Cargo.toml b/engine-sdk/Cargo.toml index 6db4a2a7e..0489f3492 100644 --- a/engine-sdk/Cargo.toml +++ b/engine-sdk/Cargo.toml @@ -13,12 +13,11 @@ publish = false autobenches = false [dependencies] -aurora-engine-types = { path = "../engine-types", default-features = false } -borsh = { version = "0.8.2", default-features = false } +aurora-engine-types = { path = "../engine-types" } +borsh = "0.8.2" sha3 = { version = "0.9.1", default-features = false } sha2 = { version = "0.9.3", default-features = false } [features] -std = ["aurora-engine-types/std"] contract = [] log = [] diff --git a/engine-sdk/src/lib.rs b/engine-sdk/src/lib.rs index 4df77bcb1..6cacb3ece 100644 --- a/engine-sdk/src/lib.rs +++ b/engine-sdk/src/lib.rs @@ -1,6 +1,3 @@ -#![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] - #[cfg(feature = "contract")] use crate::prelude::Address; use crate::prelude::{H256, STORAGE_PRICE_PER_BYTE}; diff --git a/engine-standalone-storage/Cargo.toml b/engine-standalone-storage/Cargo.toml index 0a78c5aab..c4236ff4f 100644 --- a/engine-standalone-storage/Cargo.toml +++ b/engine-standalone-storage/Cargo.toml @@ -14,11 +14,11 @@ autobenches = false crate-type = ["lib"] [dependencies] -aurora-engine = { path = "../engine", default-features = false, features = ["std"] } -aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] } -aurora-engine-transactions = { path = "../engine-transactions", default-features = false, features = ["std"] } -borsh = { version = "0.8.2" } +aurora-engine = { path = "../engine" } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } +aurora-engine-transactions = { path = "../engine-transactions" } +borsh = "0.8.2" evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } rocksdb = { version = "0.18.0", default-features = false } postgres = "0.19.2" diff --git a/engine-standalone-tracing/Cargo.toml b/engine-standalone-tracing/Cargo.toml index c75c273c3..ac8d92bae 100644 --- a/engine-standalone-tracing/Cargo.toml +++ b/engine-standalone-tracing/Cargo.toml @@ -14,9 +14,9 @@ autobenches = false crate-type = ["lib"] [dependencies] -aurora-engine = { path = "../engine", default-features = false, features = ["std"] } -aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] } +aurora-engine = { path = "../engine" } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false, features = ["std"] } evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false, features = ["std", "tracing"] } evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false, features = ["std", "tracing"] } diff --git a/engine-tests/Cargo.toml b/engine-tests/Cargo.toml index 62fa984b5..570906f9e 100644 --- a/engine-tests/Cargo.toml +++ b/engine-tests/Cargo.toml @@ -13,14 +13,14 @@ publish = false autobenches = false [dependencies] -aurora-engine = { path = "../engine", default-features = false, features = ["std", "tracing"] } -aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] } -aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false, features = ["std"] } -aurora-engine-transactions = { path = "../engine-transactions", default-features = false, features = ["std"] } +aurora-engine = { path = "../engine", features = ["tracing"] } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } +aurora-engine-precompiles = { path = "../engine-precompiles" } +aurora-engine-transactions = { path = "../engine-transactions" } engine-standalone-storage = { path = "../engine-standalone-storage" } engine-standalone-tracing = { path = "../engine-standalone-tracing" } -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" sha3 = { version = "0.9.1", default-features = false } evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false, features = ["std", "tracing"] } evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false, features = ["std", "tracing"] } @@ -34,7 +34,7 @@ byte-slice-cast = { version = "1.0", default-features = false } ethabi = { git = "https://github.com/darwinia-network/ethabi", branch = "xavier-no-std" } serde = { version = "1", features = ["derive"] } serde_json = "1" -hex = { version = "0.4.3", default-features = false } +hex = "0.4" near-sdk = { git = "https://github.com/aurora-is-near/near-sdk-rs.git", rev = "ba2eddbfbf4484ac3e44b4c8119bbac4907d6e07" } near-sdk-sim = { git = "https://github.com/aurora-is-near/near-sdk-rs.git", rev = "ba2eddbfbf4484ac3e44b4c8119bbac4907d6e07" } near-crypto = { git = "https://github.com/birchmd/nearcore.git", rev = "980bc48dc02878fea1e0dbc5812ae7de49f12dda" } diff --git a/engine-transactions/Cargo.toml b/engine-transactions/Cargo.toml index a52ce7129..e34d877fc 100644 --- a/engine-transactions/Cargo.toml +++ b/engine-transactions/Cargo.toml @@ -13,14 +13,13 @@ publish = false autobenches = false [dependencies] -aurora-engine-types = { path = "../engine-types", default-features = false } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false } -aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } +aurora-engine-precompiles = { path = "../engine-precompiles" } evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } rlp = { version = "0.5.0", default-features = false } -hex = { version = "0.4", default-features = false, features = ["alloc"] } +hex = "0.4" serde = { version = "1", features = ["derive"], optional = true } [features] -std = ["aurora-engine-types/std", "aurora-engine-precompiles/std", "evm/std", "rlp/std", "hex/std"] impl-serde = ["aurora-engine-types/impl-serde", "serde"] diff --git a/engine-transactions/src/lib.rs b/engine-transactions/src/lib.rs index 8688adaad..ac4cee1cd 100644 --- a/engine-transactions/src/lib.rs +++ b/engine-transactions/src/lib.rs @@ -1,6 +1,3 @@ -#![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] - use aurora_engine_types::types::{Address, Wei}; use aurora_engine_types::{vec, Vec, H160, U256}; use eip_2930::AccessTuple; diff --git a/engine-types/Cargo.toml b/engine-types/Cargo.toml index d1f971cfb..fb2fa0334 100644 --- a/engine-types/Cargo.toml +++ b/engine-types/Cargo.toml @@ -13,9 +13,9 @@ publish = false autobenches = false [dependencies] -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" ethabi = { git = "https://github.com/darwinia-network/ethabi", branch = "xavier-no-std", default-features = false } -hex = { version = "0.4", default-features = false, features = ["alloc"] } +hex = "0.4" primitive-types = { version = "0.10.0", default-features = false, features = ["rlp"] } sha3 = { version = "0.9.1", default-features = false } serde = { version = "1", features = ["derive"], optional = true } @@ -27,6 +27,4 @@ serde_json = "1" rand = "0.7.3" [features] -default = ["std"] -std = ["primitive-types/std"] impl-serde = ["primitive-types/impl-serde", "serde"] diff --git a/engine-types/src/lib.rs b/engine-types/src/lib.rs index 7250dab40..4df4fd3a5 100644 --- a/engine-types/src/lib.rs +++ b/engine-types/src/lib.rs @@ -1,17 +1,10 @@ -#![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] -#![cfg_attr(feature = "log", feature(panic_info_message))] - pub mod account_id; pub mod parameters; pub mod storage; pub mod types; mod v0 { - extern crate alloc; - extern crate core; - - pub use alloc::{ + pub use std::{ borrow::ToOwned, borrow::{Cow, Cow::*}, boxed::Box, @@ -23,7 +16,7 @@ mod v0 { vec, vec::Vec, }; - pub use core::{ + pub use std::{ cmp::Ordering, fmt::Display, marker::PhantomData, mem, ops::Add, ops::Div, ops::Mul, ops::Sub, ops::SubAssign, }; diff --git a/engine/Cargo.toml b/engine/Cargo.toml index cd7575d7c..7526713e5 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -16,12 +16,12 @@ autobenches = false crate-type = ["cdylib", "rlib"] [dependencies] -aurora-engine-types = { path = "../engine-types", default-features = false } -aurora-engine-sdk = { path = "../engine-sdk", default-features = false } -aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false } -aurora-engine-transactions = { path = "../engine-transactions", default-features = false } +aurora-engine-types = { path = "../engine-types" } +aurora-engine-sdk = { path = "../engine-sdk" } +aurora-engine-precompiles = { path = "../engine-precompiles" } +aurora-engine-transactions = { path = "../engine-transactions" } base64 = { version = "0.13.0", default-features = false, features = ["alloc"] } -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" bn = { package = "aurora-bn", git = "https://github.com/aurora-is-near/aurora-bn.git", default-features = false } evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "37448b6cacd98b06282cff5a559684505c29bd2b", default-features = false } @@ -34,9 +34,9 @@ sha3 = { version = "0.9.1", default-features = false } wee_alloc = { version = "0.4.5", default-features = false } logos = { version = "0.12", default-features = false, features = ["export_derive"] } ethabi = { git = "https://github.com/darwinia-network/ethabi", branch = "xavier-no-std", default-features = false } -hex = { version = "0.4", default-features = false, features = ["alloc"] } +hex = "0.4" byte-slice-cast = { version = "1.0", default-features = false } -rjson = { git = "https://github.com/aurora-is-near/rjson", rev = "cc3da949", default-features = false, features = ["integer"] } +rjson = { git = "https://github.com/aurora-is-near/rjson", rev = "cc3da949", features = ["integer"] } serde = { version = "1", features = ["derive"], optional = true } [dev-dependencies] @@ -45,9 +45,7 @@ serde_json = "1" rand = "0.7.3" [features] -default = ["std"] -std = ["borsh/std", "evm/std", "primitive-types/std", "rlp/std", "sha3/std", "ethabi/std", "logos/std", "bn/std", "aurora-engine-types/std", "rjson/std", "aurora-engine-precompiles/std", "aurora-engine-transactions/std"] -std-wasm32 = [] +std = [] contract = ["aurora-engine-sdk/contract", "aurora-engine-precompiles/contract"] evm_bully = [] log = ["aurora-engine-sdk/log", "aurora-engine-precompiles/log"] @@ -55,7 +53,7 @@ tracing = ["evm/tracing"] meta-call = [] error_refund = ["aurora-engine-precompiles/error_refund"] integration-test = ["log"] -mainnet = ["contract", "log", "std-wasm32"] +mainnet = ["contract", "log"] testnet = ["contract", "log"] mainnet-test = ["meta-call"] testnet-test = ["meta-call"] diff --git a/engine/src/lib.rs b/engine/src/lib.rs index c4c586180..2c8377ca9 100644 --- a/engine/src/lib.rs +++ b/engine/src/lib.rs @@ -1,20 +1,5 @@ -#![cfg_attr(not(any(feature = "std", feature = "std-wasm32")), no_std)] -#![cfg_attr(not(any(feature = "std", feature = "std-wasm32")), feature(alloc_error_handler))] -#![cfg_attr( - all( - all(feature = "log", target_arch = "wasm32"), - not(feature = "std-wasm32") - ), - feature(panic_info_message) -)] - use aurora_engine_types::parameters::PromiseCreateArgs; -#[cfg(not(feature = "std"))] -extern crate alloc; -#[cfg(not(feature = "std"))] -extern crate core; - mod map; #[cfg(feature = "meta-call")] pub mod meta_parsing; @@ -35,39 +20,6 @@ mod prelude; #[global_allocator] static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT; -#[cfg(target_arch = "wasm32")] -#[cfg(not(feature = "std-wasm32"))] -#[panic_handler] -#[cfg_attr(not(feature = "log"), allow(unused_variables))] -#[no_mangle] -pub unsafe fn on_panic(info: &::core::panic::PanicInfo) -> ! { - #[cfg(feature = "log")] - { - use prelude::ToString; - - if let Some(msg) = info.message() { - let msg = if let Some(log) = info.location() { - prelude::format!("{} [{}]", msg, log) - } else { - msg.to_string() - }; - prelude::sdk::panic_utf8(msg.as_bytes()); - } else if let Some(log) = info.location() { - prelude::sdk::panic_utf8(log.to_string().as_bytes()); - } - } - - ::core::arch::wasm32::unreachable(); -} - -#[cfg(target_arch = "wasm32")] -#[cfg(not(feature = "std-wasm32"))] -#[alloc_error_handler] -#[no_mangle] -pub unsafe fn on_alloc_error(_: core::alloc::Layout) -> ! { - ::core::arch::wasm32::unreachable(); -} - #[cfg(feature = "contract")] mod contract { use borsh::{BorshDeserialize, BorshSerialize}; diff --git a/etc/self-contained-5bEgfRQ/Cargo.toml b/etc/self-contained-5bEgfRQ/Cargo.toml index 968113612..df3abf459 100644 --- a/etc/self-contained-5bEgfRQ/Cargo.toml +++ b/etc/self-contained-5bEgfRQ/Cargo.toml @@ -37,7 +37,7 @@ codegen-units = 1 rpath = false [dependencies] -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" aurora-engine = { path = "../../engine", default-features = false } aurora-engine-sdk = { path = "../../engine-sdk", default-features = false, features = ["contract"] } -aurora-engine-types = { path = "../../engine-types", default-features = false } +aurora-engine-types = { path = "../../engine-types" } diff --git a/etc/state-migration-test/Cargo.toml b/etc/state-migration-test/Cargo.toml index 0c3f92502..1537e1f16 100644 --- a/etc/state-migration-test/Cargo.toml +++ b/etc/state-migration-test/Cargo.toml @@ -37,7 +37,7 @@ codegen-units = 1 rpath = false [dependencies] -borsh = { version = "0.8.2", default-features = false } +borsh = "0.8.2" aurora-engine = { path = "../../engine", default-features = false } aurora-engine-sdk = { path = "../../engine-sdk", default-features = false, features = ["contract"] } -aurora-engine-types = { path = "../../engine-types", default-features = false } +aurora-engine-types = { path = "../../engine-types" }