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

De-nest libs contracts

Browse Source
This commit is contained in:
Leonid Logvinov
2018-12-04 17:12:38 +01:00
parent 8d0192c1eb
commit 323195f4ad
31 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/core/contracts/examples/ExchangeWrapper/ExchangeWrapper.sol
View File

@@ -20,7 +20,7 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/interfaces/IExchange.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
contract ExchangeWrapper {

2
contracts/core/contracts/examples/Whitelist/Whitelist.sol
View File

@@ -20,7 +20,7 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/interfaces/IExchange.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";

2
contracts/core/contracts/extensions/DutchAuction/DutchAuction.sol
View File

@@ -20,7 +20,7 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/interfaces/IExchange.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";

8
contracts/core/contracts/extensions/Forwarder/MixinExchangeWrapper.sol
View File

@@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol";
import "./mixins/MExchangeWrapper.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibAbiEncoder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibAbiEncoder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
contract MixinExchangeWrapper is

6
contracts/core/contracts/extensions/Forwarder/MixinForwarderCore.sol
View File

@@ -25,9 +25,9 @@ import "./mixins/MAssets.sol";
import "./mixins/MExchangeWrapper.sol";
import "./interfaces/IForwarderCore.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
contract MixinForwarderCore is

2
contracts/core/contracts/extensions/Forwarder/MixinWeth.sol
View File

@@ -18,7 +18,7 @@
pragma solidity 0.4.24;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
import "./libs/LibConstants.sol";
import "./mixins/MWeth.sol";

4
contracts/core/contracts/extensions/Forwarder/interfaces/IForwarderCore.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
contract IForwarderCore {

4
contracts/core/contracts/extensions/Forwarder/mixins/MExchangeWrapper.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
contract MExchangeWrapper {

2
contracts/core/contracts/extensions/OrderValidator/OrderValidator.sol
View File

@@ -20,7 +20,7 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/interfaces/IExchange.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
import "../../tokens/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";

2
contracts/core/contracts/protocol/Exchange/Exchange.sol
View File

@@ -19,7 +19,7 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibConstants.sol";
import "@0x/contracts-libs/contracts/libs/LibConstants.sol";
import "./MixinExchangeCore.sol";
import "./MixinSignatureValidator.sol";
import "./MixinWrapperFunctions.sol";

8
contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol
View File

@@ -20,10 +20,10 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibConstants.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibConstants.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
import "./mixins/MExchangeCore.sol";
import "./mixins/MSignatureValidator.sol";
import "./mixins/MTransactions.sol";

8
contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol
View File

@@ -15,10 +15,10 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibConstants.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibConstants.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "./mixins/MExchangeCore.sol";
import "./mixins/MMatchOrders.sol";
import "./mixins/MTransactions.sol";

4
contracts/core/contracts/protocol/Exchange/MixinTransactions.sol
View File

@@ -17,10 +17,10 @@
*/
pragma solidity 0.4.24;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibExchangeErrors.sol";
import "@0x/contracts-libs/contracts/libs/LibExchangeErrors.sol";
import "./mixins/MSignatureValidator.sol";
import "./mixins/MTransactions.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibEIP712.sol";
import "@0x/contracts-libs/contracts/libs/LibEIP712.sol";
contract MixinTransactions is

8
contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol
View File

@@ -20,10 +20,10 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/ReentrancyGuard/ReentrancyGuard.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibAbiEncoder.sol";
import "@0x/contracts-libs/contracts/libs/LibMath.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibAbiEncoder.sol";
import "./mixins/MExchangeCore.sol";
import "./mixins/MWrapperFunctions.sol";

4
contracts/core/contracts/protocol/Exchange/interfaces/IExchangeCore.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
contract IExchangeCore {

4
contracts/core/contracts/protocol/Exchange/interfaces/IMatchOrders.sol
View File

@@ -18,8 +18,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
contract IMatchOrders {

4
contracts/core/contracts/protocol/Exchange/interfaces/IWrapperFunctions.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
contract IWrapperFunctions {

4
contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "../interfaces/IExchangeCore.sol";

4
contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol
View File

@@ -18,8 +18,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "../interfaces/IMatchOrders.sol";

4
contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
View File

@@ -19,8 +19,8 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibFillResults.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
import "../interfaces/IWrapperFunctions.sol";

2
contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
View File

@@ -22,7 +22,7 @@ pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
import "../../tokens/ERC20Token/ERC20Token.sol";
import "../../protocol/Exchange/interfaces/IExchange.sol";
import "@0x/contracts-libs/contracts/protocol/Exchange/libs/LibOrder.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
// solhint-disable no-unused-vars

4
contracts/libs/README.md
View File

@@ -6,8 +6,8 @@ Smart contracts libs used in the 0x protocol.
Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
* [protocol](./contracts/protocol)
* This directory contains the libs used by protocol contracts.
* [libs](./contracts/protocol)
* This directory contains the libs.
* [test](./contracts/test)
* This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.

0
contracts/libs/contracts/protocol/Exchange/libs/LibAbiEncoder.sol → contracts/libs/contracts/libs/LibAbiEncoder.sol
View File

0
contracts/libs/contracts/protocol/AssetProxy/libs/LibAssetProxyErrors.sol → contracts/libs/contracts/libs/LibAssetProxyErrors.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibConstants.sol → contracts/libs/contracts/libs/LibConstants.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibEIP712.sol → contracts/libs/contracts/libs/LibEIP712.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibExchangeErrors.sol → contracts/libs/contracts/libs/LibExchangeErrors.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibFillResults.sol → contracts/libs/contracts/libs/LibFillResults.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibMath.sol → contracts/libs/contracts/libs/LibMath.sol
View File

0
contracts/libs/contracts/protocol/Exchange/libs/LibOrder.sol → contracts/libs/contracts/libs/LibOrder.sol
View File

8
contracts/libs/contracts/test/TestLibs/TestLibs.sol
View File

@@ -19,10 +19,10 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/libs/LibMath.sol";
import "../../protocol/Exchange/libs/LibOrder.sol";
import "../../protocol/Exchange/libs/LibFillResults.sol";
import "../../protocol/Exchange/libs/LibAbiEncoder.sol";
import "../../libs/LibMath.sol";
import "../../libs/LibOrder.sol";
import "../../libs/LibFillResults.sol";
import "../../libs/LibAbiEncoder.sol";
contract TestLibs is