aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-06-08 01:07:36 +0800
committerkumavis <aaron@kumavis.me>2018-06-08 01:07:36 +0800
commit66b703b1a4ba25ddaf8278f020967b4d20351027 (patch)
tree41520dbc3ad35b3c9968cfc390ecb99db5456a33 /app/scripts
parent2198276bd533bec767cad954ef8b21c47c0f8c09 (diff)
parent988283778a2be52640b27a359ef3fb1130e95711 (diff)
downloadtangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.tar.gz
tangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.tar.zst
tangerine-wallet-browser-66b703b1a4ba25ddaf8278f020967b4d20351027.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/contentscript.js1
-rw-r--r--app/scripts/metamask-controller.js14
2 files changed, 15 insertions, 0 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 555902ddf..75e0a95b3 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -176,6 +176,7 @@ function blacklistedDomainCheck () {
'webbyawards.com',
'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
'adyen.com',
+ 'gravityforms.com',
]
var currentUrl = window.location.href
var currentRegex
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b1d0217fd..c00d31949 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -388,6 +388,8 @@ module.exports = class MetamaskController extends EventEmitter {
updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController),
retryTransaction: nodeify(this.retryTransaction, this),
getFilteredTxList: nodeify(txController.getFilteredTxList, txController),
+ isNonceTaken: nodeify(txController.isNonceTaken, txController),
+ estimateGas: nodeify(this.estimateGas, this),
// messageManager
signMessage: nodeify(this.signMessage, this),
@@ -927,6 +929,18 @@ module.exports = class MetamaskController extends EventEmitter {
return state
}
+ estimateGas (estimateGasParams) {
+ return new Promise((resolve, reject) => {
+ return this.txController.txGasUtil.query.estimateGas(estimateGasParams, (err, res) => {
+ if (err) {
+ return reject(err)
+ }
+
+ return resolve(res)
+ })
+ })
+ }
+
//=============================================================================
// PASSWORD MANAGEMENT
//=============================================================================