From 9cc237fbf4903bc748ed558e10ccaaf8671b5712 Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Tue, 26 Mar 2019 00:35:22 +0100
Subject: [PATCH] Support web3 providers that do not support sync calls

This is currently the non default web3 provider used for rinkeby etc.
---
 scripts/add-contribution.js | 6 ++++--
 scripts/add-contributor.js  | 6 ++++--
 scripts/add-proposal.js     | 6 ++++--
 scripts/cli.js              | 8 +++++---
 scripts/repl.js             | 8 +++++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/scripts/add-contribution.js b/scripts/add-contribution.js
index 67c1074..cd326e2 100644
--- a/scripts/add-contribution.js
+++ b/scripts/add-contribution.js
@@ -3,10 +3,12 @@ const promptly = require('promptly');
 const ethers = require('ethers');
 const Kredits = require('../lib/kredits');
 
+const getNetworkId = require('./helpers/networkid.js')
+
 module.exports = async function(callback) {
-  const networkId = parseInt(web3.version.network);
+  const networkId = await getNetworkId(web3)
   const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: networkId }
+    web3.currentProvider, { chainId: parseInt(networkId) }
   );
   const kredits = await new Kredits(provider, provider.getSigner()).init();
 
diff --git a/scripts/add-contributor.js b/scripts/add-contributor.js
index 827fb27..4b82593 100644
--- a/scripts/add-contributor.js
+++ b/scripts/add-contributor.js
@@ -3,6 +3,8 @@ const promptly = require('promptly');
 const ethers = require('ethers');
 const Kredits = require('../lib/kredits');
 
+const getNetworkId = require('./helpers/networkid.js')
+
 async function prompt(message, options) {
   if (!options) {
     options = {default: ''}
@@ -11,9 +13,9 @@ async function prompt(message, options) {
 }
 
 module.exports = async function(callback) {
-  const networkId = parseInt(web3.version.network);
+  const networkId = await getNetworkId(web3)
   const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: networkId }
+    web3.currentProvider, { chainId: parseInt(networkId) }
   );
   const kredits = await new Kredits(provider, provider.getSigner()).init();
 
diff --git a/scripts/add-proposal.js b/scripts/add-proposal.js
index 7b9c044..42df6d4 100644
--- a/scripts/add-proposal.js
+++ b/scripts/add-proposal.js
@@ -3,10 +3,12 @@ const promptly = require('promptly');
 const ethers = require('ethers');
 const Kredits = require('../lib/kredits');
 
+const getNetworkId = require('./helpers/networkid.js')
+
 module.exports = async function(callback) {
-  const networkId = parseInt(web3.version.network);
+  const networkId = await getNetworkId(web3)
   const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: networkId }
+    web3.currentProvider, { chainId: parseInt(networkId) }
   );
   const kredits = await new Kredits(provider, provider.getSigner()).init();
 
diff --git a/scripts/cli.js b/scripts/cli.js
index f739554..6f63504 100644
--- a/scripts/cli.js
+++ b/scripts/cli.js
@@ -4,10 +4,12 @@ const promptly = require('promptly');
 const ethers = require('ethers');
 const Kredits = require('../lib/kredits');
 
-module.exports = function(callback) {
-  const networkId = parseInt(web3.version.network);
+const getNetworkId = require('./helpers/networkid.js')
+
+module.exports = async function(callback) {
+  const networkId = await getNetworkId(web3)
   const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: networkId }
+    web3.currentProvider, { chainId: parseInt(networkId) }
   );
 
   new Kredits(provider, provider.getSigner()).init().then(async function(kredits) {
diff --git a/scripts/repl.js b/scripts/repl.js
index a8245c2..fcce559 100644
--- a/scripts/repl.js
+++ b/scripts/repl.js
@@ -3,10 +3,12 @@ const REPL = require('repl');
 const ethers = require('ethers');
 const Kredits = require('../lib/kredits');
 
-module.exports = function(callback) {
-  const networkId = parseInt(web3.version.network);
+const getNetworkId = require('./helpers/networkid.js')
+
+module.exports = async function(callback) {
+  const networkId = await getNetworkId(web3)
   const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: networkId }
+    web3.currentProvider, { chainId: parseInt(networkId) }
   );
 
   new Kredits(provider, provider.getSigner()).init().then((kredits) => {