Merge pull request #22 from VerusCoin/dev

Dev
VerusCoin · Feb 9, 2020 · b7a4aeb · b7a4aeb
2 parents 410b3e8 + f92993d
commit b7a4aeb
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 45 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,14 +7,14 @@ stages:
 ########################################################################################################################
 variables:
   DOCKER_DRIVER: overlay2
-  DEFAULT_VERUSCOIN_BRANCH: master
-  VERUS_VERSION: 0.6.4-beta
-  VERUSCOIN_VERSION: 0.6.4
+  DEFAULT_VERUSCOIN_BRANCH: release
+  VERUS_VERSION: 0.6.4-beta-1
+  VERUSCOIN_VERSION: 0.6.4-1
   KOMODO_VERSION: 0.5.2
   BINARY_SOURCE: VerusCoin
   VERUS_APPIMAGE_X64: Verus-Desktop-Linux-v${VERUS_VERSION}-x86_64.AppImage
   VERUS_APPIMAGE_ARM64: Verus-Desktop-Linux-v${VERUS_VERSION}-arm64.AppImage
-  VERUS_LINUX_TAR: Verus-Desktop-Linux-v${VERUS_VERSION}-amd64.tar.gz
+  VERUS_LINUX_TAR: Verus-Desktop-Linux-v${VERUS_VERSION}-x86_64.tar.gz
   VERUS_LINUX_ARM64_TAR: Verus-Desktop-Linux-v${VERUS_VERSION}-arm64.tar.gz
   VERUS_WINDOWS_ZIP: Verus-Desktop-Windows-v${VERUS_VERSION}.zip
   VERUS_WINDOWS_NSIS: Verus-Desktop-Windows-v${VERUS_VERSION}.exe
@@ -80,7 +80,6 @@ build:linux:
   artifacts:
     paths:
       - ${VERUS_LINUX_TAR}
-      - ${VERUS_LINUX_TAR}.sha256
     expire_in: 1 week
 
 build:linux:arm64:
@@ -124,7 +123,6 @@ build:linux:arm64:
   artifacts:
     paths:
       - ${VERUS_LINUX_ARM64_TAR}
-      - ${VERUS_LINUX_ARM64_TAR}.sha256
       - dist
     expire_in: 1 week
 ########################################################################################################################
@@ -151,12 +149,14 @@ build:windows:
     - cd ../../..
     - mkdir -p assets/bin/win64/komodod
     - wget https://github.com/KomodoPlatform/komodo/releases/download/${KOMODO_VERSION}/win64_${KOMODO_VERSION}.zip
-    - unzip win64_${KOMODO_VERSION}.zip -d assets/bin/komodod
+    - unzip win64_${KOMODO_VERSION}.zip
+    - mv win64/komodod.exe win64/komodo-cli.exe assets/bin/win64/komodod
+    - rm -rf win64
     - rm win64_${KOMODO_VERSION}.zip
     - gsutil cp $STAGING/$VERUS_CLI_WINDOWS .
     - unzip -qq Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip -d assets/bin/win64
     - mv assets/bin/win64/verus-cli assets/bin/win64/verusd
-    - strip --strip-unneeded  assets/bin/win64/komodod/komodod.exe && strip --strip-unneeded  assets/bin/win64/komodod/komodo-cli.exe && strip --strip-unneeded  assets/bin/win64/komodod/komodo-tx.exe
+    - strip --strip-unneeded  assets/bin/win64/komodod/komodod.exe && strip --strip-unneeded  assets/bin/win64/komodod/komodo-cli.exe
     - rm Verus-CLI-Windows-v${VERUSCOIN_VERSION}.zip
     - gsutil cp $STAGING/VerusCoin/Zcash/zcashd-win.tar.gz .
     - tar -xzvf zcashd-win.tar.gz --directory assets/bin/win64/
@@ -186,9 +186,7 @@ build:windows:
   artifacts:
     paths:
       - ${VERUS_WINDOWS_ZIP}
-      - ${VERUS_WINDOWS_ZIP}.sha256
       - ${VERUS_WINDOWS_NSIS}
-      - ${VERUS_WINDOWS_NSIS}.sha256
     expire_in: 1 week
 ########################################################################################################################
 ####END####                                             WINDOWS                                              ####END####
