Merge pull request #77 from VerusCoin/dev

Dev

.gitlab-ci.yml

@@ -15,8 +15,8 @@ Android:debug:
   tags: ["Mobile"]
   stage: build
   script:
-    - sed -i -e "s/PUT_KEY_HERE/${ETHERSCAN_API_KEY}/g" env/main.json
-    - sed -i -e "s/PUT_ID_HERE/${INFURA_PROJECT_ID}/g" env/main.json
+    - sed -i -e "s/PUT_KEY_HERE/${ETHERSCAN_API_KEY}/g" env/main.android.json
+    - sed -i -e "s/PUT_ID_HERE/${INFURA_PROJECT_ID}/g" env/main.android.json
     - yarn install
     - yarn run bundle-android
     - cd android && ./gradlew assembleDebug
@@ -35,8 +35,8 @@ Android:release:
     RELEASE: 1
   stage: build
   script:
-    - sed -i -e "s/PUT_KEY_HERE/${ETHERSCAN_API_KEY}/g" env/main.json
-    - sed -i -e "s/PUT_ID_HERE/${INFURA_PROJECT_ID}/g" env/main.json
+    - sed -i -e "s/PUT_KEY_HERE/${ETHERSCAN_API_KEY}/g" env/main.android.json
+    - sed -i -e "s/PUT_ID_HERE/${INFURA_PROJECT_ID}/g" env/main.android.json
     - yarn install
     - cd android
     - echo ${KEYSTORE}  | xxd -r -p - > app/${MYAPP_RELEASE_STORE_FILE}

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.19.0
+ignore: {}
+patch: {}

android/app/build.gradle

@@ -4,7 +4,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 0
 def versionMinor = 2
-def versionRevision = 1
+def versionRevision = 2
 def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");
@@ -145,6 +145,7 @@ android {
     configurations {
         all {
             exclude group: 'org.json', module: 'json'
+            exclude group: 'org.powermock', module: 'powermock-classloading-xstream'
         }
     }
 
@@ -205,7 +206,6 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-vector-icons')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.facebook.react:react-native:+"  // From node_modules
@@ -221,6 +221,29 @@ dependencies {
         implementation jscFlavor
     }
 
+    implementation('junit:junit:4.13.1') {
+        force = true
+    }
+
+    implementation('org.robolectric:robolectric:4.4') {
+        force = true
+    }
+
+    implementation('com.drewnoakes:metadata-extractor:2.13.0') {
+        force = true
+    }
+
+    implementation('org.bouncycastle:bcprov-jdk15on:1.68') {
+        force = true
+    }
+
+    implementation('org.powermock:powermock-classloading-xstream:2.0.0') {
+        force = true
+    }
+
+    implementation('org.objenesis:objenesis:2.6') {
+        force = true
+    }
 }
 
 // Run this once to be able to run the application with BUCK

android/app/src/main/java/com/verusmobile/MainApplication.java

@@ -5,7 +5,6 @@
 import com.facebook.react.PackageList;
 
 import com.facebook.react.ReactApplication;
-import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
@@ -31,11 +30,6 @@ protected List<ReactPackage> getPackages() {
       // Packages that cannot be autolinked yet can be added manually here, for example:
       // packages.add(new MyReactNativePackage());
       return packages;
-
-      /*return Arrays.<ReactPackage>asList(
-            new MainReactPackage(),
-            new VectorIconsPackage()
-      );*/
     }
 
     @Override

android/build.gradle

@@ -36,16 +36,61 @@ subprojects {
               && !details.requested.name.contains('multidex') ) {
            details.useVersion "26.1.0"
         }
