Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

[stable] builtin, istanbul and mordor testnet backports #11234

Merged
merged 8 commits into from
Nov 5, 2019
Merged

[stable] builtin, istanbul and mordor testnet backports #11234

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46342f9
ethcore-builtin (#10850)
debris Jul 7, 2019
ac66103
[builtin]: support `multiple prices and activations` in chain spec (#…
niklasad1 Oct 31, 2019
72e0eae
manually adjust spec
niklasad1 Nov 2, 2019
6923ec8
[chain specs]: activate `Istanbul` on mainnet (#11228)
niklasad1 Nov 1, 2019
4f64fd2
ethcore/res: add mordor testnet configuration (#11200)
soc1c Nov 2, 2019
cd6a160
fix bad merge
niklasad1 Nov 2, 2019
04481d9
[ethereum tests]: revert `725dbc73a725dbc73a`
niklasad1 Nov 3, 2019
87c0a5c
Merge branch 'v2.5.10-stable' of github.com:paritytech/parity-ethereu…
soc1c Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
583 changes: 502 additions & 81 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion accounts/ethkey/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
edit-distance = "2.0"
parity-crypto = "0.3.0"
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "ccc06e7480148b723eb44ac56cf4d20eec380b6f" }
ethereum-types = "0.4"
lazy_static = "1.0"
log = "0.4"
Expand Down
6 changes: 2 additions & 4 deletions ethcore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ansi_term = "0.10"
blooms-db = { path = "../util/blooms-db", optional = true }
bn = { git = "https://github.com/paritytech/bn", default-features = false }
byteorder = "1.0"
common-types = { path = "types" }
crossbeam-utils = "0.6"
Expand All @@ -22,6 +21,7 @@ ethabi-derive = "6.0"
ethash = { path = "../ethash", optional = true}
ethcore-blockchain = { path = "./blockchain" }
ethcore-bloom-journal = { path = "../util/bloom" }
ethcore-builtin = { path = "./builtin" }
ethcore-call-contract = { path = "./call-contract" }
ethcore-db = { path = "./db" }
ethcore-io = { path = "../util/io" }
Expand All @@ -46,11 +46,9 @@ log = "0.4"
lru-cache = "0.1"
macros = { path = "../util/macros" }
memory-cache = { path = "../util/memory-cache" }
memory-db = "0.11.0"
num = { version = "0.1", default-features = false, features = ["bigint"] }
memory-db = "0.11"
num_cpus = "1.2"
parity-bytes = "0.1"
parity-crypto = "0.3.0"
parity-snappy = "0.1"
parking_lot = "0.7"
trie-db = "0.11.0"
Expand Down
23 changes: 23 additions & 0 deletions ethcore/builtin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[package]
description = "ethereum vm builtin"
name = "ethcore-builtin"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
bn = { git = "https://github.com/paritytech/bn", default-features = false }
byteorder = "1.3.2"
eip-152 = { path = "../../util/EIP-152" }
ethereum-types = "0.4"
ethjson = { path = "../../json" }
ethkey = { path = "../../accounts/ethkey" }
keccak-hash = "0.2.0"
log = "0.4"
macros = { path = "../../util/macros" }
num = { version = "0.1", default-features = false, features = ["bigint"] }
parity-bytes = "0.1"
parity-crypto = "0.4.0"

[dev-dependencies]
rustc-hex = "1.0"
Loading