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

Update remaining pachages

Browse Source
This commit is contained in:
Amir Bandeali 2019-01-20 21:22:36 -08:00
parent 4a4c26a2e3
commit 43de20930b
52 changed files with 87 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

0
contracts/examples/contracts/Validator/Validator.sol → contracts/examples/contracts/examples/Validator.sol
View File

2
contracts/examples/contracts/Wallet/Wallet.sol → contracts/examples/contracts/examples/Wallet.sol
View File

@ -19,7 +19,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWallet.sol"; import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWallet.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol"; import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
contract Wallet is contract Wallet is

4
contracts/examples/contracts/Whitelist/Whitelist.sol → contracts/examples/contracts/examples/Whitelist.sol
View File

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

3
contracts/examples/package.json
View File

@ -60,8 +60,7 @@
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-interfaces": "^1.0.6", "@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-libs": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-multisig": "^1.0.6",
"@0x/contracts-tokens": "^1.0.6", "@0x/contracts-tokens": "^1.0.6",
"@0x/contracts-utils": "^1.0.6", "@0x/contracts-utils": "^1.0.6",
"@0x/order-utils": "^3.1.2", "@0x/order-utils": "^3.1.2",

0
contracts/exchange-libs/contracts/libs/LibAbiEncoder.sol → contracts/exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol
View File

0
contracts/exchange-libs/contracts/libs/LibAssetProxyErrors.sol → contracts/exchange-libs/contracts/exchange-libs/LibAssetProxyErrors.sol
View File

0
contracts/exchange-libs/contracts/libs/LibConstants.sol → contracts/exchange-libs/contracts/exchange-libs/LibConstants.sol
View File

0
contracts/exchange-libs/contracts/libs/LibEIP712.sol → contracts/exchange-libs/contracts/exchange-libs/LibEIP712.sol
View File

0
contracts/exchange-libs/contracts/libs/LibExchangeErrors.sol → contracts/exchange-libs/contracts/exchange-libs/LibExchangeErrors.sol
View File

0
contracts/exchange-libs/contracts/libs/LibExchangeSelectors.sol → contracts/exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol
View File

0
contracts/exchange-libs/contracts/libs/LibFillResults.sol → contracts/exchange-libs/contracts/exchange-libs/LibFillResults.sol
View File

0
contracts/exchange-libs/contracts/libs/LibMath.sol → contracts/exchange-libs/contracts/exchange-libs/LibMath.sol
View File

0
contracts/exchange-libs/contracts/libs/LibOrder.sol → contracts/exchange-libs/contracts/exchange-libs/LibOrder.sol
View File

10
contracts/exchange-libs/contracts/test/TestLibs.sol
View File

@ -16,13 +16,13 @@
*/ */
pragma solidity ^0.4.24; pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "../libs/LibMath.sol"; import "../exchange-libs/LibMath.sol";
import "../libs/LibOrder.sol"; import "../exchange-libs/LibOrder.sol";
import "../libs/LibFillResults.sol"; import "../exchange-libs/LibFillResults.sol";
import "../libs/LibAbiEncoder.sol"; import "../exchange-libs/LibAbiEncoder.sol";
contract TestLibs is contract TestLibs is

1
contracts/exchange-libs/package.json
View File

@ -70,7 +70,6 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-multisig": "^1.0.6",
"@0x/contracts-utils": "^1.0.6", "@0x/contracts-utils": "^1.0.6",
"@0x/order-utils": "^3.1.2", "@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2", "@0x/types": "^1.5.2",

4
contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
View File

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

2
contracts/extensions/contracts/BalanceThresholdFilter/MixinExchangeCalldata.sol
View File

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

6
contracts/extensions/contracts/DutchAuction/DutchAuction.sol
View File

@ -20,10 +20,10 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.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/ERC20Token/IERC20Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol"; import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol"; import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
contract DutchAuction is contract DutchAuction is

4
contracts/extensions/contracts/Forwarder/MixinAssets.sol
View File

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

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

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

8
contracts/extensions/contracts/Forwarder/MixinForwarderCore.sol
View File

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

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

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

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

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

