diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-07-08 13:57:09 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-07-08 13:57:09 +0800 |
commit | 8314bbbbac0101831bf8167c01e5ccf46663a2f0 (patch) | |
tree | ff6d2100884518336078c38a11312f096cda8ed4 /packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol | |
parent | 462f1f00d8151ad17f8909f2c07dbc807a0df87d (diff) | |
download | dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar.gz dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar.bz2 dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar.lz dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar.xz dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.tar.zst dexon-sol-tools-8314bbbbac0101831bf8167c01e5ccf46663a2f0.zip |
Add interfaces and mixins
Diffstat (limited to 'packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol b/packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol index fcc82b705..dc80d109c 100644 --- a/packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol +++ b/packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol @@ -20,20 +20,24 @@ pragma solidity 0.4.24; pragma experimental ABIEncoderV2; import "../utils/LibBytes/LibBytes.sol"; -import "./MixinFees.sol"; -import "./MixinMarketBuyZrx.sol"; -import "./MixinExpectedResults.sol"; -import "./MixinTransfer.sol"; -import "./MixinConstants.sol"; +import "./mixins/MFees.sol"; +import "./mixins/MMarketBuyZrx.sol"; +import "./mixins/MExpectedResults.sol"; +import "./mixins/MTransfer.sol"; +import "./mixins/MConstants.sol"; +import "./mixins/MForwarderCore.sol"; import "../protocol/Exchange/libs/LibOrder.sol"; +import "../protocol/Exchange/libs/LibFillResults.sol"; contract MixinForwarderCore is - MixinConstants, - MixinExpectedResults, - MixinFees, - MixinMarketBuyZrx, - MixinTransfer + LibFillResults, + MConstants, + MExpectedResults, + MFees, + MMarketBuyZrx, + MTransfer, + MForwarderCore { bytes4 public constant ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)")); bytes4 public constant ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)")); @@ -284,8 +288,8 @@ contract MixinForwarderCore is bytes[] memory feeSignatures, uint256 makerTokenFillAmount ) - private - returns (FillResults memory totalFillResults) + internal + returns (LibFillResults.FillResults memory totalFillResults) { // We read the maker token address to check if it is ZRX and later use it for transfer address makerTokenAddress = LibBytes.readAddress(orders[0].makerAssetData, 16); @@ -366,8 +370,8 @@ contract MixinForwarderCore is LibOrder.Order[] memory feeOrders, bytes[] memory feeSignatures ) - private - returns (FillResults memory totalFillResults) + internal + returns (LibFillResults.FillResults memory totalFillResults) { uint256 totalZrxFeeAmount; uint256 ordersLength = orders.length; |