From 580bde265451ecb7356e8b08721405595f9b9605 Mon Sep 17 00:00:00 2001 From: knaccc Date: Sun, 8 Mar 2020 14:25:10 +0000 Subject: [PATCH] v1.16 version bump replace "--proxy" with "--tx-proxy" in mipseed instructions revert to older jdk13_33 to fix windows gui dll issue --- README.md | 14 +++++++------- bin/import-packages.sh | 2 +- bin/java-config.sh | 18 +++++++++--------- mipseed.md | 2 +- .../src/org/getmonero/i2p/zero/VERSION | 2 +- .../org.getmonero.util.normalizeZip.iml | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index cc9e511..09047ca 100755 --- a/README.md +++ b/README.md @@ -27,14 +27,14 @@ Download the latest binary releases for Mac/Windows/Linux here: https://github.c The zero-dependency distribution sizes are as follows: -OS | Uncompressed size (MB) | Compressed size (MB) | v1.15 Reproducible build SHA-256 +OS | Uncompressed size (MB) | Compressed size (MB) | v1.16 Reproducible build SHA-256 ------------ | ----------------------- | --------------------- | ------------------------------------------------------------------ -Mac | 40.0 | 26.7 | `bd483be3f3528afda4620ae05ce4be0528993388e913148f95af36496e6525b0` -Windows | 41.9 | 30.5 | `cb6839c759a0a56dd0a6614de9576add4fc784a617c4a8677aab953b721e970c` -Linux | 51.6 | 33.3 | `d41f79bfa9dadfa7050736fd7e1a77a623bd8db966742cb4c2a642150702621b` -Mac GUI | 62.9 | 45.8 | `540952c4b6c61455d9efa88a1033b1f5d68edc5db8c81ed1b99e485b3b0d4adc` -Windows GUI | 63.8 | 48.8 | `92bc613047b9059e5673fbb54bb28eda590abe53c26ce48869273a6d81731450` -Linux GUI | 77.6 | 53.8 | `31f0327401f93fc4ebe608db9e46c354e93f41c457c4e1151ad4a28b5f992bfe` +Mac | 40.1 | 26.7 | `5a5afce35e31f4227882296bda327c24dff6196a1b6ee74fd716e123fa653e9d` +Windows | 47.7 | 32.3 | `ebddbac99ad8e232c8cfd5339cbfccf4963ac705016fe5a67b1bdd2b6d4233a9` +Linux | 51.8 | 33.4 | `64997e53ef27c84c3f3e871ef6b0b1f1feccf7aa7d60ccac5060f7694e9d2dfa` +Mac GUI | 63.0 | 45.8 | `c8e1a5c572ef7bff231df76b7c7be2a2ea300ced4b8dbefbd329afac75ccbcaf` +Windows GUI | 70.4 | 50.8 | `bc91c60075d0b10d0b443702176ad1997e6a571182b9ad6c2f68bdcdbbf432de` +Linux GUI | 77.9 | 53.8 | `e60e1bc257085988caa448b34d90eba803b7323f6f1e44cf4fba93b39c0eda96` Note: Reproducible builds are currently experimental. Due to JDK differences, Builds on Mac will consistently have different hashes than builds on Linux. Official releases will always be built on Linux (Ubuntu). diff --git a/bin/import-packages.sh b/bin/import-packages.sh index ae772cf..d7cf126 100755 --- a/bin/import-packages.sh +++ b/bin/import-packages.sh @@ -33,7 +33,7 @@ if [ ! -d "$basedir/import/jdks" ]; then fi if [ ! -d "$basedir/import/apache-ant-1.10.7" ]; then - wget https://www-us.apache.org/dist//ant/binaries/apache-ant-1.10.7-bin.tar.gz + wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz tar zxvf apache-ant-1.10.7-bin.tar.gz fi diff --git a/bin/java-config.sh b/bin/java-config.sh index c20e9ef..42b7582 100644 --- a/bin/java-config.sh +++ b/bin/java-config.sh @@ -8,17 +8,17 @@ fi export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 -JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz -JDK_DOWNLOAD_FILENAME_MAC=OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz -JDK_DOWNLOAD_FILENAME_WIN=OpenJDK13U-jdk_x86-32_windows_hotspot_13.0.2_8.zip +JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz +JDK_DOWNLOAD_FILENAME_MAC=OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz +JDK_DOWNLOAD_FILENAME_WIN=OpenJDK13U-jdk_x64_windows_hotspot_13_33.zip -JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz -JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz -JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x86-32_windows_hotspot_13.0.2_8.zip +JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz +JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz +JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_windows_hotspot_13_33.zip -JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-13.0.2+8 -JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-13.0.2+8/Contents/Home -JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-13.0.2+8 +JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-13+33 +JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-13+33/Contents/Home +JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-13+33 JAVAFX_VERSION=13 JAVAFX_SDK_DOWNLOAD_URL_LINUX=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_linux-x64_bin-sdk.zip diff --git a/mipseed.md b/mipseed.md index 3f69597..af8af11 100644 --- a/mipseed.md +++ b/mipseed.md @@ -7,7 +7,7 @@ 6. Create a server tunnel for incoming I2P connections by typing: `router/bin/tunnel-control.sh server.create.vanity 127.0.0.1 8061 none xyz` replacing `xyz` with a 3 alphanumeric character vanity prefix for your public b32.i2p address. This command will take a few minutes to complete, depending on how fast your CPU is. If you do not want a vanity prefix, use the command: `router/bin/tunnel-control.sh server.create 127.0.0.1 8061` 7. The command above will result in an I2P address being printed to the command line, which will end with `.b32.i2p`. This is your new I2P address. 8. You now need to keep a backup of your private keys to your I2P address on another computer for safekeeping. Do this by taking a backup of the `~/.i2p-zero/config/tunnels.json` file -9. Run monerod by typing the following, replacing `XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.b32.i2p` with your own I2P address that was printed from step 5: `monerod --proxy i2p,127.0.0.1:8060 --add-peer dsc7fyzzultm7y6pmx2avu6tze3usc7d27nkbzs5qwuujplxcmzq.b32.i2p --anonymous-inbound XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.b32.i2p,127.0.0.1 --prune-blockchain --detach`. Note than in future Monero versions, you will have to replace "--proxy" with "--tx-proxy" +9. Run monerod by typing the following, replacing `XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.b32.i2p` with your own I2P address that was printed from step 5: `monerod --tx-proxy i2p,127.0.0.1:8060 --add-peer dsc7fyzzultm7y6pmx2avu6tze3usc7d27nkbzs5qwuujplxcmzq.b32.i2p --anonymous-inbound XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.b32.i2p,127.0.0.1 --prune-blockchain --detach`. 10. (optional) Use software such as wondershaper for Linux to limit bandwidth usage. See this: https://www.ostechnix.com/how-to-limit-network-bandwidth-in-linux-using-wondershaper/ That's it! Do not replace the dsc****.b32.i2p address with yours, only replace the XXXXXXX.b32.i2p one. You are now running a mipseed, which will itself be seeded by dsc_'s mipseed. diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION index 07fe6f6..03ff897 100644 --- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION +++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION @@ -1 +1 @@ -1.15 \ No newline at end of file +1.16 \ No newline at end of file diff --git a/org.getmonero.util.normalizeZip/org.getmonero.util.normalizeZip.iml b/org.getmonero.util.normalizeZip/org.getmonero.util.normalizeZip.iml index 9074b00..5a85535 100644 --- a/org.getmonero.util.normalizeZip/org.getmonero.util.normalizeZip.iml +++ b/org.getmonero.util.normalizeZip/org.getmonero.util.normalizeZip.iml @@ -10,7 +10,7 @@ - +