From b1aa4c1f6050927ce7b7e8b88c0f62636a9317f9 Mon Sep 17 00:00:00 2001 From: Oleksandr Iozhytsia Date: Thu, 3 Dec 2020 15:25:55 +0200 Subject: [PATCH 1/2] 1. leveldbjni-all maven dependency repo changed from spring to softmotions. 2. SDK version was updated to 0.2.6 --- examples/simpleapp/README.md | 4 ++-- examples/simpleapp/mc_sc_workflow_example.md | 6 +++--- examples/simpleapp/pom.xml | 4 ++-- pom.xml | 2 +- qa/SidechainTestFramework/sc_test_framework.py | 2 +- qa/SidechainTestFramework/scutil.py | 4 ++-- sdk/pom.xml | 10 +++++----- tools/sctool/pom.xml | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/simpleapp/README.md b/examples/simpleapp/README.md index 393ff1d307..75d9f6af6b 100644 --- a/examples/simpleapp/README.md +++ b/examples/simpleapp/README.md @@ -19,12 +19,12 @@ Otherwise, to run SimpleApp outside the IDE: * (Windows) ``` cd Sidechains-SDK\examples\simpleapp - java -cp ./target/sidechains-sdk-simpleapp-0.2.5.jar;./target/lib/* com.horizen.examples.SimpleApp + java -cp ./target/sidechains-sdk-simpleapp-0.2.6.jar;./target/lib/* com.horizen.examples.SimpleApp ``` * (Linux) ``` cd ./Sidechains-SDK/examples/simpleapp - java -cp ./target/sidechains-sdk-simpleapp-0.2.5.jar:./target/lib/* com.horizen.examples.SimpleApp + java -cp ./target/sidechains-sdk-simpleapp-0.2.6.jar:./target/lib/* com.horizen.examples.SimpleApp ``` On some Linux OSs during backward transfers certificates proofs generation a extremely big RAM consumption may happen, that will lead to the process force killing by the OS. While we keep monitoring the memory footprint of the proofs generation process, we have verified that setting the glibc per-thread cache with the following command 'export GLIBC_TUNABLES=glibc.malloc.tcache_count=0' just before starting the sidechain node in order keeps the memory consumption in check. diff --git a/examples/simpleapp/mc_sc_workflow_example.md b/examples/simpleapp/mc_sc_workflow_example.md index c27869a883..de64a0826d 100644 --- a/examples/simpleapp/mc_sc_workflow_example.md +++ b/examples/simpleapp/mc_sc_workflow_example.md @@ -15,7 +15,7 @@ Build SDK components by using command (in the root of the SDK folder): Run Bootstrapping tool using command: -`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.5.jar` +`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.6.jar` All other command are performed as commands for Bootstrapping tool in next format: `"command name" "parameters for command in JSON format"`. For any help you could use command `help`, for exit just print `exit` @@ -280,9 +280,9 @@ Run SimpleApp with the `my_settings.conf`: * For Windows: ``` - java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.5.jar;./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/simpleapp/src/main/resources/my_settings.conf + java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.6.jar;./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/simpleapp/src/main/resources/my_settings.conf ``` * For Linux: ``` - java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.5.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/simpleapp/src/main/resources/my_settings.conf + java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.6.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/simpleapp/src/main/resources/my_settings.conf ``` diff --git a/examples/simpleapp/pom.xml b/examples/simpleapp/pom.xml index d973d545b4..2740dec5fd 100644 --- a/examples/simpleapp/pom.xml +++ b/examples/simpleapp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-simpleapp - 0.2.5 + 0.2.6 2018 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.2.5 + 0.2.6 diff --git a/pom.xml b/pom.xml index e5e73906ad..aaf013124c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.horizen Sidechains - 0.2.5 + 0.2.6 2018 UTF-8 diff --git a/qa/SidechainTestFramework/sc_test_framework.py b/qa/SidechainTestFramework/sc_test_framework.py index d85b24aa49..cb1cf530e5 100644 --- a/qa/SidechainTestFramework/sc_test_framework.py +++ b/qa/SidechainTestFramework/sc_test_framework.py @@ -111,7 +111,7 @@ def main(self): help="Don't stop bitcoinds after the test execution") parser.add_option("--zendir", dest="zendir", default="ZenCore/src", help="Source directory containing zend/zen-cli (default: %default)") - parser.add_option("--scjarpath", dest="scjarpath", default="../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.5.jar;../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp", #New option. Main class path won't be needed in future + parser.add_option("--scjarpath", dest="scjarpath", default="../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.6.jar;../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp", #New option. Main class path won't be needed in future help="Directory containing .jar file for SC (default: %default)") parser.add_option("--tmpdir", dest="tmpdir", default="../examples/simpleapp/target/tmp", help="Root directory for datadirs") diff --git a/qa/SidechainTestFramework/scutil.py b/qa/SidechainTestFramework/scutil.py index 32456075dc..91e6895813 100644 --- a/qa/SidechainTestFramework/scutil.py +++ b/qa/SidechainTestFramework/scutil.py @@ -98,7 +98,7 @@ def sync_sc_mempools(api_connections, wait_for=25): def launch_bootstrap_tool(command_name, json_parameters): json_param = json.dumps(json_parameters) java_ps = subprocess.Popen(["java", "-jar", - "../tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.5.jar", + "../tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.6.jar", command_name, json_param], stdout=subprocess.PIPE) sc_bootstrap_output = java_ps.communicate()[0] jsone_node = json.loads(sc_bootstrap_output) @@ -342,7 +342,7 @@ def start_sc_node(i, dirname, extra_args=None, rpchost=None, timewait=None, bina lib_separator = ";" if binary is None: - binary = "../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.5.jar" + lib_separator + "../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp" + binary = "../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.6.jar" + lib_separator + "../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp" # else if platform.system() == 'Linux': bashcmd = 'java -cp ' + binary + " " + (datadir + ('/node%s.conf' % i)) sidechainclient_processes[i] = subprocess.Popen(bashcmd.split()) diff --git a/sdk/pom.xml b/sdk/pom.xml index ca3364f3a1..ba24654421 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.horizen sidechains-sdk - 0.2.5 + 0.2.6 ${project.groupId}:${project.artifactId} Zendoo is a unique sidechain and scaling solution developed by Horizen. The Zendoo ${project.artifactId} is a framework that supports the creation of sidechains and their custom business logic, with the Horizen public blockchain as the mainchain. https://github.com/${project.github.organization}/${project.artifactId} @@ -207,7 +207,7 @@ 1.64 compile - + org.ethereum leveldbjni-all @@ -217,9 +217,9 @@ - spring-plugin-repo - Spring Plugin Repository - https://repo.spring.io/plugins-release + softmotions_repository + Softmotions Public Repository + https://repo.softmotions.com/repository/softmotions-public diff --git a/tools/sctool/pom.xml b/tools/sctool/pom.xml index f99902a10d..e00e211908 100644 --- a/tools/sctool/pom.xml +++ b/tools/sctool/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-scbootstrappingtools - 0.2.5 + 0.2.6 2018 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.2.5 + 0.2.6 From 5d03b5d972e0c0552444d94460a19c14017bf3db Mon Sep 17 00:00:00 2001 From: lander86 Date: Fri, 4 Dec 2020 11:13:17 +0100 Subject: [PATCH 2/2] fixed the CI setting the jdk11 to the latest package version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bede0a47b5..134e29c477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ services: env: global: - - CONTAINER_JAVA_VER="openjdk-11-jdk-headless=11.0.8+10-0ubuntu1~18.04.1" + - CONTAINER_JAVA_VER="openjdk-11-jdk-headless" - CONTAINER_SCALA_VER="2.12.12" - CONTAINER_SCALA_DEB_SHA256SUM="7ecbc3850d8186c0084be37c01cdd987e97328fdd74eb781bf6dc050dba95276"