Release 0.0.2 (#56)

blackyblack · Warchant · commit 89739d0c570c · 2019-11-25T16:07:00.000+02:00
* Add forkresolution and grpc methods for the forkresolution. * Cleanup * StreamUtils: add new function to read a single integer * Refactored write of the Int values according to previous Pull Request * Improve PoPtx database. * Add sonarqube task & add jacoco for coverage * Bump sonarqube version * Update gradle.yml * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Update pop rewarding (#5) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * StreamUtils: swap parameter order from max/min to min/max (#2) * BitcoinStore: fix replace and erase (#6) * BitcoinStore: fix replace(); add erase() * tests: BitcoinStore: add coverage for erase() and replace() * Remove data field (#7) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * Remove data field from VeriBlockTransaction class, fix tests. * remove temporary files from git * Fixes * Feature/veriblockstore fix replace erase (#10) * GenericBlockRepository: refactor to allow schema changes and working with stored block types directly; rename from GenericBlocksRepository * port VeriBlockBlockRepository to use GenericBlockRepository; add essential tests; rename from VeriBlockBlocksRepository * VeriBlockBlockRepository: add support for storing the block of proof * GenericBlockRepository: add support for id types other than String * BlockSQLSerializer: document the interface * VeriBlockStore: port to VeriBlockBlockRepository * BitcoinBlocksRepository: port to GenericBlockRepository; add tests * BitcoinStore: port to BitcoinBlockRepository * remove GenericBlocksRepository * SqliteBitcoinBlocksTableTest: port to BitcoinBlockRepository * remove BlockData * VeriBlockStore: fix replace(); add erase() * tests: VeriBlockStore: add coverage for erase() and replace() * Added interfaces for client wrappers (#8) * Added interfaces for client wrappers * Fixes for related projects after refactoring * Feature/fix setbitcoinheadchange (#12) * fix SetBitcoinHeadChange to match SetVeriBlockHeadChange * tests: add SetBitcoinHeadChange coverage * Feature/fix veriblock rewind (#13) * fix a typo * VeriBlockBlockchain: create correct rewind records and fix rewind() * tests: VeriBlockBlockchain: add rewind() coverage * Change: remove an excessive restriction that makes it impossible to store block creation records * Fix wrong package for new files from PR-10 (#11) * Add codecov to CI (#15) * Add codecov to CI Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Enable xml Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Feature/fix bitcoin rewind (#14) * BitcoinBlockchain: create correct rewind records and fix rewind() * tests: BitcoinBlockchain: add rewind() coverage * Implement GetLastKnown*Blocks API (#19) * implement the getLastKnown*Blocks API * expose the getLastKnown*Blocks API via GRPC; update the GRPC bindings * *ProtoConverter: add the license header * add getLastKnown*Blocks API to IVeriBlockSecurity * Ensure that erase cannot split the blockchain into 2 disconnected parts (#20) * GenericBlockRepository: implement isInUse() * BitcoinStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * VeriBlockStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * GenericBlockRepository: clean up isInUse() * Feature/test remove payloads alt 34 (#21) * Cleanup * ATV and VTB generation helpers added * ATV and VTB Security service tests * Test for removePayloads * GenericBlockRepository: refactor to use try-with-resources (#22) * tests: BitcoinBlockRepository: add coverage for getAll(), clear(), isInUse() and getEndsWithId() (#23) * tests: VeriBlockBlockRepository: add coverage for getAll(), get(), clear() and getEndsWithId() using a trimmed hash (#24) * Add new calculatePopDifficultyForBlock method with rpc calls. (#18) * Add new calculatePopDifficultyForBlock method with rpc calls. Covered by tests * update popDifficulty algorithm * Fixes * get rid of references to DatatypeConverter (#27) * tests: VeriBlockSecurity: add getLastKnown*Blocks coverage (#26) * alt-integration-grpc-service: make the veriblock network configurable (#25) * ALT_60 Clean up duplicate code (#28) * ALT_60 Clean up duplicate code MerkleTree, VeriBlockAtv/Vtb (#29) * APL-61 allow disabling the block difficulty check (#32) * APL-61 allow disabling the block difficulty check * APL-61 small fix * APL-61 move validation function * AddPayloads: throw VerificationException instead of returning a boolean (#36) * implement blockchain bootstrapping, add tests (#30) * Alt 64 allow disabling block difficulty btc (#38) * ALT-64 allow disabling btc block difficulty check by setting the network name to "unknown" * configure bootstrap, fork resolution, pop rewards etc via the config file (#31) * implement setConfig() (#34) * handle the first bootstrap block correctly; add tests (#33) * handle the first bootstrap block correctly; add tests * rename check*Contextually to checkConnectivity; rebase * remove set*Config APIs superseded by setConfig() (#35) * remove set*Config APIs superseded by setConfig() * Better logging and network selection fix (#37) * Better logging and network selection fix * Better install script * Fixes (#40) * configure VBK and BTC network parameters (#42) * ALT-71 Getting conf(property file) outside of the jar. (#43) * Use jitpack to grab alt-integration-proto (#44) * Use jitpack to grab alt-integration-proto * Use alt-integration-proto-v2 * fix *Store.replace() to allow replacing a block referenced by another block(eg as the previous block) (#45) * ALT-77 Add logs if parsing config fails. (#47) * If sonar fails, do not fail the whole job * *Store.replace(): check that the old and new block hashes match (#48) * Trying to fix Jitpack publishing (#50) * Release v0.0.1 (#46) (#51) * Add forkresolution and grpc methods for the forkresolution. * Cleanup * StreamUtils: add new function to read a single integer * Refactored write of the Int values according to previous Pull Request * Improve PoPtx database. * Add sonarqube task & add jacoco for coverage * Bump sonarqube version * Update gradle.yml * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Update pop rewarding (#5) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * StreamUtils: swap parameter order from max/min to min/max (#2) * BitcoinStore: fix replace and erase (#6) * BitcoinStore: fix replace(); add erase() * tests: BitcoinStore: add coverage for erase() and replace() * Remove data field (#7) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * Remove data field from VeriBlockTransaction class, fix tests. * remove temporary files from git * Fixes * Feature/veriblockstore fix replace erase (#10) * GenericBlockRepository: refactor to allow schema changes and working with stored block types directly; rename from GenericBlocksRepository * port VeriBlockBlockRepository to use GenericBlockRepository; add essential tests; rename from VeriBlockBlocksRepository * VeriBlockBlockRepository: add support for storing the block of proof * GenericBlockRepository: add support for id types other than String * BlockSQLSerializer: document the interface * VeriBlockStore: port to VeriBlockBlockRepository * BitcoinBlocksRepository: port to GenericBlockRepository; add tests * BitcoinStore: port to BitcoinBlockRepository * remove GenericBlocksRepository * SqliteBitcoinBlocksTableTest: port to BitcoinBlockRepository * remove BlockData * VeriBlockStore: fix replace(); add erase() * tests: VeriBlockStore: add coverage for erase() and replace() * Added interfaces for client wrappers (#8) * Added interfaces for client wrappers * Fixes for related projects after refactoring * Feature/fix setbitcoinheadchange (#12) * fix SetBitcoinHeadChange to match SetVeriBlockHeadChange * tests: add SetBitcoinHeadChange coverage * Feature/fix veriblock rewind (#13) * fix a typo * VeriBlockBlockchain: create correct rewind records and fix rewind() * tests: VeriBlockBlockchain: add rewind() coverage * Change: remove an excessive restriction that makes it impossible to store block creation records * Fix wrong package for new files from PR-10 (#11) * Add codecov to CI (#15) * Add codecov to CI Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Enable xml Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Feature/fix bitcoin rewind (#14) * BitcoinBlockchain: create correct rewind records and fix rewind() * tests: BitcoinBlockchain: add rewind() coverage * Implement GetLastKnown*Blocks API (#19) * implement the getLastKnown*Blocks API * expose the getLastKnown*Blocks API via GRPC; update the GRPC bindings * *ProtoConverter: add the license header * add getLastKnown*Blocks API to IVeriBlockSecurity * Ensure that erase cannot split the blockchain into 2 disconnected parts (#20) * GenericBlockRepository: implement isInUse() * BitcoinStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * VeriBlockStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * GenericBlockRepository: clean up isInUse() * Feature/test remove payloads alt 34 (#21) * Cleanup * ATV and VTB generation helpers added * ATV and VTB Security service tests * Test for removePayloads * GenericBlockRepository: refactor to use try-with-resources (#22) * tests: BitcoinBlockRepository: add coverage for getAll(), clear(), isInUse() and getEndsWithId() (#23) * tests: VeriBlockBlockRepository: add coverage for getAll(), get(), clear() and getEndsWithId() using a trimmed hash (#24) * Add new calculatePopDifficultyForBlock method with rpc calls. (#18) * Add new calculatePopDifficultyForBlock method with rpc calls. Covered by tests * update popDifficulty algorithm * Fixes * get rid of references to DatatypeConverter (#27) * tests: VeriBlockSecurity: add getLastKnown*Blocks coverage (#26) * alt-integration-grpc-service: make the veriblock network configurable (#25) * ALT_60 Clean up duplicate code (#28) * ALT_60 Clean up duplicate code MerkleTree, VeriBlockAtv/Vtb (#29) * APL-61 allow disabling the block difficulty check (#32) * APL-61 allow disabling the block difficulty check * APL-61 small fix * APL-61 move validation function * AddPayloads: throw VerificationException instead of returning a boolean (#36) * implement blockchain bootstrapping, add tests (#30) * Alt 64 allow disabling block difficulty btc (#38) * ALT-64 allow disabling btc block difficulty check by setting the network name to "unknown" * configure bootstrap, fork resolution, pop rewards etc via the config file (#31) * implement setConfig() (#34) * handle the first bootstrap block correctly; add tests (#33) * handle the first bootstrap block correctly; add tests * rename check*Contextually to checkConnectivity; rebase * remove set*Config APIs superseded by setConfig() (#35) * remove set*Config APIs superseded by setConfig() * Better logging and network selection fix (#37) * Better logging and network selection fix * Better install script * Fixes (#40) * configure VBK and BTC network parameters (#42) * ALT-71 Getting conf(property file) outside of the jar. (#43) * Use jitpack to grab alt-integration-proto (#44) * Use jitpack to grab alt-integration-proto * Use alt-integration-proto-v2 * fix *Store.replace() to allow replacing a block referenced by another block(eg as the previous block) (#45) * ALT-77 Add logs if parsing config fails. (#47) * If sonar fails, do not fail the whole job * Release v0.0.1 (#46) (#53) * Add forkresolution and grpc methods for the forkresolution. * Cleanup * StreamUtils: add new function to read a single integer * Refactored write of the Int values according to previous Pull Request * Improve PoPtx database. * Add sonarqube task & add jacoco for coverage * Bump sonarqube version * Update gradle.yml * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Update pop rewarding (#5) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * StreamUtils: swap parameter order from max/min to min/max (#2) * BitcoinStore: fix replace and erase (#6) * BitcoinStore: fix replace(); add erase() * tests: BitcoinStore: add coverage for erase() and replace() * Remove data field (#7) * Add using the PoPTxDatabase in the PoPRewards algorithms * update PoPRewards test with using the PoPTxdatabase. Fix forkresolution. * Add new method SavePoPTransactionData into the IntegrationService * Remove data field from VeriBlockTransaction class, fix tests. * remove temporary files from git * Fixes * Feature/veriblockstore fix replace erase (#10) * GenericBlockRepository: refactor to allow schema changes and working with stored block types directly; rename from GenericBlocksRepository * port VeriBlockBlockRepository to use GenericBlockRepository; add essential tests; rename from VeriBlockBlocksRepository * VeriBlockBlockRepository: add support for storing the block of proof * GenericBlockRepository: add support for id types other than String * BlockSQLSerializer: document the interface * VeriBlockStore: port to VeriBlockBlockRepository * BitcoinBlocksRepository: port to GenericBlockRepository; add tests * BitcoinStore: port to BitcoinBlockRepository * remove GenericBlocksRepository * SqliteBitcoinBlocksTableTest: port to BitcoinBlockRepository * remove BlockData * VeriBlockStore: fix replace(); add erase() * tests: VeriBlockStore: add coverage for erase() and replace() * Added interfaces for client wrappers (#8) * Added interfaces for client wrappers * Fixes for related projects after refactoring * Feature/fix setbitcoinheadchange (#12) * fix SetBitcoinHeadChange to match SetVeriBlockHeadChange * tests: add SetBitcoinHeadChange coverage * Feature/fix veriblock rewind (#13) * fix a typo * VeriBlockBlockchain: create correct rewind records and fix rewind() * tests: VeriBlockBlockchain: add rewind() coverage * Change: remove an excessive restriction that makes it impossible to store block creation records * Fix wrong package for new files from PR-10 (#11) * Add codecov to CI (#15) * Add codecov to CI Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Enable xml Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Fix Signed-off-by: Bogdan Vaneev <warchantua@gmail.com> * Feature/fix bitcoin rewind (#14) * BitcoinBlockchain: create correct rewind records and fix rewind() * tests: BitcoinBlockchain: add rewind() coverage * Implement GetLastKnown*Blocks API (#19) * implement the getLastKnown*Blocks API * expose the getLastKnown*Blocks API via GRPC; update the GRPC bindings * *ProtoConverter: add the license header * add getLastKnown*Blocks API to IVeriBlockSecurity * Ensure that erase cannot split the blockchain into 2 disconnected parts (#20) * GenericBlockRepository: implement isInUse() * BitcoinStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * VeriBlockStore: add a check that erasing a block must not split the blockchain into 2 disconnected parts * GenericBlockRepository: clean up isInUse() * Feature/test remove payloads alt 34 (#21) * Cleanup * ATV and VTB generation helpers added * ATV and VTB Security service tests * Test for removePayloads * GenericBlockRepository: refactor to use try-with-resources (#22) * tests: BitcoinBlockRepository: add coverage for getAll(), clear(), isInUse() and getEndsWithId() (#23) * tests: VeriBlockBlockRepository: add coverage for getAll(), get(), clear() and getEndsWithId() using a trimmed hash (#24) * Add new calculatePopDifficultyForBlock method with rpc calls. (#18) * Add new calculatePopDifficultyForBlock method with rpc calls. Covered by tests * update popDifficulty algorithm * Fixes * get rid of references to DatatypeConverter (#27) * tests: VeriBlockSecurity: add getLastKnown*Blocks coverage (#26) * alt-integration-grpc-service: make the veriblock network configurable (#25) * ALT_60 Clean up duplicate code (#28) * ALT_60 Clean up duplicate code MerkleTree, VeriBlockAtv/Vtb (#29) * APL-61 allow disabling the block difficulty check (#32) * APL-61 allow disabling the block difficulty check * APL-61 small fix * APL-61 move validation function * AddPayloads: throw VerificationException instead of returning a boolean (#36) * implement blockchain bootstrapping, add tests (#30) * Alt 64 allow disabling block difficulty btc (#38) * ALT-64 allow disabling btc block difficulty check by setting the network name to "unknown" * configure bootstrap, fork resolution, pop rewards etc via the config file (#31) * implement setConfig() (#34) * handle the first bootstrap block correctly; add tests (#33) * handle the first bootstrap block correctly; add tests * rename check*Contextually to checkConnectivity; rebase * remove set*Config APIs superseded by setConfig() (#35) * remove set*Config APIs superseded by setConfig() * Better logging and network selection fix (#37) * Better logging and network selection fix * Better install script * Fixes (#40) * configure VBK and BTC network parameters (#42) * ALT-71 Getting conf(property file) outside of the jar. (#43) * Use jitpack to grab alt-integration-proto (#44) * Use jitpack to grab alt-integration-proto * Use alt-integration-proto-v2 * fix *Store.replace() to allow replacing a block referenced by another block(eg as the previous block) (#45) * ALT-77 Add logs if parsing config fails. (#47) * If sonar fails, do not fail the whole job
diff --git a/alt-integration-adapter-java/build.gradle b/alt-integration-adapter-java/build.gradle
@@ -7,8 +7,6 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
-version = '0.1.2'
-
 dependencies {
     testImplementation 'junit:junit:4.12'
     
diff --git a/alt-integration-grpc-client/build.gradle b/alt-integration-grpc-client/build.gradle
@@ -7,8 +7,6 @@ repositories {
     maven { url 'https://jitpack.io' }
 }
 
-version = '0.1.2'
-
 dependencies {
     testCompile 'junit:junit:4.12'
     compile group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.23.0'
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
 
 apply plugin: 'nebula.release'
 
-version = '0.1.2'
+version = '0.0.2'
 
 allprojects {
     repositories {
@@ -51,11 +51,6 @@ task printTCBuildNumber() {
     println "##teamcity[buildNumber \'${version}\']"
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.2'
-}
-
-
 sonarqube {
     properties {
         property "sonar.projectKey", "vbk:alt-integration"
diff --git a/core/build.gradle b/core/build.gradle
@@ -2,17 +2,12 @@ plugins {
     id "java"
     id "idea"
     id "java-library"
-    id "maven-publish"
-    id "com.jfrog.artifactory"
 }
 
-version = '0.1.4'
-
 dependencies {
     testImplementation 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.7.22'
 
-
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'
     compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
 
@@ -34,31 +29,41 @@ jar {
     }
 }
 
+sourceSets {
+    main {
+        resources {
+            srcDirs = ['conf']
+            includes = ["**/*.properties"]
+        }
 
-artifactory {
-    contextUrl = artifactory_url
-    publish {
-        repository {
-            repoKey = artifactory_repoKey
-            username = artifactory_user
-            password = artifactory_password
-            maven = true
+        java {
+            srcDirs += ['conf']
+        }
+    }
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDirs = ['conf']
+            includes = ["**/*.properties"]
         }
 
-        defaults {
-            publications('mavenJava')
-            publishArtifacts = true
+        java {
+            srcDirs += ['conf']
         }
     }
 }
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            groupId 'veriblock'
-            artifactId 'integrations-sdk'
-            version this.version
-            from components.java
+sourceSets {
+    main {
+        resources {
+            srcDirs = ['conf']
+            includes = ["**/*.properties"]
+        }
+
+        java {
+            srcDirs += ['conf']
         }
     }
 }
diff --git a/gradle/wrapper/.gitignore b/gradle/wrapper/.gitignore
@@ -0,0 +1,2 @@
+!gradle-wrapper.jar
+!gradle-wrapper.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-#Sat Aug 03 13:58:30 CEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+#Wed Nov 20 16:49:53 EET 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/reference-lib/build.gradle b/reference-lib/build.gradle
@@ -4,14 +4,13 @@ plugins {
     id "java-library"
 }
 
-version = '0.1.2'
-
 dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.7.22'
 
-    compile project(':core')
     compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'
+
+    compile project(':core')
 }
 
 sourceSets {
diff --git a/reference-lib/src/main/java/org/veriblock/integrations/blockchain/store/BitcoinStore.java b/reference-lib/src/main/java/org/veriblock/integrations/blockchain/store/BitcoinStore.java
@@ -105,6 +105,9 @@ public StoredBitcoinBlock erase(Sha256Hash hash) throws BlockStoreException, SQL
     }
 
     public StoredBitcoinBlock replace(Sha256Hash hash, StoredBitcoinBlock storedBlock) throws BlockStoreException, SQLException {
+        if (hash != null && storedBlock != null && !hash.equals(storedBlock.getHash())) {
+            throw new BlockStoreException("The original and replacement block hashes must match");
+        }
         StoredBitcoinBlock replaced = get(hash);
         bitcoinRepository.save(storedBlock);
         return replaced;
diff --git a/reference-lib/src/main/java/org/veriblock/integrations/blockchain/store/VeriBlockStore.java b/reference-lib/src/main/java/org/veriblock/integrations/blockchain/store/VeriBlockStore.java
@@ -106,6 +106,9 @@ public StoredVeriBlockBlock erase(VBlakeHash hash) throws BlockStoreException, S
      }
 
     public StoredVeriBlockBlock replace(VBlakeHash hash, StoredVeriBlockBlock storedBlock) throws BlockStoreException, SQLException {
+        if (hash != null && storedBlock != null && !hash.equals(storedBlock.getHash())) {
+            throw new BlockStoreException("The original and replacement block hashes must match");
+        }
         StoredVeriBlockBlock replaced = get(hash);
         veriBlockRepository.save(storedBlock);
         return replaced;
diff --git a/reference-lib/src/test/java/org/veriblock/integrations/blockchain/store/BitcoinStoreTest.java b/reference-lib/src/test/java/org/veriblock/integrations/blockchain/store/BitcoinStoreTest.java
@@ -258,4 +258,22 @@ public void ReplaceNonexistentTest() throws SQLException, IOException {
         storedBlock = store.get(newBlock.getHash());
         Assert.assertEquals(newBlock, storedBlock);
     }
+
+    @Test
+    public void replaceWithDifferentHashTest() throws SQLException, IOException {
+        store.put(storedBlock1);
+
+        try {
+            store.replace(storedBlock1.getHash(), storedBlock2);
+            Assert.fail("Should throw a BlockStoreException");
+        } catch (BlockStoreException e) {
+            Assert.assertEquals(e.getMessage(), "The original and replacement block hashes must match");
+        }
+
+        StoredBitcoinBlock storedBlock = store.get(storedBlock1.getHash());
+        Assert.assertEquals(storedBlock, storedBlock1);
+
+        storedBlock = store.get(storedBlock2.getHash());
+        Assert.assertEquals(storedBlock, null);
+    }
 }
diff --git a/reference-lib/src/test/java/org/veriblock/integrations/blockchain/store/VeriBlockStoreTest.java b/reference-lib/src/test/java/org/veriblock/integrations/blockchain/store/VeriBlockStoreTest.java
@@ -70,7 +70,7 @@ public void EraseCantSplitBlockchainTest() throws SQLException, IOException {
             Assert.assertEquals(store.erase(block2.getHash()), storedBlock2);
             Assert.assertEquals(store.erase(block1.getHash()), storedBlock1);
     }
-
+    
     @Test
     public void nonexistingBlockStoreTest() throws SQLException, IOException {
             VBlakeHash hash = VBlakeHash.hash("123".getBytes());
@@ -265,4 +265,22 @@ public void ReplaceReferencedBlockTest() throws SQLException, IOException {
             StoredVeriBlockBlock storedBlock = store.get(storedBlock1.getHash());
             Assert.assertEquals(newBlock, storedBlock);
     }
+
+    @Test
+    public void replaceWithDifferentHashTest() throws SQLException, IOException {
+        store.put(storedBlock1);
+
+        try {
+            store.replace(storedBlock1.getHash(), storedBlock2);
+            Assert.fail("Should throw a BlockStoreException");
+        } catch (BlockStoreException e) {
+            Assert.assertEquals(e.getMessage(), "The original and replacement block hashes must match");
+        }
+
+        StoredVeriBlockBlock storedBlock = store.get(storedBlock1.getHash());
+        Assert.assertEquals(storedBlock, storedBlock1);
+
+        storedBlock = store.get(storedBlock2.getHash());
+        Assert.assertEquals(storedBlock, null);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ repositories {`
`7`	`7`	`maven { url 'https://jitpack.io' }`
`8`	`8`	`}`
`9`	`9`
`10`		`-version = '0.1.2'`
`11`		`-`
`12`	`10`	`dependencies {`
`13`	`11`	`testImplementation 'junit:junit:4.12'`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+!gradle-wrapper.jar`
	`2`	`+!gradle-wrapper.properties`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,13 @@ plugins {`
`4`	`4`	`id "java-library"`
`5`	`5`	`}`
`6`	`6`
`7`		`-version = '0.1.2'`
`8`		`-`
`9`	`7`	`dependencies {`
`10`	`8`	`testImplementation 'junit:junit:4.12'`
`11`	`9`	`testImplementation 'org.mockito:mockito-core:2.7.22'`
`12`	`10`
`13`		`- compile project(':core')`
`14`	`11`	`compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'`
	`12`	`+`
	`13`	`+ compile project(':core')`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ public StoredBitcoinBlock erase(Sha256Hash hash) throws BlockStoreException, SQL`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public StoredBitcoinBlock replace(Sha256Hash hash, StoredBitcoinBlock storedBlock) throws BlockStoreException, SQLException {`
	`108`	`+ if (hash != null && storedBlock != null && !hash.equals(storedBlock.getHash())) {`
	`109`	`+ throw new BlockStoreException("The original and replacement block hashes must match");`
	`110`	`+ }`
`108`	`111`	`StoredBitcoinBlock replaced = get(hash);`
`109`	`112`	`bitcoinRepository.save(storedBlock);`
`110`	`113`	`return replaced;`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ public StoredVeriBlockBlock erase(VBlakeHash hash) throws BlockStoreException, S`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public StoredVeriBlockBlock replace(VBlakeHash hash, StoredVeriBlockBlock storedBlock) throws BlockStoreException, SQLException {`
	`109`	`+ if (hash != null && storedBlock != null && !hash.equals(storedBlock.getHash())) {`
	`110`	`+ throw new BlockStoreException("The original and replacement block hashes must match");`
	`111`	`+ }`
`109`	`112`	`StoredVeriBlockBlock replaced = get(hash);`
`110`	`113`	`veriBlockRepository.save(storedBlock);`
`111`	`114`	`return replaced;`