rebased against development

contracts/asset-proxy/test/proxies.ts

@@ -1,3 +1,4 @@
+import { ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
 import {
     artifacts as erc20Artifacts,
     DummyERC20TokenContract,
@@ -28,9 +29,9 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { Erc1155Wrapper } from '../../erc1155';
 import {
     artifacts,
+    ERC1155ProxyWrapper,
     ERC20ProxyContract,
     ERC20Wrapper,
     ERC721ProxyContract,

contracts/exchange/package.json

@@ -71,7 +71,7 @@
         "@0x/contracts-asset-proxy": "^1.0.9",
         "@0x/contracts-erc20": "^1.0.9",
         "@0x/contracts-erc721": "^1.0.9",
-        "@0x/contracts-erc1155": "^0.0.1",
+        "@0x/contracts-erc1155": "^1.0.0",
         "@0x/contracts-exchange-libs": "^1.1.3",
         "@0x/contracts-utils": "^2.0.8",
         "@0x/order-utils": "^7.0.2",

packages/order-utils/src/asset_data_utils.ts

@@ -5,9 +5,6 @@ import {
     ERC1155AssetDataNoProxyId,
     ERC20AssetData,
     ERC721AssetData,
-    ERC1155AssetData,
-    ERC1155AssetDataAbi,
-    ERC1155AssetDataNoProxyId,
     MultiAssetData,
     MultiAssetDataWithRecursiveDecoding,
     SingleAssetData,

packages/order-utils/test/asset_data_utils_test.ts

@@ -68,11 +68,7 @@ describe('assetDataUtils', () => {
             KNOWN_ERC1155_ENCODING.tokenAddress,
             KNOWN_ERC1155_ENCODING.tokenIds,
             KNOWN_ERC1155_ENCODING.tokenValues,
-<<<<<<< HEAD
             KNOWN_ERC1155_ENCODING.callbackData,
-=======
-            KNOWN_ERC1155_ENCODING.callbackData
->>>>>>> 5bddc5795... ERC1155 Asset Data tests + types
         );
         expect(assetData).to.equal(KNOWN_ERC1155_ENCODING.assetData);
     });