Merge pull request #86 from rsksmart/hop410-master-merge

Hop-4.1.0 -> master merge

build.gradle

@@ -54,7 +54,7 @@ tasks.withType(AbstractArchiveTask) {
 
 ext {
     bitcoinjcoreVersion = '0.15.6-rsk-2'
-    bitcoinjVersion = '0.14.4-rsk-11'
+    bitcoinjVersion = '0.14.4-rsk-12'
     commonsLang3Version = '3.5'
     commonsIoVersion = '2.5'
     slf4jVersion = '1.7.25'
@@ -65,7 +65,7 @@ ext {
     junitVersion = '4.12'
     mockitoVersion = '2.23.4'
     powermockitoVersion = '2.0.2'
-    rskjcoreVersion = '4.1.0-SNAPSHOT'
+    rskjcoreVersion = '4.2.0-SNAPSHOT'
 }
 
 dependencies {

gradle/verification-metadata.xml

@@ -48,20 +48,20 @@
             <sha256 value="6f9c5578df1e4dd58debf5b6693e88cd7a76653908e8e675e9a74ca093231aae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="co.rsk" name="rskj-core" version="3.2.0-IRIS">
-         <artifact name="rskj-core-3.2.0-IRIS.jar">
-            <sha256 value="3a0b939f66df64a06e406d453fa668a1f4c8675a3f631b1b5659beb220fb185b" origin="Generated by Gradle"/>
+      <component group="co.rsk" name="rskj-core" version="4.0.0-HOP">
+         <artifact name="rskj-core-4.0.0-HOP.jar">
+            <sha256 value="a32e31a695ad73198e55474cce4db1b26d71785533a1127c2ddb1f13c472e2c3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="rskj-core-3.2.0-IRIS.module">
-            <sha256 value="af363c8c20415edb3b714ea88753cf65fedcf1917928d97d4c29353192ed8603" origin="Generated by Gradle"/>
+         <artifact name="rskj-core-4.0.0-HOP.module">
+            <sha256 value="687fc1cb5945c2fc6f0c8f6a011d25ef27c632fc3e3a910f253dd72c860dd322" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-11">
-         <artifact name="bitcoinj-thin-0.14.4-rsk-11.jar">
-            <sha256 value="7c791512ae18f5adec0b7f18ba49ab7c6cddac334b48816a532eceec0f44e10b" origin="Generated by Gradle"/>
+      <component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-12">
+         <artifact name="bitcoinj-thin-0.14.4-rsk-12.jar">
+            <sha256 value="c7089559775c62d212fe839cf5bfeb3592f4545dd41f54d2fe474cf6b8f9641a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="bitcoinj-thin-0.14.4-rsk-11.pom">
-            <sha256 value="b58375898eb88ed528d29cb337c1d3275ee93b7a9b5572633281eca94104c5fb" origin="Generated by Gradle"/>
+         <artifact name="bitcoinj-thin-0.14.4-rsk-12.pom">
+            <sha256 value="e79cb080ed7569b7e6e4c1533edeb62ba9b81c784b3da9dca5d7aa473402aa46" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.fasterxml" name="oss-parent" version="27">

src/main/resources/version.properties

@@ -1,2 +1,2 @@
-versionNumber='4.1.0.0'
+versionNumber='4.2.0.0'
 modifier="SNAPSHOT"