aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-05-26 06:04:44 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-05-31 08:11:31 +0800
commit101e9be7b928493efe96c6a3c05641c68e30a02e (patch)
tree13357babef4ba1330a33f21f8adcda87c8a91d6e
parent9f93d8f53380bf650702c653fea13b3e7ed5f8f7 (diff)
downloaddexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar.gz
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar.bz2
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar.lz
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar.xz
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.tar.zst
dexon-sol-tools-101e9be7b928493efe96c6a3c05641c68e30a02e.zip
Change names of signature types
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol8
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol4
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol
index 4b0b1d02d..fc61112eb 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol
@@ -132,7 +132,7 @@ contract MixinSignatureValidator is
return isValid;
// Signed using web3.eth_sign
- } else if (signatureType == SignatureType.Ecrecover) {
+ } else if (signatureType == SignatureType.EthSign) {
require(
signature.length == 65,
INVALID_SIGNATURE_LENGTH
@@ -165,9 +165,9 @@ contract MixinSignatureValidator is
isValid = signer == msg.sender;
return isValid;
- // Signature verified by signer contract.
- // If used with an order, the maker of the order is the signer contract.
- } else if (signatureType == SignatureType.Signer) {
+ // Signature verified by wallet contract.
+ // If used with an order, the maker of the order is the wallet contract.
+ } else if (signatureType == SignatureType.Wallet) {
isValid = ISigner(signer).isValidSignature(hash, signature);
return isValid;
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol
index dc08c6d27..7eed453ff 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol
@@ -28,9 +28,9 @@ contract MSignatureValidator is
Illegal, // 0x00, default value
Invalid, // 0x01
EIP712, // 0x02
- Ecrecover, // 0x03
+ EthSign, // 0x03
Caller, // 0x04
- Signer, // 0x05
+ Wallet, // 0x05
Validator, // 0x06
PreSigned, // 0x07
Trezor // 0x08