2
contracts/extensions/contracts/Forwarder/libs/LibConstants.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol"; import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.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/EtherToken/IEtherToken.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol"; import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";

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

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

4
contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
View File

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

6
contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
View File

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

2
contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
View File

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

2
contracts/extensions/contracts/OrderMatcher/interfaces/IMatchOrders.sol
View File

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

4
contracts/extensions/contracts/OrderValidator/OrderValidator.sol
View File

@ -20,10 +20,10 @@ pragma solidity 0.4.24;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol"; import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
import "@0x/contracts-libs/contracts/libs/LibOrder.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/ERC20Token/IERC20Token.sol";
import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol"; import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol"; import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
contract OrderValidator { contract OrderValidator {

5
contracts/extensions/package.json
View File

@ -71,9 +71,10 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-asset-proxy": "^2.2.3",
"@0x/contracts-interfaces": "^1.0.6", "@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-libs": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-protocol": "^2.2.3", "@0x/contracts-exchange": "^2.2.3",
"@0x/contracts-tokens": "^1.0.6", "@0x/contracts-tokens": "^1.0.6",
"@0x/contracts-utils": "^1.0.6", "@0x/contracts-utils": "^1.0.6",
"@0x/order-utils": "^3.1.2", "@0x/order-utils": "^3.1.2",

6
contracts/extensions/test/extensions/balance_threshold_filter.ts
View File

@ -8,12 +8,12 @@ import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { import {
artifacts as protocolArtifacts, artifacts as exchangeArtifacts,
ERC20Wrapper, ERC20Wrapper,
ERC721Wrapper, ERC721Wrapper,
ExchangeContract, ExchangeContract,
ExchangeWrapper, ExchangeWrapper,
} from '@0x/contracts-protocol'; } from '@0x/contracts-exchange';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -134,7 +134,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
await erc20Wrapper.setBalancesAndAllowancesAsync(); await erc20Wrapper.setBalancesAndAllowancesAsync();
// Deploy Exchange contract // Deploy Exchange contract
exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData, zrxAssetData,

6
contracts/extensions/test/extensions/dutch_auction.ts
View File

@ -1,11 +1,11 @@
import { DutchAuctionWrapper } from '@0x/contract-wrappers'; import { DutchAuctionWrapper } from '@0x/contract-wrappers';
import { import {
artifacts as protocolArtifacts, artifacts as exchangeArtifacts,
ERC20Wrapper, ERC20Wrapper,
ERC721Wrapper, ERC721Wrapper,
ExchangeContract, ExchangeContract,
ExchangeWrapper, ExchangeWrapper,
} from '@0x/contracts-protocol'; } from '@0x/contracts-exchange';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -98,7 +98,7 @@ describe(ContractName.DutchAuction, () => {
const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData, zrxAssetData,

8
contracts/extensions/test/extensions/forwarder.ts
View File

@ -1,10 +1,10 @@
import { import {
artifacts as protocolArtifacts, artifacts as exchangeArtifacts,
ERC20Wrapper, ERC20Wrapper,
ERC721Wrapper, ERC721Wrapper,
ExchangeContract, ExchangeContract,
ExchangeWrapper, ExchangeWrapper,
} from '@0x/contracts-protocol'; } from '@0x/contracts-exchange';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -107,7 +107,7 @@ describe(ContractName.Forwarder, () => {
wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address); wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData, zrxAssetData,
@ -178,7 +178,7 @@ describe(ContractName.Forwarder, () => {
describe('constructor', () => { describe('constructor', () => {
it('should revert if assetProxy is unregistered', async () => { it('should revert if assetProxy is unregistered', async () => {
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData, zrxAssetData,

17
contracts/extensions/test/extensions/order_matcher.ts
View File

@ -1,12 +1,11 @@
import { artifacts as proxyArtifacts, ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
import { import {
artifacts as protocolArtifacts, artifacts as exchangeArtifacts,
ERC20ProxyContract,
ERC20Wrapper, ERC20Wrapper,
ERC721ProxyContract,
ExchangeContract, ExchangeContract,
ExchangeFillEventArgs, ExchangeFillEventArgs,
ExchangeWrapper, ExchangeWrapper,
} from '@0x/contracts-protocol'; } from '@0x/contracts-exchange';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -102,13 +101,13 @@ describe('OrderMatcher', () => {
await erc20Wrapper.setBalancesAndAllowancesAsync(); await erc20Wrapper.setBalancesAndAllowancesAsync();
// Deploy ERC721 proxy // Deploy ERC721 proxy
erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
protocolArtifacts.ERC721Proxy, proxyArtifacts.ERC721Proxy,
provider, provider,
txDefaults, txDefaults,
); );
// Depoy exchange // Depoy exchange
exchange = await ExchangeContract.deployFrom0xArtifactAsync( exchange = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
assetDataUtils.encodeERC20AssetData(zrxToken.address), assetDataUtils.encodeERC20AssetData(zrxToken.address),
@ -197,7 +196,7 @@ describe('OrderMatcher', () => {
describe('constructor', () => { describe('constructor', () => {
it('should revert if assetProxy is unregistered', async () => { it('should revert if assetProxy is unregistered', async () => {
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
constants.NULL_BYTES, constants.NULL_BYTES,
@ -451,7 +450,7 @@ describe('OrderMatcher', () => {
signedOrderLeft.signature, signedOrderLeft.signature,
signedOrderRight.signature, signedOrderRight.signature,
); );
const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...protocolArtifacts }); const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...exchangeArtifacts });
const txReceipt = await logDecoder.getTxWithDecodedLogsAsync( const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
await web3Wrapper.sendTransactionAsync({ await web3Wrapper.sendTransactionAsync({
data, data,
@ -489,7 +488,7 @@ describe('OrderMatcher', () => {
signedOrderLeft.signature, signedOrderLeft.signature,
signedOrderRight.signature, signedOrderRight.signature,
); );
const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...protocolArtifacts }); const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...exchangeArtifacts });
const txReceipt = await logDecoder.getTxWithDecodedLogsAsync( const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
await web3Wrapper.sendTransactionAsync({ await web3Wrapper.sendTransactionAsync({
data, data,

9
contracts/extensions/test/extensions/order_validator.ts
View File

@ -1,12 +1,11 @@
import { ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
import { import {
artifacts as protocolArtifacts, artifacts as exchangeArtifacts,
ERC20ProxyContract,
ERC20Wrapper, ERC20Wrapper,
ERC721ProxyContract,
ERC721Wrapper, ERC721Wrapper,
ExchangeContract, ExchangeContract,
ExchangeWrapper, ExchangeWrapper,
} from '@0x/contracts-protocol'; } from '@0x/contracts-exchange';
import { import {
chaiSetup, chaiSetup,
constants, constants,
@ -81,7 +80,7 @@ describe('OrderValidator', () => {
const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
exchange = await ExchangeContract.deployFrom0xArtifactAsync( exchange = await ExchangeContract.deployFrom0xArtifactAsync(
protocolArtifacts.Exchange, exchangeArtifacts.Exchange,
provider, provider,
txDefaults, txDefaults,
zrxAssetData, zrxAssetData,

4
contracts/extensions/test/utils/balance_threshold_wrapper.ts
View File

@ -1,4 +1,4 @@
import { artifacts as protocolArtifacts, ExchangeContract } from '@0x/contracts-protocol'; import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange';
import { import {
FillResults, FillResults,
formatters, formatters,
@ -36,7 +36,7 @@ export class BalanceThresholdWrapper {
this._logDecoder = new LogDecoder(this._web3Wrapper, { this._logDecoder = new LogDecoder(this._web3Wrapper, {
...artifacts, ...artifacts,
...tokensArtifacts, ...tokensArtifacts,
...protocolArtifacts, ...exchangeArtifacts,
}); });
} }
public async fillOrderAsync( public async fillOrderAsync(

4
contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
View File

@ -1,4 +1,4 @@
import { artifacts as protocolArtifacts } from '@0x/contracts-protocol'; import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { LogDecoder } from '@0x/contracts-test-utils'; import { LogDecoder } from '@0x/contracts-test-utils';
import { artifacts as tokensArtifacts } from '@0x/contracts-tokens'; import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
import { DutchAuctionDetails, SignedOrder } from '@0x/types'; import { DutchAuctionDetails, SignedOrder } from '@0x/types';
@ -20,7 +20,7 @@ export class DutchAuctionTestWrapper {
this._logDecoder = new LogDecoder(this._web3Wrapper, { this._logDecoder = new LogDecoder(this._web3Wrapper, {
...artifacts, ...artifacts,
...tokensArtifacts, ...tokensArtifacts,
...protocolArtifacts, ...exchangeArtifacts,
}); });
} }
/** /**

4
contracts/extensions/test/utils/forwarder_wrapper.ts
View File

@ -1,4 +1,4 @@
import { artifacts as protocolArtifacts } from '@0x/contracts-protocol'; import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils'; import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
import { artifacts as tokensArtifacts } from '@0x/contracts-tokens'; import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
import { SignedOrder } from '@0x/types'; import { SignedOrder } from '@0x/types';
@ -63,7 +63,7 @@ export class ForwarderWrapper {
this._logDecoder = new LogDecoder(this._web3Wrapper, { this._logDecoder = new LogDecoder(this._web3Wrapper, {
...artifacts, ...artifacts,
...tokensArtifacts, ...tokensArtifacts,
...protocolArtifacts, ...exchangeArtifacts,
}); });
} }
public async marketSellOrdersWithEthAsync( public async marketSellOrdersWithEthAsync(

2
contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol
View File

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

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

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

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

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

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

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

2
contracts/interfaces/package.json
View File

@ -42,7 +42,7 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-libs": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-utils": "^1.0.6", "@0x/contracts-utils": "^1.0.6",
"@0x/types": "^1.5.2", "@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8", "@0x/typescript-typings": "^3.0.8",

2
contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
View File

@ -18,7 +18,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol"; import "@0x/contracts-utils/contracts/utils/Ownable.sol";
import "../../tokens/ERC20Token/MintableERC20Token.sol"; import "../../tokens/ERC20Token/MintableERC20Token.sol";

2
contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
View File

@ -19,7 +19,7 @@
pragma solidity 0.4.24; pragma solidity 0.4.24;
import "../../tokens/ERC721Token/MintableERC721Token.sol"; import "../../tokens/ERC721Token/MintableERC721Token.sol";
import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol"; import "@0x/contracts-utils/contracts/utils/Ownable.sol";
// solhint-disable no-empty-blocks // solhint-disable no-empty-blocks

4
contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
View File

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

2
contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol"; import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
import "./UnlimitedAllowanceERC20Token.sol"; import "./UnlimitedAllowanceERC20Token.sol";

2
contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
View File

@ -20,7 +20,7 @@ pragma solidity ^0.4.24;
import "./IERC721Token.sol"; import "./IERC721Token.sol";
import "./IERC721Receiver.sol"; import "./IERC721Receiver.sol";
import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol"; import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
contract ERC721Token is contract ERC721Token is

3
contracts/tokens/package.json
View File

@ -71,8 +71,7 @@
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-interfaces": "^1.0.6", "@0x/contracts-interfaces": "^1.0.6",
"@0x/contracts-libs": "^1.0.6", "@0x/contracts-exchange-libs": "^1.0.6",
"@0x/contracts-multisig": "^1.0.6",
"@0x/contracts-utils": "^1.0.6", "@0x/contracts-utils": "^1.0.6",
"@0x/order-utils": "^3.1.2", "@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2", "@0x/types": "^1.5.2",

1
contracts/utils/package.json
View File

@ -71,7 +71,6 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contracts-multisig": "^1.0.6",
"@0x/order-utils": "^3.1.2", "@0x/order-utils": "^3.1.2",
"@0x/types": "^1.5.2", "@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8", "@0x/typescript-typings": "^3.0.8",