Merge support for the new Generic Request format, and add Z support to Android, and testnet on both Android and iOS

README.md

@@ -96,17 +96,11 @@ echo "rust.pythonCommand=/usr/bin/python2" >> local.properties
 
 # this will install the artifacts locally in ~/.m2/repository/com/github/VerusCoin/verus-android-sdk` etc by module
 ```
-6. Change the last line in `~/Verus-mobile/android/gradle.properties` to match your full location of Maven artifacts
-```
-# Replace the last line with absolute path for maven artifacts
-# Generated by `./gradlew publishToMavenLocal' called from 'verus-android-wallet-sdk` root
-REACT_NATIVE_MAVEN_LOCAL_REPO=/home/<yourUserName>/.m2/repository/
-```
-7. Run `yarn install`
+6. Run `yarn install`
 
-8. Open a separate withdow and run `yarn start` or `npx react-native start`
+7. Open a separate withdow and run `yarn start` or `npx react-native start`
 
-9. Build and install by running `yarn android`
+8. Build and install by running `yarn android`
 
 ## iOS (on macOS)
 

android/app/src/main/AndroidManifest.xml

@@ -11,6 +11,8 @@
         <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="i5jtwbp6zymeay9llnraglgjqgdrffsau4"/>
         <data android:scheme="i5JtwbP6zyMEAy9LLnRAGLgJQGdRFfsAu4"/>
+        <data android:scheme="verus"/>
+        <data android:scheme="verus0"/>
       </intent-filter>
     </activity>
     <activity android:name=".SplashActivity" android:exported="true" android:screenOrientation="portrait" android:theme="@style/SplashTheme" android:label="@string/app_name">
@@ -20,4 +22,10 @@
       </intent-filter>
     </activity>
   </application>
+  <queries>
+    <intent>
+      <action android:name="android.intent.action.VIEW"/>
+      <data android:scheme="verus1"/>
+    </intent>
+  </queries>
 </manifest>

android/build.gradle

@@ -100,3 +100,9 @@ subprojects {
      }
   }
 }
+
+allprojects {
+    repositories {
+        mavenLocal()
+    }
+}

android/gradle.properties

@@ -59,8 +59,3 @@ org.gradle.configureondemand=true
 AsyncStorage_useNextStorage=true
 AsyncStorage_kotlinVersion=1.9.0
 AsyncStorage_next_roomVersion=2.4.2
-
-
-# Uncomment the following, replacing with absolute path for maven artifacts
-# Generated by `./gradlew publishToMavenLocal' called from 'verus-android-wallet-sdk` root
-REACT_NATIVE_MAVEN_LOCAL_REPO=/home/<user>/.m2/repository/

env/main.android.json

@@ -12,7 +12,7 @@
   "MIN_ETH_TX_CONFS": 100,
 
   "ENABLE_VERUS_IDENTITIES": false,
-  "DISABLED_CHANNELS": [""],
+  "DISABLED_CHANNELS": [],
   "ENABLE_DLIGHT": true,
   "ENABLE_ERC20": true,
   "ENABLE_ETH": true,
@@ -38,6 +38,13 @@
   "ETHERSCAN_API_KEY": "PUT_KEY_HERE",
   "INFURA_PROJECT_ID": "PUT_ID_HERE",
 
+  "VRPC_API_APP_ID": "verus-mobile",
+  "VRPC_API_KEYS": {
+    "1f01aabdb97cb99af911f189f6e446bc9fdcd43423eb4358c54f85a6e5fb1f74": "VERUS_SERVICES_API_KEY",
+    "dd5c72207c8d2513201593fe1a8d3919ca871ef9a1360f86208982ca3b58bb5f": "VERUSTEST_API_KEY",
+    "204165660a8e26de6d447ae98005825ade4a83f0799fcbab3a0e19d49cbe40c8": "V2API_API_KEY"
+  },
+
   "USER_DATA_STORAGE_INTERNAL_KEY": "userData",
   "COIN_STORAGE_INTERNAL_KEY": "activeCoins",
   "SETTINGS_STORAGE_INTERNAL_KEY": "settings",

env/main.ios.json

@@ -38,6 +38,13 @@
   "ETHERSCAN_API_KEY": "PUT_KEY_HERE",
   "INFURA_PROJECT_ID": "PUT_ID_HERE",
 
+  "VRPC_API_APP_ID": "verus-mobile",
+  "VRPC_API_KEYS": {
+    "1f01aabdb97cb99af911f189f6e446bc9fdcd43423eb4358c54f85a6e5fb1f74": "VERUS_SERVICES_API_KEY",
+    "dd5c72207c8d2513201593fe1a8d3919ca871ef9a1360f86208982ca3b58bb5f": "VERUSTEST_API_KEY",
+    "204165660a8e26de6d447ae98005825ade4a83f0799fcbab3a0e19d49cbe40c8": "V2API_API_KEY"
+  },
+
   "USER_DATA_STORAGE_INTERNAL_KEY": "userData",
   "COIN_STORAGE_INTERNAL_KEY": "activeCoins",
   "SETTINGS_STORAGE_INTERNAL_KEY": "settings",

ios/Podfile.lock

@@ -842,7 +842,7 @@ SPEC CHECKSUMS:
   react-native-randombytes: 3c8f3e89d12487fd03a2f966c288d495415fc116
   react-native-safe-area-context: 17a482f540310e2209f884fd49472d9e1c0e73d6
   react-native-udp: d88de32b4a2c8c4ff3f55902d77bc0df573eab5a
-  react-native-verus: 84dd7b2bc7736c3709d35083f388318f41045667
+  react-native-verus: b0c9f824fc1c785fa2b55d469956d7e3ceea11e8
   React-perflogger: 0ba097528e325435aca94b32b5330f58f6acb6fb
   React-RCTActionSheet: 805b3a83f3dd7ae5a1213ea9df0ed748eeb74b85
   React-RCTAnimation: 2a0233681dee47e468302b8233652b35b68329cb

ios/assets/env/main.json

@@ -38,6 +38,13 @@
   "ETHERSCAN_API_KEY": "PUT_KEY_HERE",
   "INFURA_PROJECT_ID": "PUT_ID_HERE",
 
+  "VRPC_API_APP_ID": "verus-mobile",
+  "VRPC_API_KEYS": {
+    "1f01aabdb97cb99af911f189f6e446bc9fdcd43423eb4358c54f85a6e5fb1f74": "VERUS_SERVICES_API_KEY",
+    "dd5c72207c8d2513201593fe1a8d3919ca871ef9a1360f86208982ca3b58bb5f": "VERUSTEST_API_KEY",
+    "204165660a8e26de6d447ae98005825ade4a83f0799fcbab3a0e19d49cbe40c8": "V2API_API_KEY"
+  },
+
   "USER_DATA_STORAGE_INTERNAL_KEY": "userData",
   "COIN_STORAGE_INTERNAL_KEY": "activeCoins",
   "SETTINGS_STORAGE_INTERNAL_KEY": "settings",

ios/verusMobile/Info.plist

@@ -26,6 +26,8 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>i5jtwbp6zymeay9llnraglgjqgdrffsau4</string>
+        <string>verus</string>
+        <string>verus0</string>
 			</array>
 		</dict>
 	</array>
@@ -78,6 +80,10 @@
   <string>The app does not request this permission or utilize this functionality but it is included in our info.plist since our app utilizes the react-native-permissions library, which references this permission in its code.</string>
   <key>NSSpeechRecognitionUsageDescription</key>
   <string>The app does not request this permission or utilize this functionality but it is included in our info.plist since our app utilizes the react-native-permissions library, which references this permission in its code.</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>verus1</string>
+	</array>
 	<key>UIAppFonts</key>
 	<array>
 		<string>AntDesign.ttf</string>

metro.config.js

@@ -18,13 +18,22 @@ module.exports = (async () => {
     },
     resolver: {
       assetExts: assetExts.filter(ext => ext !== 'svg'),
-      sourceExts: [...sourceExts, 'svg'],
+      sourceExts: [...sourceExts, 'svg', 'cjs'],
       extraNodeModules: {
         crypto: require.resolve('react-native-crypto'),
         path: require.resolve('path-browserify'),
         stream: require.resolve('stream-browserify'),
-        process: require.resolve('process'),
+        process: require.resolve('process')
       },
+      resolveRequest: (context, moduleName, platform) => {
+        if (moduleName === 'axios') {
+          return {
+            filePath: require.resolve('axios/dist/browser/axios.cjs'),
+            type: 'sourceFile',
+          };
+        }
+        return context.resolveRequest(context, moduleName, platform);
+      }
     },
   };
 })();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "1.0.31",
+  "version": "1.0.34",
   "private": true,
   "scripts": {
     "postinstall": "npx jetify && rm node_modules/@adraffy/ens-normalize/package.json && cp patches/@adraffy/ens-normalize/adraffy_ens_normalize_package.json node_modules/@adraffy/ens-normalize/package.json && patch-package",
@@ -33,7 +33,7 @@
     "@tradle/react-native-http": "2.0.0",
     "@xmldom/xmldom": "0.8.6",
     "assert": "1.1.1",
-    "axios": "1.7.7",
+    "axios": "1.13.5",
     "base-64": "1.0.0",
     "base64url": "3.0.1",
     "bigi": "1.4.2",
@@ -173,7 +173,6 @@
     "hosted-git-info": "3.0.8",
     "ssri": "8.0.1",
     "color-string": "1.5.5",
-    "ajv": "6.12.3",
     "hermes-engine": "0.10.0",
     "logkitty": "0.7.1",
     "node-notifier": "8.0.1",
@@ -192,7 +191,6 @@
     "jszip": "3.8.0",
     "normalize-url": "4.5.1",
     "glob-parent": "5.1.2",
-    "axios": "1.8.2",
     "lodash": "4.17.21",
     "react-native": "0.71.19",
     "@react-native-community/cli": "8.0.4",
@@ -214,16 +212,15 @@
     "cross-fetch": "3.1.5",
     "parse-link-header": "2.0.0",
     "@react-native-async-storage/async-storage": "1.17.10",
-    "minimatch": "3.0.5",
     "json5": "2.2.2",
     "qs": "6.5.3",
     "ua-parser-js": "0.7.33",
     "http-cache-semantics": "4.1.1",
     "decode-uri-component": "0.2.2",
     "@sideway/formula": "3.0.1",
     "@babel/core": "7.25.7",
-    "blake2b-wasm": "https://github.com/VerusCoin/blake2b-wasm/",
-    "@bitgo/blake2b-wasm": "https://github.com/VerusCoin/blake2b-wasm/",
+    "blake2b-wasm": "git+https://github.com/VerusCoin/blake2b-wasm.git",
+    "@bitgo/blake2b-wasm": "git+https://github.com/VerusCoin/blake2b-wasm.git",
     "browserify-sign": "4.2.2",
     "secp256k1": "3.8.1",
     "form-data": "4.0.4",
@@ -232,7 +229,17 @@
     "brace-expansion": "1.1.12",
     "base-x": "3.0.11",
     "cipher-base": "1.0.5",
-    "sha.js": "2.4.12"
+    "sha.js": "2.4.12",
+    "fast-xml-parser": "4.5.4",
+    "minimatch": "3.1.4",
+    "glob": "7.2.3",
+    "js-yaml": "3.14.1",
+    "ajv": "6.14.0",
+    "micromatch": "4.0.8",
+    "cross-spawn": "6.0.6",
+    "axios": "1.13.5",
+    "bn.js": "4.12.3",
+    "immutable": "4.3.8"
   },
   "jest": {
     "preset": "react-native",

src/actions/actions/UserData.js

@@ -27,6 +27,7 @@ import {
   ERC20,
   ETH,
   DLIGHT_PRIVATE,
+  IS_PBAAS,
   VRPC,
   WYRE_SERVICE,
 } from '../../utils/constants/intervalConstants';
@@ -275,9 +276,14 @@ export const authenticateAccount = async (account, password) => {
             _keys[activeCoins[i].id] = {};
 
             for (const channel of CHANNELS) {
-              if (
+             if (
                 (activeCoins[i].compatible_channels.includes(channel) &&
                   seeds[channel]) ||
+                (channel === DLIGHT_PRIVATE &&
+                  seeds[DLIGHT_PRIVATE] &&
+                  activeCoins[i].testnet &&
+                  activeCoins[i].tags &&
+                  activeCoins[i].tags.includes(IS_PBAAS)) ||
                 channel === ETH ||
                 channel === ERC20 ||
                 channel === VRPC
@@ -395,8 +401,13 @@ export const addKeypairs = async (
     if (!seed) throw new Error('No seed found for account');
 
     if (
-      coinObj.compatible_channels.includes(seedType) &&
-      (seedType !== DLIGHT_PRIVATE || accountSeeds[seedType])
+      (coinObj.compatible_channels.includes(seedType) &&
+      (seedType !== DLIGHT_PRIVATE || accountSeeds[seedType])) ||
+      (seedType === DLIGHT_PRIVATE &&
+        accountSeeds[DLIGHT_PRIVATE] &&
+        coinObj.testnet &&
+        coinObj.tags &&
+        coinObj.tags.includes(IS_PBAAS))
     ) {
       const keyObj = await deriveKeyPair(
         seed,

src/actions/actions/intervals/dispatchers/IntervalCreator.js

@@ -165,6 +165,7 @@ export const clearAllCoinIntervals = (chainTicker) => {
 export const refreshCoinIntervals = (coinObj, onCompletes, updateParams, allSeenSystems = []) => {
   const state = Store.getState()
   const chainTicker = coinObj.id
+  const chainStatus = state.coins.status[chainTicker] == null ? PRE_DATA : state.coins.status[chainTicker]
   const vrpcSupported = coinObj.compatible_channels.includes(VRPC)
 
   // TODO: Channel manual enabling/disabling
@@ -195,7 +196,7 @@ export const refreshCoinIntervals = (coinObj, onCompletes, updateParams, allSeen
   if (!coinObj) throw new Error(`${chainTicker} is not added for current user. Coins must be added to be used.`)
 
   const updateDataAction = generateUpdateCoinDataAction(
-    PRE_DATA,
+    chainStatus,
     chainTicker,
     coinObj.tags,
     [...DEFAULT_INTERVAL_CHANNELS, ...verusIdChannels, ...vrpcChannels],
@@ -279,4 +280,4 @@ export const refreshCoinIntervals = (coinObj, onCompletes, updateParams, allSeen
       );
     }
   }
-}
+}

src/actions/actions/intervals/dispatchers/lifecycleManager.js

@@ -18,21 +18,31 @@ import { DEFAULT_COIN_UPDATE_PARAMS } from '../../../../utils/constants/defaultU
 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 getAllSeenSystemsForCoin = (coinObj, activeCoinsForUser) => {
+  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)) {
-          allSeenSystems.push(coin.system_id);
+      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
+      ) {
+        allSeenSystems.push(coin.system_id);
       }
     }
   }
 
+  return allSeenSystems;
+};
+
+export const activateChainLifecycle = (coinObj, activeCoinsForUser) => {
+  const allSeenSystems = getAllSeenSystemsForCoin(coinObj, activeCoinsForUser);
+
   refreshCoinIntervals(coinObj, {[API_GET_INFO]: {update_expired_oncomplete: getInfoOnComplete}}, DEFAULT_COIN_UPDATE_PARAMS, allSeenSystems)
 }
 
@@ -62,12 +72,12 @@ export const getInfoOnComplete = (state, dispatch, chainTicker) => {
   if (activeCoin == null) return;
 
   const currentStatus = state.coins.status[chainTicker]
-  const getInfoResult = state.ledger.info[chainTicker];
+  const getInfoResult = state.ledger.info[DLIGHT_PRIVATE]?.[chainTicker];
   const getInfoError = state.errors[API_GET_INFO][DLIGHT_PRIVATE][chainTicker];
   const refresh = () =>
     refreshCoinIntervals(activeCoin, {
       [API_GET_INFO]: { update_expired_oncomplete: getInfoOnComplete }
-    });
+    }, DEFAULT_COIN_UPDATE_PARAMS, getAllSeenSystemsForCoin(activeCoin, state.coins.activeCoinsForUser));
 
   if (getInfoError && getInfoError.error) return
 
@@ -95,4 +105,4 @@ export const getInfoOnComplete = (state, dispatch, chainTicker) => {
       refresh();
     }
   }
-};
+};

src/actions/actions/sendModal/dispatchers/sendModal.js

@@ -212,14 +212,18 @@ export const openAddErc20TokenModal = (coinObj, data) => {
   );
 };
 
-export const openProvisionIdentityModal = (coinObj, req, fromService = null) => {
+export const openProvisionIdentityModal = (coinObj, reqOrData, fromService = null) => {
+  const data =
+    reqOrData && reqOrData.challenge != null
+      ? { request: reqOrData, fromService }
+      : { ...(reqOrData || {}), fromService };
+
   openSendModal(
     `Request VerusID`,
     coinObj,
     null,
     {
-      request: req,
-      fromService,
+      ...data,
       [SEND_MODAL_IDENTITY_TO_PROVISION_FIELD]: ''
     },
     PROVISION_IDENTITY_SEND_MODAL,