Merge pull request #2051 from CityOfZion/release/2.6.2

release: 2.6.2
CityOfZion · Jan 18, 2021 · 5f7882a · 5f7882a
2 parents c0db706 + 74b3885
commit 5f7882a
Show file tree

Hide file tree

Showing 11 changed files with 650 additions and 102 deletions.
diff --git a/__tests__/components/__snapshots__/Settings.test.js.snap b/__tests__/components/__snapshots__/Settings.test.js.snap
diff --git a/app/actions/balancesActions.js b/app/actions/balancesActions.js
@@ -1,5 +1,5 @@
 // @flow
-import { api } from '@cityofzion/neon-js'
+import { api, u, rpc, sc, wallet } from '@cityofzion/neon-js'
 import { extend, isEmpty, get } from 'lodash-es'
 import { createActions } from 'spunky'
 import { Howl } from 'howler'
@@ -13,7 +13,12 @@ import { COIN_DECIMAL_LENGTH } from '../core/formatters'
 import { toBigNumber } from '../core/math'
 import { findNetworkByDeprecatedLabel } from '../core/networks'
 
-const MAX_SCRIPT_HASH_CHUNK_SIZE = 3
+const { reverseHex, hexstring2str } = u
+const { Query } = rpc
+const { ScriptBuilder } = sc
+const { getScriptHashFromAddress } = wallet
+
+const MAX_SCRIPT_HASH_CHUNK_SIZE = 20
 
 type Props = {
   net: string,
@@ -73,6 +78,62 @@ function determineIfBalanceUpdated(
   })
 }
 
+const parseDecimals = VMOutput => {
+  if (VMOutput === '') return 0
+  return parseInt(VMOutput, 10)
+}
+
+const parseHexNum = hex => (hex ? parseInt(reverseHex(hex), 16) : 0)
+
+function NumberParser(item, decimals) {
+  switch (item.type) {
+    case 'Integer':
+      return new u.Fixed8(item.value).div(100000000)
+    case 'ByteArray':
+      // eslint-disable-next-line
+      return parseHexNum(item.value) / Math.pow(10, decimals)
+    default:
+      throw new Error(`Received invalid type ${item.type}`)
+  }
+}
+
+const getTokenBalances = (url, scriptHashArray, address) => {
+  const addrScriptHash = reverseHex(getScriptHashFromAddress(address))
+  const sb = new ScriptBuilder()
+
+  scriptHashArray.forEach(scriptHash => {
+    sb.emitAppCall(scriptHash, 'symbol')
+      .emitAppCall(scriptHash, 'decimals')
+      .emitAppCall(scriptHash, 'balanceOf', [addrScriptHash])
+  })
+  return Query.invokeScript(sb.str, false)
+    .execute(url)
+    .then(res => {
+      const tokenList = {}
+      if (
+        res &&
+        res.result &&
+        res.result.stack &&
+        res.result.stack.length >= 3
+      ) {
+        for (let i = 0; i < res.result.stack.length; i += 3) {
+          try {
+            const symbol = hexstring2str(res.result.stack[i].value)
+            const decimals = parseDecimals(res.result.stack[i + 1].value)
+            tokenList[symbol] = NumberParser(res.result.stack[i + 2], decimals)
+          } catch (e) {
+            throw e
+          }
+        }
+      }
+      return tokenList
+    })
+    .catch(err => {
+      console.error({ err })
+      throw err
+    })
+}
+
 let RETRY_COUNT = 0
 
 async function getBalances({ net, address, isRetry = false }: Props) {
@@ -122,13 +183,11 @@ async function getBalances({ net, address, isRetry = false }: Props) {
       // NOTE: because the RPC nodes will respond with the contract
       // symbol name, we need to use our original token list
       // in case two tokens have the same symbol (SWTH vs SWTH OLD)
-      const balanceResults = await api.nep5
-        .getTokenBalances(
-          endpoint,
-          chunk.map(({ scriptHash }) => scriptHash),
-          address,
-        )
-        .catch(e => Promise.reject(e))
+      const balanceResults = await getTokenBalances(
+        endpoint,
+        chunk.map(({ scriptHash }) => scriptHash),
+        address,
+      ).catch(e => Promise.reject(e))
 
       const hashBasedBalance = {}
 

diff --git a/app/assets/flags/dutch.svg b/app/assets/flags/dutch.svg
diff --git a/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx b/app/components/Modals/ReleaseNotesModal/ReleaseNotesModal.jsx
@@ -42,6 +42,41 @@ const ReleaseNotesModal = ({ hideModal, theme }: Props) => (
       )}
     >
       <div className={styles.releaseNotesContents}>
+        <div className={styles.release}>
+          <div className={styles.releaseContent}>
+            <small className={styles.date}>Jan 18th 2021 </small>
+            <h3>Patch v2.6.2</h3>
+
+            <p>
+              In this update you will find the following minor improvements:
+              <br />
+              <br />
+              <li>Fixes bug related to SWTH contract</li>
+              <li>
+                Adds dutch translation{' '}
+                <span aria-label="party" role="img">
+                  🇳🇱🎉
+                </span>{' '}
+              </li>
+              <li>Performance enhancements</li>
+              <br />
+              View full details of this release on GitHub
+              <br />
+            </p>
+
+            <Github
+              onClick={() =>
+                electron.shell.openExternal(
+                  'https://github.com/CityOfZion/neon-wallet/releases/tag/v2.6.2',
+                )
+              }
+            />
+          </div>
+          <div className={styles.marketingImage}>
+            {theme === 'Light' ? <PatchLight /> : <PatchDark />}
+          </div>
+        </div>
+
         <div className={styles.release}>
           <div className={styles.releaseContent}>
             <small className={styles.date}>Dec 1st 2020 </small>
@@ -67,9 +102,6 @@ const ReleaseNotesModal = ({ hideModal, theme }: Props) => (
               }
             />
           </div>
-          <div className={styles.marketingImage}>
-            {theme === 'Light' ? <PatchLight /> : <PatchDark />}
-          </div>
         </div>
 
         <div className={styles.release}>

diff --git a/app/components/Root/IntlWrapper.jsx b/app/components/Root/IntlWrapper.jsx
@@ -21,6 +21,7 @@ const {
   turkish,
   arabic,
   russian,
+  dutch,
 } = translations
 
 type IntlWrapperProps = {
@@ -40,6 +41,7 @@ const tranlationsMappings = {
   [LANGUAGES.TURKISH.value]: turkish,
   [LANGUAGES.ARABIC.value]: arabic,
   [LANGUAGES.RUSSIAN.value]: russian,
+  [LANGUAGES.DUTCH.value]: dutch,
 }
 
 class IntlWrapper extends React.Component<IntlWrapperProps> {

diff --git a/app/core/constants.js b/app/core/constants.js
@@ -15,6 +15,7 @@ import Vietnam from '../assets/flags/vietnam.svg'
 import Korea from '../assets/flags/south-korea.svg'
 import UnitedArabEmirates from '../assets/flags/united-arab-emirates.svg'
 import Russia from '../assets/flags/russia.svg'
+import Dutch from '../assets/flags/dutch.svg'
 
 export const NEON_WALLET_RELEASE_LINK =
   'https://github.com/CityOfZion/neon-wallet/releases'
@@ -102,6 +103,11 @@ export const LANGUAGES = {
     value: 'RUSSIAN',
     renderFlag: () => <Russia alt="Русский" />,
   },
+  DUTCH: {
+    label: 'Nederlands',
+    value: 'DUTCH',
+    renderFlag: () => <Dutch alt="Nederlands" />,
+  },
 }
 
 export const DEFAULT_LANGUAGE = LANGUAGES.ENGLISH.value

diff --git a/app/core/tokenList.json b/app/core/tokenList.json
@@ -134,6 +134,19 @@
       }
     }
   },
