crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicit returns

Browse Source
This commit is contained in:
Remco Bloemen
2018-02-21 16:53:07 -08:00
committed by Amir Bandeali
parent 92e112dc63
commit 09b99bbf8b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol
View File

@@ -66,7 +66,7 @@ contract MixinSignatureValidator is
} else if (signatureType == SignatureType.Invalid) {
require(signature.length == 1);
isValid = false;
return;
return isValid;
// Implicitly signed by caller
// The signer has initiated the call. In the case of non-contract
@@ -79,7 +79,7 @@ contract MixinSignatureValidator is
} else if (signatureType == SignatureType.Caller) {
require(signature.length == 1);
isValid = signer == msg.sender;
return;
return isValid;
// Signed using web3.eth_sign
} else if (signatureType == SignatureType.Ecrecover) {
@@ -94,7 +94,7 @@ contract MixinSignatureValidator is
s
);
isValid = signer == recovered;
return;
return isValid;
// Signature using EIP712
} else if (signatureType == SignatureType.EIP712) {
@@ -103,12 +103,12 @@ contract MixinSignatureValidator is
s = get32(signature, 35);
address recovered = ecrecover(hash, v, r, s);
isValid = signer == recovered;
return;
return isValid;
// Signature verified by signer contract
} else if (signatureType == SignatureType.Contract) {
isValid = ISigner(signer).isValidSignature(hash, signature);
return;
return isValid;
}
// Anything else is illegal (We do not return false because
@@ -132,6 +132,7 @@ contract MixinSignatureValidator is
assembly {
result := mload(add(b, index))
}
return result;
}
}