grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EIP-1344 Add CHAINID op-code (#10983)

Browse Source 
* Add client-traits crate
Move the BlockInfo trait to new crate

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

* Use new machine and client-traits crates in ethcore

* Use new crates machine and client-traits instead of ethcore where appropriate

* Fix tests

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

* Fixing more fallout from removing re-export

* fix test

* More fallout from not re-exporting types

* Add some docs

* cleanup

* import the macro edition style

* Tweak docs

* Add missing import

* remove unused ethabi_derive imports

* Use latest ethabi-contract

* Move many traits from ethcore/client/traits to client-traits crate
Initial version of extracted Engine trait

* Move snapshot related traits to the engine crate (eew)

* Move a few snapshot related types to common_types
Cleanup Executed as exported from machine crate

* fix warning

* Gradually introduce new engine crate: snapshot

* ethcore typechecks with new engine crate

* Sort out types outside ethcore

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

* Document pub members

* Sort out tests
Sort out default impls for EpochVerifier

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

* Sort out tests

* Sort out tests and refactor verification types

* Fix missing traits

* More missing traits
Fix Histogram

* Fix tests and cleanup

* cleanup

* Put back needed logger import

* Don't rexport common_types from ethcore/src/client
Don't export ethcore::client::*

* Remove files no longer used
Use types from the engine crate
Explicit exports from engine::engine

* Get rid of itertools

* Move a few more traits from ethcore to client-traits: BlockChainReset, ScheduleInfo, StateClient

* Move ProvingBlockChainClient to client-traits

* Don't re-export ForkChoice and Transition from ethcore

* Address grumbles: sort imports, remove commented out code

* Fix merge resolution error

* Extract the Clique engine to own crate

* Extract NullEngine and the block_reward module from ethcore

* Extract InstantSeal engine to own crate

* Extract remaining engines

* Extract executive_state to own crate so it can be used by engine crates

* Remove snapshot stuff from the engine crate

* Put snapshot traits back in ethcore

* cleanup

* Remove stuff from ethcore

* Don't use itertools

* itertools in aura is legit-ish

* More post-merge fixes

* Re-export less types in client

* cleanup

* Extract spec to own crate

* Put back the test-helpers from basic-authority

* Fix ethcore benchmarks

* Reduce the public api of ethcore/verification

* WIP

* Add Cargo.toml

* Fix compilation outside ethcore

* Audit uses of import_verified_blocks() and remove unneeded calls
Cleanup

* cleanup

* Remove unused imports from ethcore

* Cleanup

* remove double semi-colons

* Add missing generic param

* More missing generics

* Update ethcore/block-reward/Cargo.toml

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* Update ethcore/engines/basic-authority/Cargo.toml

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* Update ethcore/engines/ethash/Cargo.toml

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* Update ethcore/engines/clique/src/lib.rs

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* signers is already a ref

* Add an EngineType enum to tighten up Engine.name()

* Add CHAINID opcode

* Introduce Snapshotting enum to distinguish the type of snapshots a chain uses

* Rename supports_warp to snapshot_mode

* Missing import

* Add chain_id wherever we instantiate EnvInfo

* more missing chain_id

* Tell serde to ignore the chain_id field on Env

* Update ethcore/src/snapshot/consensus/mod.rs

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* Use the chain_id from the machine by adding chain_id() to the Ext trait

* cleanup

* add missing impl
cleanup

* missing import

* Fix import

* Add transition marker for EIP 1344

* double semi

* Fix merge problem

* cleanup

* merge conflict error

* Fix a few warnings

* Update ethcore/vm/src/schedule.rs

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

* more merge fallout
This commit is contained in:
David 2019-08-28 16:15:50 +02:00 committed by Wei Tang
parent cd26526868
commit 5ce249ac64
19 changed files with 278 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Cargo.lock generated
View File

@ -1631,6 +1631,7 @@ dependencies = [
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ethereum-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethereum-types 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-hash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1956,6 +1957,23 @@ dependencies = [
"unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "hex-literal"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"hex-literal-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "hex-literal-impl"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "hmac" name = "hmac"
version = "0.7.0" version = "0.7.0"
@ -3563,6 +3581,16 @@ dependencies = [
"toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "proc-macro-hack"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "0.4.20" version = "0.4.20"
@ -3571,6 +3599,14 @@ dependencies = [
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "proc-macro2"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "pulldown-cmark" name = "pulldown-cmark"
version = "0.0.3" version = "0.0.3"
@ -3623,6 +3659,14 @@ dependencies = [
"proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "quote"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.3.22" version = "0.3.22"
@ -4302,6 +4346,16 @@ dependencies = [
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "syn"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "synom" name = "synom"
version = "0.11.3" version = "0.11.3"
@ -4840,6 +4894,11 @@ name = "unicode-xid"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-xid"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "unreachable" name = "unreachable"
version = "1.0.0" version = "1.0.0"
@ -5288,6 +5347,8 @@ dependencies = [
"checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a" "checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a"
"checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
"checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82" "checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82"
"checksum hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3da68162fdd2147e66682e78e729bd77f93b4c99656db058c5782d8c6b6225a"
"checksum hex-literal-impl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06095d08c7c05760f11a071b3e1d4c5b723761c01bd8d7201c30a9536668a612"
"checksum hmac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f127a908633569f208325f86f71255d3363c79721d7f9fe31cd5569908819771" "checksum hmac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f127a908633569f208325f86f71255d3363c79721d7f9fe31cd5569908819771"
"checksum home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80dff82fb58cfbbc617fb9a9184b010be0529201553cda50ad04372bc2333aff" "checksum home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80dff82fb58cfbbc617fb9a9184b010be0529201553cda50ad04372bc2333aff"
"checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a" "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
@ -5410,12 +5471,15 @@ dependencies = [
"checksum primal-sieve 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "da2d6ed369bb4b0273aeeb43f07c105c0117717cbae827b20719438eb2eb798c" "checksum primal-sieve 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "da2d6ed369bb4b0273aeeb43f07c105c0117717cbae827b20719438eb2eb798c"
"checksum primitive-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2288eb2a39386c4bc817974cc413afe173010dc80e470fcb1e9a35580869f024" "checksum primitive-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2288eb2a39386c4bc817974cc413afe173010dc80e470fcb1e9a35580869f024"
"checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" "checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
"checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"
"checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee" "checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee"
"checksum proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5c2380ae88876faae57698be9e9775e3544decad214599c3a6266cca6ac802"
"checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" "checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
"checksum pwasm-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9135bed7b452e20dbb395a2d519abaf0c46d60e7ecc02daeeab447d29bada1" "checksum pwasm-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e9135bed7b452e20dbb395a2d519abaf0c46d60e7ecc02daeeab447d29bada1"
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5" "checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
@ -5489,6 +5553,7 @@ dependencies = [
"checksum subtle 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01dca13cf6c3b179864ab3292bd794e757618d35a7766b7c46050c614ba00829" "checksum subtle 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01dca13cf6c3b179864ab3292bd794e757618d35a7766b7c46050c614ba00829"
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
"checksum syn 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "158521e6f544e7e3dcfc370ac180794aa38cb34a1b1e07609376d4adcf429b93"
"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
"checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
@ -5543,6 +5608,7 @@ dependencies = [
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6" "checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"

2
ethcore/engines/validator-set/src/safe_contract.rs
View File

@ -115,7 +115,7 @@ fn check_first_proof(machine: &Machine, contract_address: Address, old_header: H
gas_limit: PROVIDED_GAS.into(), gas_limit: PROVIDED_GAS.into(),
timestamp: old_header.timestamp(), timestamp: old_header.timestamp(),
last_hashes: { last_hashes: {
// this will break if we don't inclue all 256 last hashes. // this will break if we don't include all 256 last hashes.
let mut last_hashes: Vec<_> = (0..256).map(|_| H256::zero()).collect(); let mut last_hashes: Vec<_> = (0..256).map(|_| H256::zero()).collect();
last_hashes[255] = *old_header.parent_hash(); last_hashes[255] = *old_header.parent_hash();
Arc::new(last_hashes) Arc::new(last_hashes)

1
ethcore/evm/Cargo.toml
View File

@ -19,6 +19,7 @@ memory-cache = { path = "../../util/memory-cache" }
[dev-dependencies] [dev-dependencies]
rustc-hex = "1.0" rustc-hex = "1.0"
criterion = "0.2" criterion = "0.2"
hex-literal = "0.2.0"
[features] [features]
evm-debug = [] evm-debug = []

2
ethcore/evm/src/factory.rs
View File

@ -47,7 +47,7 @@ impl Factory {
/// for caching jump destinations. /// for caching jump destinations.
pub fn new(evm: VMType, cache_size: usize) -> Self { pub fn new(evm: VMType, cache_size: usize) -> Self {
Factory { Factory {
evm: evm, evm,
evm_cache: Arc::new(SharedCache::new(cache_size)), evm_cache: Arc::new(SharedCache::new(cache_size)),
} }
} }

10
ethcore/evm/src/instructions.rs
View File

@ -149,6 +149,8 @@ enum_with_from_u8! {
DIFFICULTY = 0x44, DIFFICULTY = 0x44,
#[doc = "get the block's gas limit"] #[doc = "get the block's gas limit"]
GASLIMIT = 0x45, GASLIMIT = 0x45,
#[doc = "get chain ID"]
CHAINID = 0x46,
#[doc = "remove item from stack"] #[doc = "remove item from stack"]
POP = 0x50, POP = 0x50,
@ -442,12 +444,7 @@ pub struct InstructionInfo {
impl InstructionInfo { impl InstructionInfo {
/// Create new instruction info. /// Create new instruction info.
pub fn new(name: &'static str, args: usize, ret: usize, tier: GasPriceTier) -> Self { pub fn new(name: &'static str, args: usize, ret: usize, tier: GasPriceTier) -> Self {
InstructionInfo { InstructionInfo { name, args, ret, tier }
name: name,
args: args,
ret: ret,
tier: tier
}
} }
} }
@ -504,6 +501,7 @@ lazy_static! {
arr[NUMBER as usize] = Some(InstructionInfo::new("NUMBER", 0, 1, GasPriceTier::Base)); arr[NUMBER as usize] = Some(InstructionInfo::new("NUMBER", 0, 1, GasPriceTier::Base));
arr[DIFFICULTY as usize] = Some(InstructionInfo::new("DIFFICULTY", 0, 1, GasPriceTier::Base)); arr[DIFFICULTY as usize] = Some(InstructionInfo::new("DIFFICULTY", 0, 1, GasPriceTier::Base));
arr[GASLIMIT as usize] = Some(InstructionInfo::new("GASLIMIT", 0, 1, GasPriceTier::Base)); arr[GASLIMIT as usize] = Some(InstructionInfo::new("GASLIMIT", 0, 1, GasPriceTier::Base));
arr[CHAINID as usize] = Some(InstructionInfo::new("CHAINID", 0, 1, GasPriceTier::Base));
arr[POP as usize] = Some(InstructionInfo::new("POP", 1, 0, GasPriceTier::Base)); arr[POP as usize] = Some(InstructionInfo::new("POP", 1, 0, GasPriceTier::Base));
arr[MLOAD as usize] = Some(InstructionInfo::new("MLOAD", 1, 1, GasPriceTier::VeryLow)); arr[MLOAD as usize] = Some(InstructionInfo::new("MLOAD", 1, 1, GasPriceTier::VeryLow));
arr[MSTORE as usize] = Some(InstructionInfo::new("MSTORE", 2, 0, GasPriceTier::VeryLow)); arr[MSTORE as usize] = Some(InstructionInfo::new("MSTORE", 2, 0, GasPriceTier::VeryLow));

6
ethcore/evm/src/interpreter/mod.rs
View File

@ -428,7 +428,8 @@ impl<Cost: CostType> Interpreter<Cost> {
((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) || ((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) ||
(instruction == instructions::REVERT && !schedule.have_revert) || (instruction == instructions::REVERT && !schedule.have_revert) ||
((instruction == instructions::SHL || instruction == instructions::SHR || instruction == instructions::SAR) && !schedule.have_bitwise_shifting) || ((instruction == instructions::SHL || instruction == instructions::SHR || instruction == instructions::SAR) && !schedule.have_bitwise_shifting) ||
(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash) (instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash) ||
(instruction == instructions::CHAINID && !schedule.have_chain_id)
{ {
return Err(vm::Error::BadInstruction { return Err(vm::Error::BadInstruction {
instruction: instruction as u8 instruction: instruction as u8
@ -843,6 +844,9 @@ impl<Cost: CostType> Interpreter<Cost> {
instructions::GASLIMIT => { instructions::GASLIMIT => {
self.stack.push(ext.env_info().gas_limit.clone()); self.stack.push(ext.env_info().gas_limit.clone());
}, },
instructions::CHAINID => {
self.stack.push(ext.chain_id().into())
},
// Stack instructions // Stack instructions

2
ethcore/evm/src/lib.rs
View File

@ -33,6 +33,8 @@ extern crate log;
#[cfg(test)] #[cfg(test)]
extern crate rustc_hex; extern crate rustc_hex;
#[cfg(test)]
extern crate hex_literal;
pub mod evm; pub mod evm;
pub mod interpreter; pub mod interpreter;

274
ethcore/evm/src/tests.rs
View File

@ -19,17 +19,22 @@ use std::str::FromStr;
use std::hash::Hash; use std::hash::Hash;
use std::sync::Arc; use std::sync::Arc;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use rustc_hex::FromHex;
use ethereum_types::{U256, H256, Address}; use ethereum_types::{U256, H256, Address};
use vm::{self, ActionParams, ActionValue, Ext}; use vm::{self, ActionParams, ActionValue, Ext};
use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize}; use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
use factory::Factory; use factory::Factory;
use vmtype::VMType; use vmtype::VMType;
use hex_literal::hex;
evm_test!{test_add: test_add_int} evm_test!{test_add: test_add_int}
fn test_add(factory: super::Factory) { fn test_add(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055".from_hex().unwrap(); // 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
// 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
let code = hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -49,7 +54,12 @@ fn test_add(factory: super::Factory) {
evm_test!{test_sha3: test_sha3_int} evm_test!{test_sha3: test_sha3_int}
fn test_sha3(factory: super::Factory) { fn test_sha3(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "6000600020600055".from_hex().unwrap(); // 60 00 PUSH 0
// 60 00 PUSH 0
// 20 SHA3
// 60 00 PUSH 0
// 55 SSTORE
let code = hex!("6000600020600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -69,7 +79,10 @@ fn test_sha3(factory: super::Factory) {
evm_test!{test_address: test_address_int} evm_test!{test_address: test_address_int}
fn test_address(factory: super::Factory) { fn test_address(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "30600055".from_hex().unwrap(); // 30 ADDRESS
// 60 00 PUSH 0
// 55 SSTORE
let code = hex!("30600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -90,7 +103,10 @@ evm_test!{test_origin: test_origin_int}
fn test_origin(factory: super::Factory) { fn test_origin(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let origin = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap(); let origin = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
let code = "32600055".from_hex().unwrap(); // 32 ORIGIN
// 60 00 PUSH 0
// 55 SSTORE
let code = hex!("32600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -112,7 +128,10 @@ evm_test!{test_sender: test_sender_int}
fn test_sender(factory: super::Factory) { fn test_sender(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let sender = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap(); let sender = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
let code = "33600055".from_hex().unwrap(); // 33 CALLER
// 60 00 PUSH 0
// 55 SSTORE
let code = hex!("33600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -130,6 +149,27 @@ fn test_sender(factory: super::Factory) {
assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681"); assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
} }
evm_test!{test_chain_id: test_chain_id_int}
fn test_chain_id(factory: super::Factory) {
// 46 CHAINID
// 60 00 PUSH 0
// 55 SSTORE
let code = hex!("46 60 00 55").to_vec();
let mut params = ActionParams::default();
params.gas = U256::from(100_000);
params.code = Some(Arc::new(code));
let mut ext = FakeExt::new_istanbul().with_chain_id(9);
let gas_left = {
let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
};
assert_eq!(gas_left, U256::from(79_995));
assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000009");
}
evm_test!{test_extcodecopy: test_extcodecopy_int} evm_test!{test_extcodecopy: test_extcodecopy_int}
fn test_extcodecopy(factory: super::Factory) { fn test_extcodecopy(factory: super::Factory) {
// 33 - sender // 33 - sender
@ -145,8 +185,8 @@ fn test_extcodecopy(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let sender = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap(); let sender = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
let code = "333b60006000333c600051600055".from_hex().unwrap(); let code = hex!("333b60006000333c600051600055").to_vec();
let sender_code = "6005600055".from_hex().unwrap(); let sender_code = hex!("6005600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -168,7 +208,7 @@ fn test_extcodecopy(factory: super::Factory) {
evm_test!{test_log_empty: test_log_empty_int} evm_test!{test_log_empty: test_log_empty_int}
fn test_log_empty(factory: super::Factory) { fn test_log_empty(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "60006000a0".from_hex().unwrap(); let code = hex!("60006000a0").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -199,7 +239,7 @@ fn test_log_sender(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap(); let sender = Address::from_str("cd1722f3947def4cf144679da39c4c32bdc35681").unwrap();
let code = "60ff6000533360206000a1".from_hex().unwrap(); let code = hex!("60ff6000533360206000a1").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -217,13 +257,13 @@ fn test_log_sender(factory: super::Factory) {
assert_eq!(ext.logs.len(), 1); assert_eq!(ext.logs.len(), 1);
assert_eq!(ext.logs[0].topics.len(), 1); assert_eq!(ext.logs[0].topics.len(), 1);
assert_eq!(ext.logs[0].topics[0], H256::from_str("000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681").unwrap()); assert_eq!(ext.logs[0].topics[0], H256::from_str("000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681").unwrap());
assert_eq!(ext.logs[0].data, "ff00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()); assert_eq!(ext.logs[0].data, hex!("ff00000000000000000000000000000000000000000000000000000000000000").to_vec());
} }
evm_test!{test_blockhash: test_blockhash_int} evm_test!{test_blockhash: test_blockhash_int}
fn test_blockhash(factory: super::Factory) { fn test_blockhash(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "600040600055".from_hex().unwrap(); let code = hex!("600040600055").to_vec();
let blockhash = H256::from_str("123400000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681").unwrap(); let blockhash = H256::from_str("123400000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
@ -245,8 +285,8 @@ fn test_blockhash(factory: super::Factory) {
evm_test!{test_calldataload: test_calldataload_int} evm_test!{test_calldataload: test_calldataload_int}
fn test_calldataload(factory: super::Factory) { fn test_calldataload(factory: super::Factory) {
let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "600135600055".from_hex().unwrap(); let code = hex!("600135600055").to_vec();
let data = "0123ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23".from_hex().unwrap(); let data = hex!("0123ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.address = address.clone(); params.address = address.clone();
@ -267,7 +307,7 @@ fn test_calldataload(factory: super::Factory) {
evm_test!{test_author: test_author_int} evm_test!{test_author: test_author_int}
fn test_author(factory: super::Factory) { fn test_author(factory: super::Factory) {
let author = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap(); let author = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
let code = "41600055".from_hex().unwrap(); let code = hex!("41600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -287,7 +327,7 @@ fn test_author(factory: super::Factory) {
evm_test!{test_timestamp: test_timestamp_int} evm_test!{test_timestamp: test_timestamp_int}
fn test_timestamp(factory: super::Factory) { fn test_timestamp(factory: super::Factory) {
let timestamp = 0x1234; let timestamp = 0x1234;
let code = "42600055".from_hex().unwrap(); let code = hex!("42600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -307,7 +347,7 @@ fn test_timestamp(factory: super::Factory) {
evm_test!{test_number: test_number_int} evm_test!{test_number: test_number_int}
fn test_number(factory: super::Factory) { fn test_number(factory: super::Factory) {
let number = 0x1234; let number = 0x1234;
let code = "43600055".from_hex().unwrap(); let code = hex!("43600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -327,7 +367,7 @@ fn test_number(factory: super::Factory) {
evm_test!{test_difficulty: test_difficulty_int} evm_test!{test_difficulty: test_difficulty_int}
fn test_difficulty(factory: super::Factory) { fn test_difficulty(factory: super::Factory) {
let difficulty = U256::from(0x1234); let difficulty = U256::from(0x1234);
let code = "44600055".from_hex().unwrap(); let code = hex!("44600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -347,7 +387,7 @@ fn test_difficulty(factory: super::Factory) {
evm_test!{test_gas_limit: test_gas_limit_int} evm_test!{test_gas_limit: test_gas_limit_int}
fn test_gas_limit(factory: super::Factory) { fn test_gas_limit(factory: super::Factory) {
let gas_limit = U256::from(0x1234); let gas_limit = U256::from(0x1234);
let code = "45600055".from_hex().unwrap(); let code = hex!("45600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -366,7 +406,7 @@ fn test_gas_limit(factory: super::Factory) {
evm_test!{test_mul: test_mul_int} evm_test!{test_mul: test_mul_int}
fn test_mul(factory: super::Factory) { fn test_mul(factory: super::Factory) {
let code = "65012365124623626543219002600055".from_hex().unwrap(); let code = hex!("65012365124623626543219002600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -384,7 +424,7 @@ fn test_mul(factory: super::Factory) {
evm_test!{test_sub: test_sub_int} evm_test!{test_sub: test_sub_int}
fn test_sub(factory: super::Factory) { fn test_sub(factory: super::Factory) {
let code = "65012365124623626543219003600055".from_hex().unwrap(); let code = hex!("65012365124623626543219003600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -402,7 +442,7 @@ fn test_sub(factory: super::Factory) {
evm_test!{test_div: test_div_int} evm_test!{test_div: test_div_int}
fn test_div(factory: super::Factory) { fn test_div(factory: super::Factory) {
let code = "65012365124623626543219004600055".from_hex().unwrap(); let code = hex!("65012365124623626543219004600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -420,7 +460,7 @@ fn test_div(factory: super::Factory) {
evm_test!{test_div_zero: test_div_zero_int} evm_test!{test_div_zero: test_div_zero_int}
fn test_div_zero(factory: super::Factory) { fn test_div_zero(factory: super::Factory) {
let code = "6501236512462360009004600055".from_hex().unwrap(); let code = hex!("6501236512462360009004600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -438,7 +478,7 @@ fn test_div_zero(factory: super::Factory) {
evm_test!{test_mod: test_mod_int} evm_test!{test_mod: test_mod_int}
fn test_mod(factory: super::Factory) { fn test_mod(factory: super::Factory) {
let code = "650123651246236265432290066000556501236512462360009006600155".from_hex().unwrap(); let code = hex!("650123651246236265432290066000556501236512462360009006600155").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -457,7 +497,7 @@ fn test_mod(factory: super::Factory) {
evm_test!{test_smod: test_smod_int} evm_test!{test_smod: test_smod_int}
fn test_smod(factory: super::Factory) { fn test_smod(factory: super::Factory) {
let code = "650123651246236265432290076000556501236512462360009007600155".from_hex().unwrap(); let code = hex!("650123651246236265432290076000556501236512462360009007600155").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -476,7 +516,7 @@ fn test_smod(factory: super::Factory) {
evm_test!{test_sdiv: test_sdiv_int} evm_test!{test_sdiv: test_sdiv_int}
fn test_sdiv(factory: super::Factory) { fn test_sdiv(factory: super::Factory) {
let code = "650123651246236265432290056000556501236512462360009005600155".from_hex().unwrap(); let code = hex!("650123651246236265432290056000556501236512462360009005600155").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -495,7 +535,7 @@ fn test_sdiv(factory: super::Factory) {
evm_test!{test_exp: test_exp_int} evm_test!{test_exp: test_exp_int}
fn test_exp(factory: super::Factory) { fn test_exp(factory: super::Factory) {
let code = "6016650123651246230a6000556001650123651246230a6001556000650123651246230a600255".from_hex().unwrap(); let code = hex!("6016650123651246230a6000556001650123651246230a6001556000650123651246230a600255").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -515,7 +555,7 @@ fn test_exp(factory: super::Factory) {
evm_test!{test_comparison: test_comparison_int} evm_test!{test_comparison: test_comparison_int}
fn test_comparison(factory: super::Factory) { fn test_comparison(factory: super::Factory) {
let code = "601665012365124623818181811060005511600155146002556415235412358014600355".from_hex().unwrap(); let code = hex!("601665012365124623818181811060005511600155146002556415235412358014600355").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -536,7 +576,7 @@ fn test_comparison(factory: super::Factory) {
evm_test!{test_signed_comparison: test_signed_comparison_int} evm_test!{test_signed_comparison: test_signed_comparison_int}
fn test_signed_comparison(factory: super::Factory) { fn test_signed_comparison(factory: super::Factory) {
let code = "60106000036010818112600055136001556010601060000381811260025513600355".from_hex().unwrap(); let code = hex!("60106000036010818112600055136001556010601060000381811260025513600355").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -557,7 +597,7 @@ fn test_signed_comparison(factory: super::Factory) {
evm_test!{test_bitops: test_bitops_int} evm_test!{test_bitops: test_bitops_int}
fn test_bitops(factory: super::Factory) { fn test_bitops(factory: super::Factory) {
let code = "60ff610ff08181818116600055176001551860025560008015600355198015600455600555".from_hex().unwrap(); let code = hex!("60ff610ff08181818116600055176001551860025560008015600355198015600455600555").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(150_000); params.gas = U256::from(150_000);
@ -580,7 +620,7 @@ fn test_bitops(factory: super::Factory) {
evm_test!{test_addmod_mulmod: test_addmod_mulmod_int} evm_test!{test_addmod_mulmod: test_addmod_mulmod_int}
fn test_addmod_mulmod(factory: super::Factory) { fn test_addmod_mulmod(factory: super::Factory) {
let code = "60ff60f060108282820860005509600155600060f0601082828208196002550919600355".from_hex().unwrap(); let code = hex!("60ff60f060108282820860005509600155600060f0601082828208196002550919600355").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -601,7 +641,7 @@ fn test_addmod_mulmod(factory: super::Factory) {
evm_test!{test_byte: test_byte_int} evm_test!{test_byte: test_byte_int}
fn test_byte(factory: super::Factory) { fn test_byte(factory: super::Factory) {
let code = "60f061ffff1a600055610fff601f1a600155".from_hex().unwrap(); let code = hex!("60f061ffff1a600055610fff601f1a600155").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -620,7 +660,7 @@ fn test_byte(factory: super::Factory) {
evm_test!{test_signextend: test_signextend_int} evm_test!{test_signextend: test_signextend_int}
fn test_signextend(factory: super::Factory) { fn test_signextend(factory: super::Factory) {
let code = "610fff60020b60005560ff60200b600155".from_hex().unwrap(); let code = hex!("610fff60020b60005560ff60200b600155").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -640,7 +680,7 @@ fn test_signextend(factory: super::Factory) {
#[test] // JIT just returns out of gas #[test] // JIT just returns out of gas
fn test_badinstruction_int() { fn test_badinstruction_int() {
let factory = super::Factory::new(VMType::Interpreter, 1024 * 32); let factory = super::Factory::new(VMType::Interpreter, 1024 * 32);
let code = "af".from_hex().unwrap(); let code = hex!("af").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -660,7 +700,7 @@ fn test_badinstruction_int() {
evm_test!{test_pop: test_pop_int} evm_test!{test_pop: test_pop_int}
fn test_pop(factory: super::Factory) { fn test_pop(factory: super::Factory) {
let code = "60f060aa50600055".from_hex().unwrap(); let code = hex!("60f060aa50600055").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(100_000); params.gas = U256::from(100_000);
@ -678,7 +718,7 @@ fn test_pop(factory: super::Factory) {
evm_test!{test_extops: test_extops_int} evm_test!{test_extops: test_extops_int}
fn test_extops(factory: super::Factory) { fn test_extops(factory: super::Factory) {
let code = "5a6001555836553a600255386003553460045560016001526016590454600555".from_hex().unwrap(); let code = hex!("5a6001555836553a600255386003553460045560016001526016590454600555").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(150_000); params.gas = U256::from(150_000);
@ -703,7 +743,7 @@ fn test_extops(factory: super::Factory) {
evm_test!{test_jumps: test_jumps_int} evm_test!{test_jumps: test_jumps_int}
fn test_jumps(factory: super::Factory) { fn test_jumps(factory: super::Factory) {
let code = "600160015560066000555b60016000540380806000551560245760015402600155600a565b".from_hex().unwrap(); let code = hex!("600160015560066000555b60016000540380806000551560245760015402600155600a565b").to_vec();
let mut params = ActionParams::default(); let mut params = ActionParams::default();
params.gas = U256::from(150_000); params.gas = U256::from(150_000);
@ -723,7 +763,7 @@ fn test_jumps(factory: super::Factory) {
evm_test!{test_calls: test_calls_int} evm_test!{test_calls: test_calls_int}
fn test_calls(factory: super::Factory) { fn test_calls(factory: super::Factory) {
let code = "600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b".from_hex().unwrap(); let code = hex!("600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b").to_vec();
let address = Address::from_low_u64_be(0x155); let address = Address::from_low_u64_be(0x155);
let code_address = Address::from_low_u64_be(0x998); let code_address = Address::from_low_u64_be(0x998);
@ -769,7 +809,7 @@ fn test_calls(factory: super::Factory) {
evm_test!{test_create_in_staticcall: test_create_in_staticcall_int} evm_test!{test_create_in_staticcall: test_create_in_staticcall_int}
fn test_create_in_staticcall(factory: super::Factory) { fn test_create_in_staticcall(factory: super::Factory) {
let code = "600060006064f000".from_hex().unwrap(); let code = hex!("600060006064f000").to_vec();
let address = Address::from_low_u64_be(0x155); let address = Address::from_low_u64_be(0x155);
let mut params = ActionParams::default(); let mut params = ActionParams::default();
@ -793,68 +833,68 @@ fn test_shl(factory: super::Factory) {
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"00", hex!("00").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000002"); "0000000000000000000000000000000000000000000000000000000000000002");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"ff", hex!("ff").to_vec(),
"8000000000000000000000000000000000000000000000000000000000000000"); "8000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"0100", hex!("0100").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"0101", hex!("0101").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"00", hex!("00").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"01", hex!("01").to_vec(),
"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"); "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"ff", hex!("ff").to_vec(),
"8000000000000000000000000000000000000000000000000000000000000000"); "8000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"0100", hex!("0100").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"0000000000000000000000000000000000000000000000000000000000000000", hex!("0000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1b, 0x1b,
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"01", hex!("01").to_vec(),
"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"); "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe");
} }
@ -863,68 +903,68 @@ fn test_shr(factory: super::Factory) {
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"00", hex!("00").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"01", hex!("01").to_vec(),
"4000000000000000000000000000000000000000000000000000000000000000"); "4000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"ff", hex!("ff").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"0100", hex!("0100").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"0101", hex!("0101").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"00", hex!("00").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"01", hex!("01").to_vec(),
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"ff", hex!("ff").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"0100", hex!("0100").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1c, 0x1c,
"0000000000000000000000000000000000000000000000000000000000000000", hex!("0000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
} }
@ -933,104 +973,102 @@ fn test_sar(factory: super::Factory) {
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"00", hex!("00").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"0000000000000000000000000000000000000000000000000000000000000001", hex!("0000000000000000000000000000000000000000000000000000000000000001").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"01", hex!("01").to_vec(),
"c000000000000000000000000000000000000000000000000000000000000000"); "c000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"ff", hex!("ff").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"0100", hex!("0100").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"8000000000000000000000000000000000000000000000000000000000000000", hex!("8000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"0101", hex!("0101").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"00", hex!("00").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"01", hex!("01").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"ff", hex!("ff").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"0100", hex!("0100").to_vec(),
"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"0000000000000000000000000000000000000000000000000000000000000000", hex!("0000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"01", hex!("01").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"4000000000000000000000000000000000000000000000000000000000000000", hex!("4000000000000000000000000000000000000000000000000000000000000000").to_vec(),
"fe", hex!("fe").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"f8", hex!("f8").to_vec(),
"000000000000000000000000000000000000000000000000000000000000007f"); "000000000000000000000000000000000000000000000000000000000000007f");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"fe", hex!("fe").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000001"); "0000000000000000000000000000000000000000000000000000000000000001");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"ff", hex!("ff").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
push_two_pop_one_constantinople_test( push_two_pop_one_constantinople_test(
&factory, &factory,
0x1d, 0x1d,
"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex!("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").to_vec(),
"0100", hex!("0100").to_vec(),
"0000000000000000000000000000000000000000000000000000000000000000"); "0000000000000000000000000000000000000000000000000000000000000000");
} }
fn push_two_pop_one_constantinople_test(factory: &super::Factory, opcode: u8, push1: &str, push2: &str, result: &str) { fn push_two_pop_one_constantinople_test(factory: &super::Factory, opcode: u8, mut push1: Vec<u8>, mut push2: Vec<u8>, result: &str) {
let mut push1 = push1.from_hex().unwrap();
let mut push2 = push2.from_hex().unwrap();
assert!(push1.len() <= 32 && push1.len() != 0); assert!(push1.len() <= 32 && push1.len() != 0);
assert!(push2.len() <= 32 && push2.len() != 0); assert!(push2.len() <= 32 && push2.len() != 0);

4
ethcore/machine/src/externalities.rs
View File

@ -416,6 +416,10 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
self.env_info self.env_info
} }
fn chain_id(&self) -> u64 {
self.machine.params().chain_id
}
fn depth(&self) -> usize { fn depth(&self) -> usize {
self.depth self.depth
} }

2
ethcore/src/json_tests/executive.rs
View File

@ -216,6 +216,8 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for TestExt<'a, T, V, B>
self.ext.env_info() self.ext.env_info()
} }
fn chain_id(&self) -> u64 { 0 }
fn depth(&self) -> usize { fn depth(&self) -> usize {
0 0
} }

7
ethcore/types/src/engines/params.rs
View File

@ -90,6 +90,8 @@ pub struct CommonParams {
pub eip1283_disable_transition: BlockNumber, pub eip1283_disable_transition: BlockNumber,
/// Number of first block where EIP-1014 rules begin. /// Number of first block where EIP-1014 rules begin.
pub eip1014_transition: BlockNumber, pub eip1014_transition: BlockNumber,
/// Number of first block where EIP-1344 rules begin: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1344.md
pub eip1344_transition: BlockNumber,
/// Number of first block where EIP-2028 rules begin. /// Number of first block where EIP-2028 rules begin.
pub eip2028_transition: BlockNumber, pub eip2028_transition: BlockNumber,
/// Number of first block where dust cleanup rules (EIP-168 and EIP169) begin. /// Number of first block where dust cleanup rules (EIP-168 and EIP169) begin.
@ -161,6 +163,7 @@ impl CommonParams {
schedule.have_return_data = block_number >= self.eip211_transition; schedule.have_return_data = block_number >= self.eip211_transition;
schedule.have_bitwise_shifting = block_number >= self.eip145_transition; schedule.have_bitwise_shifting = block_number >= self.eip145_transition;
schedule.have_extcodehash = block_number >= self.eip1052_transition; schedule.have_extcodehash = block_number >= self.eip1052_transition;
schedule.have_chain_id = block_number >= self.eip1344_transition;
schedule.eip1283 = block_number >= self.eip1283_transition && !(block_number >= self.eip1283_disable_transition); schedule.eip1283 = block_number >= self.eip1283_transition && !(block_number >= self.eip1283_disable_transition);
if block_number >= self.eip2028_transition { if block_number >= self.eip2028_transition {
schedule.tx_data_non_zero_gas = 16; schedule.tx_data_non_zero_gas = 16;
@ -282,6 +285,10 @@ impl From<ethjson::spec::Params> for CommonParams {
BlockNumber::max_value, BlockNumber::max_value,
Into::into, Into::into,
), ),
eip1344_transition: p.eip1344_transition.map_or_else(
BlockNumber::max_value,
Into::into,
),
eip2028_transition: p.eip2028_transition.map_or_else( eip2028_transition: p.eip2028_transition.map_or_else(
BlockNumber::max_value, BlockNumber::max_value,
Into::into, Into::into,

2
ethcore/vm/src/env_info.rs
View File

@ -65,7 +65,7 @@ impl From<ethjson::vm::Env> for EnvInfo {
fn from(e: ethjson::vm::Env) -> Self { fn from(e: ethjson::vm::Env) -> Self {
let number = e.number.into(); let number = e.number.into();
EnvInfo { EnvInfo {
number: number, number,
author: e.author.into(), author: e.author.into(),
difficulty: e.difficulty.into(), difficulty: e.difficulty.into(),
gas_limit: e.gas_limit.into(), gas_limit: e.gas_limit.into(),

3
ethcore/vm/src/ext.rs
View File

@ -145,6 +145,9 @@ pub trait Ext {
/// Returns environment info. /// Returns environment info.
fn env_info(&self) -> &EnvInfo; fn env_info(&self) -> &EnvInfo;
/// Returns the chain ID of the blockchain
fn chain_id(&self) -> u64;
/// Returns current depth of execution. /// Returns current depth of execution.
/// ///
/// If contract A calls contract B, and contract B calls C, /// If contract A calls contract B, and contract B calls C,

5
ethcore/vm/src/schedule.rs
View File

@ -122,6 +122,8 @@ pub struct Schedule {
pub have_return_data: bool, pub have_return_data: bool,
/// SHL, SHR, SAR opcodes enabled. /// SHL, SHR, SAR opcodes enabled.
pub have_bitwise_shifting: bool, pub have_bitwise_shifting: bool,
/// CHAINID opcode enabled.
pub have_chain_id: bool,
/// Kill basic accounts below this balance if touched. /// Kill basic accounts below this balance if touched.
pub kill_dust: CleanDustMode, pub kill_dust: CleanDustMode,
/// Enable EIP-1283 rules /// Enable EIP-1283 rules
@ -220,6 +222,7 @@ impl Schedule {
have_revert: false, have_revert: false,
have_return_data: false, have_return_data: false,
have_bitwise_shifting: false, have_bitwise_shifting: false,
have_chain_id: false,
have_extcodehash: false, have_extcodehash: false,
stack_limit: 1024, stack_limit: 1024,
max_depth: 1024, max_depth: 1024,
@ -291,6 +294,7 @@ impl Schedule {
/// Schedule for the Istanbul fork of the Ethereum main net. /// Schedule for the Istanbul fork of the Ethereum main net.
pub fn new_istanbul() -> Schedule { pub fn new_istanbul() -> Schedule {
let mut schedule = Self::new_constantinople(); let mut schedule = Self::new_constantinople();
schedule.have_chain_id = true;
schedule.tx_data_non_zero_gas = 16; schedule.tx_data_non_zero_gas = 16;
schedule schedule
} }
@ -303,6 +307,7 @@ impl Schedule {
have_revert: false, have_revert: false,
have_return_data: false, have_return_data: false,
have_bitwise_shifting: false, have_bitwise_shifting: false,
have_chain_id: false,
have_extcodehash: false, have_extcodehash: false,
stack_limit: 1024, stack_limit: 1024,
max_depth: 1024, max_depth: 1024,

16
ethcore/vm/src/tests.rs
View File

@ -67,6 +67,8 @@ pub struct FakeExt {
pub balances: HashMap<Address, U256>, pub balances: HashMap<Address, U256>,
pub tracing: bool, pub tracing: bool,
pub is_static: bool, pub is_static: bool,
chain_id: u64,
} }
// similar to the normal `finalize` function, but ignoring NeedsReturn. // similar to the normal `finalize` function, but ignoring NeedsReturn.
@ -98,7 +100,7 @@ impl FakeExt {
ext ext
} }
/// New fake externalities with constantinople schedule rules /// New fake externalities with Istanbul schedule rules
pub fn new_istanbul() -> Self { pub fn new_istanbul() -> Self {
let mut ext = FakeExt::default(); let mut ext = FakeExt::default();
ext.schedule = Schedule::new_istanbul(); ext.schedule = Schedule::new_istanbul();
@ -110,6 +112,12 @@ impl FakeExt {
self.schedule.wasm = Some(Default::default()); self.schedule.wasm = Some(Default::default());
self self
} }
/// Set chain ID
pub fn with_chain_id(mut self, chain_id: u64) -> Self {
self.chain_id = chain_id;
self
}
} }
impl Ext for FakeExt { impl Ext for FakeExt {
@ -208,7 +216,7 @@ impl Ext for FakeExt {
fn log(&mut self, topics: Vec<H256>, data: &[u8]) -> Result<()> { fn log(&mut self, topics: Vec<H256>, data: &[u8]) -> Result<()> {
self.logs.push(FakeLogEntry { self.logs.push(FakeLogEntry {
topics: topics, topics,
data: data.to_vec() data: data.to_vec()
}); });
Ok(()) Ok(())
@ -231,6 +239,10 @@ impl Ext for FakeExt {
&self.info &self.info
} }
fn chain_id(&self) -> u64 {
self.chain_id
}
fn depth(&self) -> usize { fn depth(&self) -> usize {
self.depth self.depth
} }

2
json/src/spec/params.rs
View File

@ -94,6 +94,8 @@ pub struct Params {
/// See `CommonParams` docs. /// See `CommonParams` docs.
pub eip1014_transition: Option<Uint>, pub eip1014_transition: Option<Uint>,
/// See `CommonParams` docs. /// See `CommonParams` docs.
pub eip1344_transition: Option<Uint>,
/// See `CommonParams` docs.
pub eip2028_transition: Option<Uint>, pub eip2028_transition: Option<Uint>,
/// See `CommonParams` docs. /// See `CommonParams` docs.
pub dust_protection_transition: Option<Uint>, pub dust_protection_transition: Option<Uint>,

2
parity/informant.rs
View File

@ -24,7 +24,7 @@ use std::time::{Instant, Duration};
use atty; use atty;
use ethcore::client::{ChainNotify, NewBlocks, Client}; use ethcore::client::{ChainNotify, NewBlocks, Client};
use client_traits::{BlockInfo, ChainInfo, BlockChainClient, IoClient}; use client_traits::{BlockInfo, ChainInfo, BlockChainClient};
use types::{ use types::{
BlockNumber, BlockNumber,
client_types::ClientReport, client_types::ClientReport,

2
rpc/Cargo.toml
View File

@ -67,7 +67,6 @@ account-state = { path = "../ethcore/account-state" }
stats = { path = "../util/stats" } stats = { path = "../util/stats" }
trace = { path = "../ethcore/trace" } trace = { path = "../ethcore/trace" }
vm = { path = "../ethcore/vm" } vm = { path = "../ethcore/vm" }
verification = { path = "../ethcore/verification" }
[dev-dependencies] [dev-dependencies]
client-traits = { path = "../ethcore/client-traits" } client-traits = { path = "../ethcore/client-traits" }
@ -80,6 +79,7 @@ macros = { path = "../util/macros" }
spec = { path = "../ethcore/spec" } spec = { path = "../ethcore/spec" }
pretty_assertions = "0.1" pretty_assertions = "0.1"
transaction-pool = "2.0" transaction-pool = "2.0"
verification = { path = "../ethcore/verification" }
[features] [features]
accounts = ["ethcore-accounts"] accounts = ["ethcore-accounts"]

3
rpc/src/lib.rs
View File

@ -89,7 +89,6 @@ extern crate account_state;
extern crate stats; extern crate stats;
extern crate tempdir; extern crate tempdir;
extern crate trace; extern crate trace;
extern crate verification;
extern crate vm; extern crate vm;
#[cfg(any(test, feature = "ethcore-accounts"))] #[cfg(any(test, feature = "ethcore-accounts"))]
@ -130,6 +129,8 @@ extern crate ethcore_io as io;
#[cfg(test)] #[cfg(test)]
extern crate spec; extern crate spec;
#[cfg(test)]
extern crate verification;
pub extern crate jsonrpc_ws_server as ws; pub extern crate jsonrpc_ws_server as ws;