From c2e9056ae0ff9668116603a81edc544b27cef18d Mon Sep 17 00:00:00 2001 From: paolocappelletti Date: Sat, 24 Jun 2023 16:07:13 +0200 Subject: [PATCH 1/2] 0.6.1 final --- CHANGELOG.md | 3 +++ README.md | 2 +- examples/simpleapp/README.md | 6 +++--- examples/simpleapp/mc_sc_workflow_example.md | 8 ++++---- examples/simpleapp/pom.xml | 4 ++-- pom.xml | 2 +- qa/SidechainTestFramework/sc_test_framework.py | 2 +- qa/SidechainTestFramework/scutil.py | 6 +++--- .../secure_enclave_http_api_server.py | 2 +- sdk/pom.xml | 2 +- tools/signingtool/pom.xml | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a5e3e9b22..f1f43d5626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +**0.6.1** +1. Update zendoo-sc-cryptolib to final 0.6.0 + **0.6.0** 1. Sidechain version 2 support with the new circuit type - threshold signature circuit with key rotation. 2. Certificate key rotation API endpoints added. diff --git a/README.md b/README.md index f5c2192b46..2c86256392 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ While we keep monitoring the memory footprint of the proofs generation process, - After the installation, just run `export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` before starting the sidechain node, or run the sidechain node adding `LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` at the beginning of the java command line as follows: ``` -LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.6.0.jar:./target/lib/* com.horizen.examples.SimpleApp +LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.6.1.jar:./target/lib/* com.horizen.examples.SimpleApp ``` - In the folder `ci` you will find the script `run_sc.sh` to automatically check and use jemalloc library while starting the sidechain node. diff --git a/examples/simpleapp/README.md b/examples/simpleapp/README.md index a29c8ec159..f10640db52 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.6.0.jar;./target/lib/* com.horizen.examples.SimpleApp + java -cp ./target/sidechains-sdk-simpleapp-0.6.1.jar;./target/lib/* com.horizen.examples.SimpleApp ``` * (Linux) ``` cd ./Sidechains-SDK/examples/simpleapp - java -cp ./target/sidechains-sdk-simpleapp-0.6.0.jar:./target/lib/* com.horizen.examples.SimpleApp + java -cp ./target/sidechains-sdk-simpleapp-0.6.1.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. @@ -36,7 +36,7 @@ While we keep monitoring the memory footprint of the proofs generation process, - After the installation, just run `export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` before starting the sidechain node, or run the sidechain node adding `LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` at the beginning of the java command line as follows: ``` - LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.6.0.jar:./target/lib/* com.horizen.examples.SimpleApp + LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.6.1.jar:./target/lib/* com.horizen.examples.SimpleApp ``` - In the folder `ci` you will find the script `run_sc.sh` to automatically check and use jemalloc library while starting the sidechain node. diff --git a/examples/simpleapp/mc_sc_workflow_example.md b/examples/simpleapp/mc_sc_workflow_example.md index c45d457cf2..8788842422 100644 --- a/examples/simpleapp/mc_sc_workflow_example.md +++ b/examples/simpleapp/mc_sc_workflow_example.md @@ -32,7 +32,7 @@ Build SDK components by using a command (in the root of the Sidechains-SDK folde Run Bootstrapping tool using the command: -`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.6.0.jar` +`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.6.1.jar` All other commands are performed as commands for Bootstrapping tool in the next format: `"command name" "parameters for command in JSON format"`. For any help, you could use the command `help`, for the exit just print `exit` @@ -455,15 +455,15 @@ Run SimpleApp with the `my_settings.conf`: * For Windows: ``` - java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.0.jar;./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf + java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.1.jar;./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf ``` * For Linux (Glibc): ``` - java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.0.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf + java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.1.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf ``` * For Linux (Jemalloc): ``` - LD_PRELOAD=/libjemalloc.so.1 java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.0.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf + LD_PRELOAD=/libjemalloc.so.1 java -cp ./examples/simpleapp/target/sidechains-sdk-simpleapp-0.6.1.jar:./examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp ./examples/my_settings.conf ``` - In the folder `ci` you will find the script `run_sc.sh` to automatically check and use jemalloc library while starting the sidechain node. diff --git a/examples/simpleapp/pom.xml b/examples/simpleapp/pom.xml index 54e391b7db..8c8b405f15 100644 --- a/examples/simpleapp/pom.xml +++ b/examples/simpleapp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-simpleapp - 0.6.0 + 0.6.1 2018 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.6.0 + 0.6.1 junit diff --git a/pom.xml b/pom.xml index 2b8789da19..8899006123 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.horizen Sidechains - 0.6.0 + 0.6.1 2018 UTF-8 diff --git a/qa/SidechainTestFramework/sc_test_framework.py b/qa/SidechainTestFramework/sc_test_framework.py index bb3bcced4b..b7de0ab21d 100644 --- a/qa/SidechainTestFramework/sc_test_framework.py +++ b/qa/SidechainTestFramework/sc_test_framework.py @@ -131,7 +131,7 @@ def main(self): parser.add_option("--zendir", dest="zendir", default="ZenCore/src", help="Source directory containing zend/zen-cli (default: %default)") examples_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../..', 'examples')) - parser.add_option("--scjarpath", dest="scjarpath", default=f"{examples_dir}/simpleapp/target/sidechains-sdk-simpleapp-0.6.0.jar;{examples_dir}/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=f"{examples_dir}/simpleapp/target/sidechains-sdk-simpleapp-0.6.1.jar;{examples_dir}/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=tempfile.mkdtemp(prefix="sc_test"), help="Root directory for datadirs") diff --git a/qa/SidechainTestFramework/scutil.py b/qa/SidechainTestFramework/scutil.py index 3d452978de..b60a0c5f6b 100755 --- a/qa/SidechainTestFramework/scutil.py +++ b/qa/SidechainTestFramework/scutil.py @@ -126,7 +126,7 @@ def launch_bootstrap_tool(command_name, json_parameters): json_param = json.dumps(json_parameters) java_ps = subprocess.Popen(["java", "-jar", os.getenv("SIDECHAIN_SDK", - "..") + "/tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.6.0.jar", + "..") + "/tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.6.1.jar", command_name, json_param], stdout=subprocess.PIPE) sc_bootstrap_output = java_ps.communicate()[0] try: @@ -148,7 +148,7 @@ def launch_db_tool(dirName, storageNames, command_name, json_parameters): json_param = json.dumps(json_parameters) java_ps = subprocess.Popen(["java", "-jar", os.getenv("SIDECHAIN_SDK", - "..") + "/tools/dbtool/target/sidechains-sdk-dbtools-0.6.0.jar", + "..") + "/tools/dbtool/target/sidechains-sdk-dbtools-0.6.1.jar", storagesPath, storageNames, command_name, json_param], stdout=subprocess.PIPE) db_tool_output = java_ps.communicate()[0] try: @@ -562,7 +562,7 @@ def start_sc_node(i, dirname, extra_args=None, rpchost=None, timewait=None, bina lib_separator = ";" examples_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../..', 'examples')) if binary is None: - binary = f"{examples_dir}/simpleapp/target/sidechains-sdk-simpleapp-0.6.0.jar" + lib_separator + f"{examples_dir}/simpleapp/target/lib/* com.horizen.examples.SimpleApp" + binary = f"{examples_dir}/simpleapp/target/sidechains-sdk-simpleapp-0.6.1.jar" + lib_separator + f"{examples_dir}/simpleapp/target/lib/* com.horizen.examples.SimpleApp" # else if platform.system() == 'Linux': ''' In order to effectively attach a debugger (e.g IntelliJ) to the simpleapp, it is necessary to start the process diff --git a/qa/SidechainTestFramework/secure_enclave_http_api_server.py b/qa/SidechainTestFramework/secure_enclave_http_api_server.py index c9e55514da..6b59db418a 100644 --- a/qa/SidechainTestFramework/secure_enclave_http_api_server.py +++ b/qa/SidechainTestFramework/secure_enclave_http_api_server.py @@ -82,7 +82,7 @@ def launch_signing_tool(json_parameters): java_ps = subprocess.Popen(["java", "-jar", os.getenv("SIDECHAIN_SDK", "..") - + "/tools/signingtool/target/sidechains-sdk-signingtools-0.6.0.jar", + + "/tools/signingtool/target/sidechains-sdk-signingtools-0.6.1.jar", "createSignature", json_param], stdout=subprocess.PIPE) db_tool_output = java_ps.communicate()[0] try: diff --git a/sdk/pom.xml b/sdk/pom.xml index 1ec102b019..9f87b33fe1 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.horizen sidechains-sdk - 0.6.0 + 0.6.1 ${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} diff --git a/tools/signingtool/pom.xml b/tools/signingtool/pom.xml index 25580b775e..259a8c6095 100644 --- a/tools/signingtool/pom.xml +++ b/tools/signingtool/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-signingtools - 0.6.0 + 0.6.1 2022 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.6.0 + 0.6.1 From 576b47e8c81c65fe4ecc43a9eb03bf116c26f12e Mon Sep 17 00:00:00 2001 From: paolocappelletti Date: Sat, 24 Jun 2023 16:28:54 +0200 Subject: [PATCH 2/2] update version --- tools/dbtool/pom.xml | 4 ++-- tools/sctool/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/dbtool/pom.xml b/tools/dbtool/pom.xml index e80fc7fc94..dec4ca7b17 100644 --- a/tools/dbtool/pom.xml +++ b/tools/dbtool/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-dbtools - 0.6.0 + 0.6.1 2022 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.6.0 + 0.6.1 diff --git a/tools/sctool/pom.xml b/tools/sctool/pom.xml index 0bf731953d..78808b5fb1 100644 --- a/tools/sctool/pom.xml +++ b/tools/sctool/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.horizen sidechains-sdk-scbootstrappingtools - 0.6.0 + 0.6.1 2018 UTF-8 @@ -16,7 +16,7 @@ io.horizen sidechains-sdk - 0.6.0 + 0.6.1