Merge pull request #1178 from 0xProject/fix/linter-improvements
Add --format stylish to tslint and fix linter errors in contract-wrappers.
This commit is contained in:
		@@ -18,7 +18,7 @@
 | 
				
			|||||||
        "build": "yarn build:all",
 | 
					        "build": "yarn build:all",
 | 
				
			||||||
        "build:ci": "yarn build:commonjs",
 | 
					        "build:ci": "yarn build:commonjs",
 | 
				
			||||||
        "build:all": "run-p build:umd:prod build:commonjs",
 | 
					        "build:all": "run-p build:umd:prod build:commonjs",
 | 
				
			||||||
        "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test:circleci": "run-s test:coverage",
 | 
					        "test:circleci": "run-s test:coverage",
 | 
				
			||||||
        "rebuild_and_test": "run-s build test",
 | 
					        "rebuild_and_test": "run-s build test",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "yarn pre_build && tsc -b",
 | 
					        "build": "yarn pre_build && tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "pre_build": "yarn generate_contract_wrappers",
 | 
					        "pre_build": "yarn generate_contract_wrappers",
 | 
				
			||||||
        "clean": "shx rm -rf lib wrappers",
 | 
					        "clean": "shx rm -rf lib wrappers",
 | 
				
			||||||
        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
 | 
					        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
    "main": "lib/src/index.js",
 | 
					    "main": "lib/src/index.js",
 | 
				
			||||||
    "types": "lib/src/index.d.ts",
 | 
					    "types": "lib/src/index.d.ts",
 | 
				
			||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib test_temp",
 | 
					        "clean": "shx rm -rf lib test_temp",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
 | 
					        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "yarn tsc -b",
 | 
					        "build": "yarn tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
 | 
					        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
					        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
				
			||||||
        "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*"
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "license": "Apache-2.0",
 | 
					    "license": "Apache-2.0",
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib test_temp generated_docs",
 | 
					        "clean": "shx rm -rf lib test_temp generated_docs",
 | 
				
			||||||
        "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
 | 
					        "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
 | 
					        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit",
 | 
				
			||||||
        "test": "run-s copy_test_fixtures run_mocha",
 | 
					        "test": "run-s copy_test_fixtures run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,13 @@
 | 
				
			|||||||
