Fix gas on grant and publish (#366)

aragon · Feb 15, 2019 · 4044d0d · 4044d0d
1 parent a19932c
commit 4044d0d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "prepare": "npm run build",
     "test": "ava",
     "lint": "eslint src test && documentation lint src test",
-    "extract-roles": "scripts/extract-roles"
+    "extract-roles": "node scripts/extract-roles"
   },
   "repository": {
     "type": "git",

diff --git a/src/acl/index.js b/src/acl/index.js
@@ -35,7 +35,7 @@ module.exports = ({ web3, network }) => {
       const roleId = await getRoleId(repoAddr)
 
       const call = acl.methods.grantPermission(grantee, repoAddr, roleId)
-      const estimatedGas = call.estimatedGas()
+      const estimatedGas = call.estimateGas()
 
       return {
         to: acl.options.address,

diff --git a/src/commands/apm_cmds/grant.js b/src/commands/apm_cmds/grant.js
@@ -1,7 +1,6 @@
 const APM = require('@aragon/apm')
 const ACL = require('../../acl')
 const { ensureWeb3 } = require('../../helpers/web3-fallback')
-const { getRecommendedGasLimit } = require('../../util')
 
 exports.command = 'grant [grantees..]'
 exports.describe =
@@ -61,10 +60,7 @@ exports.handler = async function({
       .defaultGasPrice
     transaction.from = from
     transaction.gasPrice = network.gasPrice || DEFAULT_GAS_PRICE
-    transaction.gas = await getRecommendedGasLimit(
-      web3,
-      await transaction.estimateGas()
-    )
+    // the recommended gasLimit is already calculated by the ACL module
 
     try {
       const receipt = await web3.eth.sendTransaction(transaction)

diff --git a/src/commands/apm_cmds/publish.js b/src/commands/apm_cmds/publish.js
@@ -20,7 +20,6 @@ const deploy = require('../deploy')
 const startIPFS = require('../ipfs')
 const getRepoTask = require('../dao_cmds/utils/getRepoTask')
 const listrOpts = require('../../helpers/listr-options')
-const { getRecommendedGasLimit } = require('../../util')
 
 const DEFAULT_GAS_PRICE = require('../../../package.json').aragon
   .defaultGasPrice
@@ -578,10 +577,7 @@ exports.task = function({
 
             transaction.from = from
             transaction.gasPrice = network.gasPrice || DEFAULT_GAS_PRICE
-            transaction.gas = await getRecommendedGasLimit(
-              web3,
-              await transaction.estimateGas()
-            )
+            // apm.js already calculates the recommended gas
 
             ctx.receipt = await web3.eth.sendTransaction(transaction)
           } catch (e) {