Added changelog entries and cleaned up merge

contracts/asset-proxy/CHANGELOG.json

@@ -13,6 +13,10 @@
             {
                 "note": "Compile and export all contracts, artifacts, and wrappers by default",
                 "pr": 2055
+            },
+            {
+                "note": "Remove unused dependency on IAuthorizable in IAssetProxy",
+                "pr": 1910
             }
         ]
     },

contracts/coordinator/contracts/src/libs/LibEIP712CoordinatorDomain.sol

@@ -21,7 +21,8 @@ pragma solidity ^0.5.9;
 import "@0x/contracts-utils/contracts/src/LibEIP712.sol";
 
 
-contract LibEIP712CoordinatorDomain
+contract LibEIP712CoordinatorDomain is
+    LibEIP712
 {
 
     // EIP712 Domain Name value for the Coordinator
@@ -43,7 +44,7 @@ contract LibEIP712CoordinatorDomain
         public
     {
         address verifyingContractAddress = verifyingContractAddressIfExists == address(0) ? address(this) : verifyingContractAddressIfExists;
-        EIP712_COORDINATOR_DOMAIN_HASH = LibEIP712._hashEIP712Domain(
+        EIP712_COORDINATOR_DOMAIN_HASH = _hashEIP712Domain(
             EIP712_COORDINATOR_DOMAIN_NAME,
             EIP712_COORDINATOR_DOMAIN_VERSION,
             chainId,
@@ -60,6 +61,6 @@ contract LibEIP712CoordinatorDomain
         view
         returns (bytes32 result)
     {
-        return LibEIP712._hashEIP712Message(EIP712_COORDINATOR_DOMAIN_HASH, hashStruct);
+        return _hashEIP712Message(EIP712_COORDINATOR_DOMAIN_HASH, hashStruct);
     }
 }

contracts/coordinator/package.json

@@ -54,7 +54,6 @@
         "@0x/dev-utils": "^2.3.0",
         "@0x/sol-compiler": "^3.1.12",
         "@0x/tslint-config": "^3.0.1",
-        "@0x/utils": "^4.3.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",

contracts/exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol

@@ -22,6 +22,7 @@ import "@0x/contracts-utils/contracts/src/LibEIP712.sol";
 
 
 contract LibEIP712ExchangeDomain {
+
     // EIP712 Exchange Domain Name value
     string constant public EIP712_EXCHANGE_DOMAIN_NAME = "0x Protocol";
 

contracts/exchange-libs/contracts/test/TestLibEIP712ExchangeDomain.sol

@@ -26,7 +26,6 @@ contract TestLibEIP712ExchangeDomain is
     LibEIP712ExchangeDomain
 {
 
-    // solhint-disable no-empty-blocks
     constructor(
         uint256 chainId,
         address verifyingContractAddressIfExists

contracts/staking/CHANGELOG.json

@@ -5,6 +5,10 @@
             {
                 "note": "Created package",
                 "pr": 1821
+            },
+            {
+                "note": "First implementation",
+                "pr": 1910
             }
         ]
     }

contracts/utils/contracts/src/LibEIP712.sol

@@ -109,12 +109,4 @@ library LibEIP712 {
         }
         return result;
     }
-
-    function _getDomainSeparatorSchemaHash()
-        internal
-        pure
-        returns (bytes32 hash)
-    {
-        return 0xb1b295f2c1ed6b459ddeb95701466e4e0b385527a6cfa3873ae72a63c08466b6;
-    }
 }

packages/order-utils/CHANGELOG.json

@@ -65,6 +65,10 @@
             {
                 "note": "Update `IncompleteFillError` to take an `errorCode`, `expectedAssetFillAmount`, and `actualAssetFillAmount` fields.",
                 "pr": 2075
+            },
+            {
+                "note": "Add EIP712 types for Staking",
+                "pr": 1910
             }
         ]
     },

packages/types/CHANGELOG.json

@@ -9,6 +9,11 @@
             {
                 "note": "Add `OrderInfo`, `FillResults`, `MatchedFillResults`, `BatchMatchedFillResults` types",
                 "pr": 2031
+            },
+            ,
+            {
+                "note": "Add status types for Staking contracts",
+                "pr": 1910
             }
         ]
     },