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

Remove AbiV2 where unused

Browse Source
This commit is contained in:
Amir Bandeali
2018-07-05 14:02:58 -07:00
parent 0ea3b10efd
commit a2024da955
23 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/contracts/src/2.0.0/forwarder/MixinERC20.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
contract MixinERC20 {

1
packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import { WETH9 as EtherToken } from "../tokens/WETH9/WETH9.sol";
import "../protocol/Exchange/libs/LibMath.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAuthorizable.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAuthorizable.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/Ownable/Ownable.sol";
import "./mixins/MAuthorizable.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "./IAuthorizable.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../../utils/Ownable/IOwnable.sol";

1
packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../interfaces/IAuthorizable.sol";

1
packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol vendored
View File

@@ -24,6 +24,7 @@ import "../libs/LibFillResults.sol";
contract IWrapperFunctions {
/// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
/// @param order LibOrder.Order struct containing order specifications.
/// @param takerAssetFillAmount Desired amount of takerAsset to sell.

30
packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol vendored
View File

@@ -101,21 +101,23 @@ contract LibOrder is
bytes32 schemaHash = EIP712_ORDER_SCHEMA_HASH;
bytes32 makerAssetDataHash = keccak256(order.makerAssetData);
bytes32 takerAssetDataHash = keccak256(order.takerAssetData);
// Assembly for more efficiently computing:
// keccak256(abi.encode(
// order.makerAddress,
// order.takerAddress,
// order.feeRecipientAddress,
// order.senderAddress,
// order.makerAssetAmount,
// order.takerAssetAmount,
// order.makerFee,
// order.takerFee,
// order.expirationTimeSeconds,
// order.salt,
// keccak256(order.makerAssetData),
// keccak256(order.takerAssetData)
// ));
// keccak256(abi.encode(
// order.makerAddress,
// order.takerAddress,
// order.feeRecipientAddress,
// order.senderAddress,
// order.makerAssetAmount,
// order.takerAssetAmount,
// order.makerFee,
// order.takerFee,
// order.expirationTimeSeconds,
// order.salt,
// keccak256(order.makerAssetData),
// keccak256(order.takerAssetData)
// ));
assembly {
// Backup
// solhint-disable-next-line space-after-comma

1
packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../interfaces/IAssetProxyDispatcher.sol";

1
packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../Mintable/Mintable.sol";
import "../../utils/Ownable/Ownable.sol";

1
packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../tokens/ERC721Token/ERC721Token.sol";
import "../../utils/Ownable/Ownable.sol";

6
packages/contracts/src/2.0.0/test/Mintable/Mintable.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol";
import "../../utils/SafeMath/SafeMath.sol";
@@ -27,7 +26,10 @@ import "../../utils/SafeMath/SafeMath.sol";
* Mintable
* Base contract that creates a mintable UnlimitedAllowanceToken
*/
contract Mintable is UnlimitedAllowanceToken, SafeMath {
contract Mintable is
UnlimitedAllowanceToken,
SafeMath
{
function mint(uint256 _value)
public
{

4
packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/MixinAssetProxyDispatcher.sol";
@@ -27,7 +26,8 @@ contract TestAssetProxyDispatcher is MixinAssetProxyDispatcher {
bytes memory assetData,
address from,
address to,
uint256 amount)
uint256 amount
)
public
{
dispatchTransferFrom(assetData, from, to, amount);

1
packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";

6
packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol vendored
View File

@@ -32,7 +32,8 @@ contract TestLibs is
function publicGetPartialAmount(
uint256 numerator,
uint256 denominator,
uint256 target)
uint256 target
)
public
pure
returns (uint256 partialAmount)
@@ -48,7 +49,8 @@ contract TestLibs is
function publicIsRoundingError(
uint256 numerator,
uint256 denominator,
uint256 target)
uint256 target
)
public
pure
returns (bool isError)

1
packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/MixinSignatureValidator.sol";
import "../../protocol/Exchange/MixinTransactions.sol";

1
packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "./IERC20Token.sol";

1
packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
contract IERC20Token {

1
packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol vendored
View File

@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../ERC20Token/ERC20Token.sol";

1
packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol vendored
View File

@@ -1,5 +1,4 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
/*
* Ownable

1
packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol vendored
View File

@@ -1,5 +1,4 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
/*
* Ownable