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

Fix lint errors

Browse Source
This commit is contained in:
Jacob Evans
2019-08-19 11:36:35 +10:00
parent f528a3e1de
commit b06205bb7f
5 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/exchange/contracts/examples/Validator.sol
View File

@@ -39,7 +39,7 @@ contract Validator is
/// @param hash Message hash that is signed.
/// @param signerAddress Address that should have signed the given hash.
/// @param signature Proof of signing.
/// @return Validity of signature.
/// @return Returns a known magic value if the signature is valid.
// solhint-disable no-unused-vars
function isValidSignature(
bytes32 hash,
@@ -51,8 +51,8 @@ contract Validator is
returns (bytes4)
{
require(signerAddress == VALID_SIGNER, "INVALID_SIGNER");
bytes4 magic_salt = bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"));
return magic_salt;
bytes4 magicValue = bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"));
return magicValue;
}
// solhint-enable no-unused-vars
}

6
contracts/exchange/contracts/examples/Wallet.sol
View File

@@ -41,7 +41,7 @@ contract Wallet is
/// The signer must match the owner of this wallet.
/// @param hash Message hash that is signed.
/// @param eip712Signature Proof of signing.
/// @return Validity of signature.
/// @return Returns a known magic value if the signature is valid.
function isValidSignature(
bytes32 hash,
bytes calldata eip712Signature
@@ -60,7 +60,7 @@ contract Wallet is
bytes32 s = eip712Signature.readBytes32(33);
address recoveredAddress = ecrecover(hash, v, r, s);
require(WALLET_OWNER == recoveredAddress, "INVALID_SIGNATURE");
bytes4 magic_salt = bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"));
return magic_salt;
bytes4 magicValue = bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"));
return magicValue;
}
}

10
contracts/exchange/contracts/src/MixinSignatureValidator.sol
View File

@@ -238,13 +238,13 @@ contract MixinSignatureValidator is
internal
view
returns (bool isValid)
{
{
bytes memory callData = abi.encodeWithSelector(
IWallet(walletAddress).isValidSignature.selector,
hash,
signature
);
bytes32 magic_salt = bytes32(bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)")));
bytes32 magicValue = bytes32(bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)")));
assembly {
if iszero(extcodesize(walletAddress)) {
// Revert with `Error("WALLET_ERROR")`
@@ -287,7 +287,7 @@ contract MixinSignatureValidator is
// Signature is valid if call did not revert and returned true
isValid := eq(
and(mload(cdStart), 0xffffffff00000000000000000000000000000000000000000000000000000000),
and(magic_salt, 0xffffffff00000000000000000000000000000000000000000000000000000000)
and(magicValue, 0xffffffff00000000000000000000000000000000000000000000000000000000)
)
}
}
@@ -316,7 +316,7 @@ contract MixinSignatureValidator is
signerAddress,
signature
);
bytes32 magic_salt = bytes32(bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)")));
bytes32 magicValue = bytes32(bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)")));
assembly {
if iszero(extcodesize(validatorAddress)) {
// Revert with `Error("VALIDATOR_ERROR")`
@@ -359,7 +359,7 @@ contract MixinSignatureValidator is
// Signature is valid if call did not revert and returned true
isValid := eq(
and(mload(cdStart), 0xffffffff00000000000000000000000000000000000000000000000000000000),
and(magic_salt, 0xffffffff00000000000000000000000000000000000000000000000000000000)
and(magicValue, 0xffffffff00000000000000000000000000000000000000000000000000000000)
)
}
}