From 32856db2a28df57389faa9a329c26c5300a81920 Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Wed, 5 Sep 2018 14:02:38 +0200 Subject: [PATCH 01/45] FIX issue in Batch split - when there is more destination addresses than it should be --- app/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main.js b/app/main.js index ac65348d..70301141 100644 --- a/app/main.js +++ b/app/main.js @@ -1948,8 +1948,8 @@ function getTxHexStringsForSplit(event, txData, toAddresses, splitToInSatoshi, f quotient += 1; } - // if there is less/more addresses - refund the rest to the last address - if (quotient !== toAddresses.length) { + // if there is less addresses - refund the rest to the last address + if (quotient > toAddresses.length) { quotient = toAddresses.length; } @@ -1981,7 +1981,7 @@ function getTxHexStringsForSplit(event, txData, toAddresses, splitToInSatoshi, f // Sign history/transaction with PKs for (let value of data.values()) { - for (let i = 0; i < history.length; i++) { + for (let i = 0; i < value.history.length; i++) { txObj = zencashjs.transaction.signTx(txObj, i, value.pk, true); } } From e29fe73ae152a6ed1d462b5f2aad0c3c380eb4be Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Wed, 5 Sep 2018 14:06:30 +0200 Subject: [PATCH 02/45] reorder right menu --- app/zwallet.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/zwallet.html b/app/zwallet.html index 6fd05d11..64f98e71 100644 --- a/app/zwallet.html +++ b/app/zwallet.html @@ -453,9 +453,9 @@

