[FIX] Resolve web3 (#57)

* fallback node

* missed

* step

* package

* package

* downgrade web3

* restore web3

* lint

package.json

@@ -45,23 +45,23 @@
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-react": "^7.0.0",
     "autoprefixer": "^9.6.1",
-    "babel-eslint": "^10.0.2",
+    "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "copy-webpack-plugin": "^5.0.4",
-    "cross-env": "^5.2.0",
+    "cross-env": "^5.2.1",
     "css-loader": "^3.2.0",
-    "eslint": "^6.1.0",
+    "eslint": "^6.3.0",
     "eslint-plugin-react": "^7.14.3",
     "file-loader": "^4.2.0",
     "html-webpack-plugin": "^3.2.0",
     "postcss-loader": "^3.0.0",
-    "react-hot-loader": "^4.12.10",
+    "react-hot-loader": "^4.12.12",
     "style-loader": "^1.0.0",
     "url-loader": "^2.1.0",
-    "webpack": "^4.39.1",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
     "webpack-dev-server": "^3.8.0",
-    "webpack-merge": "^4.2.1"
+    "webpack-merge": "^4.2.2"
   },
   "dependencies": {
     "bignumber.js": "^9.0.0",
@@ -72,7 +72,7 @@
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
     "react-toastify": "^5.3.2",
-    "semantic-ui-react": "^0.87.3",
+    "semantic-ui-react": "^0.88.0",
     "web3": "^1.2.1"
   },
   "pre-commit": [

src/components/Content.js

@@ -33,6 +33,9 @@ export default class Content extends HasAlert {
         web3Service.emitter.on('error', (e) =>
             this.notify({ msg: e.message|| e, type: 'error' })
         );
+        web3Service.emitter.on('info', (e) =>
+            this.notify({ msg: e.message|| e, type: 'info' })
+        );
     }
 
     state = {

src/config/backupNode.js

@@ -0,0 +1,2 @@
+const infura = 'https://mainnet.infura.io/v3/33621b0ea64d4069b9e5a6d29fdac33a';
+export default infura;

src/config/index.js

@@ -2,5 +2,6 @@ export { default as call2Action } from './call2Action';
 export { default as explorers } from './explorers';
 export { default as networks } from './networks';
 export { default as features } from './features';
+export { default as backupNode } from './backupNode';
 export { default as ethereumNode } from './ethereumNode';
 export { default as fnSignatures } from './fnSignatures';

src/services/web3Service.js

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import EventEmitter from 'events';
-import { ethereumNode, explorers, fnSignatures, networks } from '../config';
+import { backupNode, ethereumNode, explorers, fnSignatures, networks } from '../config';
 import ERC20 from '../abi/ForeignToken';
 
 class web3Service {
@@ -29,6 +29,29 @@ class web3Service {
                 this._web3 = new Web3(
                     Web3.givenProvider || window.web3.currentProvider
                 );
+            } else {
+                this.emitter.emit('info', 'Using backup(infura) Mainnet node');
+                if (backupNode.includes('http')) {
+                    const slashIndex = backupNode.indexOf('//')+2;
+                    const queryIndex = backupNode.indexOf('/', slashIndex) || backupNode.indexOf('?', slashIndex);
+                    const domain = queryIndex >= 0 ? backupNode.substring(0, queryIndex) : backupNode;
+
+                    this._web3 = new Web3(
+                        new Web3.providers.HttpProvider(
+                            backupNode,
+                            {
+                            headers: [{
+                                name: 'Access-Control-Allow-Origin',
+                                value: domain
+                            }]
+                            }
+                        )
+                    );
+                } else {
+                    this._web3 = new Web3(
+                            backupNode
+                    );
+                }
             }
             this.isMetamask = this._web3.currentProvider.isMetaMask;
             this.netId = await this._web3.eth.net.getId().valueOf();

src/www/main.html

@@ -3,7 +3,7 @@
   <title>Token Transfer Dapp - Easy and optimized erc20 token transfer dapp</title>
   <meta name="description" content="A decentralized dapp, to make quick ERC20, enabled tokens transfers">
   <meta name="keywords" content="ethereum,ethereum-dapp,erc20,erc20-tokens,transfer,decentralized,dapp,token,tokens,online,metamask">
-  <link rel="icon" href="../images/icons/favicon.ico" />
+  <link rel="icon" href="./images/icons/favicon.ico" />
   <link rel="canonical" href="https://ttd.icobusses.io/" />
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css"></link>
   <link href="https://fonts.googleapis.com/css?family=Roboto:500,700,900&display=swap" rel="stylesheet">

webpack.config.js

@@ -20,6 +20,7 @@ const settings = merge(baseConfig, {
     contentBase: path.resolve('src/'),
     publicPath: 'http://localhost:8080/', // full URL is necessary for Hot Module Replacement if additional path will be added.
     quiet: false,
+    https: true,
     hot: true,
     historyApiFallback: true,
     inline: true