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

Commit 56900f0

Browse files
niklasad1soc1c
authored andcommitted
[stable] builtin, istanbul and mordor testnet backports (#11234)
* ethcore-builtin (#10850) * ethcore-builtin * rename ethcore-builtin Impl to Implementation * [builtin]: support `multiple prices and activations` in chain spec (#11039) * [builtin]: impl new builtin type Have an enum to deserialize either a builtin of a single price or several prices * [builtin]: style cleanup * [builtin]: fix tests * [builtin]: replace boxing with wrapper enum * cleanup * fix: make it backward compatible with old builtin * fix: update chain specs * fix: revert use of `type alias` on enum The CI doesn't use the latest rust. This commit reverts that change * fix: builtin tests * fix: revert use of `type alias` on enum * [basic-authority]: update test-chainspec * fix failing tests * [builtin]: multi-prices add `info field` It might be hard to read chain specs with several activations points. This commit introduces a `info` field which may be used to write some information about the current activation such as: `Istanbul hardfork EIP-1108` or something similar. * fix: bad rebase Co-Authored-By: David <dvdplm@gmail.com> * fix(grumbles): make it backward compatible * grumbles: resolve `NOTE` * revert chain specs changes * rename test Co-Authored-By: David <dvdplm@gmail.com> * [builtin docs]: price -> Fixed price Co-Authored-By: Andronik Ordian <write@reusable.software> * [json]: address naming grumbles InnerPricing -> PricingInner PriceWithActivationAt -> PricingAt * docs: revert changes for `AltBn128ConstOperations` * [json]: usize -> u64 Use explicit types to cope with platform dependent issues for `usize` * grumble: simplify `spec_backward_compability.json` * docs: add issue link to `TODO` * [builtin]: replace `match` with `map` * [builtin]: add deprecation message `eip1108` params * nits * [json spec tests]: fix json indentation * [json docs]: fix typos * [json]: `compability layer` + deser to BTreeMap Previously we had to match `Pricing::Single` and `PricingMulti` which this fixes. It does by introducing a compability layer and into() implemenentation. In addition, I switched the deserialization to `BTreeMap` instead of `Vec`. That changes the format of the chain spec again * [json]: rename `BuiltinCombat` -> `BuiltinCompat` * Update ethcore/builtin/src/lib.rs Co-Authored-By: David <dvdplm@gmail.com> * [json builtin]: improve docs Co-Authored-By: David <dvdplm@gmail.com> * [json builtin]: improve docs Co-Authored-By: David <dvdplm@gmail.com> * chore(builtin): sort dependencies * [json builtin]: deprecate `eip1108` params * [machine]: add bench for calling builtin contract * [machine]: reduce calls to `Builtin::is_active` * [builtin]: fix nits * [json]: revert breakage of chain specs * [json builtin]: remove `eip1108` params * [chain specs]: update to new format * [machine]: revert changes * [devp2p]: revert change * [builtin]: doc nits * manually adjust spec * [chain specs]: activate `Istanbul` on mainnet (#11228) * [chains spec]: activate istanbul at mainnet * Activate `Block >= 9,069,000` on the Ethereum mainnet * Enable Blake2 compression function `F` precompile * [chain specs]: add comments for EIP1108 activation * [chainspec mainnet]: enable Istanbul transitions * [chainspec mainnet]: simply configuration * ethcore/res: add mordor testnet configuration (#11200) * ethcore/res: add mordor testnet configuration * ethcore/spec: add mordor testnet configuration * parity/cli: add mordor testnet configuration * parity/config: fix tests * ethcore/res: update mordor spec with agharta hardfork block 301243 * ethcore/res: update kotti with agharta block 1705549 * ethcore/res: update morden with agharta block 5000381 * ethcore/res: multiple prices and activations for mordor testnet * fix mordor spec json * fix mordor spec json * fix bad merge * [ethereum tests]: revert `725dbc73a725dbc73a`
1 parent d45b891 commit 56900f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4593
-1434
lines changed

Cargo.lock

Lines changed: 503 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

accounts/ethkey/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
77
[dependencies]
88
edit-distance = "2.0"
99
parity-crypto = "0.3.0"
10-
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
10+
eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "ccc06e7480148b723eb44ac56cf4d20eec380b6f" }
1111
ethereum-types = "0.4"
1212
lazy_static = "1.0"
1313
log = "0.4"

ethcore/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
99
[dependencies]
1010
ansi_term = "0.10"
1111
blooms-db = { path = "../util/blooms-db", optional = true }
12-
bn = { git = "https://github.com/paritytech/bn", default-features = false }
1312
byteorder = "1.0"
1413
common-types = { path = "types" }
1514
crossbeam-utils = "0.6"
@@ -22,6 +21,7 @@ ethabi-derive = "6.0"
2221
ethash = { path = "../ethash", optional = true}
2322
ethcore-blockchain = { path = "./blockchain" }
2423
ethcore-bloom-journal = { path = "../util/bloom" }
24+
ethcore-builtin = { path = "./builtin" }
2525
ethcore-call-contract = { path = "./call-contract" }
2626
ethcore-db = { path = "./db" }
2727
ethcore-io = { path = "../util/io" }
@@ -46,11 +46,9 @@ log = "0.4"
4646
lru-cache = "0.1"
4747
macros = { path = "../util/macros" }
4848
memory-cache = { path = "../util/memory-cache" }
49-
memory-db = "0.11.0"
50-
num = { version = "0.1", default-features = false, features = ["bigint"] }
49+
memory-db = "0.11"
5150
num_cpus = "1.2"
5251
parity-bytes = "0.1"
53-
parity-crypto = "0.3.0"
5452
parity-snappy = "0.1"
5553
parking_lot = "0.7"
5654
trie-db = "0.11.0"

ethcore/builtin/Cargo.toml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[package]
2+
description = "ethereum vm builtin"
3+
name = "ethcore-builtin"
4+
version = "0.1.0"
5+
authors = ["Parity Technologies <admin@parity.io>"]
6+
edition = "2018"
7+
8+
[dependencies]
9+
bn = { git = "https://github.com/paritytech/bn", default-features = false }
10+
byteorder = "1.3.2"
11+
eip-152 = { path = "../../util/EIP-152" }
12+
ethereum-types = "0.4"
13+
ethjson = { path = "../../json" }
14+
ethkey = { path = "../../accounts/ethkey" }
15+
keccak-hash = "0.2.0"
16+
log = "0.4"
17+
macros = { path = "../../util/macros" }
18+
num = { version = "0.1", default-features = false, features = ["bigint"] }
19+
parity-bytes = "0.1"
20+
parity-crypto = "0.4.0"
21+
22+
[dev-dependencies]
23+
hex-literal = "0.2.1"

0 commit comments

Comments
 (0)