diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-11 06:37:48 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-13 01:19:33 +0800 |
commit | 2c58b8a88650fcc4f3622546c02a14bbf211cd07 (patch) | |
tree | 9c4dd90c688a5b102f9245d9f95d0e71ad1f31d2 /contracts | |
parent | cb53cd05e62b1904184ec14862e48383f80b9c54 (diff) | |
download | dexon-0x-contracts-2c58b8a88650fcc4f3622546c02a14bbf211cd07.tar.gz dexon-0x-contracts-2c58b8a88650fcc4f3622546c02a14bbf211cd07.tar.zst dexon-0x-contracts-2c58b8a88650fcc4f3622546c02a14bbf211cd07.zip |
Rename core package to protocol
Diffstat (limited to 'contracts')
-rw-r--r-- | contracts/examples/package.json | 2 | ||||
-rw-r--r-- | contracts/extensions/package.json | 4 | ||||
-rw-r--r-- | contracts/extensions/test/extensions/dutch_auction.ts | 6 | ||||
-rw-r--r-- | contracts/extensions/test/extensions/forwarder.ts | 8 | ||||
-rw-r--r-- | contracts/extensions/test/extensions/order_validator.ts | 6 | ||||
-rw-r--r-- | contracts/extensions/test/utils/forwarder_wrapper.ts | 8 | ||||
-rw-r--r-- | contracts/multisig/package.json | 2 | ||||
-rw-r--r-- | contracts/protocol/.solhint.json (renamed from contracts/core/.solhint.json) | 0 | ||||
-rw-r--r-- | contracts/protocol/CHANGELOG.json (renamed from contracts/core/CHANGELOG.json) | 0 | ||||
-rw-r--r-- | contracts/protocol/README.md (renamed from contracts/core/README.md) | 4 | ||||
-rw-r--r-- | contracts/protocol/compiler.json (renamed from contracts/core/compiler.json) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol (renamed from contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol (renamed from contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol (renamed from contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol (renamed from contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol (renamed from contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol (renamed from contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/Exchange.sol (renamed from contracts/core/contracts/protocol/Exchange/Exchange.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinExchangeCore.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinMatchOrders.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinSignatureValidator.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinTransactions.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinTransactions.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/MixinWrapperFunctions.sol (renamed from contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MExchangeCore.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MMatchOrders.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MSignatureValidator.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MTransactions.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol (renamed from contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol (renamed from contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol (renamed from contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/test/TestExchangeInternals/TestExchangeInternals.sol (renamed from contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/test/TestSignatureValidator/TestSignatureValidator.sol (renamed from contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol (renamed from contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol) | 0 | ||||
-rw-r--r-- | contracts/protocol/package.json (renamed from contracts/core/package.json) | 4 | ||||
-rw-r--r-- | contracts/protocol/src/artifacts/index.ts (renamed from contracts/core/src/artifacts/index.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/src/index.ts (renamed from contracts/core/src/index.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/src/wrappers/index.ts (renamed from contracts/core/src/wrappers/index.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/asset_proxy/authorizable.ts (renamed from contracts/core/test/asset_proxy/authorizable.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/asset_proxy/proxies.ts (renamed from contracts/core/test/asset_proxy/proxies.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/core.ts (renamed from contracts/core/test/exchange/core.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/dispatcher.ts (renamed from contracts/core/test/exchange/dispatcher.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/fill_order.ts (renamed from contracts/core/test/exchange/fill_order.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/internal.ts (renamed from contracts/core/test/exchange/internal.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/match_orders.ts (renamed from contracts/core/test/exchange/match_orders.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/signature_validator.ts (renamed from contracts/core/test/exchange/signature_validator.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/transactions.ts (renamed from contracts/core/test/exchange/transactions.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/exchange/wrapper.ts (renamed from contracts/core/test/exchange/wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/global_hooks.ts (renamed from contracts/core/test/global_hooks.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/multisig/asset_proxy_owner.ts (renamed from contracts/core/test/multisig/asset_proxy_owner.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/asset_proxy_owner_wrapper.ts (renamed from contracts/core/test/utils/asset_proxy_owner_wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/asset_wrapper.ts (renamed from contracts/core/test/utils/asset_wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/erc20_wrapper.ts (renamed from contracts/core/test/utils/erc20_wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/erc721_wrapper.ts (renamed from contracts/core/test/utils/erc721_wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/exchange_wrapper.ts (renamed from contracts/core/test/utils/exchange_wrapper.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/fill_order_combinatorial_utils.ts (renamed from contracts/core/test/utils/fill_order_combinatorial_utils.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/index.ts (renamed from contracts/core/test/utils/index.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/match_order_tester.ts (renamed from contracts/core/test/utils/match_order_tester.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/order_factory_from_scenario.ts (renamed from contracts/core/test/utils/order_factory_from_scenario.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts (renamed from contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/test/utils/simple_order_filled_cancelled_fetcher.ts (renamed from contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts) | 0 | ||||
-rw-r--r-- | contracts/protocol/tsconfig.json (renamed from contracts/core/tsconfig.json) | 0 | ||||
-rw-r--r-- | contracts/protocol/tslint.json (renamed from contracts/core/tslint.json) | 0 |
64 files changed, 24 insertions, 20 deletions
diff --git a/contracts/examples/package.json b/contracts/examples/package.json index 7682e0d45..5413f9e61 100644 --- a/contracts/examples/package.json +++ b/contracts/examples/package.json @@ -31,7 +31,7 @@ "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md", "devDependencies": { "@0x/contracts-test-utils": "^1.0.0", "@0x/abi-gen": "^1.0.17", diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 95db0c5ac..45838c825 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -43,7 +43,7 @@ "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { "@0x/contracts-test-utils": "^1.0.0", "@0x/abi-gen": "^1.0.17", @@ -75,7 +75,7 @@ "@0x/base-contract": "^3.0.8", "@0x/order-utils": "^3.0.4", "@0x/contracts-utils": "^1.0.0", - "@0x/contracts-core": "^2.1.56", + "@0x/contracts-protocol": "^2.1.56", "@0x/contracts-tokens": "^1.0.0", "@0x/contracts-libs": "^1.0.0", "@0x/contracts-interfaces": "^1.0.0", diff --git a/contracts/extensions/test/extensions/dutch_auction.ts b/contracts/extensions/test/extensions/dutch_auction.ts index 2db3be752..6c3b2f0f3 100644 --- a/contracts/extensions/test/extensions/dutch_auction.ts +++ b/contracts/extensions/test/extensions/dutch_auction.ts @@ -1,10 +1,10 @@ import { - artifacts as coreArtifacts, + artifacts as protocolArtifacts, ERC20Wrapper, ERC721Wrapper, ExchangeContract, ExchangeWrapper, -} from '@0x/contracts-core'; +} from '@0x/contracts-protocol'; import { chaiSetup, constants, @@ -109,7 +109,7 @@ describe(ContractName.DutchAuction, () => { const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - coreArtifacts.Exchange, + protocolArtifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/extensions/forwarder.ts b/contracts/extensions/test/extensions/forwarder.ts index 245d8eab9..4027f493d 100644 --- a/contracts/extensions/test/extensions/forwarder.ts +++ b/contracts/extensions/test/extensions/forwarder.ts @@ -1,10 +1,10 @@ import { - artifacts as coreArtifacts, + artifacts as protocolArtifacts, ERC20Wrapper, ERC721Wrapper, ExchangeContract, ExchangeWrapper, -} from '@0x/contracts-core'; +} from '@0x/contracts-protocol'; import { chaiSetup, constants, @@ -108,7 +108,7 @@ describe(ContractName.Forwarder, () => { wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address); zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - coreArtifacts.Exchange, + protocolArtifacts.Exchange, provider, txDefaults, zrxAssetData, @@ -179,7 +179,7 @@ describe(ContractName.Forwarder, () => { describe('constructor', () => { it('should revert if assetProxy is unregistered', async () => { const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - coreArtifacts.Exchange, + protocolArtifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/extensions/test/extensions/order_validator.ts index 9a1dc0636..f0f3b43c7 100644 --- a/contracts/extensions/test/extensions/order_validator.ts +++ b/contracts/extensions/test/extensions/order_validator.ts @@ -1,12 +1,12 @@ import { - artifacts as coreArtifacts, + artifacts as protocolArtifacts, ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper, ExchangeContract, ExchangeWrapper, -} from '@0x/contracts-core'; +} from '@0x/contracts-protocol'; import { chaiSetup, constants, @@ -81,7 +81,7 @@ describe('OrderValidator', () => { const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); exchange = await ExchangeContract.deployFrom0xArtifactAsync( - coreArtifacts.Exchange, + protocolArtifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/utils/forwarder_wrapper.ts b/contracts/extensions/test/utils/forwarder_wrapper.ts index 767a81ca6..9e44ff6b9 100644 --- a/contracts/extensions/test/utils/forwarder_wrapper.ts +++ b/contracts/extensions/test/utils/forwarder_wrapper.ts @@ -1,4 +1,4 @@ -import { artifacts as coreArtifacts } from '@0x/contracts-core'; +import { artifacts as protocolArtifacts } from '@0x/contracts-protocol'; import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils'; import { artifacts as tokensArtifacts } from '@0x/contracts-tokens'; import { SignedOrder } from '@0x/types'; @@ -60,7 +60,11 @@ export class ForwarderWrapper { constructor(contractInstance: ForwarderContract, provider: Provider) { this._forwarderContract = contractInstance; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...tokensArtifacts, ...coreArtifacts }); + this._logDecoder = new LogDecoder(this._web3Wrapper, { + ...artifacts, + ...tokensArtifacts, + ...protocolArtifacts, + }); } public async marketSellOrdersWithEthAsync( orders: SignedOrder[], diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 37d064fef..5b8b8dc14 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -42,7 +42,7 @@ "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { "@0x/contracts-test-utils": "^1.0.0", "@0x/abi-gen": "^1.0.17", diff --git a/contracts/core/.solhint.json b/contracts/protocol/.solhint.json index 076afe9f3..076afe9f3 100644 --- a/contracts/core/.solhint.json +++ b/contracts/protocol/.solhint.json diff --git a/contracts/core/CHANGELOG.json b/contracts/protocol/CHANGELOG.json index 371f18cd4..371f18cd4 100644 --- a/contracts/core/CHANGELOG.json +++ b/contracts/protocol/CHANGELOG.json diff --git a/contracts/core/README.md b/contracts/protocol/README.md index d055705c2..5fc9c0a89 100644 --- a/contracts/core/README.md +++ b/contracts/protocol/README.md @@ -42,13 +42,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0x/contracts-core yarn build +PKG=@0x/contracts-protocol yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0x/contracts-core yarn watch +PKG=@0x/contracts-protocol yarn watch ``` ### Clean diff --git a/contracts/core/compiler.json b/contracts/protocol/compiler.json index 10e5bb0a1..10e5bb0a1 100644 --- a/contracts/core/compiler.json +++ b/contracts/protocol/compiler.json diff --git a/contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol index 258443bca..258443bca 100644 --- a/contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol +++ b/contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol diff --git a/contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol index 65b664b8b..65b664b8b 100644 --- a/contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol +++ b/contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol diff --git a/contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol b/contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol index 08f9b94dc..08f9b94dc 100644 --- a/contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol +++ b/contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol diff --git a/contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol index 42231e73b..42231e73b 100644 --- a/contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol +++ b/contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol diff --git a/contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol b/contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol index fe77048ce..fe77048ce 100644 --- a/contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol +++ b/contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol diff --git a/contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol b/contracts/protocol/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol index bfc7b5a66..bfc7b5a66 100644 --- a/contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol +++ b/contracts/protocol/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol diff --git a/contracts/core/contracts/protocol/Exchange/Exchange.sol b/contracts/protocol/contracts/protocol/Exchange/Exchange.sol index 65ca742ea..65ca742ea 100644 --- a/contracts/core/contracts/protocol/Exchange/Exchange.sol +++ b/contracts/protocol/contracts/protocol/Exchange/Exchange.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol b/contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol index 36ab39b45..36ab39b45 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol b/contracts/protocol/contracts/protocol/Exchange/MixinExchangeCore.sol index 68d6a3897..68d6a3897 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinExchangeCore.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol b/contracts/protocol/contracts/protocol/Exchange/MixinMatchOrders.sol index fc6d73482..fc6d73482 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinMatchOrders.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol b/contracts/protocol/contracts/protocol/Exchange/MixinSignatureValidator.sol index 80b4c0755..80b4c0755 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinSignatureValidator.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinTransactions.sol b/contracts/protocol/contracts/protocol/Exchange/MixinTransactions.sol index 87c614382..87c614382 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinTransactions.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinTransactions.sol diff --git a/contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol b/contracts/protocol/contracts/protocol/Exchange/MixinWrapperFunctions.sol index 2d43432ff..2d43432ff 100644 --- a/contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol +++ b/contracts/protocol/contracts/protocol/Exchange/MixinWrapperFunctions.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol index fe3d03326..fe3d03326 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MExchangeCore.sol index 215284900..215284900 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MExchangeCore.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MMatchOrders.sol index 1eb4be329..1eb4be329 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MMatchOrders.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MSignatureValidator.sol index a933976d1..a933976d1 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MSignatureValidator.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MTransactions.sol index a6b0fdc85..a6b0fdc85 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MTransactions.sol diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol index 101e7cb82..101e7cb82 100644 --- a/contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol +++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol diff --git a/contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol b/contracts/protocol/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol index ad71fc9a1..ad71fc9a1 100644 --- a/contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol +++ b/contracts/protocol/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol diff --git a/contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol b/contracts/protocol/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol index 52c66cb56..52c66cb56 100644 --- a/contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol +++ b/contracts/protocol/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol diff --git a/contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol b/contracts/protocol/contracts/test/TestExchangeInternals/TestExchangeInternals.sol index 27187f8f8..27187f8f8 100644 --- a/contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol +++ b/contracts/protocol/contracts/test/TestExchangeInternals/TestExchangeInternals.sol diff --git a/contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol b/contracts/protocol/contracts/test/TestSignatureValidator/TestSignatureValidator.sol index ea3e2de59..ea3e2de59 100644 --- a/contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol +++ b/contracts/protocol/contracts/test/TestSignatureValidator/TestSignatureValidator.sol diff --git a/contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol b/contracts/protocol/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol index d08da7303..d08da7303 100644 --- a/contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol +++ b/contracts/protocol/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol diff --git a/contracts/core/package.json b/contracts/protocol/package.json index b7077f4b4..936d1bf5b 100644 --- a/contracts/core/package.json +++ b/contracts/protocol/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@0x/contracts-core", + "name": "@0x/contracts-protocol", "version": "2.1.56", "engines": { "node": ">=6.12" @@ -43,7 +43,7 @@ "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { "@0x/contracts-test-utils": "^1.0.0", "@0x/abi-gen": "^1.0.17", diff --git a/contracts/core/src/artifacts/index.ts b/contracts/protocol/src/artifacts/index.ts index c5d12f10b..c5d12f10b 100644 --- a/contracts/core/src/artifacts/index.ts +++ b/contracts/protocol/src/artifacts/index.ts diff --git a/contracts/core/src/index.ts b/contracts/protocol/src/index.ts index ba813e7ca..ba813e7ca 100644 --- a/contracts/core/src/index.ts +++ b/contracts/protocol/src/index.ts diff --git a/contracts/core/src/wrappers/index.ts b/contracts/protocol/src/wrappers/index.ts index 01b121054..01b121054 100644 --- a/contracts/core/src/wrappers/index.ts +++ b/contracts/protocol/src/wrappers/index.ts diff --git a/contracts/core/test/asset_proxy/authorizable.ts b/contracts/protocol/test/asset_proxy/authorizable.ts index 853d18be0..853d18be0 100644 --- a/contracts/core/test/asset_proxy/authorizable.ts +++ b/contracts/protocol/test/asset_proxy/authorizable.ts diff --git a/contracts/core/test/asset_proxy/proxies.ts b/contracts/protocol/test/asset_proxy/proxies.ts index c4bd95905..c4bd95905 100644 --- a/contracts/core/test/asset_proxy/proxies.ts +++ b/contracts/protocol/test/asset_proxy/proxies.ts diff --git a/contracts/core/test/exchange/core.ts b/contracts/protocol/test/exchange/core.ts index 9b948f991..9b948f991 100644 --- a/contracts/core/test/exchange/core.ts +++ b/contracts/protocol/test/exchange/core.ts diff --git a/contracts/core/test/exchange/dispatcher.ts b/contracts/protocol/test/exchange/dispatcher.ts index 5b1ac1e20..5b1ac1e20 100644 --- a/contracts/core/test/exchange/dispatcher.ts +++ b/contracts/protocol/test/exchange/dispatcher.ts diff --git a/contracts/core/test/exchange/fill_order.ts b/contracts/protocol/test/exchange/fill_order.ts index 2bdbe4855..2bdbe4855 100644 --- a/contracts/core/test/exchange/fill_order.ts +++ b/contracts/protocol/test/exchange/fill_order.ts diff --git a/contracts/core/test/exchange/internal.ts b/contracts/protocol/test/exchange/internal.ts index 972f5efb6..972f5efb6 100644 --- a/contracts/core/test/exchange/internal.ts +++ b/contracts/protocol/test/exchange/internal.ts diff --git a/contracts/core/test/exchange/match_orders.ts b/contracts/protocol/test/exchange/match_orders.ts index 8e943c237..8e943c237 100644 --- a/contracts/core/test/exchange/match_orders.ts +++ b/contracts/protocol/test/exchange/match_orders.ts diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/protocol/test/exchange/signature_validator.ts index 3f1786b5b..3f1786b5b 100644 --- a/contracts/core/test/exchange/signature_validator.ts +++ b/contracts/protocol/test/exchange/signature_validator.ts diff --git a/contracts/core/test/exchange/transactions.ts b/contracts/protocol/test/exchange/transactions.ts index 746f3cb04..746f3cb04 100644 --- a/contracts/core/test/exchange/transactions.ts +++ b/contracts/protocol/test/exchange/transactions.ts diff --git a/contracts/core/test/exchange/wrapper.ts b/contracts/protocol/test/exchange/wrapper.ts index c9efb0c9d..c9efb0c9d 100644 --- a/contracts/core/test/exchange/wrapper.ts +++ b/contracts/protocol/test/exchange/wrapper.ts diff --git a/contracts/core/test/global_hooks.ts b/contracts/protocol/test/global_hooks.ts index f8ace376a..f8ace376a 100644 --- a/contracts/core/test/global_hooks.ts +++ b/contracts/protocol/test/global_hooks.ts diff --git a/contracts/core/test/multisig/asset_proxy_owner.ts b/contracts/protocol/test/multisig/asset_proxy_owner.ts index daebfb7fb..daebfb7fb 100644 --- a/contracts/core/test/multisig/asset_proxy_owner.ts +++ b/contracts/protocol/test/multisig/asset_proxy_owner.ts diff --git a/contracts/core/test/utils/asset_proxy_owner_wrapper.ts b/contracts/protocol/test/utils/asset_proxy_owner_wrapper.ts index df23658d8..df23658d8 100644 --- a/contracts/core/test/utils/asset_proxy_owner_wrapper.ts +++ b/contracts/protocol/test/utils/asset_proxy_owner_wrapper.ts diff --git a/contracts/core/test/utils/asset_wrapper.ts b/contracts/protocol/test/utils/asset_wrapper.ts index e4090ad74..e4090ad74 100644 --- a/contracts/core/test/utils/asset_wrapper.ts +++ b/contracts/protocol/test/utils/asset_wrapper.ts diff --git a/contracts/core/test/utils/erc20_wrapper.ts b/contracts/protocol/test/utils/erc20_wrapper.ts index e5ab0e36c..e5ab0e36c 100644 --- a/contracts/core/test/utils/erc20_wrapper.ts +++ b/contracts/protocol/test/utils/erc20_wrapper.ts diff --git a/contracts/core/test/utils/erc721_wrapper.ts b/contracts/protocol/test/utils/erc721_wrapper.ts index 1f658ce86..1f658ce86 100644 --- a/contracts/core/test/utils/erc721_wrapper.ts +++ b/contracts/protocol/test/utils/erc721_wrapper.ts diff --git a/contracts/core/test/utils/exchange_wrapper.ts b/contracts/protocol/test/utils/exchange_wrapper.ts index cb6dce901..cb6dce901 100644 --- a/contracts/core/test/utils/exchange_wrapper.ts +++ b/contracts/protocol/test/utils/exchange_wrapper.ts diff --git a/contracts/core/test/utils/fill_order_combinatorial_utils.ts b/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts index 5d0ea07a8..5d0ea07a8 100644 --- a/contracts/core/test/utils/fill_order_combinatorial_utils.ts +++ b/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts diff --git a/contracts/core/test/utils/index.ts b/contracts/protocol/test/utils/index.ts index 75cd88666..75cd88666 100644 --- a/contracts/core/test/utils/index.ts +++ b/contracts/protocol/test/utils/index.ts diff --git a/contracts/core/test/utils/match_order_tester.ts b/contracts/protocol/test/utils/match_order_tester.ts index 8f574704e..8f574704e 100644 --- a/contracts/core/test/utils/match_order_tester.ts +++ b/contracts/protocol/test/utils/match_order_tester.ts diff --git a/contracts/core/test/utils/order_factory_from_scenario.ts b/contracts/protocol/test/utils/order_factory_from_scenario.ts index ecb4b2e28..ecb4b2e28 100644 --- a/contracts/core/test/utils/order_factory_from_scenario.ts +++ b/contracts/protocol/test/utils/order_factory_from_scenario.ts diff --git a/contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts b/contracts/protocol/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts index 64b7dedbe..64b7dedbe 100644 --- a/contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts +++ b/contracts/protocol/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts diff --git a/contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts b/contracts/protocol/test/utils/simple_order_filled_cancelled_fetcher.ts index af959e00e..af959e00e 100644 --- a/contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts +++ b/contracts/protocol/test/utils/simple_order_filled_cancelled_fetcher.ts diff --git a/contracts/core/tsconfig.json b/contracts/protocol/tsconfig.json index db872fc32..db872fc32 100644 --- a/contracts/core/tsconfig.json +++ b/contracts/protocol/tsconfig.json diff --git a/contracts/core/tslint.json b/contracts/protocol/tslint.json index 1bb3ac2a2..1bb3ac2a2 100644 --- a/contracts/core/tslint.json +++ b/contracts/protocol/tslint.json |