Merge pull request #2268 from 0xProject/addERC1155MintableSupport

Add erc1155 mintable support

packages/abi-gen-wrappers/package.json

@@ -21,7 +21,7 @@
         "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output src/generated-wrappers --backend ethers"
     },
     "config": {
-        "abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DevUtils|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IAssetProxy|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken|Coordinator|CoordinatorRegistry|EthBalanceChecker|ERC1155Proxy|StaticCallProxy).json"
+        "abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DevUtils|DutchAuction|DummyERC20Token|DummyERC721Token|ERC1155Mintable|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IAssetProxy|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken|Coordinator|CoordinatorRegistry|EthBalanceChecker|ERC1155Proxy|StaticCallProxy).json"
     },
     "repository": {
         "type": "git",

packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/erc1155_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/eth_balance_checker.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/static_call_proxy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen-wrappers/src/index.ts

@@ -30,6 +30,13 @@ export {
     DummyERC721TokenApprovalForAllEventArgs,
     DummyERC721TokenContract,
 } from './generated-wrappers/dummy_erc721_token';
+export {
+    ERC1155MintableContract,
+    ERC1155MintableApprovalForAllEventArgs,
+    ERC1155MintableTransferBatchEventArgs,
+    ERC1155MintableTransferSingleEventArgs,
+    ERC1155MintableURIEventArgs,
+} from './generated-wrappers/erc1155_mintable';
 export { DutchAuctionContract } from './generated-wrappers/dutch_auction';
 export {
     ERC1155ProxyEventArgs,

packages/abi-gen/templates/TypeScript/contract.handlebars

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract{{#if events}},

packages/abi-gen/test-cli/output/typescript/abi_gen_dummy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, SubscriptionManager, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen/test-cli/output/typescript/lib_dummy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/abi-gen/test-cli/output/typescript/test_lib_dummy.ts

@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma enum-naming
 // tslint:disable:whitespace no-unbound-method no-trailing-whitespace
 // tslint:disable:no-unused-variable
 import { BaseContract, PromiseWithTransactionHash } from '@0x/base-contract';

packages/contract-artifacts/src/index.ts

@@ -5,6 +5,7 @@ import * as DevUtils from '../artifacts/DevUtils.json';
 import * as DummyERC20Token from '../artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from '../artifacts/DummyERC721Token.json';
 import * as DutchAuction from '../artifacts/DutchAuction.json';
+import * as ERC1155Mintable from '../artifacts/ERC1155Mintable.json';
 import * as ERC1155Proxy from '../artifacts/ERC1155Proxy.json';
 import * as ERC20Proxy from '../artifacts/ERC20Proxy.json';
 import * as ERC20Token from '../artifacts/ERC20Token.json';
@@ -28,6 +29,7 @@ export {
     DevUtils,
     DummyERC20Token,
     DummyERC721Token,
+    ERC1155Mintable,
     ERC1155Proxy,
     ERC20Proxy,
     ERC20Token,

packages/contract-artifacts/tsconfig.json

@@ -12,6 +12,7 @@
         "./artifacts/DutchAuction.json",
         "./artifacts/DummyERC20Token.json",
         "./artifacts/DummyERC721Token.json",
+        "./artifacts/ERC1155Mintable.json",
         "./artifacts/ERC20Proxy.json",
         "./artifacts/ERC20Token.json",
         "./artifacts/ERC721Proxy.json",

packages/migrations/Dockerfile

@@ -2,7 +2,7 @@ FROM mhart/alpine-node:10
 
 WORKDIR /usr/src/app
 
-RUN npm install -g ganache-cli@6.4.1
+RUN npm install -g ganache-cli@6.7.0
 
 ENV MNEMONIC "concert load couple harbor equip island argue ramp clarify fence smart topic"
 ENV NETWORK_ID 50

packages/migrations/src/migration.ts

@@ -300,6 +300,14 @@ export async function runMigrationsAsync(
         exchange.address,
     );
 
+    // tslint:disable-next-line:no-unused-variable
+    const erc1155DummyToken = await wrappers.ERC1155MintableContract.deployFrom0xArtifactAsync(
+        artifacts.ERC1155Mintable,
+        provider,
+        txDefaults,
+        artifacts,
+    );
+
     const contractAddresses = {
         erc20Proxy: erc20Proxy.address,
         erc721Proxy: erc721Proxy.address,