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

Commit b50fb71

Browse files
arkpararkpar
authored
EIP-86 (#4697)
* EIP-86 * Disable EIP-86 auto activation for now
1 parent 0180b21 commit b50fb71

Some content is hidden

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

59 files changed

+433
-289
lines changed

‎ethcore/light/src/client/mod.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ pub trait LightChainClient: Send + Sync {
106106

107107
/// Get the `i`th CHT root.
108108
fn cht_root(&self, i: usize) -> Option<H256>;
109+
110+
/// Get the EIP-86 transition block number.
111+
fn eip86_transition(&self) -> u64;
109112
}
110113

111114
/// Something which can be treated as a `LightChainClient`.
@@ -384,4 +387,8 @@ impl LightChainClient for Client {
384387
fn cht_root(&self, i: usize) -> Option<H256> {
385388
Client::cht_root(self, i)
386389
}
390+
391+
fn eip86_transition(&self) -> u64 {
392+
self.engine().params().eip86_transition
393+
}
387394
}

‎ethcore/res/ethereum/classic.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"chainID": "0x3d",
3131
"forkBlock": "0x1d4c00",
3232
"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
33-
"eip98Transition": "0x7fffffffffffff"
33+
"eip98Transition": "0x7fffffffffffff",
34+
"eip86Transition": "0x7fffffffffffff"
3435
},
3536
"genesis": {
3637
"seal": {

‎ethcore/res/ethereum/eip150_test.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"maximumExtraDataSize": "0x20",
2525
"minGasLimit": "0x1388",
2626
"networkID" : "0x1",
27-
"eip98Transition": "0x7fffffffffffffff"
27+
"eip98Transition": "0x7fffffffffffffff",
28+
"eip86Transition": "0x7fffffffffffffff"
2829
},
2930
"genesis": {
3031
"seal": {

‎ethcore/res/ethereum/eip161_test.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"maximumExtraDataSize": "0x20",
2525
"minGasLimit": "0x1388",
2626
"networkID" : "0x1",
27-
"eip98Transition": "0x7fffffffffffffff"
27+
"eip98Transition": "0x7fffffffffffffff",
28+
"eip86Transition": "0x7fffffffffffffff"
2829
},
2930
"genesis": {
3031
"seal": {

‎ethcore/res/ethereum/expanse.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"networkID": "0x1",
3131
"chainID": "0x2",
3232
"subprotocolName": "exp",
33-
"eip98Transition": "0x7fffffffffffff"
33+
"eip98Transition": "0x7fffffffffffff",
34+
"eip86Transition": "0x7fffffffffffff"
3435
},
3536
"genesis": {
3637
"seal": {

‎ethcore/res/ethereum/foundation.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
"networkID" : "0x1",
148148
"forkBlock": "0x1d4c00",
149149
"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
150-
"eip98Transition": "0x7fffffffffffff"
150+
"eip98Transition": "0x7fffffffffffff",
151+
"eip86Transition": "0x7fffffffffffff"
151152
},
152153
"genesis": {
153154
"seal": {

‎ethcore/res/ethereum/frontier_like_test.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@
143143
"maximumExtraDataSize": "0x20",
144144
"minGasLimit": "0x1388",
145145
"networkID" : "0x1",
146-
"eip98Transition": "0x7fffffffffffff"
146+
"eip98Transition": "0x7fffffffffffff",
147+
"eip86Transition": "0x7fffffffffffff"
147148
},
148149
"genesis": {
149150
"seal": {

‎ethcore/res/ethereum/frontier_test.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"maximumExtraDataSize": "0x20",
2424
"minGasLimit": "0x1388",
2525
"networkID" : "0x1",
26-
"eip98Transition": "0x7fffffffffffff"
26+
"eip98Transition": "0x7fffffffffffff",
27+
"eip86Transition": "0x7fffffffffffff"
2728
},
2829
"genesis": {
2930
"seal": {

‎ethcore/res/ethereum/homestead_test.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"maximumExtraDataSize": "0x20",
2424
"minGasLimit": "0x1388",
2525
"networkID" : "0x1",
26-
"eip98Transition": "0x7fffffffffffff"
26+
"eip98Transition": "0x7fffffffffffff",
27+
"eip86Transition": "0x7fffffffffffff"
2728
},
2829
"genesis": {
2930
"seal": {

‎ethcore/res/ethereum/morden.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"chainID": "0x3e",
3131
"forkBlock": "0x1b34d8",
3232
"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
33-
"eip98Transition": "0x7fffffffffffff"
33+
"eip98Transition": "0x7fffffffffffff",
34+
"eip86Transition": "0x7fffffffffffff"
3435
},
3536
"genesis": {
3637
"seal": {

0 commit comments

Comments
 (0)