Refactor kredits init in helper scripts

This now also supports readonly providers like infura

scripts/add-contribution.js

@@ -1,16 +1,15 @@
 const promptly = require('promptly');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using Contributions at: ${kredits.Contribution.contract.address}`);
 

scripts/add-contributor.js

@@ -1,9 +1,6 @@
 const promptly = require('promptly');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 async function prompt(message, options) {
   if (!options) {
@@ -13,11 +10,13 @@ async function prompt(message, options) {
 }
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using contributors at: ${kredits.Contributor.contract.address}`);
 

scripts/add-proposal.js

@@ -1,16 +1,15 @@
 const promptly = require('promptly');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using Proposal at: ${kredits.Proposal.contract.address}`);
 

scripts/cli.js

@@ -1,18 +1,10 @@
 const REPL = require('repl');
 const promptly = require('promptly');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-
-  new Kredits(provider, provider.getSigner()).init().then(async function(kredits) {
+  initKredits(web3).then(async function(kredits) {
     let contractName = await promptly.prompt('Contract Name: ');
     const contractWrapper = kredits[contractName];
 

scripts/helpers/init_kredits.js

@@ -0,0 +1,25 @@
+const ethers = require('ethers');
+const getNetworkId = require('./networkid.js')
+const Kredits = require('../../lib/kredits');
+
+module.exports = async function(web3) {
+  return new Promise((resolve, reject) => {
+    getNetworkId(web3).then(networkId => {
+      const provider = new ethers.providers.Web3Provider(
+        web3.currentProvider, { chainId: parseInt(networkId) }
+      );
+      let signer = provider.getSigner();
+      // checking if siner supports signing transactions
+      signer.getAddress().then(_ => {
+        new Kredits(provider, signer).init().then(kredits => {
+          resolve(kredits);
+        })
+      }).catch(e => {
+        console.log(`Signer account not available; readonly connection (${e.message}`);
+        new Kredits(provider, null).init().then(kredits => {
+          resolve(kredits);
+        })
+      })
+    })
+  });
+}

scripts/list-contributions.js

@@ -1,17 +1,16 @@
 const promptly = require('promptly');
 const Table = require('cli-table');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
 

scripts/list-contributors.js

@@ -1,17 +1,16 @@
 const promptly = require('promptly');
 const Table = require('cli-table');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
 

scripts/list-proposals.js

@@ -1,17 +1,16 @@
 const promptly = require('promptly');
 const Table = require('cli-table');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   console.log(`Using Proposal at: ${kredits.Proposal.contract.address}`);
 

scripts/repl.js

@@ -1,9 +1,6 @@
 const REPL = require('repl');
 
-const ethers = require('ethers');
-const Kredits = require('../lib/kredits');
-
-const getNetworkId = require('./helpers/networkid.js')
+const initKredits = require('./helpers/init_kredits.js');
 
 function promiseEval (repl) {
   const currentEval = repl.eval;
@@ -21,12 +18,14 @@ function promiseEval (repl) {
 }
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
-  new Kredits(provider, provider.getSigner()).init().then((kredits) => {
   console.log(`Defined variables: kredits, web3`);
   let r = REPL.start();
   r.context.kredits = kredits;
@@ -37,5 +36,4 @@ module.exports = async function(callback) {
     console.log('Bye');
     callback();
   });
-  });
 }

scripts/seeds.js

@@ -2,17 +2,17 @@ const path = require('path');
 const each = require('async-each-series');
 const ethers = require('ethers');
 
-const Kredits = require('../lib/kredits');
-const getNetworkId = require('./helpers/networkid.js')
-
+const initKredits = require('./helpers/init_kredits.js');
 const seeds = require(path.join(__dirname, '..', '/config/seeds.js'));
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
-  const provider = new ethers.providers.Web3Provider(
-    web3.currentProvider, { chainId: parseInt(networkId) }
-  );
-  const kredits = await new Kredits(provider, provider.getSigner()).init();
+  let kredits;
+  try {
+    kredits = await initKredits(web3);
+  } catch(e) {
+    callback(e);
+    return;
+  }
 
   let fundingAmount = 2;
   each(seeds.funds, (address, next) => {