Merge branch 'master' into rinkeby-fork-blocks

Author: s1na

README.md

@@ -75,6 +75,7 @@ library supported:
 - `byzantium`
 - `constantinople`
 - `petersburg` (aka `constantinopleFix`, apply together with `constantinople`)
+- `istanbul`
 
 ## Future Hardforks
 

src/chains/goerli.json

@@ -64,7 +64,7 @@
  },
  {
  "name": "istanbul",
- "block": null,
+ "block": 1561651,
  "consensus": "poa",
  "finality": null
  }

src/chains/kovan.json

@@ -13,7 +13,62 @@
  "extraData": "0x",
  "stateRoot": "0x2480155b48a1cea17d67dbfdfaafe821c1d19cdd478c5358e8ec56dec24502b2"
  },
- "hardforks": [],
+ "hardforks": [
+ {
+ "name": "chainstart",
+ "block": 0,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "homestead",
+ "block": 0,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "dao",
+ "block": 0,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "tangerineWhistle",
+ "block": 0,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "spuriousDragon",
+ "block": 0,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "byzantium",
+ "block": 5067000,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "constantinople",
+ "block": 9200000,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "petersburg",
+ "block": 10255201,
+ "consensus": "poa",
+ "finality": null
+ },
+ {
+ "name": "istanbul",
+ "block": 14111141,
+ "consensus": "poa",
+ "finality": null
+ }
+ ],
  "bootstrapNodes": [
  {
  "ip": "40.71.221.215",

src/chains/mainnet.json

@@ -64,7 +64,7 @@
  },
  {
  "name": "istanbul",
- "block": null,
+ "block": 9069000,
  "consensus": "pow",
  "finality": null
  }

src/chains/rinkeby.json

@@ -64,7 +64,7 @@
  },
  {
  "name": "istanbul",
- "block": null,
+ "block": 5435345,
  "consensus": "poa",
  "finality": null
  }

src/chains/ropsten.json

@@ -64,7 +64,7 @@
  },
  {
  "name": "istanbul",
- "block": null,
+ "block": 6485846,
  "consensus": "pow",
  "finality": null
  }

src/hardforks/istanbul.json

@@ -1,6 +1,6 @@
 {
  "name": "istanbul",
- "comment": "HF targeted for October 2019 following the Constantinople/Petersburg HF",
+ "comment": "HF targeted for December 2019 following the Constantinople/Petersburg HF",
  "eip": {
  "url": "https://eips.ethereum.org/EIPS/eip-1679",
  "status": "Draft"

tests/hardforks.ts

@@ -33,6 +33,10 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
  msg = 'should return the correct HF change block for byzantium (set)'
  st.equal(c.hardforkBlock(), 1700000, msg)
 
+ c = new Common('ropsten', 'istanbul')
+ msg = 'should return the correct HF change block for istanbul (set)'
+ st.equal(c.hardforkBlock(), 6485846, msg)
+
  st.end()
  })
 
@@ -56,8 +60,8 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
 
  t.test('activeHardforks()', function(st: tape.Test) {
  let c = new Common('ropsten')
- let msg = 'should return 7 active hardforks for Ropsten'
- st.equal(c.activeHardforks().length, 7, msg)
+ let msg = 'should return 8 active hardforks for Ropsten'
+ st.equal(c.activeHardforks().length, 8, msg)
 
  msg = 'should return the correct HF data for Ropsten'
  st.equal(c.activeHardforks()[3]['name'], 'spuriousDragon', msg)
@@ -81,8 +85,8 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
 
  t.test('activeHardfork()', function(st: tape.Test) {
  let c = new Common('ropsten')
- let msg = 'should return petersburg as latest active HF for Ropsten'
- st.equal(c.activeHardfork(), 'petersburg', msg)
+ let msg = 'should return istanbul as latest active HF for Ropsten'
+ st.equal(c.activeHardfork(), 'istanbul', msg)
 
  msg = 'should return spuriousDragon as latest active HF for Ropsten for block 10'
  st.equal(c.activeHardfork(10), 'spuriousDragon', msg)