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

Bump Solidity version to 0.4.21

Browse Source
This commit is contained in:
Amir Bandeali
2018-03-09 09:53:11 -08:00
parent 2c44c7ea83
commit 056ec6d2b3
20 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "./MixinExchangeCore.sol";

2
packages/contracts/src/contracts/current/protocol/Exchange/IExchange.sol
View File

@@ -1,4 +1,4 @@
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
contract IExchange {

2
packages/contracts/src/contracts/current/protocol/Exchange/ISigner.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
contract ISigner {

2
packages/contracts/src/contracts/current/protocol/Exchange/LibErrors.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
contract LibErrors {

2
packages/contracts/src/contracts/current/protocol/Exchange/LibOrder.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
contract LibOrder {

2
packages/contracts/src/contracts/current/protocol/Exchange/LibPartialAmount.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "../../utils/SafeMath/SafeMath.sol";

10
packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
View File

@@ -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);

2
packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "./mixins/MSettlement.sol";

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

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "./mixins/MSignatureValidator.sol";

3
packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
View File

@@ -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)

2
packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "../LibOrder.sol";

2
packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
import "../LibOrder.sol";

2
packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSignatureValidator.sol
View File

@@ -16,7 +16,7 @@
*/
pragma solidity ^0.4.19;
pragma solidity ^0.4.21;
pragma experimental ABIEncoderV2;
contract MSignatureValidator {

2
packages/contracts/src/contracts/current/protocol/TokenRegistry/ITokenRegistery.sol
View File

@@ -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";

2
packages/contracts/src/contracts/current/protocol/TokenTransferProxy/ITokenTransferProxy.sol
View File

@@ -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";

6
packages/contracts/src/contracts/current/test/DummyToken/DummyToken.sol
View File

@@ -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;

4
packages/contracts/src/contracts/current/test/MaliciousToken/MaliciousToken.sol
View File

@@ -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

6
packages/contracts/src/contracts/current/test/Mintable/Mintable.sol
View File

@@ -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

2
packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol
View File

@@ -1,4 +1,4 @@
pragma solidity ^0.4.18;
pragma solidity ^0.4.21;
/*
* Ownable

2
packages/contracts/src/contracts/current/utils/SafeMath/SafeMath.sol
View File

@@ -1,4 +1,4 @@
pragma solidity ^0.4.18;
pragma solidity ^0.4.21;
contract SafeMath {
function safeMul(uint a, uint b)