From f71c1581647bcbff8fda3fe286494fae2d73dd05 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 5 Oct 2018 20:05:07 -0400 Subject: [PATCH] change 70000 for a constant --- lib/modules/ens/index.js | 12 +++++++----- lib/modules/ens/register.js | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js index 2de543074..d48dffebf 100644 --- a/lib/modules/ens/index.js +++ b/lib/modules/ens/index.js @@ -8,6 +8,8 @@ const reverseAddrSuffix = '.addr.reverse'; const MAINNET_ID = '1'; const ROPSTEN_ID = '3'; const RINKEBY_ID = '4'; +// Price of ENS registration contract functions +const ENS_GAS_PRICE = 700000; const ENS_CONTRACTS_CONFIG = { [MAINNET_ID]: { @@ -317,14 +319,14 @@ class ENS { const rootNode = namehash.hash(self.registration.rootDomain); var reverseNode = web3.utils.soliditySha3(web3.eth.defaultAccount.toLowerCase().substr(2) + reverseAddrSuffix); - self.ensContract.methods.setOwner(rootNode, web3.eth.defaultAccount).send({from: web3.eth.defaultAccount, gas: 700000}).then(() => { - return self.ensContract.methods.setResolver(rootNode, config.resolverAddress).send({from: web3.eth.defaultAccount, gas: 700000}); + self.ensContract.methods.setOwner(rootNode, web3.eth.defaultAccount).send({from: web3.eth.defaultAccount, gas: ENS_GAS_PRICE}).then(() => { + return self.ensContract.methods.setResolver(rootNode, config.resolverAddress).send({from: web3.eth.defaultAccount, gas: ENS_GAS_PRICE}); }).then(() => { - return self.ensContract.methods.setResolver(reverseNode, config.resolverAddress).send({from: web3.eth.defaultAccount, gas: 700000}); + return self.ensContract.methods.setResolver(reverseNode, config.resolverAddress).send({from: web3.eth.defaultAccount, gas: ENS_GAS_PRICE}); }).then(() => { - return self.resolverContract.methods.setAddr(rootNode, web3.eth.defaultAccount).send({from: web3.eth.defaultAccount, gas: 700000}); + return self.resolverContract.methods.setAddr(rootNode, web3.eth.defaultAccount).send({from: web3.eth.defaultAccount, gas: ENS_GAS_PRICE}); }).then(() => { - return self.resolverContract.methods.setName(reverseNode, self.registration.rootDomain).send({from: web3.eth.defaultAccount, gas: 700000}); + return self.resolverContract.methods.setName(reverseNode, self.registration.rootDomain).send({from: web3.eth.defaultAccount, gas: ENS_GAS_PRICE}); }).then((_result) => { next(); }) diff --git a/lib/modules/ens/register.js b/lib/modules/ens/register.js index 55a1bd2e5..d535e19aa 100644 --- a/lib/modules/ens/register.js +++ b/lib/modules/ens/register.js @@ -1,5 +1,7 @@ /*global web3*/ const namehash = require('eth-ens-namehash'); +// Price of ENS registration contract functions +const ENS_GAS_PRICE = 700000; function registerSubDomain(ens, registrar, resolver, defaultAccount, subdomain, rootDomain, reverseNode, address, logger, secureSend, callback) { const subnode = namehash.hash(subdomain); @@ -10,7 +12,7 @@ function registerSubDomain(ens, registrar, resolver, defaultAccount, subdomain, const toSend = ens.methods.setSubnodeOwner(rootNode, subnode, defaultAccount); let transaction; - secureSend(web3, toSend, {from: defaultAccount, gas: 700000}, false) + secureSend(web3, toSend, {from: defaultAccount, gas: ENS_GAS_PRICE}, false) // Set resolver for the node .then(transac => { if (transac.status !== "0x1" && transac.status !== "0x01" && transac.status !== true) { @@ -18,19 +20,19 @@ function registerSubDomain(ens, registrar, resolver, defaultAccount, subdomain, return callback('Failed to register. Check gas cost.'); } transaction = transac; - return secureSend(web3, ens.methods.setResolver(node, resolver.options.address), {from: defaultAccount, gas: 700000}, false); + return secureSend(web3, ens.methods.setResolver(node, resolver.options.address), {from: defaultAccount, gas: ENS_GAS_PRICE}, false); }) // Set address for node .then(_result => { - return secureSend(web3, resolver.methods.setAddr(node, address), {from: defaultAccount, gas: 700000}, false); + return secureSend(web3, resolver.methods.setAddr(node, address), {from: defaultAccount, gas: ENS_GAS_PRICE}, false); }) // Set resolver for the reverse node .then(_result => { - return secureSend(web3, ens.methods.setResolver(reverseNode, resolver.options.address), {from: defaultAccount, gas: 700000}, false); + return secureSend(web3, ens.methods.setResolver(reverseNode, resolver.options.address), {from: defaultAccount, gas: ENS_GAS_PRICE}, false); }) // Set name for reverse node .then(_result => { - return secureSend(web3, resolver.methods.setName(reverseNode, `${subdomain}.${rootDomain}`), {from: defaultAccount, gas: 700000}, false); + return secureSend(web3, resolver.methods.setName(reverseNode, `${subdomain}.${rootDomain}`), {from: defaultAccount, gas: ENS_GAS_PRICE}, false); }) .then(_result => { callback(null, transaction);