Move contents of examples and interfaces packages into corresponding packages

This commit is contained in:
Amir Bandeali
2019-01-21 12:06:44 -08:00
parent 174daa97c3
commit 9fa8619590
143 changed files with 344 additions and 1944 deletions

View File

@@ -18,7 +18,7 @@
pragma solidity 0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "./interfaces/IThresholdAsset.sol";
import "./MixinBalanceThresholdFilterCore.sol";

View File

@@ -18,8 +18,8 @@
pragma solidity ^0.4.24;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "./mixins/MBalanceThresholdFilterCore.sol";
import "./MixinExchangeCalldata.sol";

View File

@@ -20,7 +20,7 @@
pragma solidity ^0.4.24;
import "./mixins/MExchangeCalldata.sol";
import "@0x/contracts-utils/contracts/utils/LibAddressArray.sol";
import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
contract MixinExchangeCalldata is

View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "../interfaces/IThresholdAsset.sol";
import "../interfaces/IBalanceThresholdFilterCore.sol";

View File

@@ -19,11 +19,11 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
contract DutchAuction is

View File

@@ -18,10 +18,10 @@
pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "./libs/LibConstants.sol";
import "./mixins/MAssets.sol";

View File

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

View File

@@ -24,10 +24,10 @@ import "./mixins/MWeth.sol";
import "./mixins/MAssets.sol";
import "./mixins/MExchangeWrapper.sol";
import "./interfaces/IForwarderCore.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
contract MixinForwarderCore is

View File

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

View File

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

View File

@@ -18,10 +18,10 @@
pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-tokens/contracts/tokens/EtherToken/IEtherToken.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-tokens/contracts/EtherToken/IEtherToken.sol";
import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
contract LibConstants {

View File

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

View File

@@ -18,10 +18,10 @@
pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "./mixins/MAssets.sol";
import "./libs/LibConstants.sol";

View File

@@ -20,9 +20,9 @@ pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";
import "@0x/contracts-utils/contracts/utils/Ownable.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
contract MixinMatchOrders is

View File

@@ -19,7 +19,7 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/utils/Ownable.sol";
import "@0x/contracts-utils/contracts/src/Ownable.sol";
import "./libs/LibConstants.sol";
import "./MixinMatchOrders.sol";
import "./MixinAssets.sol";

View File

@@ -19,7 +19,7 @@
pragma solidity ^0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
contract IMatchOrders {

View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.24;
import "@0x/contract-utils/contracts/utils/Ownable/IOwnable.sol";
import "@0x/contract-utils/contracts/src/interfaces/IOwnable.sol";
import "./IMatchOrders.sol";
import "./IAssets.sol";

View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
contract LibConstants {

View File

@@ -19,11 +19,11 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-tokens/contracts/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
contract OrderValidator {

View File

@@ -72,7 +72,6 @@
"dependencies": {
"@0x/base-contract": "^3.0.13",
"@0x/contracts-asset-proxy": "^2.2.3",
"@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-exchange": "^2.2.3",
"@0x/contracts-tokens": "^1.0.6",