EIP-1344 Add CHAINID op-code #10983

dvdplm · 2019-08-21T10:50:19Z

Based on #10978

Move the BlockInfo trait to new crate

Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code.

…ropriate

* master: Allow default block parameter to be blockHash (#10932) Enable sealing when engine is ready (#10938) Fix some warnings and typos. (#10941)

* master: unify loading spec && further spec cleanups (#10948) refactor: Refactor evmbin CLI (#10742) journaldb changes (#10929)

* master: Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953)

Initial version of extracted Engine trait

Cleanup Executed as exported from machine crate

Cleanup

Sort out default impls for EpochVerifier

* master: Make ClientIoMessage generic over the Client (#10981) bump spin to 0.5.2 (#10996) fix compile warnings (#10993) Fix compilation on recent nightlies (#10991) [ipfs] Convert to edition 2018 (#10979)

dvdplm · 2019-08-28T08:28:23Z

@sorpaas rebased, should be easier to review now.

ethcore/vm/src/schedule.rs

Co-Authored-By: Andronik Ordian <write@reusable.software>

…aritytech/parity-ethereum into dp/feature/eip-1344-add-ChainID-opcode * 'dp/feature/eip-1344-add-ChainID-opcode' of github.com:paritytech/parity-ethereum: Update ethcore/vm/src/schedule.rs

ordian

LGTM

ordian · 2019-08-28T09:46:14Z

ethcore/evm/src/tests.rs

+	// 7f       PUSH32 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+	// 01       ADD
+	// 60 00    PUSH 0
+	// 55       SSTORE


Would be nice to have a macro/builder for bytecode instead of having comments, but that's outside of the scope of the PR.

In the meantime https://ethervm.io/decompile can be helpful.

sorpaas · 2019-08-28T14:15:00Z

ethcore/machine/src/externalities.rs

@@ -416,6 +416,10 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		self.env_info
 	}

+	fn chain_id(&self) -> u64 {
+		self.machine.params().chain_id


Just a note that this has the behavior that if EIP-155 is not enabled on a chain, its CHAIN_ID will instead return the network id. This is never specified in EIP-1344, but looks like acceptable behavior for now.

…ndent-ops * master: xDai chain support and nodes list update (#10989) [trace] check mem diff within range (#11002) EIP-1344 Add CHAINID op-code (#10983)

* master: EIP 1884 Re-pricing of trie-size dependent operations (openethereum#10992) xDai chain support and nodes list update (openethereum#10989) [trace] check mem diff within range (openethereum#11002) EIP-1344 Add CHAINID op-code (openethereum#10983) Make ClientIoMessage generic over the Client (openethereum#10981) bump spin to 0.5.2 (openethereum#10996) fix compile warnings (openethereum#10993)

* add more tx tests (#11038) * Fix parallel transactions race-condition (#10995) * Add blake2_f precompile (#11017) * [trace] introduce trace failed to Ext (#11019) * Edit publish-onchain.sh to use https (#11016) * Fix deadlock in network-devp2p (#11013) * EIP 1108: Reduce alt_bn128 precompile gas costs (#11008) * xDai chain support and nodes list update (#10989) * EIP 2028: transaction gas lowered from 68 to 16 (#10987) * EIP-1344 Add CHAINID op-code (#10983) * manual publish jobs for releases, no changes for nightlies (#10977) * [blooms-db] Fix benchmarks (#10974) * Verify transaction against its block during import (#10954) * Better error message for rpc gas price errors (#10931) * Fix fork choice (#10837) * Fix compilation on recent nightlies (#10991)

* add more tx tests (#11038) * Fix parallel transactions race-condition (#10995) * Add blake2_f precompile (#11017) * [trace] introduce trace failed to Ext (#11019) * Edit publish-onchain.sh to use https (#11016) * Fix deadlock in network-devp2p (#11013) * EIP 1108: Reduce alt_bn128 precompile gas costs (#11008) * xDai chain support and nodes list update (#10989) * EIP 2028: transaction gas lowered from 68 to 16 (#10987) * EIP-1344 Add CHAINID op-code (#10983) * manual publish jobs for releases, no changes for nightlies (#10977) * [blooms-db] Fix benchmarks (#10974) * Verify transaction against its block during import (#10954) * Better error message for rpc gas price errors (#10931) * tx-pool: accept local tx with higher gas price when pool full (#10901) * Fix fork choice (#10837) * Cleanup unused vm dependencies (#10787) * Fix compilation on recent nightlies (#10991)

dvdplm added 30 commits August 6, 2019 18:33

Add client-traits crate

ddeef45

Move the BlockInfo trait to new crate

New crate machine

0d49c45

Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code.

Use new machine and client-traits crates in ethcore

0465e6b

Use new crates machine and client-traits instead of ethcore where app…

50ca45a

…ropriate

Fix tests

29d4095

Don't re-export so many types from ethcore::client

cd6e0e2

Fixing more fallout from removing re-export

2477cbd

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)

fix test

c84a01f

More fallout from not re-exporting types

f2497f4

Add some docs

1e43534

cleanup

6d83cf2

import the macro edition style

e04d188

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)

Tweak docs

bac7268

Add missing import

978eb88

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)

remove unused ethabi_derive imports

18d6a94

Use latest ethabi-contract

d5700d9

Move many traits from ethcore/client/traits to client-traits crate

83bb140

Initial version of extracted Engine trait

Move snapshot related traits to the engine crate (eew)

d96fff3

Move a few snapshot related types to common_types

33aa152

Cleanup Executed as exported from machine crate

fix warning

9b70856

Gradually introduce new engine crate: snapshot

f76e5ed

ethcore typechecks with new engine crate

5b3a8ca

Sort out types outside ethcore

cecd69c

Add an EpochVerifier to ethash and use that in Engine.epoch_verifier()

c5ab534

Cleanup

Document pub members

45c0497

Sort out tests

b11a21f

Sort out default impls for EpochVerifier

Add test-helpers feature and move EngineSigner impl to the right place

af485cc

dvdplm mentioned this pull request Aug 27, 2019

EIP 1884 Re-pricing of trie-size dependent operations #10992

Merged

Merge branch 'master' into dp/feature/eip-1344-add-ChainID-opcode

e28fce7

* master: Make ClientIoMessage generic over the Client (#10981) bump spin to 0.5.2 (#10996) fix compile warnings (#10993) Fix compilation on recent nightlies (#10991) [ipfs] Convert to edition 2018 (#10979)

dvdplm added 2 commits August 28, 2019 10:38

merge conflict error

21980e8

Fix a few warnings

d61a8fd

ordian reviewed Aug 28, 2019

View reviewed changes

ethcore/vm/src/schedule.rs Outdated Show resolved Hide resolved

dvdplm and others added 3 commits August 28, 2019 10:44

Update ethcore/vm/src/schedule.rs

b37cfff

Co-Authored-By: Andronik Ordian <write@reusable.software>

more merge fallout

fb67175

Merge branch 'dp/feature/eip-1344-add-ChainID-opcode' of github.com:p…

df61eb6

…aritytech/parity-ethereum into dp/feature/eip-1344-add-ChainID-opcode * 'dp/feature/eip-1344-add-ChainID-opcode' of github.com:paritytech/parity-ethereum: Update ethcore/vm/src/schedule.rs

dvdplm requested a review from ordian August 28, 2019 09:42

ordian approved these changes Aug 28, 2019

View reviewed changes

ordian added A8-looksgood 🦄 Pull request is reviewed well. B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. B1-patch-beta 🕷🕷 M4-core ⛓ Core client code / Rust. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 28, 2019

ordian added this to the 2.7 milestone Aug 28, 2019

sorpaas reviewed Aug 28, 2019

View reviewed changes

sorpaas approved these changes Aug 28, 2019

View reviewed changes

sorpaas merged commit 5ce249a into master Aug 28, 2019

ordian deleted the dp/feature/eip-1344-add-ChainID-opcode branch August 29, 2019 11:20

dvdplm added a commit that referenced this pull request Sep 11, 2019

Manual port of #10983

453b6a0

s3krit pushed a commit that referenced this pull request Sep 11, 2019

Manual port of #10983

3b9747e

This was referenced Sep 12, 2019

v2.6.3-beta #11040

Merged

v2.5.8-stable #11041

Merged

leonprou mentioned this pull request Feb 7, 2021

Support of "EIP-1344: ChainID opcode" fuseio/fuse-network#95

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EIP-1344 Add CHAINID op-code #10983

EIP-1344 Add CHAINID op-code #10983

dvdplm commented Aug 21, 2019 •

edited

Loading

dvdplm commented Aug 28, 2019

ordian left a comment

ordian Aug 28, 2019

dvdplm Aug 28, 2019

sorpaas Aug 28, 2019

EIP-1344 Add CHAINID op-code #10983

EIP-1344 Add CHAINID op-code #10983

Conversation

dvdplm commented Aug 21, 2019 • edited Loading

dvdplm commented Aug 28, 2019

ordian left a comment

Choose a reason for hiding this comment

ordian Aug 28, 2019

Choose a reason for hiding this comment

dvdplm Aug 28, 2019

Choose a reason for hiding this comment

sorpaas Aug 28, 2019

Choose a reason for hiding this comment

dvdplm commented Aug 21, 2019 •

edited

Loading