Merge branch 'develop'

index.js

@@ -1,6 +1,5 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 
-import './src/util/shim.js'
 import './src/app.js'
 
 import { AppRegistry } from 'react-native'

ios/Podfile.lock

@@ -7,7 +7,7 @@ PODS:
     - React
   - BVLinearGradient (2.5.3):
     - React
-  - disklet (0.4.1):
+  - disklet (0.4.2):
     - React
   - DoubleConversion (1.1.6)
   - edge-login-ui-rn (0.5.41):
@@ -288,7 +288,7 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BugsnagReactNative: 7ba00c17a3dedfeea4dd011919962d415a231c49
   BVLinearGradient: 0d985ec461359c82bc254f26d11008bdae50d17a
-  disklet: 0aca5091512a734c94cdfe2bd575794b38717d9e
+  disklet: 2fd40706dc13842175ae23bdd57d5b893fbb68a8
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   edge-login-ui-rn: 6fa3b3e0d39597d29c4ae4b3dd241b05c77030c6
   Firebase: 68afeeb05461db02d7c9e3215cda28068670f4aa

ios/edge.xcodeproj/project.pbxproj

@@ -106,7 +106,7 @@
 		2FA801C9862A4F139CE441F6 /* Roboto_medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Roboto_medium.ttf; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = "<group>"; };
 		3174EFC33129444580156447 /* SourceSansPro-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-BlackItalic.ttf"; path = "../src/assets/fonts/SourceSansPro-BlackItalic.ttf"; sourceTree = "<group>"; };
 		38A5524778E84A41B960E513 /* SourceSansPro-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-ExtraLightItalic.ttf"; path = "../src/assets/fonts/SourceSansPro-ExtraLightItalic.ttf"; sourceTree = "<group>"; };
-		3D1368BC21DD76BB00DC8CE4 /* edge-core */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "edge-core"; sourceTree = "<group>"; };
+		3D1368BC21DD76BB00DC8CE4 /* edge-core */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "edge-core"; path = "../android/app/src/main/assets/edge-core"; sourceTree = "<group>"; };
 		3D2A4BE222934B0000E1EC61 /* blank.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = blank.html; path = ../android/app/src/main/assets/blank.html; sourceTree = "<group>"; };
 		497F4AA15A3F4601A2F7027F /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; };
 		49D445F8FCA448348B61F284 /* TSBackgroundFetch.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = TSBackgroundFetch.framework; path = "../node_modules/react-native-background-fetch/ios/RNBackgroundFetch/TSBackgroundFetch.framework"; sourceTree = SDKROOT; };

package.json

@@ -20,30 +20,6 @@
     "William Swanson <william@edge.app>",
     "Tim Horton <tim@edge.app>"
   ],
-  "browser": {
-    "_stream_duplex": "readable-stream/duplex",
-    "_stream_passthrough": "readable-stream/passthrough",
-    "_stream_readable": "readable-stream/readable",
-    "_stream_transform": "readable-stream/transform",
-    "_stream_writable": "readable-stream/writable",
-    "console": "console-browserify",
-    "constants": "constants-browserify",
-    "crypto": "react-native-crypto",
-    "dgram": "react-native-udp",
-    "dns": "dns.js",
-    "domain": "domain-browser",
-    "http": "react-native-http",
-    "https": "https-browserify",
-    "net": "react-native-tcp",
-    "os": "os-browserify",
-    "path": "path-browserify",
-    "querystring": "querystring-es3",
-    "stream": "stream-browserify",
-    "timers": "timers-browserify",
-    "tty": "tty-browserify",
-    "vm": "vm-browserify",
-    "zlib": "browserify-zlib"
-  },
   "scripts": {
     "android:clean": "cd android && ./gradlew clean && rm -rf build && cd ../",
     "android:logcat": "adb logcat *:S ReactNative:V ReactNativeJS:V",
@@ -61,7 +37,7 @@
     "lint:fix": "npm run format",
     "localize": "node ./localizeLanguage.js; git add ./src/locales/strings",
     "precommit": "npm run localize && lint-staged && flow && npm test",
-    "prepare": "rollup -c; node ./src/util/bridge/stringifyBridge.js",
+    "prepare": "webpack && rollup -c && node ./src/util/bridge/stringifyBridge.js",
     "server": "node ./loggingServer.js",
     "start": "node --max_old_space_size=4000 node_modules/react-native/local-cli/cli.js start ",
     "test": "jest",
@@ -124,34 +100,24 @@
     ]
   },
   "dependencies": {
-    "assert": "^1.4.1",
     "async-lock": "^1.1.2",
     "biggystring": "^3.0.2",
-    "browserify-zlib": "^0.1.4",
     "buffer": "^5.0.8",
     "bugsnag-react-native": "^2.10.2",
-    "console-browserify": "^1.1.0",
-    "constants-browserify": "0.0.1",
-    "core-js": "2.5.2",
+    "core-js": "^2.5.2",
     "dateformat": "^3.0.3",
     "detect-bundler": "^1.0.0",
     "disklet": "^0.4.1",
-    "dns.js": "^1.0.1",
-    "domain-browser": "^1.1.7",
     "edge-components": "^0.0.26",
-    "edge-core-js": "^0.16.9",
-    "edge-currency-accountbased": "0.4.5",
+    "edge-core-js": "^0.16.10",
+    "edge-currency-accountbased": "^0.4.5",
     "edge-currency-bitcoin": "^4.6.0",
-    "edge-currency-monero": "0.2.4",
+    "edge-currency-monero": "^0.2.4",
     "edge-exchange-plugins": "^0.8.5",
     "edge-login-ui-rn": "0.5.41",
-    "https-browserify": "0.0.1",
     "lodash": "^4.17.2",
-    "os-browserify": "^0.1.2",
-    "path-browserify": "0.0.0",
     "process": "^0.11.10",
     "prop-types": "^15.5.10",
-    "querystring-es3": "^0.2.1",
     "react": "16.8.3",
     "react-native": "0.59.10",
     "react-native-animatable": "^1.1.0",
@@ -161,15 +127,13 @@
     "react-native-contacts": "2.2.5",
     "react-native-contacts-wrapper": "git://github.com/EdgeApp/react-native-contacts-wrapper.git#a57a5d9",
     "react-native-cookies": "git://github.com/joeferraro/react-native-cookies.git#4206542d",
-    "react-native-crypto": "^2.0.1",
     "react-native-device-info": "^0.22.4",
     "react-native-drawer": "^2.3.0",
     "react-native-extra-dimensions-android": "^1.2.5",
     "react-native-fast-crypto": "1.8.1",
     "react-native-firebase": "4.3.8",
     "react-native-flip-view": "git://github.com/EdgeApp/react-native-flip-view.git",
     "react-native-fs": "git://github.com/EdgeApp/react-native-fs.git#edge/removeEncoding",
-    "react-native-http": "git://github.com/tradle/react-native-http#834492d",
     "react-native-image-picker": "0.28.0",
     "react-native-keyboard-aware-scroll-view": "^0.7.4",
     "react-native-linear-gradient": "^2.0.0",
@@ -200,29 +164,26 @@
     "react-native-webview": "git://github.com/swansontec/react-native-webview#edge-version",
     "react-redux": "^5.0.5",
     "react-timer-mixin": "^0.13.4",
-    "readable-stream": "^1.0.33",
     "redux": "^3.7.1",
     "redux-thunk": "^2.2.0",
     "sprintf-js": "^1.1.1",
-    "stream-browserify": "^1.0.0",
-    "timers-browserify": "^1.4.2",
-    "tty-browserify": "0.0.0",
-    "url": "^0.10.3",
+    "url": "^0.11.0",
     "url-parse": "^1.4.4",
-    "vm-browserify": "0.0.4",
     "why-did-you-update": "^0.1.1",
     "yaob": "0.3.4"
   },
   "devDependencies": {
     "@babel/core": "^7.4.0",
+    "@babel/preset-env": "^7.6.0",
     "@babel/runtime": "^7.4.2",
     "babel-eslint": "^8.1.0",
     "babel-jest": "^24.5.0",
+    "babel-loader": "^8.0.5",
     "body-parser": "^1.18.2",
     "edge-plugin-bitrefill": "https://github.com/EdgeApp/edge-plugin-bitrefill.git#2627b9d",
     "edge-plugin-simplex": "https://github.com/Airbitz/edge-plugin-simplex.git#29163e3",
     "edge-plugin-wyre": "https://github.com/EdgeApp/edge-plugin-wyre.git#3a67fdf",
-    "edge-plugin-bity": "https://github.com/EdgeApp/edge-plugin-bity.git#8706f13",
+    "edge-plugin-bity": "https://github.com/EdgeApp/edge-plugin-bity.git#1936cfe",
     "eslint": "^4.17.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-plugin-flowtype": "^2.35.0",
@@ -241,20 +202,44 @@
     "import-sort-style-module": "^5.0.0",
     "jest": "^24.5.0",
     "jest-junit": "^5.1.0",
-    "json-format": "^1.0.1",
     "jsonfile": "^4.0.0",
     "lint-staged": "^6.1.1",
     "metro-react-native-babel-preset": "^0.53.1",
     "nyc": "^10.0.0",
     "prettier-eslint-cli": "^4.7.0",
     "react-test-renderer": "16.8.3",
-    "rn-nodeify": "^7.0.1",
     "rollup": "^1.1.2",
     "rollup-plugin-node-resolve": "4.0.0",
-    "updot": "^1.1.7"
+    "updot": "^1.1.7",
+    "webpack": "^4.29.3",
+    "webpack-cli": "^3.2.3"
   },
   "resolutions": {
-    "scrypt.js": "0.3.0"
+    "axios": "0.19.0",
+    "babel-runtime": "6.26.0",
+    "base-x": "3.0.4",
+    "bip39": "3.0.2",
+    "bn.js": "4.11.8",
+    "bs58": "4.0.1",
+    "bs58check": "2.1.2",
+    "codecov": "3.5.0",
+    "core-js": "2.5.3",
+    "create-hash": "1.2.0",
+    "elliptic": "6.4.1",
+    "ethereumjs-util": "5.2.0",
+    "hash-base": "3.0.4",
+    "hdkey": "1.1.1",
+    "long": "4.0.0",
+    "process-nextick-args": "2.0.0",
+    "randombytes": "2.1.0",
+    "readable-stream": "2.3.6",
+    "regenerator-runtime": "0.13.2",
+    "ripemd160": "2.0.2",
+    "ripple-binary-codec": "0.2.3",
+    "safe-buffer": "5.1.2",
+    "scrypt.js": "0.3.0",
+    "sha.js": "2.4.11",
+    "uuid": "3.3.2"
   },
   "detox": {
     "test-runner": "jest",
@@ -310,33 +295,6 @@
     "edge-plugin-bitrefill",
     "edge-plugin-bity"
   ],
-  "react-native": {
-    "_stream_duplex": "readable-stream/duplex",
-    "_stream_passthrough": "readable-stream/passthrough",
-    "_stream_readable": "readable-stream/readable",
-    "_stream_transform": "readable-stream/transform",
-    "_stream_writable": "readable-stream/writable",
-    "console": "console-browserify",
-    "constants": "constants-browserify",
-    "crypto": "react-native-crypto",
-    "dgram": "react-native-udp",
-    "dns": "dns.js",
-    "domain": "domain-browser",
-    "fs": "react-native-level-fs",
-    "https-proxy-agent": false,
-    "http": "react-native-http",
-    "https": "https-browserify",
-    "net": "react-native-tcp",
-    "tls": "react-native-tcp/tls",
-    "os": "os-browserify",
-    "path": "path-browserify",
-    "querystring": "querystring-es3",
-    "stream": "stream-browserify",
-    "timers": "timers-browserify",
-    "tty": "tty-browserify",
-    "vm": "vm-browserify",
-    "zlib": "browserify-zlib"
-  },
   "rnpm": {
     "assets": [
       "./src/assets/fonts"

postinstall.sh

@@ -1,15 +1,5 @@
 #!/bin/bash
 
-rn-nodeify --hack
-rm -rf ./node_modules/bcoin/.babelrc ./node_modules/edge-currency-bitcoin/node_modules/bcoin/.babelrc
-rm -rf ./node_modules/bccoin/.babelrc ./node_modules/edge-currency-bitcoin/node_modules/bccoin/.babelrc
-rm -rf ./node_modules/lcoin/.babelrc ./node_modules/edge-currency-bitcoin/node_modules/lcoin/.babelrc
-
-# Fix rn-nodify's hack of fs -> react-native-level-fs for mymonero-core-js. Use react-native-fs instead
-sed "s/react-native-level-fs/react-native-fs/g" ./node_modules/mymonero-core-js/package.json > ./node_modules/mymonero-core-js/package.json.fix
-mv ./node_modules/mymonero-core-js/package.json.fix ./node_modules/mymonero-core-js/package.json
-
-node postinstall.js
 mkdir -p temp
 
 # Remove inclusion of c++_shared.so library since we are using jsc-android which already includes it
@@ -21,16 +11,6 @@ sed "s/--reset-cache/--reset-cache --sourcemap-output ios-release.bundle.map/g"
 mv temp/react-native-xcode.sh node_modules/react-native/scripts/react-native-xcode.sh
 chmod 755 node_modules/react-native/scripts/react-native-xcode.sh
 
-# Force rand to exist for miller-rabin library
-sed "s/function MillerRabin(rand)/function MillerRabin(rand = 'NoRandFunction')/g" node_modules/miller-rabin/lib/mr.js > temp/mr.js
-mv temp/mr.js node_modules/miller-rabin/lib/mr.js
-chmod 755 node_modules/miller-rabin/lib/mr.js
-
-# Remove fetch polyfill from eosjs-api
-sed "s/require('isomorphic-fetch');//g" node_modules/eosjs-api/lib/apigen.js > temp/apigen.js
-mv temp/apigen.js node_modules/eosjs-api/lib/apigen.js
-chmod 755 node_modules/eosjs-api/lib/apigen.js
-
 node ./copy-plugin.js
 
 # Disable minification
@@ -42,8 +22,15 @@ node ./copy-plugin.js
 # See: https://github.com/facebook/react-native/pull/16456
 
 # Copy edge-core-js WebView contents:
-mkdir -p ios/edge-core
-cat >ios/edge-core/index.html <<HTML
+core_assets="./android/app/src/main/assets/edge-core"
+if [ -d "$core_assets" ]; then
+  rm -r "$core_assets"
+fi
+mkdir -p "$core_assets"
+cp ./node_modules/edge-core-js/lib/react-native/edge-core.js "$core_assets"
+
+# Write out an edge-core-js index.html file:
+cat >"$core_assets/index.html" <<HTML
 <!DOCTYPE html>
 <html>
   <head>
@@ -53,42 +40,20 @@ cat >ios/edge-core/index.html <<HTML
   <body>
     <script src="edge-core.js"></script>
     <script>
-      var loading = 0
-
-      function load (path) {
-        ++loading
-
+      function load() {
         var script = document.createElement('script')
         script.charset = 'utf-8'
         script.async = true
-        function scriptDone () {
-          document.head.removeChild(script)
-          if (--loading === 0) {
-            window.lockEdgeCorePlugins()
-          }
-        }
-        script.addEventListener('error', scriptDone)
-        script.addEventListener('load', scriptDone)
-        script.src = path
+        script.addEventListener('error', window.lockEdgeCorePlugins)
+        script.addEventListener('load', window.lockEdgeCorePlugins)
+        script.src = 'plugin-bundle.js'
         document.head.appendChild(script)
       }
-
-      setTimeout(function () {
-        load('edge-currency-accountbased.js')
-        load('edge-currency-bitcoin.js')
-        load('edge-currency-monero.js')
-        load('edge-exchange-plugins.js')
-      }, 200)
+      setTimeout(load, 200)
     </script>
   </body>
 </html>
 HTML
-cp ./node_modules/edge-core-js/lib/react-native/edge-core.js ./ios/edge-core
-cp ./node_modules/edge-currency-accountbased/lib/react-native/edge-currency-accountbased.js ./ios/edge-core
-cp ./node_modules/edge-currency-bitcoin/lib/react-native/edge-currency-bitcoin.js ./ios/edge-core
-cp ./node_modules/edge-currency-monero/lib/react-native/edge-currency-monero.js ./ios/edge-core
-cp ./node_modules/edge-exchange-plugins/lib/react-native/edge-exchange-plugins.js ./ios/edge-core
-cp -r ./ios/edge-core ./android/app/src/main/assets/
 
 # Set up CocoaPods on iOS:
 unamestr=`uname`