From fd63aa0620d3ce9c5b769c63ef5e48a295730aa0 Mon Sep 17 00:00:00 2001
From: Konrad Feldmeier <konrad@brainbot.com>
Date: Mon, 31 Oct 2016 17:05:40 +0100
Subject: [PATCH] Use tests and fork block (preliminary) from eip158 branch
 #417

---
 ethereum/config.py | 2 +-
 fixtures           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethereum/config.py b/ethereum/config.py
index 288ab7815..fbc20d4af 100644
--- a/ethereum/config.py
+++ b/ethereum/config.py
@@ -66,7 +66,7 @@
     # Anti-DoS fork
     ANTI_DOS_FORK_BLKNUM=2457000,
     # "spurious dragon" fork
-    SPURIOUS_DRAGON_FORK_BLKNUM=2 ** 98,
+    SPURIOUS_DRAGON_FORK_BLKNUM=3500000,
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32
diff --git a/fixtures b/fixtures
index 862b4e3d4..10ee17035 160000
--- a/fixtures
+++ b/fixtures
@@ -1 +1 @@
-Subproject commit 862b4e3d4a9a7141af1b4aaf7dfe228a6a294614
+Subproject commit 10ee170351fbacd448de7e2e458ab968d35b1d27