Merge branch 'develop'

Author: zilm13

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"

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());
         }
     }