Boost minimum gas (#245)

floating · Sep 12, 2019 · 476c7c2 · 476c7c2
1 parent bc77e66
commit 476c7c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/main/provider/index.js b/main/provider/index.js
@@ -237,10 +237,19 @@ class Provider extends EventEmitter {
     }
   }
 
+  fillDone (fullTx, res) {
+    this.getGasPrice(fullTx, response => {
+      if (response.error) return res({ need: 'gasPrice', message: response.error.message })
+      const minGas = '0x' + (Math.floor(response.result * 1.2)).toString(16)
+      if (!fullTx.gasPrice || fullTx.gasPrice < minGas) fullTx.gasPrice = minGas
+      res(null, fullTx)
+    })
+  }
+
   fillTx (rawTx, cb) {
     const needs = {}
     // if (!rawTx.nonce) needs.nonce = this.getNonce
-    if (!rawTx.gasPrice) needs.gasPrice = this.getGasPrice
+    // if (!rawTx.gasPrice) needs.gasPrice = this.getGasPrice
     if (!rawTx.gas) needs.gas = this.getGasEstimate
     let count = 0
     const list = Object.keys(needs)
@@ -253,11 +262,11 @@ class Provider extends EventEmitter {
           } else {
             rawTx[need] = response.result
           }
-          if (++count === list.length) errors.length > 0 ? cb(errors[0]) : cb(null, rawTx)
+          if (++count === list.length) errors.length > 0 ? cb(errors[0]) : this.fillDone(rawTx, cb)
         })
       })
     } else {
-      cb(null, rawTx)
+      this.fillDone(rawTx, cb)
     }
   }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frame",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "An Ethereum Interface",
   "main": "main",
   "build": {