diff options
20 files changed, 29 insertions, 30 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol index 20420ccf5..34c681c53 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "./MixinExchangeCore.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/IExchange.sol b/packages/contracts/src/contracts/current/protocol/Exchange/IExchange.sol index 5e90f9677..79c4b1b3f 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/IExchange.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/IExchange.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; contract IExchange { diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/ISigner.sol b/packages/contracts/src/contracts/current/protocol/Exchange/ISigner.sol index 75c40f4dc..51d7e9b6b 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/ISigner.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/ISigner.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; contract ISigner { diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/LibErrors.sol b/packages/contracts/src/contracts/current/protocol/Exchange/LibErrors.sol index fbdc9ee5a..69ef346fb 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/LibErrors.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/LibErrors.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; contract LibErrors { diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol b/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol index 045a54ded..a9fa20bee 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; contract LibOrder { diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/LibPartialAmount.sol b/packages/contracts/src/contracts/current/protocol/Exchange/LibPartialAmount.sol index dc6e9ed4f..ece672748 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/LibPartialAmount.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/LibPartialAmount.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "../../utils/SafeMath/SafeMath.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol index bd8b8ede9..3a4362583 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "./mixins/MExchangeCore.sol"; @@ -88,14 +88,14 @@ contract MixinExchangeCore is // Validate order and maker only if first time seen // TODO: Read filled and cancelled only once if (filled[orderHash] == 0 && cancelled[orderHash] == 0) { - // require(order.makerTokenAmount > 0); - // require(order.takerTokenAmount > 0); - // require(isValidSignature(orderHash, order.makerAddress, signature)); + require(order.makerTokenAmount > 0); + require(order.takerTokenAmount > 0); + require(isValidSignature(orderHash, order.makerAddress, signature)); } // Validate taker if (order.takerAddress != address(0)) { - // require(order.takerAddress == msg.sender); + require(order.takerAddress == msg.sender); } require(takerTokenFillAmount > 0); diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol index 805b33412..f3a9f1f9b 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "./mixins/MSettlement.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol index 16714bb3b..c567b1d34 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "./mixins/MSignatureValidator.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol index 0b622a23a..ed7c67709 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "./mixins/MExchangeCore.sol"; @@ -63,7 +63,6 @@ contract MixinWrapperFunctions is // takerTokenFillAmount, // signature // ); - // require(success); // if (success) { // assembly { // returndatacopy(0, 0, 32) diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol index 668e62301..1fc6cb855 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "../LibOrder.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol index 4440c7979..618bee673 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; import "../LibOrder.sol"; 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 d9cdd50b0..61548dbfe 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; pragma experimental ABIEncoderV2; contract MSignatureValidator { diff --git a/packages/contracts/src/contracts/current/protocol/TokenRegistry/ITokenRegistery.sol b/packages/contracts/src/contracts/current/protocol/TokenRegistry/ITokenRegistery.sol index 7220444f2..cef47bf6e 100644 --- a/packages/contracts/src/contracts/current/protocol/TokenRegistry/ITokenRegistery.sol +++ b/packages/contracts/src/contracts/current/protocol/TokenRegistry/ITokenRegistery.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; import { IOwnable_v1 as IOwnable } from "../../../previous/Ownable/IOwnable_v1.sol"; diff --git a/packages/contracts/src/contracts/current/protocol/TokenTransferProxy/ITokenTransferProxy.sol b/packages/contracts/src/contracts/current/protocol/TokenTransferProxy/ITokenTransferProxy.sol index 9f2ec551d..9708b2a6f 100644 --- a/packages/contracts/src/contracts/current/protocol/TokenTransferProxy/ITokenTransferProxy.sol +++ b/packages/contracts/src/contracts/current/protocol/TokenTransferProxy/ITokenTransferProxy.sol @@ -16,7 +16,7 @@ */ -pragma solidity ^0.4.19; +pragma solidity ^0.4.21; import { IOwnable_v1 as IOwnable } from "../../../previous/Ownable/IOwnable_v1.sol"; diff --git a/packages/contracts/src/contracts/current/test/DummyToken/DummyToken.sol b/packages/contracts/src/contracts/current/test/DummyToken/DummyToken.sol index ab04f4d16..6090cd500 100644 --- a/packages/contracts/src/contracts/current/test/DummyToken/DummyToken.sol +++ b/packages/contracts/src/contracts/current/test/DummyToken/DummyToken.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.21; -import { Mintable } from "../Mintable/Mintable.sol"; -import { Ownable } from "../../utils/Ownable/Ownable.sol"; +import "../Mintable/Mintable.sol"; +import "../../utils/Ownable/Ownable.sol"; contract DummyToken is Mintable, Ownable { string public name; diff --git a/packages/contracts/src/contracts/current/test/MaliciousToken/MaliciousToken.sol b/packages/contracts/src/contracts/current/test/MaliciousToken/MaliciousToken.sol index 9e502616c..0fa99413c 100644 --- a/packages/contracts/src/contracts/current/test/MaliciousToken/MaliciousToken.sol +++ b/packages/contracts/src/contracts/current/test/MaliciousToken/MaliciousToken.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.21; -import { ERC20Token } from "../../tokens/ERC20Token/ERC20Token.sol"; +import "../../tokens/ERC20Token/ERC20Token.sol"; contract MaliciousToken is ERC20Token { uint8 stateToUpdate = 1; // Not null so that change only requires 5000 gas diff --git a/packages/contracts/src/contracts/current/test/Mintable/Mintable.sol b/packages/contracts/src/contracts/current/test/Mintable/Mintable.sol index cf7ee35a5..1f6b42c87 100644 --- a/packages/contracts/src/contracts/current/test/Mintable/Mintable.sol +++ b/packages/contracts/src/contracts/current/test/Mintable/Mintable.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.21; -import { UnlimitedAllowanceToken } from "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol"; -import { SafeMath } from "../../utils/SafeMath/SafeMath.sol"; +import "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol"; +import "../../utils/SafeMath/SafeMath.sol"; /* * Mintable diff --git a/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol b/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol index 9b3d6b9cf..cb50f7252 100644 --- a/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol +++ b/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.21; /* * Ownable diff --git a/packages/contracts/src/contracts/current/utils/SafeMath/SafeMath.sol b/packages/contracts/src/contracts/current/utils/SafeMath/SafeMath.sol index 955a9e379..7bd9c2122 100644 --- a/packages/contracts/src/contracts/current/utils/SafeMath/SafeMath.sol +++ b/packages/contracts/src/contracts/current/utils/SafeMath/SafeMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.21; contract SafeMath { function safeMul(uint a, uint b) |