+  "SWTH V2": {
+    "symbol": "SWTH (OLD)",
+    "companyName": "Switcheo",
+    "type": "NEP5",
+    "networks": {
+      "1": {
+        "name": "Switcheo Legacy V2",
+        "hash": "ab38352559b8b203bde5fddfa0b07d8b2525e132",
+        "decimals": 8,
+        "totalSupply": 1000000000
+      }
+    }
+  },
   "CGL": {
     "symbol": "CGL",
     "companyName": "CrazyGladiator",
@@ -842,32 +855,6 @@
       }
     }
   },
-  "SWTH V2": {
-    "symbol": "SWTH (OLD)",
-    "companyName": "Switcheo",
-    "type": "NEP5",
-    "networks": {
-      "1": {
-        "name": "Switcheo Legacy V2",
-        "hash": "ab38352559b8b203bde5fddfa0b07d8b2525e132",
-        "decimals": 8,
-        "totalSupply": 1000000000
-      }
-    }
-  },
-  "SWTH V3": {
-    "symbol": "SWTH",
-    "companyName": "Switcheo",
-    "type": "NEP5",
-    "networks": {
-      "1": {
-        "name": "Switcheo V3",
-        "hash": "3e09e602eeeb401a2fec8e8ea137d59aae54a139",
-        "decimals": 8,
-        "totalSupply": 1000000000
-      }
-    }
-  },
   "THOR": {
     "symbol": "THOR",
     "companyName": "Thor Token",
@@ -1058,5 +1045,18 @@
     },
     "image":
       "https://rawgit.com/CityOfZion/neo-tokens/master/assets/png/zpt.png"
+  },
+  "SWTH V3": {
+    "symbol": "SWTH",
+    "companyName": "Switcheo",
+    "type": "NEP5",
+    "networks": {
+      "1": {
+        "name": "Switcheo V3",
+        "hash": "3e09e602eeeb401a2fec8e8ea137d59aae54a139",
+        "decimals": 8,
+        "totalSupply": 1000000000
+      }
+    }
   }
 }