[
 | 
					[
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        "version": "3.0.1",
 | 
				
			||||||
 | 
					        "changes": [
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                "note": "Fix bug in `ForwarderWrapper` where `feeRecipientAddress` was not correctly normalized.",
 | 
				
			||||||
 | 
					                "pr": 1178
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        ]
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        "version": "3.0.0",
 | 
					        "version": "3.0.0",
 | 
				
			||||||
        "changes": [
 | 
					        "changes": [
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*",
 | 
					        "lint": "tslint --format stylish --project . --exclude **/lib/**/*",
 | 
				
			||||||
        "test:circleci": "run-s test:coverage",
 | 
					        "test:circleci": "run-s test:coverage",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s build test",
 | 
					        "rebuild_and_test": "run-s build test",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,10 +28,10 @@ export abstract class ContractWrapper {
 | 
				
			|||||||
    protected _networkId: number;
 | 
					    protected _networkId: number;
 | 
				
			||||||
    protected _web3Wrapper: Web3Wrapper;
 | 
					    protected _web3Wrapper: Web3Wrapper;
 | 
				
			||||||
    private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined;
 | 
					    private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined;
 | 
				
			||||||
    private _blockPollingIntervalMs: number;
 | 
					    private readonly _blockPollingIntervalMs: number;
 | 
				
			||||||
    private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
 | 
					    private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
 | 
				
			||||||
    private _filters: { [filterToken: string]: FilterObject };
 | 
					    private readonly _filters: { [filterToken: string]: FilterObject };
 | 
				
			||||||
    private _filterCallbacks: {
 | 
					    private readonly _filterCallbacks: {
 | 
				
			||||||
        [filterToken: string]: EventCallback<ContractEventArgs>;
 | 
					        [filterToken: string]: EventCallback<ContractEventArgs>;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    private _onLogAddedSubscriptionToken: string | undefined;
 | 
					    private _onLogAddedSubscriptionToken: string | undefined;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,6 +34,9 @@ export class ERC20ProxyWrapper extends ContractWrapper {
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    public async getProxyIdAsync(): Promise<AssetProxyId> {
 | 
					    public async getProxyIdAsync(): Promise<AssetProxyId> {
 | 
				
			||||||
        const ERC20ProxyContractInstance = this._getERC20ProxyContract();
 | 
					        const ERC20ProxyContractInstance = this._getERC20ProxyContract();
 | 
				
			||||||
 | 
					        // Note(albrow): Below is a TSLint false positive. Code won't compile if
 | 
				
			||||||
 | 
					        // you remove the type assertion.
 | 
				
			||||||
 | 
					        /* tslint:disable-next-line:no-unnecessary-type-assertion */
 | 
				
			||||||
        const proxyId = (await ERC20ProxyContractInstance.getProxyId.callAsync()) as AssetProxyId;
 | 
					        const proxyId = (await ERC20ProxyContractInstance.getProxyId.callAsync()) as AssetProxyId;
 | 
				
			||||||
        return proxyId;
 | 
					        return proxyId;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,12 +18,11 @@ import {
 | 
				
			|||||||
} from '../types';
 | 
					} from '../types';
 | 
				
			||||||
import { assert } from '../utils/assert';
 | 
					import { assert } from '../utils/assert';
 | 
				
			||||||
import { constants } from '../utils/constants';
 | 
					import { constants } from '../utils/constants';
 | 
				
			||||||
 | 
					import { utils } from '../utils/utils';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { ContractWrapper } from './contract_wrapper';
 | 
					import { ContractWrapper } from './contract_wrapper';
 | 
				
			||||||
import { ERC20ProxyWrapper } from './erc20_proxy_wrapper';
 | 
					import { ERC20ProxyWrapper } from './erc20_proxy_wrapper';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const removeUndefinedProperties = _.pickBy;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class includes all the functionality related to interacting with ERC20 token contracts.
 | 
					 * This class includes all the functionality related to interacting with ERC20 token contracts.
 | 
				
			||||||
 * All ERC20 method calls are supported, along with some convenience methods for getting/setting allowances
 | 
					 * All ERC20 method calls are supported, along with some convenience methods for getting/setting allowances
 | 
				
			||||||
@@ -32,8 +31,8 @@ const removeUndefinedProperties = _.pickBy;
 | 
				
			|||||||
export class ERC20TokenWrapper extends ContractWrapper {
 | 
					export class ERC20TokenWrapper extends ContractWrapper {
 | 
				
			||||||
    public abi: ContractAbi = ERC20Token.compilerOutput.abi;
 | 
					    public abi: ContractAbi = ERC20Token.compilerOutput.abi;
 | 
				
			||||||
    public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
 | 
					    public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
 | 
				
			||||||
    private _tokenContractsByAddress: { [address: string]: ERC20TokenContract };
 | 
					    private readonly _tokenContractsByAddress: { [address: string]: ERC20TokenContract };
 | 
				
			||||||
    private _erc20ProxyWrapper: ERC20ProxyWrapper;
 | 
					    private readonly _erc20ProxyWrapper: ERC20ProxyWrapper;
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Instantiate ERC20TokenWrapper
 | 
					     * Instantiate ERC20TokenWrapper
 | 
				
			||||||
     * @param web3Wrapper Web3Wrapper instance to use
 | 
					     * @param web3Wrapper Web3Wrapper instance to use
 | 
				
			||||||
@@ -108,7 +107,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
        const txHash = await tokenContract.approve.sendTransactionAsync(
 | 
					        const txHash = await tokenContract.approve.sendTransactionAsync(
 | 
				
			||||||
            normalizedSpenderAddress,
 | 
					            normalizedSpenderAddress,
 | 
				
			||||||
            amountInBaseUnits,
 | 
					            amountInBaseUnits,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                from: normalizedOwnerAddress,
 | 
					                from: normalizedOwnerAddress,
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
@@ -278,7 +277,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
        const txHash = await tokenContract.transfer.sendTransactionAsync(
 | 
					        const txHash = await tokenContract.transfer.sendTransactionAsync(
 | 
				
			||||||
            normalizedToAddress,
 | 
					            normalizedToAddress,
 | 
				
			||||||
            amountInBaseUnits,
 | 
					            amountInBaseUnits,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                from: normalizedFromAddress,
 | 
					                from: normalizedFromAddress,
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
@@ -339,7 +338,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
            normalizedFromAddress,
 | 
					            normalizedFromAddress,
 | 
				
			||||||
            normalizedToAddress,
 | 
					            normalizedToAddress,
 | 
				
			||||||
            amountInBaseUnits,
 | 
					            amountInBaseUnits,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                from: normalizedSenderAddress,
 | 
					                from: normalizedSenderAddress,
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,6 +34,9 @@ export class ERC721ProxyWrapper extends ContractWrapper {
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    public async getProxyIdAsync(): Promise<AssetProxyId> {
 | 
					    public async getProxyIdAsync(): Promise<AssetProxyId> {
 | 
				
			||||||
        const ERC721ProxyContractInstance = await this._getERC721ProxyContract();
 | 
					        const ERC721ProxyContractInstance = await this._getERC721ProxyContract();
 | 
				
			||||||
 | 
					        // Note(albrow): Below is a TSLint false positive. Code won't compile if
 | 
				
			||||||
 | 
					        // you remove the type assertion.
 | 
				
			||||||
 | 
					        /* tslint:disable-next-line:no-unnecessary-type-assertion */
 | 
				
			||||||
        const proxyId = (await ERC721ProxyContractInstance.getProxyId.callAsync()) as AssetProxyId;
 | 
					        const proxyId = (await ERC721ProxyContractInstance.getProxyId.callAsync()) as AssetProxyId;
 | 
				
			||||||
        return proxyId;
 | 
					        return proxyId;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,12 +18,11 @@ import {
 | 
				
			|||||||
} from '../types';
 | 
					} from '../types';
 | 
				
			||||||
import { assert } from '../utils/assert';
 | 
					import { assert } from '../utils/assert';
 | 
				
			||||||
import { constants } from '../utils/constants';
 | 
					import { constants } from '../utils/constants';
 | 
				
			||||||
 | 
					import { utils } from '../utils/utils';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { ContractWrapper } from './contract_wrapper';
 | 
					import { ContractWrapper } from './contract_wrapper';
 | 
				
			||||||
import { ERC721ProxyWrapper } from './erc721_proxy_wrapper';
 | 
					import { ERC721ProxyWrapper } from './erc721_proxy_wrapper';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const removeUndefinedProperties = _.pickBy;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class includes all the functionality related to interacting with ERC721 token contracts.
 | 
					 * This class includes all the functionality related to interacting with ERC721 token contracts.
 | 
				
			||||||
 * All ERC721 method calls are supported, along with some convenience methods for getting/setting allowances
 | 
					 * All ERC721 method calls are supported, along with some convenience methods for getting/setting allowances
 | 
				
			||||||
@@ -31,8 +30,8 @@ const removeUndefinedProperties = _.pickBy;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
export class ERC721TokenWrapper extends ContractWrapper {
 | 
					export class ERC721TokenWrapper extends ContractWrapper {
 | 
				
			||||||
    public abi: ContractAbi = ERC721Token.compilerOutput.abi;
 | 
					    public abi: ContractAbi = ERC721Token.compilerOutput.abi;
 | 
				
			||||||
    private _tokenContractsByAddress: { [address: string]: ERC721TokenContract };
 | 
					    private readonly _tokenContractsByAddress: { [address: string]: ERC721TokenContract };
 | 
				
			||||||
    private _erc721ProxyWrapper: ERC721ProxyWrapper;
 | 
					    private readonly _erc721ProxyWrapper: ERC721ProxyWrapper;
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Instantiate ERC721TokenWrapper
 | 
					     * Instantiate ERC721TokenWrapper
 | 
				
			||||||
     * @param web3Wrapper Web3Wrapper instance to use
 | 
					     * @param web3Wrapper Web3Wrapper instance to use
 | 
				
			||||||
@@ -235,7 +234,7 @@ export class ERC721TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
        const txHash = await tokenContract.setApprovalForAll.sendTransactionAsync(
 | 
					        const txHash = await tokenContract.setApprovalForAll.sendTransactionAsync(
 | 
				
			||||||
            normalizedOperatorAddress,
 | 
					            normalizedOperatorAddress,
 | 
				
			||||||
            isApproved,
 | 
					            isApproved,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
                from: normalizedOwnerAddress,
 | 
					                from: normalizedOwnerAddress,
 | 
				
			||||||
@@ -295,7 +294,7 @@ export class ERC721TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
        const txHash = await tokenContract.approve.sendTransactionAsync(
 | 
					        const txHash = await tokenContract.approve.sendTransactionAsync(
 | 
				
			||||||
            normalizedApprovedAddress,
 | 
					            normalizedApprovedAddress,
 | 
				
			||||||
            tokenId,
 | 
					            tokenId,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
                from: tokenOwnerAddress,
 | 
					                from: tokenOwnerAddress,
 | 
				
			||||||
@@ -366,7 +365,7 @@ export class ERC721TokenWrapper extends ContractWrapper {
 | 
				
			|||||||
            ownerAddress,
 | 
					            ownerAddress,
 | 
				
			||||||
            normalizedReceiverAddress,
 | 
					            normalizedReceiverAddress,
 | 
				
			||||||
            tokenId,
 | 
					            tokenId,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
                from: normalizedSenderAddress,
 | 
					                from: normalizedSenderAddress,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,22 +8,21 @@ import * as _ from 'lodash';
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import { BlockRange, ContractWrappersError, EventCallback, IndexedFilterValues, TransactionOpts } from '../types';
 | 
					import { BlockRange, ContractWrappersError, EventCallback, IndexedFilterValues, TransactionOpts } from '../types';
 | 
				
			||||||
import { assert } from '../utils/assert';
 | 
					import { assert } from '../utils/assert';
 | 
				
			||||||
 | 
					import { utils } from '../utils/utils';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { ContractWrapper } from './contract_wrapper';
 | 
					import { ContractWrapper } from './contract_wrapper';
 | 
				
			||||||
import { ERC20TokenWrapper } from './erc20_token_wrapper';
 | 
					import { ERC20TokenWrapper } from './erc20_token_wrapper';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const removeUndefinedProperties = _.pickBy;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * This class includes all the functionality related to interacting with a wrapped Ether ERC20 token contract.
 | 
					 * This class includes all the functionality related to interacting with a wrapped Ether ERC20 token contract.
 | 
				
			||||||
 * The caller can convert ETH into the equivalent number of wrapped ETH ERC20 tokens and back.
 | 
					 * The caller can convert ETH into the equivalent number of wrapped ETH ERC20 tokens and back.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
export class EtherTokenWrapper extends ContractWrapper {
 | 
					export class EtherTokenWrapper extends ContractWrapper {
 | 
				
			||||||
    public abi: ContractAbi = WETH9.compilerOutput.abi;
 | 
					    public abi: ContractAbi = WETH9.compilerOutput.abi;
 | 
				
			||||||
    private _etherTokenContractsByAddress: {
 | 
					    private readonly _etherTokenContractsByAddress: {
 | 
				
			||||||
        [address: string]: WETH9Contract;
 | 
					        [address: string]: WETH9Contract;
 | 
				
			||||||
    } = {};
 | 
					    } = {};
 | 
				
			||||||
    private _erc20TokenWrapper: ERC20TokenWrapper;
 | 
					    private readonly _erc20TokenWrapper: ERC20TokenWrapper;
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Instantiate EtherTokenWrapper.
 | 
					     * Instantiate EtherTokenWrapper.
 | 
				
			||||||
     * @param web3Wrapper Web3Wrapper instance to use
 | 
					     * @param web3Wrapper Web3Wrapper instance to use
 | 
				
			||||||
@@ -67,7 +66,7 @@ export class EtherTokenWrapper extends ContractWrapper {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
 | 
					        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
 | 
				
			||||||
        const txHash = await wethContract.deposit.sendTransactionAsync(
 | 
					        const txHash = await wethContract.deposit.sendTransactionAsync(
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                from: normalizedDepositorAddress,
 | 
					                from: normalizedDepositorAddress,
 | 
				
			||||||
                value: amountInWei,
 | 
					                value: amountInWei,
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
@@ -109,7 +108,7 @@ export class EtherTokenWrapper extends ContractWrapper {
 | 
				
			|||||||
        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
 | 
					        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
 | 
				
			||||||
        const txHash = await wethContract.withdraw.sendTransactionAsync(
 | 
					        const txHash = await wethContract.withdraw.sendTransactionAsync(
 | 
				
			||||||
            amountInWei,
 | 
					            amountInWei,
 | 
				
			||||||
            removeUndefinedProperties({
 | 
					            utils.removeUndefinedProperties({
 | 
				
			||||||
                from: normalizedWithdrawerAddress,
 | 
					                from: normalizedWithdrawerAddress,
 | 
				
			||||||
                gas: txOpts.gasLimit,
 | 
					                gas: txOpts.gasLimit,
 | 
				
			||||||
                gasPrice: txOpts.gasPrice,
 | 
					                gasPrice: txOpts.gasPrice,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,8 +46,8 @@ export class ExchangeWrapper extends ContractWrapper {
 | 
				
			|||||||
    public address: string;
 | 
					    public address: string;
 | 
				
			||||||
    public zrxTokenAddress: string;
 | 
					    public zrxTokenAddress: string;
 | 
				
			||||||
    private _exchangeContractIfExists?: ExchangeContract;
 | 
					    private _exchangeContractIfExists?: ExchangeContract;
 | 
				
			||||||
    private _erc721TokenWrapper: ERC721TokenWrapper;
 | 
					    private readonly _erc721TokenWrapper: ERC721TokenWrapper;
 | 
				
			||||||
    private _erc20TokenWrapper: ERC20TokenWrapper;
 | 
					    private readonly _erc20TokenWrapper: ERC20TokenWrapper;
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Instantiate ExchangeWrapper
 | 
					     * Instantiate ExchangeWrapper
 | 
				
			||||||
     * @param web3Wrapper Web3Wrapper instance to use.
 | 
					     * @param web3Wrapper Web3Wrapper instance to use.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { ForwarderContract } from '@0x/abi-gen-wrappers';
 | 
					import { ForwarderContract } from '@0x/abi-gen-wrappers';
 | 
				
			||||||
import { Forwarder } from '@0x/contract-artifacts';
 | 
					import { Forwarder } from '@0x/contract-artifacts';
 | 
				
			||||||
import { schemas } from '@0x/json-schemas';
 | 
					import { schemas } from '@0x/json-schemas';
 | 
				
			||||||
import { AssetProxyId, SignedOrder } from '@0x/types';
 | 
					import { SignedOrder } from '@0x/types';
 | 
				
			||||||
import { BigNumber } from '@0x/utils';
 | 
					import { BigNumber } from '@0x/utils';
 | 
				
			||||||
import { Web3Wrapper } from '@0x/web3-wrapper';
 | 
					import { Web3Wrapper } from '@0x/web3-wrapper';
 | 
				
			||||||
import { ContractAbi } from 'ethereum-types';
 | 
					import { ContractAbi } from 'ethereum-types';
 | 
				
			||||||
@@ -118,7 +118,7 @@ export class ForwarderWrapper extends ContractWrapper {
 | 
				
			|||||||
                optimizedFeeOrders,
 | 
					                optimizedFeeOrders,
 | 
				
			||||||
                feeSignatures,
 | 
					                feeSignatures,
 | 
				
			||||||
                formattedFeePercentage,
 | 
					                formattedFeePercentage,
 | 
				
			||||||
                feeRecipientAddress,
 | 
					                normalizedFeeRecipientAddress,
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    value: ethAmount,
 | 
					                    value: ethAmount,
 | 
				
			||||||
                    from: normalizedTakerAddress,
 | 
					                    from: normalizedTakerAddress,
 | 
				
			||||||
@@ -207,7 +207,7 @@ export class ForwarderWrapper extends ContractWrapper {
 | 
				
			|||||||
                optimizedFeeOrders,
 | 
					                optimizedFeeOrders,
 | 
				
			||||||
                feeSignatures,
 | 
					                feeSignatures,
 | 
				
			||||||
                formattedFeePercentage,
 | 
					                formattedFeePercentage,
 | 
				
			||||||
                feeRecipientAddress,
 | 
					                normalizedFeeRecipientAddress,
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    value: ethAmount,
 | 
					                    value: ethAmount,
 | 
				
			||||||
                    from: normalizedTakerAddress,
 | 
					                    from: normalizedTakerAddress,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,6 @@
 | 
				
			|||||||
import { BigNumber } from '@0x/utils';
 | 
					import { BigNumber } from '@0x/utils';
 | 
				
			||||||
import { Web3Wrapper } from '@0x/web3-wrapper';
 | 
					import { Web3Wrapper } from '@0x/web3-wrapper';
 | 
				
			||||||
 | 
					import * as _ from 'lodash';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { constants } from './constants';
 | 
					import { constants } from './constants';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -14,4 +15,7 @@ export const utils = {
 | 
				
			|||||||
    numberPercentageToEtherTokenAmountPercentage(percentage: number): BigNumber {
 | 
					    numberPercentageToEtherTokenAmountPercentage(percentage: number): BigNumber {
 | 
				
			||||||
        return Web3Wrapper.toBaseUnitAmount(constants.ONE_AMOUNT, constants.ETHER_TOKEN_DECIMALS).mul(percentage);
 | 
					        return Web3Wrapper.toBaseUnitAmount(constants.ONE_AMOUNT, constants.ETHER_TOKEN_DECIMALS).mul(percentage);
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    removeUndefinedProperties<T extends object>(obj: T): Partial<T> {
 | 
				
			||||||
 | 
					        return _.pickBy(obj);
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@
 | 
				
			|||||||
        "compile": "sol-compiler --contracts-dir contracts",
 | 
					        "compile": "sol-compiler --contracts-dir contracts",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
 | 
					        "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
 | 
				
			||||||
        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
 | 
					        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
 | 
				
			||||||
        "lint": "tslint --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
 | 
					        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
 | 
				
			||||||
        "coverage:report:text": "istanbul report text",
 | 
					        "coverage:report:text": "istanbul report text",
 | 
				
			||||||
        "coverage:report:html": "istanbul report html && open coverage/index.html",
 | 
					        "coverage:report:html": "istanbul report html && open coverage/index.html",
 | 
				
			||||||
        "profiler:report:html": "istanbul report html && open coverage/index.html",
 | 
					        "profiler:report:html": "istanbul report html && open coverage/index.html",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "build:dev": "../../node_modules/.bin/webpack --mode development",
 | 
					        "build:dev": "../../node_modules/.bin/webpack --mode development",
 | 
				
			||||||
        "clean": "shx rm -f public/bundle*",
 | 
					        "clean": "shx rm -f public/bundle*",
 | 
				
			||||||
        "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
 | 
					        "lint": "tslint --format stylish --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
 | 
				
			||||||
        "dev": "webpack-dev-server --mode development --content-base public"
 | 
					        "dev": "webpack-dev-server --mode development --content-base public"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "license": "Apache-2.0",
 | 
					    "license": "Apache-2.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
					        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project ."
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "license": "Apache-2.0",
 | 
					    "license": "Apache-2.0",
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated_docs",
 | 
					        "clean": "shx rm -rf lib generated_docs",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
					        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "config": {
 | 
					    "config": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
        "build": "yarn tsc -b",
 | 
					        "build": "yarn tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib src/generated_contract_wrappers",
 | 
					        "clean": "shx rm -rf lib src/generated_contract_wrappers",
 | 
				
			||||||
        "lint": "tslint --project ."
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "license": "Apache-2.0",
 | 
					    "license": "Apache-2.0",
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@
 | 
				
			|||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "watch_without_deps": "tsc -w",
 | 
					        "watch_without_deps": "tsc -w",
 | 
				
			||||||
        "dev": "webpack-dev-server --mode development",
 | 
					        "dev": "webpack-dev-server --mode development",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "jest",
 | 
					        "test": "jest",
 | 
				
			||||||
        "test:coverage": "jest --coverage",
 | 
					        "test:coverage": "jest --coverage",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project . --exclude **/schemas/**/*",
 | 
					        "lint": "tslint --format stylish --project . --exclude **/schemas/**/*",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@
 | 
				
			|||||||
    "private": true,
 | 
					    "private": true,
 | 
				
			||||||
    "description": "Example solidity project using 0x dev tools",
 | 
					    "description": "Example solidity project using 0x dev tools",
 | 
				
			||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*",
 | 
					        "lint": "tslint --format stylish --project . --exclude **/src/contract_wrappers/**/*",
 | 
				
			||||||
        "build": "yarn pre_build && tsc -b",
 | 
					        "build": "yarn pre_build && tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "pre_build": "run-s compile generate_contract_wrappers copy_artifacts",
 | 
					        "pre_build": "run-s compile generate_contract_wrappers copy_artifacts",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "migrate:v2": "run-s build script:migrate:v2",
 | 
					        "migrate:v2": "run-s build script:migrate:v2",
 | 
				
			||||||
        "script:migrate:v2": "node ./lib/migrate.js --contracts-version 2.0.0"
 | 
					        "script:migrate:v2": "node ./lib/migrate.js --contracts-version 2.0.0"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "test:publish": "run-s build script:publish",
 | 
					        "test:publish": "run-s build script:publish",
 | 
				
			||||||
        "find_unused_deps": "run-s build script:find_unused_deps",
 | 
					        "find_unused_deps": "run-s build script:find_unused_deps",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
					        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated_docs",
 | 
					        "clean": "shx rm -rf lib generated_docs",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
					        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "config": {
 | 
					    "config": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "build": "yarn tsc -b",
 | 
					        "build": "yarn tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test:circleci": "run-s test:coverage",
 | 
					        "test:circleci": "run-s test:coverage",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s build test",
 | 
					        "rebuild_and_test": "run-s build test",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
    "main": "lib/index.js",
 | 
					    "main": "lib/index.js",
 | 
				
			||||||
    "types": "lib/index.d.ts",
 | 
					    "types": "lib/index.d.ts",
 | 
				
			||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib"
 | 
					        "clean": "shx rm -rf lib"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
    "main": "lib/index.js",
 | 
					    "main": "lib/index.js",
 | 
				
			||||||
    "types": "lib/index.d.ts",
 | 
					    "types": "lib/index.d.ts",
 | 
				
			||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "build": "tsc",
 | 
					        "build": "tsc",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "watch_without_deps": "tsc -w",
 | 
					        "watch_without_deps": "tsc -w",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
					        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated_docs",
 | 
					        "clean": "shx rm -rf lib generated_docs",
 | 
				
			||||||
        "migrate": "npm run build; node lib/src/cli.js migrate",
 | 
					        "migrate": "npm run build; node lib/src/cli.js migrate",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test:circleci": "yarn test:coverage",
 | 
					        "test:circleci": "yarn test:coverage",
 | 
				
			||||||
        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
					        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "yarn pre_build && tsc -b",
 | 
					        "build": "yarn pre_build && tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "pre_build": "run-s copy_test_fixtures",
 | 
					        "pre_build": "run-s copy_test_fixtures",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "run-s compile_test run_mocha",
 | 
					        "test": "run-s compile_test run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "test:circleci": "yarn test:coverage",
 | 
					        "test:circleci": "yarn test:coverage",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
					        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
 | 
				
			||||||
        "lint": "tslint --project . --format stylish",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "generate-v1-protocol-docs": "(cd ../contracts/src/1.0.0; node ../../../../node_modules/.bin/sol-doc --contracts-dir . --contracts Exchange/Exchange_v1.sol TokenRegistry/TokenRegistry.sol TokenTransferProxy/TokenTransferProxy_v1.sol) > v1.0.0.json",
 | 
					        "generate-v1-protocol-docs": "(cd ../contracts/src/1.0.0; node ../../../../node_modules/.bin/sol-doc --contracts-dir . --contracts Exchange/Exchange_v1.sol TokenRegistry/TokenRegistry.sol TokenTransferProxy/TokenTransferProxy_v1.sol) > v1.0.0.json",
 | 
				
			||||||
        "generate-v2-protocol-docs": "(cd ../contracts/src/2.0.0; node ../../../../node_modules/.bin/sol-doc --contracts-dir . --contracts Exchange/Exchange.sol AssetProxy/ERC20Proxy.sol AssetProxy/ERC721Proxy.sol OrderValidator/OrderValidator.sol Forwarder/Forwarder.sol  AssetProxyOwner/AssetProxyOwner.sol) > v2.0.0.json",
 | 
					        "generate-v2-protocol-docs": "(cd ../contracts/src/2.0.0; node ../../../../node_modules/.bin/sol-doc --contracts-dir . --contracts Exchange/Exchange.sol AssetProxy/ERC20Proxy.sol AssetProxy/ERC721Proxy.sol OrderValidator/OrderValidator.sol Forwarder/Forwarder.sol  AssetProxyOwner/AssetProxyOwner.sol) > v2.0.0.json",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project ."
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
        "type": "git",
 | 
					        "type": "git",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
    "scripts": {
 | 
					    "scripts": {
 | 
				
			||||||
        "serve": "redoc-cli serve lib/api.json --watch",
 | 
					        "serve": "redoc-cli serve lib/api.json --watch",
 | 
				
			||||||
        "watch_without_deps": "run-p build:watch serve",
 | 
					        "watch_without_deps": "run-p build:watch serve",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "swagger-cli validate lib/api.json",
 | 
					        "test": "swagger-cli validate lib/api.json",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
					        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated_docs",
 | 
					        "clean": "shx rm -rf lib generated_docs",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
 | 
					        "run_mocha_unit": "mocha --require source-map-support/register --require make-promises-safe lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
 | 
				
			||||||
        "run_mocha_integration": "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
 | 
					        "run_mocha_integration": "mocha --require source-map-support/register --require make-promises-safe lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
 | 
				
			||||||
        "test": "npm run test:unit",
 | 
					        "test": "npm run test:unit",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "dev": "node ../../node_modules/gulp/bin/gulp.js run",
 | 
					        "dev": "node ../../node_modules/gulp/bin/gulp.js run",
 | 
				
			||||||
        "start": "node ./server/server.js",
 | 
					        "start": "node ./server/server.js",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "clean": "shx rm -rf server"
 | 
					        "clean": "shx rm -rf server"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "author": "Fabio Berger",
 | 
					    "author": "Fabio Berger",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project ."
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
        "type": "git",
 | 
					        "type": "git",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project ."
 | 
					        "lint": "tslint --format stylish --project ."
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "license": "Apache-2.0",
 | 
					    "license": "Apache-2.0",
 | 
				
			||||||
    "repository": {
 | 
					    "repository": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib",
 | 
					        "clean": "shx rm -rf lib",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "test:circleci": "yarn test:coverage",
 | 
					        "test:circleci": "yarn test:coverage",
 | 
				
			||||||
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
 | 
					        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,7 @@
 | 
				
			|||||||
        "build": "tsc -b",
 | 
					        "build": "tsc -b",
 | 
				
			||||||
        "build:ci": "yarn build",
 | 
					        "build:ci": "yarn build",
 | 
				
			||||||
        "clean": "shx rm -rf lib generated_docs",
 | 
					        "clean": "shx rm -rf lib generated_docs",
 | 
				
			||||||
        "lint": "tslint --project .",
 | 
					        "lint": "tslint --format stylish --project .",
 | 
				
			||||||
        "test": "yarn run_mocha",
 | 
					        "test": "yarn run_mocha",
 | 
				
			||||||
        "rebuild_and_test": "run-s clean build test",
 | 
					        "rebuild_and_test": "run-s clean build test",
 | 
				
			||||||
        "test:circleci": "yarn test:coverage",
 | 
					        "test:circleci": "yarn test:coverage",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
        "build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
 | 
					        "build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
 | 
				
			||||||
        "build:dev": "../../node_modules/.bin/webpack --mode development",
 | 
					        "build:dev": "../../node_modules/.bin/webpack --mode development",
 | 
				
			||||||
        "clean": "shx rm -f public/bundle*",
 | 
					        "clean": "shx rm -f public/bundle*",
 | 
				
			||||||
        "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
 | 
					        "lint": "tslint --format stylish --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
 | 
				
			||||||
        "dev": "webpack-dev-server --mode development --content-base public --https",
 | 
					        "dev": "webpack-dev-server --mode development --content-base public --https",
 | 
				
			||||||
        "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
 | 
					        "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
 | 
				
			||||||
        "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
 | 
					        "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user