Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Checking sender address earlier #266.
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Beddows committed Sep 9, 2016
1 parent e48806f commit 3c600c2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions logic/transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,11 @@ Transaction.prototype.verify = function (trs, sender, requester, cb) {
return setImmediate(cb, 'Missing sender');
}

// Check sender address
if (String(trs.senderId).toUpperCase() !== String(sender.address).toUpperCase()) {
return setImmediate(cb, 'Invalid sender address');
}

// Check requester public key
if (trs.requesterPublicKey) {
if (sender.multisignatures.indexOf(trs.requesterPublicKey) < 0) {
Expand Down Expand Up @@ -384,11 +389,6 @@ Transaction.prototype.verify = function (trs, sender, requester, cb) {
}
}

// Check sender address
if (String(trs.senderId).toUpperCase() !== String(sender.address).toUpperCase()) {
return setImmediate(cb, 'Invalid sender');
}

// Calculate fee
var fee = __private.types[trs.type].calculateFee.call(this, trs, sender) || false;
if (!fee || trs.fee !== fee) {
Expand Down

0 comments on commit 3c600c2

Please sign in to comment.