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

Extract spec to own crate#10978

Merged
sorpaas merged 83 commits into
masterfrom
dp/chore/extract-spec-from-ethcore
Aug 23, 2019
Merged

Extract spec to own crate#10978
sorpaas merged 83 commits into
masterfrom
dp/chore/extract-spec-from-ethcore

Conversation

@dvdplm
Copy link
Copy Markdown
Collaborator

@dvdplm dvdplm commented Aug 16, 2019 •
edited
Loading

Move the engine spec management code outside of ethcore. Nothing much to see here, it's mostly just reshuffling code and fixing imports.

Based on #10966.

dvdplm added 30 commits August 6, 2019 18:33
@dvdplm
Add client-traits crate
ddeef45 
Move the BlockInfo trait to new crate
@dvdplm
New crate machine
0d49c45 
Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code.
@dvdplm
Use new machine and client-traits crates in ethcore
0465e6b
@dvdplm
Use new crates machine and client-traits instead of ethcore where app…
50ca45a 
…ropriate
@dvdplm
Fix tests
29d4095
@dvdplm
Don't re-export so many types from ethcore::client
cd6e0e2
@dvdplm
Fixing more fallout from removing re-export
2477cbd
@dvdplm
Merge branch 'master' into dp/chore/move-machine-to-own-crate
51ba2f4 
* master:
  Allow default block parameter to be blockHash (#10932)
  Enable sealing when engine is ready (#10938)
  Fix some warnings and typos. (#10941)
@dvdplm
fix test
c84a01f
@dvdplm
More fallout from not re-exporting types
f2497f4
@dvdplm
Add some docs
1e43534
@dvdplm
cleanup
6d83cf2
@dvdplm
import the macro edition style
e04d188
@dvdplm
Merge branch 'master' into dp/chore/move-machine-to-own-crate
b6e91de 
* master:
  unify loading spec && further spec cleanups (#10948)
  refactor: Refactor evmbin CLI (#10742)
  journaldb changes (#10929)
@dvdplm
Tweak docs
bac7268
@dvdplm
Add missing import
978eb88
@dvdplm
Merge branch 'master' into dp/chore/move-machine-to-own-crate
d6273a7 
* master:
  Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953)
@dvdplm
remove unused ethabi_derive imports
18d6a94
@dvdplm
Use latest ethabi-contract
d5700d9
@dvdplm
Move many traits from ethcore/client/traits to client-traits crate
83bb140 
Initial version of extracted Engine trait
@dvdplm
Move snapshot related traits to the engine crate (eew)
d96fff3
@dvdplm
Move a few snapshot related types to common_types
33aa152 
Cleanup Executed as exported from machine crate
@dvdplm
fix warning
9b70856
@dvdplm
Gradually introduce new engine crate: snapshot
f76e5ed
@dvdplm
ethcore typechecks with new engine crate
5b3a8ca
@dvdplm
Sort out types outside ethcore
cecd69c
@dvdplm
Add an EpochVerifier to ethash and use that in Engine.epoch_verifier()
c5ab534 
Cleanup
@dvdplm
Document pub members
45c0497
@dvdplm
Sort out tests
b11a21f 
Sort out default impls for EpochVerifier
@dvdplm
Add test-helpers feature and move EngineSigner impl to the right place
af485cc
@dvdplm dvdplm requested review from debris and ordian August 21, 2019 05:33
dvdplm and others added 3 commits August 21, 2019 09:04
@dvdplm @tomusdrw
Update ethcore/block-reward/Cargo.toml
fbe0365 
Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
@dvdplm @tomusdrw
Update ethcore/engines/basic-authority/Cargo.toml
fdd35c7 
Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
@dvdplm @tomusdrw
Update ethcore/engines/ethash/Cargo.toml
0be9f98 
Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
@dvdplm dvdplm mentioned this pull request Aug 21, 2019
Merged
dvdplm and others added 3 commits August 21, 2019 09:25
@dvdplm @tomusdrw
Update ethcore/engines/clique/src/lib.rs
8fc5929 
Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
@dvdplm
signers is already a ref
8077b51
@dvdplm
Add an EngineType enum to tighten up Engine.name()
7f5c4d3
@dvdplm dvdplm mentioned this pull request Aug 21, 2019
Merged
dvdplm and others added 10 commits August 21, 2019 13:46
@dvdplm
Introduce Snapshotting enum to distinguish the type of snapshots a ch…
a22870d 
…ain uses
@dvdplm
Rename supports_warp to snapshot_mode
791e99a
@dvdplm
Missing import
77e76f1
@dvdplm @tomusdrw
Update ethcore/src/snapshot/consensus/mod.rs
ad35cb1 
Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>
@dvdplm
Merge branch 'master' into dp/chore/extract-clique
081e40e 
* master:
  Add a 2/3 quorum option to Authority Round. (#10909)
  Fix rlp decode for inline trie nodes. (#10980)
  Private contract migration and offchain state sync (#10748)
  manual publish jobs for releases, no changes for nightlies (#10977)
@dvdplm
Merge branch 'master' into dp/chore/extract-clique
792e84e 
* master:
  Configuration map of block reward contract addresses (#10875)
@dvdplm
Merge branch 'dp/chore/extract-clique' into dp/chore/extract-spec-fro…
70a5f87 
…m-ethcore

* dp/chore/extract-clique:
  Configuration map of block reward contract addresses (#10875)
  Update ethcore/src/snapshot/consensus/mod.rs
  Add a 2/3 quorum option to Authority Round. (#10909)
  Missing import
  Rename supports_warp to snapshot_mode
  Introduce Snapshotting enum to distinguish the type of snapshots a chain uses
  Add an EngineType enum to tighten up Engine.name()
  signers is already a ref
  Update ethcore/engines/clique/src/lib.rs
  Update ethcore/engines/ethash/Cargo.toml
  Update ethcore/engines/basic-authority/Cargo.toml
  Update ethcore/block-reward/Cargo.toml
@dvdplm
missing import
94c0a67
@dvdplm
Fix import
567d96c
@dvdplm
Merge branch 'master' into dp/chore/extract-spec-from-ethcore
c49895c 
* master:
  Extract engines to own crates (#10966)
ordian
ordian approved these changes Aug 22, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@ordian ordian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work!

Comment thread ethcore/executive-state/src/lib.rs Outdated
@ordian ordian added this to the 2.7 milestone Aug 22, 2019
@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 22, 2019
grbIzl
grbIzl approved these changes Aug 23, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@grbIzl grbIzl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@sorpaas sorpaas merged commit fbf425c into master Aug 23, 2019
@sorpaas sorpaas deleted the dp/chore/extract-spec-from-ethcore branch August 23, 2019 13:33
dvdplm added a commit that referenced this pull request Aug 25, 2019
@dvdplm
Merge branch 'master' into dp/chore/sort-out-ClientIoMessage
3ca11c0 
* master:
  Extract spec to own crate (#10978)
  EIP 2028: transaction gas lowered from 68 to 16 (#10987)
dvdplm added a commit that referenced this pull request Aug 25, 2019
@dvdplm
Merge branch 'dp/chore/sort-out-ClientIoMessage' into dp/feature/eip-…
55e74fe 
…1344-add-ChainID-opcode

* dp/chore/sort-out-ClientIoMessage:
  Extract spec to own crate (#10978)
  EIP 2028: transaction gas lowered from 68 to 16 (#10987)
  Fix merge problem
  double semi
  Extract engines to own crates (#10966)
  Fix import
  missing import
  Configuration map of block reward contract addresses (#10875)
  Update ethcore/src/snapshot/consensus/mod.rs
  Add a 2/3 quorum option to Authority Round. (#10909)
  Missing import
  Rename supports_warp to snapshot_mode
  Introduce Snapshotting enum to distinguish the type of snapshots a chain uses
  Add an EngineType enum to tighten up Engine.name()
  signers is already a ref
  Update ethcore/engines/clique/src/lib.rs
  Update ethcore/engines/ethash/Cargo.toml
  Update ethcore/engines/basic-authority/Cargo.toml
  Update ethcore/block-reward/Cargo.toml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@debris debris Awaiting requested review from debris

2 more reviewers

@ordian ordian ordian approved these changes

@grbIzl grbIzl grbIzl approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@dvdplm dvdplm

Labels

A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.

Projects

None yet

Milestone

2.7

Development

Successfully merging this pull request may close these issues.

4 participants

@dvdplm @ordian @grbIzl @sorpaas