diff --git a/README.md b/README.md
index caae9359..48a2cd0d 100644
--- 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
index 36f8e005..7f90daac 100644
--- 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
index dbbc276b..5065d00c 100644
--- 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
index 51ecde00..3f3f5bf3 100644
--- 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
index 83d617b9..5f194453 100644
--- 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
index 087d0128..2cf72c17 100644
--- 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
index 856fe545..407030da 100644
--- 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
index 3b165bdc..a8968aa0 100644
--- 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
index 94779d9c..5ae47357 100644
--- 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
index 47dceaba..0fb11e94 100644
--- a/src/app/components/address-book/address-book.component.html
+++ b/src/app/components/address-book/address-book.component.html
@@ -29,7 +29,7 @@ {{ 'COMPONENTS.ADDRESSBOOK.TITLE' | translate }}
{{address.account}} |
{{address.address}} |
- |