Merge branch 'master' into dp/debug/sync-stalls

* master: update kvdb-rocksdb to 0.4 (#11442) Rough architecutre diagram. (#11396) ethjson: impl Copy for hash type wrapper (#11423) Remove dead bootnodes, add new geth bootnodes (#11441) goerli: replace foundation bootnode (#11433)
openethereum · Feb 3, 2020 · ece33bd · ece33bd
2 parents 7119fdc + ccaa514
commit ece33bd
Show file tree

Hide file tree

Showing 28 changed files with 148 additions and 109 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,8 +41,8 @@ futures = "0.1"
 journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
-kvdb = "0.2"
-kvdb-rocksdb = "0.3.0"
+kvdb = "0.3.1"
+kvdb-rocksdb = "0.4.1"
 log = "0.4"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }

diff --git a/docs/architecture-draft.png b/docs/architecture-draft.png
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -31,9 +31,9 @@ hash-db = "0.15.0"
 itertools = "0.5"
 journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.4.0"
-kvdb = "0.2"
-kvdb-memorydb = { version = "0.2.0", optional = true }
-kvdb-rocksdb = { version = "0.3.0", optional = true }
+kvdb = "0.3.1"
+kvdb-memorydb = { version = "0.3.1", optional = true }
+kvdb-rocksdb = { version = "0.4.1", optional = true }
 lazy_static = { version = "1.3", optional = true }
 log = "0.4"
 macros = { path = "../util/macros", optional = true }
@@ -78,8 +78,8 @@ ethcore-builtin = { path = "./builtin" }
 ethjson = { path = "../json", features = ["test-helpers"] }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 fetch = { path = "../util/fetch" }
-kvdb-memorydb = "0.2.0"
-kvdb-rocksdb = "0.3.0"
+kvdb-memorydb = "0.3.1"
+kvdb-rocksdb = "0.4.1"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 macros = { path = "../util/macros" }

diff --git a/ethcore/account-db/Cargo.toml b/ethcore/account-db/Cargo.toml
@@ -11,5 +11,5 @@ ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 rlp = "0.4"
diff --git a/ethcore/account-state/Cargo.toml b/ethcore/account-state/Cargo.toml
@@ -16,7 +16,7 @@ hash-db = "0.15.0"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 lru-cache = "0.1.2"
 memory-db = "0.18.0"

diff --git a/ethcore/blockchain/Cargo.toml b/ethcore/blockchain/Cargo.toml
@@ -16,7 +16,7 @@ ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
 parity-util-mem = "0.3.0"
 itertools = "0.5"
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 parity-bytes = "0.1"
 rand = "0.7"
@@ -32,4 +32,4 @@ env_logger = "0.5"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
 rustc-hex = "1.0"
 tempdir = "0.3"
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
diff --git a/ethcore/client-traits/Cargo.toml b/ethcore/client-traits/Cargo.toml
@@ -15,7 +15,7 @@ common-types = { path = "../types" }
 ethcore-db = { path = "../db" }
 ethcore-miner = { path = "../../miner" }
 ethereum-types = "0.8.0"
-kvdb = "0.2"
+kvdb = "0.3.1"
 registrar = { path = "../../util/registrar" }
 stats = { path = "../../util/stats" }
 trace = { path = "../trace" }

diff --git a/ethcore/db/Cargo.toml b/ethcore/db/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 common-types = { path = "../types" }
 ethereum-types = "0.8.0"
-kvdb = "0.2"
+kvdb = "0.3.1"
 parity-util-mem = "0.3.0"
 parking_lot = "0.9"
 rlp = "0.4.0"

diff --git a/ethcore/engines/validator-set/Cargo.toml b/ethcore/engines/validator-set/Cargo.toml
@@ -17,7 +17,7 @@ ethereum-types = "0.8.0"
 ethjson = { path = "../../../json" }
 executive-state = { path = "../../executive-state" }
 keccak-hash = "0.4.0"
-kvdb = "0.2"
+kvdb = "0.3.1"
 lazy_static = "1.3.0"
 log = "0.4.8"
 machine = { path = "../../machine" }

diff --git a/ethcore/executive-state/Cargo.toml b/ethcore/executive-state/Cargo.toml
@@ -14,7 +14,7 @@ common-types = { path = "../types" }
 ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4.8"
 machine = { path = "../machine" }
 trace = { path = "../trace" }

diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -43,14 +43,14 @@ stats = { path = "../../util/stats" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 memory-cache = { path = "../../util/memory-cache" }
 journaldb = { path = "../../util/journaldb" }
 verification = { path = "../verification" }
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
 tempdir = "0.3"
 
 [features]

diff --git a/ethcore/node-filter/Cargo.toml b/ethcore/node-filter/Cargo.toml
@@ -22,7 +22,7 @@ lru-cache = "0.1"
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
 ethcore-io = { path = "../../util/io" }
 spec = { path = "../spec" }
 tempdir = "0.3"
diff --git a/ethcore/pod/Cargo.toml b/ethcore/pod/Cargo.toml
@@ -15,7 +15,7 @@ hash-db = "0.15.0"
 itertools = "0.8"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 parity-bytes = "0.1.0"
 rlp = "0.4"

diff --git a/ethcore/private-tx/Cargo.toml b/ethcore/private-tx/Cargo.toml
@@ -26,7 +26,7 @@ parity-util-mem = "0.3.0"
 hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 machine = { path = "../machine" }
 journaldb = { path = "../../util/journaldb" }

diff --git a/ethcore/res/ethereum/goerli.json b/ethcore/res/ethereum/goerli.json
@@ -55,7 +55,7 @@
 	"nodes": [
 		"enode://06333009fc9ef3c9e174768e495722a7f98fe7afd4660542e983005f85e556028410fd03278944f44cfe5437b1750b5e6bd1738f700fe7da3626d52010d2954c@51.141.15.254:30303",
 		"enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
-		"enode://573b6607cd59f241e30e4c4943fd50e99e2b6f42f9bd5ca111659d309c06741247f4f1e93843ad3e8c8c18b6e2d94c161b7ef67479b3938780a97134b618b5ce@52.56.136.200:30303",
+		"enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303",
 		"enode://67913271d14f445689e8310270c304d42f268428f2de7a4ac0275bea97690e021df6f549f462503ff4c7a81d9dd27288867bbfa2271477d0911378b8944fae55@157.230.239.163:30303",
 		"enode://a87685902a0622e9cf18c68e73a0ea45156ec53e857ef049b185a9db2296ca04d776417bf1901c0b4eacb5b26271d8694e88e3f17c20d49eb77e1a41ab26b5b3@51.141.78.53:30303",
 		"enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",

diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml
@@ -14,7 +14,7 @@ ethcore-io = { path = "../../util/io" }
 ethcore-private-tx = { path = "../private-tx" }
 ethcore-sync = { path = "../sync" }
 ethereum-types = "0.8.0"
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 snapshot = { path = "../snapshot" }
 spec = { path = "../spec" }
@@ -23,5 +23,5 @@ trace-time = "0.1"
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-db = { path = "../db" }
-kvdb-rocksdb = "0.3.0"
+kvdb-rocksdb = "0.4.1"
 tempdir = "0.3"
diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml
@@ -29,7 +29,7 @@ itertools = "0.5"
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4.8"
 num_cpus = "1.10.1"
 rand = "0.7"
@@ -53,7 +53,7 @@ ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"
 ethcore = { path = "..", features = ["test-helpers"] }
 ethkey = { path = "../../accounts/ethkey" }
-kvdb-rocksdb = "0.3.0"
+kvdb-rocksdb = "0.4.1"
 lazy_static = { version = "1.3" }
 spec = { path = "../spec" }
 tempdir = "0.3"

diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml
@@ -23,8 +23,8 @@ hash-db = "0.15.0"
 journaldb = { path = "../../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../../util/keccak-hasher" }
-kvdb = "0.2"
-kvdb-rocksdb = "0.3.0"
+kvdb = "0.3.1"
+kvdb-rocksdb = "0.4.1"
 log = "0.4.8"
 parking_lot = "0.9"
 parity-crypto = { version = "0.4.2", features = ["publickey"] }

diff --git a/ethcore/spec/Cargo.toml b/ethcore/spec/Cargo.toml
@@ -25,7 +25,7 @@ hash-db = "0.15.0"
 instant-seal = { path = "../engines/instant-seal" }
 journaldb = { path = "../../util/journaldb" }
 keccak-hash = "0.4.0"
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
 log = "0.4.8"
 machine = { path = "../machine" }
 null-engine = { path = "../engines/null-engine" }

diff --git a/ethcore/state-db/Cargo.toml b/ethcore/state-db/Cargo.toml
@@ -16,7 +16,7 @@ hash-db = "0.15.0"
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 journaldb = { path = "../../util/journaldb" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4.6"
 lru-cache = "0.1.2"
 memory-cache = { path = "../../util/memory-cache" }

diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
@@ -40,7 +40,7 @@ env_logger = "0.5"
 engine = { path = "../engine" }
 ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-io = { path = "../../util/io", features = ["mio"] }
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
 machine = { path = "../machine" }
 rand_xorshift = "0.2"
 rustc-hex = "1.0"

diff --git a/ethcore/trace/Cargo.toml b/ethcore/trace/Cargo.toml
@@ -11,7 +11,7 @@ ethcore-blockchain = { path = "../blockchain" }
 ethcore-db = { path = "../db" }
 ethereum-types = "0.8.0"
 evm = { path = "../evm" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 parity-bytes = "0.1.0"
 parity-util-mem = "0.3.0"

diff --git a/json/src/hash.rs b/json/src/hash.rs
@@ -25,7 +25,7 @@ use ethereum_types::{H64 as Hash64, H160 as Hash160, H256 as Hash256, H520 as Ha
 macro_rules! impl_hash {
 	($name: ident, $inner: ident) => {
 		/// Lenient hash json deserialization for test json files.
-		#[derive(Default, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone)]
+		#[derive(Default, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
 		pub struct $name(pub $inner);
 
 		impl From<$name> for $inner {

diff --git a/miner/local-store/Cargo.toml b/miner/local-store/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 common-types = { path = "../../ethcore/types" }
 ethcore-io = { path = "../../util/io" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 rlp = "0.4.0"
 serde = "1.0"
@@ -18,4 +18,4 @@ serde_json = "1.0"
 [dev-dependencies]
 ethkey = { path = "../../accounts/ethkey" }
 parity-crypto = { version = "0.4.2", features = ["publickey"] }
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
diff --git a/secret-store/Cargo.toml b/secret-store/Cargo.toml
@@ -15,8 +15,8 @@ ethkey = { path = "../accounts/ethkey", optional = true }
 futures = "0.1"
 hyper = { version = "0.12", default-features = false }
 keccak-hash = "0.4.0"
-kvdb = "0.2"
-kvdb-rocksdb = "0.3.0"
+kvdb = "0.3.1"
+kvdb-rocksdb = "0.4.1"
 lazy_static = "1.0"
 log = "0.4"
 parity-bytes = "0.1"
@@ -38,4 +38,4 @@ jsonrpc-server-utils = "14.0.3"
 [dev-dependencies]
 env_logger = "0.5"
 tempdir = "0.3"
-kvdb-rocksdb = "0.3.0"
+kvdb-rocksdb = "0.4.1"
diff --git a/util/journaldb/Cargo.toml b/util/journaldb/Cargo.toml
@@ -12,7 +12,7 @@ ethereum-types = "0.8.0"
 hash-db = "0.15.0"
 malloc_size_of = { version = "0.3.0", package = "parity-util-mem" }
 keccak-hasher = { path = "../keccak-hasher" }
-kvdb = "0.2"
+kvdb = "0.3.1"
 log = "0.4"
 memory-db = "0.18.0"
 parking_lot = "0.9"
@@ -22,4 +22,4 @@ rlp = "0.4.0"
 [dev-dependencies]
 env_logger = "0.5"
 keccak-hash = "0.4.0"
-kvdb-memorydb = "0.2.0"
+kvdb-memorydb = "0.3.1"
diff --git a/util/migration-rocksdb/Cargo.toml b/util/migration-rocksdb/Cargo.toml
@@ -6,8 +6,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 macros = { path = "../macros" }
-kvdb = "0.2"
-kvdb-rocksdb = "0.3.0"
+kvdb = "0.3.1"
+kvdb-rocksdb = "0.4.1"
 
 [dev-dependencies]
 tempdir = "0.3"