Merge pull request #42 from interbiznw/master

Updates, bumped version, update preview...

README.md

@@ -13,6 +13,7 @@ https://github.com/BTCPrivate/bitcoin-private-full-node-wallet/releases
 
 ![Bitcoin Private Desktop Wallet](https://github.com/BTCPrivate/bitcoin-private-full-node-wallet/raw/master/docs/WalletPreviewWin.png "Bitcoin Private Desktop Wallet")
 
+![Bitcoin Private Desktop Wallet Addresses](https://github.com/BTCPrivate/bitcoin-private-full-node-wallet/raw/master/docs/WalletPreviewWin2.png "Bitcoin Private Desktop Wallet Addresses]")
 
 #### WARNING: Be careful when using this software! It is highly experimental.
 #### Always test with small amounts first! It is your responsibility to properly handle your private keys!
@@ -89,8 +90,10 @@ Running the .jar will automatically set up `~/.btcprivate/btcprivate.conf` for y
 rpcuser=ENTER-RANDOM-ALPHANUMERICAL-PASSWORD
 rpcpassword=ENTER-RANDOM-ALPHANUMERICAL-PASSWORD
 rpcport=7932
+upnp=1
 #addnode=...
 
+
 ```
 
 ### Notes from ZENCash - Known Issues and Limitations

build-mac.sh

@@ -8,7 +8,7 @@
 # set up your app name, version number, and background image file name
 APP_NAME="BitcoinPrivateDesktopWallet"
 APP_DISPLAY_NAME="Bitcoin Private Desktop Wallet"
-VERSION="1.1.3"
+VERSION="1.1.4"
 APP_EXE="${APP_DISPLAY_NAME}.app/Contents/MacOS/JavaAppLauncher"
 VOL_NAME="${APP_NAME}_${VERSION}"
 DMG_TMP="${VOL_NAME}-temp.dmg"
@@ -73,7 +73,7 @@ echo "******************"
 echo ""
 
 #build the jar from source
-./gradlew clean fatJar 
+./gradlew clean fatJar
 
 echo ""
 echo "*******************"
@@ -124,22 +124,22 @@ cp -rpf "${APP_DISPLAY_NAME}.app" "${STAGING_DIR}"
 #  assumes our contents are at least 5M!
 SIZE=`du -sh "${STAGING_DIR}" | sed 's/\([0-9]*\)M\(.*\)/\1/'`
 SIZE=`echo "${SIZE} + 5.0" | bc | awk '{print int($1+0.5)}'`
- 
+
 if [ $? -ne 0 ]; then
    echo "Error: Cannot compute size of staging dir"
    exit
 fi
- 
+
 # create the temp DMG file
 hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
       -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${SIZE}M "${DMG_TMP}"
- 
+
 echo "Created DMG: ${DMG_TMP}"
- 
+
 # mount it and save the device
 DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
          egrep '^/dev/' | sed 1q | awk '{print $1}')
- 
+
 sleep 2
 
 # add a link to the Applications dir
@@ -180,16 +180,16 @@ sync
 
 # unmount it
 hdiutil detach "${DEVICE}"
- 
+
 # now make the final image a compressed disk image
 echo "Creating compressed image"
 hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
- 
+
 # clean up
 rm -rf "${DMG_TMP}"
 rm -rf "${STAGING_DIR}"
 # rm -rf "${APP_DISPLAY_NAME}.app"
 
 echo 'Done.'
- 
+
 exit

src/main/java/org/btcprivate/wallets/fullnode/ui/AboutDialog.java

@@ -33,7 +33,12 @@ public AboutDialog(JFrame parent)
         licensePanel.setLayout(new BorderLayout(3, 3));
         JTextArea licenseLabel = new JTextArea();
         licenseLabel.setText(
-                "" + "Copyright (c) 2018 - The Bitcoin Private Team\n\n"
+                "" + "Copyright (c) 2017-2019 - The Bitcoin Private Team\n\n"
+                        + "Jamie Owens (J62) <j.owens@interbiznw.com>"
+                        + "\n"
+                        + "Donate BTCP T: b1HTGSNJ5aGxd57BY3aeFDNzXMe9EhCuQrT"
+                        + "\nDonate BTCP Z: zkRHfhtnZXvckwBNZZB3Wb97YMa4UTetu8o872hXpNvEo65VCFy6V285zCZmp5VodSJBnHMKgy1qLsm7fceS9p18msFQNe4"
+                        +"\n\n"
                         + "Jon Layton <me@jonl.io>"
                         + "\n"
                         + "Donate BTCP T: b1DaAu8Un1qmjxQtGnDMcFjmYW6tP55ebvi"
@@ -88,4 +93,4 @@ public void actionPerformed(ActionEvent e)
 
         pack();
     }
-}
+}

src/main/java/org/btcprivate/wallets/fullnode/ui/BTCPWalletUI.java

@@ -23,7 +23,7 @@
  * This Java source file was generated by the Gradle 'init' task.
  */
 public class BTCPWalletUI extends JFrame {
-    private static final String VERSION = "1.1.3";
+    private static final String VERSION = "1.1.4";
     private BTCPInstallationObserver installationObserver;
     private BTCPClientCaller clientCaller;
     private StatusUpdateErrorReporter errorReporter;
@@ -290,14 +290,14 @@ public BTCPWalletUI(StartupProgressDialog progressDialog, String title)
                 showRestartRequired();
             }
         );
-    
+
 	    langFrench.addActionListener(
 	        e -> {
 	          Util.setLanguage("fr");
 	          showRestartRequired();
 	        }
 	    );
-	    
+
 	    langSpanish.addActionListener(
 	        e -> {
 	          Util.setLanguage("es-ES");

src/main/resources/config/config.txt

@@ -116,6 +116,9 @@
 # both prior transactions and several dozen future transactions.
 #keypool=100
 
+#Enable upnp to manage and open port 7933 to gather more peers(connections) and allow p2p connections to help strengthen the network.
+upnp=1
+
 # Pay an optional transaction fee every time you send Bitcoin Private.  Transactions with fees
 # are more likely than free transactions to be included in generated blocks, so may
 # be validated sooner. This setting does not affect private transactions created with