Use gas price from truffle config file (#228)

* Use gas price from truffle config file * Fix lint
aragon · Oct 23, 2018 · 7f10200 · 7f10200
1 parent 5aa4a65
commit 7f10200
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -109,6 +109,7 @@
   },
   "aragon": {
     "clientVersion": "526a1966d547f719030dcdd7867a5f5ea3808312",
-    "clientPort": "3000"
+    "clientPort": "3000",
+    "defaultGasPrice": "10000000000"
   }
 }
diff --git a/src/acl/index.js b/src/acl/index.js
@@ -1,4 +1,6 @@
-module.exports = (web3) => {
+const DEFAULT_GAS_PRICE = require('../../package.json').aragon.defaultGasPrice
+
+module.exports = ({ web3, network }) => {
   const getACL = async (repoAddr) => {
     const repo = new web3.eth.Contract(require('@aragon/os/build/contracts/AragonApp').abi, repoAddr)
     const daoAddr = await repo.methods.kernel().call()
@@ -24,7 +26,7 @@ module.exports = (web3) => {
         to: acl.options.address,
         data: call.encodeABI(),
         gas: web3.utils.toHex(5e5),
-        gasPrice: web3.utils.toHex(web3.utils.toWei('15', 'gwei'))
+        gasPrice: network.gasPrice || DEFAULT_GAS_PRICE
       }
     }
   }

diff --git a/src/commands/apm_cmds/grant.js b/src/commands/apm_cmds/grant.js
@@ -25,7 +25,7 @@ exports.handler = async function ({
   apmOptions.ensRegistryAddress = apmOptions['ens-registry']
 
   const apm = await APM(web3, apmOptions)
-  const acl = ACL(web3)
+  const acl = ACL({ web3, network })
 
   const repo = await apm.getRepository(module.appName).catch(() => null)
   if (repo === null) {

diff --git a/src/commands/apm_cmds/publish.js b/src/commands/apm_cmds/publish.js
@@ -20,6 +20,7 @@ const deploy = require('../deploy')
 const startIPFS = require('../ipfs')
 const getRepoTask = require('../dao_cmds/utils/getRepoTask')
 
+const DEFAULT_GAS_PRICE = require('../../../package.json').aragon.defaultGasPrice
 const MANIFEST_FILE = 'manifest.json'
 const ARTIFACT_FILE = 'artifact.json'
 const SOLIDITY_FILE = 'code.sol'
@@ -504,7 +505,7 @@ exports.task = function ({
           )
 
           transaction.from = from
-          transaction.gasPrice = '19000000000' // 19 gwei
+          transaction.gasPrice = network.gasPrice || DEFAULT_GAS_PRICE
 
           ctx.receipt = await web3.eth.sendTransaction(transaction)
         } catch (e) {

diff --git a/src/commands/deploy.js b/src/commands/deploy.js
@@ -6,6 +6,7 @@ const { compileContracts } = require('../helpers/truffle-runner')
 const { findProjectRoot } = require('../util')
 const { ensureWeb3 } = require('../helpers/web3-fallback')
 const deployArtifacts = require('../helpers/truffle-deploy-artifacts')
+const DEFAULT_GAS_PRICE = require('../../package.json').aragon.defaultGasPrice
 
 exports.command = 'deploy [contract]'
 
@@ -75,11 +76,20 @@ exports.task = async ({ reporter, network, cwd, contract, init, web3, apmOptions
 
         const contract = new web3.eth.Contract(abi, { data: bytecode })
         const accounts = await web3.eth.getAccounts()
+
         const deployTx = contract.deploy({ arguments: processedInit })
         const gas = await deployTx.estimateGas()
 
-        const deployPromise = deployTx.send({ from: accounts[0], gas, gasPrice: '19000000000' }) // 19 gwei
-        deployPromise.on('transactionHash', (transactionHash) => ctx.transactionHash = transactionHash)
+        const args = {
+          from: accounts[0],
+          gasPrice: network.gasPrice || DEFAULT_GAS_PRICE,
+          gas
+        }
+
+        const deployPromise = deployTx.send(args)
+        deployPromise.on('transactionHash', (transactionHash) => {
+          ctx.transactionHash = transactionHash
+        })
         const instance = await deployPromise
 
         if (!instance.options.address) {

diff --git a/src/helpers/truffle-deploy-artifacts.js b/src/helpers/truffle-deploy-artifacts.js
@@ -19,4 +19,4 @@ module.exports = async (contractArtifacts) => {
     compiler,
     flattenedCode
   }
-}
+}