aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-08-09 06:35:34 +0800
committerGitHub <noreply@github.com>2018-08-09 06:35:34 +0800
commit651a468b4476a20542014da93b04f93fd3ff0515 (patch)
tree920e7c13ead11ebaa35fc29a25191c1209f23015 /packages/contracts
parent19cda0eb036b6876964d8074aea1295142d25027 (diff)
parent68fb1bf37622e244f7dbce276a7c3355e4ec88eb (diff)
downloaddexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar.gz
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar.bz2
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar.lz
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar.xz
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.tar.zst
dexon-0x-contracts-651a468b4476a20542014da93b04f93fd3ff0515.zip
Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorComments
[contracts] Fix comments and styling for MixinSignatureValidator
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol13
1 files changed, 9 insertions, 4 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
index ac7382715..44de54817 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
@@ -96,14 +96,15 @@ contract MixinSignatureValidator is
"LENGTH_GREATER_THAN_0_REQUIRED"
);
- // Ensure signature is supported
+ // Pop last byte off of signature byte array.
uint8 signatureTypeRaw = uint8(signature.popLastByte());
+
+ // Ensure signature is supported
require(
signatureTypeRaw < uint8(SignatureType.NSignatureTypes),
"SIGNATURE_UNSUPPORTED"
);
- // Pop last byte off of signature byte array.
SignatureType signatureType = SignatureType(signatureTypeRaw);
// Variables are not scoped in Solidity.
@@ -141,7 +142,12 @@ contract MixinSignatureValidator is
v = uint8(signature[0]);
r = signature.readBytes32(1);
s = signature.readBytes32(33);
- recovered = ecrecover(hash, v, r, s);
+ recovered = ecrecover(
+ hash,
+ v,
+ r,
+ s
+ );
isValid = signerAddress == recovered;
return isValid;
@@ -197,7 +203,6 @@ contract MixinSignatureValidator is
// | 0x14 + x | 1 | Signature type is always "\x06" |
} else if (signatureType == SignatureType.Validator) {
// Pop last 20 bytes off of signature byte array.
-
address validatorAddress = signature.popLast20Bytes();
// Ensure signer has approved validator.