FreeWallet Classic updates

- Add `setCounterpartyAPI()` to get counterparty API information
- Update welcome screen to clearly indicate “FreeWallet Classic”
- Update about screen to indicate “FreeWallet Classic” and current wallet and API versions
- Update app window title bar to indicate “FreeWallet Classic”
- Update `checkWalletUpgrade()` to only check for updates to “FreeWallet Classic”
- Update package.json info to indicate “FreeWallet Classic”
- Renamed linux desktop install file to FreeWallet-Classic.desktop
- Updated linux installer scripts to install “FreeWallet Classic”
- Updated build.sh to copy `FreeWallet-Classic.desktop` file to linux app build
- Update “new version is available” notification filename to FreeWallet-Classic
- bump version number to 0.9.38

Author: jdogresorg

README.md

@@ -1,13 +1,13 @@
-FreeWallet - Desktop Wallet
+FreeWallet Classic - Desktop Wallet
 ---
-FreeWallet is a free wallet which supports Bitcoin and Counterparty.
+FreeWallet Classic is a free wallet which supports Bitcoin and Counterparty Classic.
 
 Installation Instructions
 ---
 ```
-Windows : Download FreeWallet.exe, run it, complete the installer.
-Mac/OSX : Download FreeWallet.dmg, mount, and drag FreeWallet app to 'Applications' folder
-Linux   : Download FreeWallet.tgz, extract it, run FreeWallet/install.sh
+Windows : Download FreeWallet-Classic.exe, run it, complete the installer.
+Mac/OSX : Download FreeWallet-Classic.dmg, mount, and drag FreeWallet-Classic app to 'Applications' folder
+Linux   : Download FreeWallet-Classic.tgz, extract it, run FreeWallet-Classic/install.sh
 ```
 
 Build Notes
@@ -29,10 +29,10 @@ https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases
 Generate checksum.txt file 
 ---
 ```
-sha256sum FreeWallet.linux32.tgz > checksums.txt
-sha256sum FreeWallet.linux64.tgz >> checksums.txt
-sha256sum FreeWallet.osx64.dmg   >> checksums.txt
-sha256sum FreeWallet.win32.exe   >> checksums.txt
-sha256sum FreeWallet.win64.exe   >> checksums.txt
+sha256sum FreeWallet-Classic.linux32.tgz > checksums.txt
+sha256sum FreeWallet-Classic.linux64.tgz >> checksums.txt
+sha256sum FreeWallet-Classic.osx64.dmg   >> checksums.txt
+sha256sum FreeWallet-Classic.win32.exe   >> checksums.txt
+sha256sum FreeWallet-Classic.win64.exe   >> checksums.txt
 ```
 

build.sh

@@ -249,7 +249,7 @@ while true; do
                     cp -a * /tmp/$app_name/
                     echo "### Copying additional files to install directory..."
                     cd $base_dir/misc/
-                    cp FreeWallet.png install.sh FreeWallet.desktop /tmp/$app_name/
+                    cp FreeWallet.png install.sh FreeWallet-Classic.desktop /tmp/$app_name/
                     cd /tmp
                     tar -cvzf $app_name.x$bits.tgz $app_name
                     cp $app_name.x$bits.tgz $base_dir/builds/$app_name/linux$bits/

html/about.html

@@ -1,10 +1,11 @@
 
 <center>
-    <p>FreeWallet is a free wallet which supports Bitcoin and Counterparty.</p>
+    <p>FreeWallet Classic is a free wallet which supports Bitcoin and Counterparty Classic.</p>
     <a href="https://freewallet.io"><img src="images/logo.png" height="100" style="margin-bottom: 5px"></a>
-    <div id="fw_version"></div>
+    <br>Classic Version (<span id="fw_version"></span>)
+    <br>Counterparty API Version (<span id="cp_version"></span>)
     <hr size=1 class="spacer">
-    <p>Freewallet uses public APIs available from the following providers:</p>
+    <p>Freewallet Classic uses public APIs available from the following providers:</p>
     <div>
         <a target="_blank" href="https://tokenscan.io"><img class="about-logo" src="images/tokenscan-color-500.png"></a>
         <a target="_blank" href="https://coindaddy.io"><img class="about-logo" src="images/coindaddy-500.jpg"></a>
@@ -16,7 +17,7 @@
     </div>
     <br>
     <div class="alert alert-info">
-        FreeWallet includes an <i>optional</i> 'Automatic Donation System'<br> 
+        FreeWallet Classic includes an <i>optional</i> 'Automatic Donation System'<br> 
         You can edit your automatic donation preferences at Settings->Preferences<br>
         <i class="fa fa-heart"></i> All donations are appreciated and support hosting and additional development <i class="fa fa-heart"></i>
     </div>
@@ -52,18 +53,23 @@
     var address = '1FWDonkMbC6hL64JiysuggHnUAw2CKWszs',
         debug   = $('#btn-debug'),
         update  = $('#btn-update'),
-        version = (is_nwjs()) ? 'Version ' + nw.App.manifest.version : 'Development Build';
+        apiInfo = FW.COUNTERPARTY_API;
+
+    // Set the FreeWallet and API version information
+    var fw_version = (is_nwjs()) ? nw.App.manifest.version : 'Development Build',
+        cp_version = apiInfo.version_major + '.' + apiInfo.version_minor + '.' + apiInfo.version_revision; 
 
     // Display current version number
-    $('#fw_version').html(version);
+    $('#fw_version').html(fw_version);
+    $('#cp_version').html(cp_version);
 
     // Handle showing/hiding the debug button
     if(is_nwjs()){
         debug.click($.debounce(100,function(e){
             nw.Window.get().showDevTools();
         }));
         update.click($.debounce(100,function(e){
-            checkWalletUpgrade(version, true);
+            checkWalletUpgrade(fw_version, true);
         }));
     } else {
         debug.hide();

html/settings.html

@@ -554,6 +554,7 @@
             return;
         var net = $(this).val();
         setWalletNetwork(net);
+        setCounterpartyAPI(net);
     });
 
     // Handle Updating the auto-lock function
@@ -721,6 +722,11 @@
         }
     });
 
+    // Handle updating CP API info if the API url changes
+    $('#mainnet-cp-host').change(function(){
+        setCounterpartyAPI(FW.WALLET_NETWORK);
+    });
+
     // Handle resetting donate amount
     $('#reset-donate-amount').click(function(){
         FW.DONATE_AMOUNT = FW.DONATE_DEFAULT;

html/welcome.html

@@ -1,6 +1,6 @@
 <div class="text-center">
     <img src="images/logo.png" style="width:200px;margin-bottom:20px;">
-    <p>FreeWallet is a free wallet for Bitcoin and Counterparty, the world’s first protocol for decentralized financial tools.</p>
+    <p>FreeWallet Classic is a free wallet for Bitcoin and Counterparty Classic, the world’s first protocol for decentralized financial tools.</p>
     <div class="row">
         <div class="col-xs-12 col-sm-6">
             <h3><i class="fa fa-lock"></i> Secure</h3>

index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>FreeWallet</title>
+    <title>FreeWallet Classic</title>
     <meta name="robots"      content="index, follow">
     <meta name="viewport"    content="width=device-width, initial-scale=1.0">
     <link type="image/ico" rel="icon"       href="images/favicon.ico">

js/freewallet-desktop.js

@@ -60,21 +60,21 @@ FW.WALLET_HISTORY  = JSON.parse(ls.getItem('walletHistory'))  || [];
 // Define default server info
 FW.WALLET_SERVER_INFO_DEFAULT = {
     mainnet: {
-        host: 'public.tokenscan.io',
+        host: 'classic-api.tokenscan.io',
         port: 4001,
         user: 'rpc',
         pass: 'rpc',
         ssl: true,
-        api_host: 'tokenscan.io',
+        api_host: 'classic.tokenscan.io',
         api_ssl: true
     },
     testnet: {
-        host: 'public.tokenscan.io',
+        host: 'classic-api.tokenscan.io',
         port: 14001,
         user: 'rpc',
         pass: 'rpc',
         ssl: true,
-        api_host: 'testnet.tokenscan.io',
+        api_host: 'classic-testnet.tokenscan.io',
         api_ssl: true
     }
 };
@@ -176,6 +176,9 @@ FW.ASSET_DIVISIBLE = {};
 FW.ASSET_DIVISIBLE['BTC'] = true;
 FW.ASSET_DIVISIBLE['XCP'] = true;
 
+// Define placeholder for current API information
+FW.COUNTERPARTY_API = {};
+
 // Start loading the wallet 
 $(document).ready(function(){
 
@@ -203,6 +206,9 @@ $(document).ready(function(){
     // Setup the explorer API url
     setExplorerAPI(FW.WALLET_NETWORK);
 
+    // Get info on the Counterparty API
+    setCounterpartyAPI(FW.WALLET_NETWORK);
+
     // Initialize the wallet 
     initWallet();
 
@@ -228,10 +234,23 @@ function setExplorerAPI( network ){
     FW.EXPLORER_API = getExplorerAPI(network);
 }
 
+// Handle getting Counterparty API information
+function setCounterpartyAPI(network){
+    var data = {
+       method: "get_running_info",
+        jsonrpc: "2.0",
+        id: 0
+    };
+    cpRequest(network, data, function(o){
+        if(o && o.result)
+            FW.COUNTERPARTY_API = o.result;
+    });
+}
+
 // Handle checking for an updated wallet version
 function checkWalletUpgrade(version, message){
     $.ajax({
-        url: "https://freewallet.io/releases/current",
+        url: "https://freewallet.io/releases/classic/current",
         cache: false
     }).done(function(current){
         // Only proceed if we have a response/version
@@ -3604,7 +3623,7 @@ function dialogComingSoon(){
 function dialogAbout(){
     BootstrapDialog.show({
         type: 'type-default',
-        title: '<i class="fa fa-lg fa-fw fa-info-circle"></i> About FreeWallet',
+        title: '<i class="fa fa-lg fa-fw fa-info-circle"></i> About FreeWallet Classic',
         id: 'dialog-about',
         closeByBackdrop: false,
         message: $('<div></div>').load('html/about.html')
@@ -3916,7 +3935,7 @@ function dialogUpdateAvailable(version){
                         os   = require('os'),
                         plat = os.platform(),
                         arch = os.arch(),
-                        file = 'FreeWallet.',
+                        file = 'FreeWallet-Classic.',
                         url  = 'https://github.com/jdogresorg/freewallet-desktop/releases/download/v' + version + '/';
                     // Determine the correct file to download based off platform and architecture
                     if(plat=='darwin'){
@@ -3931,7 +3950,7 @@ function dialogUpdateAvailable(version){
                     url += file;
                     nw.Shell.openExternal(url);
                 } else {
-                    var url = 'https://github.com/jdogresorg/freewallet/releases/tag/v' + version;
+                    var url = 'https://github.com/jdogresorg/freewallet-desktop/releases/tag/v' + version;
                     window.open(url);
                 }
             }
@@ -4424,7 +4443,7 @@ function dialogWelcome(){
         cssClass: 'dialog-welcome',
         closable: false,
         closeByBackdrop: false,
-        title: '<i class="fa fa-lg fa-fw fa-info-circle"></i> Welcome to FreeWallet',
+        title: '<i class="fa fa-lg fa-fw fa-info-circle"></i> Welcome to FreeWallet Classic',
         message: $('<div></div>').load('html/welcome.html'),
         buttons:[{
             label: 'Login to Existing Wallet',

misc/FreeWallet.desktop misc/FreeWallet-Classic.desktopmisc/FreeWallet.desktop renamed to misc/FreeWallet-Classic.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=FreeWallet
+Name=FreeWallet Classic
 Comment=by Jeremy Johnson <j-dog@j-dog.net>
-Exec=/usr/share/FreeWallet/FreeWallet %U
-Icon=/usr/share/icons/FreeWallet/FreeWallet.png
+Exec=/usr/share/FreeWallet-Classic/FreeWallet-Classic %U
+Icon=/usr/share/icons/FreeWallet-Classic/FreeWallet.png
 Terminal=false
 Categories=Office;
 MimeType=x-scheme-handler/bitcoin;x-scheme-handler/counterparty;x-scheme-handler/freewallet;

misc/FreeWallet.iss misc/FreeWallet-Classic.issmisc/FreeWallet.iss renamed to misc/FreeWallet-Classic.iss

@@ -1,19 +1,19 @@
-; FreeWallet.iss
+; FreeWallet-Classic.iss
 ;
 ; Config file for creating a windows installer file for tbe
 ;
 
 
 [Setup]
-AppName=FreeWallet
-AppVersion=0.9.2
-DefaultDirName={pf}\FreeWallet
+AppName=FreeWallet Classic
+AppVersion=0.9.38
+DefaultDirName={pf}\FreeWallet Classic
 DefaultGroupName=FreeWallet
-UninstallDisplayIcon={app}\FreeWallet.exe
+UninstallDisplayIcon={app}\FreeWallet-Classic.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=C:\Users\J-Dog\Desktop\
-OutputBaseFilename=FreeWallet
+OutputBaseFilename=FreeWallet Classic
 
 ; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
 ; done in "64-bit mode" on x64, meaning it should use the native
@@ -49,5 +49,5 @@ Source: "C:\Users\J-Dog\Desktop\FreeWallet\*"; DestDir: "{app}"; Flags: ignoreve
 
 ; Setup icon group and icon on desktop
 [Icons]
-Name: "{group}\FreeWallet";          Filename: "{app}\FreeWallet.exe"
-Name: "{commondesktop}\FreeWallet";  Filename: "{app}\FreeWallet.exe"
+Name: "{group}\FreeWallet Classic";          Filename: "{app}\FreeWallet-Classic.exe"
+Name: "{commondesktop}\FreeWallet Classic";  Filename: "{app}\FreeWallet-Classic.exe"

misc/install.sh

@@ -4,18 +4,18 @@
 ###########################################################
 basedir=/usr/share
 echo "### Creating installation directories..."
-mkdir -vp $basedir/FreeWallet
-mkdir -vp $basedir/icons/FreeWallet
+mkdir -vp $basedir/FreeWallet-Classic
+mkdir -vp $basedir/icons/FreeWallet-Classic
 mkdir -vp $basedir/applications
-echo "### Installing FreeWallet..."
-cp -a * $basedir/FreeWallet/
-cp FreeWallet.png $basedir/icons/FreeWallet/
+echo "### Installing FreeWallet Classic..."
+cp -a * $basedir/FreeWallet-Classic/
+cp FreeWallet.png $basedir/icons/FreeWallet-Classic/
 echo "### Integrating FreeWallet with linux desktop..."
-cp FreeWallet.desktop $basedir/applications
+cp FreeWallet-Classic.desktop $basedir/applications
 echo "### Setting file permissions..."
-chmod 644 $basedir/icons/FreeWallet/FreeWallet.png 
-chmod 644 $basedir/applications/FreeWallet.desktop
-chmod 755 $basedir/FreeWallet/*
+chmod 644 $basedir/icons/FreeWallet-Classic/FreeWallet.png 
+chmod 644 $basedir/applications/FreeWallet-Classic.desktop
+chmod 755 $basedir/FreeWallet-Classic/*
 echo "### Updating desktop database..."
 /usr/bin/update-desktop-database
 echo "### Installation Complete!"