@@ -235,7 +233,6 @@ build:mac:
   artifacts:
     paths:
       - ${VERUS_MACOS}
-      - ${VERUS_MACOS}.sha256
     expire_in: 1 week
 
 
@@ -261,13 +258,8 @@ deploy:
   artifacts:
     paths:
       - ${VERUS_LINUX_TAR}
-      - ${VERUS_LINUX_TAR}.sha256
       - ${VERUS_LINUX_ARM64_TAR}
-      - ${VERUS_LINUX_ARM64_TAR}.sha256
       - ${VERUS_WINDOWS_ZIP}
-      - ${VERUS_WINDOWS_ZIP}.sha256
       - ${VERUS_WINDOWS_NSIS}
-      - ${VERUS_WINDOWS_NSIS}.sha256
       - ${VERUS_MACOS}
-      - ${VERUS_MACOS}.sha256
     expire_in: 1 week
diff --git a/gui/Verus-Desktop-GUI b/gui/Verus-Desktop-GUI
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "verus-desktop",
   "productName": "Verus-Desktop",
-  "version": "0.6.4-beta",
+  "version": "0.6.4-beta-1",
   "description": "Verus Desktop Wallet App",
   "main": "main.js",
   "scripts": {

diff --git a/routes/api/electrum/info.js b/routes/api/electrum/info.js
@@ -15,7 +15,7 @@ module.exports = (api) => {
       protocol: "Electrum",
       name,
       txfee,
-      server: `${server.ip}:${server.port}:${server.port}`,
+      server: `${server.ip}:${server.port}:${server.proto}`,
       serverList: serverList.toString()
     }}));
 

