Move LibAssetData to DevUtils package

contracts/asset-proxy/compiler.json

@@ -30,7 +30,6 @@
         "src/MultiAssetProxy.sol",
         "src/interfaces/IAssetData.sol",
         "src/interfaces/IAssetProxy.sol",
-        "src/interfaces/IAuthorizable.sol",
+        "src/interfaces/IAuthorizable.sol"
-        "src/libs/LibAssetData.sol"
     ]
 }

contracts/asset-proxy/package.json

@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|LibAssetData|MixinAuthorizable|MultiAssetProxy).json",
+        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

contracts/asset-proxy/src/artifacts.ts

@@ -11,11 +11,9 @@ import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
 import * as IAssetData from '../generated-artifacts/IAssetData.json';
 import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json';
 import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
-import * as LibAssetData from '../generated-artifacts/LibAssetData.json';
 import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
 import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
 export const artifacts = {
-    LibAssetData: LibAssetData as ContractArtifact,
     ERC1155Proxy: ERC1155Proxy as ContractArtifact,
     ERC20Proxy: ERC20Proxy as ContractArtifact,
     ERC721Proxy: ERC721Proxy as ContractArtifact,

contracts/asset-proxy/src/wrappers.ts

@@ -9,6 +9,5 @@ export * from '../generated-wrappers/erc721_proxy';
 export * from '../generated-wrappers/i_asset_data';
 export * from '../generated-wrappers/i_asset_proxy';
 export * from '../generated-wrappers/i_authorizable';
-export * from '../generated-wrappers/lib_asset_data';
 export * from '../generated-wrappers/mixin_authorizable';
 export * from '../generated-wrappers/multi_asset_proxy';

contracts/asset-proxy/tsconfig.json

@@ -9,7 +9,6 @@
         "generated-artifacts/IAssetData.json",
         "generated-artifacts/IAssetProxy.json",
         "generated-artifacts/IAuthorizable.json",
-        "generated-artifacts/LibAssetData.json",
         "generated-artifacts/MixinAuthorizable.json",
         "generated-artifacts/MultiAssetProxy.json"
     ],

contracts/dev-utils/compiler.json

@@ -22,5 +22,5 @@
             }
         }
     },
-    "contracts": ["src/DevUtils.sol", "src/LibTransactionDecoder.sol"]
+    "contracts": ["src/DevUtils.sol", "src/LibAssetData.sol", "src/LibTransactionDecoder.sol"]
 }

contracts/dev-utils/contracts/src/LibAssetData.sol

@@ -23,7 +23,7 @@ import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
 import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
 import "@0x/contracts-erc721/contracts/src/interfaces/IERC721Token.sol";
-import "./LibAssetProxyIds.sol";
+import "@0x/contracts-asset-proxy/contracts/src/libs/LibAssetProxyIds.sol";
 
 
 contract LibAssetData is

contracts/dev-utils/package.json

@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(DevUtils|LibTransactionDecoder).json",
+        "abis": "./generated-artifacts/@(DevUtils|LibAssetData|LibTransactionDecoder).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

contracts/dev-utils/src/artifacts.ts

@@ -6,8 +6,10 @@
 import { ContractArtifact } from 'ethereum-types';
 
 import * as DevUtils from '../generated-artifacts/DevUtils.json';
+import * as LibAssetData from '../generated-artifacts/LibAssetData.json';
 import * as LibTransactionDecoder from '../generated-artifacts/LibTransactionDecoder.json';
 export const artifacts = {
     DevUtils: DevUtils as ContractArtifact,
     LibTransactionDecoder: LibTransactionDecoder as ContractArtifact,
+    LibAssetData: LibAssetData as ContractArtifact,
 };

contracts/dev-utils/src/wrappers.ts

@@ -4,4 +4,5 @@
  * -----------------------------------------------------------------------------
  */
 export * from '../generated-wrappers/dev_utils';
+export * from '../generated-wrappers/lib_asset_data';
 export * from '../generated-wrappers/lib_transaction_decoder';

contracts/dev-utils/tsconfig.json

@@ -2,6 +2,10 @@
     "extends": "../../tsconfig",
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": ["generated-artifacts/DevUtils.json", "generated-artifacts/LibTransactionDecoder.json"],
+    "files": [
+        "generated-artifacts/DevUtils.json",
+        "generated-artifacts/LibAssetData.json",
+        "generated-artifacts/LibTransactionDecoder.json"
+    ],
     "exclude": ["./deploy/solc/solc_bin"]
 }