Skip to content

Commit

Permalink
BC 1.68
Browse files Browse the repository at this point in the history
  • Loading branch information
fireduck64 committed Dec 26, 2020
1 parent 75ed3f0 commit 783ddfb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -16,7 +16,7 @@ FROM openjdk:11-slim as run
COPY --from=build /channels/bazel-bin/ChannelNode_deploy.jar /channels/
COPY docker/node.conf /channels/node.conf

CMD java -Xmx1g -jar /channels/ChannelNode_deploy.jar /channels/node.conf
CMD java -Xmx256m -jar /channels/ChannelNode_deploy.jar /channels/node.conf



6 changes: 3 additions & 3 deletions WORKSPACE
Expand Up @@ -40,8 +40,8 @@ maven_install(
"commons-codec:commons-codec:1.11",
"org.apache.commons:commons-math3:3.6.1",
"io.netty:netty-tcnative-boringssl-static:2.0.28.Final",
"org.bouncycastle:bcprov-jdk15on:1.66",
"org.bouncycastle:bcpkix-jdk15on:1.66",
"org.bouncycastle:bcprov-jdk15on:1.68",
"org.bouncycastle:bcpkix-jdk15on:1.68",
"com.thetransactioncompany:jsonrpc2-server:1.11",
"net.minidev:json-smart:2.3",
"com.lambdaworks:scrypt:1.4.0",
Expand Down Expand Up @@ -69,7 +69,7 @@ pinned_maven_install()
git_repository(
name = "snowblossom",
remote = "https://github.com/snowblossomcoin/snowblossom",
commit = "fd1a34f0ae882900116cb2c8d59f8d31f9a4318e",
commit = "909868bdb7aa0b8752a6291938604f39cd9b302a",
shallow_since = "1607220214 -0800"
)

Expand Down
3 changes: 3 additions & 0 deletions docker/node.conf
Expand Up @@ -4,6 +4,9 @@ db_path=/data/channels/node.db

wallet_path=/data/channels/node.wallet


channel_list=hello

#web_port=8080
#socks_port=1080

Expand Down
30 changes: 15 additions & 15 deletions maven_install.json
@@ -1,6 +1,6 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1782416155,
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -233191360,
"conflict_resolution": {},
"dependencies": [
{
Expand Down Expand Up @@ -454,32 +454,32 @@
"url": "https://repo1.maven.org/maven2/org/bitlet/weupnp/0.1.4/weupnp-0.1.4.jar"
},
{
"coord": "org.bouncycastle:bcpkix-jdk15on:1.66",
"coord": "org.bouncycastle:bcpkix-jdk15on:1.68",
"dependencies": [
"org.bouncycastle:bcprov-jdk15on:jar:1.66"
"org.bouncycastle:bcprov-jdk15on:jar:1.68"
],
"directDependencies": [
"org.bouncycastle:bcprov-jdk15on:jar:1.66"
"org.bouncycastle:bcprov-jdk15on:jar:1.68"
],
"file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.66/bcpkix-jdk15on-1.66.jar",
"file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.68/bcpkix-jdk15on-1.68.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.66/bcpkix-jdk15on-1.66.jar",
"https://maven.google.com/org/bouncycastle/bcpkix-jdk15on/1.66/bcpkix-jdk15on-1.66.jar"
"https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.68/bcpkix-jdk15on-1.68.jar",
"https://maven.google.com/org/bouncycastle/bcpkix-jdk15on/1.68/bcpkix-jdk15on-1.68.jar"
],
"sha256": "02d61268352fdb35dba996c9ca68a3f793d7b8bfa75754aac66d696517a421bd",
"url": "https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.66/bcpkix-jdk15on-1.66.jar"
"sha256": "fb8d0f8f673ad6e16c604732093d7aa31b26ff4e0bd9cae1d7f99984c06b8a0f",
"url": "https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.68/bcpkix-jdk15on-1.68.jar"
},
{
"coord": "org.bouncycastle:bcprov-jdk15on:1.66",
"coord": "org.bouncycastle:bcprov-jdk15on:1.68",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.66/bcprov-jdk15on-1.66.jar",
"file": "v1/https/repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.66/bcprov-jdk15on-1.66.jar",
"https://maven.google.com/org/bouncycastle/bcprov-jdk15on/1.66/bcprov-jdk15on-1.66.jar"
"https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar",
"https://maven.google.com/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar"
],
"sha256": "1b861dba1c5445de9b38a1789c211ef28b9d07e26d1fa38bee717e5b51162ffe",
"url": "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.66/bcprov-jdk15on-1.66.jar"
"sha256": "f732a46c8de7e2232f2007c682a21d1f4cc8a8a0149b6b7bd6aa1afdc65a0f8d",
"url": "https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.jar"
},
{
"coord": "org.hamcrest:hamcrest-core:1.3",
Expand Down
2 changes: 1 addition & 1 deletion src/ChannelGlobals.java
Expand Up @@ -2,7 +2,7 @@

public class ChannelGlobals
{
public static final String VERSION = "v0.7.0-2020.10.05.05";
public static final String VERSION = "v0.7.0-2020.12.25.00";
public static final String USER_ADDRESS_STRING="user";
public static final String NODE_ADDRESS_STRING="node";
public static final String CHANNEL_ADDRESS_STRING="chan";
Expand Down

0 comments on commit 783ddfb

Please sign in to comment.