Rename core package to protocol

.circleci/config.yml

@@ -45,7 +45,7 @@ jobs:
             - run: yarn wsrun test:circleci @0x/contracts-libs
             - run: yarn wsrun test:circleci @0x/contracts-tokens
             - run: yarn wsrun test:circleci @0x/contracts-extensions
-            - run: yarn wsrun test:circleci @0x/contracts-core
+            - run: yarn wsrun test:circleci @0x/contracts-protocol
     test-contracts-geth:
         docker:
             - image: circleci/node:9
@@ -62,7 +62,7 @@ jobs:
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-libs
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-tokens
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-extensions
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-core
+            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-protocol
     test-publish:
         resource_class: medium+
         docker:

.gitignore

@@ -86,7 +86,7 @@ packages/react-docs/example/public/bundle*
 packages/testnet-faucets/server/
 
 # generated contract artifacts/
-contracts/core/generated-artifacts/
+contracts/protocol/generated-artifacts/
 contracts/multisig/generated-artifacts/
 contracts/utils/generated-artifacts/
 contracts/libs/generated-artifacts/
@@ -99,7 +99,7 @@ packages/metacoin/artifacts/
 
 # generated contract wrappers
 packages/abi-gen-wrappers/wrappers
-contracts/core/generated-wrappers/
+contracts/protocol/generated-wrappers/
 contracts/multisig/generated-wrappers/
 contracts/utils/generated-wrappers/
 contracts/libs/generated-wrappers/

.prettierignore

@@ -1,7 +1,7 @@
 lib
 .nyc_output
-/contracts/core/generated-wrappers
+/contracts/protocol/generated-wrappers
-/contracts/core/generated-artifacts
+/contracts/protocol/generated-artifacts
 /contracts/multisig/generated-wrappers
 /contracts/multisig/generated-artifacts
 /contracts/utils/generated-wrappers
@@ -14,6 +14,8 @@ lib
 /contracts/tokens/generated-artifacts
 /contracts/examples/generated-wrappers
 /contracts/examples/generated-artifacts
+/contracts/extensions/generated-wrappers
+/contracts/extensions/generated-artifacts
 /packages/abi-gen-wrappers/src/generated-wrappers
 /packages/contract-artifacts/artifacts
 /python-packages/order_utils/src/zero_ex/contract_artifacts/artifacts

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",

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",

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,

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,

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,

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[],

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",

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

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",