From c2b57f4b04531f642c8fe864675fba4e0d912028 Mon Sep 17 00:00:00 2001
From: Everton Fraga <ev@ethereum.org>
Date: Fri, 1 Nov 2019 11:27:56 -0400
Subject: [PATCH 1/4] Set block number for Istanbul

---
 src/chains/goerli.json  | 2 +-
 src/chains/mainnet.json | 2 +-
 src/chains/rinkeby.json | 2 +-
 src/chains/ropsten.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chains/goerli.json b/src/chains/goerli.json
index 0297b24..121d135 100644
--- a/src/chains/goerli.json
+++ b/src/chains/goerli.json
@@ -64,7 +64,7 @@
     },
     {
       "name": "istanbul",
-      "block": null,
+      "block": 1561651,
       "consensus": "poa",
       "finality": null
     }
diff --git a/src/chains/mainnet.json b/src/chains/mainnet.json
index 887416a..c99db76 100644
--- a/src/chains/mainnet.json
+++ b/src/chains/mainnet.json
@@ -64,7 +64,7 @@
     },
     {
       "name": "istanbul",
-      "block": null,
+      "block": 9069000,
       "consensus": "pow",
       "finality": null
     }
diff --git a/src/chains/rinkeby.json b/src/chains/rinkeby.json
index 2518045..f46fbb1 100644
--- a/src/chains/rinkeby.json
+++ b/src/chains/rinkeby.json
@@ -58,7 +58,7 @@
     },
     {
       "name": "istanbul",
-      "block": null,
+      "block": 5435345,
       "consensus": "poa",
       "finality": null
     }
diff --git a/src/chains/ropsten.json b/src/chains/ropsten.json
index 2201811..cc691bf 100644
--- a/src/chains/ropsten.json
+++ b/src/chains/ropsten.json
@@ -64,7 +64,7 @@
     },
     {
       "name": "istanbul",
-      "block": null,
+      "block": 6485846,
       "consensus": "pow",
       "finality": null
     }

From 9fbc5a4de4e22efe74fbabbe426df1acb93a558a Mon Sep 17 00:00:00 2001
From: Everton Fraga <ev@ethereum.org>
Date: Fri, 1 Nov 2019 11:28:40 -0400
Subject: [PATCH 2/4] Adapt tests for Istanbul

---
 tests/hardforks.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/hardforks.ts b/tests/hardforks.ts
index 51bcfe4..9005d22 100644
--- a/tests/hardforks.ts
+++ b/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)

From ec3cb4dc469a74b5957390f4936a29723172fe09 Mon Sep 17 00:00:00 2001
From: Everton Fraga <ev@ethereum.org>
Date: Fri, 1 Nov 2019 11:29:19 -0400
Subject: [PATCH 3/4] Update Istanbul description

---
 src/hardforks/istanbul.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hardforks/istanbul.json b/src/hardforks/istanbul.json
index 1e05109..60d3639 100644
--- a/src/hardforks/istanbul.json
+++ b/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"

From f90c48ea0cd0e080e4da9f7daba1381b3bde0039 Mon Sep 17 00:00:00 2001
From: Everton Fraga <ev@ethereum.org>
Date: Mon, 4 Nov 2019 11:25:28 -0500
Subject: [PATCH 4/4] Docs: adding Istanbul to the supported fork list

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a3b6163..b4036f4 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ library supported:
 - `byzantium`
 - `constantinople`
 - `petersburg` (aka `constantinopleFix`, apply together with `constantinople`)
+- `istanbul`
 
 ## Future Hardforks