Fix using several ChainParams instances in one program

ethereum · Oct 28, 2019 · 980b658 · 980b658
1 parent 8d9a9a0
commit 980b658
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libethcore/ChainOperationParams.cpp b/libethcore/ChainOperationParams.cpp
@@ -6,7 +6,6 @@
 #include "ChainOperationParams.h"
 #include <libdevcore/CommonData.h>
 #include <libdevcore/Log.h>
-#include <libethcore/EVMSchedule.h>
 
 using namespace std;
 using namespace dev;
@@ -43,8 +42,7 @@ EVMSchedule const& ChainOperationParams::scheduleForBlockNumber(u256 const& _blo
     if (_blockNumber < lastForkBlock)
         return fixedForkSchedule;
 
-    static EVMSchedule const lastForkWithAdditionalEIPsSchedule =
-        addEIPs(fixedForkSchedule, lastForkAdditionalEIPs);
+    lastForkWithAdditionalEIPsSchedule = addEIPs(fixedForkSchedule, lastForkAdditionalEIPs);
     return lastForkWithAdditionalEIPsSchedule;
 }
 

diff --git a/libethcore/ChainOperationParams.h b/libethcore/ChainOperationParams.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <libdevcore/Common.h>
+#include <libethcore/EVMSchedule.h>
 #include <libethcore/Precompiled.h>
 
 #include "Common.h"
@@ -117,6 +118,8 @@ struct ChainOperationParams
 
     /// Precompiled contracts as specified in the chain params.
     std::unordered_map<Address, PrecompiledContract> precompiled;
+
+    mutable EVMSchedule lastForkWithAdditionalEIPsSchedule;
 };
 
 }