Skip to content

Commit 330b34d

Browse files
committed
Merge branch 'leveldb_jni_dependency_fix'
2 parents 35df59d + 5d03b5d commit 330b34d

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010

1111
env:
1212
global:
13-
- CONTAINER_JAVA_VER="openjdk-11-jdk-headless=11.0.8+10-0ubuntu1~18.04.1"
13+
- CONTAINER_JAVA_VER="openjdk-11-jdk-headless"
1414
- CONTAINER_SCALA_VER="2.12.12"
1515
- CONTAINER_SCALA_DEB_SHA256SUM="7ecbc3850d8186c0084be37c01cdd987e97328fdd74eb781bf6dc050dba95276"
1616

examples/simpleapp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Otherwise, to run SimpleApp outside the IDE:
1919
* (Windows)
2020
```
2121
cd Sidechains-SDK\examples\simpleapp
22-
java -cp ./target/sidechains-sdk-simpleapp-0.2.5.jar;./target/lib/* com.horizen.examples.SimpleApp <path_to_config_file>
22+
java -cp ./target/sidechains-sdk-simpleapp-0.2.6.jar;./target/lib/* com.horizen.examples.SimpleApp <path_to_config_file>
2323
```
2424
* (Linux)
2525
```
2626
cd ./Sidechains-SDK/examples/simpleapp
27-
java -cp ./target/sidechains-sdk-simpleapp-0.2.5.jar:./target/lib/* com.horizen.examples.SimpleApp <path_to_config_file>
27+
java -cp ./target/sidechains-sdk-simpleapp-0.2.6.jar:./target/lib/* com.horizen.examples.SimpleApp <path_to_config_file>
2828
```
2929
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.
3030
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.

examples/simpleapp/mc_sc_workflow_example.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build SDK components by using command (in the root of the SDK folder):
1515

1616
Run Bootstrapping tool using command:
1717

18-
`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.5.jar`
18+
`java -jar tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.6.jar`
1919

2020
All other command are performed as commands for Bootstrapping tool in next format: `"command name" "parameters for command in JSON format"`.
2121
For any help you could use command `help`, for exit just print `exit`
@@ -280,9 +280,9 @@ Run SimpleApp with the `my_settings.conf`:
280280

281281
* For Windows:
282282
```
283-
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
283+
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
284284
```
285285
* For Linux:
286286
```
287-
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
287+
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
288288
```

examples/simpleapp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>io.horizen</groupId>
44
<artifactId>sidechains-sdk-simpleapp</artifactId>
5-
<version>0.2.5</version>
5+
<version>0.2.6</version>
66
<inceptionYear>2018</inceptionYear>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>io.horizen</groupId>
1818
<artifactId>sidechains-sdk</artifactId>
19-
<version>0.2.5</version>
19+
<version>0.2.6</version>
2020
</dependency>
2121

2222
<dependency>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.horizen</groupId>
44
<artifactId>Sidechains</artifactId>
5-
<version>0.2.5</version>
5+
<version>0.2.6</version>
66
<inceptionYear>2018</inceptionYear>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

qa/SidechainTestFramework/sc_test_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def main(self):
111111
help="Don't stop bitcoinds after the test execution")
112112
parser.add_option("--zendir", dest="zendir", default="ZenCore/src",
113113
help="Source directory containing zend/zen-cli (default: %default)")
114-
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
114+
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
115115
help="Directory containing .jar file for SC (default: %default)")
116116
parser.add_option("--tmpdir", dest="tmpdir", default="../examples/simpleapp/target/tmp",
117117
help="Root directory for datadirs")

qa/SidechainTestFramework/scutil.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def sync_sc_mempools(api_connections, wait_for=25):
9898
def launch_bootstrap_tool(command_name, json_parameters):
9999
json_param = json.dumps(json_parameters)
100100
java_ps = subprocess.Popen(["java", "-jar",
101-
"../tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.5.jar",
101+
"../tools/sctool/target/sidechains-sdk-scbootstrappingtools-0.2.6.jar",
102102
command_name, json_param], stdout=subprocess.PIPE)
103103
sc_bootstrap_output = java_ps.communicate()[0]
104104
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
342342
lib_separator = ";"
343343

344344
if binary is None:
345-
binary = "../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.5.jar" + lib_separator + "../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp"
345+
binary = "../examples/simpleapp/target/sidechains-sdk-simpleapp-0.2.6.jar" + lib_separator + "../examples/simpleapp/target/lib/* com.horizen.examples.SimpleApp"
346346
# else if platform.system() == 'Linux':
347347
bashcmd = 'java -cp ' + binary + " " + (datadir + ('/node%s.conf' % i))
348348
sidechainclient_processes[i] = subprocess.Popen(bashcmd.split())

sdk/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.horizen</groupId>
55
<artifactId>sidechains-sdk</artifactId>
6-
<version>0.2.5</version>
6+
<version>0.2.6</version>
77
<name>${project.groupId}:${project.artifactId}</name>
88
<description>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.</description>
99
<url>https://github.com/${project.github.organization}/${project.artifactId}</url>
@@ -207,7 +207,7 @@
207207
<version>1.64</version>
208208
<scope>compile</scope>
209209
</dependency>
210-
<!-- https://mvnrepository.com/artifact/org.ethereum/leveldbjni-all -->
210+
<!-- https://repo.softmotions.com/repository/softmotions-public/org/ethereum/leveldbjni-all -->
211211
<dependency>
212212
<groupId>org.ethereum</groupId>
213213
<artifactId>leveldbjni-all</artifactId>
@@ -217,9 +217,9 @@
217217
</dependencies>
218218
<repositories>
219219
<repository>
220-
<id>spring-plugin-repo</id>
221-
<name>Spring Plugin Repository</name>
222-
<url>https://repo.spring.io/plugins-release</url>
220+
<id>softmotions_repository</id>
221+
<name>Softmotions Public Repository</name>
222+
<url>https://repo.softmotions.com/repository/softmotions-public</url>
223223
</repository>
224224
</repositories>
225225
<build>

tools/sctool/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>io.horizen</groupId>
44
<artifactId>sidechains-sdk-scbootstrappingtools</artifactId>
5-
<version>0.2.5</version>
5+
<version>0.2.6</version>
66
<inceptionYear>2018</inceptionYear>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>io.horizen</groupId>
1818
<artifactId>sidechains-sdk</artifactId>
19-
<version>0.2.5</version>
19+
<version>0.2.6</version>
2020
</dependency>
2121

2222
<dependency>

0 commit comments

Comments
 (0)