grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dev

Browse Source
This commit is contained in:
rakita
2021-03-10 17:23:00 +01:00
parent d7a958129f 187c81b3f1
commit 32fd2b484c
24 changed files with 155 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ethcore/res/chainspec/foundation.json
View File

@@ -170,7 +170,6 @@
"eip1706Transition": "0x8a61c8",
"eip1884Transition": "0x8a61c8",
"eip2028Transition": "0x8a61c8",
"eip2315Transition": "0xbad420",
"eip2929Transition": "0xbad420",
"eip2930Transition": "0xbad420"
},

1
crates/ethcore/res/chainspec/goerli.json
View File

@@ -31,7 +31,6 @@
"eip1706Transition": "0x17d433",
"eip1884Transition": "0x17d433",
"eip2028Transition": "0x17d433",
"eip2315Transition": "0x441064",
"eip2929Transition": "0x441064",
"eip2930Transition": "0x441064",
"gasLimitBoundDivisor": "0x400",

1
crates/ethcore/res/chainspec/rinkeby.json
View File

@@ -31,7 +31,6 @@
"eip1706Transition": "0x52efd1",
"eip1884Transition": "0x52efd1",
"eip2028Transition": "0x52efd1",
"eip2315Transition": "0x7e8270",
"eip2929Transition": "0x7e8270",
"eip2930Transition": "0x7e8270",
"gasLimitBoundDivisor": "0x400",

1
crates/ethcore/res/chainspec/ropsten.json
View File

@@ -52,7 +52,6 @@
"eip1706Transition": "0x62f756",
"eip1884Transition": "0x62f756",
"eip2028Transition": "0x62f756",
"eip2315Transition": "0x95b8dd",
"eip2929Transition": "0x95b8dd",
"eip2930Transition": "0x95b8dd"

3
crates/ethcore/res/chainspec/test/berlin_test.json
View File

@@ -43,7 +43,6 @@
"eip1706Transition": "0x0",
"eip1884Transition": "0x0",
"eip2028Transition": "0x0",
"eip2315Transition": "0x0",
"eip2929Transition": "0x0",
"eip2930Transition": "0x0"
},
@@ -203,4 +202,4 @@
}
}
}
}
}

1
crates/ethcore/res/chainspec/yolo3.json
View File

@@ -28,7 +28,6 @@
"eip2028Transition": "0x0",
"eip211Transition": "0x0",
"eip214Transition": "0x0",
"eip2315Transition": "0x0",
"eip2929Transition": "0x0",
"eip2930Transition": "0x0",
"eip658Transition": "0x0",

2
crates/ethcore/res/json_tests

Submodule crates/ethcore/res/json_tests updated: 1508126ea0...e431795bf7

2
crates/ethcore/src/json_tests/runner.rs
View File

@@ -184,7 +184,7 @@ impl TestRunner {
return Vec::new();
}
}
super::state::json_chain_test(&test, &path, &json, &mut |_, _| {})
super::state::json_state_test(&test, &path, &json, &mut |_, _| {})
},
)
}

6
crates/ethcore/src/json_tests/state.rs
View File

@@ -20,7 +20,6 @@ use ethjson;
use pod_state::PodState;
use std::path::Path;
use trace;
use types::transaction::SignedTransaction;
use vm::EnvInfo;
fn skip_test(
@@ -42,7 +41,7 @@ fn skip_test(
})
}
pub fn json_chain_test<H: FnMut(&str, HookType)>(
pub fn json_state_test<H: FnMut(&str, HookType)>(
state_test: &ethjson::test::StateTests,
path: &Path,
json_data: &[u8],
@@ -91,8 +90,7 @@ pub fn json_chain_test<H: FnMut(&str, HookType)>(
}
let post_root: H256 = state.hash.into();
let transaction: SignedTransaction =
multitransaction.select(&state.indexes).into();
let transaction = multitransaction.select(&state.indexes);
let result = || -> Result<_, EvmTestError> {
Ok(EvmTestClient::from_pod_state(&spec, pre.clone())?.transact(

1
crates/ethcore/types/Cargo.toml
View File

@@ -6,7 +6,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethereum-types = "0.4"
ethjson = { path = "../../ethjson" }
ethkey = { path = "../../accounts/ethkey" }
heapsize = "0.4"
keccak-hash = "0.1"

1
crates/ethcore/types/src/lib.rs
View File

@@ -35,7 +35,6 @@
#![warn(unused_extern_crates)]
extern crate ethereum_types;
extern crate ethjson;
extern crate ethkey;
extern crate heapsize;
extern crate keccak_hash as hash;

11
crates/ethcore/types/src/log_entry.rs
View File

@@ -21,7 +21,6 @@ use ethereum_types::{Address, Bloom, BloomInput, H256};
use heapsize::HeapSizeOf;
use std::ops::Deref;
use ethjson;
use BlockNumber;
/// A record of execution for a `LOG` operation.
@@ -53,16 +52,6 @@ impl LogEntry {
}
}
impl From<ethjson::state::Log> for LogEntry {
fn from(l: ethjson::state::Log) -> Self {
LogEntry {
address: l.address.into(),
topics: l.topics.into_iter().map(Into::into).collect(),
data: l.data.into(),
}
}
}
/// Log localized in a blockchain.
#[derive(Default, Debug, PartialEq, Clone)]
pub struct LocalizedLogEntry {

51
crates/ethcore/types/src/transaction/transaction.rs
View File

@@ -17,7 +17,6 @@
//! Transaction data structure.
use ethereum_types::{Address, H160, H256, U256};
use ethjson;
use ethkey::{self, public_to_address, recover, Public, Secret, Signature};
use hash::keccak;
use heapsize::HeapSizeOf;
@@ -606,56 +605,6 @@ impl SignatureComponents {
}
}
#[cfg(any(test, feature = "test-helpers"))]
impl From<ethjson::state::Transaction> for SignedTransaction {
fn from(t: ethjson::state::Transaction) -> Self {
let to: Option<ethjson::hash::Address> = t.to.into();
let secret = t.secret.map(|s| Secret::from(s.0));
let tx = TypedTransaction::Legacy(Transaction {
nonce: t.nonce.into(),
gas_price: t.gas_price.into(),
gas: t.gas_limit.into(),
action: match to {
Some(to) => Action::Call(to.into()),
None => Action::Create,
},
value: t.value.into(),
data: t.data.into(),
});
match secret {
Some(s) => tx.sign(&s, None),
None => tx.null_sign(1),
}
}
}
impl From<ethjson::transaction::Transaction> for UnverifiedTransaction {
fn from(t: ethjson::transaction::Transaction) -> Self {
let to: Option<ethjson::hash::Address> = t.to.into();
UnverifiedTransaction {
unsigned: TypedTransaction::Legacy(Transaction {
nonce: t.nonce.into(),
gas_price: t.gas_price.into(),
gas: t.gas_limit.into(),
action: match to {
Some(to) => Action::Call(to.into()),
None => Action::Create,
},
value: t.value.into(),
data: t.data.into(),
}),
chain_id: signature::extract_chain_id_from_legacy_v(t.v.into()),
signature: SignatureComponents {
r: t.r.into(),
s: t.s.into(),
standard_v: signature::extract_standard_v(t.v.into()),
},
hash: 0.into(),
}
.compute_hash()
}
}
/// Signed transaction information without verified signature.
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct UnverifiedTransaction {