Merge pull request #15 from TheLindaProjectInc/rebrand

Rebrand
TheLindaProjectInc · Jun 15, 2019 · 4186cb4 · 4186cb4
2 parents 5005048 + 181fa68
commit 4186cb4
Show file tree

Hide file tree

Showing 132 changed files with 2,469 additions and 2,302 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Altitude
-The Altitude wallet is the wallet of choice for Lindacoin.
+The Altitude wallet is the wallet of choice for Metrix.
 
 ## Help and troubleshooting
 
@@ -39,7 +39,7 @@ npm install
 npm start
 ```
 
-By default Altitude will download the latest Lindad binary and run it internally. You can connect your own Lindad binary by running it before starting the wallet.
+By default Altitude will download the latest metrixd binary and run it internally. You can connect your own metrixd binary by running it before starting the wallet.
 
 ### Development Commands
 

diff --git a/clientBinaries.json b/clientBinaries.json
@@ -1,4 +1,49 @@
 {
+    "metrixd": {
+        "version": "3.3.3.0",
+        "win32": {
+            "x64": {
+                "download": {
+                    "url": "https://lindaproject.nyc3.digitaloceanspaces.com/metrix/metrixd/3.3.3.0-e725be4/metrixd-win32-x64.exe",
+                    "sha256": "BA5873940F863D9720B3C9769A960EF6AD92D29EA102CD7A0849A1EB27DA1CB2"
+                },
+                "bin": "metrixd.exe"
+            },
+            "ia32": {
+                "download": {
+                    "url": "https://lindaproject.nyc3.digitaloceanspaces.com/metrix/metrixd/3.3.3.0-e725be4/metrixd-win32-x86.exe",
+                    "sha256": "DC71790B7DEF0097455CE4EFAC698DAC9A432D8FC7F4162630A2CD4D025456BA"
+                },
+                "bin": "metrixd.exe"
+            }
+        },
+        "linux": {
+            "x64": {
+                "download": {
+                    "url": "https://lindaproject.nyc3.digitaloceanspaces.com/metrix/metrixd/3.3.3.0-e725be4/metrixd-linux-x64",
+                    "sha256": "6F3EA9B5CBEDA8EFB945ABA828C91910EE1B40963CA99DB2BBF2F2E5D2B7D2F5"
+                },
+                "bin": "metrixd"
+            }
+        },
+        "darwin": {
+            "x64": {
+                "download": {
+                    "url": "https://lindaproject.nyc3.digitaloceanspaces.com/metrix/metrixd/3.3.3.0-e725be4/metrixd-darwin-x64",
+                    "sha256": "D6D9B51A808540F503AA7B5CF4CF1AFCB5E8D5F3AF6BEA85FFB3433CC26C8F70"
+                },
+                "bin": "metrixd"
+            }
+        },
+        "versions": {
+            "3.3.3.0": [
+                "D6D9B51A808540F503AA7B5CF4CF1AFCB5E8D5F3AF6BEA85FFB3433CC26C8F70",
+                "6F3EA9B5CBEDA8EFB945ABA828C91910EE1B40963CA99DB2BBF2F2E5D2B7D2F5",
+                "DC71790B7DEF0097455CE4EFAC698DAC9A432D8FC7F4162630A2CD4D025456BA",
+                "BA5873940F863D9720B3C9769A960EF6AD92D29EA102CD7A0849A1EB27DA1CB2"
+            ]
+        }
+    },
     "Lindad": {
         "version": "3.3.2.0",
         "win32": {

diff --git a/doc/release-notes/release-notes-1.1.0.md b/doc/release-notes/release-notes-1.1.0.md
@@ -21,7 +21,7 @@ Shutdown Altitude if it is already running and then run the installer.
 - Added right click menu for copy and paste on text inputs
 - Added autofill label/address in send page when entering either a known address or label
 - Added extra copy items to transactions
-- Added support for Linda startup commands through the Altitude application. You can now enter startup commands on the Altitude executable like you would the Linda executable 
+- Added support for Metrix startup commands through the Altitude application. You can now enter startup commands on the Altitude executable like you would the Metrix executable 
 ### Bug Fixes
 - Fixed an issue causing  the daemon to freeze on close causing a force kill
 - Fixed an issue where wallet repair sometimes didn't execute

diff --git a/doc/release-notes/release-notes-1.2.0.md b/doc/release-notes/release-notes-1.2.0.md
@@ -12,7 +12,7 @@ Shutdown Altitude if it is already running and then run the installer.
 ### What's New
 - Added masternode config check to alert if you have a bad masternode setup
 - Remember user full screen selection
-- Add support for Linda Core V3.3
+- Add support for Metrix Core V3.3
 
 ### Bug Fixes
 - Fixed an issue causing Altitude to freeze on the peers page

diff --git a/doc/release-notes/release-notes-1.2.1.md b/doc/release-notes/release-notes-1.2.1.md
@@ -10,4 +10,4 @@ Shutdown Altitude if it is already running and then run the installer.
 ## About this Release
 
 ### Bug Fixes
-- Fixed a startup problem causing the startup screen to not disappear when the Linda Core doesn't exist
+- Fixed a startup problem causing the startup screen to not disappear when the Metrix Core doesn't exist
diff --git a/electron-builder.json b/electron-builder.json
@@ -25,7 +25,7 @@
     "target": [
       "nsis"
     ],
-    "legalTrademarks": "Copyright © 2018 Linda Project Inc.",
+    "legalTrademarks": "Copyright © 2019 Linda Project Inc.",
     "publisherName": "Linda Project Inc."
   },
   "nsis": {

diff --git a/lib/client.ts b/lib/client.ts
@@ -15,7 +15,7 @@ const sleep = require('util').promisify(setTimeout)
 export default class Client {
     // client details
     clientsLocation = path.join(app.getPath('userData'), 'clients');
-    clientName = 'Lindad';
+    clientName = 'metrixd';
     clientConfigLocation = ''
     clientConfig: ClientConfig;
     clientLocalLocation: string;
@@ -36,7 +36,7 @@ export default class Client {
     // client status
     status: ClientStatus = ClientStatus.INITIALISING;
     // when using hash of unknown daemon assume version
-    readonly assumeClientVersion = '3.4.0.0';
+    readonly assumeClientVersion = '3.3.3.0';
 
     constructor(win) {
         this.win = win;
@@ -46,18 +46,20 @@ export default class Client {
     }
 
     getClientConfigLocation() {
+        const confName = 'metrix.conf';
+        const dataDir = 'metrix';
         if (os.platform() === 'win32') {
-            this.clientConfigLocation = path.join(app.getPath('userData'), '../', 'Linda', 'Linda.conf');
+            this.clientConfigLocation = path.join(app.getPath('userData'), '../', dataDir, confName);
         } else if (os.platform() === 'linux') {
-            this.clientConfigLocation = path.join(app.getPath('home'), '.Linda', 'Linda.conf');
+            this.clientConfigLocation = path.join(app.getPath('home'), '.' + dataDir, confName);
         } else if (os.platform() === 'darwin') {
-            this.clientConfigLocation = path.join(app.getPath('home'), 'Library', 'Application Support', 'Linda', 'Linda.conf');
+            this.clientConfigLocation = path.join(app.getPath('home'), 'Library', 'Application Support', dataDir, confName);
         }
         // check if we passed a custom data dir
         for (let i = 0; i < process.argv.length; i++) {
             let arg = process.argv[i];
             if (arg.toLowerCase().indexOf('-datadir=') > -1) {
-                this.clientConfigLocation = path.join(arg.split("=")[1].trim(), 'Linda.conf');
+                this.clientConfigLocation = path.join(arg.split("=")[1].trim(), confName);
                 break;
             }
         }
@@ -184,7 +186,10 @@ export default class Client {
         if (!restart) {
             try {
                 const res: any = await helpers.getRequest("https://raw.githubusercontent.com/thelindaprojectinc/altitude/master/clientBinaries.json");
-                clientBinaries = JSON.parse(res.body);
+                let remoteClientBinaries = JSON.parse(res.body);
+                if (compareVersions(clientBinaries[this.clientName].version, remoteClientBinaries[this.clientName].version) >= 0) {
+                    clientBinaries = remoteClientBinaries
+                }
             } catch (ex) {
                 log.info("Client", "Failed to get remote client binaries, using local");
             }
@@ -287,7 +292,7 @@ export default class Client {
     runClient(bin, startupCommands = []) {
         // check for invalid masternode setup
         if (!this.clientConfigFile.hasValidMasternodeSetup) {
-            log.error("Client", "Invalid masternode configuration. Please check your Linda.conf file");
+            log.error("Client", "Invalid masternode configuration. Please check your metrix.conf file");
             this.setClientStatus(ClientStatus.INVALIDMASTERNODECONFIG);
             return;
         }
@@ -302,7 +307,7 @@ export default class Client {
         }
         if (appSettings.proxy) startupCommands.push('-proxy=' + appSettings.proxy)
         if (appSettings.tor) {
-            // Linda Core 3.3 renames tor startup command to onion
+            // Metrix Core 3.3 renames tor startup command to onion
             if (compareVersions(this.clientVersion, '3.3.0.0') >= 0)
                 startupCommands.push('-tor=' + appSettings.tor)
             else

diff --git a/main.ts b/main.ts
@@ -36,7 +36,7 @@ function createWindow() {
   mainWindow = new BrowserWindow({
     center: true,
     minWidth: 800,
-    minHeight: 530,
+    minHeight: 535,
     title: 'Altitude',
     width: width < size.width ? width : size.width,
     height: height < size.height ? height : size.height,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "altitude",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "The Altitude wallet by Linda Project Inc.",
   "homepage": "https://github.com/thelindaprojectinc/altitude",
   "author": {
@@ -9,7 +9,7 @@
   },
   "keywords": [
     "wallet",
-    "linda",
+    "metrix",
     "altitude"
   ],
   "main": "main.js",

diff --git a/src/app/components/address-book/address-book.component.html b/src/app/components/address-book/address-book.component.html
@@ -29,7 +29,7 @@ <h1>{{ 'COMPONENTS.ADDRESSBOOK.TITLE' | translate }}</h1>
                     <td>{{address.account}}</td>
                     <td>{{address.address}}</td>
                     <td class="actions">
-                        <button class="btn btn-icon btn-primary" (click)="selectAddress(address)">
+                        <button class="btn btn-icon btn-default" (click)="selectAddress(address)">
                             <fa-icon icon="hand-pointer"></fa-icon>
                         </button>
                         <button class="btn btn-icon btn-default" (click)="copyAddress(address)">
@@ -80,7 +80,7 @@ <h1>{{ 'COMPONENTS.ADDRESSBOOK.TITLE' | translate }}</h1>
                     <td>{{account.name}}</td>
                     <td>{{account.address}}</td>
                     <td class="actions">
-                        <button class="btn btn-icon btn-primary" (click)="selectAddress(account)">
+                        <button class="btn btn-icon btn-default" (click)="selectAddress(account)">
                             <fa-icon icon="hand-pointer"></fa-icon>
                         </button>
                         <button class="btn btn-icon btn-default" (click)="copyAddress(account)">

diff --git a/src/app/components/prompt/prompt.component.html b/src/app/components/prompt/prompt.component.html
@@ -13,7 +13,7 @@ <h1>{{ 'COMPONENTS.PROMPT.ENTERPASSPHRASETITLE' | translate }}</h1>
       <button type="button" class="btn btn-default" (click)="passphraseModal.buttonCancel()">
         {{ 'MISC.CANCELBUTTON' | translate }}
       </button>
-      <button type="submit" class="btn btn-primary">
+      <button type="submit" class="btn btn-default">
         {{ 'MISC.DONEBUTTON' | translate}}
       </button>
     </div>
@@ -34,7 +34,7 @@ <h1>{{ 'COMPONENTS.PROMPT.CLIENTUPDATETITLE' | translate }}</h1>
         {{ 'COMPONENTS.PROMPT.CLIENTUPDATESKIPBUTTON' | translate }}
       </button>
     </div>
-    <button class="btn btn-primary" (click)="clientUpdateModal.buttonDone()">
+    <button class="btn btn-default" (click)="clientUpdateModal.buttonDone()">
       {{ 'COMPONENTS.PROMPT.CLIENTUPDATEBUTTON' | translate}}
     </button>
   </div>
@@ -54,7 +54,7 @@ <h1>{{ 'COMPONENTS.PROMPT.WALLETUPDATETITLE' | translate }}</h1>
         {{ 'COMPONENTS.PROMPT.CLIENTUPDATESKIPBUTTON' | translate }}
       </button>
     </div>
-    <button class="btn btn-primary" (click)="walletUpdateModal.buttonDone()">
+    <button class="btn btn-default" (click)="walletUpdateModal.buttonDone()">
       {{ 'COMPONENTS.PROMPT.CLIENTUPDATEBUTTON' | translate}}
     </button>
   </div>
@@ -76,7 +76,7 @@ <h1>{{ 'COMPONENTS.PROMPT.CHANGEPASSPHRASETITLE' | translate }}</h1>
       <button type="button" class="btn btn-default" (click)="changePassphraseModal.buttonCancel()">
         {{ 'MISC.CANCELBUTTON' | translate }}
       </button>
-      <button type="submit" class="btn btn-primary">
+      <button type="submit" class="btn btn-default">
         {{'COMPONENTS.PROMPT.CHANGEPASSPHRASEBUTTON' | translate}}
       </button>
     </div>
@@ -97,7 +97,7 @@ <h1>{{ 'COMPONENTS.PROMPT.ENCRYPTTITLE' | translate }}</h1>
       <button type="button" class="btn btn-default" (click)="encryptModal.buttonCancel()">
         {{ 'MISC.CANCELBUTTON' | translate }}
       </button>
-      <button type="submit" class="btn btn-primary">
+      <button type="submit" class="btn btn-default">
         {{'COMPONENTS.PROMPT.ENCRYPTBUTTON' | translate}}
       </button>
     </div>
@@ -118,7 +118,7 @@ <h1>{{ alertModal.title | translate }}</h1>
     <button class="btn btn-default" (click)="alertModal.buttonCancel()" *ngIf="alertModal.cancelButtonContent">
       {{ alertModal.cancelButtonContent | translate }}
     </button>
-    <button class="btn btn-primary right" (click)="alertModal.buttonDone()" *ngIf="alertModal.doneButtonContent">
+    <button class="btn btn-default right" (click)="alertModal.buttonDone()" *ngIf="alertModal.doneButtonContent">
       {{ alertModal.doneButtonContent | translate }}
     </button>
   </div>

diff --git a/src/app/components/side-bar/side-bar.component.html b/src/app/components/side-bar/side-bar.component.html
@@ -1,12 +1,12 @@
 <div class="sidebar">
     <div class="sidebar-top">
         <!-- Balance -->
-        <img src="assets/logo.png" alt="Linda" class="logo" />
+        <img src="assets/logo.png" alt="Metrix" class="logo" />
         <!-- Balance -->
         <h3>{{ 'MISC.BALANCE' | translate | uppercase }}</h3>
         <span>
             {{helpers.prettyCoins(wallet.balance)}}
-            <span class="balance-currency">Linda</span>
+            <span class="balance-currency">Metrix</span>
         </span>
         <!-- Menu -->
         <ul routerLinkActive="active">

diff --git a/src/app/components/transaction-row/transaction-row.component.html b/src/app/components/transaction-row/transaction-row.component.html
@@ -21,9 +21,9 @@ <h5>{{trx.account || trx.address}}</h5>
     <div class="value">
         <div class="amount"
             [ngClass]="{ 'success': trx.category!='Payment To Self'&&trx.amount>=0, 'danger': trx.category!='Payment To Self'&&trx.amount<0}">
-            {{trx.category!='Payment To Self'&&trx.amount>0?'+':''}}{{helpers.prettyCoins(trx.amount)}} Linda
+            {{trx.category!='Payment To Self'&&trx.amount>0?'+':''}}{{helpers.prettyCoins(trx.amount)}} Metrix
         </div>
         <div *ngIf="trx.fee" class="small danger">{{ 'MISC.FEE' | translate }}: {{helpers.prettyCoins(trx.fee)}}
-            Linda</div>
+            Metrix</div>
     </div>
 </div>
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
@@ -6,7 +6,7 @@ <h1>Alert</h1>
   </div>
 
   <h1>{{ 'PAGES.DASHBOARD.ACCOUNTS' | translate }}</h1>
-  <button class="btn btn-primary" (click)="showNewAccountModal()">
+  <button class="btn btn-default" (click)="showNewAccountModal()">
     <fa-icon icon="plus"></fa-icon>
     {{ 'PAGES.DASHBOARD.ADDACCOUNT' | translate }}
   </button>
@@ -26,7 +26,7 @@ <h5>{{account.name}}</h5>
           </div>
           <h6 class="account-balance">
             {{helpers.prettyCoins(account.balance)}}
-            <span>Linda</span>
+            <span>Metrix</span>
           </h6>
           <h6 class="account-address">{{account.address}}</h6>
         </div>
@@ -52,7 +52,7 @@ <h1>{{ 'PAGES.DASHBOARD.CREATEACCOUNTTITLE' | translate }}</h1>
   <text-input [(inputModel)]="newAccountLabel" placeholder="{{ 'MISC.ENTERACCOUNTLABEL' | translate }}"></text-input>
   <div class="modal-buttons">
     <button class="btn btn-default" (click)="addAccountModal.close()">{{ 'MISC.CANCELBUTTON' | translate }}</button>
-    <button class="btn btn-primary" (click)="createNewAccount()">{{ 'PAGES.DASHBOARD.CREATEACCOUNTBUTTON' | translate
+    <button class="btn btn-default" (click)="createNewAccount()">{{ 'PAGES.DASHBOARD.CREATEACCOUNTBUTTON' | translate
       }}</button>
   </div>
 </ngx-smart-modal>