Version 0.11.0

 - feature passthrough in evm-stateful
 - correct repo

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "evm"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 license = "Apache-2.0"
-authors = ["Wei Tang <hi@that.world>"]
+authors = ["Wei Tang <hi@that.world>", "Mike Lubinets <public@mersinvald.me>"]
 description = "SputnikVM - a Portable Blockchain Virtual Machine"
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 keywords = ["no_std", "ethereum"]
 edition = "2018"
 

cli/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.0"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
 description = "SputnikVM CLI"
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 # Since we have an explicit [[bin]] section below, we add the

gethrpc/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.0"
 license = "Apache-2.0"
 authors = ["Stewart Mackenzie <setori88@gmail.com>", "Wei Tang <hi@that.world>"]
 description = "gethrpc - provides functionality for interacting with geth's blockchain."
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]

network/classic/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network-classic"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Ethereum Classic patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/dynamic/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Network-agnostic patches for SputnikVM."
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>, Mike Lubinets <public@mersinvald.me>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/ellaism/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "evm-network-ellaism"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Ellaism patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/expanse/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network-expanse"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Expanse patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/foundation/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network-foundation"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Ethereum patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/musicoin/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network-musicoin"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Musicoin patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

network/ubiq/Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "evm-network-ubiq"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "Ubiq patches for SputnikVM. Deprecated and will be dropped in future releases: use evm-network instead"
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
-evm-precompiled-bn128 = { version = "0.11.0-beta", path = "../../precompiled/bn128", default-features = false}
-evm-precompiled-modexp = { version = "0.11.0-beta", path = "../../precompiled/modexp", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
+evm-precompiled-bn128 = { version = "0.11", path = "../../precompiled/bn128", default-features = false}
+evm-precompiled-modexp = { version = "0.11", path = "../../precompiled/modexp", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 
 [features]

precompiled/bn128/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "evm-precompiled-bn128"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "bn128 precompiled contracts for SputnikVM."
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false }
+evm = { version = "0.11", path = "../..", default-features = false }
 ethereum-bigint = { version = "0.2", default-features = false }
 bn-plus = { version = "0.4" }
 

precompiled/modexp/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "evm-precompiled-modexp"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 description = "modexp precompiled contracts for SputnikVM."
 license = "Apache-2.0"
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = "../..", default-features = false  }
+evm = { version = "0.11", path = "../..", default-features = false  }
 ethereum-bigint = { version = "0.2", default-features = false }
 num-bigint = "0.1"
 

regtests/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.0"
 license = "Apache-2.0"
 authors = ["Stewart Mackenzie <setori88@gmail.com>", "Wei Tang <hi@that.world>"]
 description = "regtests - performs a regression test of the entire ethereum classic blockchain."
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 # Since we have an explicit [[bin]] section below, we add the

src/eval/cost.rs

@@ -1,7 +1,6 @@
 //! Cost calculation logic
 
 use bigint::{Address, Gas, M256, U256};
-use log::{debug, trace};
 
 #[cfg(not(feature = "std"))]
 use core::cmp::max;

src/eval/mod.rs

@@ -20,7 +20,6 @@ use super::errors::{CommitError, EvalOnChainError, NotSupportedError, OnChainErr
 use super::pc::Instruction;
 use super::{AccountCommitment, Context, HeaderParams, Log, Memory, Opcode, PCMut, Patch, Stack, Valids, PC};
 use bigint::{Address, Gas, M256, U256};
-use log::{debug, trace};
 
 use self::check::{check_opcode, check_static, check_support, extra_check_opcode};
 use self::cost::{gas_cost, gas_refund, gas_stipend, memory_cost, memory_gas, AddRefund};

src/lib.rs

@@ -135,6 +135,10 @@ extern crate secp256k1;
 #[cfg(feature = "std")]
 extern crate block;
 
+// BUG: without old-style #[macro_use] extern crate, evm-rs cannot be compiled as a dependency.
+#[macro_use]
+extern crate log;
+
 mod commit;
 pub mod errors;
 mod eval;
@@ -173,8 +177,6 @@ use std::cmp::min;
 #[cfg(feature = "std")]
 use std::collections::{hash_map as map, HashSet as Set};
 
-use log::debug;
-
 #[derive(Debug, Clone, PartialEq)]
 /// VM Status
 pub enum VMStatus {

src/transaction.rs

@@ -22,8 +22,6 @@ use std::collections::{hash_map as map, HashSet as Set};
 #[cfg(feature = "std")]
 use std::ops::Deref;
 
-use log::{debug, trace};
-
 use super::errors::{CommitError, PreExecutionError, RequireError};
 use super::{
     AccountChange, AccountCommitment, AccountState, BlockhashState, Context, ContextVM, HeaderParams, Instruction, Log,

stateful/Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "evm-stateful"
-version = "0.11.0-beta.0"
+version = "0.11.0"
 license = "Apache-2.0"
 description = "Stateful evm-rs wrapped with tries."
 authors = ["Wei Tang <hi@that.world>"]
-repository = "https://github.com/etclabscore/sputnikvm"
+repository = "https://github.com/ethereumproject/evm-rs"
 edition = "2018"
 
 [dependencies]
-evm = { version = "0.11.0-beta", path = '..' }
-ethereum-bigint = "0.2"
-ethereum-trie = "0.3"
-ethereum-block = "0.4"
-ethereum-rlp = "0.2"
+evm = { version = "0.11", path = '..', default-features = false, features = ["std"] }
+ethereum-bigint = { version = "0.2", default-features = false, features = ["std"] }
+ethereum-trie = { version = "0.3", default-features = false }
+ethereum-block = { version = "0.4", default-features = false }
+ethereum-rlp = { version = "0.2", default-features = false, features = ["std"] }
 sha3 = "0.6"
 rand = "0.3"
 
@@ -22,4 +22,9 @@ serde_derive = "1.0"
 serde_json = "1.0"
 lazy_static = "0.2"
 ethereum-hexutil = "0.2"
-evm-network-classic = { version = "0.11.0-beta", path = "../network/classic" }
+evm-network-classic = { version = "0.11", path = "../network/classic" }
+
+[features]
+default = ["rust-secp256k1"]
+c-secp256k1 = ["evm/c-secp256k1", "ethereum-block/c-secp256k1"]
+rust-secp256k1 = ["evm/libsecp256k1", "ethereum-block/rust-secp256k1"]