Get URL from web3 provider, source maps, stringify typed data

package.json

@@ -20,7 +20,7 @@
     "lint": "./node_modules/.bin/eslint src/",
     "babel": "cross-env BABEL_ENV=node babel --out-dir dist src --source-maps",
     "build": "npm-run-all build:**",
-    "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser",
+    "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --source-maps",
     "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --source-maps",
     "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --source-maps",
     "ci": "npm run qa",

src/index.js

@@ -49,7 +49,11 @@ export default class EmbarkJSPlasma {
       this.initing = true;
 
       if (web3) { // web3 is being passed in and we should use that
-        this.web3 = new Web3(web3.currentProvider || web3.givenProvider, null, web3Options); // embark main process
+        const url = this.getUrlFromProvider(web3.currentProvider || web3.givenProvider);
+        if (!url) {
+          return this.logger.error(`Failed to initialize the Plasma plugin: could not obtain a blockchain node URL from the web3 provider`);
+        }
+        this.web3 = new Web3(url, null, web3Options); // embark main process
       }
       else {
         const isConnected = await this.doConnect(this.config.dappConnection);
@@ -81,6 +85,17 @@ export default class EmbarkJSPlasma {
     }
   }
 
+  getUrlFromProvider(provider) {
+    if (!provider) return null;
+    const { connection } = provider;
+    // TODO with the right babel/ES optional chaining support (https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining), rewrite as 
+    // return connection?.url || connection?.connection?.url;
+    if (!connection) return null;
+    if (connection.url) return connection.url;
+    if (connection.connection && connection.connection.url) return connection.connection.url;
+    return null;
+  }
+
   async getBrowserWeb3() {
     if (window.ethereum) {
       this.web3 = new Web3(window.ethereum, null, web3Options);
@@ -108,11 +123,17 @@ export default class EmbarkJSPlasma {
     };
 
     const connectWeb3 = async () => {
+      const self = this;
       if (window && window.ethereum) {
         this.web3 = new Web3(window.ethereum, null, web3Options);
         await window.ethereum.enable();
-      } else if (window && window.web3) { // legacy
-        this.web3 = new Web3(window.web3.currentProvider, null, web3Options);
+      } else if (window && window.web3 && window.web3.currentProvider) { // legacy
+        const url = self.getUrlFromProvider(window.web3.currentProvider);
+        if (!url) {
+          this.logger.error(`Could not get URL from web3 provider`);
+          return false;
+        }
+        this.web3 = new Web3(url, null, web3Options);
       } else {
         return false;
       }
@@ -131,7 +152,10 @@ export default class EmbarkJSPlasma {
 
     for (let connectionString of connectionList) {
       try {
-        if (connectionString === '$WEB3' && await connectWeb3(connectionString)) {
+        if (connectionString === '$WEB3') {
+          if (!await connectWeb3()) {
+            continue;
+          }
           return true;
         } else if ((/^wss?:\/\//).test(connectionString) && await connectWebsocket(connectionString)) {
           return true;

src/utils.js

@@ -96,9 +96,10 @@ export function selectUtxos(utxos, amount, currency, includeFee) {
 
 export async function signTypedData(web3, signer, data) {
   try {
-    return await web3.currentProvider.send('eth_signTypedData_v3', [signer, JSON.stringify(data)]);
+    data = JSON.stringify(data);
+    return await web3.currentProvider.send('eth_signTypedData_v3', [signer, data]);
   } catch (e) {
-    if (e.message.includes("The method eth_signTypedData_v3 does not exist/is not available")) {
+    if (/the method eth_signTypedData_v3 does not exist\/is not available/i.test(e.message)) {
       // the node we're connecting to doesn't support this RPC call
       throw new Error("The node does not support signing of typed data. Either enable a web3 wallet like MetaMask that can intercept this RPC call, or connect to a node that supports signing of typed data (ie the Embark node).");
     }