From 98b5837d68654ec101966ecfbcf0c5574073ac81 Mon Sep 17 00:00:00 2001
From: David Murdoch <david@davidmurdoch.com>
Date: Tue, 10 Dec 2019 14:43:40 -0500
Subject: [PATCH] Update default to Istanbul

---
 lib/blockchain_double.js     | 2 +-
 lib/database/txserializer.js | 2 +-
 test/block-tags.js           | 2 +-
 test/requests.js             | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/blockchain_double.js b/lib/blockchain_double.js
index afa700861e..a3bf465de3 100644
--- a/lib/blockchain_double.js
+++ b/lib/blockchain_double.js
@@ -44,7 +44,7 @@ const defaultOptions = {
   defaultTransactionGasLimit: "0x15f90",
   time: null,
   debug: false,
-  hardfork: "petersburg",
+  hardfork: "istanbul",
   allowUnlimitedContractSize: false
 };
 
diff --git a/lib/database/txserializer.js b/lib/database/txserializer.js
index ed21fe3916..40a44225c9 100644
--- a/lib/database/txserializer.js
+++ b/lib/database/txserializer.js
@@ -30,7 +30,7 @@ const decode = function(json, done) {
     comment: "Local test network"
   };
 
-  let hardfork = "petersburg";
+  let hardfork = "istanbul";
   if (json._common) {
     hardfork = json._common.hardfork;
     commonOptions.chainId = json._common.chainId;
diff --git a/test/block-tags.js b/test/block-tags.js
index e3459a1feb..2edfeb8c96 100644
--- a/test/block-tags.js
+++ b/test/block-tags.js
@@ -98,7 +98,7 @@ describe("Block Tags", function() {
     );
     assert.strictEqual(
       block.receiptsRoot,
-      "0x8183b8e21f87a0d39954f7b6f3025c9a8e26c38d47976c39df4d2d690b49fc74",
+      "0xfc83d70860b2ea62a20c8a9618b615548fa0cf6ddd9a456994f53652c51725df",
       "Should produce correct receiptsRoot"
     );
   });
diff --git a/test/requests.js b/test/requests.js
index 25b428ff17..7e8b3e65fd 100644
--- a/test/requests.js
+++ b/test/requests.js
@@ -959,7 +959,7 @@ const tests = function(web3) {
       const startingBlockNumber = await web3.eth.getBlockNumber();
 
       const gasEstimate = await web3.eth.estimateGas(txData);
-      assert.strictEqual(gasEstimate, 27795);
+      assert.strictEqual(gasEstimate, 27535);
 
       const blockNumber = await web3.eth.getBlockNumber();
 
@@ -976,7 +976,7 @@ const tests = function(web3) {
       txData.from = "0x1234567890123456789012345678901234567890";
 
       const result = await web3.eth.estimateGas(txData);
-      assert.strictEqual(result, 27795);
+      assert.strictEqual(result, 27535);
     });
 
     it("should estimate gas when no account is listed (eth_estimateGas)", async function() {
@@ -985,7 +985,7 @@ const tests = function(web3) {
       delete txData.from;
 
       const result = await web3.eth.estimateGas(txData);
-      assert.strictEqual(result, 27795);
+      assert.strictEqual(result, 27535);
     });
 
     it("should send a state changing transaction (eth_sendTransaction)", async function() {