Upgrade the versions of primitive-types to 0.13 and rlp to 0.6

.github/workflows/rust.yml

@@ -32,20 +32,23 @@ jobs:
       run: cargo build --features tracing --verbose
     - name: Run tests
       run: cargo test --verbose
-  jsontests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: "rust-blockchain/evm-tests"
-        submodules: recursive
-    - name: Submodules
-      run: |
-        cd evm
-        git remote set-url origin "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-        git fetch origin $GITHUB_SHA
-        git checkout $GITHUB_SHA
-    - name: Run tests
-      run: |
-        cd jsontests
-        cargo test --release --verbose
+  # FIXME: Due to the evm-tests repository used by the jsontests job being archived, the tests cannot be run, 
+  #        so this jsontests job has been temporarily removed. The jsontests job will be improved later, 
+  #        see issue #182
+  # jsontests:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #     with:
+  #       repository: "rust-blockchain/evm-tests"
+  #       submodules: recursive
+  #   - name: Submodules
+  #     run: |
+  #       cd evm
+  #       git remote set-url origin "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
+  #       git fetch origin $GITHUB_SHA
+  #       git checkout $GITHUB_SHA
+  #   - name: Run tests
+  #     run: |
+  #       cd jsontests
+  #       cargo test --release --verbose

Cargo.toml

@@ -10,10 +10,10 @@ edition = "2018"
 
 [dependencies]
 auto_impl = "1.0"
-ethereum = { version = "0.15", default-features = false }
+ethereum = { git = "https://github.com/rust-ethereum/ethereum.git", rev = "3be0d8fd4c2ad1ba216b69ef65b9382612efc8ba", default-features = false }
 log = { version = "0.4", default-features = false }
-primitive-types = { version = "0.12", default-features = false, features = ["rlp"] }
-rlp = { version = "0.5", default-features = false }
+primitive-types = { version = "0.13", default-features = false, features = ["rlp"] }
+rlp = { version = "0.6", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 
 # Optional dependencies
@@ -55,7 +55,7 @@ with-codec = [
 	"scale-info",
 	"primitive-types/codec",
 	"primitive-types/scale-info",
-	"ethereum/with-codec",
+	"ethereum/with-scale",
 	"evm-core/with-codec",
 ]
 with-serde = [

benches/loop.rs

@@ -42,9 +42,9 @@ fn run_loop_contract() {
 		},
 	);
 
-	let backend = MemoryBackend::new(&vicinity, state);
+	let mut backend = MemoryBackend::new(&vicinity, state);
 	let metadata = StackSubstateMetadata::new(u64::MAX, &config);
-	let state = MemoryStackState::new(metadata, &backend);
+	let state = MemoryStackState::new(metadata, &mut backend);
 	let precompiles = BTreeMap::new();
 	let mut executor = StackExecutor::new_with_precompiles(state, &config, &precompiles);
 

core/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 log = { version = "0.4", optional = true }
-primitive-types = { version = "0.12", default-features = false }
+primitive-types = { version = "0.13", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2", default-features = false, features = ["derive", "full"], optional = true }
 scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }

core/src/eval/macros.rs

@@ -53,8 +53,7 @@ macro_rules! push {
 macro_rules! push_u256 {
 	( $machine:expr, $( $x:expr ),* ) => (
 		$(
-			let mut value = H256::default();
-			$x.to_big_endian(&mut value[..]);
+			let value = H256::from($x.to_big_endian());
 			match $machine.stack.push(value) {
 				Ok(()) => (),
 				Err(e) => return Control::Exit(e.into()),

gasometer/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 environmental = { version = "1.1.2", default-features = false, optional = true }
 log = { version = "0.4", optional = true }
-primitive-types = { version = "0.12", default-features = false }
+primitive-types = { version = "0.13", default-features = false }
 
 evm-core = { version = "0.42", path = "../core", default-features = false }
 evm-runtime = { version = "0.42", path = "../runtime", default-features = false }

runtime/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 auto_impl = "1.0"
 environmental = { version = "1.1.2", default-features = false, optional = true }
-primitive-types = { version = "0.12", default-features = false }
+primitive-types = { version = "0.13", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 
 evm-core = { version = "0.42", path = "../core", default-features = false }

runtime/src/eval/macros.rs

@@ -43,8 +43,7 @@ macro_rules! push {
 macro_rules! push_u256 {
 	( $machine:expr, $( $x:expr ),* ) => (
 		$(
-			let mut value = H256::default();
-			$x.to_big_endian(&mut value[..]);
+			let value = H256::from($x.to_big_endian());
 			match $machine.machine.stack_mut().push(value) {
 				Ok(()) => (),
 				Err(e) => return Control::Exit(e.into()),

runtime/src/eval/mod.rs

@@ -113,8 +113,7 @@ pub fn finish_call(
 				&runtime.return_data_buffer[..],
 			) {
 				Ok(()) => {
-					let mut value = H256::default();
-					U256::one().to_big_endian(&mut value[..]);
+					let value = H256::from(U256::one().to_big_endian());
 					runtime.machine.stack_mut().push(value)?;
 					Ok(())
 				}

runtime/src/eval/system.rs

@@ -67,25 +67,22 @@ pub fn caller<H: Handler>(runtime: &mut Runtime) -> Control<H> {
 }
 
 pub fn callvalue<H: Handler>(runtime: &mut Runtime) -> Control<H> {
-	let mut ret = H256::default();
-	runtime.context.apparent_value.to_big_endian(&mut ret[..]);
-	push!(runtime, ret);
+	let ret = runtime.context.apparent_value.to_big_endian();
+	push!(runtime, H256::from(ret));
 
 	Control::Continue
 }
 
 pub fn gasprice<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
-	let mut ret = H256::default();
-	handler.gas_price().to_big_endian(&mut ret[..]);
-	push!(runtime, ret);
+	let ret = handler.gas_price().to_big_endian();
+	push!(runtime, H256::from(ret));
 
 	Control::Continue
 }
 
 pub fn base_fee<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
-	let mut ret = H256::default();
-	handler.block_base_fee_per_gas().to_big_endian(&mut ret[..]);
-	push!(runtime, ret);
+	let ret = handler.block_base_fee_per_gas().to_big_endian();
+	push!(runtime, H256::from(ret));
 
 	Control::Continue
 }