diff --git a/routes/api/native/addrBalance.js b/routes/api/native/addrBalance.js
@@ -9,8 +9,9 @@ const { fromSats } = require("agama-wallet-lib/src/utils");
 const BYTES_PER_MB = 1000000
 
 module.exports = (api) => {      
-  // Gets an address balance (z_getbalance)
-  api.native.get_addr_balance = async (coin, token, address, useCache, txCount) => {
+  // Gets an address balance (z_getbalance), txCount and zTotalBalance are used 
+  // to check if the cache needs to be cleared and re-built
+  api.native.get_addr_balance = async (coin, token, address, useCache, txCount = -1, zTotalBalance = -1) => {
     const cacheAddrBalanceResult = (result) => {
       const cacheSize = getObjBytes(api.native.cache);
 
@@ -25,16 +26,25 @@ module.exports = (api) => {
 
     if (useCache) {
       if (
-        api.native.cache.addr_balance_cache[coin] != null &&
-        txCount !== api.native.cache.addr_balance_cache[coin].tx_count
+        api.native.cache.addr_balance_cache[coin] != null
       ) {  
-        api.native.cache.addr_balance_cache[coin].tx_count = txCount;
-        delete api.native.cache.addr_balance_cache[coin].data;
+        if (txCount !== api.native.cache.addr_balance_cache[coin].tx_count) {
+          api.native.cache.addr_balance_cache[coin].tx_count = txCount;
+          delete api.native.cache.addr_balance_cache[coin].data;
+        }
+
+        if (zTotalBalance !== api.native.cache.addr_balance_cache[coin].total_balance) {
+          api.native.cache.addr_balance_cache[coin].total_balance = zTotalBalance;
+          if (api.native.cache.addr_balance_cache[coin].data != null) {
+            delete api.native.cache.addr_balance_cache[coin].data;
+          }
+        }
       }
 
       if (api.native.cache.addr_balance_cache[coin] == null) {
         api.native.cache.addr_balance_cache[coin] = {
           tx_count: -1,
+          total_balance: -1,
           data: {}
         };
       } else if (api.native.cache.addr_balance_cache[coin].data == null) {

diff --git a/routes/api/native/addresses.js b/routes/api/native/addresses.js
@@ -124,7 +124,7 @@ module.exports = (api) => {
                   (!isZ && tBalanceSeen < totalTBalance)
                 ) {
                   balanceObj.native = Number(
-                    await api.native.get_addr_balance(coin, token, address, true, txcount)
+                    await api.native.get_addr_balance(coin, token, address, true, txcount, Number(totalBalance.total))
                   );
 
                   isZ

diff --git a/routes/api/native/idInformation.js b/routes/api/native/idInformation.js
@@ -2,9 +2,18 @@ const Promise = require('bluebird');
 
 module.exports = (api) => {    
   api.native.get_identities = (coin, token, includeCanSpend = true, includeCanSign = false, includeWatchOnly = false) => {
+    const promiseArr = [
+      api.native.callDaemon(coin, 'listidentities', [includeCanSpend, includeCanSign, includeWatchOnly], token),
+      api.native.callDaemon(coin, "z_gettotalbalance", [], token)
+    ]
+
     return new Promise((resolve, reject) => {      
-      api.native.callDaemon(coin, 'listidentities', [includeCanSpend, includeCanSign, includeWatchOnly], token)
-      .then(async (identities) => {
+      Promise.all(promiseArr)
+      .then(async (resultArr) => {
+        const identities = resultArr[0]
+        const balances = resultArr[1]
+        const totalBalance = Number(balances.total)
+
         if (!identities) {
           resolve([])
         } else {
@@ -28,13 +37,13 @@ module.exports = (api) => {
               let zBalance = null
 
               const iBalance = Number(
-                await api.native.get_addr_balance(coin, token, iAddr, useCache, txcount)
+                await api.native.get_addr_balance(coin, token, iAddr, useCache, txcount, totalBalance)
               )
 
               if (zAddr != null) {
                 try {
                   zBalance = Number(
-                    await api.native.get_addr_balance(coin, token, zAddr, useCache, txcount)
+                    await api.native.get_addr_balance(coin, token, zAddr, useCache, txcount, totalBalance)
                   );
                 } catch (e) {
                   api.log(e, "get_identities");

diff --git a/routes/appConfig.js b/routes/appConfig.js
@@ -4,7 +4,6 @@ const zcashParamsSources = require('./zcashParamsSources')
 
 let zCoins = {}
 let nativeCoinStrings = {}
-let rpcCooldownTimes = {}
 
 const coinObjArray = coinDataTranslated.getSimpleCoinArray().map(simpleCoinObj => {
   const coinObj = coinDataTranslated.getCoinObj(simpleCoinObj.id, false)
@@ -14,7 +13,6 @@ const coinObjArray = coinDataTranslated.getSimpleCoinArray().map(simpleCoinObj =
 
   if (coinObj.available_modes.native === true) {
     nativeCoinStrings[coinObj.id] = ''
-    rpcCooldownTimes[coinObj.id] = 2000
   }
 
   return coinObj
@@ -81,8 +79,7 @@ const appConfig = {
         includePrivateBalances: zCoins,
         includePrivateTransactions: zCoins,
         stakeGuard: nativeCoinStrings,
-        dataDir: nativeCoinStrings,
-        rpcCooldownTimeout: rpcCooldownTimes
+        dataDir: nativeCoinStrings
       }
     },
     pubkey: "",
@@ -203,13 +200,6 @@ const appConfig = {
           type: "text_input",
           displayName: "Custom data directory",
           info: "A custom directory for coin data."
-        },
-        rpcCooldownTimeout: {
-          type: "number_input",
-          displayName: "Wallet Call Cooldown Timeout (MS)",
-          info:
-            "The maximum number of milliseconds in cooldown time that the wallet " +
-            "will take in between each call to the blockchain native wallet."
         }
       }
     }

diff --git a/routes/shepherd/electrum/parseTxAddresses.js b/routes/shepherd/electrum/parseTxAddresses.js
@@ -103,7 +103,7 @@ module.exports = (shepherd) => {
         const amount = _sum.inputs - _sum.outputs
 
         result = {
-          type: amount < 0 ? 'interest' : 'self',
+          type: 'self',
           amount: Number(amount).toFixed(8),
           address: targetAddress,
           timestamp: tx.timestamp,

diff --git a/version b/version
@@ -1,3 +1,3 @@
-version=0.6.4-beta
+version=0.6.4-beta-1
 type=beta
-minversion=0.6.4-beta
+minversion=0.6.4-beta-1
diff --git a/version_build b/version_build
@@ -1 +1 @@
-0.6.4-beta
+0.6.4-beta-1
+4 −3		react/src/components/modals/receiveCoin/receiveCoin.js
+4 −1		react/src/components/modals/sendCoin/claimInterestForm/claimInterestForm.js
+3 −2		react/src/containers/GeneratorCard/GeneratorCard.js