Add support for oracle gas price values not expressed in gwei (#142)

* Support other oracle's gas price values in Oracle * Add default gas price factor in Oracle * Support other oracle's gas price values in UI * Support other oracle's gas price values in Monitor
omni · Jul 12, 2019 · 811e8da · 811e8da
1 parent 54f6fb5
commit 811e8da
Show file tree

Hide file tree

Showing 19 changed files with 291 additions and 50 deletions.
diff --git a/deployment/group_vars/dai.yml b/deployment/group_vars/dai.yml
@@ -29,6 +29,7 @@ FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
 FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
 FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1
 
 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -45,7 +46,9 @@ UI_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 MONITOR_PORT: 3003
 MONITOR_HOME_DEPLOYMENT_BLOCK: 759
 MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 6478417
-MONITOR_GAS_LIMIT: 300000
-MONITOR_GAS_PRICE_FALLBACK: 21
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 0
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 MONITOR_LEFT_TX_THRESHOLD: 100
 MONITOR_CRON_SCHEDULE: "* * * * *"
diff --git a/deployment/group_vars/example.yml b/deployment/group_vars/example.yml
@@ -23,12 +23,14 @@ HOME_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
 HOME_GAS_PRICE_SPEED_TYPE: "standard"
 HOME_GAS_PRICE_FALLBACK: 1000000000      # in wei
 HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+HOME_GAS_PRICE_FACTOR: 1
 
 ## Foreign Gasprice
 FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
 FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
 FOREIGN_GAS_PRICE_FALLBACK: 1000000000   # in wei
 FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1
 
 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -45,7 +47,9 @@ UI_FOREIGN_GAS_PRICE_FALLBACK: 1000000000
 MONITOR_PORT: 3003
 MONITOR_HOME_DEPLOYMENT_BLOCK: 0
 MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 0
-MONITOR_GAS_LIMIT: 300000
-MONITOR_GAS_PRICE_FALLBACK: 21
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 1000000000
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 1000000000
 MONITOR_LEFT_TX_THRESHOLD: 100
 MONITOR_CRON_SCHEDULE: "* * * * *"
diff --git a/deployment/group_vars/wetc.yml b/deployment/group_vars/wetc.yml
@@ -23,12 +23,14 @@ HOME_GAS_PRICE_ORACLE_URL: "https://gasprice-etc.poa.network/"
 HOME_GAS_PRICE_SPEED_TYPE: "standard"
 HOME_GAS_PRICE_FALLBACK: 15000000000      # in wei
 HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+HOME_GAS_PRICE_FACTOR: 1
 
 ## Foreign Gasprice
 FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
 FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
 FOREIGN_GAS_PRICE_FALLBACK: 10000000000   # in wei
 FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1
 
 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -45,7 +47,9 @@ UI_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 MONITOR_PORT: 3003
 MONITOR_HOME_DEPLOYMENT_BLOCK: 7703292
 MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 7412459
-MONITOR_GAS_LIMIT: 300000
-MONITOR_GAS_PRICE_FALLBACK: 21
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 15000000000
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 MONITOR_LEFT_TX_THRESHOLD: 100
 MONITOR_CRON_SCHEDULE: "* * * * *"
diff --git a/deployment/roles/monitor/templates/.env.j2 b/deployment/roles/monitor/templates/.env.j2
@@ -4,9 +4,22 @@ HOME_BRIDGE_ADDRESS={{ HOME_BRIDGE_ADDRESS }}
 FOREIGN_BRIDGE_ADDRESS={{ FOREIGN_BRIDGE_ADDRESS }}
 HOME_DEPLOYMENT_BLOCK={{ MONITOR_HOME_DEPLOYMENT_BLOCK }}
 FOREIGN_DEPLOYMENT_BLOCK={{ MONITOR_FOREIGN_DEPLOYMENT_BLOCK }}
-GAS_PRICE_SPEED_TYPE={{ HOME_GAS_PRICE_SPEED_TYPE }}
-GAS_LIMIT={{ MONITOR_GAS_LIMIT }}
-GAS_PRICE_FALLBACK={{ MONITOR_GAS_PRICE_FALLBACK }}
+HOME_GAS_LIMIT={{ MONITOR_HOME_GAS_LIMIT }}
+{% if HOME_GAS_PRICE_ORACLE_URL | default('') != '' %}
+HOME_GAS_PRICE_ORACLE_URL={{ HOME_GAS_PRICE_ORACLE_URL }}
+{% endif %}
+{% if HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
+HOME_GAS_PRICE_SPEED_TYPE={{ HOME_GAS_PRICE_SPEED_TYPE }}
+{% endif %}
+HOME_GAS_PRICE_FALLBACK={{ MONITOR_HOME_GAS_PRICE_FALLBACK }}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+HOME_GAS_PRICE_FACTOR={{ HOME_GAS_PRICE_FACTOR }}
+{% endif %}
+FOREIGN_GAS_LIMIT={{ MONITOR_FOREIGN_GAS_LIMIT }}
+FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
+FOREIGN_GAS_PRICE_SPEED_TYPE={{ FOREIGN_GAS_PRICE_SPEED_TYPE }}
+FOREIGN_GAS_PRICE_FALLBACK={{ MONITOR_FOREIGN_GAS_PRICE_FALLBACK }}
+FOREIGN_GAS_PRICE_FACTOR={{ FOREIGN_GAS_PRICE_FACTOR }}
 LEFT_TX_THRESHOLD={{ MONITOR_LEFT_TX_THRESHOLD }}
 PORT={{ MONITOR_PORT }}
 CRON_SCHEDULE={{ MONITOR_CRON_SCHEDULE }}
diff --git a/deployment/roles/oracle/templates/.env.j2 b/deployment/roles/oracle/templates/.env.j2
@@ -23,6 +23,9 @@ HOME_GAS_PRICE_FALLBACK={{ HOME_GAS_PRICE_FALLBACK }}
 {% if HOME_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
 HOME_GAS_PRICE_UPDATE_INTERVAL={{ HOME_GAS_PRICE_UPDATE_INTERVAL }}
 {% endif %}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+HOME_GAS_PRICE_FACTOR={{ HOME_GAS_PRICE_FACTOR }}
+{% endif %}
 
 {% if FOREIGN_GAS_PRICE_ORACLE_URL | default('') != '' %}
 FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
@@ -34,6 +37,9 @@ FOREIGN_GAS_PRICE_FALLBACK={{ FOREIGN_GAS_PRICE_FALLBACK }}
 {% if FOREIGN_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
 FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
 {% endif %}
+{% if FOREIGN_GAS_PRICE_FACTOR | default('') != '' %}
+FOREIGN_GAS_PRICE_FACTOR={{ FOREIGN_GAS_PRICE_FACTOR }}
+{% endif %}
 
 ## Transport configuration
 ALLOW_HTTP={{ "yes" if ALLOW_HTTP else "no" }}

diff --git a/deployment/roles/ui/templates/.env.j2 b/deployment/roles/ui/templates/.env.j2
@@ -22,11 +22,15 @@ REACT_APP_HOME_GAS_PRICE_SPEED_TYPE={{ HOME_GAS_PRICE_SPEED_TYPE }}
 {% endif %}
 REACT_APP_HOME_GAS_PRICE_FALLBACK={{ UI_HOME_GAS_PRICE_FALLBACK }}
 REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL={{ HOME_GAS_PRICE_UPDATE_INTERVAL }}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+REACT_APP_HOME_GAS_PRICE_FACTOR={{ HOME_GAS_PRICE_FACTOR }}
+{% endif %}
 
 REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
 REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE={{ FOREIGN_GAS_PRICE_SPEED_TYPE }}
 REACT_APP_FOREIGN_GAS_PRICE_FALLBACK={{ UI_FOREIGN_GAS_PRICE_FALLBACK }}
 REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
+REACT_APP_FOREIGN_GAS_PRICE_FACTOR={{ FOREIGN_GAS_PRICE_FACTOR }}
 
 # Default
 REACT_APP_TITLE={{ UI_TITLE }}

diff --git a/e2e-commons/docker-compose.yml b/e2e-commons/docker-compose.yml
@@ -37,10 +37,12 @@ services:
     - HOME_GAS_PRICE_SPEED_TYPE=standard
     - HOME_GAS_PRICE_FALLBACK=1
     - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
     - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - FOREIGN_GAS_PRICE_FALLBACK=1
     - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
     - HOME_POLLING_INTERVAL=500
     - FOREIGN_POLLING_INTERVAL=500
     - ALLOW_HTTP=yes
@@ -66,10 +68,12 @@ services:
     - HOME_GAS_PRICE_SPEED_TYPE=standard
     - HOME_GAS_PRICE_FALLBACK=1
     - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
     - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - FOREIGN_GAS_PRICE_FALLBACK=1
     - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
     - HOME_POLLING_INTERVAL=500
     - FOREIGN_POLLING_INTERVAL=500
     - ALLOW_HTTP=yes
@@ -95,10 +99,12 @@ services:
     - HOME_GAS_PRICE_SPEED_TYPE=standard
     - HOME_GAS_PRICE_FALLBACK=1
     - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
     - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - FOREIGN_GAS_PRICE_FALLBACK=1
     - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
     - HOME_POLLING_INTERVAL=500
     - FOREIGN_POLLING_INTERVAL=500
     - ALLOW_HTTP=yes
@@ -123,10 +129,12 @@ services:
     - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
     - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
     - PORT=3000
     command: "true"
   ui-erc20:
@@ -149,10 +157,12 @@ services:
     - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
     - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
     - PORT=3000
     command: "true"
   ui-erc20-native:
@@ -175,10 +185,12 @@ services:
     - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
     - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
     - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
     - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
     - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
     - PORT=3000
     command: "true"
   monitor:
@@ -192,9 +204,16 @@ services:
     - FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
     - HOME_DEPLOYMENT_BLOCK=0
     - FOREIGN_DEPLOYMENT_BLOCK=0
-    - GAS_PRICE_SPEED_TYPE=standard
-    - GAS_LIMIT=300000
-    - GAS_PRICE_FALLBACK=21
+    - HOME_GAS_LIMIT=300000
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1000000000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_LIMIT=300000
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1000000000
+    - FOREIGN_GAS_PRICE_FACTOR=1
     - LEFT_TX_THRESHOLD=100
     - PORT=3003
     entrypoint: yarn start

diff --git a/monitor/.env.example b/monitor/.env.example
@@ -4,8 +4,18 @@ HOME_BRIDGE_ADDRESS=0xABb4C1399DcC28FBa3Beb76CAE2b50Be3e087353
 FOREIGN_BRIDGE_ADDRESS=0xE405F6872cE38a7a4Ff63DcF946236D458c2ca3a
 HOME_DEPLOYMENT_BLOCK=0
 FOREIGN_DEPLOYMENT_BLOCK=0
-GAS_PRICE_SPEED_TYPE=standard
-GAS_LIMIT=300000
-GAS_PRICE_FALLBACK=21
+
+HOME_GAS_LIMIT=300000
+HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+HOME_GAS_PRICE_SPEED_TYPE=standard
+HOME_GAS_PRICE_FALLBACK=1000000000
+HOME_GAS_PRICE_FACTOR=1
+
+FOREIGN_GAS_LIMIT=300000
+FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+FOREIGN_GAS_PRICE_FALLBACK=1000000000
+FOREIGN_GAS_PRICE_FACTOR=1
+
 LEFT_TX_THRESHOLD=100
 PORT=3003
diff --git a/monitor/validators.js b/monitor/validators.js
@@ -11,9 +11,16 @@ const {
   FOREIGN_RPC_URL,
   HOME_BRIDGE_ADDRESS,
   FOREIGN_BRIDGE_ADDRESS,
-  GAS_PRICE_SPEED_TYPE,
-  GAS_LIMIT,
-  GAS_PRICE_FALLBACK
+  HOME_GAS_LIMIT,
+  HOME_GAS_PRICE_ORACLE_URL,
+  HOME_GAS_PRICE_SPEED_TYPE,
+  HOME_GAS_PRICE_FALLBACK,
+  HOME_GAS_PRICE_FACTOR,
+  FOREIGN_GAS_LIMIT,
+  FOREIGN_GAS_PRICE_ORACLE_URL,
+  FOREIGN_GAS_PRICE_SPEED_TYPE,
+  FOREIGN_GAS_PRICE_FALLBACK,
+  FOREIGN_GAS_PRICE_FACTOR
 } = process.env
 const HOME_DEPLOYMENT_BLOCK = Number(process.env.HOME_DEPLOYMENT_BLOCK) || 0
 const FOREIGN_DEPLOYMENT_BLOCK = Number(process.env.FOREIGN_DEPLOYMENT_BLOCK) || 0
@@ -32,18 +39,34 @@ const asyncForEach = async (array, callback) => {
   }
 }
 
-async function getGasPrices(type) {
+function getGasPrices(url, type, factor, fallback) {
+  if (!url) {
+    return Web3Utils.toBN(fallback)
+  }
+  return fetchGasPrices(url, type, factor, fallback)
+}
+
+async function fetchGasPrices(url, type, factor, fallback) {
   try {
-    const response = await fetch('https://gasprice.poa.network/')
+    const response = await fetch(url)
     const json = await response.json()
     logger.log('Fetched gasprice: ' + json[type])
-    return json[type]
+    const gasPrice = json[type]
+    if (!gasPrice) {
+      throw new Error(`Response from Oracle didn't include gas price for ${type} type.`)
+    }
+    return normalizeGasPrice(gasPrice, factor)
   } catch (e) {
     logger.error('Gas Price API is not available', e)
-    return GAS_PRICE_FALLBACK
+    return Web3Utils.toBN(fallback)
   }
 }
 
+function normalizeGasPrice(oracleGasPrice, factor) {
+  const gasPrice = oracleGasPrice * factor
+  return Web3Utils.toBN(Web3Utils.toWei(gasPrice.toFixed(2).toString(), 'gwei'))
+}
+
 async function main(bridgeMode) {
   const { HOME_ABI, FOREIGN_ABI } = getBridgeABIs(bridgeMode)
   const homeBridge = new web3Home.eth.Contract(HOME_ABI, HOME_BRIDGE_ADDRESS)
@@ -87,19 +110,38 @@ async function main(bridgeMode) {
   })
   const foreignVBalances = {}
   const homeVBalances = {}
-  logger.debug('calling getGasPrices')
-  const gasPriceInGwei = await getGasPrices(GAS_PRICE_SPEED_TYPE)
-  const gasPrice = new Web3Utils.BN(Web3Utils.toWei(gasPriceInGwei.toString(10), 'gwei'))
-  const txCost = gasPrice.mul(new Web3Utils.BN(GAS_LIMIT))
+
+  logger.debug('calling home getGasPrices')
+  const homeGasPrice = await getGasPrices(
+    HOME_GAS_PRICE_ORACLE_URL,
+    HOME_GAS_PRICE_SPEED_TYPE,
+    HOME_GAS_PRICE_FACTOR,
+    HOME_GAS_PRICE_FALLBACK
+  )
+  const homeGasPriceGwei = Web3Utils.fromWei(homeGasPrice.toString(), 'gwei')
+  const homeTxCost = homeGasPrice.mul(Web3Utils.toBN(HOME_GAS_LIMIT))
+
+  logger.debug('calling foreign getGasPrices')
+  const foreignGasPrice = await getGasPrices(
+    FOREIGN_GAS_PRICE_ORACLE_URL,
+    FOREIGN_GAS_PRICE_SPEED_TYPE,
+    FOREIGN_GAS_PRICE_FACTOR,
+    FOREIGN_GAS_PRICE_FALLBACK
+  )
+  const foreignGasPriceGwei = Web3Utils.fromWei(foreignGasPrice.toString(), 'gwei')
+  const foreignTxCost = foreignGasPrice.mul(Web3Utils.toBN(FOREIGN_GAS_LIMIT))
+
   let validatorsMatch = true
   logger.debug('calling asyncForEach foreignValidators foreignVBalances')
   await asyncForEach(foreignValidators, async v => {
     const balance = await web3Foreign.eth.getBalance(v)
-    const leftTx = new Web3Utils.BN(balance).div(txCost).toString(10)
+    const leftTx = Web3Utils.toBN(balance)
+      .div(foreignTxCost)
+      .toString(10)
     foreignVBalances[v] = {
       balance: Web3Utils.fromWei(balance),
       leftTx: Number(leftTx),
-      gasPrice: gasPriceInGwei
+      gasPrice: Number(foreignGasPriceGwei)
     }
     if (!homeValidators.includes(v)) {
       validatorsMatch = false
@@ -108,14 +150,16 @@ async function main(bridgeMode) {
   })
   logger.debug('calling asyncForEach homeValidators homeVBalances')
   await asyncForEach(homeValidators, async v => {
-    const gasPrice = new Web3Utils.BN(1)
-    const txCost = gasPrice.mul(new Web3Utils.BN(GAS_LIMIT))
     const balance = await web3Home.eth.getBalance(v)
-    const leftTx = new Web3Utils.BN(balance).div(txCost).toString(10)
+    const leftTx = homeTxCost.isZero()
+      ? 999999
+      : Web3Utils.toBN(balance)
+          .div(homeTxCost)
+          .toString(10)
     homeVBalances[v] = {
       balance: Web3Utils.fromWei(balance),
       leftTx: Number(leftTx),
-      gasPrice: Number(gasPrice.toString(10))
+      gasPrice: Number(homeGasPriceGwei)
     }
     if (!foreignValidators.includes(v)) {
       validatorsMatch = false

diff --git a/oracle/.env.example b/oracle/.env.example
@@ -14,11 +14,13 @@ HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
 HOME_GAS_PRICE_SPEED_TYPE=standard
 HOME_GAS_PRICE_FALLBACK=1000000000
 HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+HOME_GAS_PRICE_FACTOR=1
 
 FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
 FOREIGN_GAS_PRICE_SPEED_TYPE=standard
 FOREIGN_GAS_PRICE_FALLBACK=1000000000
 FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+FOREIGN_GAS_PRICE_FACTOR=1
 
 QUEUE_URL=amqp://rabbit
 REDIS_URL=redis://redis