+
+        if (details.requested.group == 'junit' && details.requested.name == 'junit') {
+            details.useVersion '4.13.1'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-JUNIT-1017047'
+        }
+
+        if (details.requested.group == 'org.robolectric' && details.requested.name == 'robolectric') {
+            details.useVersion '4.4'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-32340'
+        }
+
+        if (details.requested.group == 'org.bouncycastle' && details.requested.name == 'bcprov-jdk15on') {
+            details.useVersion '1.68'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-32340'
+        }
+
+        if (details.requested.group == 'com.drewnoakes' && details.requested.name == 'metadata-extractor') {
+            details.useVersion '2.13.0'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-COMDREWNOAKES-455419'
+        }
+
+        if (details.requested.group == 'org.powermock' && details.requested.name == 'powermock-classloading-xstream') {
+            details.useVersion '2.0.0'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-31394'
+        }
+
+        if (details.requested.group == 'org.apache.httpcomponents' && details.requested.name == 'httpclient') {
+            details.useVersion '4.5.13'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-31517'
+        }
+
+        if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-compress') {
+            details.useVersion '1.19'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-32473'
+        }
+
+        if (details.requested.group == 'commons-codec' && details.requested.name == 'commons-codec') {
+            details.useVersion '1.13'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518'
+        }
+
+        if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') {
+            details.useVersion '30.0-jre'
+            details.because 'https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415'
+        }
      }
   }
 
    afterEvaluate {
-            project ->
-                if (project.hasProperty("android")) {
-                    android {
-                        compileSdkVersion = 29
-                        buildToolsVersion = "29.0.3"
-                    }
+        project ->
+            if (project.hasProperty("android")) {
+                android {
+                    compileSdkVersion = 29
+                    buildToolsVersion = "29.0.3"
                 }
-        }
-}
+            }
+    }
+}

android/gradle.properties

@@ -20,6 +20,7 @@
 android.useDeprecatedNdk=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.blacklist=bcprov-jdk15on
 
 # The Gradle daemon aims to improve the startup and execution time of Gradle.
 # When set to true the Gradle daemon is to run the build.

android/settings.gradle

@@ -1,6 +1,4 @@
 rootProject.name = 'verusmobile'
-include ':react-native-vector-icons'
-project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 
 include ':app'

env/index.js

@@ -0,0 +1,5 @@
+import * as iosEnv from './main.ios.json'
+import * as androidEnv from './main.android.json'
+import { Platform } from 'react-native'
+
+module.exports = Platform.OS === 'ios' ? iosEnv : androidEnv

env/main.android.json

@@ -0,0 +1,33 @@
+{
+  "APP_VERSION": "0.2.2",
+  "VERUS_QR_VERSION": "0.2.0",
+  "CHAIN_QR_VERSION": "0.1.0",
+  "ELECTRUM_PROTOCOL_CHANGE": 1.4,
+
+  "KEY_DERIVATION_VERSION": 1,
+
+  "REQUEST_TIMEOUT_MS": 60000,
+
+  "BLOCK_HEADER_STORE_CAP": 20,
+  "MIN_HEADER_CACHE_CONFS": 100,
+  "ETH_TRANSACTION_RECEIPT_CAP": 100,
+  "MIN_ETH_TX_CONFS": 100,
+
+  "ENABLE_FIAT_GATEWAY": false,
+  "ENABLE_VERUS_IDENTITIES": false,
+  "DISABLED_CHANNELS": ["dlight_private"],
+  "ENABLE_DLIGHT": false,
+  "ENABLE_ERC20": true,
+  "ENABLE_ETH": true,
+  "ENABLE_ELECTRUM": true,
+  "ENABLE_GENERAL": true,
+
+  "ETH_NETWORK": "homestead",
+
+  "BIOMETRIC_SECURITY_THRESHOLD": "SECURE_HARDWARE",
+
+  "INTERNAL_APP_ID": "Verus_Mobile",
+
+  "ETHERSCAN_API_KEY": "PUT_KEY_HERE",
+  "INFURA_PROJECT_ID": "PUT_ID_HERE"
+}

env/main.json → env/main.ios.json

@@ -1,9 +1,11 @@
 {
-  "APP_VERSION": "0.2.1-beta",
+  "APP_VERSION": "0.2.2",
   "VERUS_QR_VERSION": "0.2.0",
   "CHAIN_QR_VERSION": "0.1.0",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
+  "KEY_DERIVATION_VERSION": 1,
+
   "REQUEST_TIMEOUT_MS": 60000,
 
   "BLOCK_HEADER_STORE_CAP": 20,

index.js

@@ -1,5 +1,5 @@
 /** @format */
-import 'react-native-gesture-handler'
+//import 'react-native-gesture-handler'
 import { AppRegistry } from 'react-native';
 import App from './App';
 import {name as appName} from './app.json';