diff --git a/Cargo.lock b/Cargo.lock index d88d462dc7..711750502f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1377,8 +1377,7 @@ dependencies = [ [[package]] name = "ethereum" version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c90e0a755da706ce0970ec0fa8cc48aabcc8e8efa1245336acf718dab06ffe" +source = "git+https://github.com/purestake/ethereum?branch=tgm-0.11.1-typeinfo-patch#42ee428264e27773da5e93f264f0aa7daf1a8a7f" dependencies = [ "bytes 1.0.1", "ethereum-types", diff --git a/Cargo.toml b/Cargo.toml index e6fcdf9a58..55a447c1bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,3 +23,6 @@ members = [ "template/node", "template/runtime", ] + +[patch.crates-io] +ethereum = { git = "https://github.com/purestake/ethereum", branch = "tgm-0.11.1-typeinfo-patch" } diff --git a/client/rpc/src/eth.rs b/client/rpc/src/eth.rs index e3959e2db0..bca7aaa7b5 100644 --- a/client/rpc/src/eth.rs +++ b/client/rpc/src/eth.rs @@ -1189,7 +1189,7 @@ where Some( access_list .into_iter() - .map(|item| (item.address, item.slots)) + .map(|item| (item.address, item.storage_keys)) .collect(), ), ) @@ -1259,7 +1259,7 @@ where Some( access_list .into_iter() - .map(|item| (item.address, item.slots)) + .map(|item| (item.address, item.storage_keys)) .collect(), ), ) @@ -1430,7 +1430,7 @@ where Some( access_list .into_iter() - .map(|item| (item.address, item.slots)) + .map(|item| (item.address, item.storage_keys)) .collect(), ), ) @@ -1488,7 +1488,7 @@ where Some( access_list .into_iter() - .map(|item| (item.address, item.slots)) + .map(|item| (item.address, item.storage_keys)) .collect(), ), ) diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs index b64508e6e4..d89f87479f 100644 --- a/frame/ethereum/src/lib.rs +++ b/frame/ethereum/src/lib.rs @@ -344,7 +344,7 @@ impl Pallet { access_list: t .access_list .iter() - .map(|d| (d.address, d.slots.clone())) + .map(|d| (d.address, d.storage_keys.clone())) .collect(), }, Transaction::EIP1559(t) => TransactionData { @@ -360,7 +360,7 @@ impl Pallet { access_list: t .access_list .iter() - .map(|d| (d.address, d.slots.clone())) + .map(|d| (d.address, d.storage_keys.clone())) .collect(), }, } @@ -758,7 +758,7 @@ impl Pallet { let access_list: Vec<(H160, Vec)> = t .access_list .iter() - .map(|item| (item.address, item.slots.clone())) + .map(|item| (item.address, item.storage_keys.clone())) .collect(); ( t.input.clone(), @@ -775,7 +775,7 @@ impl Pallet { let access_list: Vec<(H160, Vec)> = t .access_list .iter() - .map(|item| (item.address, item.slots.clone())) + .map(|item| (item.address, item.storage_keys.clone())) .collect(); ( t.input.clone(),