tornadocontrib/tokenbridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use gas price from message on gas estimate for amb events

Browse Source
This commit is contained in:
Gerardo Nardelli 2019-05-27 16:28:29 -03:00
parent 7ca3b0079c
commit 95f4a0acc6
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oracle/src/events/processAMBAffirmationRequests/estimateGas.js
View File

@ -8,10 +8,11 @@ const logger = require('../../services/logger').child({
module: 'processAffirmationRequests:estimateGas'
})
async function estimateGas({ web3, homeBridge, validatorContract, message, address }) {
async function estimateGas({ web3, homeBridge, validatorContract, message, address, gasPrice }) {
try {
const gasEstimate = await homeBridge.methods.executeAffirmation(message).estimateGas({
from: address
from: address,
gasPrice
})
return gasEstimate

3
oracle/src/events/processAMBAffirmationRequests/index.js
View File

@ -61,7 +61,8 @@ function processAffirmationRequestsBuilder(config) {
homeBridge,
validatorContract,
message,
address: config.validatorAddress
address: config.validatorAddress,
gasPrice
})
logger.debug({ gasEstimate }, 'Gas estimated')
} catch (e) {

6
oracle/src/events/processAMBCollectedSignatures/estimateGas.js
View File

@ -21,13 +21,15 @@ async function estimateGas({
r,
s,
txHash,
address
address,
gasPrice
}) {
try {
const gasEstimate = await foreignBridge.methods
.executeSignatures(message, v, r, s)
.estimateGas({
from: address
from: address,
gasPrice
})
return gasEstimate
} catch (e) {

3
oracle/src/events/processAMBCollectedSignatures/index.js
View File

@ -90,7 +90,8 @@ function processCollectedSignaturesBuilder(config) {
message,
numberOfCollectedSignatures: NumberOfCollectedSignatures,
txHash,
address: config.validatorAddress
address: config.validatorAddress,
gasPrice
})
logger.debug({ gasEstimate }, 'Gas estimated')
} catch (e) {

3
oracle/src/utils/utils.js
View File

@ -1,6 +1,7 @@
const BigNumber = require('bignumber.js')
const promiseRetry = require('promise-retry')
const Web3 = require('web3')
const Web3Utils = require('web3-utils')
const { GAS_PRICE_OPTIONS } = require('./constants')
async function syncForEach(array, callback) {
@ -102,7 +103,7 @@ function generateGasPriceOptions({ dataType, gasPrice, gasPriceSpeed }) {
if (dataType === GAS_PRICE_OPTIONS.GAS_PRICE) {
gasPriceOptions = {
type: dataType,
value: gasPrice
value: Web3Utils.hexToNumberString(gasPrice)
}
} else if (dataType === GAS_PRICE_OPTIONS.SPEED) {
gasPriceOptions = {

7
oracle/test/utils.test.js
View File

@ -3,6 +3,7 @@ const chai = require('chai')
const chaiAsPromised = require('chai-as-promised')
const BigNumber = require('bignumber.js')
const proxyquire = require('proxyquire')
const Web3Utils = require('web3-utils')
const { addExtraGas, syncForEach, generateGasPriceOptions } = require('../src/utils/utils')
const { GAS_PRICE_OPTIONS, ORACLE_GAS_PRICE_SPEEDS } = require('../src/utils/constants')
@ -139,12 +140,14 @@ describe('utils', () => {
it('should work for GAS_PRICE option', () => {
// given
const dataType = GAS_PRICE_OPTIONS.GAS_PRICE
const gasPrice = BigNumber('0000000000000000000000000000000000000000000000000000000165a0bc00')
const gasPrice = Web3Utils.toBN(
'0000000000000000000000000000000000000000000000000000000165a0bc00'
)
const gasPriceSpeed = null
const expectedResult = {
type: dataType,
value: gasPrice
value: Web3Utils.hexToNumberString(gasPrice)
}
// when