Merge 85f9335 into 2a008e4

aragon · Oct 29, 2018 · 5003bda · 5003bda
2 parents 2a008e4 + 85f9335
commit 5003bda
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/scripts/deploy-apm.js b/scripts/deploy-apm.js
@@ -7,6 +7,7 @@ const logDeploy = require('./helpers/deploy-logger')
 const getAccounts = require('./helpers/get-accounts')
 
 const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
+const globalWeb3 = this.artifacts // Not injected unless called directly via truffle
 
 const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
 
@@ -18,6 +19,7 @@ module.exports = async (
   truffleExecCallback,
   {
     artifacts = globalArtifacts,
+    web3 = globalWeb3,
     ensAddress = defaultENSAddress,
     owner = defaultOwner,
     daoFactoryAddress = defaultDaoFactoryAddress,

diff --git a/scripts/deploy-test-ens.js b/scripts/deploy-test-ens.js
@@ -2,10 +2,19 @@ const logDeploy = require('./helpers/deploy-logger')
 const getAccounts = require('./helpers/get-accounts')
 
 const globalArtifacts = this.artifacts // Not injected unless called directly via truffle
+const globalWeb3 = this.artifacts // Not injected unless called directly via truffle
 
 const defaultOwner = process.env.OWNER
 
-module.exports = async (truffleExecCallback, { artifacts = globalArtifacts, owner = defaultOwner, verbose = true } = {}) => {
+module.exports = async (
+  truffleExecCallback,
+  {
+    artifacts = globalArtifacts,
+    web3 = globalWeb3,
+    owner = defaultOwner,
+    verbose = true
+  } = {}
+) => {
   const log = (...args) => {
     if (verbose) { console.log(...args) }
   }