From 6943bbcacbd9a1df0cdddb2696a768aec4b3d2c4 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 4 Feb 2019 10:12:49 +0100 Subject: Temp --- .github/autolabeler.yml | 1 + contracts/asset-proxy/compiler.json | 24 +-- contracts/asset-proxy/package.json | 5 +- contracts/asset-proxy/src/artifacts.ts | 29 ++++ contracts/asset-proxy/src/artifacts/index.ts | 19 --- contracts/asset-proxy/src/wrappers.ts | 13 ++ contracts/asset-proxy/src/wrappers/index.ts | 7 - contracts/asset-proxy/test/proxies.ts | 28 ++-- contracts/asset-proxy/test/utils/erc20_wrapper.ts | 6 +- contracts/asset-proxy/test/utils/erc721_wrapper.ts | 6 +- contracts/asset-proxy/tsconfig.json | 25 +-- contracts/erc20/compiler.json | 27 ++-- contracts/erc20/package.json | 5 +- contracts/erc20/src/artifacts.ts | 27 ++++ contracts/erc20/src/artifacts/index.ts | 30 ---- contracts/erc20/src/wrappers.ts | 12 ++ contracts/erc20/src/wrappers/index.ts | 11 -- contracts/erc20/tsconfig.json | 28 ++-- contracts/erc721/compiler.json | 19 +-- contracts/erc721/package.json | 5 +- contracts/erc721/src/artifacts.ts | 19 +++ contracts/erc721/src/artifacts/index.ts | 20 --- contracts/erc721/src/wrappers.ts | 8 + contracts/erc721/src/wrappers/index.ts | 7 - contracts/erc721/tsconfig.json | 20 +-- contracts/exchange-forwarder/compiler.json | 13 +- contracts/exchange-forwarder/package.json | 5 +- contracts/exchange-forwarder/src/artifacts.ts | 15 ++ .../exchange-forwarder/src/artifacts/index.ts | 7 - contracts/exchange-forwarder/src/wrappers.ts | 6 + contracts/exchange-forwarder/src/wrappers/index.ts | 1 - contracts/exchange-forwarder/test/forwarder.ts | 20 ++- .../test/utils/forwarder_wrapper.ts | 10 +- contracts/exchange-forwarder/tsconfig.json | 14 +- contracts/exchange-libs/compiler.json | 21 ++- contracts/exchange-libs/package.json | 5 +- contracts/exchange-libs/src/artifacts.ts | 21 +++ contracts/exchange-libs/src/artifacts/index.ts | 17 -- contracts/exchange-libs/src/wrappers.ts | 9 ++ contracts/exchange-libs/src/wrappers/index.ts | 6 - contracts/exchange-libs/tsconfig.json | 20 ++- contracts/exchange/compiler.json | 49 +++--- contracts/exchange/package.json | 5 +- contracts/exchange/src/artifacts.ts | 57 +++++++ contracts/exchange/src/artifacts/index.ts | 41 ----- contracts/exchange/src/wrappers.ts | 27 ++++ contracts/exchange/src/wrappers/index.ts | 18 --- contracts/exchange/test/core.ts | 31 ++-- contracts/exchange/test/dispatcher.ts | 14 +- contracts/exchange/test/match_orders.ts | 19 ++- contracts/exchange/test/signature_validator.ts | 3 +- contracts/exchange/test/utils/exchange_wrapper.ts | 4 +- .../test/utils/fill_order_combinatorial_utils.ts | 9 +- contracts/exchange/test/wrapper.ts | 17 +- contracts/exchange/tsconfig.json | 50 +++--- contracts/extensions/compiler.json | 19 ++- contracts/extensions/package.json | 5 +- contracts/extensions/src/artifacts.ts | 27 ++++ contracts/extensions/src/artifacts/index.ts | 13 -- contracts/extensions/src/wrappers.ts | 12 ++ contracts/extensions/src/wrappers/index.ts | 4 - .../extensions/test/balance_threshold_filter.ts | 6 +- contracts/extensions/test/dutch_auction.ts | 18 ++- contracts/extensions/test/order_matcher.ts | 47 +++--- contracts/extensions/test/order_validator.ts | 18 ++- .../test/utils/balance_threshold_wrapper.ts | 15 +- .../test/utils/dutch_auction_test_wrapper.ts | 10 +- contracts/extensions/tsconfig.json | 21 +-- contracts/multisig/compiler.json | 16 +- contracts/multisig/package.json | 5 +- contracts/multisig/src/artifacts.ts | 17 ++ contracts/multisig/src/artifacts/index.ts | 15 -- contracts/multisig/src/wrappers.ts | 7 + contracts/multisig/src/wrappers/index.ts | 5 - contracts/multisig/test/asset_proxy_owner.ts | 6 +- .../test/utils/asset_proxy_owner_wrapper.ts | 4 +- contracts/multisig/tsconfig.json | 17 +- contracts/utils/compiler.json | 15 +- contracts/utils/package.json | 5 +- contracts/utils/src/artifacts.ts | 19 +++ contracts/utils/src/artifacts/index.ts | 19 --- contracts/utils/src/wrappers.ts | 8 + contracts/utils/src/wrappers/index.ts | 2 - contracts/utils/tsconfig.json | 20 +-- package.json | 1 + packages/contracts-gen/.npmignore | 6 + packages/contracts-gen/CHANGELOG.json | 1 + packages/contracts-gen/README.md | 76 +++++++++ packages/contracts-gen/bin/contracts-gen.js | 2 + packages/contracts-gen/package.json | 49 ++++++ packages/contracts-gen/src/contracts-gen.ts | 171 +++++++++++++++++++++ packages/contracts-gen/src/index.ts | 6 + packages/contracts-gen/tsconfig.json | 8 + packages/contracts-gen/tslint.json | 3 + packages/monorepo-scripts/package.json | 8 + packages/monorepo-scripts/src/deps_versions.ts | 9 +- packages/monorepo-scripts/src/publish.ts | 6 +- packages/monorepo-scripts/src/test_installation.ts | 4 +- packages/monorepo-scripts/src/types.ts | 17 +- .../src/utils/doc_generate_and_upload_utils.ts | 3 +- packages/monorepo-scripts/src/utils/utils.ts | 14 +- packages/sol-compiler/src/compiler.ts | 11 +- packages/sol-compiler/src/utils/compiler.ts | 5 +- packages/types/src/index.ts | 20 +++ tsconfig.json | 1 + yarn.lock | 44 ++---- 106 files changed, 1110 insertions(+), 685 deletions(-) create mode 100644 contracts/asset-proxy/src/artifacts.ts delete mode 100644 contracts/asset-proxy/src/artifacts/index.ts create mode 100644 contracts/asset-proxy/src/wrappers.ts delete mode 100644 contracts/asset-proxy/src/wrappers/index.ts create mode 100644 contracts/erc20/src/artifacts.ts delete mode 100644 contracts/erc20/src/artifacts/index.ts create mode 100644 contracts/erc20/src/wrappers.ts delete mode 100644 contracts/erc20/src/wrappers/index.ts create mode 100644 contracts/erc721/src/artifacts.ts delete mode 100644 contracts/erc721/src/artifacts/index.ts create mode 100644 contracts/erc721/src/wrappers.ts delete mode 100644 contracts/erc721/src/wrappers/index.ts create mode 100644 contracts/exchange-forwarder/src/artifacts.ts delete mode 100644 contracts/exchange-forwarder/src/artifacts/index.ts create mode 100644 contracts/exchange-forwarder/src/wrappers.ts delete mode 100644 contracts/exchange-forwarder/src/wrappers/index.ts create mode 100644 contracts/exchange-libs/src/artifacts.ts delete mode 100644 contracts/exchange-libs/src/artifacts/index.ts create mode 100644 contracts/exchange-libs/src/wrappers.ts delete mode 100644 contracts/exchange-libs/src/wrappers/index.ts create mode 100644 contracts/exchange/src/artifacts.ts delete mode 100644 contracts/exchange/src/artifacts/index.ts create mode 100644 contracts/exchange/src/wrappers.ts delete mode 100644 contracts/exchange/src/wrappers/index.ts create mode 100644 contracts/extensions/src/artifacts.ts delete mode 100644 contracts/extensions/src/artifacts/index.ts create mode 100644 contracts/extensions/src/wrappers.ts delete mode 100644 contracts/extensions/src/wrappers/index.ts create mode 100644 contracts/multisig/src/artifacts.ts delete mode 100644 contracts/multisig/src/artifacts/index.ts create mode 100644 contracts/multisig/src/wrappers.ts delete mode 100644 contracts/multisig/src/wrappers/index.ts create mode 100644 contracts/utils/src/artifacts.ts delete mode 100644 contracts/utils/src/artifacts/index.ts create mode 100644 contracts/utils/src/wrappers.ts delete mode 100644 contracts/utils/src/wrappers/index.ts create mode 100644 packages/contracts-gen/.npmignore create mode 100644 packages/contracts-gen/CHANGELOG.json create mode 100644 packages/contracts-gen/README.md create mode 100755 packages/contracts-gen/bin/contracts-gen.js create mode 100644 packages/contracts-gen/package.json create mode 100644 packages/contracts-gen/src/contracts-gen.ts create mode 100644 packages/contracts-gen/src/index.ts create mode 100644 packages/contracts-gen/tsconfig.json create mode 100644 packages/contracts-gen/tslint.json diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml index 321ec18a4..fb5b00aa4 100644 --- a/.github/autolabeler.yml +++ b/.github/autolabeler.yml @@ -2,6 +2,7 @@ python: ['python-packages'] contracts: ['contracts'] sol-doc: ['packages/sol-doc'] sol-resolver: ['packages/sol-resolver'] +contracts-gen: ['packages/contracts-gen'] sra-spec: ['packages/sra-spec'] subproviders: ['packages/subproviders'] contract-addresses: ['packages/contract-addresses'] diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index 70d4c6b20..aab143bad 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,12 +17,17 @@ } }, "contracts": [ - "IAssetData", - "IAssetProxy", - "IAuthorizable", - "ERC20Proxy", - "ERC721Proxy", - "MixinAuthorizable", - "MultiAssetProxy" + "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol", + "@0x/contracts-erc20/contracts/test/DummyMultipleReturnERC20Token.sol", + "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol", + "@0x/contracts-erc721/contracts/test/DummyERC721Receiver.sol", + "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol", + "src/ERC20Proxy.sol", + "src/ERC721Proxy.sol", + "src/MixinAuthorizable.sol", + "src/MultiAssetProxy.sol", + "src/interfaces/IAssetData.sol", + "src/interfaces/IAssetProxy.sol", + "src/interfaces/IAuthorizable.sol" ] } diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 360fdab75..ce686b7ef 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json" + "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -48,6 +50,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/asset-proxy/src/artifacts.ts b/contracts/asset-proxy/src/artifacts.ts new file mode 100644 index 000000000..87b80d075 --- /dev/null +++ b/contracts/asset-proxy/src/artifacts.ts @@ -0,0 +1,29 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json'; +import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json'; +import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; +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 MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json'; +import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json'; +export const artifacts = { + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, + DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + ERC20Proxy: ERC20Proxy as ContractArtifact, + ERC721Proxy: ERC721Proxy as ContractArtifact, + MixinAuthorizable: MixinAuthorizable as ContractArtifact, + MultiAssetProxy: MultiAssetProxy as ContractArtifact, + IAssetData: IAssetData as ContractArtifact, + IAssetProxy: IAssetProxy as ContractArtifact, + IAuthorizable: IAuthorizable as ContractArtifact, +}; diff --git a/contracts/asset-proxy/src/artifacts/index.ts b/contracts/asset-proxy/src/artifacts/index.ts deleted file mode 100644 index 7f3060815..000000000 --- a/contracts/asset-proxy/src/artifacts/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json'; -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 MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json'; -import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json'; - -export const artifacts = { - IAuthorizable: IAuthorizable as ContractArtifact, - IAssetData: IAssetData as ContractArtifact, - IAssetProxy: IAssetProxy as ContractArtifact, - ERC20Proxy: ERC20Proxy as ContractArtifact, - ERC721Proxy: ERC721Proxy as ContractArtifact, - MixinAuthorizable: MixinAuthorizable as ContractArtifact, - MultiAssetProxy: MultiAssetProxy as ContractArtifact, -}; diff --git a/contracts/asset-proxy/src/wrappers.ts b/contracts/asset-proxy/src/wrappers.ts new file mode 100644 index 000000000..4bff2f423 --- /dev/null +++ b/contracts/asset-proxy/src/wrappers.ts @@ -0,0 +1,13 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc20_token'; +export * from '../generated-wrappers/dummy_erc721_receiver'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/dummy_multiple_return_erc20_token'; +export * from '../generated-wrappers/dummy_no_return_erc20_token'; +export * from '../generated-wrappers/erc20_proxy'; +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/mixin_authorizable'; +export * from '../generated-wrappers/multi_asset_proxy'; diff --git a/contracts/asset-proxy/src/wrappers/index.ts b/contracts/asset-proxy/src/wrappers/index.ts deleted file mode 100644 index 6aecbc086..000000000 --- a/contracts/asset-proxy/src/wrappers/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from '../../generated-wrappers/i_asset_data'; -export * from '../../generated-wrappers/i_asset_proxy'; -export * from '../../generated-wrappers/erc20_proxy'; -export * from '../../generated-wrappers/erc721_proxy'; -export * from '../../generated-wrappers/mixin_authorizable'; -export * from '../../generated-wrappers/multi_asset_proxy'; -export * from '../../generated-wrappers/i_authorizable'; diff --git a/contracts/asset-proxy/test/proxies.ts b/contracts/asset-proxy/test/proxies.ts index 797787135..c2f9653aa 100644 --- a/contracts/asset-proxy/test/proxies.ts +++ b/contracts/asset-proxy/test/proxies.ts @@ -1,15 +1,3 @@ -import { - artifacts as erc20Artifacts, - DummyERC20TokenContract, - DummyERC20TokenTransferEventArgs, - DummyMultipleReturnERC20TokenContract, - DummyNoReturnERC20TokenContract, -} from '@0x/contracts-erc20'; -import { - artifacts as erc721Artifacts, - DummyERC721ReceiverContract, - DummyERC721TokenContract, -} from '@0x/contracts-erc721'; import { chaiSetup, constants, @@ -30,6 +18,12 @@ import * as _ from 'lodash'; import { artifacts, + DummyERC20TokenContract, + DummyERC20TokenTransferEventArgs, + DummyERC721ReceiverContract, + DummyERC721TokenContract, + DummyMultipleReturnERC20TokenContract, + DummyNoReturnERC20TokenContract, ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, @@ -154,7 +148,7 @@ describe('Asset Transfer Proxies', () => { constants.DUMMY_TOKEN_DECIMALS, ); noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.DummyNoReturnERC20Token, + artifacts.DummyNoReturnERC20Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, @@ -163,7 +157,7 @@ describe('Asset Transfer Proxies', () => { constants.DUMMY_TOKEN_TOTAL_SUPPLY, ); multipleReturnErc20Token = await DummyMultipleReturnERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.DummyMultipleReturnERC20Token, + artifacts.DummyMultipleReturnERC20Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, @@ -204,7 +198,7 @@ describe('Asset Transfer Proxies', () => { // Deploy and configure ERC721 tokens and receiver [erc721TokenA, erc721TokenB] = await erc721Wrapper.deployDummyTokensAsync(); erc721Receiver = await DummyERC721ReceiverContract.deployFrom0xArtifactAsync( - erc721Artifacts.DummyERC721Receiver, + artifacts.DummyERC721Receiver, provider, txDefaults, ); @@ -568,7 +562,7 @@ describe('Asset Transfer Proxies', () => { erc721Receiver.address, amount, ); - const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc721Artifacts }); + const logDecoder = new LogDecoder(web3Wrapper, artifacts); const tx = await logDecoder.getTxWithDecodedLogsAsync( await web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, @@ -760,7 +754,7 @@ describe('Asset Transfer Proxies', () => { inputAmount, ); const erc20Balances = await erc20Wrapper.getBalancesAsync(); - const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts }); + const logDecoder = new LogDecoder(web3Wrapper, artifacts); const tx = await logDecoder.getTxWithDecodedLogsAsync( await web3Wrapper.sendTransactionAsync({ to: multiAssetProxy.address, diff --git a/contracts/asset-proxy/test/utils/erc20_wrapper.ts b/contracts/asset-proxy/test/utils/erc20_wrapper.ts index 12cd06ece..09607e776 100644 --- a/contracts/asset-proxy/test/utils/erc20_wrapper.ts +++ b/contracts/asset-proxy/test/utils/erc20_wrapper.ts @@ -1,4 +1,3 @@ -import { artifacts as tokensArtifacts, DummyERC20TokenContract } from '@0x/contracts-erc20'; import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils'; import { assetDataUtils } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; @@ -6,8 +5,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; -import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy'; -import { artifacts } from '../../src/artifacts'; +import { artifacts, DummyERC20TokenContract, ERC20ProxyContract } from '../../src'; export class ERC20Wrapper { private readonly _tokenOwnerAddresses: string[]; @@ -38,7 +36,7 @@ export class ERC20Wrapper { for (let i = 0; i < numberToDeploy; i++) { this._dummyTokenContracts.push( await DummyERC20TokenContract.deployFrom0xArtifactAsync( - tokensArtifacts.DummyERC20Token, + artifacts.DummyERC20Token, this._provider, txDefaults, constants.DUMMY_TOKEN_NAME, diff --git a/contracts/asset-proxy/test/utils/erc721_wrapper.ts b/contracts/asset-proxy/test/utils/erc721_wrapper.ts index fc43d8c52..92d1398a7 100644 --- a/contracts/asset-proxy/test/utils/erc721_wrapper.ts +++ b/contracts/asset-proxy/test/utils/erc721_wrapper.ts @@ -1,4 +1,3 @@ -import { artifacts as tokensArtifacts, DummyERC721TokenContract } from '@0x/contracts-erc721'; import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils'; import { generatePseudoRandomSalt } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; @@ -6,8 +5,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; -import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy'; -import { artifacts } from '../../src/artifacts'; +import { artifacts, DummyERC721TokenContract, ERC721ProxyContract } from '../../src'; export class ERC721Wrapper { private readonly _tokenOwnerAddresses: string[]; @@ -30,7 +28,7 @@ export class ERC721Wrapper { for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) { this._dummyTokenContracts.push( await DummyERC721TokenContract.deployFrom0xArtifactAsync( - tokensArtifacts.DummyERC721Token, + artifacts.DummyERC721Token, this._provider, txDefaults, constants.DUMMY_TOKEN_NAME, diff --git a/contracts/asset-proxy/tsconfig.json b/contracts/asset-proxy/tsconfig.json index 7baa48cbe..526be2c64 100644 --- a/contracts/asset-proxy/tsconfig.json +++ b/contracts/asset-proxy/tsconfig.json @@ -1,19 +1,20 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/IAssetData.json", - "./generated-artifacts/IAssetProxy.json", - "./generated-artifacts/IAuthorizable.json", - "./generated-artifacts/ERC20Proxy.json", - "./generated-artifacts/ERC721Proxy.json", - "./generated-artifacts/MixinAuthorizable.json", - "./generated-artifacts/MultiAssetProxy.json" + "generated-artifacts/DummyERC20Token.json", + "generated-artifacts/DummyERC721Receiver.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/DummyMultipleReturnERC20Token.json", + "generated-artifacts/DummyNoReturnERC20Token.json", + "generated-artifacts/ERC20Proxy.json", + "generated-artifacts/ERC721Proxy.json", + "generated-artifacts/IAssetData.json", + "generated-artifacts/IAssetProxy.json", + "generated-artifacts/IAuthorizable.json", + "generated-artifacts/MixinAuthorizable.json", + "generated-artifacts/MultiAssetProxy.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 264f6231a..033917d22 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,16 +17,16 @@ } }, "contracts": [ - "DummyERC20Token", - "DummyMultipleReturnERC20Token", - "DummyNoReturnERC20Token", - "ReentrantERC20Token", - "ERC20Token", - "IERC20Token", - "MintableERC20Token", - "UnlimitedAllowanceERC20Token", - "IEtherToken", - "WETH9", - "ZRXToken" + "src/ERC20Token.sol", + "src/MintableERC20Token.sol", + "src/UnlimitedAllowanceERC20Token.sol", + "src/WETH9.sol", + "src/ZRXToken.sol", + "src/interfaces/IERC20Token.sol", + "src/interfaces/IEtherToken.sol", + "test/DummyERC20Token.sol", + "test/DummyMultipleReturnERC20Token.sol", + "test/DummyNoReturnERC20Token.sol", + "test/ReentrantERC20Token.sol" ] } diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 778b9257d..801f2a034 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ReentrantERC20Token|ERC20Token|IERC20Token|MintableERC20Token|UnlimitedAllowanceERC20Token|IEtherToken|WETH9|ZRXToken).json" + "abis": "./generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IEtherToken|MintableERC20Token|ReentrantERC20Token|UnlimitedAllowanceERC20Token|WETH9|ZRXToken).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/erc20/src/artifacts.ts b/contracts/erc20/src/artifacts.ts new file mode 100644 index 000000000..0627b98cf --- /dev/null +++ b/contracts/erc20/src/artifacts.ts @@ -0,0 +1,27 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json'; +import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json'; +import * as ERC20Token from '../generated-artifacts/ERC20Token.json'; +import * as IERC20Token from '../generated-artifacts/IERC20Token.json'; +import * as IEtherToken from '../generated-artifacts/IEtherToken.json'; +import * as MintableERC20Token from '../generated-artifacts/MintableERC20Token.json'; +import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json'; +import * as UnlimitedAllowanceERC20Token from '../generated-artifacts/UnlimitedAllowanceERC20Token.json'; +import * as WETH9 from '../generated-artifacts/WETH9.json'; +import * as ZRXToken from '../generated-artifacts/ZRXToken.json'; +export const artifacts = { + ERC20Token: ERC20Token as ContractArtifact, + MintableERC20Token: MintableERC20Token as ContractArtifact, + UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact, + WETH9: WETH9 as ContractArtifact, + ZRXToken: (ZRXToken as any) as ContractArtifact, + IERC20Token: IERC20Token as ContractArtifact, + IEtherToken: IEtherToken as ContractArtifact, + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, + DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, +}; diff --git a/contracts/erc20/src/artifacts/index.ts b/contracts/erc20/src/artifacts/index.ts deleted file mode 100644 index ce1ae06ac..000000000 --- a/contracts/erc20/src/artifacts/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as DummyERC20Token from '../../generated-artifacts/DummyERC20Token.json'; -import * as DummyMultipleReturnERC20Token from '../../generated-artifacts/DummyMultipleReturnERC20Token.json'; -import * as DummyNoReturnERC20Token from '../../generated-artifacts/DummyNoReturnERC20Token.json'; -import * as ERC20Token from '../../generated-artifacts/ERC20Token.json'; -import * as IERC20Token from '../../generated-artifacts/IERC20Token.json'; -import * as IEtherToken from '../../generated-artifacts/IEtherToken.json'; -import * as MintableERC20Token from '../../generated-artifacts/MintableERC20Token.json'; -import * as ReentrantERC20Token from '../../generated-artifacts/ReentrantERC20Token.json'; -import * as UnlimitedAllowanceERC20Token from '../../generated-artifacts/UnlimitedAllowanceERC20Token.json'; -import * as WETH9 from '../../generated-artifacts/WETH9.json'; -import * as ZRXToken from '../../generated-artifacts/ZRXToken.json'; - -// tslint:disable:no-unnecessary-type-assertion -export const artifacts = { - DummyERC20Token: DummyERC20Token as ContractArtifact, - DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, - DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, - ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, - ERC20Token: ERC20Token as ContractArtifact, - IERC20Token: IERC20Token as ContractArtifact, - MintableERC20Token: MintableERC20Token as ContractArtifact, - UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact, - IEtherToken: IEtherToken as ContractArtifact, - WETH9: WETH9 as ContractArtifact, - // Note(albrow): "as any" hack still required here because ZRXToken does not - // conform to the v2 artifact type. - ZRXToken: (ZRXToken as any) as ContractArtifact, -}; diff --git a/contracts/erc20/src/wrappers.ts b/contracts/erc20/src/wrappers.ts new file mode 100644 index 000000000..b66c3b1ca --- /dev/null +++ b/contracts/erc20/src/wrappers.ts @@ -0,0 +1,12 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc20_token'; +export * from '../generated-wrappers/dummy_multiple_return_erc20_token'; +export * from '../generated-wrappers/dummy_no_return_erc20_token'; +export * from '../generated-wrappers/erc20_token'; +export * from '../generated-wrappers/i_erc20_token'; +export * from '../generated-wrappers/i_ether_token'; +export * from '../generated-wrappers/mintable_erc20_token'; +export * from '../generated-wrappers/reentrant_erc20_token'; +export * from '../generated-wrappers/unlimited_allowance_erc20_token'; +export * from '../generated-wrappers/weth9'; +export * from '../generated-wrappers/zrx_token'; diff --git a/contracts/erc20/src/wrappers/index.ts b/contracts/erc20/src/wrappers/index.ts deleted file mode 100644 index b4e4ef969..000000000 --- a/contracts/erc20/src/wrappers/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from '../../generated-wrappers/zrx_token'; -export * from '../../generated-wrappers/weth9'; -export * from '../../generated-wrappers/unlimited_allowance_erc20_token'; -export * from '../../generated-wrappers/reentrant_erc20_token'; -export * from '../../generated-wrappers/mintable_erc20_token'; -export * from '../../generated-wrappers/i_ether_token'; -export * from '../../generated-wrappers/i_erc20_token'; -export * from '../../generated-wrappers/erc20_token'; -export * from '../../generated-wrappers/dummy_no_return_erc20_token'; -export * from '../../generated-wrappers/dummy_multiple_return_erc20_token'; -export * from '../../generated-wrappers/dummy_erc20_token'; diff --git a/contracts/erc20/tsconfig.json b/contracts/erc20/tsconfig.json index 4df7424be..74419260a 100644 --- a/contracts/erc20/tsconfig.json +++ b/contracts/erc20/tsconfig.json @@ -1,23 +1,19 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/DummyERC20Token.json", - "./generated-artifacts/DummyMultipleReturnERC20Token.json", - "./generated-artifacts/DummyNoReturnERC20Token.json", - "./generated-artifacts/ReentrantERC20Token.json", - "./generated-artifacts/ERC20Token.json", - "./generated-artifacts/IERC20Token.json", - "./generated-artifacts/MintableERC20Token.json", - "./generated-artifacts/UnlimitedAllowanceERC20Token.json", - "./generated-artifacts/IEtherToken.json", - "./generated-artifacts/WETH9.json", - "./generated-artifacts/ZRXToken.json" + "generated-artifacts/DummyERC20Token.json", + "generated-artifacts/DummyMultipleReturnERC20Token.json", + "generated-artifacts/DummyNoReturnERC20Token.json", + "generated-artifacts/ERC20Token.json", + "generated-artifacts/IERC20Token.json", + "generated-artifacts/IEtherToken.json", + "generated-artifacts/MintableERC20Token.json", + "generated-artifacts/ReentrantERC20Token.json", + "generated-artifacts/UnlimitedAllowanceERC20Token.json", + "generated-artifacts/WETH9.json", + "generated-artifacts/ZRXToken.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index db8589016..09d79ba28 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,12 +17,12 @@ } }, "contracts": [ - "DummyERC721Receiver", - "InvalidERC721Receiver", - "DummyERC721Token", - "ERC721Token", - "IERC721Receiver", - "IERC721Token", - "MintableERC721Token" + "src/ERC721Token.sol", + "src/MintableERC721Token.sol", + "src/interfaces/IERC721Receiver.sol", + "src/interfaces/IERC721Token.sol", + "test/DummyERC721Receiver.sol", + "test/DummyERC721Token.sol", + "test/InvalidERC721Receiver.sol" ] } diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 096e1025e..54f261a80 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(DummyERC721Receiver|InvalidERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|MintableERC721Token).json" + "abis": "./generated-artifacts/@(DummyERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|InvalidERC721Receiver|MintableERC721Token).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/erc721/src/artifacts.ts b/contracts/erc721/src/artifacts.ts new file mode 100644 index 000000000..daa29a83c --- /dev/null +++ b/contracts/erc721/src/artifacts.ts @@ -0,0 +1,19 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as ERC721Token from '../generated-artifacts/ERC721Token.json'; +import * as IERC721Receiver from '../generated-artifacts/IERC721Receiver.json'; +import * as IERC721Token from '../generated-artifacts/IERC721Token.json'; +import * as InvalidERC721Receiver from '../generated-artifacts/InvalidERC721Receiver.json'; +import * as MintableERC721Token from '../generated-artifacts/MintableERC721Token.json'; +export const artifacts = { + ERC721Token: ERC721Token as ContractArtifact, + MintableERC721Token: MintableERC721Token as ContractArtifact, + IERC721Receiver: IERC721Receiver as ContractArtifact, + IERC721Token: IERC721Token as ContractArtifact, + DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, +}; diff --git a/contracts/erc721/src/artifacts/index.ts b/contracts/erc721/src/artifacts/index.ts deleted file mode 100644 index 8d5ec8a46..000000000 --- a/contracts/erc721/src/artifacts/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as DummyERC721Receiver from '../../generated-artifacts/DummyERC721Receiver.json'; -import * as DummyERC721Token from '../../generated-artifacts/DummyERC721Token.json'; -import * as ERC721Token from '../../generated-artifacts/ERC721Token.json'; -import * as IERC721Receiver from '../../generated-artifacts/IERC721Receiver.json'; -import * as IERC721Token from '../../generated-artifacts/IERC721Token.json'; -import * as InvalidERC721Receiver from '../../generated-artifacts/InvalidERC721Receiver.json'; -import * as MintableERC721Token from '../../generated-artifacts/MintableERC721Token.json'; - -// tslint:disable:no-unnecessary-type-assertion -export const artifacts = { - DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, - InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, - DummyERC721Token: DummyERC721Token as ContractArtifact, - ERC721Token: ERC721Token as ContractArtifact, - IERC721Receiver: IERC721Receiver as ContractArtifact, - IERC721Token: IERC721Token as ContractArtifact, - MintableERC721Token: MintableERC721Token as ContractArtifact, -}; diff --git a/contracts/erc721/src/wrappers.ts b/contracts/erc721/src/wrappers.ts new file mode 100644 index 000000000..909e05868 --- /dev/null +++ b/contracts/erc721/src/wrappers.ts @@ -0,0 +1,8 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc721_receiver'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/erc721_token'; +export * from '../generated-wrappers/i_erc721_receiver'; +export * from '../generated-wrappers/i_erc721_token'; +export * from '../generated-wrappers/invalid_erc721_receiver'; +export * from '../generated-wrappers/mintable_erc721_token'; diff --git a/contracts/erc721/src/wrappers/index.ts b/contracts/erc721/src/wrappers/index.ts deleted file mode 100644 index ba6c51885..000000000 --- a/contracts/erc721/src/wrappers/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from '../../generated-wrappers/mintable_erc721_token'; -export * from '../../generated-wrappers/invalid_erc721_receiver'; -export * from '../../generated-wrappers/i_erc721_token'; -export * from '../../generated-wrappers/i_erc721_receiver'; -export * from '../../generated-wrappers/erc721_token'; -export * from '../../generated-wrappers/dummy_erc721_token'; -export * from '../../generated-wrappers/dummy_erc721_receiver'; diff --git a/contracts/erc721/tsconfig.json b/contracts/erc721/tsconfig.json index 098c3a7f3..3b218affe 100644 --- a/contracts/erc721/tsconfig.json +++ b/contracts/erc721/tsconfig.json @@ -1,19 +1,15 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/DummyERC721Receiver.json", - "./generated-artifacts/InvalidERC721Receiver.json", - "./generated-artifacts/DummyERC721Token.json", - "./generated-artifacts/ERC721Token.json", - "./generated-artifacts/IERC721Receiver.json", - "./generated-artifacts/IERC721Token.json", - "./generated-artifacts/MintableERC721Token.json" + "generated-artifacts/DummyERC721Receiver.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/ERC721Token.json", + "generated-artifacts/IERC721Receiver.json", + "generated-artifacts/IERC721Token.json", + "generated-artifacts/InvalidERC721Receiver.json", + "generated-artifacts/MintableERC721Token.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index e93eb4bdd..051e81de5 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -19,5 +16,11 @@ } } }, - "contracts": ["Forwarder"] + "contracts": [ + "@0x/contracts-erc20/contracts/src/WETH9.sol", + "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol", + "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol", + "@0x/contracts-exchange/contracts/src/Exchange.sol", + "src/Forwarder.sol" + ] } diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 73a30e851..388980177 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(Forwarder).json" + "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|Exchange|Forwarder|WETH9).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -50,6 +52,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/exchange-forwarder/src/artifacts.ts b/contracts/exchange-forwarder/src/artifacts.ts new file mode 100644 index 000000000..39295b797 --- /dev/null +++ b/contracts/exchange-forwarder/src/artifacts.ts @@ -0,0 +1,15 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as Exchange from '../generated-artifacts/Exchange.json'; +import * as Forwarder from '../generated-artifacts/Forwarder.json'; +import * as WETH9 from '../generated-artifacts/WETH9.json'; +export const artifacts = { + WETH9: WETH9 as ContractArtifact, + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + Exchange: Exchange as ContractArtifact, + Forwarder: Forwarder as ContractArtifact, +}; diff --git a/contracts/exchange-forwarder/src/artifacts/index.ts b/contracts/exchange-forwarder/src/artifacts/index.ts deleted file mode 100644 index f15dac49a..000000000 --- a/contracts/exchange-forwarder/src/artifacts/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as Forwarder from '../../generated-artifacts/Forwarder.json'; - -export const artifacts = { - Forwarder: Forwarder as ContractArtifact, -}; diff --git a/contracts/exchange-forwarder/src/wrappers.ts b/contracts/exchange-forwarder/src/wrappers.ts new file mode 100644 index 000000000..a023f878c --- /dev/null +++ b/contracts/exchange-forwarder/src/wrappers.ts @@ -0,0 +1,6 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc20_token'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/exchange'; +export * from '../generated-wrappers/forwarder'; +export * from '../generated-wrappers/weth9'; diff --git a/contracts/exchange-forwarder/src/wrappers/index.ts b/contracts/exchange-forwarder/src/wrappers/index.ts deleted file mode 100644 index 89dff9e74..000000000 --- a/contracts/exchange-forwarder/src/wrappers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../../generated-wrappers/forwarder'; diff --git a/contracts/exchange-forwarder/test/forwarder.ts b/contracts/exchange-forwarder/test/forwarder.ts index 24c219563..5acf113dd 100644 --- a/contracts/exchange-forwarder/test/forwarder.ts +++ b/contracts/exchange-forwarder/test/forwarder.ts @@ -1,7 +1,5 @@ import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange'; +import { ExchangeWrapper } from '@0x/contracts-exchange'; import { chaiSetup, constants, @@ -23,7 +21,15 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; -import { artifacts, ForwarderContract, ForwarderWrapper } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ExchangeContract, + ForwarderContract, + ForwarderWrapper, + WETH9Contract, +} from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -88,14 +94,14 @@ describe(ContractName.Forwarder, () => { const erc721Balances = await erc721Wrapper.getBalancesAsync(); erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address]; - wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults); + wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults); weth = new DummyERC20TokenContract(wethContract.abi, wethContract.address, provider); erc20Wrapper.addDummyTokenContract(weth); wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address); zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, zrxAssetData, @@ -166,7 +172,7 @@ describe(ContractName.Forwarder, () => { describe('constructor', () => { it('should revert if assetProxy is unregistered', async () => { const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts b/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts index 207106852..4f9f6110a 100644 --- a/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts +++ b/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts @@ -1,6 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; -import { artifacts as erc721Artifacts } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange'; import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils'; import { SignedOrder } from '@0x/types'; import { BigNumber } from '@0x/utils'; @@ -61,12 +58,7 @@ export class ForwarderWrapper { constructor(contractInstance: ForwarderContract, provider: Provider) { this._forwarderContract = contractInstance; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { - ...artifacts, - ...erc20Artifacts, - ...erc721Artifacts, - ...exchangeArtifacts, - }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } public async marketSellOrdersWithEthAsync( orders: SignedOrder[], diff --git a/contracts/exchange-forwarder/tsconfig.json b/contracts/exchange-forwarder/tsconfig.json index cd80b5a5f..92c3a0475 100644 --- a/contracts/exchange-forwarder/tsconfig.json +++ b/contracts/exchange-forwarder/tsconfig.json @@ -1,11 +1,13 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], - "files": ["./generated-artifacts/Forwarder.json"], + "files": [ + "generated-artifacts/DummyERC20Token.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/Exchange.json", + "generated-artifacts/Forwarder.json", + "generated-artifacts/WETH9.json" + ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index c4f0c6bd9..2a69896e6 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,13 +17,13 @@ } }, "contracts": [ - "TestLibs", - "LibOrder", - "LibMath", - "LibFillResults", - "LibAbiEncoder", - "LibEIP712", - "LibAssetProxyErrors", - "LibConstants" + "src/LibAbiEncoder.sol", + "src/LibAssetProxyErrors.sol", + "src/LibConstants.sol", + "src/LibEIP712.sol", + "src/LibFillResults.sol", + "src/LibMath.sol", + "src/LibOrder.sol", + "test/TestLibs.sol" ] } diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index f3efdd00e..a2279af91 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(LibMath|LibOrder|LibFillResults|LibAbiEncoder|TestLibs|LibEIP712).json" + "abis": "./generated-artifacts/@(LibAbiEncoder|LibAssetProxyErrors|LibConstants|LibEIP712|LibFillResults|LibMath|LibOrder|TestLibs).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/exchange-libs/src/artifacts.ts b/contracts/exchange-libs/src/artifacts.ts new file mode 100644 index 000000000..5e660e1a8 --- /dev/null +++ b/contracts/exchange-libs/src/artifacts.ts @@ -0,0 +1,21 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as LibAbiEncoder from '../generated-artifacts/LibAbiEncoder.json'; +import * as LibAssetProxyErrors from '../generated-artifacts/LibAssetProxyErrors.json'; +import * as LibConstants from '../generated-artifacts/LibConstants.json'; +import * as LibEIP712 from '../generated-artifacts/LibEIP712.json'; +import * as LibFillResults from '../generated-artifacts/LibFillResults.json'; +import * as LibMath from '../generated-artifacts/LibMath.json'; +import * as LibOrder from '../generated-artifacts/LibOrder.json'; +import * as TestLibs from '../generated-artifacts/TestLibs.json'; +export const artifacts = { + LibAbiEncoder: LibAbiEncoder as ContractArtifact, + LibAssetProxyErrors: LibAssetProxyErrors as ContractArtifact, + LibConstants: LibConstants as ContractArtifact, + LibEIP712: LibEIP712 as ContractArtifact, + LibFillResults: LibFillResults as ContractArtifact, + LibMath: LibMath as ContractArtifact, + LibOrder: LibOrder as ContractArtifact, + TestLibs: TestLibs as ContractArtifact, +}; diff --git a/contracts/exchange-libs/src/artifacts/index.ts b/contracts/exchange-libs/src/artifacts/index.ts deleted file mode 100644 index 3955bbe2b..000000000 --- a/contracts/exchange-libs/src/artifacts/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as LibAbiEncoder from '../../generated-artifacts/LibAbiEncoder.json'; -import * as LibEIP721 from '../../generated-artifacts/LibEIP712.json'; -import * as LibFillResults from '../../generated-artifacts/LibFillResults.json'; -import * as LibMath from '../../generated-artifacts/LibMath.json'; -import * as LibOrder from '../../generated-artifacts/LibOrder.json'; -import * as TestLibs from '../../generated-artifacts/TestLibs.json'; - -export const artifacts = { - TestLibs: TestLibs as ContractArtifact, - LibAbiEncoder: LibAbiEncoder as ContractArtifact, - LibFillResults: LibFillResults as ContractArtifact, - LibMath: LibMath as ContractArtifact, - LibOrder: LibOrder as ContractArtifact, - LibEIP721: LibEIP721 as ContractArtifact, -}; diff --git a/contracts/exchange-libs/src/wrappers.ts b/contracts/exchange-libs/src/wrappers.ts new file mode 100644 index 000000000..840886181 --- /dev/null +++ b/contracts/exchange-libs/src/wrappers.ts @@ -0,0 +1,9 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/lib_abi_encoder'; +export * from '../generated-wrappers/lib_asset_proxy_errors'; +export * from '../generated-wrappers/lib_constants'; +export * from '../generated-wrappers/lib_e_i_p712'; +export * from '../generated-wrappers/lib_fill_results'; +export * from '../generated-wrappers/lib_math'; +export * from '../generated-wrappers/lib_order'; +export * from '../generated-wrappers/test_libs'; diff --git a/contracts/exchange-libs/src/wrappers/index.ts b/contracts/exchange-libs/src/wrappers/index.ts deleted file mode 100644 index baaae6e34..000000000 --- a/contracts/exchange-libs/src/wrappers/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from '../../generated-wrappers/test_libs'; -export * from '../../generated-wrappers/lib_abi_encoder'; -export * from '../../generated-wrappers/lib_fill_results'; -export * from '../../generated-wrappers/lib_math'; -export * from '../../generated-wrappers/lib_order'; -export * from '../../generated-wrappers/lib_e_i_p712'; diff --git a/contracts/exchange-libs/tsconfig.json b/contracts/exchange-libs/tsconfig.json index 27ca35085..1b5d54175 100644 --- a/contracts/exchange-libs/tsconfig.json +++ b/contracts/exchange-libs/tsconfig.json @@ -1,18 +1,16 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/TestLibs.json", - "./generated-artifacts/LibOrder.json", - "./generated-artifacts/LibFillResults.json", - "./generated-artifacts/LibAbiEncoder.json", - "./generated-artifacts/LibEIP712.json", - "./generated-artifacts/LibMath.json" + "generated-artifacts/LibAbiEncoder.json", + "generated-artifacts/LibAssetProxyErrors.json", + "generated-artifacts/LibConstants.json", + "generated-artifacts/LibEIP712.json", + "generated-artifacts/LibFillResults.json", + "generated-artifacts/LibMath.json", + "generated-artifacts/LibOrder.json", + "generated-artifacts/TestLibs.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index 6a5f666d1..b7a94cd13 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,23 +17,31 @@ } }, "contracts": [ - "Exchange", - "IAssetProxyDispatcher", - "IExchange", - "IExchangeCore", - "IMatchOrders", - "ISignatureValidator", - "ITransactions", - "IValidator", - "IWallet", - "IWrapperFunctions", - "TestAssetProxyDispatcher", - "TestExchangeInternals", - "TestSignatureValidator", - "TestStaticCallReceiver", - "ExchangeWrapper", - "Validator", - "Wallet", - "Whitelist" + "@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol", + "@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol", + "@0x/contracts-asset-proxy/contracts/src/MultiAssetProxy.sol", + "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol", + "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol", + "@0x/contracts-erc20/contracts/test/ReentrantERC20Token.sol", + "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol", + "@0x/contracts-exchange-libs/contracts/test/TestLibs.sol", + "examples/ExchangeWrapper.sol", + "examples/Validator.sol", + "examples/Wallet.sol", + "examples/Whitelist.sol", + "src/Exchange.sol", + "src/interfaces/IAssetProxyDispatcher.sol", + "src/interfaces/IExchange.sol", + "src/interfaces/IExchangeCore.sol", + "src/interfaces/IMatchOrders.sol", + "src/interfaces/ISignatureValidator.sol", + "src/interfaces/ITransactions.sol", + "src/interfaces/IValidator.sol", + "src/interfaces/IWallet.sol", + "src/interfaces/IWrapperFunctions.sol", + "test/TestAssetProxyDispatcher.sol", + "test/TestExchangeInternals.sol", + "test/TestSignatureValidator.sol", + "test/TestStaticCallReceiver.sol" ] } diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index a11767626..51a6cdf26 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(ERC20Proxy|ERC721Proxy|Exchange|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IWrapperFunctions|IValidator|IWallet|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver|ExchangeWrapper|Validator|Wallet|Whitelist).json" + "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|IAssetProxyDispatcher|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IValidator|IWallet|IWrapperFunctions|MultiAssetProxy|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibs|TestSignatureValidator|TestStaticCallReceiver|Validator|Wallet|Whitelist).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -48,6 +50,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts new file mode 100644 index 000000000..e49aea10b --- /dev/null +++ b/contracts/exchange/src/artifacts.ts @@ -0,0 +1,57 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json'; +import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; +import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json'; +import * as Exchange from '../generated-artifacts/Exchange.json'; +import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json'; +import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json'; +import * as IExchange from '../generated-artifacts/IExchange.json'; +import * as IExchangeCore from '../generated-artifacts/IExchangeCore.json'; +import * as IMatchOrders from '../generated-artifacts/IMatchOrders.json'; +import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator.json'; +import * as ITransactions from '../generated-artifacts/ITransactions.json'; +import * as IValidator from '../generated-artifacts/IValidator.json'; +import * as IWallet from '../generated-artifacts/IWallet.json'; +import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json'; +import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json'; +import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json'; +import * as TestAssetProxyDispatcher from '../generated-artifacts/TestAssetProxyDispatcher.json'; +import * as TestExchangeInternals from '../generated-artifacts/TestExchangeInternals.json'; +import * as TestLibs from '../generated-artifacts/TestLibs.json'; +import * as TestSignatureValidator from '../generated-artifacts/TestSignatureValidator.json'; +import * as TestStaticCallReceiver from '../generated-artifacts/TestStaticCallReceiver.json'; +import * as Validator from '../generated-artifacts/Validator.json'; +import * as Wallet from '../generated-artifacts/Wallet.json'; +import * as Whitelist from '../generated-artifacts/Whitelist.json'; +export const artifacts = { + ERC20Proxy: ERC20Proxy as ContractArtifact, + ERC721Proxy: ERC721Proxy as ContractArtifact, + MultiAssetProxy: MultiAssetProxy as ContractArtifact, + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + TestLibs: TestLibs as ContractArtifact, + ExchangeWrapper: ExchangeWrapper as ContractArtifact, + Validator: Validator as ContractArtifact, + Wallet: Wallet as ContractArtifact, + Whitelist: Whitelist as ContractArtifact, + Exchange: Exchange as ContractArtifact, + IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, + IExchange: IExchange as ContractArtifact, + IExchangeCore: IExchangeCore as ContractArtifact, + IMatchOrders: IMatchOrders as ContractArtifact, + ISignatureValidator: ISignatureValidator as ContractArtifact, + ITransactions: ITransactions as ContractArtifact, + IValidator: IValidator as ContractArtifact, + IWallet: IWallet as ContractArtifact, + IWrapperFunctions: IWrapperFunctions as ContractArtifact, + TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, + TestExchangeInternals: TestExchangeInternals as ContractArtifact, + TestSignatureValidator: TestSignatureValidator as ContractArtifact, + TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact, +}; diff --git a/contracts/exchange/src/artifacts/index.ts b/contracts/exchange/src/artifacts/index.ts deleted file mode 100644 index 798ff17ab..000000000 --- a/contracts/exchange/src/artifacts/index.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as Exchange from '../../generated-artifacts/Exchange.json'; -import * as ExchangeWrapper from '../../generated-artifacts/ExchangeWrapper.json'; -import * as IAssetProxyDispatcher from '../../generated-artifacts/IAssetProxyDispatcher.json'; -import * as IExchange from '../../generated-artifacts/IExchange.json'; -import * as IExchangeCore from '../../generated-artifacts/IExchangeCore.json'; -import * as IMatchOrders from '../../generated-artifacts/IMatchOrders.json'; -import * as ISignatureValidator from '../../generated-artifacts/ISignatureValidator.json'; -import * as ITransactions from '../../generated-artifacts/ITransactions.json'; -import * as IValidator from '../../generated-artifacts/IValidator.json'; -import * as IWallet from '../../generated-artifacts/IWallet.json'; -import * as IWrapperFunctions from '../../generated-artifacts/IWrapperFunctions.json'; -import * as TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json'; -import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json'; -import * as TestSignatureValidator from '../../generated-artifacts/TestSignatureValidator.json'; -import * as TestStaticCallReceiver from '../../generated-artifacts/TestStaticCallReceiver.json'; -import * as Validator from '../../generated-artifacts/Validator.json'; -import * as Wallet from '../../generated-artifacts/Wallet.json'; -import * as Whitelist from '../../generated-artifacts/Whitelist.json'; - -export const artifacts = { - Exchange: Exchange as ContractArtifact, - TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, - TestExchangeInternals: TestExchangeInternals as ContractArtifact, - TestSignatureValidator: TestSignatureValidator as ContractArtifact, - TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact, - IExchange: IExchange as ContractArtifact, - IExchangeCore: IExchangeCore as ContractArtifact, - IMatchOrders: IMatchOrders as ContractArtifact, - ISignatureValidator: ISignatureValidator as ContractArtifact, - ITransactions: ITransactions as ContractArtifact, - IWrapperFunctions: IWrapperFunctions as ContractArtifact, - IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, - IValidator: IValidator as ContractArtifact, - IWallet: IWallet as ContractArtifact, - ExchangeWrapper: ExchangeWrapper as ContractArtifact, - Validator: Validator as ContractArtifact, - Wallet: Wallet as ContractArtifact, - Whitelist: Whitelist as ContractArtifact, -}; diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts new file mode 100644 index 000000000..eca3c1c89 --- /dev/null +++ b/contracts/exchange/src/wrappers.ts @@ -0,0 +1,27 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/dummy_erc20_token'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/dummy_no_return_erc20_token'; +export * from '../generated-wrappers/erc20_proxy'; +export * from '../generated-wrappers/erc721_proxy'; +export * from '../generated-wrappers/exchange'; +export * from '../generated-wrappers/exchange_wrapper'; +export * from '../generated-wrappers/i_asset_proxy_dispatcher'; +export * from '../generated-wrappers/i_exchange'; +export * from '../generated-wrappers/i_exchange_core'; +export * from '../generated-wrappers/i_match_orders'; +export * from '../generated-wrappers/i_signature_validator'; +export * from '../generated-wrappers/i_transactions'; +export * from '../generated-wrappers/i_validator'; +export * from '../generated-wrappers/i_wallet'; +export * from '../generated-wrappers/i_wrapper_functions'; +export * from '../generated-wrappers/multi_asset_proxy'; +export * from '../generated-wrappers/reentrant_erc20_token'; +export * from '../generated-wrappers/test_asset_proxy_dispatcher'; +export * from '../generated-wrappers/test_exchange_internals'; +export * from '../generated-wrappers/test_libs'; +export * from '../generated-wrappers/test_signature_validator'; +export * from '../generated-wrappers/test_static_call_receiver'; +export * from '../generated-wrappers/validator'; +export * from '../generated-wrappers/wallet'; +export * from '../generated-wrappers/whitelist'; diff --git a/contracts/exchange/src/wrappers/index.ts b/contracts/exchange/src/wrappers/index.ts deleted file mode 100644 index 86e939b56..000000000 --- a/contracts/exchange/src/wrappers/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -export * from '../../generated-wrappers/exchange'; -export * from '../../generated-wrappers/test_asset_proxy_dispatcher'; -export * from '../../generated-wrappers/test_exchange_internals'; -export * from '../../generated-wrappers/test_signature_validator'; -export * from '../../generated-wrappers/test_static_call_receiver'; -export * from '../../generated-wrappers/i_asset_proxy_dispatcher'; -export * from '../../generated-wrappers/i_exchange'; -export * from '../../generated-wrappers/i_exchange_core'; -export * from '../../generated-wrappers/i_match_orders'; -export * from '../../generated-wrappers/i_signature_validator'; -export * from '../../generated-wrappers/i_transactions'; -export * from '../../generated-wrappers/i_wrapper_functions'; -export * from '../../generated-wrappers/i_validator'; -export * from '../../generated-wrappers/i_wallet'; -export * from '../../generated-wrappers/exchange_wrapper'; -export * from '../../generated-wrappers/validator'; -export * from '../../generated-wrappers/wallet'; -export * from '../../generated-wrappers/whitelist'; diff --git a/contracts/exchange/test/core.ts b/contracts/exchange/test/core.ts index 74161cc73..7e61ef7ac 100644 --- a/contracts/exchange/test/core.ts +++ b/contracts/exchange/test/core.ts @@ -1,19 +1,4 @@ -import { - artifacts as proxyArtifacts, - ERC20ProxyContract, - ERC20Wrapper, - ERC721ProxyContract, - ERC721Wrapper, - MultiAssetProxyContract, -} from '@0x/contracts-asset-proxy'; -import { - artifacts as erc20Artifacts, - DummyERC20TokenContract, - DummyERC20TokenTransferEventArgs, - DummyNoReturnERC20TokenContract, - ReentrantERC20TokenContract, -} from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -39,9 +24,17 @@ import * as _ from 'lodash'; import { artifacts, + DummyERC20TokenContract, + DummyERC20TokenTransferEventArgs, + DummyERC721TokenContract, + DummyNoReturnERC20TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, ExchangeCancelEventArgs, ExchangeContract, ExchangeWrapper, + MultiAssetProxyContract, + ReentrantERC20TokenContract, TestStaticCallReceiverContract, } from '../src'; @@ -98,7 +91,7 @@ describe('Exchange core', () => { erc20Proxy = await erc20Wrapper.deployProxyAsync(); erc721Proxy = await erc721Wrapper.deployProxyAsync(); multiAssetProxy = await MultiAssetProxyContract.deployFrom0xArtifactAsync( - proxyArtifacts.MultiAssetProxy, + artifacts.MultiAssetProxy, provider, txDefaults, ); @@ -120,7 +113,7 @@ describe('Exchange core', () => { txDefaults, ); reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.ReentrantERC20Token, + artifacts.ReentrantERC20Token, provider, txDefaults, exchange.address, @@ -345,7 +338,7 @@ describe('Exchange core', () => { describe('Testing exchange of ERC20 tokens with no return values', () => { before(async () => { noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.DummyNoReturnERC20Token, + artifacts.DummyNoReturnERC20Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, diff --git a/contracts/exchange/test/dispatcher.ts b/contracts/exchange/test/dispatcher.ts index a25755936..8263b0402 100644 --- a/contracts/exchange/test/dispatcher.ts +++ b/contracts/exchange/test/dispatcher.ts @@ -1,11 +1,4 @@ -import { - artifacts as proxyArtifacts, - ERC20ProxyContract, - ERC20Wrapper, - ERC721ProxyContract, - ERC721Wrapper, -} from '@0x/contracts-asset-proxy'; -import { DummyERC20TokenContract } from '@0x/contracts-erc20'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -25,6 +18,9 @@ import * as _ from 'lodash'; import { artifacts, + DummyERC20TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, TestAssetProxyDispatcherAssetProxyRegisteredEventArgs, TestAssetProxyDispatcherContract, } from '../src'; @@ -131,7 +127,7 @@ describe('AssetProxyDispatcher', () => { expect(proxyAddress).to.be.equal(erc20Proxy.address); // Deploy a new version of the ERC20 Transfer Proxy contract const newErc20TransferProxy = await ERC20ProxyContract.deployFrom0xArtifactAsync( - proxyArtifacts.ERC20Proxy, + artifacts.ERC20Proxy, provider, txDefaults, ); diff --git a/contracts/exchange/test/match_orders.ts b/contracts/exchange/test/match_orders.ts index d17025ddd..98fea67ea 100644 --- a/contracts/exchange/test/match_orders.ts +++ b/contracts/exchange/test/match_orders.ts @@ -1,6 +1,4 @@ -import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -20,7 +18,18 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, ExchangeContract, ExchangeWrapper, MatchOrderTester, TestExchangeInternalsContract } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + ExchangeWrapper, + MatchOrderTester, + ReentrantERC20TokenContract, + TestExchangeInternalsContract, +} from '../src'; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); chaiSetup.configure(); @@ -131,7 +140,7 @@ describe('matchOrders', () => { ); reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.ReentrantERC20Token, + artifacts.ReentrantERC20Token, provider, txDefaults, exchange.address, diff --git a/contracts/exchange/test/signature_validator.ts b/contracts/exchange/test/signature_validator.ts index 89eac4ddb..33510e50c 100644 --- a/contracts/exchange/test/signature_validator.ts +++ b/contracts/exchange/test/signature_validator.ts @@ -1,4 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; import { addressUtils, chaiSetup, @@ -78,7 +77,7 @@ describe('MixinSignatureValidator', () => { provider, txDefaults, ); - signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts }); + signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts); await web3Wrapper.awaitTransactionSuccessAsync( await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, { from: signerAddress, diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts index eca535c65..61176751f 100644 --- a/contracts/exchange/test/utils/exchange_wrapper.ts +++ b/contracts/exchange/test/utils/exchange_wrapper.ts @@ -1,5 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; -import { artifacts as erc721Artifacts } from '@0x/contracts-erc721'; import { FillResults, formatters, @@ -25,7 +23,7 @@ export class ExchangeWrapper { constructor(exchangeContract: ExchangeContract, provider: Provider) { this._exchange = exchangeContract; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...erc721Artifacts }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } public async fillOrderAsync( signedOrder: SignedOrder, diff --git a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts index 26b168909..00ca8a9fc 100644 --- a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts +++ b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts @@ -1,5 +1,4 @@ import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-exchange-libs'; import { AllowanceAmountScenario, AssetDataScenario, @@ -33,7 +32,7 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types'; import * as _ from 'lodash'; import 'make-promises-safe'; -import { artifacts, ExchangeContract, ExchangeFillEventArgs } from '../../src'; +import { artifacts, ExchangeContract, ExchangeFillEventArgs, TestLibsContract } from '../../src'; import { AssetWrapper } from './asset_wrapper'; import { ExchangeWrapper } from './exchange_wrapper'; @@ -129,11 +128,7 @@ export async function fillOrderCombinatorialUtilsFactoryAsync( exchangeContract.address, ); - const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync( - libsArtifacts.TestLibs, - provider, - txDefaults, - ); + const testLibsContract = await TestLibsContract.deployFrom0xArtifactAsync(artifacts.TestLibs, provider, txDefaults); const fillOrderCombinatorialUtils = new FillOrderCombinatorialUtils( orderFactory, diff --git a/contracts/exchange/test/wrapper.ts b/contracts/exchange/test/wrapper.ts index 62a0d426f..5476ac99d 100644 --- a/contracts/exchange/test/wrapper.ts +++ b/contracts/exchange/test/wrapper.ts @@ -1,6 +1,4 @@ -import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -22,7 +20,16 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, ExchangeContract, ExchangeWrapper } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + ExchangeWrapper, + ReentrantERC20TokenContract, +} from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -107,7 +114,7 @@ describe('Exchange wrappers', () => { ); reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.ReentrantERC20Token, + artifacts.ReentrantERC20Token, provider, txDefaults, exchange.address, diff --git a/contracts/exchange/tsconfig.json b/contracts/exchange/tsconfig.json index b0fcd1771..35ca3d933 100644 --- a/contracts/exchange/tsconfig.json +++ b/contracts/exchange/tsconfig.json @@ -1,30 +1,34 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/IAssetProxyDispatcher.json", - "./generated-artifacts/IExchange.json", - "./generated-artifacts/IExchangeCore.json", - "./generated-artifacts/IMatchOrders.json", - "./generated-artifacts/ISignatureValidator.json", - "./generated-artifacts/ITransactions.json", - "./generated-artifacts/IValidator.json", - "./generated-artifacts/IWallet.json", - "./generated-artifacts/IWrapperFunctions.json", - "./generated-artifacts/Exchange.json", - "./generated-artifacts/TestAssetProxyDispatcher.json", - "./generated-artifacts/TestExchangeInternals.json", - "./generated-artifacts/TestSignatureValidator.json", - "./generated-artifacts/TestStaticCallReceiver.json", - "./generated-artifacts/ExchangeWrapper.json", - "./generated-artifacts/Validator.json", - "./generated-artifacts/Wallet.json", - "./generated-artifacts/Whitelist.json" + "generated-artifacts/DummyERC20Token.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/DummyNoReturnERC20Token.json", + "generated-artifacts/ERC20Proxy.json", + "generated-artifacts/ERC721Proxy.json", + "generated-artifacts/Exchange.json", + "generated-artifacts/ExchangeWrapper.json", + "generated-artifacts/IAssetProxyDispatcher.json", + "generated-artifacts/IExchange.json", + "generated-artifacts/IExchangeCore.json", + "generated-artifacts/IMatchOrders.json", + "generated-artifacts/ISignatureValidator.json", + "generated-artifacts/ITransactions.json", + "generated-artifacts/IValidator.json", + "generated-artifacts/IWallet.json", + "generated-artifacts/IWrapperFunctions.json", + "generated-artifacts/MultiAssetProxy.json", + "generated-artifacts/ReentrantERC20Token.json", + "generated-artifacts/TestAssetProxyDispatcher.json", + "generated-artifacts/TestExchangeInternals.json", + "generated-artifacts/TestLibs.json", + "generated-artifacts/TestSignatureValidator.json", + "generated-artifacts/TestStaticCallReceiver.json", + "generated-artifacts/Validator.json", + "generated-artifacts/Wallet.json", + "generated-artifacts/Whitelist.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index 91e0bd429..41fd582ad 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -19,5 +16,17 @@ } } }, - "contracts": ["BalanceThresholdFilter", "DutchAuction", "OrderMatcher", "OrderValidator"] + "contracts": [ + "@0x/contracts-asset-proxy/contracts/src/ERC20Proxy.sol", + "@0x/contracts-asset-proxy/contracts/src/ERC721Proxy.sol", + "@0x/contracts-erc20/contracts/src/WETH9.sol", + "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol", + "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol", + "@0x/contracts-exchange/contracts/examples/ExchangeWrapper.sol", + "@0x/contracts-exchange/contracts/src/Exchange.sol", + "src/BalanceThresholdFilter/BalanceThresholdFilter.sol", + "src/DutchAuction/DutchAuction.sol", + "src/OrderMatcher/OrderMatcher.sol", + "src/OrderValidator/OrderValidator.sol" + ] } diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index ad829033f..698c42ccf 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(BalanceThresholdFilter|DutchAuction|OrderMatcher|OrderValidator).json" + "abis": "./generated-artifacts/@(BalanceThresholdFilter|DummyERC20Token|DummyERC721Token|DutchAuction|ERC20Proxy|ERC721Proxy|Exchange|ExchangeWrapper|OrderMatcher|OrderValidator|WETH9).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -50,6 +52,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/extensions/src/artifacts.ts b/contracts/extensions/src/artifacts.ts new file mode 100644 index 000000000..6db3daecc --- /dev/null +++ b/contracts/extensions/src/artifacts.ts @@ -0,0 +1,27 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as BalanceThresholdFilter from '../generated-artifacts/BalanceThresholdFilter.json'; +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json'; +import * as DutchAuction from '../generated-artifacts/DutchAuction.json'; +import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; +import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json'; +import * as Exchange from '../generated-artifacts/Exchange.json'; +import * as ExchangeWrapper from '../generated-artifacts/ExchangeWrapper.json'; +import * as OrderMatcher from '../generated-artifacts/OrderMatcher.json'; +import * as OrderValidator from '../generated-artifacts/OrderValidator.json'; +import * as WETH9 from '../generated-artifacts/WETH9.json'; +export const artifacts = { + ERC20Proxy: ERC20Proxy as ContractArtifact, + ERC721Proxy: ERC721Proxy as ContractArtifact, + WETH9: WETH9 as ContractArtifact, + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + ExchangeWrapper: ExchangeWrapper as ContractArtifact, + Exchange: Exchange as ContractArtifact, + BalanceThresholdFilter: BalanceThresholdFilter as ContractArtifact, + DutchAuction: DutchAuction as ContractArtifact, + OrderMatcher: OrderMatcher as ContractArtifact, + OrderValidator: OrderValidator as ContractArtifact, +}; diff --git a/contracts/extensions/src/artifacts/index.ts b/contracts/extensions/src/artifacts/index.ts deleted file mode 100644 index f2aee4908..000000000 --- a/contracts/extensions/src/artifacts/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as BalanceThresholdFilter from '../../generated-artifacts/BalanceThresholdFilter.json'; -import * as DutchAuction from '../../generated-artifacts/DutchAuction.json'; -import * as OrderMatcher from '../../generated-artifacts/OrderMatcher.json'; -import * as OrderValidator from '../../generated-artifacts/OrderValidator.json'; - -export const artifacts = { - BalanceThresholdFilter: BalanceThresholdFilter as ContractArtifact, - DutchAuction: DutchAuction as ContractArtifact, - OrderMatcher: OrderMatcher as ContractArtifact, - OrderValidator: OrderValidator as ContractArtifact, -}; diff --git a/contracts/extensions/src/wrappers.ts b/contracts/extensions/src/wrappers.ts new file mode 100644 index 000000000..d34cca292 --- /dev/null +++ b/contracts/extensions/src/wrappers.ts @@ -0,0 +1,12 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/balance_threshold_filter'; +export * from '../generated-wrappers/dummy_erc20_token'; +export * from '../generated-wrappers/dummy_erc721_token'; +export * from '../generated-wrappers/dutch_auction'; +export * from '../generated-wrappers/erc20_proxy'; +export * from '../generated-wrappers/erc721_proxy'; +export * from '../generated-wrappers/exchange'; +export * from '../generated-wrappers/exchange_wrapper'; +export * from '../generated-wrappers/order_matcher'; +export * from '../generated-wrappers/order_validator'; +export * from '../generated-wrappers/weth9'; diff --git a/contracts/extensions/src/wrappers/index.ts b/contracts/extensions/src/wrappers/index.ts deleted file mode 100644 index eed198524..000000000 --- a/contracts/extensions/src/wrappers/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from '../../generated-wrappers/balance_threshold_filter'; -export * from '../../generated-wrappers/dutch_auction'; -export * from '../../generated-wrappers/order_matcher'; -export * from '../../generated-wrappers/order_validator'; diff --git a/contracts/extensions/test/balance_threshold_filter.ts b/contracts/extensions/test/balance_threshold_filter.ts index c79a72f5a..34eb319de 100644 --- a/contracts/extensions/test/balance_threshold_filter.ts +++ b/contracts/extensions/test/balance_threshold_filter.ts @@ -1,3 +1,4 @@ +import { ExchangeWrapper } from '@0x/contracts-exchange'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils } from '@0x/order-utils'; import { Order, RevertReason, SignedOrder } from '@0x/types'; @@ -9,7 +10,6 @@ import * as _ from 'lodash'; import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { DummyERC20TokenContract } from '@0x/contracts-erc20'; -import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange'; import { chaiSetup, constants, @@ -24,7 +24,7 @@ import { web3Wrapper, } from '@0x/contracts-test-utils'; -import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper } from '../src'; +import { artifacts, BalanceThresholdFilterContract, BalanceThresholdWrapper, ExchangeContract } from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -127,7 +127,7 @@ describe(ContractName.BalanceThresholdFilter, () => { await erc20Wrapper.setBalancesAndAllowancesAsync(); // Deploy Exchange contract exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/dutch_auction.ts b/contracts/extensions/test/dutch_auction.ts index 34ff25c3d..efe813ffc 100644 --- a/contracts/extensions/test/dutch_auction.ts +++ b/contracts/extensions/test/dutch_auction.ts @@ -1,8 +1,6 @@ import { DutchAuctionWrapper } from '@0x/contract-wrappers'; import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange'; +import { ExchangeWrapper } from '@0x/contracts-exchange'; import { chaiSetup, constants, @@ -23,7 +21,15 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, DutchAuctionContract, DutchAuctionTestWrapper } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + DutchAuctionContract, + DutchAuctionTestWrapper, + ExchangeContract, + WETH9Contract, +} from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -82,12 +88,12 @@ describe(ContractName.DutchAuction, () => { const erc721Balances = await erc721Wrapper.getBalancesAsync(); erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address]; - wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults); + wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults); erc20Wrapper.addDummyTokenContract(wethContract as any); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/order_matcher.ts b/contracts/extensions/test/order_matcher.ts index 0b2f9ddbb..d726de8e0 100644 --- a/contracts/extensions/test/order_matcher.ts +++ b/contracts/extensions/test/order_matcher.ts @@ -1,17 +1,5 @@ -import { - artifacts as proxyArtifacts, - ERC20ProxyContract, - ERC20Wrapper, - ERC721ProxyContract, -} from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20'; -import { artifacts as erc721Artifacts, DummyERC721TokenContract } from '@0x/contracts-erc721'; -import { - artifacts as exchangeArtifacts, - ExchangeContract, - ExchangeFillEventArgs, - ExchangeWrapper, -} from '@0x/contracts-exchange'; +import { ERC20Wrapper } from '@0x/contracts-asset-proxy'; +import { ExchangeWrapper } from '@0x/contracts-exchange'; import { chaiSetup, constants, @@ -34,7 +22,16 @@ import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; -import { artifacts, OrderMatcherContract } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + ExchangeFillEventArgs, + OrderMatcherContract, +} from '../src'; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); chaiSetup.configure(); @@ -104,14 +101,10 @@ describe('OrderMatcher', () => { erc20Proxy = await erc20Wrapper.deployProxyAsync(); await erc20Wrapper.setBalancesAndAllowancesAsync(); // Deploy ERC721 proxy - erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync( - proxyArtifacts.ERC721Proxy, - provider, - txDefaults, - ); + erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(artifacts.ERC721Proxy, provider, txDefaults); // Depoy exchange exchange = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, assetDataUtils.encodeERC20AssetData(zrxToken.address), @@ -200,7 +193,7 @@ describe('OrderMatcher', () => { describe('constructor', () => { it('should revert if assetProxy is unregistered', async () => { const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, constants.NULL_BYTES, @@ -454,7 +447,7 @@ describe('OrderMatcher', () => { signedOrderLeft.signature, signedOrderRight.signature, ); - const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts, ...exchangeArtifacts }); + const logDecoder = new LogDecoder(web3Wrapper, artifacts); const txReceipt = await logDecoder.getTxWithDecodedLogsAsync( await web3Wrapper.sendTransactionAsync({ data, @@ -492,7 +485,7 @@ describe('OrderMatcher', () => { signedOrderLeft.signature, signedOrderRight.signature, ); - const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts, ...exchangeArtifacts }); + const logDecoder = new LogDecoder(web3Wrapper, artifacts); const txReceipt = await logDecoder.getTxWithDecodedLogsAsync( await web3Wrapper.sendTransactionAsync({ data, @@ -729,7 +722,7 @@ describe('OrderMatcher', () => { }); it('should allow owner to withdraw ERC721 tokens', async () => { const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync( - erc721Artifacts.DummyERC721Token, + artifacts.DummyERC721Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, @@ -774,7 +767,7 @@ describe('OrderMatcher', () => { }); it('should be able to approve an ERC721 token by passing in allowance = 1', async () => { const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync( - erc721Artifacts.DummyERC721Token, + artifacts.DummyERC721Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, @@ -791,7 +784,7 @@ describe('OrderMatcher', () => { }); it('should be able to approve an ERC721 token by passing in allowance > 1', async () => { const erc721Token = await DummyERC721TokenContract.deployFrom0xArtifactAsync( - erc721Artifacts.DummyERC721Token, + artifacts.DummyERC721Token, provider, txDefaults, constants.DUMMY_TOKEN_NAME, diff --git a/contracts/extensions/test/order_validator.ts b/contracts/extensions/test/order_validator.ts index 88dae14fb..ec31cafbc 100644 --- a/contracts/extensions/test/order_validator.ts +++ b/contracts/extensions/test/order_validator.ts @@ -1,7 +1,5 @@ -import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { DummyERC20TokenContract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; +import { ExchangeWrapper } from '@0x/contracts-exchange'; import { chaiSetup, constants, @@ -18,7 +16,15 @@ import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, OrderValidatorContract } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + OrderValidatorContract, +} from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -74,7 +80,7 @@ describe('OrderValidator', () => { const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); exchange = await ExchangeContract.deployFrom0xArtifactAsync( - exchangeArtifacts.Exchange, + artifacts.Exchange, provider, txDefaults, zrxAssetData, diff --git a/contracts/extensions/test/utils/balance_threshold_wrapper.ts b/contracts/extensions/test/utils/balance_threshold_wrapper.ts index 3178d992e..ab59c5688 100644 --- a/contracts/extensions/test/utils/balance_threshold_wrapper.ts +++ b/contracts/extensions/test/utils/balance_threshold_wrapper.ts @@ -1,6 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; -import { artifacts as erc721Artifacts } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange'; import { FillResults, formatters, @@ -15,8 +12,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import * as _ from 'lodash'; -import { BalanceThresholdFilterContract } from '../../generated-wrappers/balance_threshold_filter'; -import { artifacts } from '../../src/artifacts'; +import { artifacts, BalanceThresholdFilterContract, ExchangeContract } from '../../src'; export class BalanceThresholdWrapper { private readonly _balanceThresholdFilter: BalanceThresholdFilterContract; @@ -34,12 +30,7 @@ export class BalanceThresholdWrapper { this._exchange = exchangeContract; this._signerTransactionFactory = signerTransactionFactory; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { - ...artifacts, - ...erc20Artifacts, - ...erc721Artifacts, - ...exchangeArtifacts, - }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } public async fillOrderAsync( signedOrder: SignedOrder, @@ -227,7 +218,7 @@ export class BalanceThresholdWrapper { from: string, ): Promise { const params = orderUtils.createMatchOrders(signedOrderLeft, signedOrderRight); - const data = await this._exchange.matchOrders.getABIEncodedTransactionData( + const data = this._exchange.matchOrders.getABIEncodedTransactionData( params.left, params.right, params.leftSignature, diff --git a/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts b/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts index 5899ffcac..06cdc21d5 100644 --- a/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts +++ b/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts @@ -1,6 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; -import { artifacts as erc721Artifacts } from '@0x/contracts-erc721'; -import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange'; import { LogDecoder } from '@0x/contracts-test-utils'; import { DutchAuctionDetails, SignedOrder } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; @@ -18,12 +15,7 @@ export class DutchAuctionTestWrapper { constructor(contractInstance: DutchAuctionContract, provider: Provider) { this._dutchAuctionContract = contractInstance; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { - ...artifacts, - ...erc20Artifacts, - ...erc721Artifacts, - ...exchangeArtifacts, - }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } /** * Matches the buy and sell orders at an amount given the following: the current block time, the auction diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json index 0c06c6902..b424bfa04 100644 --- a/contracts/extensions/tsconfig.json +++ b/contracts/extensions/tsconfig.json @@ -1,16 +1,19 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/BalanceThresholdFilter.json", - "./generated-artifacts/DutchAuction.json", - "./generated-artifacts/OrderMatcher.json", - "./generated-artifacts/OrderValidator.json" + "generated-artifacts/BalanceThresholdFilter.json", + "generated-artifacts/DummyERC20Token.json", + "generated-artifacts/DummyERC721Token.json", + "generated-artifacts/DutchAuction.json", + "generated-artifacts/ERC20Proxy.json", + "generated-artifacts/ERC721Proxy.json", + "generated-artifacts/Exchange.json", + "generated-artifacts/ExchangeWrapper.json", + "generated-artifacts/OrderMatcher.json", + "generated-artifacts/OrderValidator.json", + "generated-artifacts/WETH9.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index ae3905238..336a9ed7b 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -20,10 +17,11 @@ } }, "contracts": [ - "AssetProxyOwner", - "MultiSigWallet", - "MultiSigWalletWithTimeLock", - "TestAssetProxyOwner", - "TestRejectEther" + "@0x/contracts-asset-proxy/contracts/src/MixinAuthorizable.sol", + "src/AssetProxyOwner.sol", + "src/MultiSigWallet.sol", + "src/MultiSigWalletWithTimeLock.sol", + "test/TestAssetProxyOwner.sol", + "test/TestRejectEther.sol" ] } diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index cbdd96fd8..c5cc8ef25 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(AssetProxyOwner|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json" + "abis": "./generated-artifacts/@(AssetProxyOwner|MixinAuthorizable|MultiSigWallet|MultiSigWalletWithTimeLock|TestAssetProxyOwner|TestRejectEther).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "chai": "^4.0.1", diff --git a/contracts/multisig/src/artifacts.ts b/contracts/multisig/src/artifacts.ts new file mode 100644 index 000000000..37aa9d4ef --- /dev/null +++ b/contracts/multisig/src/artifacts.ts @@ -0,0 +1,17 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as AssetProxyOwner from '../generated-artifacts/AssetProxyOwner.json'; +import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json'; +import * as MultiSigWallet from '../generated-artifacts/MultiSigWallet.json'; +import * as MultiSigWalletWithTimeLock from '../generated-artifacts/MultiSigWalletWithTimeLock.json'; +import * as TestAssetProxyOwner from '../generated-artifacts/TestAssetProxyOwner.json'; +import * as TestRejectEther from '../generated-artifacts/TestRejectEther.json'; +export const artifacts = { + MixinAuthorizable: MixinAuthorizable as ContractArtifact, + AssetProxyOwner: AssetProxyOwner as ContractArtifact, + MultiSigWallet: MultiSigWallet as ContractArtifact, + MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact, + TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact, + TestRejectEther: TestRejectEther as ContractArtifact, +}; diff --git a/contracts/multisig/src/artifacts/index.ts b/contracts/multisig/src/artifacts/index.ts deleted file mode 100644 index 326d79000..000000000 --- a/contracts/multisig/src/artifacts/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as AssetProxyOwner from '../../generated-artifacts/AssetProxyOwner.json'; -import * as MultiSigWallet from '../../generated-artifacts/MultiSigWallet.json'; -import * as MultiSigWalletWithTimeLock from '../../generated-artifacts/MultiSigWalletWithTimeLock.json'; -import * as TestAssetProxyOwner from '../../generated-artifacts/TestAssetProxyOwner.json'; -import * as TestRejectEther from '../../generated-artifacts/TestRejectEther.json'; - -export const artifacts = { - AssetProxyOwner: AssetProxyOwner as ContractArtifact, - MultiSigWallet: MultiSigWallet as ContractArtifact, - MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact, - TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact, - TestRejectEther: TestRejectEther as ContractArtifact, -}; diff --git a/contracts/multisig/src/wrappers.ts b/contracts/multisig/src/wrappers.ts new file mode 100644 index 000000000..fc46799d0 --- /dev/null +++ b/contracts/multisig/src/wrappers.ts @@ -0,0 +1,7 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/asset_proxy_owner'; +export * from '../generated-wrappers/mixin_authorizable'; +export * from '../generated-wrappers/multi_sig_wallet'; +export * from '../generated-wrappers/multi_sig_wallet_with_time_lock'; +export * from '../generated-wrappers/test_asset_proxy_owner'; +export * from '../generated-wrappers/test_reject_ether'; diff --git a/contracts/multisig/src/wrappers/index.ts b/contracts/multisig/src/wrappers/index.ts deleted file mode 100644 index 43ab25704..000000000 --- a/contracts/multisig/src/wrappers/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from '../../generated-wrappers/asset_proxy_owner'; -export * from '../../generated-wrappers/multi_sig_wallet'; -export * from '../../generated-wrappers/multi_sig_wallet_with_time_lock'; -export * from '../../generated-wrappers/test_asset_proxy_owner'; -export * from '../../generated-wrappers/test_reject_ether'; diff --git a/contracts/multisig/test/asset_proxy_owner.ts b/contracts/multisig/test/asset_proxy_owner.ts index 62081554b..7bf4069cb 100644 --- a/contracts/multisig/test/asset_proxy_owner.ts +++ b/contracts/multisig/test/asset_proxy_owner.ts @@ -1,4 +1,3 @@ -import { artifacts as proxyArtifacts, MixinAuthorizableContract } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -26,6 +25,7 @@ import { AssetProxyOwnerExecutionFailureEventArgs, AssetProxyOwnerSubmissionEventArgs, AssetProxyOwnerWrapper, + MixinAuthorizableContract, TestAssetProxyOwnerContract, } from '../src'; @@ -58,12 +58,12 @@ describe('AssetProxyOwner', () => { notOwner = accounts[3]; const initialOwner = accounts[0]; erc20Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( - proxyArtifacts.MixinAuthorizable, + artifacts.MixinAuthorizable, provider, txDefaults, ); erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( - proxyArtifacts.MixinAuthorizable, + artifacts.MixinAuthorizable, provider, txDefaults, ); diff --git a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts index b6040d8e3..d5aaaf519 100644 --- a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts +++ b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts @@ -1,5 +1,3 @@ -import { artifacts as proxyArtifacts } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; import { LogDecoder } from '@0x/contracts-test-utils'; import { BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; @@ -16,7 +14,7 @@ export class AssetProxyOwnerWrapper { constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) { this._assetProxyOwner = assetproxyOwnerContract; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...proxyArtifacts }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } public async submitTransactionAsync( destination: string, diff --git a/contracts/multisig/tsconfig.json b/contracts/multisig/tsconfig.json index ad1707e43..094f89413 100644 --- a/contracts/multisig/tsconfig.json +++ b/contracts/multisig/tsconfig.json @@ -1,17 +1,14 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/AssetProxyOwner.json", - "./generated-artifacts/MultiSigWallet.json", - "./generated-artifacts/MultiSigWalletWithTimeLock.json", - "./generated-artifacts/TestAssetProxyOwner.json", - "./generated-artifacts/TestRejectEther.json" + "generated-artifacts/AssetProxyOwner.json", + "generated-artifacts/MixinAuthorizable.json", + "generated-artifacts/MultiSigWallet.json", + "generated-artifacts/MultiSigWalletWithTimeLock.json", + "generated-artifacts/TestAssetProxyOwner.json", + "generated-artifacts/TestRejectEther.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index 7473ea6d1..a54f547df 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -3,10 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "optimizer": { - "enabled": true, - "runs": 1000000 - }, + "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { "*": [ @@ -19,5 +16,13 @@ } } }, - "contracts": ["TestConstants", "TestLibBytes", "LibBytes", "Ownable", "IOwnable", "ReentrancyGuard", "SafeMath"] + "contracts": [ + "src/LibBytes.sol", + "src/Ownable.sol", + "src/ReentrancyGuard.sol", + "src/SafeMath.sol", + "src/interfaces/IOwnable.sol", + "test/TestConstants.sol", + "test/TestLibBytes.sol" + ] } diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 33d94cc33..afa4a7011 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -29,10 +29,12 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test", + "contracts:gen": "contracts-gen", "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "generated-artifacts/@(IOwnable|Ownable|LibBytes|ReentrancyGuard|SafeMath|TestConstants|TestLibBytes).json" + "abis": "./generated-artifacts/@(IOwnable|LibBytes|Ownable|ReentrancyGuard|SafeMath|TestConstants|TestLibBytes).json", + "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { "type": "git", @@ -49,6 +51,7 @@ "@0x/dev-utils": "^1.0.24", "@0x/sol-compiler": "^2.0.2", "@0x/tslint-config": "^2.0.2", + "@0x/contracts-gen": "^1.0.0", "@types/lodash": "4.14.104", "@types/node": "*", "@types/bn.js": "^4.11.0", diff --git a/contracts/utils/src/artifacts.ts b/contracts/utils/src/artifacts.ts new file mode 100644 index 000000000..26f665eec --- /dev/null +++ b/contracts/utils/src/artifacts.ts @@ -0,0 +1,19 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +import { ContractArtifact } from 'ethereum-types'; + +import * as IOwnable from '../generated-artifacts/IOwnable.json'; +import * as LibBytes from '../generated-artifacts/LibBytes.json'; +import * as Ownable from '../generated-artifacts/Ownable.json'; +import * as ReentrancyGuard from '../generated-artifacts/ReentrancyGuard.json'; +import * as SafeMath from '../generated-artifacts/SafeMath.json'; +import * as TestConstants from '../generated-artifacts/TestConstants.json'; +import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json'; +export const artifacts = { + LibBytes: LibBytes as ContractArtifact, + Ownable: Ownable as ContractArtifact, + ReentrancyGuard: ReentrancyGuard as ContractArtifact, + SafeMath: SafeMath as ContractArtifact, + IOwnable: IOwnable as ContractArtifact, + TestConstants: TestConstants as ContractArtifact, + TestLibBytes: TestLibBytes as ContractArtifact, +}; diff --git a/contracts/utils/src/artifacts/index.ts b/contracts/utils/src/artifacts/index.ts deleted file mode 100644 index a5c2b215c..000000000 --- a/contracts/utils/src/artifacts/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as IOwnable from '../../generated-artifacts/IOwnable.json'; -import * as LibBytes from '../../generated-artifacts/LibBytes.json'; -import * as Ownable from '../../generated-artifacts/Ownable.json'; -import * as ReentrancyGuard from '../../generated-artifacts/ReentrancyGuard.json'; -import * as SafeMath from '../../generated-artifacts/SafeMath.json'; -import * as TestConstants from '../../generated-artifacts/TestConstants.json'; -import * as TestLibBytes from '../../generated-artifacts/TestLibBytes.json'; - -export const artifacts = { - TestConstants: TestConstants as ContractArtifact, - TestLibBytes: TestLibBytes as ContractArtifact, - IOwnable: IOwnable as ContractArtifact, - LibBytes: LibBytes as ContractArtifact, - Ownable: Ownable as ContractArtifact, - SafeMath: SafeMath as ContractArtifact, - ReentrancyGuard: ReentrancyGuard as ContractArtifact, -}; diff --git a/contracts/utils/src/wrappers.ts b/contracts/utils/src/wrappers.ts new file mode 100644 index 000000000..fc8e4584a --- /dev/null +++ b/contracts/utils/src/wrappers.ts @@ -0,0 +1,8 @@ +// This file is auto-generated by contracts-gen. Don't edit manually. +export * from '../generated-wrappers/i_ownable'; +export * from '../generated-wrappers/lib_bytes'; +export * from '../generated-wrappers/ownable'; +export * from '../generated-wrappers/reentrancy_guard'; +export * from '../generated-wrappers/safe_math'; +export * from '../generated-wrappers/test_constants'; +export * from '../generated-wrappers/test_lib_bytes'; diff --git a/contracts/utils/src/wrappers/index.ts b/contracts/utils/src/wrappers/index.ts deleted file mode 100644 index 823b7fa4b..000000000 --- a/contracts/utils/src/wrappers/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '../../generated-wrappers/test_constants'; -export * from '../../generated-wrappers/test_lib_bytes'; diff --git a/contracts/utils/tsconfig.json b/contracts/utils/tsconfig.json index 68251e6b0..efd71ff93 100644 --- a/contracts/utils/tsconfig.json +++ b/contracts/utils/tsconfig.json @@ -1,19 +1,15 @@ { "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": ".", - "resolveJsonModule": true - }, + "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ - "./generated-artifacts/TestConstants.json", - "./generated-artifacts/TestLibBytes.json", - "./generated-artifacts/IOwnable.json", - "./generated-artifacts/Ownable.json", - "./generated-artifacts/LibBytes.json", - "./generated-artifacts/SafeMath.json", - "./generated-artifacts/ReentrancyGuard.json" + "generated-artifacts/IOwnable.json", + "generated-artifacts/LibBytes.json", + "generated-artifacts/Ownable.json", + "generated-artifacts/ReentrancyGuard.json", + "generated-artifacts/SafeMath.json", + "generated-artifacts/TestConstants.json", + "generated-artifacts/TestLibBytes.json" ], "exclude": ["./deploy/solc/solc_bin"] } diff --git a/package.json b/package.json index 62b4c1c36..c52057e4f 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "build:ts": "tsc -b", "watch:ts": "tsc -b -w", "clean": "wsrun clean $PKG --fast-exit -r --parallel --exclude-missing", + "contracts:gen": "wsrun contracts:gen $PKG --fast-exit -r --parallel --exclude-missing", "remove_node_modules": "lerna clean --yes; rm -rf node_modules", "rebuild": "run-s clean build", "rebuild:no_website": "run-s clean build:no_website", diff --git a/packages/contracts-gen/.npmignore b/packages/contracts-gen/.npmignore new file mode 100644 index 000000000..d645458f6 --- /dev/null +++ b/packages/contracts-gen/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +/src/ +/scripts/ +tsconfig.json +/lib/monorepo_scripts/ diff --git a/packages/contracts-gen/CHANGELOG.json b/packages/contracts-gen/CHANGELOG.json new file mode 100644 index 000000000..fe51488c7 --- /dev/null +++ b/packages/contracts-gen/CHANGELOG.json @@ -0,0 +1 @@ +[] diff --git a/packages/contracts-gen/README.md b/packages/contracts-gen/README.md new file mode 100644 index 000000000..b32fa53cc --- /dev/null +++ b/packages/contracts-gen/README.md @@ -0,0 +1,76 @@ +# Contracts Gen + +This package allows you to generate boilerplate TypeScript code and configs for smart contracts packages. + +## Installation + +`yarn add -g @0x/contracts-gen` + +## Usage + +Run it from within your smart contracts packages. + +```bash +contracts-gen +``` + +You should run this tool after each time you move your contracts around to regenerate boilerplate code and configs. + +## What can it generate + +This tool does the following: + +- Reads your `compiler.json`. Specifically list of smart contracts. +- Creates `wrapper.ts` file which exports all contract wrappers. +- Creates `artifacts.ts` file which exports all contract artifacts. +- Generates list of JSON artifact files in `tsconfig.json` +- Generates a glob for abi-gen in `package.json` + +On top of that - if your `compiler.json` has contracts referenced just by name - it will resolve the name to relative path and put it there. +It also sorts all the lists in it's output leading to smaller and cleaner diffs. + +## Contributing + +We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository. + +Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. + +### Install dependencies + +If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: + +```bash +yarn config set workspaces-experimental true +``` + +Then install dependencies + +```bash +yarn install +``` + +### Build + +To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: + +```bash +PKG=@0x/contracts-gen yarn build +``` + +Or continuously rebuild on change: + +```bash +PKG=@0x/contracts-gen yarn watch +``` + +### Clean + +```bash +yarn clean +``` + +### Lint + +```bash +yarn lint +``` diff --git a/packages/contracts-gen/bin/contracts-gen.js b/packages/contracts-gen/bin/contracts-gen.js new file mode 100755 index 000000000..ec6ab4db6 --- /dev/null +++ b/packages/contracts-gen/bin/contracts-gen.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +require('../lib/src/contracts-gen.js'); diff --git a/packages/contracts-gen/package.json b/packages/contracts-gen/package.json new file mode 100644 index 000000000..8526feabc --- /dev/null +++ b/packages/contracts-gen/package.json @@ -0,0 +1,49 @@ +{ + "name": "@0x/contracts-gen", + "version": "1.0.0", + "engines": { + "node": ">=6.12" + }, + "description": "Generates boilerplate code for smart contracts packages", + "main": "lib/src/index.js", + "types": "lib/src/index.d.ts", + "scripts": { + "lint": "tslint --format stylish --project .", + "clean": "shx rm -rf lib", + "build": "tsc -b", + "build:ci": "yarn build" + }, + "bin": { + "contracts-gen": "bin/contracts-gen.js" + }, + "repository": { + "type": "git", + "url": "https://github.com/0xProject/0x-monorepo.git" + }, + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/0xProject/0x-monorepo/issues" + }, + "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts-gen/README.md", + "dependencies": { + "@0x/types": "^1.5.2", + "@0x/utils": "^3.0.1", + "@0x/typescript-typings": "^3.0.8", + "ethereum-types": "^1.1.6", + "@0x/sol-resolver": "^1.2.3", + "lodash": "^4.17.5", + "prettier": "^1.16.3", + "to-snake-case": "^1.0.0" + }, + "devDependencies": { + "@0x/tslint-config": "^2.0.2", + "@types/node": "*", + "@types/prettier": "^1.15.2", + "shx": "^0.2.2", + "tslint": "5.11.0", + "typescript": "3.0.1" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/packages/contracts-gen/src/contracts-gen.ts b/packages/contracts-gen/src/contracts-gen.ts new file mode 100644 index 000000000..0695d9c98 --- /dev/null +++ b/packages/contracts-gen/src/contracts-gen.ts @@ -0,0 +1,171 @@ +#!/usr/bin/env node + +import { NameResolver } from '@0x/sol-resolver'; +import { PackageJSON } from '@0x/types'; +import { logUtils } from '@0x/utils'; +import { CompilerOptions } from 'ethereum-types'; +import * as fs from 'fs'; +import * as _ from 'lodash'; +import * as path from 'path'; +import * as prettier from 'prettier'; +import toSnakeCase = require('to-snake-case'); + +const SOLIDITY_EXTENSION = '.sol'; +const DEFAULT_ARTIFACTS_DIR = 'artifacts'; +const DEFAULT_CONTRACTS_DIR = 'contracts'; +const DEFAULT_WRAPPERS_DIR = 'generated-wrappers'; +const AUTO_GENERATED_BANNER = `This file is auto-generated by contracts-gen. Don't edit manually.`; +const AUTO_GENERATED_BANNER_FOR_LISTS = `This list is auto-generated by contracts-gen. Don't edit manually.`; + +(async () => { + const packageDir = process.cwd(); + const compilerJSON = readJSONFile('compiler.json'); + const contracts = compilerJSON.contracts; + const contractsDir = compilerJSON.contractsDir || DEFAULT_CONTRACTS_DIR; + const artifactsDir = compilerJSON.artifactsDir || DEFAULT_ARTIFACTS_DIR; + const wrappersDir = DEFAULT_WRAPPERS_DIR; + if (!_.isArray(contracts)) { + throw new Error('Unable to run the generator bacause contracts key in compiler.json is not of type array'); + } + const prettierConfig = await prettier.resolveConfig(packageDir); + generateCompilerJSONContractsList(contracts, contractsDir, prettierConfig); + generateArtifactsTs(contracts, artifactsDir, prettierConfig); + generateWrappersTs(contracts, wrappersDir, prettierConfig); + generateTsConfigJSONFilesList(contracts, artifactsDir, prettierConfig); + generatePackageJSONABIConfig(contracts, artifactsDir, prettierConfig); + process.exit(0); +})().catch(err => { + logUtils.log(err); + process.exit(1); +}); + +function generateCompilerJSONContractsList( + contracts: string[], + contractsDir: string, + prettierConfig: prettier.Options | null, +): void { + const COMPILER_JSON_FILE_PATH = 'compiler.json'; + const compilerJSON = readJSONFile(COMPILER_JSON_FILE_PATH); + compilerJSON.contracts = _.map(contracts, contract => { + if (contract.endsWith(SOLIDITY_EXTENSION)) { + // If it's already a relative path - NO-OP. + return contract; + } else { + // If it's just a contract name - resolve it and rewrite. + return new NameResolver(contractsDir).resolve(contract).path; + } + }); + compilerJSON.contracts = _.sortBy(compilerJSON.contracts); + const compilerJSONString = JSON.stringify(compilerJSON); + const formattedCompilerJSON = prettier.format(compilerJSONString, { + ...prettierConfig, + filepath: COMPILER_JSON_FILE_PATH, + }); + fs.writeFileSync(COMPILER_JSON_FILE_PATH, formattedCompilerJSON); +} + +function generateArtifactsTs(contracts: string[], artifactsDir: string, prettierConfig: prettier.Options | null): void { + const imports = _.map(contracts, contract => { + const contractName = path.basename(contract, SOLIDITY_EXTENSION); + const importPath = path.join('..', artifactsDir, `${contractName}.json`); + return `import * as ${contractName} from '${importPath}';`; + }); + const sortedImports = _.sortBy(imports); + const artifacts = _.map(contracts, contract => { + const contractName = path.basename(contract, SOLIDITY_EXTENSION); + if (contractName === 'ZRXToken') { + // HACK(albrow): "as any" hack still required here because ZRXToken does not + // conform to the v2 artifact type. + return `${contractName}: (${contractName} as any) as ContractArtifact,`; + } else { + return `${contractName}: ${contractName} as ContractArtifact,`; + } + }); + const artifactsTs = ` + // ${AUTO_GENERATED_BANNER} + import { ContractArtifact } from 'ethereum-types'; + + ${sortedImports.join('\n')} + export const artifacts = {${artifacts.join('\n')}}; + `; + const ARTIFACTS_TS_FILE_PATH = 'src/artifacts.ts'; + const formattedArtifactsTs = prettier.format(artifactsTs, { ...prettierConfig, filepath: ARTIFACTS_TS_FILE_PATH }); + fs.writeFileSync(ARTIFACTS_TS_FILE_PATH, formattedArtifactsTs); +} + +function generateWrappersTs(contracts: string[], wrappersDir: string, prettierConfig: prettier.Options | null): void { + const imports = _.map(contracts, contract => { + const contractName = path.basename(contract, SOLIDITY_EXTENSION); + const outputFileName = makeOutputFileName(contractName); + const exportPath = path.join('..', wrappersDir, outputFileName); + return `export * from '${exportPath}';`; + }); + const sortedImports = _.sortBy(imports); + const wrappersTs = ` + // ${AUTO_GENERATED_BANNER} + ${sortedImports.join('\n')} + `; + const WRAPPERS_TS_FILE_PATH = 'src/wrappers.ts'; + const formattedArtifactsTs = prettier.format(wrappersTs, { ...prettierConfig, filepath: WRAPPERS_TS_FILE_PATH }); + fs.writeFileSync(WRAPPERS_TS_FILE_PATH, formattedArtifactsTs); +} + +function generateTsConfigJSONFilesList( + contracts: string[], + artifactsDir: string, + prettierConfig: prettier.Options | null, +): void { + const TS_CONFIG_FILE_PATH = 'tsconfig.json'; + const tsConfig = readJSONFile(TS_CONFIG_FILE_PATH); + tsConfig.files = _.map(contracts, contract => { + const contractName = path.basename(contract, SOLIDITY_EXTENSION); + const artifactPath = path.join(artifactsDir, `${contractName}.json`); + return artifactPath; + }); + tsConfig.files = _.sortBy(tsConfig.files); + const tsConfigString = JSON.stringify(tsConfig); + const formattedTsConfig = prettier.format(tsConfigString, { ...prettierConfig, filepath: TS_CONFIG_FILE_PATH }); + fs.writeFileSync(TS_CONFIG_FILE_PATH, formattedTsConfig); +} + +function generatePackageJSONABIConfig( + contracts: string[], + artifactsDir: string, + prettierConfig: prettier.Options | null, +): void { + let packageJSON = readJSONFile('package.json'); + const contractNames = _.map(contracts, contract => { + const contractName = path.basename(contract, SOLIDITY_EXTENSION); + return contractName; + }); + const sortedContractNames = _.sortBy(contractNames); + packageJSON = { + ...packageJSON, + config: { + ...packageJSON.config, + 'abis:comment': AUTO_GENERATED_BANNER_FOR_LISTS, + abis: `${artifactsDir}/@(${sortedContractNames.join('|')}).json`, + }, + }; + const PACKAGE_JSON_FILE_PATH = 'package.json'; + const packageJSONString = JSON.stringify(packageJSON); + const formattedPackageJSON = prettier.format(packageJSONString, { + ...prettierConfig, + filepath: PACKAGE_JSON_FILE_PATH, + }); + fs.writeFileSync(PACKAGE_JSON_FILE_PATH, formattedPackageJSON); +} + +function makeOutputFileName(name: string): string { + let fileName = toSnakeCase(name); + // HACK: Snake case doesn't make a lot of sense for abbreviated names but we can't reliably detect abbreviations + // so we special-case the abbreviations we use. + fileName = fileName.replace('z_r_x', 'zrx').replace('e_r_c', 'erc'); + return fileName; +} + +function readJSONFile(filePath: string): T { + const JSONString = fs.readFileSync(filePath, 'utf8'); + const parsed: T = JSON.parse(JSONString); + return parsed; +} diff --git a/packages/contracts-gen/src/index.ts b/packages/contracts-gen/src/index.ts new file mode 100644 index 000000000..4863ab794 --- /dev/null +++ b/packages/contracts-gen/src/index.ts @@ -0,0 +1,6 @@ +/** + * This module is a CLI tool. As soon as you run it - it starts doing stuff. + * At the same time - our installation tests assume that you can import package without causing side effects. + * That's why our main entry point it empty. No side effects. But out secondary entry poing - contracts-gen.ts is a CLI tool and starts running as soon as you import/run it. + */ +export {}; diff --git a/packages/contracts-gen/tsconfig.json b/packages/contracts-gen/tsconfig.json new file mode 100644 index 000000000..233008d61 --- /dev/null +++ b/packages/contracts-gen/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "outDir": "lib", + "rootDir": "." + }, + "include": ["./src/**/*"] +} diff --git a/packages/contracts-gen/tslint.json b/packages/contracts-gen/tslint.json new file mode 100644 index 000000000..dd9053357 --- /dev/null +++ b/packages/contracts-gen/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": ["@0x/tslint-config"] +} diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 187a80c93..e6273fd60 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -8,6 +8,9 @@ "description": "Helper scripts for the monorepo", "main": "lib/index.js", "types": "lib/index.d.ts", + "bin": { + "contracts-gen": "bin/contracts-gen.js" + }, "scripts": { "build": "tsc -b", "build:ci": "yarn build", @@ -36,6 +39,7 @@ "@types/mkdirp": "^0.5.2", "@types/node": "*", "@types/opn": "^5.1.0", + "@types/prettier": "^1.15.2", "@types/rimraf": "^2.0.2", "@types/semver": "5.5.0", "@types/yargs": "^10.0.0", @@ -48,17 +52,20 @@ }, "dependencies": { "@0x/utils": "^3.0.1", + "@0x/types": "^1.5.2", "@lerna/batch-packages": "^3.0.0-beta.18", "@types/depcheck": "^0.6.0", "async-child-process": "^1.1.1", "chalk": "^2.3.0", "es6-promisify": "^5.0.0", + "ethereum-types": "^1.1.6", "glob": "^7.1.2", "isomorphic-fetch": "2.2.1", "lodash": "^4.17.5", "mkdirp": "^0.5.1", "moment": "2.21.0", "opn": "^5.3.0", + "prettier": "^1.16.3", "promisify-child-process": "^1.0.5", "prompt": "^1.0.0", "publish-release": "0xproject/publish-release", @@ -66,6 +73,7 @@ "semver": "5.5.0", "semver-diff": "^2.1.0", "semver-sort": "0.0.4", + "snake-case": "^2.1.0", "typedoc": "0.13.0", "yargs": "^10.0.3" }, diff --git a/packages/monorepo-scripts/src/deps_versions.ts b/packages/monorepo-scripts/src/deps_versions.ts index 1053906b7..d15bb6b4d 100644 --- a/packages/monorepo-scripts/src/deps_versions.ts +++ b/packages/monorepo-scripts/src/deps_versions.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node +import { PackageJSON } from '@0x/types'; import chalk from 'chalk'; -import * as fs from 'fs'; import { sync as globSync } from 'glob'; import * as _ from 'lodash'; @@ -21,11 +21,10 @@ const PACKAGE_JSON_GLOB = '../*/package.json'; // tslint:disable:no-unused-variable function getDependencies(path: string): Dependencies { - const file = fs.readFileSync(path).toString(); - const parsed = JSON.parse(file); + const packageJSON = utils.readJSONFile(path); const dependencies = { - ...parsed.dependencies, - ...parsed.devDependencies, + ...packageJSON.dependencies, + ...packageJSON.devDependencies, }; return dependencies; } diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index 105d87dcd..ddb2811f2 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -1,8 +1,8 @@ #!/usr/bin/env node +import { PackageJSON } from '@0x/types'; import { logUtils } from '@0x/utils'; import * as promisify from 'es6-promisify'; -import * as fs from 'fs'; import * as _ from 'lodash'; import * as moment from 'moment'; import opn = require('opn'); @@ -141,8 +141,8 @@ async function publishImagesToDockerHubAsync(allUpdatedPackages: Package[]): Pro function getPackagesWithDocs(allUpdatedPackages: Package[]): Package[] { const rootPackageJsonPath = `${constants.monorepoRootPath}/package.json`; - const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath).toString()); - const packagesWithDocPagesStringIfExist = _.get(rootPackageJson, 'config.packagesWithDocPages', undefined); + const rootPackageJSON = utils.readJSONFile(rootPackageJsonPath); + const packagesWithDocPagesStringIfExist = _.get(rootPackageJSON, 'config.packagesWithDocPages', undefined); if (_.isUndefined(packagesWithDocPagesStringIfExist)) { return []; // None to generate & publish } diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 822f48967..ec145cd32 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -8,7 +8,7 @@ import { exec as execAsync } from 'promisify-child-process'; import * as rimraf from 'rimraf'; import { promisify } from 'util'; -import { Package } from './types'; +import { Changelog, Package } from './types'; import { utils } from './utils/utils'; // Packages might not be runnable if they are command-line tools or only run in browsers. @@ -100,7 +100,7 @@ async function testInstallPackageAsync( installablePackage: Package, ): Promise { const changelogPath = path.join(installablePackage.location, 'CHANGELOG.json'); - const lastChangelogVersion = JSON.parse(fs.readFileSync(changelogPath).toString())[0].version; + const lastChangelogVersion = utils.readJSONFile(changelogPath)[0].version; const packageName = installablePackage.packageJson.name; utils.log(`Testing ${packageName}@${lastChangelogVersion}`); const packageDirName = path.join(...`${packageName}-test`.split('/')); diff --git a/packages/monorepo-scripts/src/types.ts b/packages/monorepo-scripts/src/types.ts index 4af4fd257..e285d9082 100644 --- a/packages/monorepo-scripts/src/types.ts +++ b/packages/monorepo-scripts/src/types.ts @@ -1,3 +1,5 @@ +import { PackageJSON } from '@0x/types'; + export interface UpdatedPackage { name: string; version: string; @@ -34,21 +36,6 @@ export interface GitTagsByPackageName { [packageName: string]: string[]; } -export interface PackageJSON { - private?: boolean; - version: string; - name: string; - main?: string; - scripts?: { [command: string]: string }; - config?: { - postpublish?: { - assets?: string[]; - docOmitExports?: string[]; - dockerHubRepo?: string; - }; - }; -} - export interface Package { location: string; packageJson: PackageJSON; diff --git a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts index 1a4294e9c..c0e86ad44 100644 --- a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts +++ b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts @@ -1,3 +1,4 @@ +import { PackageJSON } from '@0x/types'; import { existsSync, readFileSync, writeFileSync } from 'fs'; import * as _ from 'lodash'; import * as path from 'path'; @@ -6,7 +7,7 @@ import * as ts from 'typescript'; import { constants } from '../constants'; import { docGenConfigs } from '../doc_gen_configs'; -import { ExportInfo, ExportNameToTypedocNames, ExportPathToExportedItems, PackageJSON } from '../types'; +import { ExportInfo, ExportNameToTypedocNames, ExportPathToExportedItems } from '../types'; import { utils } from './utils'; diff --git a/packages/monorepo-scripts/src/utils/utils.ts b/packages/monorepo-scripts/src/utils/utils.ts index 28c5658f3..20a6932c3 100644 --- a/packages/monorepo-scripts/src/utils/utils.ts +++ b/packages/monorepo-scripts/src/utils/utils.ts @@ -1,3 +1,4 @@ +import { PackageJSON } from '@0x/types'; import batchPackages = require('@lerna/batch-packages'); import * as fs from 'fs'; import * as _ from 'lodash'; @@ -5,7 +6,7 @@ import { exec as execAsync } from 'promisify-child-process'; import semver = require('semver'); import { constants } from '../constants'; -import { GitTagsByPackageName, Package, PackageJSON, UpdatedPackage } from '../types'; +import { GitTagsByPackageName, Package, UpdatedPackage } from '../types'; import { changelogUtils } from './changelog_utils'; @@ -13,6 +14,11 @@ export const utils = { log(...args: any[]): void { console.log(...args); // tslint:disable-line:no-console }, + readJSONFile(path: string): T { + const JSONString = fs.readFileSync(path, 'utf8'); + const parsed: T = JSON.parse(JSONString); + return parsed; + }, getTopologicallySortedPackages(rootDir: string): Package[] { const packages = utils.getPackages(rootDir); const batchedPackages: PackageJSON[] = _.flatten(batchPackages(_.map(packages, pkg => pkg.packageJson), false)); @@ -23,8 +29,7 @@ export const utils = { return topsortedPackages; }, getPackages(rootDir: string): Package[] { - const rootPackageJsonString = fs.readFileSync(`${rootDir}/package.json`, 'utf8'); - const rootPackageJson = JSON.parse(rootPackageJsonString); + const rootPackageJson = utils.readJSONFile(`${rootDir}/package.json`); if (_.isUndefined(rootPackageJson.workspaces)) { throw new Error(`Did not find 'workspaces' key in root package.json`); } @@ -40,8 +45,7 @@ export const utils = { } const pathToPackageJson = `${rootDir}/${workspacePath}${subpackageName}`; try { - const packageJsonString = fs.readFileSync(`${pathToPackageJson}/package.json`, 'utf8'); - const packageJson = JSON.parse(packageJsonString); + const packageJson = utils.readJSONFile(`${pathToPackageJson}/package.json`); const pkg = { location: pathToPackageJson, packageJson, diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index efee3eb8a..743acacaa 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -195,9 +195,7 @@ export class Compiler { path.basename(contractSource.path, constants.SOLIDITY_FILE_EXTENSION), ); } else { - contractNamesToCompile = this._specifiedContracts.map(specifiedContract => - path.basename(specifiedContract, constants.SOLIDITY_FILE_EXTENSION), - ); + return this._specifiedContracts; } return contractNamesToCompile; } @@ -217,12 +215,9 @@ export class Compiler { for (const contractName of contractNames) { const spyResolver = new SpyResolver(this._resolver); const contractSource = spyResolver.resolve(contractName); - const sourceTreeHashHex = getSourceTreeHash( - spyResolver, - path.join(this._contractsDir, contractSource.path), - ).toString('hex'); + const sourceTreeHashHex = getSourceTreeHash(spyResolver, contractSource.path).toString('hex'); const contractData = { - contractName, + contractName: path.basename(contractName, constants.SOLIDITY_FILE_EXTENSION), currentArtifactIfExists: await getContractArtifactIfExistsAsync(this._artifactsDir, contractName), sourceTreeHashHex: `0x${sourceTreeHashHex}`, }; diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts index c75f76dac..dffd07b1d 100644 --- a/packages/sol-compiler/src/utils/compiler.ts +++ b/packages/sol-compiler/src/utils/compiler.ts @@ -26,7 +26,10 @@ export async function getContractArtifactIfExistsAsync( contractName: string, ): Promise { let contractArtifact; - const currentArtifactPath = `${artifactsDir}/${contractName}.json`; + const currentArtifactPath = `${artifactsDir}/${path.basename( + contractName, + constants.SOLIDITY_FILE_EXTENSION, + )}.json`; try { const opts = { encoding: 'utf8', diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 49f788fb0..dec386ccf 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -685,3 +685,23 @@ export interface DutchAuctionDetails { currentAmount: BigNumber; currentTimeSeconds: BigNumber; } + +export interface PackageJSON { + private?: boolean; + version: string; + name: string; + main?: string; + scripts?: { [command: string]: string }; + config?: { + postpublish?: { + assets?: string[]; + docOmitExports?: string[]; + dockerHubRepo?: string; + }; + 'abis:comment'?: string; + abis?: string; + }; + dependencies?: { [dependencyName: string]: string }; + devDependencies?: { [dependencyName: string]: string }; + workspaces?: string[]; +} diff --git a/tsconfig.json b/tsconfig.json index 0a063c85b..bfa83503e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,6 +40,7 @@ { "path": "./packages/contract-addresses" }, { "path": "./packages/contract-artifacts" }, { "path": "./packages/contract-wrappers" }, + { "path": "./packages/contracts-gen" }, { "path": "./packages/dev-utils" }, { "path": "./packages/ethereum-types" }, { "path": "./packages/fill-scenarios" }, diff --git a/yarn.lock b/yarn.lock index 3bc39a830..477e020c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1591,6 +1591,11 @@ version "0.0.29" resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c" +"@types/prettier@^1.15.2": + version "1.15.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.15.2.tgz#91594ea7cb6f3b1f7ea69f32621246654c7cc231" + integrity sha512-XIB0ZCaFZmWUHAa9dBqP5UKXXHwuukmVlP+XcyU94dui2k+l2lG+CHAbt2ffenHPUqoIs5Beh8Pdf2YEq/CZ7A== + "@types/prop-types@*": version "15.5.5" resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.5.tgz#17038dd322c2325f5da650a94d5f9974943625e3" @@ -7920,7 +7925,8 @@ got@^6.7.1: graceful-fs@4.1.15, graceful-fs@^3.0.0, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~1.2.0: version "4.1.15" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -12950,6 +12956,11 @@ prettier@^1.14.3, prettier@^1.15.3: version "1.15.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a" +prettier@^1.16.3: + version "1.16.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" + integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== + pretty-bytes@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84" @@ -13495,15 +13506,6 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react-dom@^16.4.2: - version "16.7.0" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.12.0" - react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13561,8 +13563,8 @@ react-highlight@0xproject/react-highlight#fix/react-version: dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" - react "^16.4.2" - react-dom "^16.4.2" + react "^16.5.2" + react-dom "^16.5.2" react-hot-loader@^4.3.3: version "4.3.4" @@ -13830,15 +13832,6 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react@^16.4.2: - version "16.7.0" - resolved "https://registry.npmjs.org/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.12.0" - react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14727,13 +14720,6 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" -scheduler@^0.12.0: - version "0.12.0" - resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -15134,6 +15120,7 @@ smart-buffer@^4.0.1: snake-case@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f" + integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8= dependencies: no-case "^2.2.0" @@ -16300,6 +16287,7 @@ to-regex@^3.0.1, to-regex@^3.0.2: to-snake-case@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-snake-case/-/to-snake-case-1.0.0.tgz#ce746913897946019a87e62edfaeaea4c608ab8c" + integrity sha1-znRpE4l5RgGah+Yu366upMYIq4w= dependencies: to-space-case "^1.0.0" -- cgit v1.2.3 From 31d1390039aec962153e33884a7c0585561bd946 Mon Sep 17 00:00:00 2001 From: Fabio B Date: Mon, 4 Feb 2019 12:52:36 +0100 Subject: Update packages/contracts-gen/README.md Co-Authored-By: LogvinovLeon --- packages/contracts-gen/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-gen/README.md b/packages/contracts-gen/README.md index b32fa53cc..feaf9e65f 100644 --- a/packages/contracts-gen/README.md +++ b/packages/contracts-gen/README.md @@ -20,7 +20,7 @@ You should run this tool after each time you move your contracts around to regen This tool does the following: -- Reads your `compiler.json`. Specifically list of smart contracts. +- Reads your `compiler.json`. Specifically the list of smart contracts. - Creates `wrapper.ts` file which exports all contract wrappers. - Creates `artifacts.ts` file which exports all contract artifacts. - Generates list of JSON artifact files in `tsconfig.json` -- cgit v1.2.3 From 129ae3a737e0ab32be8e25dc2504bcf31a564cef Mon Sep 17 00:00:00 2001 From: Fabio B Date: Mon, 4 Feb 2019 12:56:18 +0100 Subject: Update packages/contracts-gen/src/index.ts Co-Authored-By: LogvinovLeon --- packages/contracts-gen/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-gen/src/index.ts b/packages/contracts-gen/src/index.ts index 4863ab794..c5f4b01f1 100644 --- a/packages/contracts-gen/src/index.ts +++ b/packages/contracts-gen/src/index.ts @@ -1,6 +1,6 @@ /** * This module is a CLI tool. As soon as you run it - it starts doing stuff. * At the same time - our installation tests assume that you can import package without causing side effects. - * That's why our main entry point it empty. No side effects. But out secondary entry poing - contracts-gen.ts is a CLI tool and starts running as soon as you import/run it. + * That's why our main entry point it empty. No side effects. But our secondary entry point - contracts-gen.ts is a CLI tool and starts running as soon as you import/run it. */ export {}; -- cgit v1.2.3 From 47357ddec84fedb9e449edf6a75d3c7ab295aa6b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 4 Feb 2019 12:58:19 +0100 Subject: Remove redundant dependencies --- packages/monorepo-scripts/package.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index e6273fd60..187a80c93 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -8,9 +8,6 @@ "description": "Helper scripts for the monorepo", "main": "lib/index.js", "types": "lib/index.d.ts", - "bin": { - "contracts-gen": "bin/contracts-gen.js" - }, "scripts": { "build": "tsc -b", "build:ci": "yarn build", @@ -39,7 +36,6 @@ "@types/mkdirp": "^0.5.2", "@types/node": "*", "@types/opn": "^5.1.0", - "@types/prettier": "^1.15.2", "@types/rimraf": "^2.0.2", "@types/semver": "5.5.0", "@types/yargs": "^10.0.0", @@ -52,20 +48,17 @@ }, "dependencies": { "@0x/utils": "^3.0.1", - "@0x/types": "^1.5.2", "@lerna/batch-packages": "^3.0.0-beta.18", "@types/depcheck": "^0.6.0", "async-child-process": "^1.1.1", "chalk": "^2.3.0", "es6-promisify": "^5.0.0", - "ethereum-types": "^1.1.6", "glob": "^7.1.2", "isomorphic-fetch": "2.2.1", "lodash": "^4.17.5", "mkdirp": "^0.5.1", "moment": "2.21.0", "opn": "^5.3.0", - "prettier": "^1.16.3", "promisify-child-process": "^1.0.5", "prompt": "^1.0.0", "publish-release": "0xproject/publish-release", @@ -73,7 +66,6 @@ "semver": "5.5.0", "semver-diff": "^2.1.0", "semver-sort": "0.0.4", - "snake-case": "^2.1.0", "typedoc": "0.13.0", "yargs": "^10.0.3" }, -- cgit v1.2.3 From 1a88eac9c7e8f30f5d1f57132a48e59abd912d41 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 4 Feb 2019 13:00:15 +0100 Subject: Make the banner more visible --- contracts/asset-proxy/src/artifacts.ts | 6 +++++- contracts/asset-proxy/src/wrappers.ts | 6 +++++- contracts/erc20/src/artifacts.ts | 6 +++++- contracts/erc20/src/wrappers.ts | 6 +++++- contracts/erc721/src/artifacts.ts | 6 +++++- contracts/erc721/src/wrappers.ts | 6 +++++- contracts/exchange-forwarder/src/artifacts.ts | 6 +++++- contracts/exchange-forwarder/src/wrappers.ts | 6 +++++- contracts/exchange-libs/src/artifacts.ts | 6 +++++- contracts/exchange-libs/src/wrappers.ts | 6 +++++- contracts/exchange/src/artifacts.ts | 6 +++++- contracts/exchange/src/wrappers.ts | 6 +++++- contracts/extensions/src/artifacts.ts | 6 +++++- contracts/extensions/src/wrappers.ts | 6 +++++- contracts/multisig/src/artifacts.ts | 6 +++++- contracts/multisig/src/wrappers.ts | 6 +++++- contracts/utils/src/artifacts.ts | 6 +++++- contracts/utils/src/wrappers.ts | 6 +++++- packages/contracts-gen/src/contracts-gen.ts | 10 +++++++--- 19 files changed, 97 insertions(+), 21 deletions(-) diff --git a/contracts/asset-proxy/src/artifacts.ts b/contracts/asset-proxy/src/artifacts.ts index 87b80d075..d82c0537e 100644 --- a/contracts/asset-proxy/src/artifacts.ts +++ b/contracts/asset-proxy/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; diff --git a/contracts/asset-proxy/src/wrappers.ts b/contracts/asset-proxy/src/wrappers.ts index 4bff2f423..f8cd342c0 100644 --- a/contracts/asset-proxy/src/wrappers.ts +++ b/contracts/asset-proxy/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/dummy_erc20_token'; export * from '../generated-wrappers/dummy_erc721_receiver'; export * from '../generated-wrappers/dummy_erc721_token'; diff --git a/contracts/erc20/src/artifacts.ts b/contracts/erc20/src/artifacts.ts index 0627b98cf..c97a73195 100644 --- a/contracts/erc20/src/artifacts.ts +++ b/contracts/erc20/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; diff --git a/contracts/erc20/src/wrappers.ts b/contracts/erc20/src/wrappers.ts index b66c3b1ca..40193e7d8 100644 --- a/contracts/erc20/src/wrappers.ts +++ b/contracts/erc20/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/dummy_erc20_token'; export * from '../generated-wrappers/dummy_multiple_return_erc20_token'; export * from '../generated-wrappers/dummy_no_return_erc20_token'; diff --git a/contracts/erc721/src/artifacts.ts b/contracts/erc721/src/artifacts.ts index daa29a83c..79a76e21b 100644 --- a/contracts/erc721/src/artifacts.ts +++ b/contracts/erc721/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json'; diff --git a/contracts/erc721/src/wrappers.ts b/contracts/erc721/src/wrappers.ts index 909e05868..716f6cca4 100644 --- a/contracts/erc721/src/wrappers.ts +++ b/contracts/erc721/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/dummy_erc721_receiver'; export * from '../generated-wrappers/dummy_erc721_token'; export * from '../generated-wrappers/erc721_token'; diff --git a/contracts/exchange-forwarder/src/artifacts.ts b/contracts/exchange-forwarder/src/artifacts.ts index 39295b797..94bcdf84a 100644 --- a/contracts/exchange-forwarder/src/artifacts.ts +++ b/contracts/exchange-forwarder/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; diff --git a/contracts/exchange-forwarder/src/wrappers.ts b/contracts/exchange-forwarder/src/wrappers.ts index a023f878c..cbe72c5cf 100644 --- a/contracts/exchange-forwarder/src/wrappers.ts +++ b/contracts/exchange-forwarder/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/dummy_erc20_token'; export * from '../generated-wrappers/dummy_erc721_token'; export * from '../generated-wrappers/exchange'; diff --git a/contracts/exchange-libs/src/artifacts.ts b/contracts/exchange-libs/src/artifacts.ts index 5e660e1a8..861d6f3d2 100644 --- a/contracts/exchange-libs/src/artifacts.ts +++ b/contracts/exchange-libs/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as LibAbiEncoder from '../generated-artifacts/LibAbiEncoder.json'; diff --git a/contracts/exchange-libs/src/wrappers.ts b/contracts/exchange-libs/src/wrappers.ts index 840886181..05244d87b 100644 --- a/contracts/exchange-libs/src/wrappers.ts +++ b/contracts/exchange-libs/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/lib_abi_encoder'; export * from '../generated-wrappers/lib_asset_proxy_errors'; export * from '../generated-wrappers/lib_constants'; diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts index e49aea10b..efdacd376 100644 --- a/contracts/exchange/src/artifacts.ts +++ b/contracts/exchange/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts index eca3c1c89..1c1d7fdb4 100644 --- a/contracts/exchange/src/wrappers.ts +++ b/contracts/exchange/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/dummy_erc20_token'; export * from '../generated-wrappers/dummy_erc721_token'; export * from '../generated-wrappers/dummy_no_return_erc20_token'; diff --git a/contracts/extensions/src/artifacts.ts b/contracts/extensions/src/artifacts.ts index 6db3daecc..efa5c859c 100644 --- a/contracts/extensions/src/artifacts.ts +++ b/contracts/extensions/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as BalanceThresholdFilter from '../generated-artifacts/BalanceThresholdFilter.json'; diff --git a/contracts/extensions/src/wrappers.ts b/contracts/extensions/src/wrappers.ts index d34cca292..1a67d2ee3 100644 --- a/contracts/extensions/src/wrappers.ts +++ b/contracts/extensions/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/balance_threshold_filter'; export * from '../generated-wrappers/dummy_erc20_token'; export * from '../generated-wrappers/dummy_erc721_token'; diff --git a/contracts/multisig/src/artifacts.ts b/contracts/multisig/src/artifacts.ts index 37aa9d4ef..7d8a85884 100644 --- a/contracts/multisig/src/artifacts.ts +++ b/contracts/multisig/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as AssetProxyOwner from '../generated-artifacts/AssetProxyOwner.json'; diff --git a/contracts/multisig/src/wrappers.ts b/contracts/multisig/src/wrappers.ts index fc46799d0..81aab39da 100644 --- a/contracts/multisig/src/wrappers.ts +++ b/contracts/multisig/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/asset_proxy_owner'; export * from '../generated-wrappers/mixin_authorizable'; export * from '../generated-wrappers/multi_sig_wallet'; diff --git a/contracts/utils/src/artifacts.ts b/contracts/utils/src/artifacts.ts index 26f665eec..15a1abedf 100644 --- a/contracts/utils/src/artifacts.ts +++ b/contracts/utils/src/artifacts.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ import { ContractArtifact } from 'ethereum-types'; import * as IOwnable from '../generated-artifacts/IOwnable.json'; diff --git a/contracts/utils/src/wrappers.ts b/contracts/utils/src/wrappers.ts index fc8e4584a..8748cb074 100644 --- a/contracts/utils/src/wrappers.ts +++ b/contracts/utils/src/wrappers.ts @@ -1,4 +1,8 @@ -// This file is auto-generated by contracts-gen. Don't edit manually. +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ export * from '../generated-wrappers/i_ownable'; export * from '../generated-wrappers/lib_bytes'; export * from '../generated-wrappers/ownable'; diff --git a/packages/contracts-gen/src/contracts-gen.ts b/packages/contracts-gen/src/contracts-gen.ts index 0695d9c98..0160a8204 100644 --- a/packages/contracts-gen/src/contracts-gen.ts +++ b/packages/contracts-gen/src/contracts-gen.ts @@ -14,7 +14,11 @@ const SOLIDITY_EXTENSION = '.sol'; const DEFAULT_ARTIFACTS_DIR = 'artifacts'; const DEFAULT_CONTRACTS_DIR = 'contracts'; const DEFAULT_WRAPPERS_DIR = 'generated-wrappers'; -const AUTO_GENERATED_BANNER = `This file is auto-generated by contracts-gen. Don't edit manually.`; +const AUTO_GENERATED_BANNER = `/* +* ----------------------------------------------------------------------------- +* Warning: This file is auto-generated by contracts-gen. Don't edit manually. +* ----------------------------------------------------------------------------- +*/`; const AUTO_GENERATED_BANNER_FOR_LISTS = `This list is auto-generated by contracts-gen. Don't edit manually.`; (async () => { @@ -82,7 +86,7 @@ function generateArtifactsTs(contracts: string[], artifactsDir: string, prettier } }); const artifactsTs = ` - // ${AUTO_GENERATED_BANNER} + ${AUTO_GENERATED_BANNER} import { ContractArtifact } from 'ethereum-types'; ${sortedImports.join('\n')} @@ -102,7 +106,7 @@ function generateWrappersTs(contracts: string[], wrappersDir: string, prettierCo }); const sortedImports = _.sortBy(imports); const wrappersTs = ` - // ${AUTO_GENERATED_BANNER} + ${AUTO_GENERATED_BANNER} ${sortedImports.join('\n')} `; const WRAPPERS_TS_FILE_PATH = 'src/wrappers.ts'; -- cgit v1.2.3 From 4d75681357b04ae77637ee62645b662796a3b15b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 4 Feb 2019 13:11:20 +0100 Subject: Add @0x/types dependency --- packages/monorepo-scripts/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 187a80c93..6904a793b 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -48,6 +48,7 @@ }, "dependencies": { "@0x/utils": "^3.0.1", + "@0x/types": "^1.5.2", "@lerna/batch-packages": "^3.0.0-beta.18", "@types/depcheck": "^0.6.0", "async-child-process": "^1.1.1", -- cgit v1.2.3 From 95526767836c81949213da7e1c44d4e02fdffc71 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 1 Feb 2019 14:54:37 -0800 Subject: Add schema validation to getOrderHashBuff --- packages/order-utils/src/order_hash.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts index c8e9be71e..b15ccacf7 100644 --- a/packages/order-utils/src/order_hash.ts +++ b/packages/order-utils/src/order_hash.ts @@ -51,6 +51,17 @@ export const orderHashUtils = { * @return A Buffer containing the resulting orderHash from hashing the supplied order */ getOrderHashBuffer(order: SignedOrder | Order): Buffer { + try { + assert.doesConformToSchema('order', order, schemas.orderSchema, [schemas.hexSchema]); + } catch (error) { + if (_.includes(error.message, INVALID_TAKER_FORMAT)) { + const errMsg = + 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS'; + throw new Error(errMsg); + } + throw error; + } + const typedData = eip712Utils.createOrderTypedData(order); const orderHashBuff = signTypedDataUtils.generateTypedDataHash(typedData); return orderHashBuff; -- cgit v1.2.3 From 1ada6796631ad4e281423407f6eb2602a16f119e Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 1 Feb 2019 14:55:36 -0800 Subject: Update ZeroExTransactionSchema --- .../json-schemas/schemas/zero_ex_transaction_schema.json | 1 + packages/order-utils/src/eip712_utils.ts | 9 +++------ packages/order-utils/test/eip712_utils_test.ts | 14 ++++++-------- packages/types/src/index.ts | 5 +++++ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/json-schemas/schemas/zero_ex_transaction_schema.json b/packages/json-schemas/schemas/zero_ex_transaction_schema.json index 0c714f14d..726886e20 100644 --- a/packages/json-schemas/schemas/zero_ex_transaction_schema.json +++ b/packages/json-schemas/schemas/zero_ex_transaction_schema.json @@ -1,6 +1,7 @@ { "id": "/zeroExTransactionSchema", "properties": { + "verifyingContractAddress": { "$ref": "/addressSchema" }, "data": { "$ref": "/hexSchema" }, "signerAddress": { "$ref": "/addressSchema" }, "salt": { "$ref": "/wholeNumberSchema" } diff --git a/packages/order-utils/src/eip712_utils.ts b/packages/order-utils/src/eip712_utils.ts index 385fda989..646d9e301 100644 --- a/packages/order-utils/src/eip712_utils.ts +++ b/packages/order-utils/src/eip712_utils.ts @@ -63,11 +63,8 @@ export const eip712Utils = { * @param exchangeAddress The address of the exchange contract * @return A typed data object */ - createZeroExTransactionTypedData: ( - zeroExTransaction: ZeroExTransaction, - exchangeAddress: string, - ): EIP712TypedData => { - assert.isETHAddressHex('exchangeAddress', exchangeAddress); + createZeroExTransactionTypedData: (zeroExTransaction: ZeroExTransaction): EIP712TypedData => { + assert.isETHAddressHex('verifyingContractAddress', zeroExTransaction.verifyingContractAddress); assert.doesConformToSchema('zeroExTransaction', zeroExTransaction, schemas.zeroExTransactionSchema); const normalizedTransaction = _.mapValues(zeroExTransaction, value => { return !_.isString(value) ? value.toString() : value; @@ -76,7 +73,7 @@ export const eip712Utils = { constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.name, { ZeroExTransaction: constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.parameters }, normalizedTransaction, - exchangeAddress, + zeroExTransaction.verifyingContractAddress, ); return typedData; }, diff --git a/packages/order-utils/test/eip712_utils_test.ts b/packages/order-utils/test/eip712_utils_test.ts index a54e49958..fb9388fcc 100644 --- a/packages/order-utils/test/eip712_utils_test.ts +++ b/packages/order-utils/test/eip712_utils_test.ts @@ -29,14 +29,12 @@ describe('EIP712 Utils', () => { }); describe('createTypedData', () => { it('adds in the EIP712DomainSeparator', () => { - const typedData = eip712Utils.createZeroExTransactionTypedData( - { - salt: new BigNumber('0'), - data: constants.NULL_BYTES, - signerAddress: constants.NULL_ADDRESS, - }, - constants.NULL_ADDRESS, - ); + const typedData = eip712Utils.createZeroExTransactionTypedData({ + salt: new BigNumber('0'), + data: constants.NULL_BYTES, + signerAddress: constants.NULL_ADDRESS, + verifyingContractAddress: constants.NULL_ADDRESS, + }); expect(typedData.primaryType).to.eq(constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.name); expect(typedData.types.EIP712Domain).to.not.be.undefined(); }); diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 49f788fb0..ce124e289 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -45,11 +45,16 @@ export interface SignedOrder extends Order { * ZeroExTransaction for use with 0x Exchange executeTransaction */ export interface ZeroExTransaction { + verifyingContractAddress: string; salt: BigNumber; signerAddress: string; data: string; } +export interface SignedZeroExTransaction extends ZeroExTransaction { + signature: string; +} + /** * Elliptic Curve signature */ -- cgit v1.2.3 From c7c4cb9bc6824f12adf352253464c76f177b4914 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 1 Feb 2019 16:11:15 -0800 Subject: Add transaction hash utils --- packages/order-utils/src/eip712_utils.ts | 9 ++-- packages/order-utils/src/index.ts | 2 + packages/order-utils/src/transaction_hash.ts | 46 ++++++++++++++++++ packages/order-utils/test/transaction_hash_test.ts | 56 ++++++++++++++++++++++ 4 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 packages/order-utils/src/transaction_hash.ts create mode 100644 packages/order-utils/test/transaction_hash_test.ts diff --git a/packages/order-utils/src/eip712_utils.ts b/packages/order-utils/src/eip712_utils.ts index 646d9e301..4b37dba41 100644 --- a/packages/order-utils/src/eip712_utils.ts +++ b/packages/order-utils/src/eip712_utils.ts @@ -11,16 +11,16 @@ export const eip712Utils = { * @param primaryType The primary type found in message * @param types The additional types for the data in message * @param message The contents of the message - * @param exchangeAddress The address of the exchange contract + * @param verifyingContractAddress The address of the verifying contract * @return A typed data object */ createTypedData: ( primaryType: string, types: EIP712Types, message: EIP712Object, - exchangeAddress: string, + verifyingContractAddress: string, ): EIP712TypedData => { - assert.isETHAddressHex('exchangeAddress', exchangeAddress); + assert.isETHAddressHex('verifyingContractAddress', verifyingContractAddress); assert.isString('primaryType', primaryType); const typedData = { types: { @@ -30,7 +30,7 @@ export const eip712Utils = { domain: { name: constants.EIP712_DOMAIN_NAME, version: constants.EIP712_DOMAIN_VERSION, - verifyingContract: exchangeAddress, + verifyingContract: verifyingContractAddress, }, message, primaryType, @@ -60,7 +60,6 @@ export const eip712Utils = { * Creates an ExecuteTransaction EIP712TypedData object for use with signTypedData and * 0x Exchange executeTransaction. * @param ZeroExTransaction the 0x transaction - * @param exchangeAddress The address of the exchange contract * @return A typed data object */ createZeroExTransactionTypedData: (zeroExTransaction: ZeroExTransaction): EIP712TypedData => { diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index 2150a02e4..26cbf9665 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -3,6 +3,7 @@ export { signatureUtils } from './signature_utils'; export { generatePseudoRandomSalt } from './salt'; export { assetDataUtils } from './asset_data_utils'; export { marketUtils } from './market_utils'; +export { transactionHashUtils } from './transaction_hash'; export { rateUtils } from './rate_utils'; export { sortingUtils } from './sorting_utils'; export { orderParsingUtils } from './parsing_utils'; @@ -51,6 +52,7 @@ export { EIP712Object, EIP712ObjectValue, ZeroExTransaction, + SignedZeroExTransaction, } from '@0x/types'; export { OrderError, diff --git a/packages/order-utils/src/transaction_hash.ts b/packages/order-utils/src/transaction_hash.ts new file mode 100644 index 000000000..2b2345af7 --- /dev/null +++ b/packages/order-utils/src/transaction_hash.ts @@ -0,0 +1,46 @@ +import { schemas, SchemaValidator } from '@0x/json-schemas'; +import { SignedZeroExTransaction, ZeroExTransaction } from '@0x/types'; +import { signTypedDataUtils } from '@0x/utils'; +import * as _ from 'lodash'; + +import { assert } from './assert'; +import { eip712Utils } from './eip712_utils'; + +export const transactionHashUtils = { + /** + * Checks if the supplied hex encoded 0x transaction hash is valid. + * Note: Valid means it has the expected format, not that a transaction with the transactionHash exists. + * Use this method when processing transactionHashes submitted as user input. + * @param transactionHash Hex encoded transactionHash. + * @return Whether the supplied transactionHash has the expected format. + */ + isValidTransactionHash(transactionHash: string): boolean { + // Since this method can be called to check if any arbitrary string conforms to an transactionHash's + // format, we only assert that we were indeed passed a string. + assert.isString('transactionHash', transactionHash); + const schemaValidator = new SchemaValidator(); + const isValid = schemaValidator.validate(transactionHash, schemas.orderHashSchema).valid; + return isValid; + }, + /** + * Computes the transactionHash for a supplied 0x transaction. + * @param transaction An object that conforms to the ZeroExTransaction or SignedZeroExTransaction interface definitions. + * @return Hex encoded string transactionHash from hashing the supplied order. + */ + getTransactionHashHex(transaction: ZeroExTransaction | SignedZeroExTransaction): string { + assert.doesConformToSchema('transaction', transaction, schemas.zeroExTransactionSchema, [schemas.hexSchema]); + const transactionHashBuff = transactionHashUtils.getTransactionHashBuffer(transaction); + const transactionHashHex = `0x${transactionHashBuff.toString('hex')}`; + return transactionHashHex; + }, + /** + * Computes the transactionHash for a supplied 0x transaction. + * @param transaction An object that conforms to the ZeroExTransaction or SignedZeroExTransaction interface definitions. + * @return A Buffer containing the resulting transactionHash from hashing the supplied 0x transaction. + */ + getTransactionHashBuffer(transaction: ZeroExTransaction | SignedZeroExTransaction): Buffer { + const typedData = eip712Utils.createZeroExTransactionTypedData(transaction); + const transactionHashBuff = signTypedDataUtils.generateTypedDataHash(typedData); + return transactionHashBuff; + }, +}; diff --git a/packages/order-utils/test/transaction_hash_test.ts b/packages/order-utils/test/transaction_hash_test.ts new file mode 100644 index 000000000..0c371c7c2 --- /dev/null +++ b/packages/order-utils/test/transaction_hash_test.ts @@ -0,0 +1,56 @@ +import { ZeroExTransaction } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import * as chai from 'chai'; +import 'mocha'; + +import { transactionHashUtils } from '../src'; + +import { constants } from '../src/constants'; + +import { chaiSetup } from './utils/chai_setup'; + +chaiSetup.configure(); +const expect = chai.expect; + +describe.only('0x transaction hashing', () => { + describe('#getTransactionHashHex', () => { + const expectedTransactionHash = '0x82c9bb2dcac4f868ec7a15c20ff6175cfc384c20ae6a872aa0342a840f108c2b'; + const fakeVerifyingContractAddress = '0x5e72914535f202659083db3a02c984188fa26e9f'; + const transaction: ZeroExTransaction = { + verifyingContractAddress: fakeVerifyingContractAddress, + signerAddress: constants.NULL_ADDRESS, + salt: new BigNumber(0), + data: constants.NULL_BYTES, + }; + it('calculates the transaction hash', async () => { + const transactionHash = transactionHashUtils.getTransactionHashHex(transaction); + expect(transactionHash).to.be.equal(expectedTransactionHash); + }); + it('calculates the transaction hash if amounts are strings', async () => { + // It's common for developers using javascript to provide the amounts + // as strings. Since we eventually toString() the BigNumber + // before encoding we should result in the same orderHash in this scenario + // tslint:disable-next-line:no-unnecessary-type-assertion + const transactionHash = transactionHashUtils.getTransactionHashHex({ + ...transaction, + salt: '0', + } as any); + expect(transactionHash).to.be.equal(expectedTransactionHash); + }); + }); + describe('#isValidTransactionHash', () => { + it('returns false if the value is not a hex string', () => { + const isValid = transactionHashUtils.isValidTransactionHash('not a hex'); + expect(isValid).to.be.false(); + }); + it('returns false if the length is wrong', () => { + const isValid = transactionHashUtils.isValidTransactionHash('0xdeadbeef'); + expect(isValid).to.be.false(); + }); + it('returns true if order hash is correct', () => { + const orderHashLength = 65; + const isValid = transactionHashUtils.isValidTransactionHash(`0x${Array(orderHashLength).join('0')}`); + expect(isValid).to.be.true(); + }); + }); +}); -- cgit v1.2.3 From a394967268be3f3d3f7da3507887ee88befee253 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Fri, 1 Feb 2019 16:28:29 -0800 Subject: Use new transaction schema throughout monorepo --- contracts/exchange/test/transactions.ts | 5 ++--- contracts/exchange/test/utils/exchange_wrapper.ts | 13 +++-------- contracts/test-utils/src/index.ts | 1 - contracts/test-utils/src/transaction_factory.ts | 26 +++++++++++----------- contracts/test-utils/src/types.ts | 8 ------- .../src/utils/transaction_encoder.ts | 3 ++- packages/order-utils/test/transaction_hash_test.ts | 2 +- 7 files changed, 21 insertions(+), 37 deletions(-) diff --git a/contracts/exchange/test/transactions.ts b/contracts/exchange/test/transactions.ts index 613953493..4f8c07579 100644 --- a/contracts/exchange/test/transactions.ts +++ b/contracts/exchange/test/transactions.ts @@ -8,14 +8,13 @@ import { OrderFactory, orderUtils, provider, - SignedTransaction, TransactionFactory, txDefaults, web3Wrapper, } from '@0x/contracts-test-utils'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils'; -import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types'; +import { OrderWithoutExchangeAddress, RevertReason, SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; @@ -41,7 +40,7 @@ describe('Exchange transactions', () => { let erc20Balances: ERC20BalancesByOwner; let signedOrder: SignedOrder; - let signedTx: SignedTransaction; + let signedTx: SignedZeroExTransaction; let orderWithoutExchangeAddress: OrderWithoutExchangeAddress; let orderFactory: OrderFactory; let makerTransactionFactory: TransactionFactory; diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts index eca535c65..03c37c4a9 100644 --- a/contracts/exchange/test/utils/exchange_wrapper.ts +++ b/contracts/exchange/test/utils/exchange_wrapper.ts @@ -1,14 +1,7 @@ import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; import { artifacts as erc721Artifacts } from '@0x/contracts-erc721'; -import { - FillResults, - formatters, - LogDecoder, - OrderInfo, - orderUtils, - SignedTransaction, -} from '@0x/contracts-test-utils'; -import { SignedOrder } from '@0x/types'; +import { FillResults, formatters, LogDecoder, OrderInfo, orderUtils } from '@0x/contracts-test-utils'; +import { SignedOrder, SignedZeroExTransaction } from '@0x/types'; import { AbiEncoder, BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; @@ -206,7 +199,7 @@ export class ExchangeWrapper { return tx; } public async executeTransactionAsync( - signedTx: SignedTransaction, + signedTx: SignedZeroExTransaction, from: string, ): Promise { const txHash = await this._exchange.executeTransaction.sendTransactionAsync( diff --git a/contracts/test-utils/src/index.ts b/contracts/test-utils/src/index.ts index 7880de0bf..5ac927e47 100644 --- a/contracts/test-utils/src/index.ts +++ b/contracts/test-utils/src/index.ts @@ -31,7 +31,6 @@ export { MarketBuyOrders, MarketSellOrders, ERC721TokenIdsByOwner, - SignedTransaction, OrderStatus, AllowanceAmountScenario, AssetDataScenario, diff --git a/contracts/test-utils/src/transaction_factory.ts b/contracts/test-utils/src/transaction_factory.ts index dbab3ade4..e6cd4c23f 100644 --- a/contracts/test-utils/src/transaction_factory.ts +++ b/contracts/test-utils/src/transaction_factory.ts @@ -1,10 +1,8 @@ -import { eip712Utils, generatePseudoRandomSalt } from '@0x/order-utils'; -import { SignatureType } from '@0x/types'; -import { signTypedDataUtils } from '@0x/utils'; +import { generatePseudoRandomSalt, transactionHashUtils } from '@0x/order-utils'; +import { SignatureType, SignedZeroExTransaction } from '@0x/types'; import * as ethUtil from 'ethereumjs-util'; import { signingUtils } from './signing_utils'; -import { SignedTransaction } from './types'; export class TransactionFactory { private readonly _signerBuff: Buffer; @@ -15,23 +13,25 @@ export class TransactionFactory { this._exchangeAddress = exchangeAddress; this._signerBuff = ethUtil.privateToAddress(this._privateKey); } - public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction { + public newSignedTransaction( + data: string, + signatureType: SignatureType = SignatureType.EthSign, + ): SignedZeroExTransaction { const salt = generatePseudoRandomSalt(); const signerAddress = `0x${this._signerBuff.toString('hex')}`; - const executeTransactionData = { + const transaction = { salt, signerAddress, data, + verifyingContractAddress: this._exchangeAddress, }; - const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, this._exchangeAddress); - const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData); - const signature = signingUtils.signMessage(eip712MessageBuffer, this._privateKey, signatureType); - const signedTx = { - exchangeAddress: this._exchangeAddress, + const transactionHashBuffer = transactionHashUtils.getTransactionHashBuffer(transaction); + const signature = signingUtils.signMessage(transactionHashBuffer, this._privateKey, signatureType); + const signedTransaction = { + ...transaction, signature: `0x${signature.toString('hex')}`, - ...executeTransactionData, }; - return signedTx; + return signedTransaction; } } diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts index 60cb2b102..16c3a9f3d 100644 --- a/contracts/test-utils/src/types.ts +++ b/contracts/test-utils/src/types.ts @@ -107,14 +107,6 @@ export enum ContractName { BalanceThresholdFilter = 'BalanceThresholdFilter', } -export interface SignedTransaction { - exchangeAddress: string; - salt: BigNumber; - signerAddress: string; - data: string; - signature: string; -} - export interface TransferAmountsByMatchOrders { // Left Maker amountBoughtByLeftMaker: BigNumber; diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts index 0cf08a8fe..c674abbe5 100644 --- a/packages/contract-wrappers/src/utils/transaction_encoder.ts +++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts @@ -28,11 +28,12 @@ export class TransactionEncoder { public getTransactionHex(data: string, salt: BigNumber, signerAddress: string): string { const exchangeAddress = this._getExchangeContract().address; const executeTransactionData = { + verifyingContractAddress: exchangeAddress, salt, signerAddress, data, }; - const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData, exchangeAddress); + const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData); const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData); const messageHex = `0x${eip712MessageBuffer.toString('hex')}`; return messageHex; diff --git a/packages/order-utils/test/transaction_hash_test.ts b/packages/order-utils/test/transaction_hash_test.ts index 0c371c7c2..c7ca33a64 100644 --- a/packages/order-utils/test/transaction_hash_test.ts +++ b/packages/order-utils/test/transaction_hash_test.ts @@ -12,7 +12,7 @@ import { chaiSetup } from './utils/chai_setup'; chaiSetup.configure(); const expect = chai.expect; -describe.only('0x transaction hashing', () => { +describe('0x transaction hashing', () => { describe('#getTransactionHashHex', () => { const expectedTransactionHash = '0x82c9bb2dcac4f868ec7a15c20ff6175cfc384c20ae6a872aa0342a840f108c2b'; const fakeVerifyingContractAddress = '0x5e72914535f202659083db3a02c984188fa26e9f'; -- cgit v1.2.3 From 9abd6f569538025f7777e78963cc8aa24ce0052b Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 3 Feb 2019 17:19:47 -0800 Subject: Allow custom domains in eip712Utils --- packages/order-utils/src/constants.ts | 10 +++--- packages/order-utils/src/eip712_utils.ts | 47 ++++++++++++++++++-------- packages/order-utils/src/index.ts | 10 +++++- packages/order-utils/src/order_hash.ts | 1 - packages/order-utils/test/eip712_utils_test.ts | 41 ++++++++++++++++++---- packages/types/src/index.ts | 6 ++++ 6 files changed, 88 insertions(+), 27 deletions(-) diff --git a/packages/order-utils/src/constants.ts b/packages/order-utils/src/constants.ts index a9a687719..3c93575b3 100644 --- a/packages/order-utils/src/constants.ts +++ b/packages/order-utils/src/constants.ts @@ -68,9 +68,9 @@ export const constants = { SELECTOR_CHAR_LENGTH_WITH_PREFIX: 10, INFINITE_TIMESTAMP_SEC: new BigNumber(2524604400), // Close to infinite ZERO_AMOUNT: new BigNumber(0), - EIP712_DOMAIN_NAME: '0x Protocol', - EIP712_DOMAIN_VERSION: '2', - EIP712_DOMAIN_SCHEMA: { + EXCHANGE_DOMAIN_NAME: '0x Protocol', + EXCHANGE_DOMAIN_VERSION: '2', + DEFAULT_DOMAIN_SCHEMA: { name: 'EIP712Domain', parameters: [ { name: 'name', type: 'string' }, @@ -78,7 +78,7 @@ export const constants = { { name: 'verifyingContract', type: 'address' }, ], }, - EIP712_ORDER_SCHEMA: { + EXCHANGE_ORDER_SCHEMA: { name: 'Order', parameters: [ { name: 'makerAddress', type: 'address' }, @@ -95,7 +95,7 @@ export const constants = { { name: 'takerAssetData', type: 'bytes' }, ], }, - EIP712_ZEROEX_TRANSACTION_SCHEMA: { + EXCHANGE_ZEROEX_TRANSACTION_SCHEMA: { name: 'ZeroExTransaction', parameters: [ { name: 'salt', type: 'uint256' }, diff --git a/packages/order-utils/src/eip712_utils.ts b/packages/order-utils/src/eip712_utils.ts index 4b37dba41..313653c63 100644 --- a/packages/order-utils/src/eip712_utils.ts +++ b/packages/order-utils/src/eip712_utils.ts @@ -1,36 +1,49 @@ import { assert } from '@0x/assert'; import { schemas } from '@0x/json-schemas'; -import { EIP712Object, EIP712TypedData, EIP712Types, Order, ZeroExTransaction } from '@0x/types'; +import { + EIP712DomainWithDefaultSchema, + EIP712Object, + EIP712TypedData, + EIP712Types, + Order, + ZeroExTransaction, +} from '@0x/types'; import * as _ from 'lodash'; import { constants } from './constants'; +export const DEFAULT_DOMAIN_SCHEMA = constants.DEFAULT_DOMAIN_SCHEMA; +export const EXCHANGE_DOMAIN_NAME = constants.EXCHANGE_DOMAIN_NAME; +export const EXCHANGE_DOMAIN_VERSION = constants.EXCHANGE_DOMAIN_VERSION; +export const EXCHANGE_ORDER_SCHEMA = constants.EXCHANGE_ORDER_SCHEMA; +export const EXCHANGE_ZEROEX_TRANSACTION_SCHEMA = constants.EXCHANGE_ZEROEX_TRANSACTION_SCHEMA; + export const eip712Utils = { /** * Creates a EIP712TypedData object specific to the 0x protocol for use with signTypedData. * @param primaryType The primary type found in message * @param types The additional types for the data in message * @param message The contents of the message - * @param verifyingContractAddress The address of the verifying contract + * @param domain Domain containing a name (optional), version (optional), and verifying contract address * @return A typed data object */ createTypedData: ( primaryType: string, types: EIP712Types, message: EIP712Object, - verifyingContractAddress: string, + domain: EIP712DomainWithDefaultSchema, ): EIP712TypedData => { - assert.isETHAddressHex('verifyingContractAddress', verifyingContractAddress); + assert.isETHAddressHex('verifyingContractAddress', domain.verifyingContractAddress); assert.isString('primaryType', primaryType); const typedData = { types: { - EIP712Domain: constants.EIP712_DOMAIN_SCHEMA.parameters, + EIP712Domain: DEFAULT_DOMAIN_SCHEMA.parameters, ...types, }, domain: { - name: constants.EIP712_DOMAIN_NAME, - version: constants.EIP712_DOMAIN_VERSION, - verifyingContract: verifyingContractAddress, + name: _.isUndefined(domain.name) ? EXCHANGE_DOMAIN_NAME : domain.name, + version: _.isUndefined(domain.version) ? EXCHANGE_DOMAIN_VERSION : domain.version, + verifyingContract: domain.verifyingContractAddress, }, message, primaryType, @@ -48,11 +61,14 @@ export const eip712Utils = { const normalizedOrder = _.mapValues(order, value => { return !_.isString(value) ? value.toString() : value; }); + const domain = { + verifyingContractAddress: order.exchangeAddress, + }; const typedData = eip712Utils.createTypedData( - constants.EIP712_ORDER_SCHEMA.name, - { Order: constants.EIP712_ORDER_SCHEMA.parameters }, + EXCHANGE_ORDER_SCHEMA.name, + { Order: EXCHANGE_ORDER_SCHEMA.parameters }, normalizedOrder, - order.exchangeAddress, + domain, ); return typedData; }, @@ -68,11 +84,14 @@ export const eip712Utils = { const normalizedTransaction = _.mapValues(zeroExTransaction, value => { return !_.isString(value) ? value.toString() : value; }); + const domain = { + verifyingContractAddress: zeroExTransaction.verifyingContractAddress, + }; const typedData = eip712Utils.createTypedData( - constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.name, - { ZeroExTransaction: constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.parameters }, + EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name, + { ZeroExTransaction: EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.parameters }, normalizedTransaction, - zeroExTransaction.verifyingContractAddress, + domain, ); return typedData; }, diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index 26cbf9665..436677efc 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -19,7 +19,14 @@ export { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export { BalanceAndProxyAllowanceLazyStore } from './store/balance_and_proxy_allowance_lazy_store'; export { OrderFilledCancelledLazyStore } from './store/order_filled_cancelled_lazy_store'; -export { eip712Utils } from './eip712_utils'; +export { + eip712Utils, + DEFAULT_DOMAIN_SCHEMA, + EXCHANGE_DOMAIN_NAME, + EXCHANGE_DOMAIN_VERSION, + EXCHANGE_ORDER_SCHEMA, + EXCHANGE_ZEROEX_TRANSACTION_SCHEMA, +} from './eip712_utils'; export { Provider, @@ -51,6 +58,7 @@ export { EIP712Types, EIP712Object, EIP712ObjectValue, + EIP712DomainWithDefaultSchema, ZeroExTransaction, SignedZeroExTransaction, } from '@0x/types'; diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts index b15ccacf7..3bc23c14e 100644 --- a/packages/order-utils/src/order_hash.ts +++ b/packages/order-utils/src/order_hash.ts @@ -61,7 +61,6 @@ export const orderHashUtils = { } throw error; } - const typedData = eip712Utils.createOrderTypedData(order); const orderHashBuff = signTypedDataUtils.generateTypedDataHash(typedData); return orderHashBuff; diff --git a/packages/order-utils/test/eip712_utils_test.ts b/packages/order-utils/test/eip712_utils_test.ts index fb9388fcc..4208e9beb 100644 --- a/packages/order-utils/test/eip712_utils_test.ts +++ b/packages/order-utils/test/eip712_utils_test.ts @@ -3,7 +3,12 @@ import * as chai from 'chai'; import 'mocha'; import { constants } from '../src/constants'; -import { eip712Utils } from '../src/eip712_utils'; +import { + eip712Utils, + EXCHANGE_DOMAIN_NAME, + EXCHANGE_DOMAIN_VERSION, + EXCHANGE_ZEROEX_TRANSACTION_SCHEMA, +} from '../src/eip712_utils'; import { chaiSetup } from './utils/chai_setup'; @@ -12,22 +17,42 @@ const expect = chai.expect; describe('EIP712 Utils', () => { describe('createTypedData', () => { - it('adds in the EIP712DomainSeparator', () => { + it('adds in the EIP712DomainSeparator with default values', () => { + const primaryType = 'Test'; + const typedData = eip712Utils.createTypedData( + primaryType, + { Test: [{ name: 'testValue', type: 'uint256' }] }, + { testValue: '1' }, + { verifyingContractAddress: constants.NULL_ADDRESS }, + ); + expect(typedData.domain).to.not.be.undefined(); + expect(typedData.types.EIP712Domain).to.not.be.undefined(); + const domainObject = typedData.domain; + expect(domainObject.name).to.eq(EXCHANGE_DOMAIN_NAME); + expect(domainObject.version).to.eq(EXCHANGE_DOMAIN_VERSION); + expect(domainObject.verifyingContract).to.eq(constants.NULL_ADDRESS); + expect(typedData.primaryType).to.eq(primaryType); + }); + it('adds in the EIP712DomainSeparator without default values', () => { const primaryType = 'Test'; + const domainName = 'testDomain'; + const domainVersion = 'testVersion'; const typedData = eip712Utils.createTypedData( primaryType, { Test: [{ name: 'testValue', type: 'uint256' }] }, { testValue: '1' }, - constants.NULL_ADDRESS, + { name: domainName, version: domainVersion, verifyingContractAddress: constants.NULL_ADDRESS }, ); expect(typedData.domain).to.not.be.undefined(); expect(typedData.types.EIP712Domain).to.not.be.undefined(); const domainObject = typedData.domain; - expect(domainObject.name).to.eq(constants.EIP712_DOMAIN_NAME); + expect(domainObject.name).to.eq(domainName); + expect(domainObject.version).to.eq(domainVersion); + expect(domainObject.verifyingContract).to.eq(constants.NULL_ADDRESS); expect(typedData.primaryType).to.eq(primaryType); }); }); - describe('createTypedData', () => { + describe('createZeroExTransactionTypedData', () => { it('adds in the EIP712DomainSeparator', () => { const typedData = eip712Utils.createZeroExTransactionTypedData({ salt: new BigNumber('0'), @@ -35,8 +60,12 @@ describe('EIP712 Utils', () => { signerAddress: constants.NULL_ADDRESS, verifyingContractAddress: constants.NULL_ADDRESS, }); - expect(typedData.primaryType).to.eq(constants.EIP712_ZEROEX_TRANSACTION_SCHEMA.name); + expect(typedData.primaryType).to.eq(EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name); expect(typedData.types.EIP712Domain).to.not.be.undefined(); + const domainObject = typedData.domain; + expect(domainObject.name).to.eq(EXCHANGE_DOMAIN_NAME); + expect(domainObject.version).to.eq(EXCHANGE_DOMAIN_VERSION); + expect(domainObject.verifyingContract).to.eq(constants.NULL_ADDRESS); }); }); }); diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index ce124e289..a30a0494f 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -690,3 +690,9 @@ export interface DutchAuctionDetails { currentAmount: BigNumber; currentTimeSeconds: BigNumber; } + +export interface EIP712DomainWithDefaultSchema { + name?: string; + version?: string; + verifyingContractAddress: string; +} -- cgit v1.2.3 From 4514da0646983f5b6216e382ff3f61e816a6b451 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 3 Feb 2019 21:08:44 -0800 Subject: Update CHANGELOGs --- contracts/test-utils/CHANGELOG.json | 4 ++++ packages/contract-wrappers/CHANGELOG.json | 4 ++++ packages/json-schemas/CHANGELOG.json | 4 ++++ packages/order-utils/CHANGELOG.json | 17 +++++++++++++++++ packages/types/CHANGELOG.json | 8 ++++++++ 5 files changed, 37 insertions(+) diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 51b726e82..0c6174313 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Import `ZeroExTransaction` type instead of using type defined in this package", + "pr": 1576 } ], "timestamp": 1549373905 diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 413563f80..3d747b396 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Fix OrderValidatorWrapper constructor to use the correct address", "pr": 1568 + }, + { + "note": "Use new `ZeroExTransaction` interface", + "pr": 1576 } ], "timestamp": 1549373905 diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 869f8bdf1..e174975d1 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Add `verifyingContractAddress` to `zeroExTransactionSchema`", + "pr": 1576 } ], "timestamp": 1549373905 diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 5169208c9..b13ce197a 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,21 @@ [ + { + "version": "5.0.0", + "changes": [ + { + "note": "Add `transactionHashUtils`", + "pr": 1576 + }, + { + "note": "Refactor `eip712Utils` to allow custom domain params", + "pr": 1576 + }, + { + "note": "Export constant EIP712 params", + "pr": 1576 + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index b9ddb5acf..c2a54f824 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -5,6 +5,14 @@ { "note": "Upgrade the bignumber.js to v8.0.2", "pr": 1517 + }, + { + "note": "Update `ZeroExTransaction` type and add `SignedZeroExTransaction` type", + "pr": 1576 + }, + { + "note": "Add `EIP712DomainWithDefaultSchema` type", + "pr": 1576 } ], "timestamp": 1549373905 -- cgit v1.2.3 From 8246dec84342138319b9eaf4778862a8e4770851 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 4 Feb 2019 09:47:10 -0800 Subject: Rename getTransactionHex to getTransactionHashHex for clarity --- packages/contract-wrappers/CHANGELOG.json | 6 +++++- .../contract-wrappers/src/utils/transaction_encoder.ts | 18 ++++++++---------- .../contract-wrappers/test/transaction_encoder_test.ts | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 3d747b396..ae3176537 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "6.0.1", + "version": "7.0.0", "changes": [ { "note": "Fix OrderValidatorWrapper constructor to use the correct address", @@ -9,6 +9,10 @@ { "note": "Use new `ZeroExTransaction` interface", "pr": 1576 + }, + { + "note": "Rename `getTransactionHex` to `getTransactionHashHex`", + "pr": 1576 } ], "timestamp": 1549373905 diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts index c674abbe5..307487a9b 100644 --- a/packages/contract-wrappers/src/utils/transaction_encoder.ts +++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts @@ -1,9 +1,9 @@ import { ExchangeContract } from '@0x/abi-gen-wrappers'; import { schemas } from '@0x/json-schemas'; -import { eip712Utils } from '@0x/order-utils'; +import { transactionHashUtils } from '@0x/order-utils'; import { Order, SignedOrder } from '@0x/types'; -import { BigNumber, signTypedDataUtils } from '@0x/utils'; +import { BigNumber } from '@0x/utils'; import _ = require('lodash'); import { assert } from './assert'; @@ -19,24 +19,22 @@ export class TransactionEncoder { this._exchangeInstance = exchangeInstance; } /** - * Encodes the transaction data for use with the Exchange contract. + * Hashes the transaction data for use with the Exchange contract. * @param data The ABI Encoded 0x Exchange method. I.e fillOrder * @param salt A random value to provide uniqueness and prevent replay attacks. * @param signerAddress The address which will sign this transaction. - * @return An unsigned hex encoded transaction for use in 0x Exchange executeTransaction. + * @return The hash of the 0x transaction. */ - public getTransactionHex(data: string, salt: BigNumber, signerAddress: string): string { + public getTransactionHashHex(data: string, salt: BigNumber, signerAddress: string): string { const exchangeAddress = this._getExchangeContract().address; - const executeTransactionData = { + const transaction = { verifyingContractAddress: exchangeAddress, salt, signerAddress, data, }; - const typedData = eip712Utils.createZeroExTransactionTypedData(executeTransactionData); - const eip712MessageBuffer = signTypedDataUtils.generateTypedDataHash(typedData); - const messageHex = `0x${eip712MessageBuffer.toString('hex')}`; - return messageHex; + const hashHex = transactionHashUtils.getTransactionHashHex(transaction); + return hashHex; } /** * Encodes a fillOrder transaction. diff --git a/packages/contract-wrappers/test/transaction_encoder_test.ts b/packages/contract-wrappers/test/transaction_encoder_test.ts index ef9eb2cf3..a996b9f08 100644 --- a/packages/contract-wrappers/test/transaction_encoder_test.ts +++ b/packages/contract-wrappers/test/transaction_encoder_test.ts @@ -83,8 +83,8 @@ describe('TransactionEncoder', () => { signerAddress: string = takerAddress, ): Promise => { const salt = generatePseudoRandomSalt(); - const encodedTransaction = encoder.getTransactionHex(data, salt, signerAddress); - const signature = await signatureUtils.ecSignHashAsync(provider, encodedTransaction, signerAddress); + const transactionHash = encoder.getTransactionHashHex(data, salt, signerAddress); + const signature = await signatureUtils.ecSignHashAsync(provider, transactionHash, signerAddress); txHash = await contractWrappers.exchange.executeTransactionAsync( salt, signerAddress, -- cgit v1.2.3 From eac254f9256499fda4cd3d739410c8180069e0c7 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 4 Feb 2019 09:48:11 -0800 Subject: Fix outdated comments and make verifyingContractAddress a required part of the 0x tx schema --- packages/json-schemas/schemas/zero_ex_transaction_schema.json | 2 +- packages/order-utils/src/order_hash.ts | 11 +++++++---- packages/order-utils/test/order_hash_test.ts | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/json-schemas/schemas/zero_ex_transaction_schema.json b/packages/json-schemas/schemas/zero_ex_transaction_schema.json index 726886e20..ffdf1f229 100644 --- a/packages/json-schemas/schemas/zero_ex_transaction_schema.json +++ b/packages/json-schemas/schemas/zero_ex_transaction_schema.json @@ -6,6 +6,6 @@ "signerAddress": { "$ref": "/addressSchema" }, "salt": { "$ref": "/wholeNumberSchema" } }, - "required": ["data", "salt", "signerAddress"], + "required": ["verifyingContractAddress", "data", "salt", "signerAddress"], "type": "object" } diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts index 3bc23c14e..ce7e6d85f 100644 --- a/packages/order-utils/src/order_hash.ts +++ b/packages/order-utils/src/order_hash.ts @@ -4,6 +4,7 @@ import { signTypedDataUtils } from '@0x/utils'; import * as _ from 'lodash'; import { assert } from './assert'; +import { constants } from './constants'; import { eip712Utils } from './eip712_utils'; const INVALID_TAKER_FORMAT = 'instance.takerAddress is not of a type(s) string'; @@ -34,8 +35,9 @@ export const orderHashUtils = { assert.doesConformToSchema('order', order, schemas.orderSchema, [schemas.hexSchema]); } catch (error) { if (_.includes(error.message, INVALID_TAKER_FORMAT)) { - const errMsg = - 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS'; + const errMsg = `Order taker must be of type string. If you want anyone to be able to fill an order - pass ${ + constants.NULL_ADDRESS + }`; throw new Error(errMsg); } throw error; @@ -55,8 +57,9 @@ export const orderHashUtils = { assert.doesConformToSchema('order', order, schemas.orderSchema, [schemas.hexSchema]); } catch (error) { if (_.includes(error.message, INVALID_TAKER_FORMAT)) { - const errMsg = - 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS'; + const errMsg = `Order taker must be of type string. If you want anyone to be able to fill an order - pass ${ + constants.NULL_ADDRESS + }`; throw new Error(errMsg); } throw error; diff --git a/packages/order-utils/test/order_hash_test.ts b/packages/order-utils/test/order_hash_test.ts index 30fb15a37..514fc2709 100644 --- a/packages/order-utils/test/order_hash_test.ts +++ b/packages/order-utils/test/order_hash_test.ts @@ -54,8 +54,9 @@ describe('Order hashing', () => { ...order, takerAddress: (null as any) as string, }; - const expectedErrorMessage = - 'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS'; + const expectedErrorMessage = `Order taker must be of type string. If you want anyone to be able to fill an order - pass ${ + constants.NULL_ADDRESS + }`; expect(() => orderHashUtils.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage); }); }); -- cgit v1.2.3 From af4ed0f39c9eb3e314a6b05de9cedab98e7cb233 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 4 Feb 2019 10:20:54 -0800 Subject: Update python JSON schema for 0x transactions --- .../src/zero_ex/json_schemas/schemas/zero_ex_transaction_schema.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-packages/json_schemas/src/zero_ex/json_schemas/schemas/zero_ex_transaction_schema.json b/python-packages/json_schemas/src/zero_ex/json_schemas/schemas/zero_ex_transaction_schema.json index 0c714f14d..ffdf1f229 100644 --- a/python-packages/json_schemas/src/zero_ex/json_schemas/schemas/zero_ex_transaction_schema.json +++ b/python-packages/json_schemas/src/zero_ex/json_schemas/schemas/zero_ex_transaction_schema.json @@ -1,10 +1,11 @@ { "id": "/zeroExTransactionSchema", "properties": { + "verifyingContractAddress": { "$ref": "/addressSchema" }, "data": { "$ref": "/hexSchema" }, "signerAddress": { "$ref": "/addressSchema" }, "salt": { "$ref": "/wholeNumberSchema" } }, - "required": ["data", "salt", "signerAddress"], + "required": ["verifyingContractAddress", "data", "salt", "signerAddress"], "type": "object" } -- cgit v1.2.3 From 2326dcdb129674677674690b300fec1245149a48 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Feb 2019 17:28:31 -0800 Subject: Handle NULL input for all data types --- .../abi_encoder/abstract_data_types/data_type.ts | 3 ++- .../abi_encoder/abstract_data_types/types/set.ts | 21 +++++++++++++++++++++ .../utils/src/abi_encoder/calldata/raw_calldata.ts | 5 +++++ .../utils/src/abi_encoder/evm_data_types/address.ts | 5 +++++ .../utils/src/abi_encoder/evm_data_types/bool.ts | 5 +++++ .../src/abi_encoder/evm_data_types/dynamic_bytes.ts | 5 +++++ .../utils/src/abi_encoder/evm_data_types/int.ts | 12 ++++++++++-- .../utils/src/abi_encoder/evm_data_types/pointer.ts | 5 +++++ .../src/abi_encoder/evm_data_types/static_bytes.ts | 7 +++++++ .../utils/src/abi_encoder/evm_data_types/string.ts | 5 +++++ .../utils/src/abi_encoder/evm_data_types/uint.ts | 12 ++++++++++-- packages/utils/src/abi_encoder/utils/constants.ts | 6 +++++- 12 files changed, 85 insertions(+), 6 deletions(-) diff --git a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts index f23324721..bd4711baf 100644 --- a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts +++ b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts @@ -47,7 +47,7 @@ export abstract class DataType { const hasSelector = !_.isUndefined(selector); const rawCalldata = new RawCalldata(calldata, hasSelector); const rules_ = _.isUndefined(rules) ? constants.DEFAULT_DECODING_RULES : rules; - const value = this.generateValue(rawCalldata, rules_); + const value = rawCalldata.getSizeInBytes() > 0 ? this.generateValue(rawCalldata, rules_) : this.getDefaultValue(rules_); return value; } @@ -71,6 +71,7 @@ export abstract class DataType { public abstract generateCalldataBlock(value: any, parentBlock?: CalldataBlock): CalldataBlock; public abstract generateValue(calldata: RawCalldata, rules: DecodingRules): any; + public abstract getDefaultValue(rules?: DecodingRules): any; public abstract getSignatureType(): string; public abstract isStatic(): boolean; } diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts index 2c6c4b0f6..d45088482 100644 --- a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts +++ b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts @@ -97,6 +97,27 @@ export abstract class AbstractSetDataType extends DataType { return isStatic; } + public getDefaultValue(rules?: DecodingRules): any[] | object { + let defaultValue: any[] | object; + if (this._isArray && _.isUndefined(this._arrayLength)) { + defaultValue = []; + } else if (!_.isUndefined(rules) && rules.shouldConvertStructsToObjects && !this._isArray) { + defaultValue = {}; + _.each(this._memberIndexByName, (idx: number, key: string) => { + const member = this._members[idx]; + const memberValue = member.getDefaultValue(); + (defaultValue as { [key: string]: any })[key] = memberValue; + }); + } else { + defaultValue = []; + _.each(this._members, (member: DataType, idx: number) => { + const memberValue = member.getDefaultValue(); + (defaultValue as any[]).push(memberValue); + }); + } + return defaultValue; + } + protected _generateCalldataBlockFromArray(value: any[], parentBlock?: CalldataBlock): SetCalldataBlock { // Sanity check: if the set has a defined length then `value` must have the same length. if (!_.isUndefined(this._arrayLength) && value.length !== this._arrayLength) { diff --git a/packages/utils/src/abi_encoder/calldata/raw_calldata.ts b/packages/utils/src/abi_encoder/calldata/raw_calldata.ts index 189841989..dbc9d4942 100644 --- a/packages/utils/src/abi_encoder/calldata/raw_calldata.ts +++ b/packages/utils/src/abi_encoder/calldata/raw_calldata.ts @@ -79,4 +79,9 @@ export class RawCalldata { public getSelector(): string { return this._selector; } + + public getSizeInBytes(): number { + const sizeInBytes = this._value.byteLength; + return sizeInBytes; + } } diff --git a/packages/utils/src/abi_encoder/evm_data_types/address.ts b/packages/utils/src/abi_encoder/evm_data_types/address.ts index 2278830eb..7e92d3888 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/address.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/address.ts @@ -12,6 +12,7 @@ export class AddressDataType extends AbstractBlobDataType { private static readonly _ADDRESS_SIZE_IN_BYTES = 20; private static readonly _DECODED_ADDRESS_OFFSET_IN_BYTES = constants.EVM_WORD_WIDTH_IN_BYTES - AddressDataType._ADDRESS_SIZE_IN_BYTES; + private static readonly _DEFAULT_VALUE = '0x0000000000000000000000000000000000000000'; public static matchType(type: string): boolean { return type === SolidityTypes.Address; @@ -43,6 +44,10 @@ export class AddressDataType extends AbstractBlobDataType { return valueLowercase; } + public getDefaultValue(): string { + return AddressDataType._DEFAULT_VALUE; + } + public getSignatureType(): string { return SolidityTypes.Address; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/bool.ts b/packages/utils/src/abi_encoder/evm_data_types/bool.ts index ffccd6e53..54b516bb0 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/bool.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/bool.ts @@ -10,6 +10,7 @@ import { constants } from '../utils/constants'; export class BoolDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true; + private static readonly _DEFAULT_VALUE: boolean =false; public static matchType(type: string): boolean { return type === SolidityTypes.Bool; @@ -47,6 +48,10 @@ export class BoolDataType extends AbstractBlobDataType { return value; } + public getDefaultValue(): boolean { + return BoolDataType._DEFAULT_VALUE; + } + public getSignatureType(): string { return SolidityTypes.Bool; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts b/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts index fa38b63c0..0dd40fed2 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts @@ -9,6 +9,7 @@ import { constants } from '../utils/constants'; export class DynamicBytesDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = false; + private static readonly _DEFAULT_VALUE = "0x"; public static matchType(type: string): boolean { return type === SolidityTypes.Bytes; @@ -65,6 +66,10 @@ export class DynamicBytesDataType extends AbstractBlobDataType { return value; } + public getDefaultValue(): string { + return DynamicBytesDataType._DEFAULT_VALUE; + } + public getSignatureType(): string { return SolidityTypes.Bytes; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/int.ts b/packages/utils/src/abi_encoder/evm_data_types/int.ts index f8be1f778..c7e4318eb 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/int.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/int.ts @@ -15,6 +15,7 @@ export class IntDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true; private static readonly _MAX_WIDTH: number = 256; private static readonly _DEFAULT_WIDTH: number = IntDataType._MAX_WIDTH; + private static readonly _DEFAULT_VALUE = new BigNumber(0); private readonly _width: number; private readonly _minValue: BigNumber; private readonly _maxValue: BigNumber; @@ -50,13 +51,20 @@ export class IntDataType extends AbstractBlobDataType { public decodeValue(calldata: RawCalldata): BigNumber | number { const valueBuf = calldata.popWord(); const value = EncoderMath.safeDecodeNumericValue(valueBuf, this._minValue, this._maxValue); - const numberOfBytesInUint8 = 8; - if (this._width === numberOfBytesInUint8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { return value.toNumber(); } return value; } + public getDefaultValue(): BigNumber | number { + const defaultValue = IntDataType._DEFAULT_VALUE; + if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { + return defaultValue.toNumber(); + } + return defaultValue; + } + public getSignatureType(): string { return `${SolidityTypes.Int}${this._width}`; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/pointer.ts b/packages/utils/src/abi_encoder/evm_data_types/pointer.ts index 250db7c64..50f68f5ea 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/pointer.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/pointer.ts @@ -18,4 +18,9 @@ export class PointerDataType extends AbstractPointerDataType { public getSignature(isDetailed?: boolean): string { return this._destination.getSignature(isDetailed); } + + public getDefaultValue(): any { + const defaultValue = this._destination.getDefaultValue(); + return defaultValue; + } } diff --git a/packages/utils/src/abi_encoder/evm_data_types/static_bytes.ts b/packages/utils/src/abi_encoder/evm_data_types/static_bytes.ts index cbf1957d7..a965f6796 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/static_bytes.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/static_bytes.ts @@ -58,6 +58,13 @@ export class StaticBytesDataType extends AbstractBlobDataType { return value; } + public getDefaultValue(): string { + const valueBufPadded = constants.EMPTY_EVM_WORD_BUFFER; + const valueBuf = valueBufPadded.slice(0, this._width); + const value = ethUtil.bufferToHex(valueBuf); + return value; + } + private _sanityCheckValue(value: string | Buffer): void { if (typeof value === 'string') { if (!_.startsWith(value, '0x')) { diff --git a/packages/utils/src/abi_encoder/evm_data_types/string.ts b/packages/utils/src/abi_encoder/evm_data_types/string.ts index 97ac46442..886f398f9 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/string.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/string.ts @@ -9,6 +9,7 @@ import { constants } from '../utils/constants'; export class StringDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = false; + private static readonly _DEFAULT_VALUE = ""; public static matchType(type: string): boolean { return type === SolidityTypes.String; @@ -52,6 +53,10 @@ export class StringDataType extends AbstractBlobDataType { return value; } + public getDefaultValue(): string { + return StringDataType._DEFAULT_VALUE; + } + public getSignatureType(): string { return SolidityTypes.String; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/uint.ts b/packages/utils/src/abi_encoder/evm_data_types/uint.ts index a82aa789e..9dc141a59 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/uint.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/uint.ts @@ -16,6 +16,7 @@ export class UIntDataType extends AbstractBlobDataType { private static readonly _MAX_WIDTH: number = 256; private static readonly _DEFAULT_WIDTH: number = UIntDataType._MAX_WIDTH; private static readonly _MIN_VALUE = new BigNumber(0); + private static readonly _DEFAULT_VALUE = new BigNumber(0); private readonly _width: number; private readonly _maxValue: BigNumber; @@ -49,13 +50,20 @@ export class UIntDataType extends AbstractBlobDataType { public decodeValue(calldata: RawCalldata): BigNumber | number { const valueBuf = calldata.popWord(); const value = EncoderMath.safeDecodeNumericValue(valueBuf, UIntDataType._MIN_VALUE, this._maxValue); - const numberOfBytesInUint8 = 8; - if (this._width === numberOfBytesInUint8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { return value.toNumber(); } return value; } + public getDefaultValue(): BigNumber | number { + const defaultValue = UIntDataType._DEFAULT_VALUE; + if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { + return defaultValue.toNumber(); + } + return defaultValue; + } + public getSignatureType(): string { return `${SolidityTypes.Uint}${this._width}`; } diff --git a/packages/utils/src/abi_encoder/utils/constants.ts b/packages/utils/src/abi_encoder/utils/constants.ts index fc586f295..e14814e2e 100644 --- a/packages/utils/src/abi_encoder/utils/constants.ts +++ b/packages/utils/src/abi_encoder/utils/constants.ts @@ -14,4 +14,8 @@ export const constants = { DEFAULT_DECODING_RULES: { shouldConvertStructsToObjects: true } as DecodingRules, DEFAULT_ENCODING_RULES: { shouldOptimize: true, shouldAnnotate: false } as EncodingRules, /* tslint:enable no-object-literal-type-assertion */ -}; + EMPTY_EVM_WORD_STRING: '0x0000000000000000000000000000000000000000000000000000000000000000', + EMPTY_EVM_WORD_BUFFER: new Buffer('0x0000000000000000000000000000000000000000000000000000000000000000'), + NUMBER_OF_BYTES_IN_UINT8: 8, + NUMBER_OF_BYTES_IN_INT8: 8, +} -- cgit v1.2.3 From 2ad6bd394504fe8d89ce6189aef18bb705ad7625 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Feb 2019 18:01:38 -0800 Subject: Test cases for handling NULL input for all data types --- packages/utils/src/abi_encoder/utils/constants.ts | 3 +- .../utils/test/abi_encoder/evm_data_types_test.ts | 171 +++++++++++++++++++-- 2 files changed, 162 insertions(+), 12 deletions(-) diff --git a/packages/utils/src/abi_encoder/utils/constants.ts b/packages/utils/src/abi_encoder/utils/constants.ts index e14814e2e..db190c3a6 100644 --- a/packages/utils/src/abi_encoder/utils/constants.ts +++ b/packages/utils/src/abi_encoder/utils/constants.ts @@ -1,4 +1,5 @@ import { DecodingRules, EncodingRules } from './rules'; +import * as ethUtil from 'ethereumjs-util'; export const constants = { EVM_WORD_WIDTH_IN_BYTES: 32, @@ -15,7 +16,7 @@ export const constants = { DEFAULT_ENCODING_RULES: { shouldOptimize: true, shouldAnnotate: false } as EncodingRules, /* tslint:enable no-object-literal-type-assertion */ EMPTY_EVM_WORD_STRING: '0x0000000000000000000000000000000000000000000000000000000000000000', - EMPTY_EVM_WORD_BUFFER: new Buffer('0x0000000000000000000000000000000000000000000000000000000000000000'), + EMPTY_EVM_WORD_BUFFER: ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000000'), NUMBER_OF_BYTES_IN_UINT8: 8, NUMBER_OF_BYTES_IN_INT8: 8, } diff --git a/packages/utils/test/abi_encoder/evm_data_types_test.ts b/packages/utils/test/abi_encoder/evm_data_types_test.ts index c146890e0..c09c0d929 100644 --- a/packages/utils/test/abi_encoder/evm_data_types_test.ts +++ b/packages/utils/test/abi_encoder/evm_data_types_test.ts @@ -11,6 +11,7 @@ const expect = chai.expect; describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { const encodingRules: AbiEncoder.EncodingRules = { shouldOptimize: false }; // optimizer is tested separately. + const nullEncodedArgs = '0x'; describe('Array', () => { it('Fixed size; Static elements', async () => { // Create DataType object @@ -207,6 +208,51 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw('Tried to assign NaN value'); }); + it('Should decode NULL to default values (Fixed size; Static elements)', async () => { + // Create DataType object + const testDataItem = { name: 'testArray', type: 'int[2]' }; + const dataType = new AbiEncoder.Array(testDataItem); + const args = [new BigNumber(0), new BigNumber(0)]; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default values (Dynamic size; Static elements)', async () => { + // Create DataType object + const testDataItem = { name: 'testArray', type: 'int[]' }; + const dataType = new AbiEncoder.Array(testDataItem); + const args: BigNumber[] = []; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default values (Fixed size; Dynamic elements)', async () => { + // Create DataType object + const testDataItem = { name: 'testArray', type: 'string[2]' }; + const dataType = new AbiEncoder.Array(testDataItem); + const args = ['', '']; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default values (Dynamic size; Dynamic elements)', async () => { + // Create DataType object + const testDataItem = { name: 'testArray', type: 'string[]' }; + const dataType = new AbiEncoder.Array(testDataItem); + const args: string[] = []; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default values (Dynamic Size; Multidimensional; Dynamic Elements)', async () => { + // Create DataType object + const testDataItem = { name: 'testArray', type: 'bytes[][]' }; + const dataType = new AbiEncoder.Array(testDataItem); + const args: string[][] = []; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Tuple', () => { @@ -407,6 +453,46 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw('Could not assign tuple to object: missing key \'field_2\' in object {"field_1":"-5"}'); }); + it('Should decode NULL to default values (static elements only)', async () => { + // Create DataType object + const testDataItem = { + name: 'Tuple', + type: 'tuple', + components: [{ name: 'field_1', type: 'int32' }, { name: 'field_2', type: 'bool' }], + }; + const dataType = new AbiEncoder.Tuple(testDataItem); + // Construct args to be encoded + const args = { field_1: new BigNumber(0), field_2: false }; + // Decode Encoded Args and validate result + const decodingRules: AbiEncoder.DecodingRules = { shouldConvertStructsToObjects: true }; + const decodedArgs = dataType.decode(nullEncodedArgs, decodingRules); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default values (static and dynamic elements)', async () => { + // Create DataType object + const testDataItem = { + name: 'Tuple', + type: 'tuple', + components: [ + { name: 'field_1', type: 'int32' }, + { name: 'field_2', type: 'string' }, + { name: 'field_3', type: 'bool' }, + { name: 'field_4', type: 'bytes' }, + ], + }; + const dataType = new AbiEncoder.Tuple(testDataItem); + // Construct args to be encoded + const args = { + field_1: new BigNumber(0), + field_2: '', + field_3: false, + field_4: '0x', + }; + // Decode Encoded Args and validate result + const decodingRules: AbiEncoder.DecodingRules = { shouldConvertStructsToObjects: true }; + const decodedArgs = dataType.decode(nullEncodedArgs, decodingRules); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Address', () => { @@ -450,6 +536,15 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw(`Invalid address: '${args}'`); }); + it('Should decode NULL to default value of address zero', async () => { + // Create DataType object + const testDataItem = { name: 'Address', type: 'address' }; + const dataType = new AbiEncoder.Address(testDataItem); + const args = '0x0000000000000000000000000000000000000000'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Bool', () => { @@ -489,23 +584,14 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { const argsEncodedFromSignature = dataTypeFromSignature.encode(args); expect(argsEncodedFromSignature).to.be.deep.equal(expectedEncodedArgs); }); - it('Null should decode as False', async () => { - // Hack @hysz: there are some cases where `false` is encoded as 0x instead of 0x0. + it('Should decode NULL to default value of False', async () => { // Create DataType object const testDataItem = { name: 'Boolean', type: 'bool' }; const dataType = new AbiEncoder.Bool(testDataItem); - // Construct args to be encoded const args = false; - // Encode Args and validate result - const encodedArgs = '0x'; - const expectedEncodedArgs = '0x0000000000000000000000000000000000000000000000000000000000000000'; // Decode Encoded Args and validate result - const decodedArgs = dataType.decode(encodedArgs); + const decodedArgs = dataType.decode(nullEncodedArgs); expect(decodedArgs).to.be.deep.equal(args); - // Validate signature - const dataTypeFromSignature = AbiEncoder.create(dataType.getSignature(true)); - const argsEncodedFromSignature = dataTypeFromSignature.encode(args); - expect(argsEncodedFromSignature).to.be.deep.equal(expectedEncodedArgs); }); }); @@ -705,6 +791,15 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw(); }); + it('Should decode NULL to default value of 0', async () => { + // Create DataType object + const testDataItem = { name: 'Integer (256)', type: 'int' }; + const dataType = new AbiEncoder.Int(testDataItem); + const args = new BigNumber(0); + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Unsigned Integer', () => { @@ -867,6 +962,15 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw(); }); + it('Should decode NULL to default value of 0', async () => { + // Create DataType object + const testDataItem = { name: 'Unsigned Integer (256)', type: 'uint' }; + const dataType = new AbiEncoder.UInt(testDataItem); + const args = new BigNumber(0); + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Static Bytes', () => { @@ -1030,6 +1134,33 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw('Tried to assign 0x010, which is contains a half-byte. Use full bytes only.'); }); + it('Should decode NULL to default value - Single Byte (byte)', async () => { + // Create DataType object + const testDataItem = { name: 'Static Byte', type: 'byte' }; + const dataType = new AbiEncoder.StaticBytes(testDataItem); + const args = '0x00'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default value - 4 Bytes (bytes4)', async () => { + // Create DataType object + const testDataItem = { name: 'Static Bytes4', type: 'bytes4' }; + const dataType = new AbiEncoder.StaticBytes(testDataItem); + const args = '0x00000000'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); + it('Should decode NULL to default value - 32 Bytes (bytes32)', async () => { + // Create DataType object + const testDataItem = { name: 'Static Bytes32', type: 'bytes32' }; + const dataType = new AbiEncoder.StaticBytes(testDataItem); + const args = '0x0000000000000000000000000000000000000000000000000000000000000000'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('Dynamic Bytes', () => { @@ -1117,6 +1248,15 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { dataType.encode(args, encodingRules); }).to.throw('Tried to assign 0x010, which is contains a half-byte. Use full bytes only.'); }); + it('Should decode NULL to empty byte array', async () => { + // Create DataType object + const testDataItem = { name: 'Dynamic Bytes', type: 'bytes' }; + const dataType = new AbiEncoder.DynamicBytes(testDataItem); + const args = '0x'; + // Decode Encoded Args and validate result + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); describe('String', () => { @@ -1182,5 +1322,14 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => { const argsEncodedFromSignature = dataTypeFromSignature.encode(args); expect(argsEncodedFromSignature).to.be.deep.equal(expectedEncodedArgs); }); + it('Should decode NULL to empty string', async () => { + // Create DataType object + const testDataItem = { name: 'String', type: 'string' }; + const dataType = new AbiEncoder.String(testDataItem); + // Decode Encoded Args and validate result + const args = ''; + const decodedArgs = dataType.decode(nullEncodedArgs); + expect(decodedArgs).to.be.deep.equal(args); + }); }); }); -- cgit v1.2.3 From 023ea5b3a13f015ffad037cc6f21a686d2b95023 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Feb 2019 18:03:52 -0800 Subject: Ran prettier + linter --- packages/utils/src/abi_encoder/abstract_data_types/data_type.ts | 3 ++- packages/utils/src/abi_encoder/evm_data_types/bool.ts | 2 +- packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts | 2 +- packages/utils/src/abi_encoder/evm_data_types/int.ts | 4 ++-- packages/utils/src/abi_encoder/evm_data_types/string.ts | 2 +- packages/utils/src/abi_encoder/evm_data_types/uint.ts | 4 ++-- packages/utils/src/abi_encoder/utils/constants.ts | 5 +++-- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts index bd4711baf..db4f02b89 100644 --- a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts +++ b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts @@ -47,7 +47,8 @@ export abstract class DataType { const hasSelector = !_.isUndefined(selector); const rawCalldata = new RawCalldata(calldata, hasSelector); const rules_ = _.isUndefined(rules) ? constants.DEFAULT_DECODING_RULES : rules; - const value = rawCalldata.getSizeInBytes() > 0 ? this.generateValue(rawCalldata, rules_) : this.getDefaultValue(rules_); + const value = + rawCalldata.getSizeInBytes() > 0 ? this.generateValue(rawCalldata, rules_) : this.getDefaultValue(rules_); return value; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/bool.ts b/packages/utils/src/abi_encoder/evm_data_types/bool.ts index 54b516bb0..24887c509 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/bool.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/bool.ts @@ -10,7 +10,7 @@ import { constants } from '../utils/constants'; export class BoolDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = true; - private static readonly _DEFAULT_VALUE: boolean =false; + private static readonly _DEFAULT_VALUE: boolean = false; public static matchType(type: string): boolean { return type === SolidityTypes.Bool; diff --git a/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts b/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts index 0dd40fed2..7a49a84b4 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/dynamic_bytes.ts @@ -9,7 +9,7 @@ import { constants } from '../utils/constants'; export class DynamicBytesDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = false; - private static readonly _DEFAULT_VALUE = "0x"; + private static readonly _DEFAULT_VALUE = '0x'; public static matchType(type: string): boolean { return type === SolidityTypes.Bytes; diff --git a/packages/utils/src/abi_encoder/evm_data_types/int.ts b/packages/utils/src/abi_encoder/evm_data_types/int.ts index c7e4318eb..02278f666 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/int.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/int.ts @@ -51,7 +51,7 @@ export class IntDataType extends AbstractBlobDataType { public decodeValue(calldata: RawCalldata): BigNumber | number { const valueBuf = calldata.popWord(); const value = EncoderMath.safeDecodeNumericValue(valueBuf, this._minValue, this._maxValue); - if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { return value.toNumber(); } return value; @@ -59,7 +59,7 @@ export class IntDataType extends AbstractBlobDataType { public getDefaultValue(): BigNumber | number { const defaultValue = IntDataType._DEFAULT_VALUE; - if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { return defaultValue.toNumber(); } return defaultValue; diff --git a/packages/utils/src/abi_encoder/evm_data_types/string.ts b/packages/utils/src/abi_encoder/evm_data_types/string.ts index 886f398f9..f54d739b4 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/string.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/string.ts @@ -9,7 +9,7 @@ import { constants } from '../utils/constants'; export class StringDataType extends AbstractBlobDataType { private static readonly _SIZE_KNOWN_AT_COMPILE_TIME: boolean = false; - private static readonly _DEFAULT_VALUE = ""; + private static readonly _DEFAULT_VALUE = ''; public static matchType(type: string): boolean { return type === SolidityTypes.String; diff --git a/packages/utils/src/abi_encoder/evm_data_types/uint.ts b/packages/utils/src/abi_encoder/evm_data_types/uint.ts index 9dc141a59..d530606b9 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/uint.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/uint.ts @@ -50,7 +50,7 @@ export class UIntDataType extends AbstractBlobDataType { public decodeValue(calldata: RawCalldata): BigNumber | number { const valueBuf = calldata.popWord(); const value = EncoderMath.safeDecodeNumericValue(valueBuf, UIntDataType._MIN_VALUE, this._maxValue); - if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { return value.toNumber(); } return value; @@ -58,7 +58,7 @@ export class UIntDataType extends AbstractBlobDataType { public getDefaultValue(): BigNumber | number { const defaultValue = UIntDataType._DEFAULT_VALUE; - if (this._width === constants.NUMBER_OF_BYTES_IN_INT8) { + if (this._width === constants.NUMBER_OF_BYTES_IN_UINT8) { return defaultValue.toNumber(); } return defaultValue; diff --git a/packages/utils/src/abi_encoder/utils/constants.ts b/packages/utils/src/abi_encoder/utils/constants.ts index db190c3a6..b45b5b8e8 100644 --- a/packages/utils/src/abi_encoder/utils/constants.ts +++ b/packages/utils/src/abi_encoder/utils/constants.ts @@ -1,6 +1,7 @@ -import { DecodingRules, EncodingRules } from './rules'; import * as ethUtil from 'ethereumjs-util'; +import { DecodingRules, EncodingRules } from './rules'; + export const constants = { EVM_WORD_WIDTH_IN_BYTES: 32, EVM_WORD_WIDTH_IN_BITS: 256, @@ -19,4 +20,4 @@ export const constants = { EMPTY_EVM_WORD_BUFFER: ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000000'), NUMBER_OF_BYTES_IN_UINT8: 8, NUMBER_OF_BYTES_IN_INT8: 8, -} +}; -- cgit v1.2.3 From b3ae9e6e25a81d034c3089d1c8c5f5df89264c57 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Feb 2019 19:18:00 -0800 Subject: updated changelog for utils --- packages/utils/CHANGELOG.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 8671729d3..8e8a125ef 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "4.0.2", + "changes": [ + { + "note": "ABI Decode NULL for all data types", + "pr": 1587 + } + ] + }, { "version": "4.0.1", "changes": [ -- cgit v1.2.3 From 3d7a635543b74eddf303ab4b0181ecf47dc29591 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Feb 2019 21:33:07 -0800 Subject: Added NULL decoding tests for return values --- .../abi_encoder/abi_samples/return_value_abis.ts | 25 ++ .../utils/test/abi_encoder/return_values_test.ts | 251 ++++++++++++++++----- 2 files changed, 214 insertions(+), 62 deletions(-) diff --git a/packages/utils/test/abi_encoder/abi_samples/return_value_abis.ts b/packages/utils/test/abi_encoder/abi_samples/return_value_abis.ts index ac2124011..ad07b3d24 100644 --- a/packages/utils/test/abi_encoder/abi_samples/return_value_abis.ts +++ b/packages/utils/test/abi_encoder/abi_samples/return_value_abis.ts @@ -97,3 +97,28 @@ export const mixedStaticAndDynamicReturnValues: MethodAbi = { stateMutability: 'nonpayable', type: 'function', }; + +export const structuredReturnValue: MethodAbi = { + constant: false, + inputs: [], + name: 'fillOrder', + outputs: [ + { + components: [ + { + name: 'makerAssetFilledAmount', + type: 'uint256', + }, + { + name: 'takerAssetFilledAmount', + type: 'uint256', + }, + ], + name: 'fillResults', + type: 'tuple', + }, + ], + payable: false, + stateMutability: 'nonpayable', + type: 'function', +}; diff --git a/packages/utils/test/abi_encoder/return_values_test.ts b/packages/utils/test/abi_encoder/return_values_test.ts index 308d11ee5..ccdac510d 100644 --- a/packages/utils/test/abi_encoder/return_values_test.ts +++ b/packages/utils/test/abi_encoder/return_values_test.ts @@ -1,7 +1,7 @@ import * as chai from 'chai'; import 'mocha'; -import { AbiEncoder } from '../../src/'; +import { AbiEncoder, BigNumber } from '../../src/'; import { chaiSetup } from '../utils/chai_setup'; import * as ReturnValueAbis from './abi_samples/return_value_abis'; @@ -11,67 +11,194 @@ const expect = chai.expect; describe('ABI Encoder: Return Value Encoding/Decoding', () => { const encodingRules: AbiEncoder.EncodingRules = { shouldOptimize: false }; // optimizer is tested separately. - it('No Return Value', async () => { - // Decode return value - const method = new AbiEncoder.Method(ReturnValueAbis.noReturnValues); - const returnValue = '0x'; - const decodedReturnValue = method.decodeReturnValues(returnValue, { shouldConvertStructsToObjects: false }); - const expectedDecodedReturnValue: any[] = []; - expect(decodedReturnValue).to.be.deep.equal(expectedDecodedReturnValue); - }); - it('Single static return value', async () => { - // Generate Return Value - const method = new AbiEncoder.Method(ReturnValueAbis.singleStaticReturnValue); - const returnValue = ['0x01020304']; - const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); - const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { - shouldConvertStructsToObjects: false, - }); - // Validate decoded return value - expect(decodedReturnValue).to.be.deep.equal(returnValue); - }); - it('Multiple static return values', async () => { - // Generate Return Value - const method = new AbiEncoder.Method(ReturnValueAbis.multipleStaticReturnValues); - const returnValue = ['0x01020304', '0x05060708']; - const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); - const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { - shouldConvertStructsToObjects: false, - }); - // Validate decoded return value - expect(decodedReturnValue).to.be.deep.equal(returnValue); - }); - it('Single dynamic return value', async () => { - // Generate Return Value - const method = new AbiEncoder.Method(ReturnValueAbis.singleDynamicReturnValue); - const returnValue = ['0x01020304']; - const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); - const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { - shouldConvertStructsToObjects: false, - }); - // Validate decoded return value - expect(decodedReturnValue).to.be.deep.equal(returnValue); - }); - it('Multiple dynamic return values', async () => { - // Generate Return Value - const method = new AbiEncoder.Method(ReturnValueAbis.multipleDynamicReturnValues); - const returnValue = ['0x01020304', '0x05060708']; - const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); - const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { - shouldConvertStructsToObjects: false, - }); - // Validate decoded return value - expect(decodedReturnValue).to.be.deep.equal(returnValue); + const nullEncodedReturnValue = '0x'; + describe('Standard encoding/decoding', () => { + it('No Return Value', async () => { + // Decode return value + const method = new AbiEncoder.Method(ReturnValueAbis.noReturnValues); + const returnValue = '0x'; + const decodedReturnValue = method.decodeReturnValues(returnValue, { shouldConvertStructsToObjects: false }); + const expectedDecodedReturnValue: any[] = []; + expect(decodedReturnValue).to.be.deep.equal(expectedDecodedReturnValue); + }); + it('Single static return value', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleStaticReturnValue); + const returnValue = ['0x01020304']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Multiple static return values', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleStaticReturnValues); + const returnValue = ['0x01020304', '0x05060708']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Single dynamic return value', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleDynamicReturnValue); + const returnValue = ['0x01020304']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Multiple dynamic return values', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleDynamicReturnValues); + const returnValue = ['0x01020304', '0x05060708']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Mixed static/dynamic return values', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.mixedStaticAndDynamicReturnValues); + const returnValue = ['0x01020304', '0x05060708']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Should decode NULL as default value (single; static)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleStaticReturnValue); + const returnValue = ['0x00000000']; + + const decodedReturnValue = method.decodeReturnValues(nullEncodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Should decode NULL as default value (multiple; static)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleStaticReturnValues); + const returnValue = ['0x00000000', '0x00000000']; + const decodedReturnValue = method.decodeReturnValues(nullEncodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Should decode NULL as default value (single; dynamic)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleDynamicReturnValue); + const returnValue = ['0x']; + const decodedReturnValue = method.decodeReturnValues(nullEncodedReturnValue, { + shouldConvertStructsToObjects: false, + }); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); }); - it('Mixed static/dynamic return values', async () => { - // Generate Return Value - const method = new AbiEncoder.Method(ReturnValueAbis.mixedStaticAndDynamicReturnValues); - const returnValue = ['0x01020304', '0x05060708']; - const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); - const decodedReturnValue = method.decodeReturnValues(encodedReturnValue, { - shouldConvertStructsToObjects: false, - }); - // Validate decoded return value - expect(decodedReturnValue).to.be.deep.equal(returnValue); + + describe('Strict encoding/decoding', () => { + it('No Return Value', async () => { + // Decode return value + const method = new AbiEncoder.Method(ReturnValueAbis.noReturnValues); + const returnValue = '0x'; + const decodedReturnValue = method.strictDecodeReturnValue(returnValue); + const expectedDecodedReturnValue = undefined; + expect(decodedReturnValue).to.be.deep.equal(expectedDecodedReturnValue); + }); + it('Single static return value', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleStaticReturnValue); + const returnValue = ['0x01020304']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.strictDecodeReturnValue(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue[0]); + }); + it('Multiple static return values', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleStaticReturnValues); + const returnValue = ['0x01020304', '0x05060708']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.strictDecodeReturnValue<[string, string]>(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Single dynamic return value', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleDynamicReturnValue); + const returnValue = ['0x01020304']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.strictDecodeReturnValue(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue[0]); + }); + it('Multiple dynamic return values', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleDynamicReturnValues); + const returnValue = ['0x01020304', '0x05060708']; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.strictDecodeReturnValue<[string, string]>(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Struct should include fields', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.structuredReturnValue); + const returnValue = { + fillResults: { + makerAssetFilledAmount: new BigNumber(50), + takerAssetFilledAmount: new BigNumber(40), + }, + }; + const encodedReturnValue = method.encodeReturnValues(returnValue, encodingRules); + const decodedReturnValue = method.strictDecodeReturnValue<{ + makerAssetFilledAmount: BigNumber; + takerAssetFilledAmount: BigNumber; + }>(encodedReturnValue); + // Validate decoded return value + // Note that only the contents of `fillResults`, not the key itself, is decoded. + // This is by design, as only a struct's contents are encoded and returned by a funciton call. + expect(decodedReturnValue).to.be.deep.equal(returnValue.fillResults); + }); + it('Should decode NULL as default value (single; static)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleStaticReturnValue); + const returnValue = '0x00000000'; + const encodedReturnValue = '0x'; + const decodedReturnValue = method.strictDecodeReturnValue(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Should decode NULL as default value (multiple; static)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.multipleStaticReturnValues); + const returnValue = ['0x00000000', '0x00000000']; + const encodedReturnValue = '0x'; + const decodedReturnValue = method.strictDecodeReturnValue<[string, string]>(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); + it('Should decode NULL as default value (single; dynamic)', async () => { + // Generate Return Value + const method = new AbiEncoder.Method(ReturnValueAbis.singleDynamicReturnValue); + const returnValue = '0x'; + const encodedReturnValue = '0x'; + const decodedReturnValue = method.strictDecodeReturnValue(encodedReturnValue); + // Validate decoded return value + expect(decodedReturnValue).to.be.deep.equal(returnValue); + }); }); }); -- cgit v1.2.3 From 879c795fc44b53f829c752ab50521c2e357929bf Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Feb 2019 11:07:16 +0000 Subject: Fix react-highlight dep --- packages/react-shared/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 72d384382..52b4ca8ab 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -52,7 +52,7 @@ "material-ui": "^0.20.0", "react": "^16.5.2", "react-dom": "^16.5.2", - "react-highlight": "0xproject/react-highlight", + "react-highlight": "0xproject/react-highlight#fix/react-version", "react-markdown": "^3.2.2", "react-router-dom": "^4.3.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", -- cgit v1.2.3 From 9bbe56df0bbbaf0594678d48bc141e00cec65365 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Feb 2019 11:24:40 +0000 Subject: Fix react-highlight dep --- packages/react-shared/package.json | 2 +- yarn.lock | 33 +-------------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 52b4ca8ab..bf860b412 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -52,7 +52,7 @@ "material-ui": "^0.20.0", "react": "^16.5.2", "react-dom": "^16.5.2", - "react-highlight": "0xproject/react-highlight#fix/react-version", + "react-highlight": "0xproject/react-highlight#react-peer-deps", "react-markdown": "^3.2.2", "react-router-dom": "^4.3.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", diff --git a/yarn.lock b/yarn.lock index 03b62f49b..858187f96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1535,7 +1535,6 @@ "@types/react-dom@^16.0.6": version "16.0.11" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.11.tgz#bd10ccb0d9260343f4b9a49d4f7a8330a5c1f081" - integrity sha512-x6zUx9/42B5Kl2Vl9HlopV8JF64wLpX3c+Pst9kc1HgzrsH+mkehe/zmHMQTplIrR48H2gpU7ZqurQolYu8XBA== dependencies: "@types/react" "*" @@ -13339,16 +13338,6 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react-dom@^16.4.2: - version "16.7.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" - integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.12.0" - react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13400,14 +13389,12 @@ react-helmet@^5.2.0: prop-types "^15.5.4" react-side-effect "^1.1.0" -react-highlight@0xproject/react-highlight: +react-highlight@0xproject/react-highlight#react-peer-deps: version "1.0.0" resolved "https://codeload.github.com/0xproject/react-highlight/tar.gz/a70c7631e09508dafc4719cbcc6f121074e1937d" dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" - react "^16.4.2" - react-dom "^16.4.2" react-hot-loader@^4.3.3: version "4.3.4" @@ -13652,16 +13639,6 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react@^16.4.2: - version "16.7.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" - integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.12.0" - react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14533,14 +14510,6 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" -scheduler@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" - integrity sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" -- cgit v1.2.3 From 265df31750b3f5d89d99dd7fb65812b2b19642c1 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Feb 2019 11:41:12 +0000 Subject: Updated CHANGELOGS --- contracts/asset-proxy/CHANGELOG.json | 9 +++++++++ contracts/asset-proxy/CHANGELOG.md | 4 ++++ contracts/erc20/CHANGELOG.json | 9 +++++++++ contracts/erc20/CHANGELOG.md | 4 ++++ contracts/erc721/CHANGELOG.json | 9 +++++++++ contracts/erc721/CHANGELOG.md | 4 ++++ contracts/exchange-forwarder/CHANGELOG.json | 9 +++++++++ contracts/exchange-forwarder/CHANGELOG.md | 4 ++++ contracts/exchange-libs/CHANGELOG.json | 9 +++++++++ contracts/exchange-libs/CHANGELOG.md | 4 ++++ contracts/exchange/CHANGELOG.json | 9 +++++++++ contracts/exchange/CHANGELOG.md | 4 ++++ contracts/extensions/CHANGELOG.json | 9 +++++++++ contracts/extensions/CHANGELOG.md | 4 ++++ contracts/multisig/CHANGELOG.json | 9 +++++++++ contracts/multisig/CHANGELOG.md | 4 ++++ contracts/test-utils/CHANGELOG.json | 9 +++++++++ contracts/test-utils/CHANGELOG.md | 5 +++++ contracts/utils/CHANGELOG.json | 9 +++++++++ contracts/utils/CHANGELOG.md | 4 ++++ packages/0x.js/CHANGELOG.json | 9 +++++++++ packages/0x.js/CHANGELOG.md | 4 ++++ packages/abi-gen-wrappers/CHANGELOG.json | 9 +++++++++ packages/abi-gen-wrappers/CHANGELOG.md | 4 ++++ packages/abi-gen/CHANGELOG.json | 9 +++++++++ packages/abi-gen/CHANGELOG.md | 4 ++++ packages/assert/CHANGELOG.json | 9 +++++++++ packages/assert/CHANGELOG.md | 4 ++++ packages/asset-buyer/CHANGELOG.json | 9 +++++++++ packages/asset-buyer/CHANGELOG.md | 4 ++++ packages/base-contract/CHANGELOG.json | 9 +++++++++ packages/base-contract/CHANGELOG.md | 4 ++++ packages/connect/CHANGELOG.json | 9 +++++++++ packages/connect/CHANGELOG.md | 4 ++++ packages/contract-wrappers/CHANGELOG.json | 2 +- packages/contract-wrappers/CHANGELOG.md | 4 +++- packages/dev-utils/CHANGELOG.json | 9 +++++++++ packages/dev-utils/CHANGELOG.md | 4 ++++ packages/fill-scenarios/CHANGELOG.json | 9 +++++++++ packages/fill-scenarios/CHANGELOG.md | 4 ++++ packages/json-schemas/CHANGELOG.json | 9 +++++++++ packages/json-schemas/CHANGELOG.md | 5 +++++ packages/migrations/CHANGELOG.json | 9 +++++++++ packages/migrations/CHANGELOG.md | 4 ++++ packages/order-utils/CHANGELOG.json | 3 ++- packages/order-utils/CHANGELOG.md | 7 +++++++ packages/order-watcher/CHANGELOG.json | 9 +++++++++ packages/order-watcher/CHANGELOG.md | 4 ++++ packages/react-docs/CHANGELOG.json | 9 +++++++++ packages/react-docs/CHANGELOG.md | 4 ++++ packages/react-shared/CHANGELOG.json | 9 +++++++++ packages/react-shared/CHANGELOG.md | 4 ++++ packages/sol-compiler/CHANGELOG.json | 9 +++++++++ packages/sol-compiler/CHANGELOG.md | 4 ++++ packages/sol-coverage/CHANGELOG.json | 9 +++++++++ packages/sol-coverage/CHANGELOG.md | 4 ++++ packages/sol-doc/CHANGELOG.json | 9 +++++++++ packages/sol-doc/CHANGELOG.md | 4 ++++ packages/sol-profiler/CHANGELOG.json | 9 +++++++++ packages/sol-profiler/CHANGELOG.md | 4 ++++ packages/sol-resolver/CHANGELOG.json | 9 +++++++++ packages/sol-resolver/CHANGELOG.md | 4 ++++ packages/sol-trace/CHANGELOG.json | 9 +++++++++ packages/sol-trace/CHANGELOG.md | 4 ++++ packages/sol-tracing-utils/CHANGELOG.json | 9 +++++++++ packages/sol-tracing-utils/CHANGELOG.md | 4 ++++ packages/sra-spec/CHANGELOG.json | 9 +++++++++ packages/sra-spec/CHANGELOG.md | 4 ++++ packages/subproviders/CHANGELOG.json | 9 +++++++++ packages/subproviders/CHANGELOG.md | 4 ++++ packages/types/CHANGELOG.json | 9 +++++++++ packages/types/CHANGELOG.md | 6 ++++++ packages/utils/CHANGELOG.json | 3 ++- packages/utils/CHANGELOG.md | 4 ++++ packages/web3-wrapper/CHANGELOG.json | 9 +++++++++ packages/web3-wrapper/CHANGELOG.md | 4 ++++ 76 files changed, 478 insertions(+), 4 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 932cf0752..940294368 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/asset-proxy/CHANGELOG.md b/contracts/asset-proxy/CHANGELOG.md index abff2e53d..ba38d8d8c 100644 --- a/contracts/asset-proxy/CHANGELOG.md +++ b/contracts/asset-proxy/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 34a0948b7..64e5cc844 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/erc20/CHANGELOG.md b/contracts/erc20/CHANGELOG.md index 20569f9b9..298bd6766 100644 --- a/contracts/erc20/CHANGELOG.md +++ b/contracts/erc20/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index 83b8bc1cd..c2a40b4fc 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/erc721/CHANGELOG.md b/contracts/erc721/CHANGELOG.md index 01f5fec60..e87cb32ca 100644 --- a/contracts/erc721/CHANGELOG.md +++ b/contracts/erc721/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index ee0c1dce8..8b9292e0f 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/exchange-forwarder/CHANGELOG.md b/contracts/exchange-forwarder/CHANGELOG.md index 7489d67aa..9bef39d6a 100644 --- a/contracts/exchange-forwarder/CHANGELOG.md +++ b/contracts/exchange-forwarder/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index 6d769c502..56fa0308a 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/exchange-libs/CHANGELOG.md b/contracts/exchange-libs/CHANGELOG.md index d2740d0b1..d510ce089 100644 --- a/contracts/exchange-libs/CHANGELOG.md +++ b/contracts/exchange-libs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index a03a08c29..c0b783ef9 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "1.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549373905, "version": "1.0.1", diff --git a/contracts/exchange/CHANGELOG.md b/contracts/exchange/CHANGELOG.md index f59bbf5d4..4378d44e5 100644 --- a/contracts/exchange/CHANGELOG.md +++ b/contracts/exchange/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v1.0.1 - _February 5, 2019_ * Dependencies updated diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 6e89b0c79..a3df1c2ee 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md index 54014c14b..fb348fff9 100644 --- a/contracts/extensions/CHANGELOG.md +++ b/contracts/extensions/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 71a02a0cd..951c5679b 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md index 6dc72b9ef..7349fca68 100644 --- a/contracts/multisig/CHANGELOG.md +++ b/contracts/multisig/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 0c6174313..f1aaad3b4 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index a643b5735..4b0b1ed9e 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,9 +5,14 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) + * Import `ZeroExTransaction` type instead of using type defined in this package (#1576) ## v2.0.1 - _January 17, 2019_ diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 187a81d70..1b6a8d2c3 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md index 4c46b4f95..ba83d631f 100644 --- a/contracts/utils/CHANGELOG.md +++ b/contracts/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 1eab891a8..813409609 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "4.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index cca12fda4..1626bb7d0 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v4.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index 2603ae525..f714100ce 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/abi-gen-wrappers/CHANGELOG.md b/packages/abi-gen-wrappers/CHANGELOG.md index 793e1f157..75ac81d45 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.md +++ b/packages/abi-gen-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 66858db63..3e6eb9038 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md index d68608194..17085c515 100644 --- a/packages/abi-gen/CHANGELOG.md +++ b/packages/abi-gen/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index 814b5d148..8ca292485 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md index 90fba7196..0050d0105 100644 --- a/packages/assert/CHANGELOG.md +++ b/packages/assert/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 39d402084..dc3df44e9 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "5.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "5.0.0", "changes": [ diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index 5bb0d7274..c538fa3e0 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v5.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v5.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index 070f32d1d..d3333dff6 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "4.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md index f6d3ec615..ae705dab7 100644 --- a/packages/base-contract/CHANGELOG.md +++ b/packages/base-contract/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v4.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 45a1b80f8..6339048b8 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "4.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index d0172b951..eedc1edf4 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v4.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index ae3176537..4ebab1ad7 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -15,7 +15,7 @@ "pr": 1576 } ], - "timestamp": 1549373905 + "timestamp": 1549452781 }, { "version": "6.0.0", diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index 03cb40fac..a86fe613f 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,9 +5,11 @@ Edit the package's CHANGELOG.json file only. CHANGELOG -## v6.0.1 - _February 5, 2019_ +## v7.0.0 - _February 6, 2019_ * Fix OrderValidatorWrapper constructor to use the correct address (#1568) + * Use new `ZeroExTransaction` interface (#1576) + * Rename `getTransactionHex` to `getTransactionHashHex` (#1576) ## v6.0.0 - _Invalid date_ diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 141ac0eb6..1f0ec9b93 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index a89a07a90..652fc6e96 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index 45ad00308..b6538274d 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md index d483661db..2fbd84b2b 100644 --- a/packages/fill-scenarios/CHANGELOG.md +++ b/packages/fill-scenarios/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index e174975d1..0f8ad747c 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index ea94cbaf4..8d6ec83bf 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,9 +5,14 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) + * Add `verifyingContractAddress` to `zeroExTransactionSchema` (#1576) ## v2.1.7 - _January 15, 2019_ diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index f651e9434..b102ed0f7 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index 40add5c2c..a741fb430 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index b13ce197a..b5eb209d7 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -14,7 +14,8 @@ "note": "Export constant EIP712 params", "pr": 1576 } - ] + ], + "timestamp": 1549452781 }, { "version": "4.0.0", diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index dd5a7c58f..d40ecb5a4 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,9 +5,16 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v5.0.0 - _February 6, 2019_ + + * Add `transactionHashUtils` (#1576) + * Refactor `eip712Utils` to allow custom domain params (#1576) + * Export constant EIP712 params (#1576) + ## v4.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) + * Fix preSigned `isSignatureValidAsync` check (#1580) ## v3.1.2 - _January 15, 2019_ diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index f6d9a6aad..9fdc3af0f 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index 55b344b6a..95b13c746 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 91c60fa9a..17f6a428f 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index 4867a663a..8e30d4d0a 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index ce5182ca6..128df9442 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index a5a09a9e0..08f6a07ed 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 021804ffa..5f103342e 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md index 03a2b5b87..400c33763 100644 --- a/packages/sol-compiler/CHANGELOG.md +++ b/packages/sol-compiler/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/sol-coverage/CHANGELOG.json b/packages/sol-coverage/CHANGELOG.json index 2a33fe578..c5b3ae84e 100644 --- a/packages/sol-coverage/CHANGELOG.json +++ b/packages/sol-coverage/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/sol-coverage/CHANGELOG.md b/packages/sol-coverage/CHANGELOG.md index 0c1916717..0612e407e 100644 --- a/packages/sol-coverage/CHANGELOG.md +++ b/packages/sol-coverage/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json index 2ffa21f26..d4f89a32e 100644 --- a/packages/sol-doc/CHANGELOG.json +++ b/packages/sol-doc/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md index 6eff7d01a..d838a52ae 100644 --- a/packages/sol-doc/CHANGELOG.md +++ b/packages/sol-doc/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/sol-profiler/CHANGELOG.json b/packages/sol-profiler/CHANGELOG.json index 54375890d..145158ab3 100644 --- a/packages/sol-profiler/CHANGELOG.json +++ b/packages/sol-profiler/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.1", "changes": [ diff --git a/packages/sol-profiler/CHANGELOG.md b/packages/sol-profiler/CHANGELOG.md index 32a2bac0a..cf0ec8ee7 100644 --- a/packages/sol-profiler/CHANGELOG.md +++ b/packages/sol-profiler/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 5, 2019_ * Fix a bug when some parts of the profiling report were missing because of the coverage ignore lines (#1535) diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index efca37e90..147f7ac61 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md index 7e5fd05a8..90d7cc2b8 100644 --- a/packages/sol-resolver/CHANGELOG.md +++ b/packages/sol-resolver/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index 3897b1249..44ce3fcf6 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.1", "changes": [ diff --git a/packages/sol-trace/CHANGELOG.md b/packages/sol-trace/CHANGELOG.md index d828b4744..92e53f6f3 100644 --- a/packages/sol-trace/CHANGELOG.md +++ b/packages/sol-trace/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 5, 2019_ * Improve error messages when unable to find matching bytecode (#1558) diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 6b5db6c8f..75131dddb 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "6.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "6.0.0", "changes": [ diff --git a/packages/sol-tracing-utils/CHANGELOG.md b/packages/sol-tracing-utils/CHANGELOG.md index 74d0ca61f..3889e89c3 100644 --- a/packages/sol-tracing-utils/CHANGELOG.md +++ b/packages/sol-tracing-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v6.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v6.0.0 - _February 5, 2019_ * `SolCompilerArtifactAdapter` now uses `SolResolver` under the hood which allows to resolve `NPM` dependencies properly (#1535) diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json index 0f0d50701..b812f0809 100644 --- a/packages/sra-spec/CHANGELOG.json +++ b/packages/sra-spec/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md index b971fb3e6..ceae08a17 100644 --- a/packages/sra-spec/CHANGELOG.md +++ b/packages/sra-spec/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 647d7c1d9..ad005d2e5 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "3.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.0", "changes": [ diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index a3e0969be..58a85b822 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v3.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index c2a54f824..cb01ccc4a 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "2.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.0", "changes": [ diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index a4f185dca..e43be5e55 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -5,9 +5,15 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v2.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) + * Update `ZeroExTransaction` type and add `SignedZeroExTransaction` type (#1576) + * Add `EIP712DomainWithDefaultSchema` type (#1576) ## v1.5.2 - _January 15, 2019_ diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 8e8a125ef..9ff26e3e4 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -6,7 +6,8 @@ "note": "ABI Decode NULL for all data types", "pr": 1587 } - ] + ], + "timestamp": 1549452781 }, { "version": "4.0.1", diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index f76166f94..e4b581aef 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.2 - _February 6, 2019_ + + * ABI Decode NULL for all data types (#1587) + ## v4.0.1 - _February 5, 2019_ * ABI Decode NULL as False (#1582) diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 8dd98a4ae..e9e85be24 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549452781, + "version": "4.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.0.0", "changes": [ diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 255b37ade..82b646a04 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.1 - _February 6, 2019_ + + * Dependencies updated + ## v4.0.0 - _February 5, 2019_ * Upgrade the bignumber.js to v8.0.2 (#1517) -- cgit v1.2.3 From dbb3c5e32b26a8c2edf6be19a8216851b7c65888 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Feb 2019 11:41:24 +0000 Subject: Publish - 0x.js@4.0.1 - @0x/abi-gen@2.0.1 - @0x/abi-gen-wrappers@3.0.1 - @0x/assert@2.0.1 - @0x/asset-buyer@5.0.1 - @0x/base-contract@4.0.1 - @0x/connect@4.0.1 - @0x/contract-wrappers@7.0.0 - @0x/dev-tools-pages@0.0.16 - @0x/dev-utils@2.0.1 - @0x/fill-scenarios@2.0.1 - @0x/instant@1.0.10 - @0x/json-schemas@3.0.1 - @0x/metacoin@0.0.38 - @0x/migrations@3.0.1 - @0x/monorepo-scripts@1.0.21 - @0x/order-utils@5.0.0 - @0x/order-watcher@3.0.1 - @0x/pipeline@1.0.7 - @0x/react-docs@2.0.1 - @0x/react-shared@2.0.1 - @0x/sol-compiler@3.0.1 - @0x/sol-coverage@2.0.1 - @0x/sol-doc@2.0.1 - @0x/sol-profiler@2.0.2 - @0x/sol-resolver@2.0.1 - @0x/sol-trace@2.0.2 - @0x/sol-tracing-utils@6.0.1 - @0x/sra-spec@2.0.1 - @0x/subproviders@3.0.1 - @0x/testnet-faucets@1.0.66 - @0x/types@2.0.1 - @0x/utils@4.0.2 - @0x/web3-wrapper@4.0.1 - @0x/website@0.0.69 - @0x/contracts-asset-proxy@1.0.2 - @0x/contracts-erc20@1.0.2 - @0x/contracts-erc721@1.0.2 - @0x/contracts-exchange@1.0.2 - @0x/contracts-exchange-forwarder@1.0.2 - @0x/contracts-exchange-libs@1.0.2 - @0x/contracts-extensions@2.0.1 - @0x/contracts-multisig@2.0.1 - @0x/contracts-test-utils@3.0.1 - @0x/contracts-utils@2.0.1 --- contracts/asset-proxy/package.json | 26 +++++++++++------------ contracts/erc20/package.json | 22 ++++++++++---------- contracts/erc721/package.json | 20 +++++++++--------- contracts/exchange-forwarder/package.json | 34 +++++++++++++++---------------- contracts/exchange-libs/package.json | 22 ++++++++++---------- contracts/exchange/package.json | 30 +++++++++++++-------------- contracts/extensions/package.json | 34 +++++++++++++++---------------- contracts/multisig/package.json | 22 ++++++++++---------- contracts/test-utils/package.json | 24 +++++++++++----------- contracts/utils/package.json | 20 +++++++++--------- packages/0x.js/package.json | 26 +++++++++++------------ packages/abi-gen-wrappers/package.json | 12 +++++------ packages/abi-gen/package.json | 4 ++-- packages/assert/package.json | 6 +++--- packages/asset-buyer/package.json | 20 +++++++++--------- packages/base-contract/package.json | 6 +++--- packages/connect/package.json | 12 +++++------ packages/contract-wrappers/package.json | 26 +++++++++++------------ packages/dev-tools-pages/package.json | 4 ++-- packages/dev-utils/package.json | 10 ++++----- packages/fill-scenarios/package.json | 14 ++++++------- packages/instant/package.json | 18 ++++++++-------- packages/json-schemas/package.json | 4 ++-- packages/metacoin/package.json | 24 +++++++++++----------- packages/migrations/package.json | 20 +++++++++--------- packages/monorepo-scripts/package.json | 4 ++-- packages/order-utils/package.json | 20 +++++++++--------- packages/order-watcher/package.json | 28 ++++++++++++------------- packages/pipeline/package.json | 18 ++++++++-------- packages/react-docs/package.json | 10 ++++----- packages/react-shared/package.json | 6 +++--- packages/sol-compiler/package.json | 16 +++++++-------- packages/sol-coverage/package.json | 6 +++--- packages/sol-doc/package.json | 8 ++++---- packages/sol-profiler/package.json | 6 +++--- packages/sol-resolver/package.json | 4 ++-- packages/sol-trace/package.json | 6 +++--- packages/sol-tracing-utils/package.json | 14 ++++++------- packages/sra-spec/package.json | 4 ++-- packages/subproviders/package.json | 10 ++++----- packages/testnet-faucets/package.json | 10 ++++----- packages/types/package.json | 2 +- packages/utils/package.json | 4 ++-- packages/web3-wrapper/package.json | 8 ++++---- packages/website/package.json | 22 ++++++++++---------- 45 files changed, 333 insertions(+), 333 deletions(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 101109a80..b185124dd 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-asset-proxy", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -63,16 +63,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-erc20": "^1.0.1", - "@0x/contracts-erc721": "^1.0.1", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/contracts-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-erc20": "^1.0.2", + "@0x/contracts-erc721": "^1.0.2", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index e60af6bfe..936854a7a 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc20", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,10 +44,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -64,13 +64,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-exchange-libs": "^1.0.1", - "@0x/contracts-utils": "^2.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-exchange-libs": "^1.0.2", + "@0x/contracts-utils": "^2.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 0a31a48ff..175e12fa6 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc721", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,10 +44,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -64,12 +64,12 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-utils": "^2.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-utils": "^2.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 53b7a92d9..8cee3cf80 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-forwarder", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,11 +44,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contract-wrappers": "^7.0.0", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -65,18 +65,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-asset-proxy": "^1.0.1", - "@0x/contracts-erc20": "^1.0.1", - "@0x/contracts-erc721": "^1.0.1", - "@0x/contracts-exchange": "^1.0.1", - "@0x/contracts-exchange-libs": "^1.0.1", - "@0x/contracts-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.2", + "@0x/contracts-erc20": "^1.0.2", + "@0x/contracts-erc721": "^1.0.2", + "@0x/contracts-exchange": "^1.0.2", + "@0x/contracts-exchange-libs": "^1.0.2", + "@0x/contracts-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index bd35e9888..0e05830f4 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-libs", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,10 +44,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -64,13 +64,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 76fe7f215..9bc6c5340 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange", - "version": "1.0.1", + "version": "1.0.2", "engines": { "node": ">=6.12" }, @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -63,18 +63,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-asset-proxy": "^1.0.1", - "@0x/contracts-erc20": "^1.0.1", - "@0x/contracts-erc721": "^1.0.1", - "@0x/contracts-exchange-libs": "^1.0.1", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/contracts-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.2", + "@0x/contracts-erc20": "^1.0.2", + "@0x/contracts-erc721": "^1.0.2", + "@0x/contracts-exchange-libs": "^1.0.2", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5" diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 2c8767bcb..09fc2b85a 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-extensions", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -44,11 +44,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contract-wrappers": "^7.0.0", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -65,18 +65,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-asset-proxy": "^1.0.1", - "@0x/contracts-erc20": "^1.0.1", - "@0x/contracts-erc721": "^1.0.1", - "@0x/contracts-exchange": "^1.0.1", - "@0x/contracts-exchange-libs": "^1.0.1", - "@0x/contracts-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.2", + "@0x/contracts-erc20": "^1.0.2", + "@0x/contracts-erc721": "^1.0.2", + "@0x/contracts-exchange": "^1.0.2", + "@0x/contracts-exchange-libs": "^1.0.2", + "@0x/contracts-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 2bd71e240..e947ef571 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-multisig", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -44,10 +44,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -64,13 +64,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/contracts-asset-proxy": "^1.0.1", - "@0x/contracts-erc20": "^1.0.1", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/contracts-asset-proxy": "^1.0.2", + "@0x/contracts-erc20": "^1.0.2", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.5" }, diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index e47561cdb..484562125 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-test-utils", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -40,19 +40,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/sol-compiler": "^3.0.0", - "@0x/sol-coverage": "^2.0.0", - "@0x/sol-profiler": "^2.0.1", - "@0x/sol-trace": "^2.0.1", - "@0x/subproviders": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/sol-compiler": "^3.0.1", + "@0x/sol-coverage": "^2.0.1", + "@0x/sol-profiler": "^2.0.2", + "@0x/sol-trace": "^2.0.2", + "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/bn.js": "^4.11.0", "@types/js-combinatorics": "^0.5.29", "@types/lodash": "4.14.104", diff --git a/contracts/utils/package.json b/contracts/utils/package.json index f277b6673..62b774b5b 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-utils", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -44,10 +44,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", @@ -65,12 +65,12 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "bn.js": "^4.11.8", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 58cd439fd..a3e4886da 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "4.0.0", + "version": "4.0.1", "engines": { "node": ">=6.12" }, @@ -42,10 +42,10 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", + "@0x/abi-gen-wrappers": "^3.0.1", "@0x/contract-addresses": "^2.2.1", - "@0x/dev-utils": "^2.0.0", - "@0x/migrations": "^3.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/migrations": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -72,16 +72,16 @@ "webpack": "^4.20.2" }, "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/base-contract": "^4.0.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/order-utils": "^4.0.0", - "@0x/order-watcher": "^3.0.0", - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/base-contract": "^4.0.1", + "@0x/contract-wrappers": "^7.0.0", + "@0x/order-utils": "^5.0.0", + "@0x/order-watcher": "^3.0.1", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/web3-provider-engine": "^14.0.0", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json index 2372aacda..ce6183169 100644 --- a/packages/abi-gen-wrappers/package.json +++ b/packages/abi-gen-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0x/abi-gen-wrappers", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -30,19 +30,19 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.0", + "@0x/abi-gen": "^2.0.1", "@0x/abi-gen-templates": "^2.0.0", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/types": "^2.0.1", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11", "shx": "^0.2.2" }, "dependencies": { - "@0x/base-contract": "^4.0.0" + "@0x/base-contract": "^4.0.1" }, "publishConfig": { "access": "public" diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 3199eb120..3856f29b9 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0x/abi-gen", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -32,7 +32,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "dependencies": { "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", "glob": "^7.1.2", diff --git a/packages/assert/package.json b/packages/assert/package.json index e071e3992..6b87d67f2 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0x/assert", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -44,9 +44,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/json-schemas": "^3.0.0", + "@0x/json-schemas": "^3.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "lodash": "^4.17.11", "valid-url": "^1.0.9" }, diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index e4a8dcd6a..5a53330a4 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@ { "name": "@0x/asset-buyer", - "version": "5.0.0", + "version": "5.0.1", "engines": { "node": ">=6.12" }, @@ -36,16 +36,16 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/connect": "^4.0.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/connect": "^4.0.1", + "@0x/contract-wrappers": "^7.0.0", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 1dbc6a854..ac7b3fb87 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,6 @@ { "name": "@0x/base-contract", - "version": "4.0.0", + "version": "4.0.1", "engines": { "node": ">=6.12" }, @@ -41,8 +41,8 @@ }, "dependencies": { "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/connect/package.json b/packages/connect/package.json index b0e1fd3b2..5c54fc252 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0x/connect", - "version": "4.0.0", + "version": "4.0.1", "engines": { "node": ">=6.12" }, @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "lodash": "^4.17.11", "query-string": "^6.0.0", "sinon": "^4.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 562eba81c..ac764942a 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contract-wrappers", - "version": "6.0.1", + "version": "7.0.0", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", @@ -37,9 +37,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.0", - "@0x/migrations": "^3.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/migrations": "^3.0.1", + "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -65,18 +65,18 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", - "@0x/assert": "^2.0.0", + "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/assert": "^2.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contracts-test-utils": "^3.0.0", - "@0x/fill-scenarios": "^2.0.0", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/contracts-test-utils": "^3.0.1", + "@0x/fill-scenarios": "^2.0.1", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethereumjs-abi": "0.6.5", "ethereumjs-blockstream": "6.0.0", diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index 3a3345e82..ad6febd54 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -1,6 +1,6 @@ { "name": "@0x/dev-tools-pages", - "version": "0.0.15", + "version": "0.0.16", "engines": { "node": ">=6.12" }, @@ -26,7 +26,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@0x/react-shared": "^2.0.0", + "@0x/react-shared": "^2.0.1", "basscss": "^8.0.3", "bowser": "^1.9.3", "highlight.js": "^9.13.1", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 41956765b..183e20fc1 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/dev-utils", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -41,11 +41,11 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", "ethereum-types": "^2.0.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 5bde3f23e..6833a34bc 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@ { "name": "@0x/fill-scenarios", - "version": "2.0.0", + "version": "2.0.1", "description": "0x order fill scenario generator", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -28,14 +28,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", - "@0x/base-contract": "^4.0.0", + "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/base-contract": "^4.0.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/instant/package.json b/packages/instant/package.json index 3b7055595..81a7ccd61 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,6 +1,6 @@ { "name": "@0x/instant", - "version": "1.0.9", + "version": "1.0.10", "engines": { "node": ">=6.12" }, @@ -42,15 +42,15 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md", "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/asset-buyer": "^5.0.0", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/asset-buyer": "^5.0.1", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "babel-runtime": "^6.26.0", "bowser": "^1.9.4", "copy-to-clipboard": "^3.0.8", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index a1966897f..1b6fdc116 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0x/json-schemas", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -46,7 +46,7 @@ }, "devDependencies": { "@0x/tslint-config": "^3.0.0", - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 63b137df0..24b387355 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -1,6 +1,6 @@ { "name": "@0x/metacoin", - "version": "0.0.37", + "version": "0.0.38", "engines": { "node": ">=6.12" }, @@ -29,18 +29,18 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@0x/abi-gen": "^2.0.0", + "@0x/abi-gen": "^2.0.1", "@0x/abi-gen-templates": "^2.0.0", - "@0x/base-contract": "^4.0.0", - "@0x/sol-coverage": "^2.0.0", - "@0x/sol-profiler": "^2.0.1", - "@0x/sol-trace": "^2.0.1", - "@0x/subproviders": "^3.0.0", + "@0x/base-contract": "^4.0.1", + "@0x/sol-coverage": "^2.0.1", + "@0x/sol-profiler": "^2.0.2", + "@0x/sol-trace": "^2.0.2", + "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/mocha": "^2.2.42", "copyfiles": "^2.0.0", "ethereum-types": "^2.0.0", @@ -49,8 +49,8 @@ "run-s": "^0.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 6ad48b3a6..269cbad17 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { "name": "@0x/migrations", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -35,9 +35,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0x/dev-utils": "^2.0.0", + "@0x/dev-utils": "^2.0.1", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@types/yargs": "^11.0.0", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", @@ -48,16 +48,16 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", - "@0x/base-contract": "^4.0.0", + "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/base-contract": "^4.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^4.0.0", - "@0x/sol-compiler": "^3.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/order-utils": "^5.0.0", + "@0x/sol-compiler": "^3.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index dbe2d081c..6d94aa586 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/monorepo-scripts", - "version": "1.0.20", + "version": "1.0.21", "engines": { "node": ">=6.12" }, @@ -47,7 +47,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "@lerna/batch-packages": "^3.0.0-beta.18", "@types/depcheck": "^0.6.0", "async-child-process": "^1.1.1", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 8645581ab..35961d085 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-utils", - "version": "4.0.0", + "version": "5.0.0", "engines": { "node": ">=6.12" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0x/dev-utils": "^2.0.0", + "@0x/dev-utils": "^2.0.1", "@0x/tslint-config": "^3.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", @@ -53,16 +53,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", - "@0x/assert": "^2.0.0", - "@0x/base-contract": "^4.0.0", - "@0x/contract-artifacts": "^1.3.0", + "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/assert": "^2.0.1", + "@0x/base-contract": "^4.0.1", "@0x/contract-addresses": "^2.2.1", - "@0x/json-schemas": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/contract-artifacts": "^1.3.0", + "@0x/json-schemas": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/node": "*", "bn.js": "^4.11.8", "ethereum-types": "^2.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 472b59bbd..6d52740ac 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-watcher", - "version": "3.0.0", + "version": "3.0.1", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -38,9 +38,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.0", - "@0x/migrations": "^3.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/migrations": "^3.0.1", + "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", @@ -63,19 +63,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.0", - "@0x/assert": "^2.0.0", - "@0x/base-contract": "^4.0.0", + "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/assert": "^2.0.1", + "@0x/base-contract": "^4.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/fill-scenarios": "^2.0.0", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/types": "^2.0.0", + "@0x/contract-wrappers": "^7.0.0", + "@0x/fill-scenarios": "^2.0.1", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "bintrees": "^1.0.2", "ethereum-types": "^2.0.0", "ethereumjs-blockstream": "6.0.0", diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index e1292c0df..e9abb4e13 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -1,6 +1,6 @@ { "name": "@0x/pipeline", - "version": "1.0.6", + "version": "1.0.7", "private": true, "description": "Data pipeline for offline analysis", "scripts": { @@ -39,16 +39,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/connect": "^4.0.0", + "@0x/connect": "^4.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^6.0.1", - "@0x/dev-utils": "^2.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/contract-wrappers": "^7.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/dockerode": "^2.5.9", "@types/p-limit": "^2.0.0", "async-parallel": "^1.2.3", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index d9c354e25..569aae3ce 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-docs", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -24,7 +24,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^2.0.0", + "@0x/dev-utils": "^2.0.1", "@0x/tslint-config": "^3.0.0", "@types/compare-versions": "^3.0.0", "@types/styled-components": "4.0.0", @@ -34,9 +34,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/react-shared": "^2.0.0", - "@0x/types": "^2.0.0", - "@0x/utils": "^4.0.1", + "@0x/react-shared": "^2.0.1", + "@0x/types": "^2.0.1", + "@0x/utils": "^4.0.2", "@types/lodash": "4.14.104", "@types/material-ui": "^0.20.0", "@types/node": "*", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index bf860b412..da464bc80 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -25,7 +25,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^2.0.0", + "@0x/dev-utils": "^2.0.1", "@0x/tslint-config": "^3.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", @@ -33,7 +33,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@material-ui/core": "^3.0.1", "@types/is-mobile": "0.3.0", "@types/lodash": "4.14.104", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index c16c6eb4a..3ba3c20e6 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-compiler", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { - "@0x/dev-utils": "^2.0.0", + "@0x/dev-utils": "^2.0.1", "@0x/tslint-config": "^3.0.0", "@types/chokidar": "^1.7.5", "@types/mkdirp": "^0.5.2", @@ -67,13 +67,13 @@ "zeppelin-solidity": "1.8.0" }, "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/json-schemas": "^3.0.0", - "@0x/sol-resolver": "^2.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/json-schemas": "^3.0.1", + "@0x/sol-resolver": "^2.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/yargs": "^11.0.0", "chalk": "^2.3.0", "chokidar": "^2.0.4", diff --git a/packages/sol-coverage/package.json b/packages/sol-coverage/package.json index 8f0681639..f6be925bb 100644 --- a/packages/sol-coverage/package.json +++ b/packages/sol-coverage/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-coverage", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-coverage/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/sol-tracing-utils": "^6.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json index 2004b5bd2..e68e3a237 100644 --- a/packages/sol-doc/package.json +++ b/packages/sol-doc/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-doc", - "version": "2.0.0", + "version": "2.0.1", "description": "Solidity documentation generator", "main": "lib/src/index.js", "types": "lib/src/index.d.js", @@ -25,9 +25,9 @@ "author": "F. Eugene Aumson", "license": "Apache-2.0", "dependencies": { - "@0x/sol-compiler": "^3.0.0", - "@0x/types": "^2.0.0", - "@0x/utils": "^4.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/types": "^2.0.1", + "@0x/utils": "^4.0.2", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.11", diff --git a/packages/sol-profiler/package.json b/packages/sol-profiler/package.json index 06ca7a708..8518c88b0 100644 --- a/packages/sol-profiler/package.json +++ b/packages/sol-profiler/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-profiler", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-profiler/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/sol-tracing-utils": "^6.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 3f0fe3be4..1f5189537 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-resolver", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -30,7 +30,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "lodash": "^4.17.11" }, diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index a1439de7e..678253ce7 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-trace", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-trace/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/sol-tracing-utils": "^6.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index 082894b2c..5e2f69c82 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-tracing-utils", - "version": "6.0.0", + "version": "6.0.1", "engines": { "node": ">=6.12" }, @@ -42,13 +42,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-tracing-utils/README.md", "dependencies": { - "@0x/dev-utils": "^2.0.0", - "@0x/sol-compiler": "^3.0.0", - "@0x/sol-resolver": "^2.0.0", - "@0x/subproviders": "^3.0.0", + "@0x/dev-utils": "^2.0.1", + "@0x/sol-compiler": "^3.0.1", + "@0x/sol-resolver": "^2.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@types/solidity-parser-antlr": "^0.2.0", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 34cfb0205..7644cbe7d 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sra-spec", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md", "dependencies": { - "@0x/json-schemas": "^3.0.0", + "@0x/json-schemas": "^3.0.1", "@loopback/openapi-v3-types": "^0.8.2" }, "devDependencies": { diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index ffba02051..30728434f 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0x/subproviders", - "version": "3.0.0", + "version": "3.0.1", "engines": { "node": ">=6.12" }, @@ -29,11 +29,11 @@ } }, "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/types": "^2.0.0", + "@0x/assert": "^2.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "4.24.0", "@types/eth-lightwallet": "^3.0.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index dd1faf1b7..74c43a2d1 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/testnet-faucets", - "version": "1.0.65", + "version": "1.0.66", "engines": { "node": ">=6.12" }, @@ -18,11 +18,11 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^4.0.0", - "@0x/subproviders": "^3.0.0", + "0x.js": "^4.0.1", + "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "body-parser": "^1.17.1", "ethereum-types": "^2.0.0", "ethereumjs-tx": "^1.3.5", diff --git a/packages/types/package.json b/packages/types/package.json index 89d1bbd1c..4e196b292 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0x/types", - "version": "2.0.0", + "version": "2.0.1", "engines": { "node": ">=6.12" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 8431b98c1..f5b69644e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/utils", - "version": "4.0.1", + "version": "4.0.2", "engines": { "node": ">=6.12" }, @@ -44,7 +44,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.0", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@types/node": "*", "abortcontroller-polyfill": "^1.1.9", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index eab2e6bce..967d2bc34 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0x/web3-wrapper", - "version": "4.0.0", + "version": "4.0.1", "engines": { "node": ">=6.12" }, @@ -54,10 +54,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^2.0.0", - "@0x/json-schemas": "^3.0.0", + "@0x/assert": "^2.0.1", + "@0x/json-schemas": "^3.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", + "@0x/utils": "^4.0.2", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/website/package.json b/packages/website/package.json index 651b0e118..25b503c58 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0x/website", - "version": "0.0.68", + "version": "0.0.69", "engines": { "node": ">=6.12" }, @@ -20,18 +20,18 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0x/asset-buyer": "^5.0.0", + "@0x/asset-buyer": "^5.0.1", "@0x/contract-addresses": "^2.2.1", - "@0x/contract-wrappers": "^6.0.1", - "@0x/json-schemas": "^3.0.0", - "@0x/order-utils": "^4.0.0", - "@0x/react-docs": "^2.0.0", - "@0x/react-shared": "^2.0.0", - "@0x/subproviders": "^3.0.0", - "@0x/types": "^2.0.0", + "@0x/contract-wrappers": "^7.0.0", + "@0x/json-schemas": "^3.0.1", + "@0x/order-utils": "^5.0.0", + "@0x/react-docs": "^2.0.1", + "@0x/react-shared": "^2.0.1", + "@0x/subproviders": "^3.0.1", + "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.1", - "@0x/web3-wrapper": "^4.0.0", + "@0x/utils": "^4.0.2", + "@0x/web3-wrapper": "^4.0.1", "@reach/dialog": "^0.1.2", "@types/react-lazyload": "^2.3.1", "@types/react-loadable": "^5.4.2", -- cgit v1.2.3 From a50eefc44e965c9d901638672857bd4c44c758e9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 6 Feb 2019 14:08:45 +0000 Subject: Fix paragraph rendering on wiki --- packages/react-shared/src/components/markdown_paragraph_block.tsx | 6 +++++- packages/website/less/all.less | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/react-shared/src/components/markdown_paragraph_block.tsx b/packages/react-shared/src/components/markdown_paragraph_block.tsx index eeaef8571..9ed44ed07 100644 --- a/packages/react-shared/src/components/markdown_paragraph_block.tsx +++ b/packages/react-shared/src/components/markdown_paragraph_block.tsx @@ -6,5 +6,9 @@ import { colors } from '../utils/colors'; export interface MarkdownParagraphBlockProps {} export const MarkdownParagraphBlock: React.StatelessComponent = ({ children }) => { - return {children}; + return ( + + {children} + + ); }; diff --git a/packages/website/less/all.less b/packages/website/less/all.less index 5d1dccc98..d288b182b 100644 --- a/packages/website/less/all.less +++ b/packages/website/less/all.less @@ -88,13 +88,6 @@ code { color: #1d5cde; // linkBlue } - h1, - h2, - h3, - h4 { - padding-top: 15px; - } - p, blockquote, ol, -- cgit v1.2.3 From ac58ace8cfd02e0d6f39fc833eb515fbd8340482 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 00:16:39 +0000 Subject: Add CHANGELOG entry about faux publish of contract packages --- contracts/asset-proxy/CHANGELOG.json | 8 ++++++++ contracts/erc20/CHANGELOG.json | 8 ++++++++ contracts/erc721/CHANGELOG.json | 8 ++++++++ contracts/exchange-forwarder/CHANGELOG.json | 8 ++++++++ contracts/exchange-libs/CHANGELOG.json | 8 ++++++++ contracts/exchange/CHANGELOG.json | 8 ++++++++ contracts/extensions/CHANGELOG.json | 8 ++++++++ contracts/multisig/CHANGELOG.json | 8 ++++++++ contracts/test-utils/CHANGELOG.json | 8 ++++++++ contracts/utils/CHANGELOG.json | 8 ++++++++ 10 files changed, 80 insertions(+) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 940294368..ad2548d12 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 64e5cc844..bb7e83cb5 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index c2a40b4fc..a5d331a8b 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index 8b9292e0f..7e18cf796 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index 56fa0308a..ebb5eb8e8 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index c0b783ef9..c9ecf878a 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "1.0.3", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "1.0.2", diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index a3df1c2ee..589e989d5 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.0.2", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 951c5679b..50ea3c6ad 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.0.2", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index f1aaad3b4..9809347f6 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "3.0.2", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 1b6a8d2c3..fbe3b5530 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "2.0.2", + "changes": [ + { + "note": "Fake publish to enable pinning" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", -- cgit v1.2.3 From b883b183a6c6011e306fee4338eb4d0da698911a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 01:03:43 +0000 Subject: Stop exporting EIP712 schemas --- packages/order-utils/CHANGELOG.json | 6 ++++++ packages/order-utils/src/eip712_utils.ts | 20 +++++++------------- packages/order-utils/src/index.ts | 9 +-------- packages/order-utils/test/eip712_utils_test.ts | 17 ++++++----------- 4 files changed, 20 insertions(+), 32 deletions(-) diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index b5eb209d7..fcecdd48e 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,10 @@ [ + { + "version": "6.0.0", + "changes": { + "note": "Stop exporting the EIP712 schemas" + } + }, { "version": "5.0.0", "changes": [ diff --git a/packages/order-utils/src/eip712_utils.ts b/packages/order-utils/src/eip712_utils.ts index 313653c63..685fdc8c8 100644 --- a/packages/order-utils/src/eip712_utils.ts +++ b/packages/order-utils/src/eip712_utils.ts @@ -12,12 +12,6 @@ import * as _ from 'lodash'; import { constants } from './constants'; -export const DEFAULT_DOMAIN_SCHEMA = constants.DEFAULT_DOMAIN_SCHEMA; -export const EXCHANGE_DOMAIN_NAME = constants.EXCHANGE_DOMAIN_NAME; -export const EXCHANGE_DOMAIN_VERSION = constants.EXCHANGE_DOMAIN_VERSION; -export const EXCHANGE_ORDER_SCHEMA = constants.EXCHANGE_ORDER_SCHEMA; -export const EXCHANGE_ZEROEX_TRANSACTION_SCHEMA = constants.EXCHANGE_ZEROEX_TRANSACTION_SCHEMA; - export const eip712Utils = { /** * Creates a EIP712TypedData object specific to the 0x protocol for use with signTypedData. @@ -37,12 +31,12 @@ export const eip712Utils = { assert.isString('primaryType', primaryType); const typedData = { types: { - EIP712Domain: DEFAULT_DOMAIN_SCHEMA.parameters, + EIP712Domain: constants.DEFAULT_DOMAIN_SCHEMA.parameters, ...types, }, domain: { - name: _.isUndefined(domain.name) ? EXCHANGE_DOMAIN_NAME : domain.name, - version: _.isUndefined(domain.version) ? EXCHANGE_DOMAIN_VERSION : domain.version, + name: _.isUndefined(domain.name) ? constants.EXCHANGE_DOMAIN_NAME : domain.name, + version: _.isUndefined(domain.version) ? constants.EXCHANGE_DOMAIN_VERSION : domain.version, verifyingContract: domain.verifyingContractAddress, }, message, @@ -65,8 +59,8 @@ export const eip712Utils = { verifyingContractAddress: order.exchangeAddress, }; const typedData = eip712Utils.createTypedData( - EXCHANGE_ORDER_SCHEMA.name, - { Order: EXCHANGE_ORDER_SCHEMA.parameters }, + constants.EXCHANGE_ORDER_SCHEMA.name, + { Order: constants.EXCHANGE_ORDER_SCHEMA.parameters }, normalizedOrder, domain, ); @@ -88,8 +82,8 @@ export const eip712Utils = { verifyingContractAddress: zeroExTransaction.verifyingContractAddress, }; const typedData = eip712Utils.createTypedData( - EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name, - { ZeroExTransaction: EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.parameters }, + constants.EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name, + { ZeroExTransaction: constants.EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.parameters }, normalizedTransaction, domain, ); diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index 436677efc..ff37d7088 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -19,14 +19,7 @@ export { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export { BalanceAndProxyAllowanceLazyStore } from './store/balance_and_proxy_allowance_lazy_store'; export { OrderFilledCancelledLazyStore } from './store/order_filled_cancelled_lazy_store'; -export { - eip712Utils, - DEFAULT_DOMAIN_SCHEMA, - EXCHANGE_DOMAIN_NAME, - EXCHANGE_DOMAIN_VERSION, - EXCHANGE_ORDER_SCHEMA, - EXCHANGE_ZEROEX_TRANSACTION_SCHEMA, -} from './eip712_utils'; +export { eip712Utils } from './eip712_utils'; export { Provider, diff --git a/packages/order-utils/test/eip712_utils_test.ts b/packages/order-utils/test/eip712_utils_test.ts index 4208e9beb..c97bed144 100644 --- a/packages/order-utils/test/eip712_utils_test.ts +++ b/packages/order-utils/test/eip712_utils_test.ts @@ -3,12 +3,7 @@ import * as chai from 'chai'; import 'mocha'; import { constants } from '../src/constants'; -import { - eip712Utils, - EXCHANGE_DOMAIN_NAME, - EXCHANGE_DOMAIN_VERSION, - EXCHANGE_ZEROEX_TRANSACTION_SCHEMA, -} from '../src/eip712_utils'; +import { eip712Utils } from '../src/eip712_utils'; import { chaiSetup } from './utils/chai_setup'; @@ -28,8 +23,8 @@ describe('EIP712 Utils', () => { expect(typedData.domain).to.not.be.undefined(); expect(typedData.types.EIP712Domain).to.not.be.undefined(); const domainObject = typedData.domain; - expect(domainObject.name).to.eq(EXCHANGE_DOMAIN_NAME); - expect(domainObject.version).to.eq(EXCHANGE_DOMAIN_VERSION); + expect(domainObject.name).to.eq(constants.EXCHANGE_DOMAIN_NAME); + expect(domainObject.version).to.eq(constants.EXCHANGE_DOMAIN_VERSION); expect(domainObject.verifyingContract).to.eq(constants.NULL_ADDRESS); expect(typedData.primaryType).to.eq(primaryType); }); @@ -60,11 +55,11 @@ describe('EIP712 Utils', () => { signerAddress: constants.NULL_ADDRESS, verifyingContractAddress: constants.NULL_ADDRESS, }); - expect(typedData.primaryType).to.eq(EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name); + expect(typedData.primaryType).to.eq(constants.EXCHANGE_ZEROEX_TRANSACTION_SCHEMA.name); expect(typedData.types.EIP712Domain).to.not.be.undefined(); const domainObject = typedData.domain; - expect(domainObject.name).to.eq(EXCHANGE_DOMAIN_NAME); - expect(domainObject.version).to.eq(EXCHANGE_DOMAIN_VERSION); + expect(domainObject.name).to.eq(constants.EXCHANGE_DOMAIN_NAME); + expect(domainObject.version).to.eq(constants.EXCHANGE_DOMAIN_VERSION); expect(domainObject.verifyingContract).to.eq(constants.NULL_ADDRESS); }); }); -- cgit v1.2.3 From af26403a860de28656d71c1c05a5f5246ee480b8 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 01:53:02 +0000 Subject: Updated CHANGELOGS --- contracts/asset-proxy/CHANGELOG.json | 3 ++- contracts/asset-proxy/CHANGELOG.md | 4 ++++ contracts/erc20/CHANGELOG.json | 3 ++- contracts/erc20/CHANGELOG.md | 4 ++++ contracts/erc721/CHANGELOG.json | 3 ++- contracts/erc721/CHANGELOG.md | 4 ++++ contracts/exchange-forwarder/CHANGELOG.json | 3 ++- contracts/exchange-forwarder/CHANGELOG.md | 4 ++++ contracts/exchange-libs/CHANGELOG.json | 3 ++- contracts/exchange-libs/CHANGELOG.md | 4 ++++ contracts/exchange/CHANGELOG.json | 3 ++- contracts/exchange/CHANGELOG.md | 4 ++++ contracts/extensions/CHANGELOG.json | 3 ++- contracts/extensions/CHANGELOG.md | 4 ++++ contracts/multisig/CHANGELOG.json | 3 ++- contracts/multisig/CHANGELOG.md | 4 ++++ contracts/test-utils/CHANGELOG.json | 3 ++- contracts/test-utils/CHANGELOG.md | 4 ++++ contracts/utils/CHANGELOG.json | 3 ++- contracts/utils/CHANGELOG.md | 4 ++++ packages/0x.js/CHANGELOG.json | 9 +++++++++ packages/0x.js/CHANGELOG.md | 4 ++++ packages/asset-buyer/CHANGELOG.json | 9 +++++++++ packages/asset-buyer/CHANGELOG.md | 4 ++++ packages/connect/CHANGELOG.json | 9 +++++++++ packages/connect/CHANGELOG.md | 4 ++++ packages/contract-wrappers/CHANGELOG.json | 9 +++++++++ packages/contract-wrappers/CHANGELOG.md | 4 ++++ packages/fill-scenarios/CHANGELOG.json | 9 +++++++++ packages/fill-scenarios/CHANGELOG.md | 4 ++++ packages/migrations/CHANGELOG.json | 9 +++++++++ packages/migrations/CHANGELOG.md | 4 ++++ packages/monorepo-scripts/src/publish.ts | 2 +- packages/order-utils/CHANGELOG.json | 3 ++- packages/order-utils/CHANGELOG.md | 4 ++++ packages/order-watcher/CHANGELOG.json | 9 +++++++++ packages/order-watcher/CHANGELOG.md | 4 ++++ packages/react-docs/CHANGELOG.json | 9 +++++++++ packages/react-docs/CHANGELOG.md | 4 ++++ packages/react-shared/CHANGELOG.json | 9 +++++++++ packages/react-shared/CHANGELOG.md | 4 ++++ 41 files changed, 184 insertions(+), 12 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index ad2548d12..1c48b6280 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/asset-proxy/CHANGELOG.md b/contracts/asset-proxy/CHANGELOG.md index ba38d8d8c..9600ae19a 100644 --- a/contracts/asset-proxy/CHANGELOG.md +++ b/contracts/asset-proxy/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index bb7e83cb5..352013d26 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/erc20/CHANGELOG.md b/contracts/erc20/CHANGELOG.md index 298bd6766..9f4bdb99e 100644 --- a/contracts/erc20/CHANGELOG.md +++ b/contracts/erc20/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index a5d331a8b..8a8027f36 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/erc721/CHANGELOG.md b/contracts/erc721/CHANGELOG.md index e87cb32ca..2fbf8fe7e 100644 --- a/contracts/erc721/CHANGELOG.md +++ b/contracts/erc721/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index 7e18cf796..44b812513 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/exchange-forwarder/CHANGELOG.md b/contracts/exchange-forwarder/CHANGELOG.md index 9bef39d6a..dde8d8087 100644 --- a/contracts/exchange-forwarder/CHANGELOG.md +++ b/contracts/exchange-forwarder/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index ebb5eb8e8..6a169e635 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/exchange-libs/CHANGELOG.md b/contracts/exchange-libs/CHANGELOG.md index d510ce089..0bd4a7b70 100644 --- a/contracts/exchange-libs/CHANGELOG.md +++ b/contracts/exchange-libs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index c9ecf878a..7b640dafe 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/exchange/CHANGELOG.md b/contracts/exchange/CHANGELOG.md index 4378d44e5..7a30bfea9 100644 --- a/contracts/exchange/CHANGELOG.md +++ b/contracts/exchange/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.3 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v1.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 589e989d5..4d9955408 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md index fb348fff9..fe80e1ddc 100644 --- a/contracts/extensions/CHANGELOG.md +++ b/contracts/extensions/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 50ea3c6ad..6fbe3712a 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md index 7349fca68..7426c18c3 100644 --- a/contracts/multisig/CHANGELOG.md +++ b/contracts/multisig/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 9809347f6..b789f2907 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index 4b0b1ed9e..222a6a93d 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index fbe3b5530..7c90d8e7e 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -5,7 +5,8 @@ { "note": "Fake publish to enable pinning" } - ] + ], + "timestamp": 1549504360 }, { "timestamp": 1549452781, diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md index ba83d631f..e11d1d9c5 100644 --- a/contracts/utils/CHANGELOG.md +++ b/contracts/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Fake publish to enable pinning + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 813409609..8f13049e9 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "4.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "4.0.1", diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 1626bb7d0..2ea296ea5 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index dc3df44e9..2b567bbb2 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "5.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "5.0.1", diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index c538fa3e0..d21d89b8e 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v5.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v5.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 6339048b8..feeb057d5 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "4.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "4.0.1", diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index eedc1edf4..af1b088c9 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 4ebab1ad7..803863da3 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "7.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "7.0.0", "changes": [ diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index a86fe613f..fee13b218 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v7.0.1 - _February 7, 2019_ + + * Dependencies updated + ## v7.0.0 - _February 6, 2019_ * Fix OrderValidatorWrapper constructor to use the correct address (#1568) diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index b6538274d..faa702fcf 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md index 2fbd84b2b..66966d3ec 100644 --- a/packages/fill-scenarios/CHANGELOG.md +++ b/packages/fill-scenarios/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index b102ed0f7..167279609 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index a741fb430..f759e4a91 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index 105d87dcd..196b4c2ff 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -47,7 +47,7 @@ async function confirmAsync(message: string): Promise { await confirmAsync( 'THIS IS NOT A TEST PUBLISH! You are about to publish one or more packages to npm. Are you sure you want to continue? (y/n)', ); - await confirmDocPagesRenderAsync(packagesWithDocs); + // await confirmDocPagesRenderAsync(packagesWithDocs); } // Update CHANGELOGs diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index fcecdd48e..d58a8a4c2 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -3,7 +3,8 @@ "version": "6.0.0", "changes": { "note": "Stop exporting the EIP712 schemas" - } + }, + "timestamp": 1549504360 }, { "version": "5.0.0", diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index d40ecb5a4..f5e20a8d8 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v6.0.0 - _February 7, 2019_ + + * undefined + ## v5.0.0 - _February 6, 2019_ * Add `transactionHashUtils` (#1576) diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 9fdc3af0f..c7bffa5b7 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index 95b13c746..bb908bfcf 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 17f6a428f..9fccd6257 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index 8e30d4d0a..a95f5371b 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 128df9442..b9a7ca3df 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549504360, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index 08f6a07ed..05bdffa14 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated -- cgit v1.2.3 From 2a344e26cc51fa41a9df3535b625b8609dfc167e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 01:53:15 +0000 Subject: Publish - 0x.js@4.0.2 - @0x/asset-buyer@5.0.2 - @0x/connect@4.0.2 - @0x/contract-wrappers@7.0.1 - @0x/dev-tools-pages@0.0.17 - @0x/fill-scenarios@2.0.2 - @0x/instant@1.0.11 - @0x/migrations@3.0.2 - @0x/monorepo-scripts@1.0.22 - @0x/order-utils@6.0.0 - @0x/order-watcher@3.0.2 - @0x/pipeline@1.0.8 - @0x/react-docs@2.0.2 - @0x/react-shared@2.0.2 - @0x/testnet-faucets@1.0.67 - @0x/website@0.0.70 - @0x/contracts-asset-proxy@1.0.3 - @0x/contracts-erc20@1.0.3 - @0x/contracts-erc721@1.0.3 - @0x/contracts-exchange@1.0.3 - @0x/contracts-exchange-forwarder@1.0.3 - @0x/contracts-exchange-libs@1.0.3 - @0x/contracts-extensions@2.0.2 - @0x/contracts-multisig@2.0.2 - @0x/contracts-test-utils@3.0.2 - @0x/contracts-utils@2.0.2 --- contracts/asset-proxy/package.json | 12 ++++++------ contracts/erc20/package.json | 8 ++++---- contracts/erc721/package.json | 6 +++--- contracts/exchange-forwarder/package.json | 20 ++++++++++---------- contracts/exchange-libs/package.json | 8 ++++---- contracts/exchange/package.json | 16 ++++++++-------- contracts/extensions/package.json | 20 ++++++++++---------- contracts/multisig/package.json | 8 ++++---- contracts/test-utils/package.json | 4 ++-- contracts/utils/package.json | 6 +++--- packages/0x.js/package.json | 10 +++++----- packages/asset-buyer/package.json | 8 ++++---- packages/connect/package.json | 4 ++-- packages/contract-wrappers/package.json | 10 +++++----- packages/dev-tools-pages/package.json | 4 ++-- packages/fill-scenarios/package.json | 4 ++-- packages/instant/package.json | 6 +++--- packages/migrations/package.json | 4 ++-- packages/monorepo-scripts/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 10 +++++----- packages/pipeline/package.json | 8 ++++---- packages/react-docs/package.json | 4 ++-- packages/react-shared/package.json | 2 +- packages/testnet-faucets/package.json | 4 ++-- packages/website/package.json | 12 ++++++------ 26 files changed, 101 insertions(+), 101 deletions(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index b185124dd..8398249cd 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-asset-proxy", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -64,11 +64,11 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-erc20": "^1.0.2", - "@0x/contracts-erc721": "^1.0.2", - "@0x/contracts-test-utils": "^3.0.1", - "@0x/contracts-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 936854a7a..937198f2f 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc20", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -65,8 +65,8 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-exchange-libs": "^1.0.2", - "@0x/contracts-utils": "^2.0.1", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 175e12fa6..4d2c79c46 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc721", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -65,7 +65,7 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-utils": "^2.0.1", + "@0x/contracts-utils": "^2.0.2", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 8cee3cf80..8e7a0c5e0 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-forwarder", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -45,8 +45,8 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contract-wrappers": "^7.0.0", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -66,13 +66,13 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.2", - "@0x/contracts-erc20": "^1.0.2", - "@0x/contracts-erc721": "^1.0.2", - "@0x/contracts-exchange": "^1.0.2", - "@0x/contracts-exchange-libs": "^1.0.2", - "@0x/contracts-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index 0e05830f4..6bf8267be 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-libs", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -65,8 +65,8 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 9bc6c5340..ca4b1fd00 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange", - "version": "1.0.2", + "version": "1.0.3", "engines": { "node": ">=6.12" }, @@ -64,13 +64,13 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.2", - "@0x/contracts-erc20": "^1.0.2", - "@0x/contracts-erc721": "^1.0.2", - "@0x/contracts-exchange-libs": "^1.0.2", - "@0x/contracts-test-utils": "^3.0.1", - "@0x/contracts-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 09fc2b85a..0a8cf7fc0 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-extensions", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -45,8 +45,8 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contract-wrappers": "^7.0.0", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -66,13 +66,13 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.2", - "@0x/contracts-erc20": "^1.0.2", - "@0x/contracts-erc721": "^1.0.2", - "@0x/contracts-exchange": "^1.0.2", - "@0x/contracts-exchange-libs": "^1.0.2", - "@0x/contracts-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-erc721": "^1.0.3", + "@0x/contracts-exchange": "^1.0.3", + "@0x/contracts-exchange-libs": "^1.0.3", + "@0x/contracts-utils": "^2.0.2", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index e947ef571..bc83bbf05 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-multisig", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -65,8 +65,8 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.2", - "@0x/contracts-erc20": "^1.0.2", + "@0x/contracts-asset-proxy": "^1.0.3", + "@0x/contracts-erc20": "^1.0.3", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 484562125..0b8478e05 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-test-utils", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -42,7 +42,7 @@ "dependencies": { "@0x/abi-gen": "^2.0.1", "@0x/dev-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/sol-compiler": "^3.0.1", "@0x/sol-coverage": "^2.0.1", "@0x/sol-profiler": "^2.0.2", diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 62b774b5b..214ea59d8 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-utils", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -66,7 +66,7 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index a3e4886da..0dce40010 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "4.0.1", + "version": "4.0.2", "engines": { "node": ">=6.12" }, @@ -45,7 +45,7 @@ "@0x/abi-gen-wrappers": "^3.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.1", + "@0x/migrations": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -74,9 +74,9 @@ "dependencies": { "@0x/assert": "^2.0.1", "@0x/base-contract": "^4.0.1", - "@0x/contract-wrappers": "^7.0.0", - "@0x/order-utils": "^5.0.0", - "@0x/order-watcher": "^3.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/order-utils": "^6.0.0", + "@0x/order-watcher": "^3.0.2", "@0x/subproviders": "^3.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index 5a53330a4..ccaaf5d87 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@ { "name": "@0x/asset-buyer", - "version": "5.0.1", + "version": "5.0.2", "engines": { "node": ">=6.12" }, @@ -37,10 +37,10 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "dependencies": { "@0x/assert": "^2.0.1", - "@0x/connect": "^4.0.1", - "@0x/contract-wrappers": "^7.0.0", + "@0x/connect": "^4.0.2", + "@0x/contract-wrappers": "^7.0.1", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/subproviders": "^3.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/packages/connect/package.json b/packages/connect/package.json index 5c54fc252..10c694ca9 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0x/connect", - "version": "4.0.1", + "version": "4.0.2", "engines": { "node": ">=6.12" }, @@ -46,7 +46,7 @@ "dependencies": { "@0x/assert": "^2.0.1", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index ac764942a..9fcf2a62d 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contract-wrappers", - "version": "7.0.0", + "version": "7.0.1", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", @@ -38,7 +38,7 @@ }, "devDependencies": { "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.1", + "@0x/migrations": "^3.0.2", "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", @@ -69,10 +69,10 @@ "@0x/assert": "^2.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contracts-test-utils": "^3.0.1", - "@0x/fill-scenarios": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", + "@0x/fill-scenarios": "^2.0.2", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index ad6febd54..7006e6ca9 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -1,6 +1,6 @@ { "name": "@0x/dev-tools-pages", - "version": "0.0.16", + "version": "0.0.17", "engines": { "node": ">=6.12" }, @@ -26,7 +26,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@0x/react-shared": "^2.0.1", + "@0x/react-shared": "^2.0.2", "basscss": "^8.0.3", "bowser": "^1.9.3", "highlight.js": "^9.13.1", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 6833a34bc..8ec4a1111 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@ { "name": "@0x/fill-scenarios", - "version": "2.0.1", + "version": "2.0.2", "description": "0x order fill scenario generator", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "@0x/abi-gen-wrappers": "^3.0.1", "@0x/base-contract": "^4.0.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/instant/package.json b/packages/instant/package.json index 81a7ccd61..07e817324 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,6 +1,6 @@ { "name": "@0x/instant", - "version": "1.0.10", + "version": "1.0.11", "engines": { "node": ">=6.12" }, @@ -43,9 +43,9 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md", "dependencies": { "@0x/assert": "^2.0.1", - "@0x/asset-buyer": "^5.0.1", + "@0x/asset-buyer": "^5.0.2", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/subproviders": "^3.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 269cbad17..857136158 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { "name": "@0x/migrations", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -52,7 +52,7 @@ "@0x/base-contract": "^4.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/sol-compiler": "^3.0.1", "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 6d94aa586..fddcc13f8 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/monorepo-scripts", - "version": "1.0.21", + "version": "1.0.22", "engines": { "node": ">=6.12" }, diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 35961d085..90fdfeed3 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-utils", - "version": "5.0.0", + "version": "6.0.0", "engines": { "node": ">=6.12" }, diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 6d52740ac..3c4cc06ba 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-watcher", - "version": "3.0.1", + "version": "3.0.2", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -39,7 +39,7 @@ }, "devDependencies": { "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.1", + "@0x/migrations": "^3.0.2", "@0x/subproviders": "^3.0.1", "@0x/tslint-config": "^3.0.0", "@types/bintrees": "^1.0.2", @@ -68,10 +68,10 @@ "@0x/base-contract": "^4.0.1", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^7.0.0", - "@0x/fill-scenarios": "^2.0.1", + "@0x/contract-wrappers": "^7.0.1", + "@0x/fill-scenarios": "^2.0.2", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index e9abb4e13..a1500cc74 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -1,6 +1,6 @@ { "name": "@0x/pipeline", - "version": "1.0.7", + "version": "1.0.8", "private": true, "description": "Data pipeline for offline analysis", "scripts": { @@ -39,12 +39,12 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/connect": "^4.0.1", + "@0x/connect": "^4.0.2", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^7.0.0", + "@0x/contract-wrappers": "^7.0.1", "@0x/dev-utils": "^2.0.1", - "@0x/order-utils": "^5.0.0", + "@0x/order-utils": "^6.0.0", "@0x/subproviders": "^3.0.1", "@0x/types": "^2.0.1", "@0x/utils": "^4.0.2", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 569aae3ce..ed32f4289 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-docs", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -34,7 +34,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/react-shared": "^2.0.1", + "@0x/react-shared": "^2.0.2", "@0x/types": "^2.0.1", "@0x/utils": "^4.0.2", "@types/lodash": "4.14.104", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index da464bc80..3558d8afd 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 74c43a2d1..22961d215 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/testnet-faucets", - "version": "1.0.66", + "version": "1.0.67", "engines": { "node": ">=6.12" }, @@ -18,7 +18,7 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^4.0.1", + "0x.js": "^4.0.2", "@0x/subproviders": "^3.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/packages/website/package.json b/packages/website/package.json index 25b503c58..77295d4de 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0x/website", - "version": "0.0.69", + "version": "0.0.70", "engines": { "node": ">=6.12" }, @@ -20,13 +20,13 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0x/asset-buyer": "^5.0.1", + "@0x/asset-buyer": "^5.0.2", "@0x/contract-addresses": "^2.2.1", - "@0x/contract-wrappers": "^7.0.0", + "@0x/contract-wrappers": "^7.0.1", "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^5.0.0", - "@0x/react-docs": "^2.0.1", - "@0x/react-shared": "^2.0.1", + "@0x/order-utils": "^6.0.0", + "@0x/react-docs": "^2.0.2", + "@0x/react-shared": "^2.0.2", "@0x/subproviders": "^3.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", -- cgit v1.2.3 From 9089bf2c5fdecdcaa271f83b4efeed7174ab12e4 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 6 Feb 2019 21:10:35 -0800 Subject: Lock dep versions in contracts packages --- contracts/asset-proxy/package.json | 8 ++++---- contracts/erc20/package.json | 4 ++-- contracts/erc721/package.json | 2 +- contracts/exchange-forwarder/package.json | 12 ++++++------ contracts/exchange-libs/package.json | 2 +- contracts/exchange/package.json | 12 ++++++------ contracts/extensions/package.json | 12 ++++++------ contracts/multisig/package.json | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 8398249cd..a08f9ed50 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -45,6 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -64,10 +65,9 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-erc20": "^1.0.3", - "@0x/contracts-erc721": "^1.0.3", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-erc20": "1.0.2", + "@0x/contracts-erc721": "1.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 937198f2f..63e3d20da 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -65,8 +65,8 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-exchange-libs": "^1.0.3", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-exchange-libs": "1.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 4d2c79c46..34f71c91e 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 8e7a0c5e0..015e48460 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -66,12 +66,12 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.3", - "@0x/contracts-erc20": "^1.0.3", - "@0x/contracts-erc721": "^1.0.3", - "@0x/contracts-exchange": "^1.0.3", - "@0x/contracts-exchange-libs": "^1.0.3", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-asset-proxy": "1.0.2", + "@0x/contracts-erc20": "1.0.2", + "@0x/contracts-erc721": "1.0.2", + "@0x/contracts-exchange": "1.0.2", + "@0x/contracts-exchange-libs": "1.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index 6bf8267be..695301da1 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -65,7 +65,7 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index ca4b1fd00..65cb8743b 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -45,6 +45,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { "@0x/abi-gen": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -64,12 +65,11 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.3", - "@0x/contracts-erc20": "^1.0.3", - "@0x/contracts-erc721": "^1.0.3", - "@0x/contracts-exchange-libs": "^1.0.3", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-asset-proxy": "1.0.2", + "@0x/contracts-erc20": "1.0.2", + "@0x/contracts-erc721": "1.0.2", + "@0x/contracts-exchange-libs": "1.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 0a8cf7fc0..cf0f5c6a6 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -66,12 +66,12 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.3", - "@0x/contracts-erc20": "^1.0.3", - "@0x/contracts-erc721": "^1.0.3", - "@0x/contracts-exchange": "^1.0.3", - "@0x/contracts-exchange-libs": "^1.0.3", - "@0x/contracts-utils": "^2.0.2", + "@0x/contracts-asset-proxy": "1.0.2", + "@0x/contracts-erc20": "1.0.2", + "@0x/contracts-erc721": "1.0.2", + "@0x/contracts-exchange": "1.0.2", + "@0x/contracts-exchange-libs": "1.0.2", + "@0x/contracts-utils": "2.0.1", "@0x/order-utils": "^6.0.0", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index bc83bbf05..493889b37 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -65,8 +65,8 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", - "@0x/contracts-asset-proxy": "^1.0.3", - "@0x/contracts-erc20": "^1.0.3", + "@0x/contracts-asset-proxy": "1.0.2", + "@0x/contracts-erc20": "1.0.2", "@0x/types": "^2.0.1", "@0x/typescript-typings": "^4.0.0", "@0x/utils": "^4.0.2", -- cgit v1.2.3 From 7519d60fb7c298148fbbc9aefa981eda3ac9637b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 11:29:04 +0100 Subject: Fix linter issues --- packages/monorepo-scripts/src/deps_versions.ts | 2 +- packages/monorepo-scripts/src/publish.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/monorepo-scripts/src/deps_versions.ts b/packages/monorepo-scripts/src/deps_versions.ts index fb57a26ef..bb7e50f51 100644 --- a/packages/monorepo-scripts/src/deps_versions.ts +++ b/packages/monorepo-scripts/src/deps_versions.ts @@ -25,7 +25,7 @@ interface ParsedDependencies { const PACKAGE_JSON_GLOB = '../../*/package.json'; const config = utils.readJSONFile(path.join(__dirname, '../../../package.json')) - .config as PackageJSONConfig; + .config as PackageJSONConfig; // tslint:disable-line no-unnecessary-type-assertion const dependenciesWithIgnoredVersions: string[] = (config.ignoreDependencyVersions as string).split(' '); const packagesWithIgnoredVersions: string[] = (config.ignoreDependencyVersionsForPackage as string).split(' '); diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index b9179678e..ddb2811f2 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -47,7 +47,7 @@ async function confirmAsync(message: string): Promise { await confirmAsync( 'THIS IS NOT A TEST PUBLISH! You are about to publish one or more packages to npm. Are you sure you want to continue? (y/n)', ); - // await confirmDocPagesRenderAsync(packagesWithDocs); + await confirmDocPagesRenderAsync(packagesWithDocs); } // Update CHANGELOGs -- cgit v1.2.3 From 88432a5e673e0b98aa45145394e6b6fe1bedf20d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 11:49:59 +0100 Subject: Fix deps versions --- contracts/asset-proxy/package.json | 2 +- contracts/erc20/package.json | 2 +- contracts/erc721/package.json | 2 +- contracts/exchange-forwarder/package.json | 2 +- contracts/exchange-libs/package.json | 2 +- contracts/exchange/package.json | 2 +- contracts/extensions/package.json | 2 +- contracts/multisig/package.json | 2 +- contracts/test-utils/package.json | 2 +- contracts/utils/package.json | 2 +- package.json | 2 +- packages/contracts-gen/package.json | 12 ++++++------ packages/pipeline/package.json | 2 +- packages/website/package.json | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index 88ae7e3a5..51d26b0ac 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -77,7 +77,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 082395376..b3517a8c0 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -75,7 +75,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 3989830a9..a8cf7016f 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -74,7 +74,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index 511d749f7..1ed3bee3a 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -81,7 +81,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index 8b50ca3f6..2b7a1c404 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -75,7 +75,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 021ae219a..6c3781b54 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -80,7 +80,7 @@ "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 34b994f02..118926eb5 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -81,7 +81,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index d6e5989cd..ce29122c4 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -75,7 +75,7 @@ "@0x/utils": "^4.0.2", "@0x/web3-wrapper": "^4.0.1", "ethereum-types": "^2.0.0", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 0b8478e05..f73e1f456 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -66,7 +66,7 @@ "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", "js-combinatorics": "^0.5.3", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "make-promises-safe": "^1.1.0" }, "publishConfig": { diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 9b66f532e..3b0e5a527 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -77,7 +77,7 @@ "bn.js": "^4.11.8", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", - "lodash": "^4.17.5" + "lodash": "^4.17.11" }, "publishConfig": { "access": "public" diff --git a/package.json b/package.json index be6d01c87..1c7ff93ed 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "lcov-result-merger": "^3.0.0", "lerna": "^3.0.0-beta.25", "npm-run-all": "^4.1.2", - "prettier": "^1.15.3", + "prettier": "^1.16.3", "source-map-support": "^0.5.6", "typescript": "3.0.1", "wsrun": "^2.2.0" diff --git a/packages/contracts-gen/package.json b/packages/contracts-gen/package.json index 9f9f14c4a..1265cac69 100644 --- a/packages/contracts-gen/package.json +++ b/packages/contracts-gen/package.json @@ -27,16 +27,16 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts-gen/README.md", "dependencies": { "@0x/types": "^2.0.1", - "@0x/utils": "^3.0.1", - "@0x/typescript-typings": "^3.0.8", - "ethereum-types": "^1.1.6", - "@0x/sol-resolver": "^1.2.3", - "lodash": "^4.17.5", + "@0x/utils": "^4.0.2", + "@0x/typescript-typings": "^4.0.0", + "ethereum-types": "^2.0.0", + "@0x/sol-resolver": "^2.0.1", + "lodash": "^4.17.11", "prettier": "^1.16.3", "to-snake-case": "^1.0.0" }, "devDependencies": { - "@0x/tslint-config": "^2.0.2", + "@0x/tslint-config": "^3.0.0", "@types/node": "*", "@types/prettier": "^1.15.2", "shx": "^0.2.2", diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index a1500cc74..3e45aa992 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -57,7 +57,7 @@ "dockerode": "^2.5.7", "ethereum-types": "^2.0.0", "pg": "^7.5.0", - "prettier": "^1.15.3", + "prettier": "^1.16.3", "ramda": "^0.25.0", "reflect-metadata": "^0.1.12", "sqlite3": "^4.0.2", diff --git a/packages/website/package.json b/packages/website/package.json index 77295d4de..62b83b3ec 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -47,7 +47,7 @@ "find-versions": "^2.0.0", "jsonschema": "^1.2.0", "less": "^2.7.2", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "material-ui": "^0.20.0", "moment": "2.21.0", "numeral": "^2.0.6", -- cgit v1.2.3 From 5ff646ca8e5b17fda83372a25f855ecb88758e70 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 10:53:14 +0000 Subject: re-add postinstall hack --- package.json | 4 +- yarn.lock | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dccfe6513..a077f3224 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,9 @@ "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate_and_upload.js", "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i --shouldUpload false --isStaging true || break -1; done;", "bundlewatch": "bundlewatch", - "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing" + "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing", + "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlink properly for types. We temporarily make it manually. Remove this ASAP!", + "postinstall": "shx cp -R node_modules/@0x/order-utils contracts/erc20/node_modules/@0x/contracts-exchange-libs/node_modules/@0x/contracts-utils/node_modules/@0x;" }, "config": { "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-multisig @0x/contracts-test-utils @0x/contracts-utils", diff --git a/yarn.lock b/yarn.lock index 858187f96..41795e163 100644 --- a/yarn.lock +++ b/yarn.lock @@ -472,6 +472,121 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" +"@0x/contracts-asset-proxy@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@0x/contracts-asset-proxy/-/contracts-asset-proxy-1.0.2.tgz#48a432a52a019ee632e50456f2687c85a5b57535" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/contracts-erc20" "^1.0.2" + "@0x/contracts-erc721" "^1.0.2" + "@0x/contracts-test-utils" "^3.0.1" + "@0x/contracts-utils" "^2.0.1" + "@0x/order-utils" "^5.0.0" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + ethereum-types "^2.0.0" + lodash "^4.17.5" + +"@0x/contracts-erc20@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@0x/contracts-erc20/-/contracts-erc20-1.0.2.tgz#67cfefd4458b262d575bb1b07f63bc3dfed4daeb" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/contracts-exchange-libs" "^1.0.2" + "@0x/contracts-utils" "^2.0.1" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + ethereum-types "^2.0.0" + lodash "^4.17.5" + +"@0x/contracts-erc721@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@0x/contracts-erc721/-/contracts-erc721-1.0.2.tgz#e7309ae57de266bb9c4947de50ba16a89203ad08" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/contracts-utils" "^2.0.1" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + ethereum-types "^2.0.0" + lodash "^4.17.5" + +"@0x/contracts-exchange-libs@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@0x/contracts-exchange-libs/-/contracts-exchange-libs-1.0.2.tgz#0682c01cdb3e36100bda0ffbdf9badb5b8a01fc4" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/contracts-utils" "^2.0.1" + "@0x/order-utils" "^5.0.0" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + ethereum-types "^2.0.0" + lodash "^4.17.5" + +"@0x/contracts-exchange@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@0x/contracts-exchange/-/contracts-exchange-1.0.2.tgz#4c02378b26a7bf6324e16a41f2851c43fed82c63" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/contracts-asset-proxy" "^1.0.2" + "@0x/contracts-erc20" "^1.0.2" + "@0x/contracts-erc721" "^1.0.2" + "@0x/contracts-exchange-libs" "^1.0.2" + "@0x/contracts-test-utils" "^3.0.1" + "@0x/contracts-utils" "^2.0.1" + "@0x/order-utils" "^5.0.0" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + ethereum-types "^2.0.0" + ethereumjs-util "^5.1.1" + lodash "^4.17.5" + +"@0x/contracts-utils@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@0x/contracts-utils/-/contracts-utils-2.0.1.tgz#32e298ab5e6edb045c37294063ff928b629db0a4" + dependencies: + "@0x/base-contract" "^4.0.1" + "@0x/order-utils" "^5.0.0" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + bn.js "^4.11.8" + ethereum-types "^2.0.0" + ethereumjs-util "^5.1.1" + lodash "^4.17.5" + +"@0x/order-utils@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@0x/order-utils/-/order-utils-5.0.0.tgz#7f43e0310ace31738895881501c8dda9c3a3aefa" + dependencies: + "@0x/abi-gen-wrappers" "^3.0.1" + "@0x/assert" "^2.0.1" + "@0x/base-contract" "^4.0.1" + "@0x/contract-addresses" "^2.2.1" + "@0x/contract-artifacts" "^1.3.0" + "@0x/json-schemas" "^3.0.1" + "@0x/types" "^2.0.1" + "@0x/typescript-typings" "^4.0.0" + "@0x/utils" "^4.0.2" + "@0x/web3-wrapper" "^4.0.1" + "@types/node" "*" + bn.js "^4.11.8" + ethereum-types "^2.0.0" + ethereumjs-abi "0.6.5" + ethereumjs-util "^5.1.1" + ethers "~4.0.4" + lodash "^4.17.11" + "@0xproject/npm-cli-login@^0.0.11": version "0.0.11" resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e" @@ -13395,6 +13510,8 @@ react-highlight@0xproject/react-highlight#react-peer-deps: dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" + react "^16.4.2" + react-dom "^16.4.2" react-hot-loader@^4.3.3: version "4.3.4" -- cgit v1.2.3 From fd4d3cff880e9131d55a4e534c17289db5f72b6b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 12:13:24 +0100 Subject: Fix sol-compiler bug with remappings causing smart recompilation to now work --- package.json | 2 ++ packages/metacoin/package.json | 3 ++- packages/sol-compiler/CHANGELOG.json | 9 +++++++++ packages/sol-compiler/src/compiler.ts | 5 ++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1c7ff93ed..af32a3c8f 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,8 @@ "watch:ts": "tsc -b -w", "clean": "wsrun clean $PKG --fast-exit -r --parallel --exclude-missing", "contracts:gen": "wsrun contracts:gen $PKG --fast-exit -r --parallel --exclude-missing", + "contracts:compile": "wsrun compile $PKG --fast-exit -r --stages --exclude-missing", + "contracts:watch": "wsrun watch $PKG --parallel --exclude-missing", "remove_node_modules": "lerna clean --yes; rm -rf node_modules", "rebuild": "run-s clean build", "rebuild:no_website": "run-s clean build:no_website", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 24b387355..fbff1c62a 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -24,7 +24,8 @@ "profiler:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test:coverage", - "compile": "sol-compiler compile" + "compile": "sol-compiler", + "watch": "sol-compiler -w" }, "author": "", "license": "Apache-2.0", diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 5f103342e..dd65f3aed 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "3.0.2", + "changes": [ + { + "note": "Fix a bug when smart recompilation wasn't working because of remappings", + "pr": 1575 + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index 743acacaa..c5dea1155 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -324,7 +324,10 @@ export class Compiler { } else { const currentArtifact = contractData.currentArtifactIfExists as ContractArtifact; const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION; - const didCompilerSettingsChange = !_.isEqual(currentArtifact.compiler.settings, this._compilerSettings); + const didCompilerSettingsChange = !_.isEqual( + _.omit(currentArtifact.compiler.settings, 'remappings'), + this._compilerSettings, + ); const didSourceChange = currentArtifact.sourceTreeHashHex !== contractData.sourceTreeHashHex; return !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange; } -- cgit v1.2.3 From c20285dd3655a9685b52205229e675c797cd4418 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 12:30:54 +0100 Subject: Fix the undefined opts bug --- packages/sol-compiler/CHANGELOG.json | 4 ++++ packages/sol-compiler/src/compiler.ts | 4 ++-- packages/sol-compiler/test/compiler_test.ts | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index dd65f3aed..a0d2250aa 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Fix a bug when smart recompilation wasn't working because of remappings", "pr": 1575 + }, + { + "note": "Fix a bug when opts could not be undefined", + "pr": "TODO" } ] }, diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index c5dea1155..686ba4f82 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -96,12 +96,12 @@ export class Compiler { * @return An instance of the Compiler class. */ constructor(opts?: CompilerOptions) { - assert.doesConformToSchema('opts', opts, compilerOptionsSchema); + const passedOpts = opts || {}; + assert.doesConformToSchema('opts', passedOpts, compilerOptionsSchema); // TODO: Look for config file in parent directories if not found in current directory const config: CompilerOptions = fs.existsSync(CONFIG_FILE) ? JSON.parse(fs.readFileSync(CONFIG_FILE).toString()) : {}; - const passedOpts = opts || {}; assert.doesConformToSchema('compiler.json', config, compilerOptionsSchema); this._contractsDir = path.resolve(passedOpts.contractsDir || config.contractsDir || DEFAULT_CONTRACTS_DIR); this._solcVersionIfExists = passedOpts.solcVersion || config.solcVersion; diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts index 464aa8bb6..5cc7e41ce 100644 --- a/packages/sol-compiler/test/compiler_test.ts +++ b/packages/sol-compiler/test/compiler_test.ts @@ -23,6 +23,9 @@ describe('#Compiler', function(): void { contractsDir, contracts: constants.contracts, }; + it('should create a Compiler with empty opts', async () => { + const _compiler = new Compiler(); + }); it('should create an Exchange artifact with the correct unlinked binary', async () => { compilerOpts.contracts = ['Exchange']; -- cgit v1.2.3 From b001fe2b08dd6c20de0f56a0285504d18c0d09fc Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 11:58:06 +0000 Subject: Remove postinstall hack --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index a077f3224..dccfe6513 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,7 @@ "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate_and_upload.js", "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i --shouldUpload false --isStaging true || break -1; done;", "bundlewatch": "bundlewatch", - "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing", - "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlink properly for types. We temporarily make it manually. Remove this ASAP!", - "postinstall": "shx cp -R node_modules/@0x/order-utils contracts/erc20/node_modules/@0x/contracts-exchange-libs/node_modules/@0x/contracts-utils/node_modules/@0x;" + "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing" }, "config": { "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-multisig @0x/contracts-test-utils @0x/contracts-utils", -- cgit v1.2.3 From 64d6dae672e71f6c81b472a58cb9c443607262c9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 12:58:46 +0100 Subject: Remove the bin_paths and fetch the solidity release list from github repo --- packages/sol-compiler/CHANGELOG.json | 4 +++ packages/sol-compiler/src/compiler.ts | 7 ++-- packages/sol-compiler/src/solc/bin_paths.ts | 52 ----------------------------- packages/sol-compiler/src/utils/compiler.ts | 21 +++++++++--- packages/sol-compiler/src/utils/types.ts | 4 +++ 5 files changed, 29 insertions(+), 59 deletions(-) delete mode 100644 packages/sol-compiler/src/solc/bin_paths.ts diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index a0d2250aa..977699ad6 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Fix a bug when opts could not be undefined", "pr": "TODO" + }, + { + "note": "Remove `bin_paths` and fetch the list of soliidty compilers from github", + "pr": "TODO" } ] }, diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index 686ba4f82..45608eb55 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -21,7 +21,6 @@ import * as semver from 'semver'; import solc = require('solc'); import { compilerOptionsSchema } from './schemas/compiler_options_schema'; -import { binPaths } from './solc/bin_paths'; import { addHexPrefixToContractBytecode, compileDockerAsync, @@ -29,6 +28,7 @@ import { createDirIfDoesNotExistAsync, getContractArtifactIfExistsAsync, getDependencyNameToPackagePath, + getSolcJSReleasesAsync, getSourcesWithDependencies, getSourceTreeHash, makeContractPathsRelative, @@ -211,6 +211,7 @@ export class Compiler { // map contract paths to data about them for later verification and persistence const contractPathToData: ContractPathToData = {}; + const solcJSReleases = await getSolcJSReleasesAsync(); const resolvedContractSources = []; for (const contractName of contractNames) { const spyResolver = new SpyResolver(this._resolver); @@ -226,7 +227,7 @@ export class Compiler { } contractPathToData[contractSource.path] = contractData; const solcVersion = _.isUndefined(this._solcVersionIfExists) - ? semver.maxSatisfying(_.keys(binPaths), parseSolidityVersionRange(contractSource.source)) + ? semver.maxSatisfying(_.keys(solcJSReleases), parseSolidityVersionRange(contractSource.source)) : this._solcVersionIfExists; const isFirstContractWithThisVersion = _.isUndefined(versionToInputs[solcVersion]); if (isFirstContractWithThisVersion) { @@ -272,7 +273,7 @@ export class Compiler { fullSolcVersion = versionCommandOutputParts[versionCommandOutputParts.length - 1].trim(); compilerOutput = await compileDockerAsync(solcVersion, input.standardInput); } else { - fullSolcVersion = binPaths[solcVersion]; + fullSolcVersion = solcJSReleases[solcVersion]; compilerOutput = await compileSolcJSAsync(solcVersion, input.standardInput); } if (!_.isUndefined(compilerOutput.errors)) { diff --git a/packages/sol-compiler/src/solc/bin_paths.ts b/packages/sol-compiler/src/solc/bin_paths.ts deleted file mode 100644 index b653c0926..000000000 --- a/packages/sol-compiler/src/solc/bin_paths.ts +++ /dev/null @@ -1,52 +0,0 @@ -export interface BinaryPaths { - [key: string]: string; -} - -export const binPaths: BinaryPaths = { - '0.5.2': 'soljson-v0.5.2+commit.1df8f40c.js', - '0.5.1': 'soljson-v0.5.1+commit.c8a2cb62.js', - '0.5.0': 'soljson-v0.5.0+commit.1d4f565a.js', - '0.4.25': 'soljson-v0.4.25+commit.59dbf8f1.js', - '0.4.24': 'soljson-v0.4.24+commit.e67f0147.js', - '0.4.23': 'soljson-v0.4.23+commit.124ca40d.js', - '0.4.22': 'soljson-v0.4.22+commit.4cb486ee.js', - '0.4.21': 'soljson-v0.4.21+commit.dfe3193c.js', - '0.4.20': 'soljson-v0.4.20+commit.3155dd80.js', - '0.4.19': 'soljson-v0.4.19+commit.c4cbbb05.js', - '0.4.18': 'soljson-v0.4.18+commit.9cf6e910.js', - '0.4.17': 'soljson-v0.4.17+commit.bdeb9e52.js', - '0.4.16': 'soljson-v0.4.16+commit.d7661dd9.js', - '0.4.15': 'soljson-v0.4.15+commit.bbb8e64f.js', - '0.4.14': 'soljson-v0.4.14+commit.c2215d46.js', - '0.4.13': 'soljson-v0.4.13+commit.fb4cb1a.js', - '0.4.12': 'soljson-v0.4.12+commit.194ff033.js', - '0.4.11': 'soljson-v0.4.11+commit.68ef5810.js', - '0.4.10': 'soljson-v0.4.10+commit.f0d539ae.js', - '0.4.9': 'soljson-v0.4.9+commit.364da425.js', - '0.4.8': 'soljson-v0.4.8+commit.60cc1668.js', - '0.4.7': 'soljson-v0.4.7+commit.822622cf.js', - '0.4.6': 'soljson-v0.4.6+commit.2dabbdf0.js', - '0.4.5': 'soljson-v0.4.5+commit.b318366e.js', - '0.4.4': 'soljson-v0.4.4+commit.4633f3de.js', - '0.4.3': 'soljson-v0.4.3+commit.2353da71.js', - '0.4.2': 'soljson-v0.4.2+commit.af6afb04.js', - '0.4.1': 'soljson-v0.4.1+commit.4fc6fc2c.js', - '0.4.0': 'soljson-v0.4.0+commit.acd334c9.js', - '0.3.6': 'soljson-v0.3.6+commit.3fc68da.js', - '0.3.5': 'soljson-v0.3.5+commit.5f97274.js', - '0.3.4': 'soljson-v0.3.4+commit.7dab890.js', - '0.3.3': 'soljson-v0.3.3+commit.4dc1cb1.js', - '0.3.2': 'soljson-v0.3.2+commit.81ae2a7.js', - '0.3.1': 'soljson-v0.3.1+commit.c492d9b.js', - '0.3.0': 'soljson-v0.3.0+commit.11d6736.js', - '0.2.2': 'soljson-v0.2.2+commit.ef92f56.js', - '0.2.1': 'soljson-v0.2.1+commit.91a6b35.js', - '0.2.0': 'soljson-v0.2.0+commit.4dc2445.js', - '0.1.7': 'soljson-v0.1.7+commit.b4e666c.js', - '0.1.6': 'soljson-v0.1.6+commit.d41f8b7.js', - '0.1.5': 'soljson-v0.1.5+commit.23865e3.js', - '0.1.4': 'soljson-v0.1.4+commit.5f6c3cd.js', - '0.1.3': 'soljson-v0.1.3+commit.28f561.js', - '0.1.2': 'soljson-v0.1.2+commit.d0d36e3.js', - '0.1.1': 'soljson-v0.1.1+commit.6ff4cd6.js', -}; diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts index dffd07b1d..34aa1a3b8 100644 --- a/packages/sol-compiler/src/utils/compiler.ts +++ b/packages/sol-compiler/src/utils/compiler.ts @@ -9,11 +9,9 @@ import * as path from 'path'; import * as requireFromString from 'require-from-string'; import * as solc from 'solc'; -import { binPaths } from '../solc/bin_paths'; - import { constants } from './constants'; import { fsWrapper } from './fs_wrapper'; -import { CompilationError } from './types'; +import { BinaryPaths, CompilationError } from './types'; /** * Gets contract data on network or returns if an artifact does not exist. @@ -119,6 +117,20 @@ export function parseDependencies(contractSource: ContractSource): string[] { return dependencies; } +let solcJSReleasesCache: BinaryPaths | undefined; + +/** + * Fetches the list of available solidity compilers + */ +export async function getSolcJSReleasesAsync(): Promise { + if (_.isUndefined(solcJSReleasesCache)) { + const versionList = await fetch('https://ethereum.github.io/solc-bin/bin/list.json'); + const versionListJSON = await versionList.json(); + solcJSReleasesCache = versionListJSON.releases; + } + return solcJSReleasesCache as BinaryPaths; +} + /** * Compiles the contracts and prints errors/warnings * @param solcVersion Version of a solc compiler @@ -319,7 +331,8 @@ function recursivelyGatherDependencySources( * @param solcVersion The compiler version. e.g. 0.5.0 */ export async function getSolcJSAsync(solcVersion: string): Promise { - const fullSolcVersion = binPaths[solcVersion]; + const solcJSReleases = await getSolcJSReleasesAsync(); + const fullSolcVersion = solcJSReleases[solcVersion]; if (_.isUndefined(fullSolcVersion)) { throw new Error(`${solcVersion} is not a known compiler version`); } diff --git a/packages/sol-compiler/src/utils/types.ts b/packages/sol-compiler/src/utils/types.ts index 64328899d..f756c51bb 100644 --- a/packages/sol-compiler/src/utils/types.ts +++ b/packages/sol-compiler/src/utils/types.ts @@ -13,6 +13,10 @@ export interface ContractSourceData { [contractName: string]: ContractSpecificSourceData; } +export interface BinaryPaths { + [key: string]: string; +} + export interface ContractSpecificSourceData { solcVersionRange: string; sourceHash: Buffer; -- cgit v1.2.3 From bede3d7e295ead6cb63457c138274727e5dae710 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 12:01:57 +0000 Subject: Update yarn.lock --- yarn.lock | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/yarn.lock b/yarn.lock index 41795e163..16ed56625 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13453,6 +13453,15 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react-dom@^16.4.2: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.1" + react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13756,6 +13765,15 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react@^16.4.2: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.1" + react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14627,6 +14645,13 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" +scheduler@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" -- cgit v1.2.3 From d567c58d3b2b8d858977c310b2978e65a587b968 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:10:08 +0100 Subject: Fix a bug when ast and legacyAST were not present in the artifacts even if requested --- packages/sol-compiler/CHANGELOG.json | 4 ++++ packages/sol-compiler/src/utils/compiler.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 977699ad6..78db31b0f 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -13,6 +13,10 @@ { "note": "Remove `bin_paths` and fetch the list of soliidty compilers from github", "pr": "TODO" + }, + { + "note": "Fix a bug when ast and legacyAST were not present in the artifacts even if requested", + "pr": "TODO" } ] }, diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts index 34aa1a3b8..28049e453 100644 --- a/packages/sol-compiler/src/utils/compiler.ts +++ b/packages/sol-compiler/src/utils/compiler.ts @@ -251,7 +251,7 @@ export function getSourcesWithDependencies( contractPath: string, fullSources: { [sourceName: string]: { id: number } }, ): { sourceCodes: { [sourceName: string]: string }; sources: { [sourceName: string]: { id: number } } } { - const sources = { [contractPath]: { id: fullSources[contractPath].id } }; + const sources = { [contractPath]: fullSources[contractPath] }; const sourceCodes = { [contractPath]: resolver.resolve(contractPath).source }; recursivelyGatherDependencySources( resolver, -- cgit v1.2.3 From 2b7699c26afb96cf043c25973b45926ff32b00d5 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:20:03 +0100 Subject: Omit remapping in compiler settings equality checks --- packages/sol-compiler/src/compiler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index 45608eb55..afa4cc5bb 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -327,7 +327,7 @@ export class Compiler { const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION; const didCompilerSettingsChange = !_.isEqual( _.omit(currentArtifact.compiler.settings, 'remappings'), - this._compilerSettings, + _.omit(this._compilerSettings, 'remappings'), ); const didSourceChange = currentArtifact.sourceTreeHashHex !== contractData.sourceTreeHashHex; return !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange; -- cgit v1.2.3 From 2ef3af000378f66daa0212daaf23c807d018711e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:20:03 +0100 Subject: Omit remapping in compiler settings equality checks --- packages/sol-compiler/src/compiler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index c5dea1155..67021d445 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -326,7 +326,7 @@ export class Compiler { const isUserOnLatestVersion = currentArtifact.schemaVersion === constants.LATEST_ARTIFACT_VERSION; const didCompilerSettingsChange = !_.isEqual( _.omit(currentArtifact.compiler.settings, 'remappings'), - this._compilerSettings, + _.omit(this._compilerSettings, 'remappings'), ); const didSourceChange = currentArtifact.sourceTreeHashHex !== contractData.sourceTreeHashHex; return !isUserOnLatestVersion || didCompilerSettingsChange || didSourceChange; -- cgit v1.2.3 From 2e60d5341efbd985b284dbb4c31210025259bf15 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:24:57 +0100 Subject: Add PR numbers --- packages/sol-compiler/CHANGELOG.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 78db31b0f..7a6174605 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -8,15 +8,15 @@ }, { "note": "Fix a bug when opts could not be undefined", - "pr": "TODO" + "pr": 1596 }, { "note": "Remove `bin_paths` and fetch the list of soliidty compilers from github", - "pr": "TODO" + "pr": 1596 }, { "note": "Fix a bug when ast and legacyAST were not present in the artifacts even if requested", - "pr": "TODO" + "pr": 1596 } ] }, -- cgit v1.2.3 From f118e86cfe478f95eb0450df351871e8278862c3 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 12:29:05 +0000 Subject: Re-run yarn since fails again on first run --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6e028ea0..38fb2624a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: command: sudo npm install --global yarn@1.9.4 - run: name: yarn - command: yarn --frozen-lockfile --ignore-engines install + command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install - setup_remote_docker - run: yarn build:ci:no_website - run: yarn build:ts -- cgit v1.2.3 From 53fe08a348fdf940eb1818327e36ed5637547eb1 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:30:00 +0100 Subject: Update CHANGELOG --- packages/sol-compiler/CHANGELOG.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 7a6174605..434c62211 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -7,15 +7,15 @@ "pr": 1575 }, { - "note": "Fix a bug when opts could not be undefined", + "note": "Fix a bug when `opts` could not be `undefined`", "pr": 1596 }, { - "note": "Remove `bin_paths` and fetch the list of soliidty compilers from github", + "note": "Remove `bin_paths` and fetch the list of Solidity compilers from Github", "pr": 1596 }, { - "note": "Fix a bug when ast and legacyAST were not present in the artifacts even if requested", + "note": "Fix a bug when `ast` and `legacyAST` were not present in the artifacts even if requested", "pr": 1596 } ] -- cgit v1.2.3 From b54bafe1c57b100a205630e88c8ead5e5358cc6a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 13:35:50 +0100 Subject: Fix linter --- packages/sol-compiler/test/compiler_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts index 5cc7e41ce..cae6bce05 100644 --- a/packages/sol-compiler/test/compiler_test.ts +++ b/packages/sol-compiler/test/compiler_test.ts @@ -24,7 +24,7 @@ describe('#Compiler', function(): void { contracts: constants.contracts, }; it('should create a Compiler with empty opts', async () => { - const _compiler = new Compiler(); + const _compiler = new Compiler(); // tslint:disable-line no-unused-variable }); it('should create an Exchange artifact with the correct unlinked binary', async () => { compilerOpts.contracts = ['Exchange']; -- cgit v1.2.3 From 8af9a38c8e87451ffa42e66177602076c098490e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 7 Feb 2019 13:07:36 +0000 Subject: Move from devDep to dep --- contracts/asset-proxy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index e98fc8fca..e6e250b19 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -48,7 +48,6 @@ "devDependencies": { "@0x/contracts-gen": "^1.0.0", "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", "@0x/dev-utils": "^2.0.1", "@0x/sol-compiler": "^3.0.1", "@0x/tslint-config": "^3.0.0", @@ -68,6 +67,7 @@ }, "dependencies": { "@0x/base-contract": "^4.0.1", + "@0x/contracts-test-utils": "^3.0.2", "@0x/contracts-erc20": "1.0.2", "@0x/contracts-erc721": "1.0.2", "@0x/contracts-utils": "2.0.1", -- cgit v1.2.3 From 7f2a011c3e64d0010940658ab75eb8da1e99c160 Mon Sep 17 00:00:00 2001 From: Fabio B Date: Thu, 7 Feb 2019 14:17:23 +0100 Subject: Update packages/sol-compiler/CHANGELOG.json Co-Authored-By: LogvinovLeon --- packages/sol-compiler/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 434c62211..26878c085 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -7,7 +7,7 @@ "pr": 1575 }, { - "note": "Fix a bug when `opts` could not be `undefined`", + "note": "Fix a bug that made `opts` required instead of optional", "pr": 1596 }, { -- cgit v1.2.3 From 2ff0f545f5535cf6d61b883583643750acae2fbc Mon Sep 17 00:00:00 2001 From: Fabio B Date: Thu, 7 Feb 2019 14:17:41 +0100 Subject: Update packages/sol-compiler/CHANGELOG.json Co-Authored-By: LogvinovLeon --- packages/sol-compiler/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 26878c085..cded2c3ad 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -15,7 +15,7 @@ "pr": 1596 }, { - "note": "Fix a bug when `ast` and `legacyAST` were not present in the artifacts even if requested", + "note": "Fix a bug causing `ast` and `legacyAST` to not be added to the artifacts even when requested", "pr": 1596 } ] -- cgit v1.2.3 From 88497ddc52cafeee1c29f36b93190f6438f0d4e9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 14:34:37 +0100 Subject: Updated CHANGELOGS --- contracts/asset-proxy/CHANGELOG.json | 9 +++++++++ contracts/asset-proxy/CHANGELOG.md | 4 ++++ contracts/erc20/CHANGELOG.json | 9 +++++++++ contracts/erc20/CHANGELOG.md | 4 ++++ contracts/erc721/CHANGELOG.json | 9 +++++++++ contracts/erc721/CHANGELOG.md | 4 ++++ contracts/exchange-forwarder/CHANGELOG.json | 9 +++++++++ contracts/exchange-forwarder/CHANGELOG.md | 4 ++++ contracts/exchange-libs/CHANGELOG.json | 9 +++++++++ contracts/exchange-libs/CHANGELOG.md | 4 ++++ contracts/exchange/CHANGELOG.json | 9 +++++++++ contracts/exchange/CHANGELOG.md | 4 ++++ contracts/extensions/CHANGELOG.json | 9 +++++++++ contracts/extensions/CHANGELOG.md | 4 ++++ contracts/multisig/CHANGELOG.json | 9 +++++++++ contracts/multisig/CHANGELOG.md | 4 ++++ contracts/test-utils/CHANGELOG.json | 9 +++++++++ contracts/test-utils/CHANGELOG.md | 4 ++++ contracts/utils/CHANGELOG.json | 9 +++++++++ contracts/utils/CHANGELOG.md | 4 ++++ packages/0x.js/CHANGELOG.json | 9 +++++++++ packages/0x.js/CHANGELOG.md | 4 ++++ packages/abi-gen-wrappers/CHANGELOG.json | 9 +++++++++ packages/abi-gen-wrappers/CHANGELOG.md | 4 ++++ packages/abi-gen/CHANGELOG.json | 9 +++++++++ packages/abi-gen/CHANGELOG.md | 4 ++++ packages/assert/CHANGELOG.json | 9 +++++++++ packages/assert/CHANGELOG.md | 4 ++++ packages/asset-buyer/CHANGELOG.json | 9 +++++++++ packages/asset-buyer/CHANGELOG.md | 4 ++++ packages/base-contract/CHANGELOG.json | 9 +++++++++ packages/base-contract/CHANGELOG.md | 4 ++++ packages/connect/CHANGELOG.json | 9 +++++++++ packages/connect/CHANGELOG.md | 4 ++++ packages/contract-wrappers/CHANGELOG.json | 9 +++++++++ packages/contract-wrappers/CHANGELOG.md | 4 ++++ packages/contracts-gen/CHANGELOG.json | 12 +++++++++++- packages/contracts-gen/CHANGELOG.md | 10 ++++++++++ packages/dev-utils/CHANGELOG.json | 9 +++++++++ packages/dev-utils/CHANGELOG.md | 4 ++++ packages/fill-scenarios/CHANGELOG.json | 9 +++++++++ packages/fill-scenarios/CHANGELOG.md | 4 ++++ packages/json-schemas/CHANGELOG.json | 9 +++++++++ packages/json-schemas/CHANGELOG.md | 4 ++++ packages/migrations/CHANGELOG.json | 9 +++++++++ packages/migrations/CHANGELOG.md | 4 ++++ packages/order-utils/CHANGELOG.json | 9 +++++++++ packages/order-utils/CHANGELOG.md | 4 ++++ packages/order-watcher/CHANGELOG.json | 9 +++++++++ packages/order-watcher/CHANGELOG.md | 4 ++++ packages/react-docs/CHANGELOG.json | 9 +++++++++ packages/react-docs/CHANGELOG.md | 4 ++++ packages/react-shared/CHANGELOG.json | 9 +++++++++ packages/react-shared/CHANGELOG.md | 4 ++++ packages/sol-compiler/CHANGELOG.json | 3 ++- packages/sol-compiler/CHANGELOG.md | 7 +++++++ packages/sol-coverage/CHANGELOG.json | 9 +++++++++ packages/sol-coverage/CHANGELOG.md | 4 ++++ packages/sol-doc/CHANGELOG.json | 9 +++++++++ packages/sol-doc/CHANGELOG.md | 4 ++++ packages/sol-profiler/CHANGELOG.json | 9 +++++++++ packages/sol-profiler/CHANGELOG.md | 4 ++++ packages/sol-resolver/CHANGELOG.json | 9 +++++++++ packages/sol-resolver/CHANGELOG.md | 4 ++++ packages/sol-trace/CHANGELOG.json | 9 +++++++++ packages/sol-trace/CHANGELOG.md | 4 ++++ packages/sol-tracing-utils/CHANGELOG.json | 9 +++++++++ packages/sol-tracing-utils/CHANGELOG.md | 4 ++++ packages/sra-spec/CHANGELOG.json | 9 +++++++++ packages/sra-spec/CHANGELOG.md | 4 ++++ packages/subproviders/CHANGELOG.json | 9 +++++++++ packages/subproviders/CHANGELOG.md | 4 ++++ packages/types/CHANGELOG.json | 9 +++++++++ packages/types/CHANGELOG.md | 4 ++++ packages/utils/CHANGELOG.json | 9 +++++++++ packages/utils/CHANGELOG.md | 4 ++++ packages/web3-wrapper/CHANGELOG.json | 9 +++++++++ packages/web3-wrapper/CHANGELOG.md | 4 ++++ 78 files changed, 511 insertions(+), 2 deletions(-) create mode 100644 packages/contracts-gen/CHANGELOG.md diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 1c48b6280..1fb67818c 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/asset-proxy/CHANGELOG.md b/contracts/asset-proxy/CHANGELOG.md index 9600ae19a..fcf5202c6 100644 --- a/contracts/asset-proxy/CHANGELOG.md +++ b/contracts/asset-proxy/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 352013d26..18bd3a01c 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/erc20/CHANGELOG.md b/contracts/erc20/CHANGELOG.md index 9f4bdb99e..658309672 100644 --- a/contracts/erc20/CHANGELOG.md +++ b/contracts/erc20/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index 8a8027f36..284cbba5c 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/erc721/CHANGELOG.md b/contracts/erc721/CHANGELOG.md index 2fbf8fe7e..5886f10b8 100644 --- a/contracts/erc721/CHANGELOG.md +++ b/contracts/erc721/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index 44b812513..e140e445d 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/exchange-forwarder/CHANGELOG.md b/contracts/exchange-forwarder/CHANGELOG.md index dde8d8087..24bb6da5b 100644 --- a/contracts/exchange-forwarder/CHANGELOG.md +++ b/contracts/exchange-forwarder/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index 6a169e635..5927505d1 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/exchange-libs/CHANGELOG.md b/contracts/exchange-libs/CHANGELOG.md index 0bd4a7b70..46e970e6f 100644 --- a/contracts/exchange-libs/CHANGELOG.md +++ b/contracts/exchange-libs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index 7b640dafe..5969742fd 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.3", "changes": [ diff --git a/contracts/exchange/CHANGELOG.md b/contracts/exchange/CHANGELOG.md index 7a30bfea9..f265cd96f 100644 --- a/contracts/exchange/CHANGELOG.md +++ b/contracts/exchange/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _February 7, 2019_ + + * Dependencies updated + ## v1.0.3 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 4d9955408..633d5e20d 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.2", "changes": [ diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md index fe80e1ddc..34137efdb 100644 --- a/contracts/extensions/CHANGELOG.md +++ b/contracts/extensions/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index 6fbe3712a..ada01d9bb 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.2", "changes": [ diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md index 7426c18c3..7c7b0ae4a 100644 --- a/contracts/multisig/CHANGELOG.md +++ b/contracts/multisig/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index b789f2907..9a13566c4 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.2", "changes": [ diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index 222a6a93d..b3fc98ab6 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.2 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 7c90d8e7e..32d3417bd 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "2.0.2", "changes": [ diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md index e11d1d9c5..dd0b91a61 100644 --- a/contracts/utils/CHANGELOG.md +++ b/contracts/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Fake publish to enable pinning diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 8f13049e9..5d5492e1d 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "4.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "4.0.2", diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 2ea296ea5..7c14fb586 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index f714100ce..ea1c0693f 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/abi-gen-wrappers/CHANGELOG.md b/packages/abi-gen-wrappers/CHANGELOG.md index 75ac81d45..93e11736c 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.md +++ b/packages/abi-gen-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 3e6eb9038..2b891281f 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md index 17085c515..65c914cc9 100644 --- a/packages/abi-gen/CHANGELOG.md +++ b/packages/abi-gen/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index 8ca292485..ae6ae00ef 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md index 0050d0105..682115497 100644 --- a/packages/assert/CHANGELOG.md +++ b/packages/assert/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 2b567bbb2..3dd906bfb 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "5.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "5.0.2", diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index d21d89b8e..c5977e3e4 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v5.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v5.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index d3333dff6..a99483df6 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "4.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "4.0.1", diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md index ae705dab7..68de790bc 100644 --- a/packages/base-contract/CHANGELOG.md +++ b/packages/base-contract/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index feeb057d5..711bea312 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "4.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "4.0.2", diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index af1b088c9..3094d2251 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 803863da3..b97169137 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "7.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "7.0.1", diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index fee13b218..2e174e767 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v7.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v7.0.1 - _February 7, 2019_ * Dependencies updated diff --git a/packages/contracts-gen/CHANGELOG.json b/packages/contracts-gen/CHANGELOG.json index fe51488c7..84505d91b 100644 --- a/packages/contracts-gen/CHANGELOG.json +++ b/packages/contracts-gen/CHANGELOG.json @@ -1 +1,11 @@ -[] +[ + { + "timestamp": 1549546009, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + } +] diff --git a/packages/contracts-gen/CHANGELOG.md b/packages/contracts-gen/CHANGELOG.md new file mode 100644 index 000000000..e046c6a0a --- /dev/null +++ b/packages/contracts-gen/CHANGELOG.md @@ -0,0 +1,10 @@ + + +CHANGELOG + +## v1.0.1 - _February 7, 2019_ + + * Dependencies updated diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 1f0ec9b93..38225c514 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index 652fc6e96..41e2ca88a 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index faa702fcf..ace972f6e 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "2.0.2", diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md index 66966d3ec..e87652e7d 100644 --- a/packages/fill-scenarios/CHANGELOG.md +++ b/packages/fill-scenarios/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 0f8ad747c..8645c56ac 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index 8d6ec83bf..91426a687 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 167279609..f466374ce 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "3.0.2", diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index f759e4a91..b39732ef4 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index d58a8a4c2..5e3d209e1 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "6.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "6.0.0", "changes": { diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index f5e20a8d8..06e6a2839 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v6.0.1 - _February 7, 2019_ + + * Dependencies updated + ## v6.0.0 - _February 7, 2019_ * undefined diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index c7bffa5b7..70bbcb414 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "3.0.2", diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index bb908bfcf..7a3ede421 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 9fccd6257..f8095fff2 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "2.0.2", diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index a95f5371b..fa8f387c2 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index b9a7ca3df..7e1ef8f60 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549504360, "version": "2.0.2", diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index 05bdffa14..e1de4a765 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 7, 2019_ * Dependencies updated diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index cded2c3ad..721637b9f 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -18,7 +18,8 @@ "note": "Fix a bug causing `ast` and `legacyAST` to not be added to the artifacts even when requested", "pr": 1596 } - ] + ], + "timestamp": 1549546009 }, { "timestamp": 1549452781, diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md index 400c33763..016509028 100644 --- a/packages/sol-compiler/CHANGELOG.md +++ b/packages/sol-compiler/CHANGELOG.md @@ -5,6 +5,13 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Fix a bug when smart recompilation wasn't working because of remappings (#1575) + * Fix a bug that made `opts` required instead of optional (#1596) + * Remove `bin_paths` and fetch the list of Solidity compilers from Github (#1596) + * Fix a bug causing `ast` and `legacyAST` to not be added to the artifacts even when requested (#1596) + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-coverage/CHANGELOG.json b/packages/sol-coverage/CHANGELOG.json index c5b3ae84e..d23ec2c11 100644 --- a/packages/sol-coverage/CHANGELOG.json +++ b/packages/sol-coverage/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/sol-coverage/CHANGELOG.md b/packages/sol-coverage/CHANGELOG.md index 0612e407e..1af9b9f26 100644 --- a/packages/sol-coverage/CHANGELOG.md +++ b/packages/sol-coverage/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json index d4f89a32e..5c7a08805 100644 --- a/packages/sol-doc/CHANGELOG.json +++ b/packages/sol-doc/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md index d838a52ae..06ea1d7b4 100644 --- a/packages/sol-doc/CHANGELOG.md +++ b/packages/sol-doc/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-profiler/CHANGELOG.json b/packages/sol-profiler/CHANGELOG.json index 145158ab3..ce861c4f3 100644 --- a/packages/sol-profiler/CHANGELOG.json +++ b/packages/sol-profiler/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.2", diff --git a/packages/sol-profiler/CHANGELOG.md b/packages/sol-profiler/CHANGELOG.md index cf0ec8ee7..bf9e59e54 100644 --- a/packages/sol-profiler/CHANGELOG.md +++ b/packages/sol-profiler/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 147f7ac61..207566325 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md index 90d7cc2b8..f23c55ea8 100644 --- a/packages/sol-resolver/CHANGELOG.md +++ b/packages/sol-resolver/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index 44ce3fcf6..203757c7a 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.2", diff --git a/packages/sol-trace/CHANGELOG.md b/packages/sol-trace/CHANGELOG.md index 92e53f6f3..bcb75c423 100644 --- a/packages/sol-trace/CHANGELOG.md +++ b/packages/sol-trace/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.2 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index 75131dddb..b68a7d722 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "6.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "6.0.1", diff --git a/packages/sol-tracing-utils/CHANGELOG.md b/packages/sol-tracing-utils/CHANGELOG.md index 3889e89c3..6f9fa5615 100644 --- a/packages/sol-tracing-utils/CHANGELOG.md +++ b/packages/sol-tracing-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v6.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v6.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json index b812f0809..1dd26f52c 100644 --- a/packages/sra-spec/CHANGELOG.json +++ b/packages/sra-spec/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md index ceae08a17..ce7a09708 100644 --- a/packages/sra-spec/CHANGELOG.md +++ b/packages/sra-spec/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index ad005d2e5..03c175732 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "3.0.1", diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index 58a85b822..b3dfa757a 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v3.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index cb01ccc4a..433f7438e 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "2.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "2.0.1", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index e43be5e55..a2bc34dee 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v2.0.1 - _February 6, 2019_ * Dependencies updated diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 9ff26e3e4..289b3c64f 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "4.0.3", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "4.0.2", "changes": [ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index e4b581aef..4772bbb86 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.3 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.2 - _February 6, 2019_ * ABI Decode NULL for all data types (#1587) diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index e9e85be24..be5033d57 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1549546009, + "version": "4.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1549452781, "version": "4.0.1", diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 82b646a04..461d55a26 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v4.0.2 - _February 7, 2019_ + + * Dependencies updated + ## v4.0.1 - _February 6, 2019_ * Dependencies updated -- cgit v1.2.3 From 5f5ee0041f824efe00bdbf0d0c6b66a221893561 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 15:01:53 +0100 Subject: Updated CHANGELOGS --- contracts/asset-proxy/CHANGELOG.json | 4 ++-- contracts/erc20/CHANGELOG.json | 4 ++-- contracts/erc721/CHANGELOG.json | 4 ++-- contracts/exchange-forwarder/CHANGELOG.json | 4 ++-- contracts/exchange-libs/CHANGELOG.json | 4 ++-- contracts/exchange/CHANGELOG.json | 4 ++-- contracts/extensions/CHANGELOG.json | 4 ++-- contracts/multisig/CHANGELOG.json | 4 ++-- contracts/test-utils/CHANGELOG.json | 4 ++-- contracts/utils/CHANGELOG.json | 4 ++-- packages/0x.js/CHANGELOG.json | 4 ++-- packages/abi-gen-wrappers/CHANGELOG.json | 4 ++-- packages/abi-gen/CHANGELOG.json | 4 ++-- packages/assert/CHANGELOG.json | 4 ++-- packages/asset-buyer/CHANGELOG.json | 4 ++-- packages/base-contract/CHANGELOG.json | 4 ++-- packages/connect/CHANGELOG.json | 4 ++-- packages/contract-wrappers/CHANGELOG.json | 4 ++-- packages/contracts-gen/CHANGELOG.json | 4 ++-- packages/dev-utils/CHANGELOG.json | 4 ++-- packages/fill-scenarios/CHANGELOG.json | 4 ++-- packages/json-schemas/CHANGELOG.json | 4 ++-- packages/migrations/CHANGELOG.json | 4 ++-- packages/order-utils/CHANGELOG.json | 4 ++-- packages/order-watcher/CHANGELOG.json | 4 ++-- packages/react-docs/CHANGELOG.json | 4 ++-- packages/react-shared/CHANGELOG.json | 4 ++-- packages/sol-compiler/CHANGELOG.json | 2 +- packages/sol-coverage/CHANGELOG.json | 4 ++-- packages/sol-doc/CHANGELOG.json | 4 ++-- packages/sol-profiler/CHANGELOG.json | 4 ++-- packages/sol-resolver/CHANGELOG.json | 4 ++-- packages/sol-trace/CHANGELOG.json | 4 ++-- packages/sol-tracing-utils/CHANGELOG.json | 4 ++-- packages/sra-spec/CHANGELOG.json | 4 ++-- packages/subproviders/CHANGELOG.json | 4 ++-- packages/types/CHANGELOG.json | 4 ++-- packages/utils/CHANGELOG.json | 4 ++-- packages/web3-wrapper/CHANGELOG.json | 4 ++-- yarn.lock | 32 +++++++++++++++++++++++++++-- 40 files changed, 107 insertions(+), 79 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 1fb67818c..de7e90d66 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 18bd3a01c..972de2038 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index 284cbba5c..5f3e08dd3 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index e140e445d..338adde3d 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index 5927505d1..5de06a714 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index 5969742fd..02c614b1a 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "1.0.4", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "1.0.3", diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 633d5e20d..8a1335c51 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "2.0.2", diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index ada01d9bb..0c1b52f2f 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "2.0.2", diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 9a13566c4..812bff732 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "3.0.2", diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 32d3417bd..bc887914b 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "2.0.2", diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 5d5492e1d..69381d7a0 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "4.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index ea1c0693f..a7793c5d5 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 2b891281f..d7770c06d 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index ae6ae00ef..e2231a676 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index 3dd906bfb..80b02f2c6 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "5.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index a99483df6..d3cf76696 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "4.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 711bea312..d7e557146 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "4.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index b97169137..73c8e6070 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "7.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/contracts-gen/CHANGELOG.json b/packages/contracts-gen/CHANGELOG.json index 84505d91b..f1a523c30 100644 --- a/packages/contracts-gen/CHANGELOG.json +++ b/packages/contracts-gen/CHANGELOG.json @@ -1,11 +1,11 @@ [ { - "timestamp": 1549546009, "version": "1.0.1", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 } ] diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 38225c514..ce6cfede5 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index ace972f6e..8615d137b 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 8645c56ac..a6ae0160f 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index f466374ce..9d7c22b7c 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 5e3d209e1..0028ea0c7 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "6.0.1", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "6.0.0", diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 70bbcb414..69bcc8d03 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index f8095fff2..82e162272 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 7e1ef8f60..9a7284c2a 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549504360, diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index 721637b9f..ed9c45245 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -19,7 +19,7 @@ "pr": 1596 } ], - "timestamp": 1549546009 + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-coverage/CHANGELOG.json b/packages/sol-coverage/CHANGELOG.json index d23ec2c11..dc5ae1a53 100644 --- a/packages/sol-coverage/CHANGELOG.json +++ b/packages/sol-coverage/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json index 5c7a08805..d9d0ddfa2 100644 --- a/packages/sol-doc/CHANGELOG.json +++ b/packages/sol-doc/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-profiler/CHANGELOG.json b/packages/sol-profiler/CHANGELOG.json index ce861c4f3..89f3f7171 100644 --- a/packages/sol-profiler/CHANGELOG.json +++ b/packages/sol-profiler/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index 207566325..9c02b9148 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json index 203757c7a..c786a56a3 100644 --- a/packages/sol-trace/CHANGELOG.json +++ b/packages/sol-trace/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sol-tracing-utils/CHANGELOG.json b/packages/sol-tracing-utils/CHANGELOG.json index b68a7d722..911cf6c1f 100644 --- a/packages/sol-tracing-utils/CHANGELOG.json +++ b/packages/sol-tracing-utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "6.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json index 1dd26f52c..05ea49243 100644 --- a/packages/sra-spec/CHANGELOG.json +++ b/packages/sra-spec/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 03c175732..3d5bade1f 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "3.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 433f7438e..8f2bf967a 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "2.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 289b3c64f..007591d18 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "4.0.3", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "version": "4.0.2", diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index be5033d57..49dbe5a64 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,12 +1,12 @@ [ { - "timestamp": 1549546009, "version": "4.0.2", "changes": [ { "note": "Dependencies updated" } - ] + ], + "timestamp": 1549547375 }, { "timestamp": 1549452781, diff --git a/yarn.lock b/yarn.lock index ab5d22492..fae178e3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13461,6 +13461,16 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react-dom@^16.4.2: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4" + integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.1" + react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13518,8 +13528,8 @@ react-highlight@0xproject/react-highlight#react-peer-deps: dependencies: highlight.js "^9.11.0" highlightjs-solidity "^1.0.5" - react "^16.4.2" - react-dom "^16.4.2" + react "^16.5.2" + react-dom "^16.5.2" react-hot-loader@^4.3.3: version "4.3.4" @@ -13764,6 +13774,16 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react@^16.4.2: + version "16.8.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a" + integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.1" + react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14635,6 +14655,14 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" +scheduler@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" + integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" -- cgit v1.2.3 From f003298ce4c7a2201d2d59685b0d5d0411aeb55d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 7 Feb 2019 15:02:05 +0100 Subject: Publish - 0x.js@4.0.3 - @0x/abi-gen@2.0.2 - @0x/abi-gen-wrappers@3.0.2 - @0x/assert@2.0.2 - @0x/asset-buyer@5.0.3 - @0x/base-contract@4.0.2 - @0x/connect@4.0.3 - @0x/contract-wrappers@7.0.2 - @0x/contracts-gen@1.0.1 - @0x/dev-tools-pages@0.0.18 - @0x/dev-utils@2.0.2 - @0x/fill-scenarios@2.0.3 - @0x/instant@1.0.12 - @0x/json-schemas@3.0.2 - @0x/metacoin@0.0.39 - @0x/migrations@3.0.3 - @0x/monorepo-scripts@1.0.23 - @0x/order-utils@6.0.1 - @0x/order-watcher@3.0.3 - @0x/pipeline@1.0.9 - @0x/react-docs@2.0.3 - @0x/react-shared@2.0.3 - @0x/sol-compiler@3.0.2 - @0x/sol-coverage@2.0.2 - @0x/sol-doc@2.0.2 - @0x/sol-profiler@2.0.3 - @0x/sol-resolver@2.0.2 - @0x/sol-trace@2.0.3 - @0x/sol-tracing-utils@6.0.2 - @0x/sra-spec@2.0.2 - @0x/subproviders@3.0.2 - @0x/testnet-faucets@1.0.68 - @0x/types@2.0.2 - @0x/utils@4.0.3 - @0x/web3-wrapper@4.0.2 - @0x/website@0.0.71 - @0x/contracts-asset-proxy@1.0.4 - @0x/contracts-erc20@1.0.4 - @0x/contracts-erc721@1.0.4 - @0x/contracts-exchange@1.0.4 - @0x/contracts-exchange-forwarder@1.0.4 - @0x/contracts-exchange-libs@1.0.4 - @0x/contracts-extensions@2.0.3 - @0x/contracts-multisig@2.0.3 - @0x/contracts-test-utils@3.0.3 - @0x/contracts-utils@2.0.3 --- contracts/asset-proxy/package.json | 22 +++++++++++----------- contracts/erc20/package.json | 20 ++++++++++---------- contracts/erc721/package.json | 20 ++++++++++---------- contracts/exchange-forwarder/package.json | 24 ++++++++++++------------ contracts/exchange-libs/package.json | 22 +++++++++++----------- contracts/exchange/package.json | 22 +++++++++++----------- contracts/extensions/package.json | 24 ++++++++++++------------ contracts/multisig/package.json | 20 ++++++++++---------- contracts/test-utils/package.json | 24 ++++++++++++------------ contracts/utils/package.json | 22 +++++++++++----------- packages/0x.js/package.json | 26 +++++++++++++------------- packages/abi-gen-wrappers/package.json | 12 ++++++------ packages/abi-gen/package.json | 4 ++-- packages/assert/package.json | 6 +++--- packages/asset-buyer/package.json | 20 ++++++++++---------- packages/base-contract/package.json | 6 +++--- packages/connect/package.json | 12 ++++++------ packages/contract-wrappers/package.json | 26 +++++++++++++------------- packages/contracts-gen/package.json | 8 ++++---- packages/dev-tools-pages/package.json | 4 ++-- packages/dev-utils/package.json | 10 +++++----- packages/fill-scenarios/package.json | 14 +++++++------- packages/instant/package.json | 18 +++++++++--------- packages/json-schemas/package.json | 4 ++-- packages/metacoin/package.json | 24 ++++++++++++------------ packages/migrations/package.json | 20 ++++++++++---------- packages/monorepo-scripts/package.json | 6 +++--- packages/order-utils/package.json | 18 +++++++++--------- packages/order-watcher/package.json | 28 ++++++++++++++-------------- packages/pipeline/package.json | 18 +++++++++--------- packages/react-docs/package.json | 10 +++++----- packages/react-shared/package.json | 6 +++--- packages/sol-compiler/package.json | 16 ++++++++-------- packages/sol-coverage/package.json | 6 +++--- packages/sol-doc/package.json | 8 ++++---- packages/sol-profiler/package.json | 6 +++--- packages/sol-resolver/package.json | 4 ++-- packages/sol-trace/package.json | 6 +++--- packages/sol-tracing-utils/package.json | 14 +++++++------- packages/sra-spec/package.json | 4 ++-- packages/subproviders/package.json | 10 +++++----- packages/testnet-faucets/package.json | 10 +++++----- packages/types/package.json | 2 +- packages/utils/package.json | 4 ++-- packages/web3-wrapper/package.json | 8 ++++---- packages/website/package.json | 22 +++++++++++----------- 46 files changed, 320 insertions(+), 320 deletions(-) diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index e6e250b19..def8eead7 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-asset-proxy", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,10 +46,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -66,16 +66,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", - "@0x/contracts-test-utils": "^3.0.2", + "@0x/base-contract": "^4.0.2", "@0x/contracts-erc20": "1.0.2", "@0x/contracts-erc721": "1.0.2", + "@0x/contracts-test-utils": "^3.0.3", "@0x/contracts-utils": "2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index d44020db7..45272f157 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc20", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -67,13 +67,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-exchange-libs": "1.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index ba0762f30..830ea5d73 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-erc721", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -67,12 +67,12 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index e71409c82..875d60ae6 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-forwarder", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contract-wrappers": "^7.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contract-wrappers": "^7.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -68,18 +68,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-asset-proxy": "1.0.2", "@0x/contracts-erc20": "1.0.2", "@0x/contracts-erc721": "1.0.2", "@0x/contracts-exchange": "1.0.2", "@0x/contracts-exchange-libs": "1.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index ebe3e8195..8ffd5e81d 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange-libs", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -67,13 +67,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 43ceeeebd..b16785087 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-exchange", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -67,17 +67,17 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-asset-proxy": "1.0.2", "@0x/contracts-erc20": "1.0.2", "@0x/contracts-erc721": "1.0.2", "@0x/contracts-exchange-libs": "1.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.11" diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index 335abaa80..831a3398a 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-extensions", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -46,12 +46,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contract-wrappers": "^7.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contract-wrappers": "^7.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -68,18 +68,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-asset-proxy": "1.0.2", "@0x/contracts-erc20": "1.0.2", "@0x/contracts-erc721": "1.0.2", "@0x/contracts-exchange": "1.0.2", "@0x/contracts-exchange-libs": "1.0.2", "@0x/contracts-utils": "2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index 49326ad7d..f3774c409 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-multisig", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/node": "*", @@ -67,13 +67,13 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", + "@0x/base-contract": "^4.0.2", "@0x/contracts-asset-proxy": "1.0.2", "@0x/contracts-erc20": "1.0.2", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index f73e1f456..b379f470a 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-test-utils", - "version": "3.0.2", + "version": "3.0.3", "engines": { "node": ">=6.12" }, @@ -40,19 +40,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen": "^2.0.1", - "@0x/dev-utils": "^2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/sol-compiler": "^3.0.1", - "@0x/sol-coverage": "^2.0.1", - "@0x/sol-profiler": "^2.0.2", - "@0x/sol-trace": "^2.0.2", - "@0x/subproviders": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/dev-utils": "^2.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/sol-compiler": "^3.0.2", + "@0x/sol-coverage": "^2.0.2", + "@0x/sol-profiler": "^2.0.3", + "@0x/sol-trace": "^2.0.3", + "@0x/subproviders": "^3.0.2", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/bn.js": "^4.11.0", "@types/js-combinatorics": "^0.5.29", "@types/lodash": "4.14.104", diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 3b0e5a527..91abc8043 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-utils", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -46,11 +46,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md", "devDependencies": { - "@0x/contracts-gen": "^1.0.0", - "@0x/abi-gen": "^2.0.1", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/abi-gen": "^2.0.2", + "@0x/contracts-gen": "^1.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", @@ -68,12 +68,12 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/base-contract": "^4.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/base-contract": "^4.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "bn.js": "^4.11.8", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 0dce40010..b02176811 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "4.0.2", + "version": "4.0.3", "engines": { "node": ">=6.12" }, @@ -42,10 +42,10 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", "@0x/contract-addresses": "^2.2.1", - "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.2", + "@0x/dev-utils": "^2.0.2", + "@0x/migrations": "^3.0.3", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -72,16 +72,16 @@ "webpack": "^4.20.2" }, "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/base-contract": "^4.0.1", - "@0x/contract-wrappers": "^7.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/order-watcher": "^3.0.2", - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/base-contract": "^4.0.2", + "@0x/contract-wrappers": "^7.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/order-watcher": "^3.0.3", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/web3-provider-engine": "^14.0.0", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json index ce6183169..c9682e28f 100644 --- a/packages/abi-gen-wrappers/package.json +++ b/packages/abi-gen-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0x/abi-gen-wrappers", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -30,19 +30,19 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md", "devDependencies": { - "@0x/abi-gen": "^2.0.1", + "@0x/abi-gen": "^2.0.2", "@0x/abi-gen-templates": "^2.0.0", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/types": "^2.0.2", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11", "shx": "^0.2.2" }, "dependencies": { - "@0x/base-contract": "^4.0.1" + "@0x/base-contract": "^4.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 3856f29b9..d07e0a580 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0x/abi-gen", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -32,7 +32,7 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "dependencies": { "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", + "@0x/utils": "^4.0.3", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", "glob": "^7.1.2", diff --git a/packages/assert/package.json b/packages/assert/package.json index 6b87d67f2..551414de3 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0x/assert", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -44,9 +44,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/json-schemas": "^3.0.1", + "@0x/json-schemas": "^3.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", + "@0x/utils": "^4.0.3", "lodash": "^4.17.11", "valid-url": "^1.0.9" }, diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index ccaaf5d87..391a5d688 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@ { "name": "@0x/asset-buyer", - "version": "5.0.2", + "version": "5.0.3", "engines": { "node": ">=6.12" }, @@ -36,16 +36,16 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/connect": "^4.0.2", - "@0x/contract-wrappers": "^7.0.1", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/connect": "^4.0.3", + "@0x/contract-wrappers": "^7.0.2", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" }, diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index ac7b3fb87..d9970b7f4 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,6 @@ { "name": "@0x/base-contract", - "version": "4.0.1", + "version": "4.0.2", "engines": { "node": ">=6.12" }, @@ -41,8 +41,8 @@ }, "dependencies": { "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/connect/package.json b/packages/connect/package.json index 10c694ca9..a9648594c 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0x/connect", - "version": "4.0.2", + "version": "4.0.3", "engines": { "node": ">=6.12" }, @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", + "@0x/utils": "^4.0.3", "lodash": "^4.17.11", "query-string": "^6.0.0", "sinon": "^4.0.0", diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 9fcf2a62d..7ea270eb5 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contract-wrappers", - "version": "7.0.1", + "version": "7.0.2", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", @@ -37,9 +37,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.2", - "@0x/subproviders": "^3.0.1", + "@0x/dev-utils": "^2.0.2", + "@0x/migrations": "^3.0.3", + "@0x/subproviders": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -65,18 +65,18 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", - "@0x/assert": "^2.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", + "@0x/assert": "^2.0.2", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contracts-test-utils": "^3.0.2", - "@0x/fill-scenarios": "^2.0.2", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/contracts-test-utils": "^3.0.3", + "@0x/fill-scenarios": "^2.0.3", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "ethereumjs-abi": "0.6.5", "ethereumjs-blockstream": "6.0.0", diff --git a/packages/contracts-gen/package.json b/packages/contracts-gen/package.json index 1265cac69..fdf22ab45 100644 --- a/packages/contracts-gen/package.json +++ b/packages/contracts-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-gen", - "version": "1.0.0", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -26,11 +26,11 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts-gen/README.md", "dependencies": { - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", + "@0x/sol-resolver": "^2.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", + "@0x/utils": "^4.0.3", "ethereum-types": "^2.0.0", - "@0x/sol-resolver": "^2.0.1", "lodash": "^4.17.11", "prettier": "^1.16.3", "to-snake-case": "^1.0.0" diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index 7006e6ca9..80ff16a44 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -1,6 +1,6 @@ { "name": "@0x/dev-tools-pages", - "version": "0.0.17", + "version": "0.0.18", "engines": { "node": ">=6.12" }, @@ -26,7 +26,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@0x/react-shared": "^2.0.2", + "@0x/react-shared": "^2.0.3", "basscss": "^8.0.3", "bowser": "^1.9.3", "highlight.js": "^9.13.1", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 183e20fc1..89298f4db 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/dev-utils", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -41,11 +41,11 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", "ethereum-types": "^2.0.0", diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 8ec4a1111..523bc07c1 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@ { "name": "@0x/fill-scenarios", - "version": "2.0.2", + "version": "2.0.3", "description": "0x order fill scenario generator", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -28,14 +28,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", - "@0x/base-contract": "^4.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", + "@0x/base-contract": "^4.0.2", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", "lodash": "^4.17.11" diff --git a/packages/instant/package.json b/packages/instant/package.json index 07e817324..0fe45e963 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,6 +1,6 @@ { "name": "@0x/instant", - "version": "1.0.11", + "version": "1.0.12", "engines": { "node": ">=6.12" }, @@ -42,15 +42,15 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md", "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/asset-buyer": "^5.0.2", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/asset-buyer": "^5.0.3", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "babel-runtime": "^6.26.0", "bowser": "^1.9.4", "copy-to-clipboard": "^3.0.8", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 1b6fdc116..0c101aa28 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0x/json-schemas", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -46,7 +46,7 @@ }, "devDependencies": { "@0x/tslint-config": "^3.0.0", - "@0x/utils": "^4.0.2", + "@0x/utils": "^4.0.3", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index fbff1c62a..3afe8eb8c 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -1,6 +1,6 @@ { "name": "@0x/metacoin", - "version": "0.0.38", + "version": "0.0.39", "engines": { "node": ">=6.12" }, @@ -30,18 +30,18 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@0x/abi-gen": "^2.0.1", + "@0x/abi-gen": "^2.0.2", "@0x/abi-gen-templates": "^2.0.0", - "@0x/base-contract": "^4.0.1", - "@0x/sol-coverage": "^2.0.1", - "@0x/sol-profiler": "^2.0.2", - "@0x/sol-trace": "^2.0.2", - "@0x/subproviders": "^3.0.1", + "@0x/base-contract": "^4.0.2", + "@0x/sol-coverage": "^2.0.2", + "@0x/sol-profiler": "^2.0.3", + "@0x/sol-trace": "^2.0.3", + "@0x/subproviders": "^3.0.2", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/mocha": "^2.2.42", "copyfiles": "^2.0.0", "ethereum-types": "^2.0.0", @@ -50,8 +50,8 @@ "run-s": "^0.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 857136158..91476d322 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { "name": "@0x/migrations", - "version": "3.0.2", + "version": "3.0.3", "engines": { "node": ">=6.12" }, @@ -35,9 +35,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0x/dev-utils": "^2.0.1", + "@0x/dev-utils": "^2.0.2", "@0x/tslint-config": "^3.0.0", - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@types/yargs": "^11.0.0", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", @@ -48,16 +48,16 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", - "@0x/base-contract": "^4.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", + "@0x/base-contract": "^4.0.2", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/order-utils": "^6.0.0", - "@0x/sol-compiler": "^3.0.1", - "@0x/subproviders": "^3.0.1", + "@0x/order-utils": "^6.0.1", + "@0x/sol-compiler": "^3.0.2", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@ledgerhq/hw-app-eth": "^4.3.0", "ethereum-types": "^2.0.0", "ethers": "~4.0.4", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 24dca0004..3e9a972c2 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/monorepo-scripts", - "version": "1.0.22", + "version": "1.0.23", "engines": { "node": ">=6.12" }, @@ -47,8 +47,8 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", + "@0x/types": "^2.0.2", + "@0x/utils": "^4.0.3", "@lerna/batch-packages": "^3.0.0-beta.18", "@types/depcheck": "^0.6.0", "async-child-process": "^1.1.1", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 90fdfeed3..e2d0bcc98 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-utils", - "version": "6.0.0", + "version": "6.0.1", "engines": { "node": ">=6.12" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0x/dev-utils": "^2.0.1", + "@0x/dev-utils": "^2.0.2", "@0x/tslint-config": "^3.0.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", @@ -53,16 +53,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", - "@0x/assert": "^2.0.1", - "@0x/base-contract": "^4.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", + "@0x/assert": "^2.0.2", + "@0x/base-contract": "^4.0.2", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/json-schemas": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/json-schemas": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/node": "*", "bn.js": "^4.11.8", "ethereum-types": "^2.0.0", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 3c4cc06ba..209c9bdc5 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { "name": "@0x/order-watcher", - "version": "3.0.2", + "version": "3.0.3", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -38,9 +38,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0x/dev-utils": "^2.0.1", - "@0x/migrations": "^3.0.2", - "@0x/subproviders": "^3.0.1", + "@0x/dev-utils": "^2.0.2", + "@0x/migrations": "^3.0.3", + "@0x/subproviders": "^3.0.2", "@0x/tslint-config": "^3.0.0", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", @@ -63,19 +63,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/abi-gen-wrappers": "^3.0.1", - "@0x/assert": "^2.0.1", - "@0x/base-contract": "^4.0.1", + "@0x/abi-gen-wrappers": "^3.0.2", + "@0x/assert": "^2.0.2", + "@0x/base-contract": "^4.0.2", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^7.0.1", - "@0x/fill-scenarios": "^2.0.2", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/types": "^2.0.1", + "@0x/contract-wrappers": "^7.0.2", + "@0x/fill-scenarios": "^2.0.3", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "bintrees": "^1.0.2", "ethereum-types": "^2.0.0", "ethereumjs-blockstream": "6.0.0", diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index 3e45aa992..b2ad39a5f 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -1,6 +1,6 @@ { "name": "@0x/pipeline", - "version": "1.0.8", + "version": "1.0.9", "private": true, "description": "Data pipeline for offline analysis", "scripts": { @@ -39,16 +39,16 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/connect": "^4.0.2", + "@0x/connect": "^4.0.3", "@0x/contract-addresses": "^2.2.1", "@0x/contract-artifacts": "^1.3.0", - "@0x/contract-wrappers": "^7.0.1", - "@0x/dev-utils": "^2.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/contract-wrappers": "^7.0.2", + "@0x/dev-utils": "^2.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/dockerode": "^2.5.9", "@types/p-limit": "^2.0.0", "async-parallel": "^1.2.3", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index ed32f4289..5a91220e0 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-docs", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -24,7 +24,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^2.0.1", + "@0x/dev-utils": "^2.0.2", "@0x/tslint-config": "^3.0.0", "@types/compare-versions": "^3.0.0", "@types/styled-components": "4.0.0", @@ -34,9 +34,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/react-shared": "^2.0.2", - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", + "@0x/react-shared": "^2.0.3", + "@0x/types": "^2.0.2", + "@0x/utils": "^4.0.3", "@types/lodash": "4.14.104", "@types/material-ui": "^0.20.0", "@types/node": "*", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 3558d8afd..d93eb1436 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -25,7 +25,7 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^2.0.1", + "@0x/dev-utils": "^2.0.2", "@0x/tslint-config": "^3.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", @@ -33,7 +33,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@material-ui/core": "^3.0.1", "@types/is-mobile": "0.3.0", "@types/lodash": "4.14.104", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 3ba3c20e6..3344c0b38 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-compiler", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { - "@0x/dev-utils": "^2.0.1", + "@0x/dev-utils": "^2.0.2", "@0x/tslint-config": "^3.0.0", "@types/chokidar": "^1.7.5", "@types/mkdirp": "^0.5.2", @@ -67,13 +67,13 @@ "zeppelin-solidity": "1.8.0" }, "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/json-schemas": "^3.0.1", - "@0x/sol-resolver": "^2.0.1", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/json-schemas": "^3.0.2", + "@0x/sol-resolver": "^2.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/yargs": "^11.0.0", "chalk": "^2.3.0", "chokidar": "^2.0.4", diff --git a/packages/sol-coverage/package.json b/packages/sol-coverage/package.json index f6be925bb..6724a03df 100644 --- a/packages/sol-coverage/package.json +++ b/packages/sol-coverage/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-coverage", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-coverage/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.1", - "@0x/subproviders": "^3.0.1", + "@0x/sol-tracing-utils": "^6.0.2", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json index e68e3a237..c413e248f 100644 --- a/packages/sol-doc/package.json +++ b/packages/sol-doc/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-doc", - "version": "2.0.1", + "version": "2.0.2", "description": "Solidity documentation generator", "main": "lib/src/index.js", "types": "lib/src/index.d.js", @@ -25,9 +25,9 @@ "author": "F. Eugene Aumson", "license": "Apache-2.0", "dependencies": { - "@0x/sol-compiler": "^3.0.1", - "@0x/types": "^2.0.1", - "@0x/utils": "^4.0.2", + "@0x/sol-compiler": "^3.0.2", + "@0x/types": "^2.0.2", + "@0x/utils": "^4.0.3", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.11", diff --git a/packages/sol-profiler/package.json b/packages/sol-profiler/package.json index 8518c88b0..cce49e22e 100644 --- a/packages/sol-profiler/package.json +++ b/packages/sol-profiler/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-profiler", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-profiler/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.1", - "@0x/subproviders": "^3.0.1", + "@0x/sol-tracing-utils": "^6.0.2", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", "ethereum-types": "^2.0.0", "lodash": "^4.17.11" diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 1f5189537..aeb0c6bfc 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-resolver", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -30,7 +30,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", "lodash": "^4.17.11" }, diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index 678253ce7..b65a8b002 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-trace", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -29,8 +29,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-trace/README.md", "dependencies": { - "@0x/sol-tracing-utils": "^6.0.1", - "@0x/subproviders": "^3.0.1", + "@0x/sol-tracing-utils": "^6.0.2", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index 5e2f69c82..8bccb237d 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sol-tracing-utils", - "version": "6.0.1", + "version": "6.0.2", "engines": { "node": ">=6.12" }, @@ -42,13 +42,13 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-tracing-utils/README.md", "dependencies": { - "@0x/dev-utils": "^2.0.1", - "@0x/sol-compiler": "^3.0.1", - "@0x/sol-resolver": "^2.0.1", - "@0x/subproviders": "^3.0.1", + "@0x/dev-utils": "^2.0.2", + "@0x/sol-compiler": "^3.0.2", + "@0x/sol-resolver": "^2.0.2", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@types/solidity-parser-antlr": "^0.2.0", "chalk": "^2.3.0", "ethereum-types": "^2.0.0", diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 7644cbe7d..28cf15938 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -1,6 +1,6 @@ { "name": "@0x/sra-spec", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md", "dependencies": { - "@0x/json-schemas": "^3.0.1", + "@0x/json-schemas": "^3.0.2", "@loopback/openapi-v3-types": "^0.8.2" }, "devDependencies": { diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 30728434f..a783bb5a2 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0x/subproviders", - "version": "3.0.1", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -29,11 +29,11 @@ } }, "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/types": "^2.0.1", + "@0x/assert": "^2.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "4.24.0", "@types/eth-lightwallet": "^3.0.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 22961d215..c529d4975 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0x/testnet-faucets", - "version": "1.0.67", + "version": "1.0.68", "engines": { "node": ">=6.12" }, @@ -18,11 +18,11 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^4.0.2", - "@0x/subproviders": "^3.0.1", + "0x.js": "^4.0.3", + "@0x/subproviders": "^3.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "body-parser": "^1.17.1", "ethereum-types": "^2.0.0", "ethereumjs-tx": "^1.3.5", diff --git a/packages/types/package.json b/packages/types/package.json index 4e196b292..951251c58 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0x/types", - "version": "2.0.1", + "version": "2.0.2", "engines": { "node": ">=6.12" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index f5b69644e..86fecbc7c 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/utils", - "version": "4.0.2", + "version": "4.0.3", "engines": { "node": ">=6.12" }, @@ -44,7 +44,7 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^2.0.1", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", "@types/node": "*", "abortcontroller-polyfill": "^1.1.9", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 967d2bc34..d28a9894f 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0x/web3-wrapper", - "version": "4.0.1", + "version": "4.0.2", "engines": { "node": ">=6.12" }, @@ -54,10 +54,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^2.0.1", - "@0x/json-schemas": "^3.0.1", + "@0x/assert": "^2.0.2", + "@0x/json-schemas": "^3.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", + "@0x/utils": "^4.0.3", "ethereum-types": "^2.0.0", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/website/package.json b/packages/website/package.json index 62b83b3ec..165ce5725 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0x/website", - "version": "0.0.70", + "version": "0.0.71", "engines": { "node": ">=6.12" }, @@ -20,18 +20,18 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "@0x/asset-buyer": "^5.0.2", + "@0x/asset-buyer": "^5.0.3", "@0x/contract-addresses": "^2.2.1", - "@0x/contract-wrappers": "^7.0.1", - "@0x/json-schemas": "^3.0.1", - "@0x/order-utils": "^6.0.0", - "@0x/react-docs": "^2.0.2", - "@0x/react-shared": "^2.0.2", - "@0x/subproviders": "^3.0.1", - "@0x/types": "^2.0.1", + "@0x/contract-wrappers": "^7.0.2", + "@0x/json-schemas": "^3.0.2", + "@0x/order-utils": "^6.0.1", + "@0x/react-docs": "^2.0.3", + "@0x/react-shared": "^2.0.3", + "@0x/subproviders": "^3.0.2", + "@0x/types": "^2.0.2", "@0x/typescript-typings": "^4.0.0", - "@0x/utils": "^4.0.2", - "@0x/web3-wrapper": "^4.0.1", + "@0x/utils": "^4.0.3", + "@0x/web3-wrapper": "^4.0.2", "@reach/dialog": "^0.1.2", "@types/react-lazyload": "^2.3.1", "@types/react-loadable": "^5.4.2", -- cgit v1.2.3