diff --git a/scripts/deploy-kit.js b/scripts/deploy-kit.js index 045ccdd..cf9bf52 100644 --- a/scripts/deploy-kit.js +++ b/scripts/deploy-kit.js @@ -6,6 +6,7 @@ const argv = require('yargs').argv const namehash = require('eth-ens-namehash').hash const fileInject = require('./helpers/file_inject.js') +const getNetworkId = require('./helpers/networkid.js') const DAOFactory = artifacts.require('DAOFactory') const KreditsKit = artifacts.require('KreditsKit') @@ -18,18 +19,7 @@ const daoFactoryAddress = arapp.environments[environment].daoFactory || process. module.exports = async function(callback) { - - // load networkId; will change with updated truffle - const networkPromise = new Promise((resolve, reject) => { - web3.version.getNetwork((err, network) => { - if (err) { - reject(err); - } else { - resolve(network); - } - }) - }) - const networkId = await networkPromise; + const networkId = await getNetworkId(web3) console.log(`Deploying to networkId: ${networkId}`) if (!ensAddr) { diff --git a/scripts/new-dao.js b/scripts/new-dao.js index ad37e39..4694c48 100644 --- a/scripts/new-dao.js +++ b/scripts/new-dao.js @@ -2,23 +2,14 @@ const fs = require('fs'); const path = require('path'); const fileInject = require('./helpers/file_inject.js'); +const getNetworkId = require('./helpers/networkid.js'); const addressesPath = path.join(__dirname, '..', 'lib/addresses'); const KreditsKit = artifacts.require('KreditsKit') module.exports = async function(callback) { - // load networkId; will change with updated truffle - const networkPromise = new Promise((resolve, reject) => { - web3.version.getNetwork((err, network) => { - if (err) { - reject(err); - } else { - resolve(network); - } - }) - }) - const networkId = await networkPromise; + const networkId = await getNetworkId(web3) console.log(`Deploying to networkId: ${networkId}`) let kitAddresseFile = path.join(addressesPath, 'KreditsKit.json'); diff --git a/scripts/seeds.js b/scripts/seeds.js index 1591ffc..2531a6a 100644 --- a/scripts/seeds.js +++ b/scripts/seeds.js @@ -1,15 +1,16 @@ 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 seeds = require(path.join(__dirname, '..', '/config/seeds.js')); -const ethers = require('ethers'); -const Kredits = require('../lib/kredits'); - -const each = require('async-each-series'); - 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();