From 2fbd9d729687a735ba101abf083331b1566653f4 Mon Sep 17 00:00:00 2001
From: Dmitry Shmatko <zilm@zilm.net>
Date: Fri, 12 Oct 2018 18:44:40 +0300
Subject: [PATCH 1/2] Switched to recent, 1.10.0 EthereumJ snapshot

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cef4523..3db9667 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     compile "org.ethereum:solcJ-all:0.4.19"                   // Solidity Compiler win/mac/linux binaries
 
     // don't forget to adjust {ethereumJ.version} in application.properties
-    compile ("org.ethereum:ethereumj-core:1.9.0-SNAPSHOT") {
+    compile ("org.ethereum:ethereumj-core:1.10.0-SNAPSHOT") {
         changing = true
 
         exclude group: "log4j"

From 3ab4cdd78e12b7548fa6a1812e12592b0d0cb5a3 Mon Sep 17 00:00:00 2001
From: "e.shevchenko" <eugene@ethergit.com>
Date: Wed, 17 Oct 2018 13:40:39 +0300
Subject: [PATCH 2/2] Disables storage dictionary data collecting when
 'modules.contracts.enabled' config is false.

---
 build.gradle                                                 | 2 +-
 src/main/java/com/ethercamp/harmony/config/ModuleConfig.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index cef4523..34b7f4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,7 +108,7 @@ dependencies {
         exclude group: "org.ethereum", module: "solcJ-all"
     }
 
-    compile "com.ethercamp:contract-data:1.9.2"
+    compile "com.ethercamp:contract-data:1.9.3"
 
     compile "org.projectlombok:lombok:1.16.20"
     compile "com.maxmind.geoip:geoip-api:1.3.1"
diff --git a/src/main/java/com/ethercamp/harmony/config/ModuleConfig.java b/src/main/java/com/ethercamp/harmony/config/ModuleConfig.java
index 7664e97..9e0f56c 100644
--- a/src/main/java/com/ethercamp/harmony/config/ModuleConfig.java
+++ b/src/main/java/com/ethercamp/harmony/config/ModuleConfig.java
@@ -1,5 +1,6 @@
 package com.ethercamp.harmony.config;
 
+import com.ethercamp.contrdata.storage.dictionary.StorageDictionaryVmHook;
 import com.ethercamp.harmony.service.ClientMessageService;
 import com.ethercamp.harmony.service.ClientMessageServiceDummy;
 import com.ethercamp.harmony.service.ClientMessageServiceImpl;
@@ -149,10 +150,11 @@ DbSource<byte[]> contractSettingsStorage() {
     }
 
     @Bean
-    ContractsService contractsService() {
+    ContractsService contractsService(StorageDictionaryVmHook vmHook) {
         if (props.isContractStorageEnabled()) {
             return new ContractsServiceImpl();
         } else {
+            vmHook.disable();
             return new DisabledContractService(contractSettingsStorage());
         }
     }