Merge pull request #175 from VerusCoin/dev

v1.0.15
VerusCoin · Aug 2, 2024 · 6708ed9 · 6708ed9
2 parents f13e5f0 + 5e1431f
commit 6708ed9
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 17 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,7 +4,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 1
 def versionMinor = 0
-def versionRevision = 14
+def versionRevision = 15
 def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");

diff --git a/env/main.android.json b/env/main.android.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.14",
+  "APP_VERSION": "1.0.15",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/env/main.ios.json b/env/main.ios.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.14",
+  "APP_VERSION": "1.0.15",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/assets/env/main.json b/ios/assets/env/main.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.14",
+  "APP_VERSION": "1.0.15",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.14;
+				MARKETING_VERSION = 1.0.15;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -792,7 +792,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.14;
+				MARKETING_VERSION = 1.0.15;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "private": true,
   "scripts": {
     "postinstall": "./node_modules/.bin/rn-nodeify --hack --install --yarn && npx jetify",

diff --git a/src/actions/actions/intervals/dispatchers/lifecycleManager.js b/src/actions/actions/intervals/dispatchers/lifecycleManager.js
@@ -19,15 +19,15 @@ import { coinsList } from '../../../../utils/CoinData/CoinsList';
 import { IS_PBAAS_CHAIN } from '../../../../utils/constants/currencies';
 
 export const activateChainLifecycle = (coinObj, activeCoinsForUser) => {
-  const allSeenSystems = [coinObj.testnet ? coinsList.VRSCTEST.currency_id : coinsList.VRSC.currency_id];
+  const allSeenSystems = [!!(coinObj.testnet) ? coinsList.VRSCTEST.currency_id : coinsList.VRSC.currency_id];
 
   if (coinObj.tags.includes(IS_PBAAS) && activeCoinsForUser != null) {
     for (const coin of activeCoinsForUser) {
       if (coin.tags.includes(IS_PBAAS) && 
           !allSeenSystems.includes(coin.system_id) &&
           coin.system_options != null && 
           (coin.system_options & IS_PBAAS_CHAIN) === IS_PBAAS_CHAIN &&
-          coin.testnet === coinObj.testnet) {
+          !!(coin.testnet) === !!(coinObj.testnet)) {
           allSeenSystems.push(coin.system_id);
       }
     }

diff --git a/src/containers/Coin/Overview/Overview.js b/src/containers/Coin/Overview/Overview.js
@@ -212,7 +212,7 @@ class Overview extends Component {
           this.props.activeCoin.proto === ERC20
         ) {
           if (
-            (this.props.activeCoin.testnet &&
+            (!!(this.props.activeCoin.testnet) &&
               VERUS_BRIDGE_DELEGATOR_GOERLI_CONTRACT != null &&
               subtitle.toLowerCase() === VERUS_BRIDGE_DELEGATOR_GOERLI_CONTRACT.toLowerCase()) ||
             (!this.props.activeCoin.testnet &&

diff --git a/src/containers/Coin/ReceiveCoin/ReceiveCoin.js b/src/containers/Coin/ReceiveCoin/ReceiveCoin.js
@@ -237,7 +237,7 @@ class ReceiveCoin extends Component {
 
             invoice.details.setFlags({
               acceptsConversion,
-              isTestnet: coinObj.testnet,
+              isTestnet: !!(coinObj.testnet),
               acceptsNonVerusSystems: nonVerusSystems.length > 0,
               acceptsAnyAmount: !amountGtZero
             })

diff --git a/src/containers/Home/HomeWidgets/CurrencyWidget.js b/src/containers/Home/HomeWidgets/CurrencyWidget.js
@@ -139,7 +139,7 @@ const CurrencyWidget = props => {
              numberOfLines={1}
              style={{fontSize: 16, paddingTop: 8, fontWeight: '500'}}
             >
-              {coinObj.testnet || uniValueDisplay === '-'
+              {!!coinObj.testnet || uniValueDisplay === '-'
                 ? `${
                     currencyBalance == null
                       ? '-'
@@ -153,7 +153,7 @@ const CurrencyWidget = props => {
             >
               {coinObj.testnet && coinObj.proto === 'erc20'
                 ? 'Testnet ERC20 Token'
-                : coinObj.testnet
+                : !!coinObj.testnet
                 ? 'Testnet Currency'
                 : coinObj.pbaas_options &&
                   !coinObj.compatible_channels.includes(GENERAL)
@@ -185,7 +185,7 @@ const CurrencyWidget = props => {
             <Paragraph style={{fontSize: 12}}>
               {coinObj.testnet && coinObj.proto === 'erc20'
                 ? 'Testnet ERC20 Token'
-                : coinObj.testnet
+                : !!coinObj.testnet
                 ? 'Testnet Currency'
                 : coinObj.pbaas_options &&
                   !coinObj.compatible_channels.includes(GENERAL)

diff --git a/src/containers/Settings/WalletSettings/VrpcOverrides/VrpcOverrides.js b/src/containers/Settings/WalletSettings/VrpcOverrides/VrpcOverrides.js
@@ -18,7 +18,8 @@ class VrpcOverrides extends Component {
     this.DEFAULT_SYSTEMS = {
       [coinsList.VRSC.system_id]: coinsList.VRSC,
       [coinsList.VRSCTEST.system_id]: coinsList.VRSCTEST,
-      [coinsList.iExBJfZYK7KREDpuhj6PzZBzqMAKaFg7d2.system_id]: coinsList.iExBJfZYK7KREDpuhj6PzZBzqMAKaFg7d2
+      [coinsList.iExBJfZYK7KREDpuhj6PzZBzqMAKaFg7d2.system_id]: coinsList.iExBJfZYK7KREDpuhj6PzZBzqMAKaFg7d2,
+      [coinsList.iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N.system_id]: coinsList.iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N,
     };
 
     this.state = {

diff --git a/src/sagas/coins.js b/src/sagas/coins.js
@@ -45,7 +45,7 @@ function* handleFinishSetUserCoins(action) {
                 !allSeenSystems.includes(coin.system_id) &&
                 coin.system_options != null && 
                 (coin.system_options & IS_PBAAS_CHAIN) === IS_PBAAS_CHAIN &&
-                coin.testnet === coinObj.testnet) {
+                !!(coin.testnet) === !!(coinObj.testnet)) {
                   allSeenSystems.push(coin.system_id);
             }
           }

diff --git a/src/utils/CoinData/CoinDirectory.js b/src/utils/CoinData/CoinDirectory.js
@@ -42,6 +42,8 @@ class _CoinDirectory {
   updateCoinLists() {
     this.fullCoinList = Object.values(this.coins).map(function(coin) {
       return coin.id;
+    }).filter(x => {
+      return this.coins[x];
     });
 
     this.testCoinList = this.fullCoinList.filter(x => {
@@ -126,6 +128,10 @@ class _CoinDirectory {
   }
 
   getVrpcEndpoints(coinId) {
+    if (this.vrpcOverrides && this.vrpcOverrides.hasOwnProperty(coinId)) {
+      return this.vrpcOverrides[coinId];
+    }
+
     const simpleCoinObj = this.getBasicCoinObj(coinId);
 
     if (this.vrpcOverrides && this.vrpcOverrides.hasOwnProperty(simpleCoinObj.system_id)) {

diff --git a/src/utils/CoinData/CoinsList.js b/src/utils/CoinData/CoinsList.js
@@ -330,6 +330,27 @@ export const coinsList = {
     apps: VERUS_APPS,
     website: 'https://piratechain.com/'
   },
+  ["iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N"]: {
+    pbaas_options: 264,
+    system_options: 264,
+    id: "iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N",
+    currency_id: "iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N",
+    system_id: "iHog9UCTrn95qpUBFCZ7kKz7qWdMA8MQ6N",
+    launch_system_id: "i5w5MuNik5NtLcYmNzcvaoixooEebB6MGV",
+    bitgojs_network_key: "verus",
+    display_ticker: "vDEX",
+    display_name: "vDEX",
+    alt_names: [],
+    theme_color: "#1d1d2c",
+    compatible_channels: [VERUSID, VRPC],
+    tags: [IS_VERUS, IS_ZCASH, IS_PBAAS],
+    proto: "vrsc",
+    vrpc_endpoints: ["https://api.vdex.to/"],
+    decimals: 8,
+    seconds_per_block: 60,
+    default_app: "wallet",
+    apps: VERUS_APPS
+  },
   ["iD5WRg7jdQM1uuoVHsBCAEKfJCKGs1U3TB"]: {
     pbaas_options: 545,
     id: "iD5WRg7jdQM1uuoVHsBCAEKfJCKGs1U3TB",

diff --git a/src/utils/web3/web3Interface.js b/src/utils/web3/web3Interface.js
@@ -90,7 +90,7 @@ class Web3Interface {
     for (const key in coinsList) {
       if (
         coinsList[key].proto === ERC20 &&
-        ((coinsList[key].testnet && this.network === 'goerli') ||
+        ((!!coinsList[key].testnet && this.network === 'goerli') ||
           (!coinsList[key].testnet && this.network === 'homestead')) &&
         coinsList[key].currency_id.toLowerCase() === contractAddress.toLowerCase()
       ) {