Merge pull request #8 from SigwoTechnologies/v1.13.0

1.13.0 version release
SigwoTechnologies · Feb 9, 2020 · c03c877 · c03c877
2 parents 606e0a0 + e9e27f2
commit c03c877
Show file tree

Hide file tree

Showing 688 changed files with 5,479 additions and 4,550 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,16 +26,12 @@ ENV LC_ALL C.UTF-8
 #RUN su - $USER # switch to testuser
 
 # Install Jupiter
-RUN apt-get update && apt-get install -y build-essential software-properties-common python-software-properties g++ libssl-dev apache2-utils curl git python make nano
-RUN add-apt-repository ppa:webupd8team/java -y
-RUN apt-get update
-RUN apt-get install -y wget unzip
-RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
+RUN apt-get update && apt-get install -y build-essential software-properties-common python-software-properties g++ libssl-dev apache2-utils curl git python make nano wget unzip 
+RUN apt install -y openjdk-8-jre-headless openjdk-8-jdk
 
 # compile Jupiter
 RUN cd /root && git clone https://github.com/sigwotechnologies/jupiter && \
 cd jupiter && chmod + compile.sh && ./compile.sh
 
 # both Jupiter ports get exposed
-EXPOSE 7874 7876
+EXPOSE 7864 7876
diff --git a/README.md b/README.md
@@ -8,11 +8,12 @@ Jupiter is the base platform needed to run the [Gravity](https://github.com/Sigw
 ----
 ## Get it! ##
 
+=======
   - *pre-packaged* - `https://github.com/SigwoTechnologies/jupiter/releases` and download the latest release.
 
   - *dependencies*:
     - *General* - Java 8
-    - *Ubuntu* - `http://www.webupd8.org/2012/09/install-oracle-java-8-in-ubuntu-via-ppa.html`
+    - *Ubuntu* - `apt install openjdk-8-jre-headless`
     - *Debian* - `http://www.webupd8.org/2014/03/how-to-install-oracle-java-8-in-debian.html`
     - *FreeBSD* - `pkg install openjdk8`
 

diff --git a/README.txt b/README.txt
@@ -79,7 +79,7 @@ close the browser but keep the java process running. If you want to keep
 forging, make sure you do not click on "stop forging" when logging out. You can
 also just close the browser without logging out.
 
-The java process communicates with peers on port 7874 tcp by default. If you are
+The java process communicates with peers on port 7864 tcp by default. If you are
 behind a router or a firewall and want to have your node accept incoming peer
 connections, you should setup port forwarding. The server will still work though
 even if only outgoing connections are allowed, so opening this port is optional.

diff --git a/changelogs/jrs-client-1.12.0.changelog.txt b/changelogs/jrs-client-1.12.0.changelog.txt
@@ -0,0 +1,3 @@
+* Increased forging requirement from 1,000 to 10,000.
+* Removed https://exchange.darcr.us swap site links
+* Fixed pipeline tests and Dockerfile
diff --git a/changelogs/jrs-client-1.12.2e.changelog.txt b/changelogs/jrs-client-1.12.2e.changelog.txt
@@ -0,0 +1,2 @@
+[*] Reverted 10,000 forging to 1,000
+[*] Changed peer port to 7864 so Nxt and Jupiter do not connect
diff --git a/changelogs/jrs-client-1.13.0.changelog.txt b/changelogs/jrs-client-1.13.0.changelog.txt
@@ -0,0 +1,2 @@
+[*] Limit old version connection to v1.12.2+
+[*] Misc updates
diff --git a/classes/nxt/BlockchainProcessorImpl$1.class b/classes/nxt/BlockchainProcessorImpl$1.class
diff --git a/classes/nxt/BlockchainProcessorImpl.class b/classes/nxt/BlockchainProcessorImpl.class
diff --git a/classes/nxt/Constants.class b/classes/nxt/Constants.class
diff --git a/classes/nxt/Nxt$Init.class b/classes/nxt/Nxt$Init.class
diff --git a/classes/nxt/Nxt.class b/classes/nxt/Nxt.class
diff --git a/classes/nxt/env/DesktopSystemTray.class b/classes/nxt/env/DesktopSystemTray.class
diff --git a/classes/nxt/http/APITestServlet.class b/classes/nxt/http/APITestServlet.class
diff --git a/classes/nxt/http/GetBlockchainStatus.class b/classes/nxt/http/GetBlockchainStatus.class
diff --git a/classes/nxt/peer/Peers$Init.class b/classes/nxt/peer/Peers$Init.class
diff --git a/classes/nxt/peer/Peers.class b/classes/nxt/peer/Peers.class
diff --git a/classes/nxt/util/UPnP.class b/classes/nxt/util/UPnP.class
diff --git a/conf/nxt-default.properties b/conf/nxt-default.properties
@@ -35,8 +35,8 @@
 # peers. If disabled, peer networking servlet will not be started at all.
 nxt.shareMyAddress=true
 
-# Port for incoming peer to peer networking requests, if enabled.
-nxt.peerServerPort=7874
+# Port for incoming peer to peer networking requests, if enabled. Updated in 1.12.2e
+nxt.peerServerPort=7864
 
 # Enable UPnP for the peer port.
 nxt.enablePeerUPnP=true
@@ -71,7 +71,7 @@ nxt.defaultPeers=
 
 # A list of well known peer addresses / host names, separated by '; '. These
 # peers are always kept in connected state.
-nxt.wellKnownPeers=jpr.sigwo.com;104.236.80.199;jpr4.sigwo.tech;sk-jpr.sigwo.tech;
+nxt.wellKnownPeers=jpr.sigwo.com;jpr4.sigwo.com;jpr8.gojupiter.tech;
 
 # Known bad peers to be blacklisted.
 nxt.knownBlacklistedPeers=
@@ -90,7 +90,7 @@ nxt.maxNumberOfInboundConnections=250
 nxt.maxNumberOfOutboundConnections=50
 
 # Maintain active connections with at least that many peers.
-nxt.maxNumberOfConnectedPublicPeers=20
+nxt.maxNumberOfConnectedPublicPeers=200
 
 # Stop adding new peers when number of known peers exceeds that many.
 nxt.maxNumberOfKnownPeers=2000
@@ -128,8 +128,8 @@ nxt.pullThreshold=0
 # Blacklist peers for 600000 milliseconds (i.e. 10 minutes by default).
 nxt.blacklistingPeriod=600000
 
-# Consider a new transaction or block sent after 10 peers have received it.
-nxt.sendToPeersLimit=10
+# Consider a new transaction or block sent after 2 peers have received it.
+nxt.sendToPeersLimit=2
 
 # Enable the Jetty Denial of Service Filter for the peer networking server.
 nxt.enablePeerServerDoSFilter=true
@@ -150,7 +150,7 @@ nxt.savePeers=true
 
 # Set to false to disable use of the peers database and the default initial
 # peers. This will not delete saved peers.
-nxt.usePeersDb=true
+nxt.usePeersDb=false
 
 # Set to false to disable getting more peers from the currently connected peers.
 # Only useful when debugging and want to limit the peers to those in peersDb or
@@ -257,7 +257,7 @@ nxt.disableAdminPassword=false
 # The maximum number of records possible to retrieve with a single request. This
 # restriction is not enforced if the admin password is provided, or is not
 # needed (disabled or listening on localhost only).
-nxt.maxAPIRecords=100
+nxt.maxAPIRecords=1000
 
 # API event registration timeout (seconds). The timeout is reset each time an
 # event wait request is received from the application. The minimum value is 15
@@ -614,4 +614,4 @@ nxt.disableSecurityPolicy=false
 
 
 # NRS version.
-nxt.version=1.11.7.1
+nxt.version=1.13.0
diff --git a/contrib/Dockerfile b/contrib/Dockerfile
@@ -26,16 +26,12 @@ ENV LC_ALL C.UTF-8
 #RUN su - $USER # switch to testuser
 
 # Install Jupiter
-RUN apt-get update && apt-get install -y build-essential software-properties-common python-software-properties g++ libssl-dev apache2-utils curl git python make nano
-RUN add-apt-repository ppa:webupd8team/java -y
-RUN apt-get update
-RUN apt-get install -y wget unzip
-RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
+RUN apt-get update && apt-get install -y build-essential software-properties-common python-software-properties g++ libssl-dev apache2-utils curl git python make nano wget unzip 
+RUN apt install -y openjdk-8-jre-headless openjdk-8-jdk
 
 # compile Jupiter
 RUN cd /root && git clone https://github.com/sigwotechnologies/jupiter && \
-cd jupiter && chmod + compile.sh && ./compile.sh && ./run.sh
+cd jupiter && chmod + compile.sh && ./compile.sh
 
 # both Jupiter ports get exposed
-EXPOSE 7874 7876
+EXPOSE 7864 7876
diff --git a/html/doc/allclasses-frame.html b/html/doc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jan 23 04:35:28 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_181) on Sun Feb 09 03:25:40 UTC 2020 -->
 <title>All Classes</title>
-<meta name="date" content="2019-01-23">
+<meta name="date" content="2020-02-09">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/html/doc/allclasses-noframe.html b/html/doc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jan 23 04:35:28 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_181) on Sun Feb 09 03:25:40 UTC 2020 -->
 <title>All Classes</title>
-<meta name="date" content="2019-01-23">
+<meta name="date" content="2020-02-09">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>