aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-10-26 08:38:03 +0800
committerGitHub <noreply@github.com>2016-10-26 08:38:03 +0800
commit1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7 (patch)
tree35a9b0805476b095e025ee56d1c0194d7781467d
parentf7688ac3cf8939057013667f544d57dcb73937a5 (diff)
parentbda64ab132e87d4f717f257935a842f7368f0776 (diff)
downloadtangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar.gz
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar.bz2
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar.lz
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar.xz
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.tar.zst
tangerine-wallet-browser-1cabeb2fc46ebe76f9f80aa5ba9a85d8b27b8fc7.zip
Merge pull request #766 from MetaMask/FixDelegateCallCheck
Fix delegate call analysis
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/lib/idStore.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2c442050..0586b8ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Current Master
- Add a check for improper Transaction data.
+- Fix bug that was sometimes preventing transactions from being sent.
## 2.13.5 2016-10-18
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 402a5e612..cb14a5145 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -247,7 +247,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
// perform static analyis on the target contract code
function analyzeForDelegateCall(cb){
if (txParams.to) {
- query.getCode(txParams.to, function (err, result) {
+ query.getCode(txParams.to, (err, result) => {
if (err) return cb(err)
var containsDelegateCall = this.checkForDelegateCall(result)
txData.containsDelegateCall = containsDelegateCall