Change Wallet Password
+ -
From f026cfdfb65a3b8c90d7b739bf11dba7e2ea98dd Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Fri, 7 Sep 2018 14:13:11 +0200 Subject: [PATCH 03/45] update packages --- package.json | 58 +++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index b1c740a4..a316f237 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "keywords": [ "zen", - "zencash", + "horizen", "equihash", "wallet", "windows", @@ -35,7 +35,7 @@ "desktop", "electron" ], - "author": "ZEN team ", + "author": "Horizen team ", "contributors": [ { "name": "@lukas", @@ -48,23 +48,11 @@ { "name": "@Tigger", "email": "kamila@zensystem.io" - }, - { - "name": "@woky", - "email": "woky@zensystem.io" - }, - { - "name": "@nonghost", - "email": "neduchal@gmail.com" - }, - { - "name": "@k4chn1k", - "email": "k4chn1k@gmail.com" } ], "license": "MIT", "engines": { - "node": ">=6.0" + "node": ">=10.2.0" }, "build": { "appId": "io.zensystem.arizen", @@ -105,48 +93,48 @@ "dependencies": { "axios": "^0.18.0", "axios-debug-log": "^0.4.0", - "bip32-utils": "^0.11.0", - "bitcoinjs-lib": "^3.3.1", - "bs58check": "2.1.1", - "delay": "^3.0.0", - "electron-debug": "^1.5.0", - "electron-download": "^4.1.0", - "electron-packager": "^12.1.0", - "electron-simple-updater": "^1.2.3", - "electron-tabs": "^0.9.1", + "bip32-utils": "^0.11.1", + "bitcoinjs-lib": "^3.3.2", + "bs58check": "2.1.2", + "delay": "^4.0.0", + "electron-debug": "^2.0.0", + "electron-download": "^4.1.1", + "electron-packager": "^12.1.1", + "electron-simple-updater": "^1.2.4", + "electron-tabs": "^0.9.4", "errors": "^0.3.0", "flatten-packages": "^0.1.4", - "fs-extra": "^6.0.1", + "fs-extra": "^7.0.0", "immutable": "^3.8.2", "is-ip": "^2.0.0", "jspdf": "^1.4.0", - "luxon": "^1.2.1", + "luxon": "^1.3.3", "node-json-rpc2": "^1.1.0", "node-ssh": "^5.1.1", - "npm": "^6.1.0", + "npm": "^6.4.1", "open-ssh-tunnel": "^0.3.1", "password-hash": "^1.2.2", "ping": "^0.2.2", - "qrcode": "^1.2.0", + "qrcode": "^1.2.2", "sql.js": "^0.5.0", "zencashjs": "^1.1.9-a" }, "devDependencies": { - "ajv": "^6.5.0", + "ajv": "^6.5.3", "ajv-keywords": "^3.2.0", "coveralls": "^3.0.1", "deepmerge": "^2.0.1", "devtron": "^1.4.0", - "electron": "^2.0.2", - "electron-builder": "20.10.0", - "electron-builder-squirrel-windows": "20.11.0", - "flow-bin": "^0.73.0", + "electron": "^2.0.8", + "electron-builder": "20.28.4", + "electron-builder-squirrel-windows": "20.28.3", + "flow-bin": "^0.80.0", "json-file-plus": "^3.3.0", - "yargs": "^11.0.0" + "yargs": "^12.0.1" }, "optionalDependencies": { "electron-installer-debian": "^0.8.1", - "electron-installer-dmg": "^1.0.0", + "electron-installer-dmg": "^2.0.0", "electron-installer-windows": "^1.0.2" } } From ee8b5fcbc28ba28ee00b139935ac9166a45fa6d7 Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Fri, 7 Sep 2018 14:19:46 +0200 Subject: [PATCH 04/45] fix typo in path for linux binaries --- updates.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/updates.json b/updates.json index 7a1c36c2..e3ad8b2f 100644 --- a/updates.json +++ b/updates.json @@ -1,8 +1,8 @@ { "linux-x64-prod": { "readme": "1st version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x96_64.AppImage", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x96_64.AppImage", + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", "version": "1.2.0" }, "win32-x64-prod": { @@ -19,8 +19,8 @@ }, "linux-x64-beta": { "readme": "beta version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x96_64.AppImage", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x96_64.AppImage", + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", "version": "1.2.0-beta" }, "win32-x64-beta": { From 0506f389f9a001adeb13efa0e97438b1a0f3df14 Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Fri, 7 Sep 2018 14:29:23 +0200 Subject: [PATCH 05/45] update version to v1.2.1 --- README.md | 8 ++++++-- package.json | 4 ++-- release.json | 6 +++--- updates.json | 36 ++++++++++++++++++------------------ 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index d00ab33f..1457bb6e 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Code Climate][codeclimate-img]][codeclimate-url] # User Manuals +- v1.2.1: [Arizen v1.2.1 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen.v1.2.1.Wallet.User.Manual.pdf) - v1.2.0: [Arizen v1.2.0 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen.v1.2.0.Wallet.User.Manual.pdf) - v1.1.9: [Arizen v1.1.9 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen.v1.1.9.Wallet.User.Manual.pdf) - v1.1.8: [Arizen v1.1.8 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.8/Arizen.v1.1.8.Wallet.User.Manual.pdf) @@ -17,11 +18,14 @@ # Version History +## v1.2.1 +- [ ] +- [ ] + ## v1.2.0 -- [ ] Brand expansion +- [x] Brand expansion - [x] FIX: max button - ## v1.1.91 - [x] FIX: generate new T address - [x] FIX: max button diff --git a/package.json b/package.json index a316f237..874b85a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Arizen", - "version": "1.2.0", - "description": "Arizen is light API wallet for ZenCash with localy stored and encrypted files.", + "version": "1.2.1", + "description": "Arizen is light API wallet for Horizen with localy stored and encrypted files.", "main": "app/main.js", "scripts": { "postinstall": "electron-builder install-app-deps", diff --git a/release.json b/release.json index 7a2461ae..4dee9e89 100644 --- a/release.json +++ b/release.json @@ -1,6 +1,6 @@ { - "url": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-mac.zip", - "name": "1.2.0", + "url": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-mac.zip", + "name": "1.2.1", "notes": "1st Version", - "pub_date": "22-8-2018" + "pub_date": "30-9-2018" } diff --git a/updates.json b/updates.json index e3ad8b2f..8fe7a288 100644 --- a/updates.json +++ b/updates.json @@ -1,38 +1,38 @@ { "linux-x64-prod": { "readme": "1st version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", - "version": "1.2.0" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-x86_64.AppImage", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-x86_64.AppImage", + "version": "1.2.1" }, "win32-x64-prod": { "readme": "1st version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0", - "version": "1.2.0" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1", + "version": "1.2.1" }, "darwin-x64-prod": { "readme": "1st version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/release.json", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0.dmg", - "version": "1.2.0" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/release.json", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1.dmg", + "version": "1.2.1" }, "linux-x64-beta": { "readme": "beta version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0-x86_64.AppImage", - "version": "1.2.0-beta" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-x86_64.AppImage", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-x86_64.AppImage", + "version": "1.2.1-beta" }, "win32-x64-beta": { "readme": "beta version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0", - "version": "1.2.0-beta" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1", + "version": "1.2.1-beta" }, "darwin-x64-beta": { "readme": "beta version", - "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/release.json", - "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen-1.2.0.dmg", - "version": "1.2.0-beta" + "update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/release.json", + "install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1.dmg", + "version": "1.2.1-beta" } } From bc1b616bac711684457dbf4ab64394c161e714f1 Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Fri, 7 Sep 2018 15:55:48 +0200 Subject: [PATCH 06/45] update engines --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ac56ba9f..0711839e 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,8 @@ ], "license": "MIT", "engines": { - "node": ">=10.2.0" + "node": ">=10.0.0", + "npm": ">=6.0.0" }, "build": { "appId": "io.zensystem.arizen", From efb50c97b5c7e1199446877355ed23b6e2401c77 Mon Sep 17 00:00:00 2001 From: Lukas Bures Date: Sat, 8 Sep 2018 12:34:21 +0200 Subject: [PATCH 07/45] update appId --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0711839e..e28b229e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "npm": ">=6.0.0" }, "build": { - "appId": "io.zensystem.arizen", + "appId": "global.horizen.arizen", "mac": { "category": "public.app-category.finance", "type": "distribution" From 7ca43fd0de9e00a9b460adbb2d861567ebf0e844 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Fri, 5 Oct 2018 00:07:13 +0200 Subject: [PATCH 08/45] Sleep for linux only. --- app/main.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/main.js b/app/main.js index 6513e302..a8e48d01 100644 --- a/app/main.js +++ b/app/main.js @@ -38,6 +38,12 @@ const userWarningExportWalletEncrypted = "You are going to export an ENCRYPTED w // Show/Hide Development menu process.env.NODE_ENV = "production"; +let sleepTimeOSDependent = () => {if (os.platform() === 'linux'){ return 334 } else { return 0 } } + +function sleep(millis) { + return new Promise(resolve => setTimeout(resolve, millis)); +} + function attachUpdaterHandlers() { function onUpdateDownloaded() { let version = updater.meta.version; @@ -452,7 +458,9 @@ function setSettings(newSettings) { axiosApi = axios.create({ baseURL: settings.domainFrontingUrl, headers: { - "Host": settings.domainFrontingHost + "Host": settings.domainFrontingHost, + "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0" + }, timeout: 30000, }); @@ -613,11 +621,15 @@ function importOnePK(pk, name = "", isT = true) { async function apiGet(url) { const resp = await axiosApi(url); + console.log(sleepTimeOSDependent()); + await sleep(sleepTimeOSDependent()); return resp.data; } async function apiPost(url, form) { const resp = await axiosApi.post(url, querystring.stringify(form)); + console.log(sleepTimeOSDependent()); + await sleep(sleepTimeOSDependent()); return resp.data; } From 66173ddcefe07fd8427dbe385bedf10232b00233 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Fri, 5 Oct 2018 00:24:02 +0200 Subject: [PATCH 09/45] Sleep for linux only. Clean. --- app/main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/main.js b/app/main.js index a8e48d01..5c1247b4 100644 --- a/app/main.js +++ b/app/main.js @@ -621,14 +621,12 @@ function importOnePK(pk, name = "", isT = true) { async function apiGet(url) { const resp = await axiosApi(url); - console.log(sleepTimeOSDependent()); await sleep(sleepTimeOSDependent()); return resp.data; } async function apiPost(url, form) { const resp = await axiosApi.post(url, querystring.stringify(form)); - console.log(sleepTimeOSDependent()); await sleep(sleepTimeOSDependent()); return resp.data; } From ae575acc5cdf28463675c9720cf4245834faa922 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Fri, 5 Oct 2018 10:47:38 +0200 Subject: [PATCH 10/45] Rewrite sleepTimeOSDependent. --- app/main.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/main.js b/app/main.js index 5c1247b4..415dc4c3 100644 --- a/app/main.js +++ b/app/main.js @@ -38,7 +38,15 @@ const userWarningExportWalletEncrypted = "You are going to export an ENCRYPTED w // Show/Hide Development menu process.env.NODE_ENV = "production"; -let sleepTimeOSDependent = () => {if (os.platform() === 'linux'){ return 334 } else { return 0 } } +//let sleepTimeOSDependent = () => {if (os.platform() === 'linux'){ return 334 } else { return 0 } } + +function sleepTimeOSDependent() { + if (os.platform() === 'linux'){ + return 334 + } else { + return 0 + } +} function sleep(millis) { return new Promise(resolve => setTimeout(resolve, millis)); From d1e34eb0714ed037c0d30e8a19bfb7c1624c5e33 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Mon, 8 Oct 2018 19:17:49 +0200 Subject: [PATCH 11/45] Test commit. --- app/main.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/main.js b/app/main.js index 415dc4c3..e19d89fd 100644 --- a/app/main.js +++ b/app/main.js @@ -40,17 +40,17 @@ process.env.NODE_ENV = "production"; //let sleepTimeOSDependent = () => {if (os.platform() === 'linux'){ return 334 } else { return 0 } } -function sleepTimeOSDependent() { - if (os.platform() === 'linux'){ - return 334 - } else { - return 0 - } -} - -function sleep(millis) { - return new Promise(resolve => setTimeout(resolve, millis)); -} +// function sleepTimeOSDependent() { +// if (os.platform() === 'linux'){ +// return 334 +// } else { +// return 0 +// } +// } +// +// function sleep(millis) { +// return new Promise(resolve => setTimeout(resolve, millis)); +// } function attachUpdaterHandlers() { function onUpdateDownloaded() { @@ -629,13 +629,13 @@ function importOnePK(pk, name = "", isT = true) { async function apiGet(url) { const resp = await axiosApi(url); - await sleep(sleepTimeOSDependent()); +// await sleep(sleepTimeOSDependent()); return resp.data; } async function apiPost(url, form) { const resp = await axiosApi.post(url, querystring.stringify(form)); - await sleep(sleepTimeOSDependent()); +// await sleep(sleepTimeOSDependent()); return resp.data; } From 26140395eba1fa5d61c759f9157d820e956857bd Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Tue, 9 Oct 2018 10:28:04 +0200 Subject: [PATCH 12/45] Test commit 2. --- app/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main.js b/app/main.js index e19d89fd..08ecfe31 100644 --- a/app/main.js +++ b/app/main.js @@ -466,8 +466,8 @@ function setSettings(newSettings) { axiosApi = axios.create({ baseURL: settings.domainFrontingUrl, headers: { - "Host": settings.domainFrontingHost, - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0" + "Host": settings.domainFrontingHost//, + //"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0" }, timeout: 30000, From b82a689db7e2a333ec9bce4d1d248b912546e1cb Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Tue, 9 Oct 2018 22:45:10 +0200 Subject: [PATCH 13/45] Revert. --- app/main.js | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/app/main.js b/app/main.js index 08ecfe31..398e1ad9 100644 --- a/app/main.js +++ b/app/main.js @@ -38,19 +38,17 @@ const userWarningExportWalletEncrypted = "You are going to export an ENCRYPTED w // Show/Hide Development menu process.env.NODE_ENV = "production"; -//let sleepTimeOSDependent = () => {if (os.platform() === 'linux'){ return 334 } else { return 0 } } - -// function sleepTimeOSDependent() { -// if (os.platform() === 'linux'){ -// return 334 -// } else { -// return 0 -// } -// } -// -// function sleep(millis) { -// return new Promise(resolve => setTimeout(resolve, millis)); -// } +function sleepTimeOSDependent() { + if (os.platform() === 'linux'){ + return 334 + } else { + return 0 + } +} + +function sleep(millis) { + return new Promise(resolve => setTimeout(resolve, millis)); +} function attachUpdaterHandlers() { function onUpdateDownloaded() { @@ -466,8 +464,8 @@ function setSettings(newSettings) { axiosApi = axios.create({ baseURL: settings.domainFrontingUrl, headers: { - "Host": settings.domainFrontingHost//, - //"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0" + "Host": settings.domainFrontingHost, + "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0" }, timeout: 30000, @@ -629,13 +627,13 @@ function importOnePK(pk, name = "", isT = true) { async function apiGet(url) { const resp = await axiosApi(url); -// await sleep(sleepTimeOSDependent()); + await sleep(sleepTimeOSDependent()); return resp.data; } async function apiPost(url, form) { const resp = await axiosApi.post(url, querystring.stringify(form)); -// await sleep(sleepTimeOSDependent()); + await sleep(sleepTimeOSDependent()); return resp.data; } From de32d3c43d77b75ab905bba7b6769ef199387b95 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Wed, 5 Dec 2018 23:44:24 +0100 Subject: [PATCH 14/45] Test --- app/main.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/main.js b/app/main.js index 398e1ad9..4cf8a3d3 100644 --- a/app/main.js +++ b/app/main.js @@ -39,11 +39,12 @@ const userWarningExportWalletEncrypted = "You are going to export an ENCRYPTED w process.env.NODE_ENV = "production"; function sleepTimeOSDependent() { - if (os.platform() === 'linux'){ - return 334 - } else { - return 0 - } + // if (os.platform() === 'linux'){ + // return 334 + // } else { + // return 0 + // } + return 0 } function sleep(millis) { From dfd381f2b01ccafc1b8b99b0c8d7b2010a615472 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Sat, 8 Dec 2018 14:50:47 +0100 Subject: [PATCH 15/45] Travis CI mod. --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index df5e8aeb..c148f42b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: global: # TODO Update this to match the name of your project. - PROJECT_NAME=arizen + - NODE_VERSION="6" matrix: include: @@ -24,10 +25,10 @@ matrix: osx_image: xcode9.2 sudo: required language: c - - os: windows - sudo: required - env: TARGET_ARCH=x64 - language: c + # - os: windows + # sudo: required + # env: TARGET_ARCH=x64 + # language: c - os: linux env: CC=clang CXX=clang++ npm_config_clang=1 TARGET_ARCH=x64 compiler: clang @@ -53,7 +54,7 @@ before_install: - ./ci/before_install.sh install: - - nvm install 6 + - nvm install $NODE_VERSION - ./ci/install.sh script: From 822188c92dc155eb832c911a0f93835a48bc6683 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Sat, 8 Dec 2018 17:21:51 +0100 Subject: [PATCH 16/45] Custom API interval (user defined) for tx and balance refresh. --- app/main.js | 10 ++++++---- app/zcommon.js | 7 +++++-- app/zwallet.html | 3 +++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/main.js b/app/main.js index 4cf8a3d3..9a203fce 100644 --- a/app/main.js +++ b/app/main.js @@ -90,6 +90,7 @@ const defaultSettings = { autoLogOffTimeout: 60, explorerUrl: "https://explorer.zensystem.io", apiUrls: [ + "https://explorer.horizen.global/insight-api-zen", "https://explorer.zensystem.io/insight-api-zen", "https://explorer.zen-solutions.io/api", "http://explorer.zenmine.pro/insight-api-zen" @@ -98,7 +99,8 @@ const defaultSettings = { secureNodePort: 18231, domainFronting: false, domainFrontingUrl: "https://www.google.com", - domainFrontingHost: "zendhide.appspot.com" + domainFrontingHost: "zendhide.appspot.com", + refreshIntervalAPI: 334 }; const defaultInternalInfo = {pendingTxs: []}; @@ -628,13 +630,13 @@ function importOnePK(pk, name = "", isT = true) { async function apiGet(url) { const resp = await axiosApi(url); - await sleep(sleepTimeOSDependent()); + await sleep(parseFloat(settings.refreshIntervalAPI)); return resp.data; } async function apiPost(url, form) { - const resp = await axiosApi.post(url, querystring.stringify(form)); - await sleep(sleepTimeOSDependent()); + const resp = await axiosApi.post(url, querystring.stringify(form)); + await sleep(parseFloat(settings.refreshIntervalAPI)); return resp.data; } diff --git a/app/zcommon.js b/app/zcommon.js index 1b6dec7d..d8c357cb 100644 --- a/app/zcommon.js +++ b/app/zcommon.js @@ -416,7 +416,8 @@ function showSettingsDialog() { const inputDomainFrontingUrl = dialog.querySelector(".settingDomainFrontingUrl"); const inputDomainFrontingHost = dialog.querySelector(".settingDomainFrontingHost"); const inputAutoLogOffEnable = dialog.querySelector(".settingAutoLogOffEnable"); - const inputAutoLogOffTimeout = dialog.querySelector(".settingAutoLogOffTimeout"); + const inputAutoLogOffTimeout = dialog.querySelector(".settingAutoLogOffTimeout"); + const inputRefreshIntervalAPI = dialog.querySelector(".settingsRefreshIntervalAPI"); inputTxHistory.value = settings.txHistory; inputExplorerUrl.value = settings.explorerUrl; @@ -443,6 +444,7 @@ function showSettingsDialog() { inputAutoLogOffEnable.checked = settings.autoLogOffEnable; inputAutoLogOffTimeout.value = settings.autoLogOffTimeout || 60; + inputRefreshIntervalAPI.value = settings.refreshIntervalAPI || 334; dialog.querySelector(".chooseKeyPath").addEventListener("click", () => { let inputFakeElement = document.createElement('input'); @@ -479,7 +481,8 @@ function showSettingsDialog() { domainFrontingUrl: inputDomainFrontingUrl.value, domainFrontingHost: inputDomainFrontingHost.value, autoLogOffEnable: inputAutoLogOffEnable.checked ? 1 : 0, - autoLogOffTimeout: inputAutoLogOffTimeout.value < 60 ? 60 : inputAutoLogOffTimeout.value + autoLogOffTimeout: inputAutoLogOffTimeout.value < 60 ? 60 : inputAutoLogOffTimeout.value, + refreshIntervalAPI: inputRefreshIntervalAPI.value }; if (settings.lang !== newSettings.lang) { diff --git a/app/zwallet.html b/app/zwallet.html index 6fd05d11..52d7ebf9 100644 --- a/app/zwallet.html +++ b/app/zwallet.html @@ -362,6 +362,9 @@

Settings

+ + +
From 6f8b58b1737d845c56b6bb74542b6b09e5220311 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Wed, 12 Dec 2018 20:00:44 +0100 Subject: [PATCH 17/45] Minor fix 1. --- app/main.js | 8 +++----- package.json | 2 +- release.json | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/main.js b/app/main.js index 016db144..119b20b6 100644 --- a/app/main.js +++ b/app/main.js @@ -88,12 +88,10 @@ const defaultSettings = { txHistory: 50, autoLogOffEnable: 0, autoLogOffTimeout: 60, - explorerUrl: "https://explorer.zensystem.io", + explorerUrl: "https://explorer.horizen.global", apiUrls: [ - "https://explorer.horizen.global/insight-api-zen", - "https://explorer.zensystem.io/insight-api-zen", - "https://explorer.zen-solutions.io/api", - "http://explorer.zenmine.pro/insight-api-zen" + "https://explorer.horizen.global/api", + "https://explorer.zen-solutions.io/api" ], secureNodeFQDN: "", secureNodePort: 18231, diff --git a/package.json b/package.json index e28b229e..5c1e3bd2 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "desktop", "electron" ], - "author": "Horizen team ", + "author": "Horizen team ", "contributors": [ { "name": "@lukas", diff --git a/release.json b/release.json index 4dee9e89..49b5a61c 100644 --- a/release.json +++ b/release.json @@ -2,5 +2,5 @@ "url": "https://github.com/ZencashOfficial/arizen/releases/download/v1.2.1/Arizen-1.2.1-mac.zip", "name": "1.2.1", "notes": "1st Version", - "pub_date": "30-9-2018" + "pub_date": "09-12-2018" } From 5e18a79d794252017cf55aefda5c3fd3b874bd0c Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Wed, 12 Dec 2018 21:16:48 +0100 Subject: [PATCH 18/45] Travis. --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c148f42b..5ae9268e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,10 @@ matrix: osx_image: xcode9.2 sudo: required language: c - # - os: windows - # sudo: required - # env: TARGET_ARCH=x64 - # language: c + - os: windows + sudo: required + env: TARGET_ARCH=x64 + language: c - os: linux env: CC=clang CXX=clang++ npm_config_clang=1 TARGET_ARCH=x64 compiler: clang @@ -54,7 +54,9 @@ before_install: - ./ci/before_install.sh install: - - nvm install $NODE_VERSION + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then nvm install $NODE_VERSION; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nvm install $NODE_VERSION; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install nvm; fi - ./ci/install.sh script: From a153ef1116cad9aed3377d32c8bc45a22eb0e3c3 Mon Sep 17 00:00:00 2001 From: gsfakianakis Date: Tue, 18 Dec 2018 20:00:34 +0100 Subject: [PATCH 19/45] Quick domain fronting removal. --- .travis.yml | 10 +++++++++- app/zwallet.html | 16 +++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ae9268e..11f8bdb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ branches: - /^v\d+\.\d+\.\d+.*$/ - development - master +language: node_js +node_js: + - "node" env: global: # TODO Update this to match the name of your project. @@ -56,7 +59,12 @@ before_install: install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then nvm install $NODE_VERSION; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nvm install $NODE_VERSION; fi - - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install nvm; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install nvm; echo $NVM_HOME; export NVM_HOME=C:\\ProgramData\\nvm; export NVM_SYMLINK=C:\\ProgramData\\nodejs; echo $NVM_HOME; RefreshEnv.cmd; echo $NVM_HOME; fi # choco install nodejs.install; + #- nvm install $NODE_VERSION; + - echo "$TRAVIS_NODE_VERSION" + - echo "$TRAVIS_OS_NAME" + - nvm -v + #- nvm on - ./ci/install.sh script: diff --git a/app/zwallet.html b/app/zwallet.html index 6c65b533..8689cd3b 100644 --- a/app/zwallet.html +++ b/app/zwallet.html @@ -394,18 +394,16 @@

Settings

- - -