aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
0 files changed, 0 insertions, 0 deletions
0d887ad529bb0557a55c67cc162977c7b270'>2b8f0d887ad529bb0557a55c67cc162977c7b270 (diff)parent797d7c7878e33ce012259a6a5db5335e9dc838ba (diff)downloaddexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.gz
dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.zst
dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.zip
Merge development
Diffstat
-rw-r--r--CODE_OF_CONDUCT.md20
-rw-r--r--CONTRIBUTING.md28
-rw-r--r--PULL_REQUEST_TEMPLATE.md8
-rw-r--r--contracts/examples/CHANGELOG.json9
-rw-r--r--contracts/examples/CHANGELOG.md4
-rw-r--r--contracts/examples/package.json38
-rw-r--r--contracts/extensions/CHANGELOG.json9
-rw-r--r--contracts/extensions/CHANGELOG.md4
-rw-r--r--contracts/extensions/package.json40
-rw-r--r--contracts/extensions/test/extensions/balance_threshold_filter.ts28
-rw-r--r--contracts/extensions/test/extensions/order_validator.ts12
-rw-r--r--contracts/interfaces/CHANGELOG.json9
-rw-r--r--contracts/interfaces/CHANGELOG.md4
-rw-r--r--contracts/interfaces/README.md4
-rw-r--r--contracts/interfaces/package.json24
-rw-r--r--contracts/libs/CHANGELOG.json9
-rw-r--r--contracts/libs/CHANGELOG.md4
-rw-r--r--contracts/libs/README.md8
-rw-r--r--contracts/libs/package.json32
-rw-r--r--contracts/multisig/CHANGELOG.json9
-rw-r--r--contracts/multisig/CHANGELOG.md4
-rw-r--r--contracts/multisig/README.md8
-rw-r--r--contracts/multisig/package.json28
-rw-r--r--contracts/protocol/CHANGELOG.json9
-rw-r--r--contracts/protocol/CHANGELOG.md4
-rw-r--r--contracts/protocol/README.md8
-rw-r--r--contracts/protocol/package.json40
-rw-r--r--contracts/protocol/test/exchange/core.ts20
-rw-r--r--contracts/protocol/test/exchange/wrapper.ts24
-rw-r--r--contracts/protocol/test/utils/match_order_tester.ts8
-rw-r--r--contracts/test-utils/CHANGELOG.json18
-rw-r--r--contracts/test-utils/CHANGELOG.md4
-rw-r--r--contracts/test-utils/package.json30
-rw-r--r--contracts/test-utils/src/types.ts14
-rw-r--r--contracts/tokens/CHANGELOG.json9
-rw-r--r--contracts/tokens/CHANGELOG.md4
-rw-r--r--contracts/tokens/README.md8
-rw-r--r--contracts/tokens/package.json36
-rw-r--r--contracts/utils/CHANGELOG.json9
-rw-r--r--contracts/utils/CHANGELOG.md4
-rw-r--r--contracts/utils/README.md8
-rw-r--r--contracts/utils/package.json30
-rw-r--r--package.json2
-rw-r--r--packages/0x.js/CHANGELOG.json129
-rw-r--r--packages/0x.js/CHANGELOG.md4
-rw-r--r--packages/0x.js/package.json32
-rw-r--r--packages/abi-gen-templates/README.md6
-rw-r--r--packages/abi-gen-wrappers/CHANGELOG.json12
-rw-r--r--packages/abi-gen-wrappers/CHANGELOG.md4
-rw-r--r--packages/abi-gen-wrappers/package.json16
-rw-r--r--packages/abi-gen/CHANGELOG.json18
-rw-r--r--packages/abi-gen/CHANGELOG.md4
-rw-r--r--packages/abi-gen/package.json10
-rw-r--r--packages/assert/CHANGELOG.json15
-rw-r--r--packages/assert/CHANGELOG.md4
-rw-r--r--packages/assert/package.json10
-rw-r--r--packages/asset-buyer/CHANGELOG.json15
-rw-r--r--packages/asset-buyer/CHANGELOG.md4
-rw-r--r--packages/asset-buyer/package.json26
-rw-r--r--packages/asset-buyer/src/utils/order_provider_response_processor.ts2
-rw-r--r--packages/base-contract/CHANGELOG.json12
-rw-r--r--packages/base-contract/CHANGELOG.md4
-rw-r--r--packages/base-contract/package.json12
-rw-r--r--packages/connect/CHANGELOG.json12
-rw-r--r--packages/connect/CHANGELOG.md4
-rw-r--r--packages/connect/README.md4
-rw-r--r--packages/connect/package.json16
-rw-r--r--packages/contract-wrappers/CHANGELOG.json66
-rw-r--r--packages/contract-wrappers/CHANGELOG.md4
-rw-r--r--packages/contract-wrappers/package.json32
-rw-r--r--packages/contract-wrappers/src/types.ts14
-rw-r--r--packages/contract-wrappers/src/utils/assert.ts2
-rw-r--r--packages/contract-wrappers/test/exchange_wrapper_test.ts10
-rw-r--r--packages/contract-wrappers/test/forwarder_wrapper_test.ts8
-rw-r--r--packages/contract-wrappers/test/order_validator_wrapper_test.ts4
-rw-r--r--packages/dev-tools-pages/README.md8
-rw-r--r--packages/dev-tools-pages/package.json6
-rw-r--r--packages/dev-tools-pages/ts/components/animations/index.tsx5
-rw-r--r--packages/dev-tools-pages/ts/components/button.tsx49
-rw-r--r--packages/dev-tools-pages/ts/components/code.tsx12
-rw-r--r--packages/dev-tools-pages/ts/components/container.tsx5
-rw-r--r--packages/dev-tools-pages/ts/components/content.tsx5
-rw-r--r--packages/dev-tools-pages/ts/components/tabs.tsx4
-rw-r--r--packages/dev-tools-pages/ts/components/trace.tsx15
-rw-r--r--packages/dev-tools-pages/ts/globalStyles.tsx5
-rw-r--r--packages/dev-utils/CHANGELOG.json9
-rw-r--r--packages/dev-utils/CHANGELOG.md4
-rw-r--r--packages/dev-utils/package.json16
-rw-r--r--packages/devnet/genesis.json3
-rw-r--r--packages/ethereum-types/CHANGELOG.json9
-rw-r--r--packages/ethereum-types/CHANGELOG.md4
-rw-r--r--packages/ethereum-types/package.json4
-rw-r--r--packages/fill-scenarios/CHANGELOG.json12
-rw-r--r--packages/fill-scenarios/CHANGELOG.md4
-rw-r--r--packages/fill-scenarios/package.json20
-rw-r--r--packages/instant/CHANGELOG.json9
-rw-r--r--packages/instant/README.md9
-rw-r--r--packages/instant/package.json24
-rw-r--r--packages/instant/src/components/animations/full_rotation.tsx5
-rw-r--r--packages/instant/src/components/animations/position_animation.tsx5
-rw-r--r--packages/instant/src/components/css_reset.tsx6
-rw-r--r--packages/instant/src/components/timed_progress_bar.tsx5
-rw-r--r--packages/instant/src/components/ui/circle.tsx19
-rw-r--r--packages/instant/src/components/ui/container.tsx5
-rw-r--r--packages/instant/src/components/ui/flex.tsx5
-rw-r--r--packages/instant/src/components/ui/input.tsx10
-rw-r--r--packages/instant/src/components/ui/overlay.tsx5
-rw-r--r--packages/instant/src/components/ui/text.tsx5
-rw-r--r--packages/instant/src/containers/latest_error.tsx5
-rw-r--r--packages/instant/src/redux/actions.ts93
-rw-r--r--packages/instant/src/redux/analytics_middleware.ts16
-rw-r--r--packages/instant/src/redux/reducer.ts46
-rw-r--r--packages/instant/src/style/theme.ts2
-rw-r--r--packages/instant/src/types.ts8
-rw-r--r--packages/instant/src/util/analytics.ts130
-rw-r--r--packages/instant/src/util/asset.ts5
-rw-r--r--packages/json-schemas/CHANGELOG.json18
-rw-r--r--packages/json-schemas/CHANGELOG.md4
-rw-r--r--packages/json-schemas/package.json8
-rw-r--r--packages/metacoin/README.md12
-rw-r--r--packages/metacoin/package.json30
-rw-r--r--packages/migrations/CHANGELOG.json15
-rw-r--r--packages/migrations/CHANGELOG.md4
-rw-r--r--packages/migrations/package.json26
-rw-r--r--packages/monorepo-scripts/package.json4
-rw-r--r--packages/order-utils/CHANGELOG.json57
-rw-r--r--packages/order-utils/CHANGELOG.md4
-rw-r--r--packages/order-utils/package.json24
-rw-r--r--packages/order-watcher/CHANGELOG.json33
-rw-r--r--packages/order-watcher/CHANGELOG.md4
-rw-r--r--packages/order-watcher/README.md20
-rw-r--r--packages/order-watcher/package.json34
-rw-r--r--packages/pipeline/README.md15
-rw-r--r--packages/pipeline/package.json20
-rw-r--r--packages/pipeline/src/parsers/copper/index.ts6
-rw-r--r--packages/pipeline/src/scripts/pull_radar_relay_orders.ts29
-rw-r--r--packages/pipeline/test/fixtures/copper/api_v1_list_leads.json18
-rw-r--r--packages/react-docs/CHANGELOG.json21
-rw-r--r--packages/react-docs/CHANGELOG.md4
-rw-r--r--packages/react-docs/README.md24
-rw-r--r--packages/react-docs/package.json18
-rw-r--r--packages/react-docs/src/components/doc_reference.tsx24
-rw-r--r--packages/react-docs/src/components/interface.tsx3
-rw-r--r--packages/react-docs/src/components/signature_block.tsx18
-rw-r--r--packages/react-docs/src/components/type.tsx9
-rw-r--r--packages/react-shared/CHANGELOG.json12
-rw-r--r--packages/react-shared/CHANGELOG.md4
-rw-r--r--packages/react-shared/package.json14
-rw-r--r--packages/react-shared/src/components/anchor_title.tsx21
-rw-r--r--packages/sol-compiler/CHANGELOG.json21
-rw-r--r--packages/sol-compiler/CHANGELOG.md4
-rw-r--r--packages/sol-compiler/README.md10
-rw-r--r--packages/sol-compiler/package.json22
-rw-r--r--packages/sol-compiler/src/cli.ts4
-rw-r--r--packages/sol-coverage/CHANGELOG.json9
-rw-r--r--packages/sol-coverage/CHANGELOG.md14
-rw-r--r--packages/sol-coverage/package.json12
-rw-r--r--packages/sol-doc/CHANGELOG.json12
-rw-r--r--packages/sol-doc/CHANGELOG.md4
-rw-r--r--packages/sol-doc/package.json12
-rw-r--r--packages/sol-profiler/CHANGELOG.json9
-rw-r--r--packages/sol-profiler/CHANGELOG.md14
-rw-r--r--packages/sol-profiler/package.json12
-rw-r--r--packages/sol-resolver/CHANGELOG.json9
-rw-r--r--packages/sol-resolver/CHANGELOG.md4
-rw-r--r--packages/sol-resolver/package.json8
-rw-r--r--packages/sol-trace/CHANGELOG.json9
-rw-r--r--packages/sol-trace/CHANGELOG.md14
-rw-r--r--packages/sol-trace/package.json12
-rw-r--r--packages/sol-tracing-utils/CHANGELOG.json21
-rw-r--r--packages/sol-tracing-utils/CHANGELOG.md4
-rw-r--r--packages/sol-tracing-utils/package.json18
-rw-r--r--packages/sra-spec/CHANGELOG.json12
-rw-r--r--packages/sra-spec/CHANGELOG.md4
-rw-r--r--packages/sra-spec/package.json6
-rw-r--r--packages/sra-spec/src/md/introduction.md8
-rw-r--r--packages/subproviders/CHANGELOG.json24
-rw-r--r--packages/subproviders/CHANGELOG.md4
-rw-r--r--packages/subproviders/README.md12
-rw-r--r--packages/subproviders/package.json16
-rw-r--r--packages/testnet-faucets/package.json16
-rw-r--r--packages/testnet-faucets/src/ts/handler.ts6
-rw-r--r--packages/tslint-config/CHANGELOG.json18
-rw-r--r--packages/tslint-config/CHANGELOG.md4
-rw-r--r--packages/tslint-config/package.json3
-rw-r--r--packages/tslint-config/rules/enumNamingRule.ts60
-rw-r--r--packages/tslint-config/test/enumNamingSpec.spec.ts88
-rw-r--r--packages/tslint-config/test/lintrunner.ts23
-rw-r--r--packages/tslint-config/tsconfig.json4
-rw-r--r--packages/tslint-config/tslint.json3
-rw-r--r--packages/types/CHANGELOG.json15
-rw-r--r--packages/types/CHANGELOG.md4
-rw-r--r--packages/types/package.json6
-rw-r--r--packages/typescript-typings/CHANGELOG.json12
-rw-r--r--packages/typescript-typings/CHANGELOG.md4
-rw-r--r--packages/typescript-typings/package.json4
-rw-r--r--packages/typescript-typings/types/chai-as-promised/index.d.ts4
-rw-r--r--packages/utils/CHANGELOG.json15
-rw-r--r--packages/utils/CHANGELOG.md4
-rw-r--r--packages/utils/package.json10
-rw-r--r--packages/utils/src/abi_encoder/evm_data_types/address.ts4
-rw-r--r--packages/web3-wrapper/CHANGELOG.json36
-rw-r--r--packages/web3-wrapper/CHANGELOG.md4
-rw-r--r--packages/web3-wrapper/package.json14
-rw-r--r--packages/website/README.md10
-rw-r--r--packages/website/contracts/Mintable.json3
-rw-r--r--packages/website/md/docs/json_schemas/1/schemas.md40
-rw-r--r--packages/website/md/docs/json_schemas/2/schemas.md58
-rw-r--r--packages/website/md/docs/json_schemas/3/schemas.md60
-rw-r--r--packages/website/md/docs/smart_contracts/2/introduction.md4
-rw-r--r--packages/website/md/docs/sol-compiler/1/introduction.md12
-rw-r--r--packages/website/package.json32
-rw-r--r--packages/website/public/css/basscss.min.css1
-rw-r--r--packages/website/public/index.html1
-rw-r--r--packages/website/translations/chinese.json39
-rw-r--r--packages/website/translations/english.json51
-rw-r--r--packages/website/translations/korean.json39
-rw-r--r--packages/website/translations/russian.json39
-rw-r--r--packages/website/translations/spanish.json42
-rw-r--r--packages/website/ts/components/aboutPageLayout.tsx23
-rw-r--r--packages/website/ts/components/animatedChatIcon.tsx5
-rw-r--r--packages/website/ts/components/banner.tsx5
-rw-r--r--packages/website/ts/components/button.tsx5
-rw-r--r--packages/website/ts/components/definition.tsx10
-rw-r--r--packages/website/ts/components/dialogs/blockchain_err_dialog.tsx8
-rw-r--r--packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx27
-rw-r--r--packages/website/ts/components/dialogs/ledger_config_dialog.tsx18
-rw-r--r--packages/website/ts/components/fill_order.tsx25
-rw-r--r--packages/website/ts/components/fill_warning_dialog.tsx3
-rw-r--r--packages/website/ts/components/generate_order/asset_picker.tsx42
-rw-r--r--packages/website/ts/components/generate_order/generate_order_form.tsx20
-rw-r--r--packages/website/ts/components/generate_order/new_token_form.tsx2
-rw-r--r--packages/website/ts/components/hamburger.tsx10
-rw-r--r--packages/website/ts/components/header.tsx49
-rw-r--r--packages/website/ts/components/hero.tsx15
-rw-r--r--packages/website/ts/components/icon.tsx10
-rw-r--r--packages/website/ts/components/image.tsx5
-rw-r--r--packages/website/ts/components/inputs/allowance_state_toggle.tsx2
-rw-r--r--packages/website/ts/components/link.tsx5
-rw-r--r--packages/website/ts/components/logo.tsx5
-rw-r--r--packages/website/ts/components/mobileNav.tsx15
-rw-r--r--packages/website/ts/components/modals/input.tsx5
-rw-r--r--packages/website/ts/components/modals/modal_contact.tsx16
-rw-r--r--packages/website/ts/components/nested_sidebar_menu.tsx4
-rw-r--r--packages/website/ts/components/newLayout.tsx30
-rw-r--r--packages/website/ts/components/newsletter_form.tsx26
-rw-r--r--packages/website/ts/components/portal/portal.tsx7
-rw-r--r--packages/website/ts/components/sections/landing/clients.tsx7
-rw-r--r--packages/website/ts/components/siteWrap.tsx5
-rw-r--r--packages/website/ts/components/text.tsx10
-rw-r--r--packages/website/ts/components/token_balances.tsx33
-rw-r--r--packages/website/ts/components/ui/alert.tsx2
-rw-r--r--packages/website/ts/components/ui/lifecycle_raised_button.tsx24
-rw-r--r--packages/website/ts/components/ui/party.tsx50
-rw-r--r--packages/website/ts/constants/globalStyle.tsx4
-rw-r--r--packages/website/ts/containers/asset_buyer_documentation.ts7
-rw-r--r--packages/website/ts/containers/connect_documentation.ts7
-rw-r--r--packages/website/ts/containers/contract_wrappers_documentation.ts7
-rw-r--r--packages/website/ts/containers/docs_home.ts7
-rw-r--r--packages/website/ts/containers/ethereum_types_documentation.ts7
-rw-r--r--packages/website/ts/containers/faq.ts5
-rw-r--r--packages/website/ts/containers/json_schemas_documentation.ts7
-rw-r--r--packages/website/ts/containers/migrations_documentation.ts7
-rw-r--r--packages/website/ts/containers/not_found.ts7
-rw-r--r--packages/website/ts/containers/order_utils_documentation.ts7
-rw-r--r--packages/website/ts/containers/order_watcher_documentation.ts7
-rw-r--r--packages/website/ts/containers/portal.ts7
-rw-r--r--packages/website/ts/containers/smart_contracts_documentation.ts7
-rw-r--r--packages/website/ts/containers/sol_compiler_documentation.ts7
-rw-r--r--packages/website/ts/containers/sol_coverage_documentation.ts7
-rw-r--r--packages/website/ts/containers/sol_profiler_documentation.ts7
-rw-r--r--packages/website/ts/containers/sol_trace_documentation.ts7
-rw-r--r--packages/website/ts/containers/subproviders_documentation.ts7
-rw-r--r--packages/website/ts/containers/web3_wrapper_documentation.ts7
-rw-r--r--packages/website/ts/containers/wiki.ts5
-rw-r--r--packages/website/ts/containers/zero_ex_js_documentation.ts7
-rw-r--r--packages/website/ts/index.tsx1
-rw-r--r--packages/website/ts/pages/about/jobs.tsx4
-rw-r--r--packages/website/ts/pages/documentation/developers_page.tsx10
-rw-r--r--packages/website/ts/pages/faq/faq.tsx20
-rw-r--r--packages/website/ts/pages/instant.tsx50
-rw-r--r--packages/website/ts/pages/instant/config_generator.tsx7
-rw-r--r--packages/website/ts/pages/why.tsx11
-rw-r--r--packages/website/ts/types.ts36
-rw-r--r--packages/website/ts/utils/utils.ts10
-rw-r--r--python-packages/sra_client/README.md46
-rw-r--r--python-packages/sra_client/docs/DefaultApi.md28
-rw-r--r--yarn.lock2919
288 files changed, 2589 insertions, 4684 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 4b3ef1f07..609f6e642 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
Examples of behavior that contributes to creating a positive environment include:
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3e709b36f..aea2f10e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,26 +12,26 @@ We welcome contributions from anyone on the internet and are grateful for even t
Before removing the `[WIP]` tag and submitting the PR for review, make sure:
-* It passes our linter checks (`yarn lint`)
-* It is properly formatted with Prettier (`yarn prettier`)
-* It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#enabling-code-coverage-checks-on-your-fork) for instructions on getting the `submit-coverage` test to pass on forks)
-* You've created/updated the corresponding [CHANGELOG](#CHANGELOGs) entries.
-* Your changes have sufficient test coverage (e.g regression tests have been added for bug fixes)
+- It passes our linter checks (`yarn lint`)
+- It is properly formatted with Prettier (`yarn prettier`)
+- It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#enabling-code-coverage-checks-on-your-fork) for instructions on getting the `submit-coverage` test to pass on forks)
+- You've created/updated the corresponding [CHANGELOG](#CHANGELOGs) entries.
+- Your changes have sufficient test coverage (e.g regression tests have been added for bug fixes)
### Branch structure
We have two main branches:
-* `master` represents the most recently released (published on npm) version of the codebase.
-* `development` represents the current development state of the codebase.
+- `master` represents the most recently released (published on npm) version of the codebase.
+- `development` represents the current development state of the codebase.
ALL PRs should be opened against `development`.
Branch names should be prefixed with `fix`, `feature` or `refactor`.
-* e.g `fix/broken-wiki-link`
-* If the PR only edits a single package, add it's name too
- * e.g `fix/website/broken-wiki-link`
+- e.g `fix/broken-wiki-link`
+- If the PR only edits a single package, add it's name too
+ - e.g `fix/website/broken-wiki-link`
### CHANGELOGs
@@ -67,8 +67,8 @@ If you want to change a rule, or add a custom rule, please make these changes to
Integrate it into your text editor:
-* VSCode: [vscode-tslint](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
-* Atom: [linter-tslint](https://atom.io/packages/linter-tslint)
+- VSCode: [vscode-tslint](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
+- Atom: [linter-tslint](https://atom.io/packages/linter-tslint)
#### Auto-formatter
@@ -76,8 +76,8 @@ We use [Prettier](https://prettier.io/) to auto-format our code. Be sure to eith
If using the Atom text editor, we recommend you install the following packages:
-* VSCode: [prettier-vscode](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
-* Atom: [prettier-atom](https://atom.io/packages/prettier-atom)
+- VSCode: [prettier-vscode](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+- Atom: [prettier-atom](https://atom.io/packages/prettier-atom)
## Unenforced coding conventions
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 70c5e8a9f..bfca7a576 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -20,7 +20,7 @@
<!--- The following points should be used to indicate the progress of your PR. Put an `x` in all the boxes that apply right now, and come back over time and check them off as you make progress. If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-* [ ] Prefix PR title with `[WIP]` if necessary.
-* [ ] Add tests to cover changes as needed.
-* [ ] Update documentation as needed.
-* [ ] Add new entries to the relevant CHANGELOG.jsons.
+- [ ] Prefix PR title with `[WIP]` if necessary.
+- [ ] Add tests to cover changes as needed.
+- [ ] Update documentation as needed.
+- [ ] Add new entries to the relevant CHANGELOG.jsons.
diff --git a/contracts/examples/CHANGELOG.json b/contracts/examples/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/examples/CHANGELOG.json
+++ b/contracts/examples/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/examples/CHANGELOG.md b/contracts/examples/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/examples/CHANGELOG.md
+++ b/contracts/examples/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index d04b5fc44..d1778f85f 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-examples",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -33,12 +33,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -58,20 +58,20 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-interfaces": "^1.0.3",
- "@0x/contracts-libs": "^1.0.3",
- "@0x/contracts-multisig": "^1.0.3",
- "@0x/contracts-tokens": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-interfaces": "^1.0.4",
+ "@0x/contracts-libs": "^1.0.4",
+ "@0x/contracts-multisig": "^1.0.4",
+ "@0x/contracts-tokens": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json
index de1ada0a8..c4aafdd44 100644
--- a/contracts/extensions/CHANGELOG.json
+++ b/contracts/extensions/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.2.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.2.0",
"changes": [
{
diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md
index 452cc8e82..00a7196c4 100644
--- a/contracts/extensions/CHANGELOG.md
+++ b/contracts/extensions/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.2.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.2.0 - _January 9, 2019_
* Added Dutch Auction Wrapper (#1465)
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 99b5b35a8..6e8c12631 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
- "version": "1.2.0",
+ "version": "1.2.1",
"engines": {
"node": ">=6.12"
},
@@ -44,13 +44,13 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contract-wrappers": "^4.2.0",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contract-wrappers": "^4.2.1",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -70,20 +70,20 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-interfaces": "^1.0.3",
- "@0x/contracts-libs": "^1.0.3",
- "@0x/contracts-protocol": "^2.2.0",
- "@0x/contracts-tokens": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-interfaces": "^1.0.4",
+ "@0x/contracts-libs": "^1.0.4",
+ "@0x/contracts-protocol": "^2.2.1",
+ "@0x/contracts-tokens": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/contracts/extensions/test/extensions/balance_threshold_filter.ts b/contracts/extensions/test/extensions/balance_threshold_filter.ts
index 07199d60b..a1c322e08 100644
--- a/contracts/extensions/test/extensions/balance_threshold_filter.ts
+++ b/contracts/extensions/test/extensions/balance_threshold_filter.ts
@@ -1457,7 +1457,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
validSignedOrder,
);
- expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
// Cancel
const txReceipt = await erc721MakerBalanceThresholdWrapper.cancelOrderAsync(
validSignedOrder,
@@ -1470,7 +1470,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
validSignedOrder,
);
- expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
});
it('Should successfully cancel order if maker does not meet balance threshold', async () => {
// Create order where maker does not meet balance threshold
@@ -1479,7 +1479,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
signedOrderWithBadMakerAddress,
);
- expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
// Cancel
const txReceipt = await erc721NonValidBalanceThresholdWrapper.cancelOrderAsync(
signedOrderWithBadMakerAddress,
@@ -1492,7 +1492,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
signedOrderWithBadMakerAddress,
);
- expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
});
});
@@ -1512,7 +1512,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
});
// Cancel
const txReceipt = await erc721MakerBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1527,7 +1527,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
});
});
it('Should successfully batch cancel order if maker does not meet balance threshold', async () => {
@@ -1542,7 +1542,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
});
// Cancel
const txReceipt = await erc721NonValidBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1557,7 +1557,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoAfterCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
});
});
});
@@ -1578,7 +1578,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
});
// Cancel
const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1596,9 +1596,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
);
const saltAsBigNumber = new BigNumber(salt);
if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
} else {
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
}
});
});
@@ -1614,7 +1614,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
signedOrder,
);
- return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
});
// Cancel
const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1632,9 +1632,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
);
const saltAsBigNumber = new BigNumber(salt);
if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
} else {
- return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
}
});
});
diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/extensions/test/extensions/order_validator.ts
index 82a6b937f..7d8675f36 100644
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ b/contracts/extensions/test/extensions/order_validator.ts
@@ -432,7 +432,7 @@ describe('OrderValidator', () => {
takerAddress,
);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
expect(traderInfo.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -485,7 +485,7 @@ describe('OrderValidator', () => {
takerAddress,
);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
expect(traderInfo.makerBalance).to.be.bignumber.equal(makerBalance);
@@ -514,10 +514,10 @@ describe('OrderValidator', () => {
] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
- expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
- expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
expect(traderInfo1.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -581,10 +581,10 @@ describe('OrderValidator', () => {
] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
- expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
- expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
expect(traderInfo1.makerBalance).to.be.bignumber.equal(makerBalance);
diff --git a/contracts/interfaces/CHANGELOG.json b/contracts/interfaces/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/interfaces/CHANGELOG.json
+++ b/contracts/interfaces/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/interfaces/CHANGELOG.md b/contracts/interfaces/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/interfaces/CHANGELOG.md
+++ b/contracts/interfaces/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/interfaces/README.md b/contracts/interfaces/README.md
index b7d519abb..81dd4c3ac 100644
--- a/contracts/interfaces/README.md
+++ b/contracts/interfaces/README.md
@@ -6,8 +6,8 @@ Smart contract interfaces of the 0x protocol.
Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [protocol](./contracts/protocol)
- * This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+- [protocol](./contracts/protocol)
+ - This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
## Bug bounty
diff --git a/contracts/interfaces/package.json b/contracts/interfaces/package.json
index 9017f0a73..8e3f67f67 100644
--- a/contracts/interfaces/package.json
+++ b/contracts/interfaces/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-interfaces",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -30,9 +30,9 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/tslint-config": "^2.0.1",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"solhint": "^1.4.1",
@@ -41,14 +41,14 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-libs": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-libs": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/contracts/libs/CHANGELOG.json b/contracts/libs/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/libs/CHANGELOG.json
+++ b/contracts/libs/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/libs/CHANGELOG.md b/contracts/libs/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/libs/CHANGELOG.md
+++ b/contracts/libs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/libs/README.md b/contracts/libs/README.md
index 66eedf6be..cfa631679 100644
--- a/contracts/libs/README.md
+++ b/contracts/libs/README.md
@@ -6,10 +6,10 @@ Smart contracts libs used in the 0x protocol.
Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [libs](./contracts/protocol)
- * This directory contains the libs.
-* [test](./contracts/test)
- * This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+- [libs](./contracts/protocol)
+ - This directory contains the libs.
+- [test](./contracts/test)
+ - This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
## Contributing
diff --git a/contracts/libs/package.json b/contracts/libs/package.json
index 9d28cc038..5946faf74 100644
--- a/contracts/libs/package.json
+++ b/contracts/libs/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-libs",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -69,17 +69,17 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-multisig": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-multisig": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/multisig/CHANGELOG.json
+++ b/contracts/multisig/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/multisig/CHANGELOG.md
+++ b/contracts/multisig/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/multisig/README.md b/contracts/multisig/README.md
index 93db63b5b..e29f46251 100644
--- a/contracts/multisig/README.md
+++ b/contracts/multisig/README.md
@@ -6,10 +6,10 @@ MultiSig smart contracts
Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [multisig](./contracts/multisig)
- * This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
-* [test](./contracts/test)
- * This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+- [multisig](./contracts/multisig)
+ - This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
+- [test](./contracts/test)
+ - This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
## Contributing
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index e0bbc001d..030323cbf 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/ethereumjs-abi": "^0.6.0",
"@types/lodash": "4.14.104",
@@ -69,13 +69,13 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/contracts/protocol/CHANGELOG.json b/contracts/protocol/CHANGELOG.json
index 6672ce9c3..039f0f94a 100644
--- a/contracts/protocol/CHANGELOG.json
+++ b/contracts/protocol/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "2.2.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "2.2.0",
"changes": [
{
diff --git a/contracts/protocol/CHANGELOG.md b/contracts/protocol/CHANGELOG.md
index a8ad921a2..75d4b9a5e 100644
--- a/contracts/protocol/CHANGELOG.md
+++ b/contracts/protocol/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.2.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v2.2.0 - _January 9, 2019_
* Added LibAddressArray (#1383)
diff --git a/contracts/protocol/README.md b/contracts/protocol/README.md
index 5fc9c0a89..dc1f32c98 100644
--- a/contracts/protocol/README.md
+++ b/contracts/protocol/README.md
@@ -6,10 +6,10 @@ Smart contracts that implement the 0x protocol. Addresses of the deployed contra
Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [protocol](./contracts/protocol)
- * This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
-* [test](./contracts/test)
- * This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+- [protocol](./contracts/protocol)
+ - This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+- [test](./contracts/test)
+ - This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
## Bug bounty
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 7d49dfbe8..daece8876 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-protocol",
- "version": "2.2.0",
+ "version": "2.2.1",
"engines": {
"node": ">=6.12"
},
@@ -44,11 +44,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -68,22 +68,22 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-examples": "^1.0.3",
- "@0x/contracts-interfaces": "^1.0.3",
- "@0x/contracts-libs": "^1.0.3",
- "@0x/contracts-multisig": "^1.0.3",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/contracts-tokens": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-examples": "^1.0.4",
+ "@0x/contracts-interfaces": "^1.0.4",
+ "@0x/contracts-libs": "^1.0.4",
+ "@0x/contracts-multisig": "^1.0.4",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/contracts-tokens": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/contracts/protocol/test/exchange/core.ts b/contracts/protocol/test/exchange/core.ts
index 42db8623d..700643b79 100644
--- a/contracts/protocol/test/exchange/core.ts
+++ b/contracts/protocol/test/exchange/core.ts
@@ -1043,7 +1043,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.FILLABLE;
+ const expectedOrderStatus = OrderStatus.Fillable;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1053,7 +1053,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
- const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+ const expectedOrderStatus = OrderStatus.FullyFilled;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1064,7 +1064,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = takerAssetFillAmount;
- const expectedOrderStatus = OrderStatus.FILLABLE;
+ const expectedOrderStatus = OrderStatus.Fillable;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1074,7 +1074,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.CANCELLED;
+ const expectedOrderStatus = OrderStatus.Cancelled;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1086,7 +1086,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = takerAssetFillAmount;
- const expectedOrderStatus = OrderStatus.CANCELLED;
+ const expectedOrderStatus = OrderStatus.Cancelled;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1098,7 +1098,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.EXPIRED;
+ const expectedOrderStatus = OrderStatus.Expired;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1112,7 +1112,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = takerAssetFillAmount;
- const expectedOrderStatus = OrderStatus.EXPIRED;
+ const expectedOrderStatus = OrderStatus.Expired;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1126,7 +1126,7 @@ describe('Exchange core', () => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
// FULLY_FILLED takes precedence over EXPIRED
- const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+ const expectedOrderStatus = OrderStatus.FullyFilled;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1136,7 +1136,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.INVALID_MAKER_ASSET_AMOUNT;
+ const expectedOrderStatus = OrderStatus.InvalidMakerAssetAmount;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1146,7 +1146,7 @@ describe('Exchange core', () => {
const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.INVALID_TAKER_ASSET_AMOUNT;
+ const expectedOrderStatus = OrderStatus.InvalidTakerAssetAmount;
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
diff --git a/contracts/protocol/test/exchange/wrapper.ts b/contracts/protocol/test/exchange/wrapper.ts
index c9efb0c9d..4c4506945 100644
--- a/contracts/protocol/test/exchange/wrapper.ts
+++ b/contracts/protocol/test/exchange/wrapper.ts
@@ -1288,7 +1288,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.FILLABLE;
+ const expectedOrderStatus = OrderStatus.Fillable;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1303,7 +1303,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
- const expectedOrderStatus = OrderStatus.FILLABLE;
+ const expectedOrderStatus = OrderStatus.Fillable;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1317,7 +1317,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
- const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+ const expectedOrderStatus = OrderStatus.FullyFilled;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1331,7 +1331,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.CANCELLED;
+ const expectedOrderStatus = OrderStatus.Cancelled;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1347,7 +1347,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
- const expectedOrderStatus = OrderStatus.CANCELLED;
+ const expectedOrderStatus = OrderStatus.Cancelled;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1363,7 +1363,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = new BigNumber(0);
- const expectedOrderStatus = OrderStatus.EXPIRED;
+ const expectedOrderStatus = OrderStatus.Expired;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1381,7 +1381,7 @@ describe('Exchange wrappers', () => {
_.forEach(signedOrders, (signedOrder, index) => {
const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
- const expectedOrderStatus = OrderStatus.EXPIRED;
+ const expectedOrderStatus = OrderStatus.Expired;
const orderInfo = ordersInfo[index];
expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1408,7 +1408,7 @@ describe('Exchange wrappers', () => {
const expectedUnfilledOrderHash = orderHashUtils.getOrderHashHex(unfilledOrder);
const expectedUnfilledTakerAssetFilledAmount = new BigNumber(0);
- const expectedUnfilledOrderStatus = OrderStatus.FILLABLE;
+ const expectedUnfilledOrderStatus = OrderStatus.Fillable;
const unfilledOrderInfo = ordersInfo[0];
expect(unfilledOrderInfo.orderHash).to.be.equal(expectedUnfilledOrderHash);
expect(unfilledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1418,7 +1418,7 @@ describe('Exchange wrappers', () => {
const expectedPartialOrderHash = orderHashUtils.getOrderHashHex(partiallyFilledOrder);
const expectedPartialTakerAssetFilledAmount = partiallyFilledOrder.takerAssetAmount.div(2);
- const expectedPartialOrderStatus = OrderStatus.FILLABLE;
+ const expectedPartialOrderStatus = OrderStatus.Fillable;
const partialOrderInfo = ordersInfo[1];
expect(partialOrderInfo.orderHash).to.be.equal(expectedPartialOrderHash);
expect(partialOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1428,7 +1428,7 @@ describe('Exchange wrappers', () => {
const expectedFilledOrderHash = orderHashUtils.getOrderHashHex(fullyFilledOrder);
const expectedFilledTakerAssetFilledAmount = fullyFilledOrder.takerAssetAmount;
- const expectedFilledOrderStatus = OrderStatus.FULLY_FILLED;
+ const expectedFilledOrderStatus = OrderStatus.FullyFilled;
const filledOrderInfo = ordersInfo[2];
expect(filledOrderInfo.orderHash).to.be.equal(expectedFilledOrderHash);
expect(filledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1438,7 +1438,7 @@ describe('Exchange wrappers', () => {
const expectedCancelledOrderHash = orderHashUtils.getOrderHashHex(cancelledOrder);
const expectedCancelledTakerAssetFilledAmount = new BigNumber(0);
- const expectedCancelledOrderStatus = OrderStatus.CANCELLED;
+ const expectedCancelledOrderStatus = OrderStatus.Cancelled;
const cancelledOrderInfo = ordersInfo[3];
expect(cancelledOrderInfo.orderHash).to.be.equal(expectedCancelledOrderHash);
expect(cancelledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1448,7 +1448,7 @@ describe('Exchange wrappers', () => {
const expectedExpiredOrderHash = orderHashUtils.getOrderHashHex(expiredOrder);
const expectedExpiredTakerAssetFilledAmount = new BigNumber(0);
- const expectedExpiredOrderStatus = OrderStatus.EXPIRED;
+ const expectedExpiredOrderStatus = OrderStatus.Expired;
const expiredOrderInfo = ordersInfo[4];
expect(expiredOrderInfo.orderHash).to.be.equal(expectedExpiredOrderHash);
expect(expiredOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
diff --git a/contracts/protocol/test/utils/match_order_tester.ts b/contracts/protocol/test/utils/match_order_tester.ts
index 8f574704e..31864820f 100644
--- a/contracts/protocol/test/utils/match_order_tester.ts
+++ b/contracts/protocol/test/utils/match_order_tester.ts
@@ -268,15 +268,15 @@ export class MatchOrderTester {
const maxAmountBoughtByLeftMaker = signedOrderLeft.takerAssetAmount.minus(initialLeftOrderFilledAmount);
const leftOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderLeft);
const leftExpectedStatus = expectedTransferAmounts.amountBoughtByLeftMaker.equals(maxAmountBoughtByLeftMaker)
- ? OrderStatus.FULLY_FILLED
- : OrderStatus.FILLABLE;
+ ? OrderStatus.FullyFilled
+ : OrderStatus.Fillable;
expect(leftOrderInfo.orderStatus, 'Checking exchange status for left order').to.be.equal(leftExpectedStatus);
// Assert right order status
const maxAmountBoughtByRightMaker = signedOrderRight.takerAssetAmount.minus(initialRightOrderFilledAmount);
const rightOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderRight);
const rightExpectedStatus = expectedTransferAmounts.amountBoughtByRightMaker.equals(maxAmountBoughtByRightMaker)
- ? OrderStatus.FULLY_FILLED
- : OrderStatus.FILLABLE;
+ ? OrderStatus.FullyFilled
+ : OrderStatus.Fillable;
expect(rightOrderInfo.orderStatus, 'Checking exchange status for right order').to.be.equal(rightExpectedStatus);
}
/// @dev Asserts account balances after matching orders.
diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json
index 8ba8d179a..7bebd0fcb 100644
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,5 +1,23 @@
[
{
+ "version": "2.0.0",
+ "changes": [
+ {
+ "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule",
+ "pr": 1474
+ }
+ ]
+ },
+ {
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md
index 4732f1746..6aa89cd76 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
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json
index 2653fc0e4..bf3b23921 100644
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -40,19 +40,19 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/sol-coverage": "^1.0.0",
- "@0x/sol-profiler": "^1.0.0",
- "@0x/sol-trace": "^1.0.0",
- "@0x/abi-gen": "^1.0.20",
- "@0x/dev-utils": "^1.0.22",
- "@0x/order-utils": "^3.1.0",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/sol-coverage": "^1.0.1",
+ "@0x/sol-profiler": "^1.0.1",
+ "@0x/sol-trace": "^1.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/bn.js": "^4.11.0",
"@types/ethereumjs-abi": "^0.6.0",
"@types/js-combinatorics": "^0.5.29",
@@ -63,7 +63,7 @@
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"dirty-chai": "^2.0.1",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4",
diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts
index 1630eab0d..60cb2b102 100644
--- a/contracts/test-utils/src/types.ts
+++ b/contracts/test-utils/src/types.ts
@@ -70,13 +70,13 @@ export interface Token {
}
export enum OrderStatus {
- INVALID,
- INVALID_MAKER_ASSET_AMOUNT,
- INVALID_TAKER_ASSET_AMOUNT,
- FILLABLE,
- EXPIRED,
- FULLY_FILLED,
- CANCELLED,
+ Invalid,
+ InvalidMakerAssetAmount,
+ InvalidTakerAssetAmount,
+ Fillable,
+ Expired,
+ FullyFilled,
+ Cancelled,
}
export enum ContractName {
diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/tokens/CHANGELOG.json
+++ b/contracts/tokens/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/tokens/CHANGELOG.md
+++ b/contracts/tokens/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/tokens/README.md b/contracts/tokens/README.md
index 9c4106d41..2d1db92f0 100644
--- a/contracts/tokens/README.md
+++ b/contracts/tokens/README.md
@@ -6,10 +6,10 @@ Token smart contracts that are used in the 0x protocol. Addresses of the deploye
Token contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [tokens](./contracts/tokens)
- * This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
-* [test](./contracts/test)
- * This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+- [tokens](./contracts/tokens)
+ - This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
+- [test](./contracts/test)
+ - This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
## Bug bounty
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 31bf8f7cc..4601566e3 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-tokens",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -69,19 +69,19 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-interfaces": "^1.0.3",
- "@0x/contracts-libs": "^1.0.3",
- "@0x/contracts-multisig": "^1.0.3",
- "@0x/contracts-utils": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-interfaces": "^1.0.4",
+ "@0x/contracts-libs": "^1.0.4",
+ "@0x/contracts-multisig": "^1.0.4",
+ "@0x/contracts-utils": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/js-combinatorics": "^0.5.29",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.4",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.3",
"changes": [
diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.4 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.3 - _January 9, 2019_
* Dependencies updated
diff --git a/contracts/utils/README.md b/contracts/utils/README.md
index e7c7b49ff..2f872ddb5 100644
--- a/contracts/utils/README.md
+++ b/contracts/utils/README.md
@@ -6,10 +6,10 @@ Smart contracts utils used in the 0x protocol.
Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
-* [utils](./contracts/utils)
- * This directory contains libraries and utils.
-* [test](./contracts/test)
- * This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+- [utils](./contracts/utils)
+ - This directory contains libraries and utils.
+- [test](./contracts/test)
+ - This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
## Contributing
diff --git a/contracts/utils/package.json b/contracts/utils/package.json
index 732556f34..3745323ce 100644
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
- "version": "1.0.3",
+ "version": "1.0.4",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
"devDependencies": {
- "@0x/abi-gen": "^1.0.20",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/abi-gen": "^1.0.21",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"@types/node": "*",
@@ -70,14 +70,14 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11",
- "@0x/contracts-multisig": "^1.0.3",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contracts-multisig": "^1.0.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.5"
},
diff --git a/package.json b/package.json
index 9395dbaa2..27675ddd3 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
"lcov-result-merger": "^3.0.0",
"lerna": "^3.0.0-beta.25",
"npm-run-all": "^4.1.2",
- "prettier": "^1.11.1",
+ "prettier": "^1.15.3",
"source-map-support": "^0.5.6",
"typescript": "3.0.1",
"wsrun": "^2.2.0"
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 2f7320fea..2ded786c1 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,10 +1,18 @@
[
{
+ "timestamp": 1547225310,
+ "version": "3.0.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "3.0.0",
"changes": [
{
- "note":
- "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.",
+ "note": "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.",
"pr": 1363
}
],
@@ -90,18 +98,15 @@
"pr": 1102
},
{
- "note":
- "Added `MetamaskSubprovider` to handle inconsistencies in Metamask's signing JSON RPC endpoints.",
+ "note": "Added `MetamaskSubprovider` to handle inconsistencies in Metamask's signing JSON RPC endpoints.",
"pr": 1102
},
{
- "note":
- "Removed `SignerType` (including `SignerType.Metamask`). Please use the `MetamaskSubprovider` to wrap `web3.currentProvider`.",
+ "note": "Removed `SignerType` (including `SignerType.Metamask`). Please use the `MetamaskSubprovider` to wrap `web3.currentProvider`.",
"pr": 1102
},
{
- "note":
- "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers",
+ "note": "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers",
"pr": 1105
},
{
@@ -200,8 +205,7 @@
"version": "1.0.1-rc.5",
"changes": [
{
- "note":
- "Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js"
+ "note": "Fix `main` and `types` package.json entries so that they point to the new location of index.d.ts and index.js"
}
]
},
@@ -209,8 +213,7 @@
"version": "1.0.1-rc.4",
"changes": [
{
- "note":
- "Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher`",
+ "note": "Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher`",
"pr": 963
}
],
@@ -282,18 +285,15 @@
"pr": 863
},
{
- "note":
- "Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types",
+ "note": "Refactored `ZeroEx.isValidSignature` to `zeroEx.isValidSignatureAsync`. It is now async so that it can verify contract-dependent signature types",
"pr": 863
},
{
- "note":
- "Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too.",
+ "note": "Refactored `signOrderHashAsync` to `ecSignOrderHashAsync`. There are now many non-ECSignature ways to sign orders too.",
"pr": 863
},
{
- "note":
- "Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2",
+ "note": "Removed `createOrderWatcherAsync` method. Will be added back once OrderWatcher is refactored for V2",
"pr": 863
},
{
@@ -368,8 +368,7 @@
"pr": 579
},
{
- "note":
- "Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage",
+ "note": "Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage",
"pr": 579
}
],
@@ -454,8 +453,7 @@
"pr": 501
},
{
- "note":
- "Add `zeroEx.exchange.getOrderStateAsync` to allow obtaining current OrderState for a signedOrder",
+ "note": "Add `zeroEx.exchange.getOrderStateAsync` to allow obtaining current OrderState for a signedOrder",
"pr": 510
}
],
@@ -465,8 +463,7 @@
"version": "0.35.0",
"changes": [
{
- "note":
- "Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3-wrapper' `Web3WrapperErrors.TransactionMiningTimeout`",
+ "note": "Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3-wrapper' `Web3WrapperErrors.TransactionMiningTimeout`",
"pr": 485
}
],
@@ -476,8 +473,7 @@
"version": "0.34.0",
"changes": [
{
- "note":
- "Fix the bug causing `zeroEx.exchange.fillOrdersUpToAsync` validation to fail if there were some extra orders passed",
+ "note": "Fix the bug causing `zeroEx.exchange.fillOrdersUpToAsync` validation to fail if there were some extra orders passed",
"pr": 470
},
{
@@ -489,8 +485,7 @@
"pr": 488
},
{
- "note":
- "Added `stateLayer` setting to `OrderStateWatcherConfig` so OrderStateWatcher can be set to monitor different blockchain state layers",
+ "note": "Added `stateLayer` setting to `OrderStateWatcherConfig` so OrderStateWatcher can be set to monitor different blockchain state layers",
"pr": 488
}
],
@@ -577,8 +572,7 @@
"pr": 350
},
{
- "note":
- "Fixed the bug causing order watcher to throw if there is an event with the same signature but different indexed fields",
+ "note": "Fixed the bug causing order watcher to throw if there is an event with the same signature but different indexed fields",
"pr": 366
}
],
@@ -598,8 +592,7 @@
"version": "0.31.0",
"changes": [
{
- "note":
- "Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the caller can decide on whether to add the personalMessage prefix before relaying the request to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects it to have already been added.",
+ "note": "Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the caller can decide on whether to add the personalMessage prefix before relaying the request to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects it to have already been added.",
"pr": 349
}
],
@@ -644,8 +637,7 @@
"pr": 312
},
{
- "note":
- "Fix a bug in fillOrdersUpTo validation making it impossible to fill up to if user doesn't have enough balance to fully fill all the orders",
+ "note": "Fix a bug in fillOrdersUpTo validation making it impossible to fill up to if user doesn't have enough balance to fully fill all the orders",
"pr": 321
}
],
@@ -679,13 +671,11 @@
"version": "0.28.0",
"changes": [
{
- "note":
- "Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken`",
+ "note": "Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken`",
"pr": 267
},
{
- "note":
- "Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry`",
+ "note": "Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry`",
"pr": 267
},
{
@@ -697,8 +687,7 @@
"pr": 272
},
{
- "note":
- "Add `zeroEx.etherToken.subscribe`, `zeroEx.etherToken.unsubscribe`, `zeroEx.etherToken.unsubscribeAll`",
+ "note": "Add `zeroEx.etherToken.subscribe`, `zeroEx.etherToken.unsubscribe`, `zeroEx.etherToken.unsubscribeAll`",
"pr": 277
},
{
@@ -706,8 +695,7 @@
"pr": 277
},
{
- "note":
- "Add new public types `BlockParamLiteral`, `EtherTokenEvents`, `EtherTokenContractEventArgs`, `DepositContractEventArgs`, `WithdrawalContractEventArgs`",
+ "note": "Add new public types `BlockParamLiteral`, `EtherTokenEvents`, `EtherTokenContractEventArgs`, `DepositContractEventArgs`, `WithdrawalContractEventArgs`",
"pr": 277
},
{
@@ -742,8 +730,7 @@
"pr": 233
},
{
- "note":
- "Make all `getContractAddress` functions, `zeroEx.exchange.subscribe`, `zeroEx.exchange.getZRXTokenAddress` sync",
+ "note": "Make all `getContractAddress` functions, `zeroEx.exchange.subscribe`, `zeroEx.exchange.getZRXTokenAddress` sync",
"pr": 233
},
{
@@ -751,8 +738,7 @@
"pr": 233
},
{
- "note":
- "Make `DecodedLogEvent<A>` contain `LogWithDecodedArgs<A>` under log key instead of merging it in like web3 does",
+ "note": "Make `DecodedLogEvent<A>` contain `LogWithDecodedArgs<A>` under log key instead of merging it in like web3 does",
"pr": 234
},
{
@@ -768,8 +754,7 @@
"pr": 235
},
{
- "note":
- "Modify order validation methods to validate against the `latest` block, not against the `pending` block",
+ "note": "Modify order validation methods to validate against the `latest` block, not against the `pending` block",
"pr": 236
}
],
@@ -779,8 +764,7 @@
"version": "0.26.0",
"changes": [
{
- "note":
- "Add post-formatter for logs converting `blockNumber`, `logIndex`, `transactionIndex` from hexes to numbers",
+ "note": "Add post-formatter for logs converting `blockNumber`, `logIndex`, `transactionIndex` from hexes to numbers",
"pr": 231
},
{
@@ -788,8 +772,7 @@
"pr": 222
},
{
- "note":
- "In OrderWatcher subscribe to ZRX Token Transfer and Approval events when maker token is different",
+ "note": "In OrderWatcher subscribe to ZRX Token Transfer and Approval events when maker token is different",
"pr": 225
}
],
@@ -807,8 +790,7 @@
"pr": 205
},
{
- "note":
- "Normalized the transactionReceipt status to be `null|0|1`, 1 meaning transaction execution successful, 0 unsuccessful and `null` if it is a pre-byzantinium transaction.",
+ "note": "Normalized the transactionReceipt status to be `null|0|1`, 1 meaning transaction execution successful, 0 unsuccessful and `null` if it is a pre-byzantinium transaction.",
"pr": 200
}
],
@@ -879,8 +861,7 @@
"version": "0.22.0",
"changes": [
{
- "note":
- "Started using `OrderFillRequest` interface instead of `OrderFillOrKillRequest` interface for `zeroEx.exchange.batchFillOrKill`",
+ "note": "Started using `OrderFillRequest` interface instead of `OrderFillOrKillRequest` interface for `zeroEx.exchange.batchFillOrKill`",
"pr": 187
},
{
@@ -894,8 +875,7 @@
"version": "0.21.4",
"changes": [
{
- "note":
- "Made 0x.js more type-safe by making `getLogsAsync` and `subscribe/subscribeAsync` generics parametrized with arg type",
+ "note": "Made 0x.js more type-safe by making `getLogsAsync` and `subscribe/subscribeAsync` generics parametrized with arg type",
"pr": 194
}
],
@@ -942,8 +922,7 @@
"note": "Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`"
},
{
- "note":
- "Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood"
+ "note": "Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood"
},
{
"note": "Subscriptions correctly handle block re-orgs (forks)"
@@ -952,8 +931,7 @@
"note": "Subscriptions correctly backfill logs (connection problems)"
},
{
- "note":
- "They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider"
+ "note": "They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider"
},
{
"note": "Removed `ContractEventEmitter` and added `LogEvent`"
@@ -1060,8 +1038,7 @@
"version": "0.15.0",
"changes": [
{
- "note":
- "Added the ability to specify a historical `blockNumber` at which to query the blockchain's state when calling a token or exchange method",
+ "note": "Added the ability to specify a historical `blockNumber` at which to query the blockchain's state when calling a token or exchange method",
"pr": 161
}
],
@@ -1109,8 +1086,7 @@
"version": "0.13.0",
"changes": [
{
- "note":
- "Made all the functions submitting transactions to the network to immediately return transaction hash",
+ "note": "Made all the functions submitting transactions to the network to immediately return transaction hash",
"pr": 151
},
{
@@ -1118,8 +1094,7 @@
"pr": 151
},
{
- "note":
- "Added `TransactionReceiptWithDecodedLogs`, `LogWithDecodedArgs`, `DecodedLogArgs` to public types",
+ "note": "Added `TransactionReceiptWithDecodedLogs`, `LogWithDecodedArgs`, `DecodedLogArgs` to public types",
"pr": 151
},
{
@@ -1292,8 +1267,7 @@
"pr": 104
},
{
- "note":
- "Fixed an issue with incorrect balance/allowance validation when ZRX is one of the tokens traded",
+ "note": "Fixed an issue with incorrect balance/allowance validation when ZRX is one of the tokens traded",
"pr": 109
}
],
@@ -1303,13 +1277,11 @@
"version": "0.8.0",
"changes": [
{
- "note":
- "Added the ability to call methods on different authorized versions of the Exchange smart contract",
+ "note": "Added the ability to call methods on different authorized versions of the Exchange smart contract",
"pr": 82
},
{
- "note":
- "Updated contract artifacts to reflect latest changes to the smart contracts (0xproject/contracts#59)"
+ "note": "Updated contract artifacts to reflect latest changes to the smart contracts (0xproject/contracts#59)"
},
{
"note": "Added `zeroEx.proxy.isAuthorizedAsync` and `zeroEx.proxy.getAuthorizedAddressesAsync`",
@@ -1345,8 +1317,7 @@
"version": "0.7.1",
"changes": [
{
- "note":
- "Added the ability to convert Ether to wrapped Ether tokens and back via `zeroEx.etherToken.depostAsync` and `zeroEx.etherToken.withdrawAsync`",
+ "note": "Added the ability to convert Ether to wrapped Ether tokens and back via `zeroEx.etherToken.depostAsync` and `zeroEx.etherToken.withdrawAsync`",
"pr": 81
}
],
@@ -1368,8 +1339,7 @@
"pr": 72
},
{
- "note":
- "Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`"
+ "note": "Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`"
}
],
"timestamp": 1498057200
@@ -1411,8 +1381,7 @@
"version": "0.5.2",
"changes": [
{
- "note":
- "Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page"
+ "note": "Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page"
}
],
"timestamp": 1497452400
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 258dee66a..54ed42342 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
+## v3.0.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v3.0.0 - _January 9, 2019_
* Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`. (#1363)
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 74522c784..1b6eb6af9 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "3.0.0",
+ "version": "3.0.1",
"engines": {
"node": ">=6.12"
},
@@ -42,11 +42,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
+ "@0x/abi-gen-wrappers": "^2.1.1",
"@0x/contract-addresses": "^2.1.0",
- "@0x/dev-utils": "^1.0.22",
- "@0x/migrations": "^2.3.0",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/migrations": "^2.3.1",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@@ -72,18 +72,18 @@
"webpack": "^4.20.2"
},
"dependencies": {
- "@0x/assert": "^1.0.21",
- "@0x/base-contract": "^3.0.11",
- "@0x/contract-wrappers": "^4.2.0",
- "@0x/order-utils": "^3.1.0",
- "@0x/order-watcher": "^2.4.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/assert": "^1.0.22",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/contract-wrappers": "^4.2.1",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/order-watcher": "^2.4.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/web3-provider-engine": "^14.0.0",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5",
"web3-provider-engine": "14.0.6"
diff --git a/packages/abi-gen-templates/README.md b/packages/abi-gen-templates/README.md
index c6cc3b1b3..06c2e19cd 100644
--- a/packages/abi-gen-templates/README.md
+++ b/packages/abi-gen-templates/README.md
@@ -2,9 +2,9 @@ These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo
To successfully compile the generated TypeScript contract wrappers, you must:
-* Install the packages on which the main contract template directly depends: `yarn add @0x/base-contract @0x/sol-compiler @0x/utils @0x/web3-wrapper ethereum-types ethers lodash`
-* Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
-* Ensure that your TypeScript configuration includes the following:
+- Install the packages on which the main contract template directly depends: `yarn add @0x/base-contract @0x/sol-compiler @0x/utils @0x/web3-wrapper ethereum-types ethers lodash`
+- Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
+- Ensure that your TypeScript configuration includes the following:
```
"compilerOptions": {
diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json
index 404ba0f1b..028415b9c 100644
--- a/packages/abi-gen-wrappers/CHANGELOG.json
+++ b/packages/abi-gen-wrappers/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "2.1.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "2.1.0",
"changes": [
{
@@ -41,8 +50,7 @@
"version": "1.1.0",
"changes": [
{
- "note":
- "`deployFrom0xArtifactAsync` additionally accepts artifacts that conform to the `SimpleContractArtifact` interface",
+ "note": "`deployFrom0xArtifactAsync` additionally accepts artifacts that conform to the `SimpleContractArtifact` interface",
"pr": 1298
}
],
diff --git a/packages/abi-gen-wrappers/CHANGELOG.md b/packages/abi-gen-wrappers/CHANGELOG.md
index 4090e045a..7c5a00a74 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
+## v2.1.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v2.1.0 - _January 9, 2019_
* Added Dutch Auction Wrapper (#1465)
diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json
index f7d40d591..c97810548 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": "2.1.0",
+ "version": "2.1.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": "^1.0.20",
+ "@0x/abi-gen": "^1.0.21",
"@0x/abi-gen-templates": "^1.0.1",
- "@0x/tslint-config": "^2.0.0",
- "@0x/types": "^1.5.0",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/tslint-config": "^2.0.1",
+ "@0x/types": "^1.5.1",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5",
"shx": "^0.2.2"
},
"dependencies": {
- "@0x/base-contract": "^3.0.11"
+ "@0x/base-contract": "^3.0.12"
},
"publishConfig": {
"access": "public"
diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json
index 19cceb509..e32b91444 100644
--- a/packages/abi-gen/CHANGELOG.json
+++ b/packages/abi-gen/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.21",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.20",
"changes": [
@@ -312,13 +321,11 @@
"version": "0.2.4",
"changes": [
{
- "note":
- "Add a `backend` parameter that allows you to specify the Ethereum library you use in your templates (`web3` or `ethers`). Ethers auto-converts small ints to numbers whereas Web3 doesn't. Defaults to `web3`",
+ "note": "Add a `backend` parameter that allows you to specify the Ethereum library you use in your templates (`web3` or `ethers`). Ethers auto-converts small ints to numbers whereas Web3 doesn't. Defaults to `web3`",
"pr": 413
},
{
- "note":
- "Add support for [tuple types](https://solidity.readthedocs.io/en/develop/abi-spec.html#handling-tuple-types)",
+ "note": "Add support for [tuple types](https://solidity.readthedocs.io/en/develop/abi-spec.html#handling-tuple-types)",
"pr": 413
},
{
@@ -346,8 +353,7 @@
"pr": 346
},
{
- "note":
- "Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts",
+ "note": "Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts",
"pr": 388
}
],
diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
index 26d42cd36..4ff16b803 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
+## v1.0.21 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.20 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 4a2754233..5db5fd763 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen",
- "version": "1.0.20",
+ "version": "1.0.21",
"engines": {
"node": ">=6.12"
},
@@ -31,10 +31,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
"dependencies": {
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
"chalk": "^2.3.0",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"lodash": "^4.17.5",
@@ -45,7 +45,7 @@
"yargs": "^10.0.3"
},
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/glob": "5.0.35",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json
index 275ec2e4e..3f031df4b 100644
--- a/packages/assert/CHANGELOG.json
+++ b/packages/assert/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.22",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.21",
"changes": [
@@ -193,8 +202,7 @@
"version": "1.0.0",
"changes": [
{
- "note":
- "Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values",
+ "note": "Fix bug in string enum assertion. We erroneously were checking against the enum keys, not values",
"pr": 821
}
]
@@ -339,8 +347,7 @@
"note": "Re-publish Assert previously published under NPM package @0xproject/0x-assert"
},
{
- "note":
- "Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals."
+ "note": "Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals."
}
],
"timestamp": 1510585200
diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md
index 25383b2d1..5c07ad07c 100644
--- a/packages/assert/CHANGELOG.md
+++ b/packages/assert/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.22 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.21 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/assert/package.json b/packages/assert/package.json
index e11ccb3cb..5c88da079 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/assert",
- "version": "1.0.21",
+ "version": "1.0.22",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@@ -44,9 +44,9 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/json-schemas": "^2.1.5",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
"lodash": "^4.17.5",
"valid-url": "^1.0.9"
},
diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json
index a7f8d3418..1548a43f7 100644
--- a/packages/asset-buyer/CHANGELOG.json
+++ b/packages/asset-buyer/CHANGELOG.json
@@ -6,7 +6,8 @@
"note": "Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute",
"pr": 1437
}
- ]
+ ],
+ "timestamp": 1547225310
},
{
"timestamp": 1547040760,
@@ -90,8 +91,7 @@
"pr": 1187
},
{
- "note":
- "the `OrderProvider` now requires a new method `getAvailableMakerAssetDatasAsync` and the `StandardRelayerAPIOrderProvider` requires the network id at init.",
+ "note": "the `OrderProvider` now requires a new method `getAvailableMakerAssetDatasAsync` and the `StandardRelayerAPIOrderProvider` requires the network id at init.",
"pr": 1203
},
{
@@ -99,13 +99,11 @@
"pr": 1197
},
{
- "note":
- "Fix bug where `BuyQuoteInfo` objects could return `totalEthAmount` and `feeEthAmount` that were not whole numbers",
+ "note": "Fix bug where `BuyQuoteInfo` objects could return `totalEthAmount` and `feeEthAmount` that were not whole numbers",
"pr": 1207
},
{
- "note":
- "Fix bug where default values for `AssetBuyer` public facing methods could get overriden by `undefined` values",
+ "note": "Fix bug where default values for `AssetBuyer` public facing methods could get overriden by `undefined` values",
"pr": 1207
},
{
@@ -126,8 +124,7 @@
"pr": 1131
},
{
- "note":
- "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers",
+ "note": "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers",
"pr": 1105
},
{
diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md
index 70bbe8302..13d52571b 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
+## v4.0.0 - _January 11, 2019_
+
+ * Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute (#1437)
+
## v3.0.5 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json
index dd6780e48..3e1c26814 100644
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-buyer/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/asset-buyer",
- "version": "3.0.5",
+ "version": "4.0.0",
"engines": {
"node": ">=6.12"
},
@@ -36,21 +36,21 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
"dependencies": {
- "@0x/assert": "^1.0.21",
- "@0x/connect": "^3.0.11",
- "@0x/contract-wrappers": "^4.2.0",
- "@0x/json-schemas": "^2.1.5",
- "@0x/order-utils": "^3.1.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/assert": "^1.0.22",
+ "@0x/connect": "^3.0.12",
+ "@0x/contract-wrappers": "^4.2.1",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"lodash": "^4.17.5"
},
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "^4.14.116",
"@types/mocha": "^2.2.42",
"@types/node": "*",
diff --git a/packages/asset-buyer/src/utils/order_provider_response_processor.ts b/packages/asset-buyer/src/utils/order_provider_response_processor.ts
index 25e85b2cc..4244d196c 100644
--- a/packages/asset-buyer/src/utils/order_provider_response_processor.ts
+++ b/packages/asset-buyer/src/utils/order_provider_response_processor.ts
@@ -105,7 +105,7 @@ function getValidOrdersWithRemainingFillableMakerAssetAmountsFromOnChain(
// get corresponding on-chain state for the order
const { orderInfo, traderInfo } = ordersAndTradersInfo[index];
// if the order IS NOT fillable, do not add anything to the accumulations and continue iterating
- if (orderInfo.orderStatus !== OrderStatus.FILLABLE) {
+ if (orderInfo.orderStatus !== OrderStatus.Fillable) {
return accOrders;
}
// if the order IS fillable, add the order and calculate the remaining fillable amount
diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
index 1a6e3f845..6c8f3b069 100644
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "3.0.12",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "3.0.11",
"changes": [
@@ -243,8 +252,7 @@
"version": "0.3.4",
"changes": [
{
- "note":
- "Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201"
+ "note": "Update EthersJs to fix the `value.toLowerCase()` is not a function bug caused by `ethers.js` breaking patch version https://github.com/ethers-io/ethers.js/issues/201"
}
],
"timestamp": 1529397769
diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md
index 7a1a96639..d99ea0c6e 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
+## v3.0.12 - _January 11, 2019_
+
+ * Dependencies updated
+
## v3.0.11 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index 7193c4881..027340508 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/base-contract",
- "version": "3.0.11",
+ "version": "3.0.12",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"make-promises-safe": "^1.1.0",
@@ -40,10 +40,10 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5"
},
diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json
index fe32990e2..90aa82819 100644
--- a/packages/connect/CHANGELOG.json
+++ b/packages/connect/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "3.0.12",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "3.0.11",
"changes": [
@@ -228,8 +237,7 @@
"version": "1.0.0",
"changes": [
{
- "note":
- "Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`"
+ "note": "Remove `WebSocketOrderbookChannel` from the public interface and replace with `orderbookChannelFactory`"
}
]
},
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index d01caa613..137af451b 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v3.0.12 - _January 11, 2019_
+
+ * Dependencies updated
+
## v3.0.11 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/connect/README.md b/packages/connect/README.md
index 6d3ee66a0..386b7bbbf 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -18,8 +18,8 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
## Usage
-* [Docs](https://0xproject.com/docs/connect)
-* [Tutorials](https://0xproject.com/wiki#connect)
+- [Docs](https://0xproject.com/docs/connect)
+- [Tutorials](https://0xproject.com/wiki#connect)
## Contributing
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 76817f23e..f03115c16 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/connect",
- "version": "3.0.11",
+ "version": "3.0.12",
"engines": {
"node": ">=6.12"
},
@@ -44,12 +44,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
"dependencies": {
- "@0x/assert": "^1.0.21",
- "@0x/json-schemas": "^2.1.5",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
+ "@0x/assert": "^1.0.22",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
"lodash": "^4.17.5",
"query-string": "^5.0.1",
"sinon": "^4.0.0",
@@ -57,7 +57,7 @@
"websocket": "^1.0.25"
},
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/fetch-mock": "^6.0.3",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
index fd8dfa427..9a225726a 100644
--- a/packages/contract-wrappers/CHANGELOG.json
+++ b/packages/contract-wrappers/CHANGELOG.json
@@ -1,5 +1,23 @@
[
{
+ "version": "5.0.0",
+ "changes": [
+ {
+ "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule",
+ "pr": 1474
+ }
+ ]
+ },
+ {
+ "timestamp": 1547225310,
+ "version": "4.2.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "4.2.0",
"changes": [
{
@@ -52,8 +70,7 @@
"version": "4.1.0",
"changes": [
{
- "note":
- "Add a `nonce` field for `TxOpts` so that it's now possible to re-broadcast stuck transactions with a higher gas amount",
+ "note": "Add a `nonce` field for `TxOpts` so that it's now possible to re-broadcast stuck transactions with a higher gas amount",
"pr": 1292
}
],
@@ -81,18 +98,15 @@
"version": "4.0.0",
"changes": [
{
- "note":
- "Add signature validation, regular cancellation and `cancelledUpTo` checks to `validateOrderFillableOrThrowAsync`",
+ "note": "Add signature validation, regular cancellation and `cancelledUpTo` checks to `validateOrderFillableOrThrowAsync`",
"pr": 1235
},
{
- "note":
- "Improved the errors thrown by `validateOrderFillableOrThrowAsync` by making them more descriptive",
+ "note": "Improved the errors thrown by `validateOrderFillableOrThrowAsync` by making them more descriptive",
"pr": 1235
},
{
- "note":
- "Throw previously swallowed network errors when calling `validateOrderFillableOrThrowAsync` (see issue: #1218)",
+ "note": "Throw previously swallowed network errors when calling `validateOrderFillableOrThrowAsync` (see issue: #1218)",
"pr": 1235
}
],
@@ -123,28 +137,23 @@
"pr": 1105
},
{
- "note":
- "Default contract addresses are no longer stored in artifacts and are instead loaded from the `@0xproject/contract-addresses` package.",
+ "note": "Default contract addresses are no longer stored in artifacts and are instead loaded from the `@0xproject/contract-addresses` package.",
"pr": 1105
},
{
- "note":
- "Most contract addresses are now defined at instantiation time and are available as properties (e.g., `exchangeWrapper.address`) instead of methods (e.g., `exchangeWrapper.getContractAddress()`).",
+ "note": "Most contract addresses are now defined at instantiation time and are available as properties (e.g., `exchangeWrapper.address`) instead of methods (e.g., `exchangeWrapper.getContractAddress()`).",
"pr": 1105
},
{
- "note":
- "Removed `setProvider` method in top-level `ContractWrapper` class and added new `unsubscribeAll` method.",
+ "note": "Removed `setProvider` method in top-level `ContractWrapper` class and added new `unsubscribeAll` method.",
"pr": 1105
},
{
- "note":
- "Some properties and methods have been renamed. For example, some methods that previously could throw no longer can, and so their names have been updated accordingly.",
+ "note": "Some properties and methods have been renamed. For example, some methods that previously could throw no longer can, and so their names have been updated accordingly.",
"pr": 1105
},
{
- "note":
- "Removed ContractNotFound errors. Checking for this error was somewhat ineffecient. Relevant methods/functions now return the default error from web3-wrapper, which we feel provides enough information.",
+ "note": "Removed ContractNotFound errors. Checking for this error was somewhat ineffecient. Relevant methods/functions now return the default error from web3-wrapper, which we feel provides enough information.",
"pr": 1105
},
{
@@ -180,13 +189,11 @@
"version": "2.0.0",
"changes": [
{
- "note":
- "Fixes dropped events in subscriptions by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
+ "note": "Fixes dropped events in subscriptions by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
"pr": 1080
},
{
- "note":
- "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
+ "note": "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
"pr": 1080
}
],
@@ -235,18 +242,15 @@
"note": "Add `OrderValidatorWrapper`"
},
{
- "note":
- "Fix bug where contracts not deployed on a network showed an `EXCHANGE_CONTRACT_DOES_NOT_EXIST` error instead of `CONTRACT_NOT_DEPLOYED_ON_NETWORK`",
+ "note": "Fix bug where contracts not deployed on a network showed an `EXCHANGE_CONTRACT_DOES_NOT_EXIST` error instead of `CONTRACT_NOT_DEPLOYED_ON_NETWORK`",
"pr": 1044
},
{
- "note":
- "Export `AssetBalanceAndProxyAllowanceFetcher` and `OrderFilledCancelledFetcher` implementations",
+ "note": "Export `AssetBalanceAndProxyAllowanceFetcher` and `OrderFilledCancelledFetcher` implementations",
"pr": 1054
},
{
- "note":
- "Add `validateOrderFillableOrThrowAsync` and `validateFillOrderThrowIfInvalidAsync` to ExchangeWrapper",
+ "note": "Add `validateOrderFillableOrThrowAsync` and `validateFillOrderThrowIfInvalidAsync` to ExchangeWrapper",
"pr": 1054
}
],
@@ -265,13 +269,11 @@
"version": "1.0.1-rc.4",
"changes": [
{
- "note":
- "Export missing types: `TransactionEncoder`, `ContractAbi`, `JSONRPCRequestPayload`, `JSONRPCResponsePayload`, `JSONRPCErrorCallback`, `AbiDefinition`, `FunctionAbi`, `EventAbi`, `EventParameter`, `DecodedLogArgs`, `MethodAbi`, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability`, `StateMutability` & `ExchangeSignatureValidatorApprovalEventArgs`",
+ "note": "Export missing types: `TransactionEncoder`, `ContractAbi`, `JSONRPCRequestPayload`, `JSONRPCResponsePayload`, `JSONRPCErrorCallback`, `AbiDefinition`, `FunctionAbi`, `EventAbi`, `EventParameter`, `DecodedLogArgs`, `MethodAbi`, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability`, `StateMutability` & `ExchangeSignatureValidatorApprovalEventArgs`",
"pr": 924
},
{
- "note":
- "Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`, `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs`",
+ "note": "Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`, `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs`",
"pr": 924
},
{
diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md
index fe7bb7b81..d43345049 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
+## v4.2.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v4.2.0 - _January 9, 2019_
* Added Dutch Auction wrapper (#1465)
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 708b4249a..6c1a8836a 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
- "version": "4.2.0",
+ "version": "4.2.1",
"description": "Smart TS wrappers for 0x smart contracts",
"keywords": [
"0xproject",
@@ -37,10 +37,10 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/migrations": "^2.3.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/migrations": "^2.3.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@@ -65,19 +65,19 @@
"web3-provider-engine": "14.0.6"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
- "@0x/assert": "^1.0.21",
+ "@0x/abi-gen-wrappers": "^2.1.1",
+ "@0x/assert": "^1.0.22",
"@0x/contract-addresses": "^2.1.0",
"@0x/contract-artifacts": "^1.2.0",
- "@0x/contracts-test-utils": "^1.0.3",
- "@0x/fill-scenarios": "^1.1.0",
- "@0x/json-schemas": "^2.1.5",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/contracts-test-utils": "^1.0.4",
+ "@0x/fill-scenarios": "^1.1.1",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"ethereumjs-abi": "0.6.5",
"ethereumjs-blockstream": "6.0.0",
"ethereumjs-util": "^5.1.1",
diff --git a/packages/contract-wrappers/src/types.ts b/packages/contract-wrappers/src/types.ts
index 945ca88cd..29cf8b2c4 100644
--- a/packages/contract-wrappers/src/types.ts
+++ b/packages/contract-wrappers/src/types.ts
@@ -177,13 +177,13 @@ export interface OrderInfo {
}
export enum OrderStatus {
- INVALID = 0,
- INVALID_MAKER_ASSET_AMOUNT,
- INVALID_TAKER_ASSET_AMOUNT,
- FILLABLE,
- EXPIRED,
- FULLY_FILLED,
- CANCELLED,
+ Invalid = 0,
+ InvalidMakerAssetAmount,
+ InvalidTakerAssetAmount,
+ Fillable,
+ Expired,
+ FullyFilled,
+ Cancelled,
}
export interface TraderInfo {
diff --git a/packages/contract-wrappers/src/utils/assert.ts b/packages/contract-wrappers/src/utils/assert.ts
index 3f02ed052..d30c6b29c 100644
--- a/packages/contract-wrappers/src/utils/assert.ts
+++ b/packages/contract-wrappers/src/utils/assert.ts
@@ -70,7 +70,7 @@ export const assert = {
/*
* Asserts that all the orders have the same value for the provided propertyName
* If the value parameter is provided, this asserts that all orders have the prope
- */
+ */
ordersHaveAtMostOneUniqueValueForProperty(orders: Order[], propertyName: string, value?: any): void {
const allValues = _.map(orders, order => _.get(order, propertyName));
sharedAssert.hasAtMostOneUniqueValue(
diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts
index 73ce6c743..a1d60dc6e 100644
--- a/packages/contract-wrappers/test/exchange_wrapper_test.ts
+++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts
@@ -109,7 +109,7 @@ describe('ExchangeWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
});
});
describe('#fillOrKillOrderAsync', () => {
@@ -157,7 +157,7 @@ describe('ExchangeWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
});
});
describe('#marketSellOrdersAsync', () => {
@@ -183,7 +183,7 @@ describe('ExchangeWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
const orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
});
});
describe('#batchFillOrdersNoThrowAsync', () => {
@@ -197,9 +197,9 @@ describe('ExchangeWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
let orderInfo = await contractWrappers.exchange.getOrderInfoAsync(signedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
orderInfo = await contractWrappers.exchange.getOrderInfoAsync(anotherSignedOrder);
- expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FullyFilled);
});
});
describe('#batchFillOrKillOrdersAsync', () => {
diff --git a/packages/contract-wrappers/test/forwarder_wrapper_test.ts b/packages/contract-wrappers/test/forwarder_wrapper_test.ts
index ff4ff8b67..0d197eced 100644
--- a/packages/contract-wrappers/test/forwarder_wrapper_test.ts
+++ b/packages/contract-wrappers/test/forwarder_wrapper_test.ts
@@ -97,8 +97,8 @@ describe('ForwarderWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
const ordersInfo = await contractWrappers.exchange.getOrdersInfoAsync([signedOrder, anotherSignedOrder]);
- expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
- expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
+ expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FullyFilled);
+ expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FullyFilled);
});
it('should throw when invalid transaction and shouldValidate is true', async () => {
const signedOrders = [signedOrder];
@@ -131,8 +131,8 @@ describe('ForwarderWrapper', () => {
);
await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
const ordersInfo = await contractWrappers.exchange.getOrdersInfoAsync([signedOrder, anotherSignedOrder]);
- expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FULLY_FILLED);
- expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(ordersInfo[0].orderStatus).to.be.equal(OrderStatus.FullyFilled);
+ expect(ordersInfo[1].orderStatus).to.be.equal(OrderStatus.Fillable);
expect(ordersInfo[1].orderTakerAssetFilledAmount).to.be.bignumber.equal(new BigNumber(4)); // only 95% of ETH is sold
});
it('should throw when invalid transaction and shouldValidate is true', async () => {
diff --git a/packages/contract-wrappers/test/order_validator_wrapper_test.ts b/packages/contract-wrappers/test/order_validator_wrapper_test.ts
index da3f99e72..c61c05d31 100644
--- a/packages/contract-wrappers/test/order_validator_wrapper_test.ts
+++ b/packages/contract-wrappers/test/order_validator_wrapper_test.ts
@@ -117,9 +117,9 @@ describe('OrderValidator', () => {
it('should return correct on-chain order info for input orders', async () => {
const firstOrderInfo = ordersInfo[0];
const secondOrderInfo = ordersInfo[1];
- expect(firstOrderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(firstOrderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(firstOrderInfo.orderTakerAssetFilledAmount).to.bignumber.equal(constants.ZERO_AMOUNT);
- expect(secondOrderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+ expect(secondOrderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
expect(secondOrderInfo.orderTakerAssetFilledAmount).to.bignumber.equal(constants.ZERO_AMOUNT);
});
it('should return correct on-chain trader info for input takers', async () => {
diff --git a/packages/dev-tools-pages/README.md b/packages/dev-tools-pages/README.md
index cbc459be7..47d7e5865 100644
--- a/packages/dev-tools-pages/README.md
+++ b/packages/dev-tools-pages/README.md
@@ -73,13 +73,13 @@ yarn prettier
##### Toolkit
-* [Styled Components](https://www.styled-components.com/)
-* [BassCSS](http://basscss.com/)
+- [Styled Components](https://www.styled-components.com/)
+- [BassCSS](http://basscss.com/)
##### Recommended Atom packages:
-* [atom-typescript](https://atom.io/packages/atom-typescript)
-* [linter-tslint](https://atom.io/packages/linter-tslint)
+- [atom-typescript](https://atom.io/packages/atom-typescript)
+- [linter-tslint](https://atom.io/packages/linter-tslint)
## Contributing
diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json
index db927849e..bde64d165 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.11",
+ "version": "0.0.12",
"engines": {
"node": ">=6.12"
},
@@ -16,7 +16,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "@0x/react-shared": "^1.1.0",
+ "@0x/react-shared": "^1.1.1",
"basscss": "^8.0.3",
"bowser": "^1.9.3",
"highlight.js": "^9.13.1",
@@ -71,6 +71,6 @@
"puppeteerArgs": [
"--no-sandbox",
"--disable-setuid-sandbox"
- ]
+ ]
}
}
diff --git a/packages/dev-tools-pages/ts/components/animations/index.tsx b/packages/dev-tools-pages/ts/components/animations/index.tsx
index 8e5421f5c..106acf707 100644
--- a/packages/dev-tools-pages/ts/components/animations/index.tsx
+++ b/packages/dev-tools-pages/ts/components/animations/index.tsx
@@ -69,10 +69,7 @@ class BaseAnimation extends React.PureComponent<AnimationProps, AnimationState>
}
}
-const Container =
- styled.div <
- AnimationProps >
- `
+const Container = styled.div<AnimationProps>`
width: 100%;
height: ${props => props.height}px;
position: absolute;
diff --git a/packages/dev-tools-pages/ts/components/button.tsx b/packages/dev-tools-pages/ts/components/button.tsx
index d3b36ebfd..ae032eb05 100644
--- a/packages/dev-tools-pages/ts/components/button.tsx
+++ b/packages/dev-tools-pages/ts/components/button.tsx
@@ -6,40 +6,37 @@ interface ButtonProps {
large?: boolean;
}
-const Button =
- styled.button <
- ButtonProps >
- `
- font-family: inherit;
- line-height: 1;
- font-weight: 500;
- white-space: nowrap;
- vertical-align: middle;
- background-color: ${props => props.theme.colors.secondary};
- color: ${colors.black};
- border: 0;
- border-radius: 5rem;
- display: inline-flex;
- justify-content: space-between;
- align-items: center;
-
- ${props =>
- props.large
- ? `
+const Button = styled.button<ButtonProps>`
+ font-family: inherit;
+ line-height: 1;
+ font-weight: 500;
+ white-space: nowrap;
+ vertical-align: middle;
+ background-color: ${props => props.theme.colors.secondary};
+ color: ${colors.black};
+ border: 0;
+ border-radius: 5rem;
+ display: inline-flex;
+ justify-content: space-between;
+ align-items: center;
+
+ ${props =>
+ props.large
+ ? `
font-size: 1rem;
padding: 1.1875rem 2.375rem 1.0625rem;
`
- : `
+ : `
font-size: .875rem;
padding: .5625rem 1.25rem;
`}
- :hover, :focus {
- background-color: ${props => props.theme.colors.secondary_alt};
- outline: 0;
- }
+ :hover, :focus {
+ background-color: ${props => props.theme.colors.secondary_alt};
+ outline: 0;
+ }
- ${media.small`
+ ${media.small`
font-size: .875rem;
padding: .5625rem 1.25rem;
`}
diff --git a/packages/dev-tools-pages/ts/components/code.tsx b/packages/dev-tools-pages/ts/components/code.tsx
index 71d7a7752..c4f9cee24 100644
--- a/packages/dev-tools-pages/ts/components/code.tsx
+++ b/packages/dev-tools-pages/ts/components/code.tsx
@@ -45,11 +45,8 @@ const Container = styled.div`
}
`;
-const Base =
- styled.div <
- CodeProps >
- `
- font-size: .875rem;
+const Base = styled.div<CodeProps>`
+ font-size: 0.875rem;
color: ${props => (_.isUndefined(props.language) ? colors.white : 'inherit')};
background-color: ${props =>
props.isLight ? 'rgba(255,255,255,.15)' : _.isUndefined(props.language) ? colors.black : '#F1F4F5'};
@@ -110,10 +107,7 @@ const StyledCodeDiff = styled(CodeDiff)`
}
`;
-const StyledPre =
- styled.pre <
- CodeProps >
- `
+const StyledPre = styled.pre<CodeProps>`
margin: 0;
${props =>
!props.isDiff
diff --git a/packages/dev-tools-pages/ts/components/container.tsx b/packages/dev-tools-pages/ts/components/container.tsx
index 1b9212ed2..192d82af8 100644
--- a/packages/dev-tools-pages/ts/components/container.tsx
+++ b/packages/dev-tools-pages/ts/components/container.tsx
@@ -4,10 +4,7 @@ interface ContainerProps {
wide?: boolean;
}
-const Container =
- styled.div <
- ContainerProps >
- `
+const Container = styled.div<ContainerProps>`
max-width: 77.5rem;
margin: 0 auto;
width: ${props => (props.wide ? '100%' : 'calc(100% - 5rem)')};
diff --git a/packages/dev-tools-pages/ts/components/content.tsx b/packages/dev-tools-pages/ts/components/content.tsx
index f74e09af7..b3c353f8a 100644
--- a/packages/dev-tools-pages/ts/components/content.tsx
+++ b/packages/dev-tools-pages/ts/components/content.tsx
@@ -3,10 +3,7 @@ import styled from 'styled-components';
import { Container } from './container';
-const StyledMain =
- styled.div <
- MainProps >
- `
+const StyledMain = styled.div<MainProps>`
padding-top: 6.25rem;
padding-bottom: 6.25rem;
${props =>
diff --git a/packages/dev-tools-pages/ts/components/tabs.tsx b/packages/dev-tools-pages/ts/components/tabs.tsx
index 1d26f2777..fa2145208 100644
--- a/packages/dev-tools-pages/ts/components/tabs.tsx
+++ b/packages/dev-tools-pages/ts/components/tabs.tsx
@@ -48,7 +48,9 @@ const Tabs: React.StatelessComponent<{}> = props => (
})}
</StyledTabList>
- {React.Children.map(props.children, child => <TabPanel>{child}</TabPanel>)}
+ {React.Children.map(props.children, child => (
+ <TabPanel>{child}</TabPanel>
+ ))}
</ReactTabs>
</Breakout>
);
diff --git a/packages/dev-tools-pages/ts/components/trace.tsx b/packages/dev-tools-pages/ts/components/trace.tsx
index 108154648..f41dac9b7 100644
--- a/packages/dev-tools-pages/ts/components/trace.tsx
+++ b/packages/dev-tools-pages/ts/components/trace.tsx
@@ -108,10 +108,7 @@ interface TraceProps {
background?: string;
}
-const StyledSection =
- styled.section <
- TraceProps >
- `
+const StyledSection = styled.section<TraceProps>`
max-width: 90rem;
margin: 0 auto;
background: linear-gradient(to right, ${colors.black} 50%, ${props => props.background} 50%);
@@ -138,10 +135,7 @@ const Wrapper = styled(Container)`
`};
`;
-const Block =
- styled.div <
- TraceProps >
- `
+const Block = styled.div<TraceProps>`
width: 50%;
background: ${props => (props.background ? props.background : colors.black)};
color: ${props => (props.background ? 'inherit' : colors.white)};
@@ -200,10 +194,7 @@ const Item = styled.li`
}
`;
-const Copy =
- styled.div <
- { dark: boolean } >
- `
+const Copy = styled.div<{ dark: boolean }>`
margin-right: 5.875rem;
${props =>
props.dark &&
diff --git a/packages/dev-tools-pages/ts/globalStyles.tsx b/packages/dev-tools-pages/ts/globalStyles.tsx
index a77fb4eef..507497dd4 100644
--- a/packages/dev-tools-pages/ts/globalStyles.tsx
+++ b/packages/dev-tools-pages/ts/globalStyles.tsx
@@ -5,10 +5,7 @@ import styledNormalize from 'styled-normalize';
import { ContextInterface } from 'ts/context';
import { media } from 'ts/variables';
-const GlobalStyles =
- createGlobalStyle <
- ContextInterface >
- `
+const GlobalStyles = createGlobalStyle<ContextInterface>`
${styledNormalize}
${hljsStyles}
diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json
index 8f355466c..41a69508a 100644
--- a/packages/dev-utils/CHANGELOG.json
+++ b/packages/dev-utils/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.23",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.22",
"changes": [
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 04ee860b5..caabc2261 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
+## v1.0.23 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.22 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index cb27ad5c5..91698c81e 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/dev-utils",
- "version": "1.0.22",
+ "version": "1.0.23",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"make-promises-safe": "^1.1.0",
@@ -41,14 +41,14 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/subproviders": "^2.1.9",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/web3-provider-engine": "^14.0.0",
"chai": "^4.0.1",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/devnet/genesis.json b/packages/devnet/genesis.json
index ddabe8d79..03dc5d623 100644
--- a/packages/devnet/genesis.json
+++ b/packages/devnet/genesis.json
@@ -14,8 +14,7 @@
},
"nonce": "0x0",
"timestamp": "0x5af1ffac",
- "extraData":
- "0x0000000000000000000000000000000000000000000000000000000000000000e8816898d851d5b61b7f950627d04d794c07ca370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000e8816898d851d5b61b7f950627d04d794c07ca370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"gasLimit": "0x4c4b400000",
"difficulty": "0x1",
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json
index 9a0f2ad49..878a1f5ea 100644
--- a/packages/ethereum-types/CHANGELOG.json
+++ b/packages/ethereum-types/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.1.5",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.1.4",
"changes": [
{
diff --git a/packages/ethereum-types/CHANGELOG.md b/packages/ethereum-types/CHANGELOG.md
index 1d27757f3..9db9998ee 100644
--- a/packages/ethereum-types/CHANGELOG.md
+++ b/packages/ethereum-types/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.1.5 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.1.4 - _December 13, 2018_
* Dependencies updated
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index 69ae64c2b..384f7b5b3 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -1,6 +1,6 @@
{
"name": "ethereum-types",
- "version": "1.1.4",
+ "version": "1.1.5",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"tslint": "5.11.0",
diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json
index 125a62cdf..a47b039b7 100644
--- a/packages/fill-scenarios/CHANGELOG.json
+++ b/packages/fill-scenarios/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.1.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.1.0",
"changes": [
{
@@ -176,8 +185,7 @@
"version": "1.0.1-rc.3",
"changes": [
{
- "note":
- "Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface",
+ "note": "Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface",
"pr": 936
},
{
diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md
index 45cee1ce3..44a87270c 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
+## v1.1.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.1.0 - _January 9, 2019_
* Add support for MultiAssetProxy (#1363)
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index a38dcc1c3..deca2418a 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/fill-scenarios",
- "version": "1.1.0",
+ "version": "1.1.1",
"description": "0x order fill scenario generator",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/lodash": "4.14.104",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -28,15 +28,15 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
- "@0x/base-contract": "^3.0.11",
+ "@0x/abi-gen-wrappers": "^2.1.1",
+ "@0x/base-contract": "^3.0.12",
"@0x/contract-artifacts": "^1.2.0",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
- "ethereum-types": "^1.1.4",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5"
},
diff --git a/packages/instant/CHANGELOG.json b/packages/instant/CHANGELOG.json
index db187140f..537670584 100644
--- a/packages/instant/CHANGELOG.json
+++ b/packages/instant/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "2.0.0",
+ "changes": [
+ {
+ "note": "Renamed ActionTypes enum members to PascalCase to conform with tslint enum-naming rule",
+ "pr": 1474
+ }
+ ]
+ },
+ {
"timestamp": 1542821676,
"version": "1.0.1",
"changes": [
diff --git a/packages/instant/README.md b/packages/instant/README.md
index 32abf76e0..8832e562d 100644
--- a/packages/instant/README.md
+++ b/packages/instant/README.md
@@ -17,9 +17,12 @@ The package is available as a UMD module named `zeroExInstant` at https://instan
<body>
<div id="zeroExInstantContainer"></div>
<script>
- zeroExInstant.render({
- // Initialization options
- }, '#zeroExInstantContainer');
+ zeroExInstant.render(
+ {
+ // Initialization options
+ },
+ '#zeroExInstantContainer',
+ );
</script>
</body>
```
diff --git a/packages/instant/package.json b/packages/instant/package.json
index 0888fc6a6..0012b5b9a 100644
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/instant",
- "version": "1.0.5",
+ "version": "1.0.6",
"engines": {
"node": ">=6.12"
},
@@ -41,18 +41,18 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
"dependencies": {
- "@0x/assert": "^1.0.21",
- "@0x/asset-buyer": "^3.0.5",
- "@0x/json-schemas": "^2.1.5",
- "@0x/order-utils": "^3.1.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/assert": "^1.0.22",
+ "@0x/asset-buyer": "^4.0.0",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"bowser": "^1.9.4",
"copy-to-clipboard": "^3.0.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"lodash": "^4.17.5",
"polished": "^2.2.0",
"react": "^16.5.2",
@@ -65,7 +65,7 @@
"ts-optchain": "^0.1.1"
},
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@static/discharge": "https://github.com/0xProject/discharge.git",
"@types/enzyme": "^3.1.14",
"@types/enzyme-adapter-react-16": "^1.0.3",
diff --git a/packages/instant/src/components/animations/full_rotation.tsx b/packages/instant/src/components/animations/full_rotation.tsx
index 9adb565f9..1dff1b1fc 100644
--- a/packages/instant/src/components/animations/full_rotation.tsx
+++ b/packages/instant/src/components/animations/full_rotation.tsx
@@ -14,10 +14,7 @@ to {
}
`;
-export const FullRotation =
- styled.div <
- FullRotationProps >
- `
+export const FullRotation = styled.div<FullRotationProps>`
animation: ${rotatingKeyframes} 2s linear infinite;
height: ${props => props.height};
width: ${props => props.width};
diff --git a/packages/instant/src/components/animations/position_animation.tsx b/packages/instant/src/components/animations/position_animation.tsx
index 8b3b294b7..4f8f25679 100644
--- a/packages/instant/src/components/animations/position_animation.tsx
+++ b/packages/instant/src/components/animations/position_animation.tsx
@@ -95,10 +95,7 @@ const animationForSize = (
return animationSettingsForSize && mediaFn`${generatePositionAnimationCss(animationSettingsForSize)}`;
};
-export const PositionAnimation =
- styled.div <
- PositionAnimationProps >
- `
+export const PositionAnimation = styled.div<PositionAnimationProps>`
&& {
${props => props.zIndex && stylesForMedia<number>('z-index', props.zIndex)}
${props => defaultAnimation(props.positionSettings)}
diff --git a/packages/instant/src/components/css_reset.tsx b/packages/instant/src/components/css_reset.tsx
index 0bef85389..d1b20f4c9 100644
--- a/packages/instant/src/components/css_reset.tsx
+++ b/packages/instant/src/components/css_reset.tsx
@@ -4,9 +4,9 @@ import { createGlobalStyle } from '../style/theme';
export interface CSSResetProps {}
/*
-* Derived from
-* https://github.com/jtrost/Complete-CSS-Reset
-*/
+ * Derived from
+ * https://github.com/jtrost/Complete-CSS-Reset
+ */
export const CSSReset = createGlobalStyle`
.${INJECTED_DIV_CLASS} {
a, abbr, area, article, aside, audio, b, bdo, blockquote, body, button,
diff --git a/packages/instant/src/components/timed_progress_bar.tsx b/packages/instant/src/components/timed_progress_bar.tsx
index b1644b871..287269af7 100644
--- a/packages/instant/src/components/timed_progress_bar.tsx
+++ b/packages/instant/src/components/timed_progress_bar.tsx
@@ -68,10 +68,7 @@ interface ProgressProps {
animationSettings?: WidthAnimationSettings;
}
-export const Progress =
- styled.div <
- ProgressProps >
- `
+export const Progress = styled.div<ProgressProps>`
&& {
background-color: ${props => props.theme[ColorOption.primaryColor]};
border-radius: 6px;
diff --git a/packages/instant/src/components/ui/circle.tsx b/packages/instant/src/components/ui/circle.tsx
index 4f9f56f12..e4f2c5260 100644
--- a/packages/instant/src/components/ui/circle.tsx
+++ b/packages/instant/src/components/ui/circle.tsx
@@ -8,16 +8,15 @@ export interface CircleProps {
}
export const Circle = withTheme(
- styled.div <
- CircleProps >
- `
- && {
- width: ${props => props.diameter}px;
- height: ${props => props.diameter}px;
- background-color: ${props => (props.rawColor ? props.rawColor : props.theme[props.color || ColorOption.white])};
- border-radius: 50%;
- }
-`,
+ styled.div<CircleProps>`
+ && {
+ width: ${props => props.diameter}px;
+ height: ${props => props.diameter}px;
+ background-color: ${props =>
+ props.rawColor ? props.rawColor : props.theme[props.color || ColorOption.white]};
+ border-radius: 50%;
+ }
+ `,
);
Circle.displayName = 'Circle';
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 58d7d5871..59b733f3e 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -51,10 +51,7 @@ const getBackgroundColor = (theme: any, backgroundColor?: ColorOption, rawBackgr
return 'none';
};
-export const Container =
- styled.div <
- ContainerProps >
- `
+export const Container = styled.div<ContainerProps>`
&& {
box-sizing: border-box;
${props => cssRuleIfExists(props, 'flex-grow')}
diff --git a/packages/instant/src/components/ui/flex.tsx b/packages/instant/src/components/ui/flex.tsx
index 274c46b9e..145e654f1 100644
--- a/packages/instant/src/components/ui/flex.tsx
+++ b/packages/instant/src/components/ui/flex.tsx
@@ -14,10 +14,7 @@ export interface FlexProps {
flexGrow?: number | string;
}
-export const Flex =
- styled.div <
- FlexProps >
- `
+export const Flex = styled.div<FlexProps>`
&& {
display: ${props => (props.inline ? 'inline-flex' : 'flex')};
flex-direction: ${props => props.direction};
diff --git a/packages/instant/src/components/ui/input.tsx b/packages/instant/src/components/ui/input.tsx
index 53c43ea0b..024e81b15 100644
--- a/packages/instant/src/components/ui/input.tsx
+++ b/packages/instant/src/components/ui/input.tsx
@@ -14,10 +14,7 @@ export interface InputProps extends React.HTMLAttributes<HTMLInputElement> {
onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
}
-export const Input =
- styled.input <
- InputProps >
- `
+export const Input = styled.input<InputProps>`
&& {
all: initial;
font-size: ${props => props.fontSize};
@@ -32,10 +29,11 @@ export const Input =
color: ${props => props.theme[props.fontColor || 'white']} !important;
opacity: 0.5 !important;
}
- &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+ &::-webkit-outer-spin-button,
+ &::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
- }
+ }
}
`;
diff --git a/packages/instant/src/components/ui/overlay.tsx b/packages/instant/src/components/ui/overlay.tsx
index 0b5eaf299..0b1be6a65 100644
--- a/packages/instant/src/components/ui/overlay.tsx
+++ b/packages/instant/src/components/ui/overlay.tsx
@@ -12,10 +12,7 @@ export interface OverlayProps {
showMaxWidth?: ScreenWidths;
}
-export const Overlay =
- styled.div <
- OverlayProps >
- `
+export const Overlay = styled.div<OverlayProps>`
&& {
position: fixed;
top: 0;
diff --git a/packages/instant/src/components/ui/text.tsx b/packages/instant/src/components/ui/text.tsx
index 282477758..ca120f3bd 100644
--- a/packages/instant/src/components/ui/text.tsx
+++ b/packages/instant/src/components/ui/text.tsx
@@ -31,10 +31,7 @@ export const Text: React.StatelessComponent<TextProps> = ({ href, onClick, ...re
};
const opacityOnHoverAmount = 0.5;
-export const StyledText =
- styled.div <
- TextProps >
- `
+export const StyledText = styled.div<TextProps>`
&& {
font-family: 'Inter UI', sans-serif;
font-style: ${props => props.fontStyle};
diff --git a/packages/instant/src/containers/latest_error.tsx b/packages/instant/src/containers/latest_error.tsx
index 6da4558ef..57a2dbdc2 100644
--- a/packages/instant/src/containers/latest_error.tsx
+++ b/packages/instant/src/containers/latest_error.tsx
@@ -62,4 +62,7 @@ const mapDispatchToProps = (dispatch: Dispatch<Action>, _ownProps: LatestErrorPr
},
});
-export const LatestError = connect(mapStateToProps, mapDispatchToProps)(LatestErrorComponent);
+export const LatestError = connect(
+ mapStateToProps,
+ mapDispatchToProps,
+)(LatestErrorComponent);
diff --git a/packages/instant/src/redux/actions.ts b/packages/instant/src/redux/actions.ts
index 9d7a61fc7..ca0be543b 100644
--- a/packages/instant/src/redux/actions.ts
+++ b/packages/instant/src/redux/actions.ts
@@ -21,57 +21,56 @@ function createAction<T extends string, P>(type: T, data?: P): PlainAction<T> |
}
export enum ActionTypes {
- SET_ACCOUNT_STATE_LOADING = 'SET_ACCOUNT_STATE_LOADING',
- SET_ACCOUNT_STATE_LOCKED = 'SET_ACCOUNT_STATE_LOCKED',
- SET_ACCOUNT_STATE_READY = 'SET_ACCOUNT_STATE_READY',
- UPDATE_ACCOUNT_ETH_BALANCE = 'UPDATE_ACCOUNT_ETH_BALANCE',
- UPDATE_ETH_USD_PRICE = 'UPDATE_ETH_USD_PRICE',
- UPDATE_SELECTED_ASSET_UNIT_AMOUNT = 'UPDATE_SELECTED_ASSET_UNIT_AMOUNT',
- SET_BUY_ORDER_STATE_NONE = 'SET_BUY_ORDER_STATE_NONE',
- SET_BUY_ORDER_STATE_VALIDATING = 'SET_BUY_ORDER_STATE_VALIDATING',
- SET_BUY_ORDER_STATE_PROCESSING = 'SET_BUY_ORDER_STATE_PROCESSING',
- SET_BUY_ORDER_STATE_FAILURE = 'SET_BUY_ORDER_STATE_FAILURE',
- SET_BUY_ORDER_STATE_SUCCESS = 'SET_BUY_ORDER_STATE_SUCCESS',
- UPDATE_LATEST_BUY_QUOTE = 'UPDATE_LATEST_BUY_QUOTE',
- UPDATE_SELECTED_ASSET = 'UPDATE_SELECTED_ASSET',
- SET_AVAILABLE_ASSETS = 'SET_AVAILABLE_ASSETS',
- SET_QUOTE_REQUEST_STATE_PENDING = 'SET_QUOTE_REQUEST_STATE_PENDING',
- SET_QUOTE_REQUEST_STATE_FAILURE = 'SET_QUOTE_REQUEST_STATE_FAILURE',
- SET_ERROR_MESSAGE = 'SET_ERROR_MESSAGE',
- HIDE_ERROR = 'HIDE_ERROR',
- CLEAR_ERROR = 'CLEAR_ERROR',
- RESET_AMOUNT = 'RESET_AMOUNT',
- OPEN_STANDARD_SLIDING_PANEL = 'OPEN_STANDARD_SLIDING_PANEL',
- CLOSE_STANDARD_SLIDING_PANEL = 'CLOSE_STANDARD_SLIDING_PANEL',
- UPDATE_BASE_CURRENCY = 'UPDATE_BASE_CURRENCY',
+ SetAccountStateLoading = 'SET_ACCOUNT_STATE_LOADING',
+ SetAccountStateLocked = 'SET_ACCOUNT_STATE_LOCKED',
+ SetAccountStateReady = 'SET_ACCOUNT_STATE_READY',
+ UpdateAccountEthBalance = 'UPDATE_ACCOUNT_ETH_BALANCE',
+ UpdateEthUsdPrice = 'UPDATE_ETH_USD_PRICE',
+ UpdateSelectedAssetUnitAmount = 'UPDATE_SELECTED_ASSET_UNIT_AMOUNT',
+ SetBuyOrderStateNone = 'SET_BUY_ORDER_STATE_NONE',
+ SetBuyOrderStateValidating = 'SET_BUY_ORDER_STATE_VALIDATING',
+ SetBuyOrderStateProcessing = 'SET_BUY_ORDER_STATE_PROCESSING',
+ SetBuyOrderStateFailure = 'SET_BUY_ORDER_STATE_FAILURE',
+ SetBuyOrderStateSuccess = 'SET_BUY_ORDER_STATE_SUCCESS',
+ UpdateLatestBuyQuote = 'UPDATE_LATEST_BUY_QUOTE',
+ UpdateSelectedAsset = 'UPDATE_SELECTED_ASSET',
+ SetAvailableAssets = 'SET_AVAILABLE_ASSETS',
+ SetQuoteRequestStatePending = 'SET_QUOTE_REQUEST_STATE_PENDING',
+ SetQuoteRequestStateFailure = 'SET_QUOTE_REQUEST_STATE_FAILURE',
+ SetErrorMessage = 'SET_ERROR_MESSAGE',
+ HideError = 'HIDE_ERROR',
+ ClearError = 'CLEAR_ERROR',
+ ResetAmount = 'RESET_AMOUNT',
+ OpenStandardSlidingPanel = 'OPEN_STANDARD_SLIDING_PANEL',
+ CloseStandardSlidingPanel = 'CLOSE_STANDARD_SLIDING_PANEL',
+ UpdateBaseCurrency = 'UPDATE_BASE_CURRENCY',
}
export const actions = {
- setAccountStateLoading: () => createAction(ActionTypes.SET_ACCOUNT_STATE_LOADING),
- setAccountStateLocked: () => createAction(ActionTypes.SET_ACCOUNT_STATE_LOCKED),
- setAccountStateReady: (address: string) => createAction(ActionTypes.SET_ACCOUNT_STATE_READY, address),
+ setAccountStateLoading: () => createAction(ActionTypes.SetAccountStateLoading),
+ setAccountStateLocked: () => createAction(ActionTypes.SetAccountStateLocked),
+ setAccountStateReady: (address: string) => createAction(ActionTypes.SetAccountStateReady, address),
updateAccountEthBalance: (addressAndBalance: AddressAndEthBalanceInWei) =>
- createAction(ActionTypes.UPDATE_ACCOUNT_ETH_BALANCE, addressAndBalance),
- updateEthUsdPrice: (price?: BigNumber) => createAction(ActionTypes.UPDATE_ETH_USD_PRICE, price),
- updateSelectedAssetAmount: (amount?: BigNumber) =>
- createAction(ActionTypes.UPDATE_SELECTED_ASSET_UNIT_AMOUNT, amount),
- setBuyOrderStateNone: () => createAction(ActionTypes.SET_BUY_ORDER_STATE_NONE),
- setBuyOrderStateValidating: () => createAction(ActionTypes.SET_BUY_ORDER_STATE_VALIDATING),
+ createAction(ActionTypes.UpdateAccountEthBalance, addressAndBalance),
+ updateEthUsdPrice: (price?: BigNumber) => createAction(ActionTypes.UpdateEthUsdPrice, price),
+ updateSelectedAssetAmount: (amount?: BigNumber) => createAction(ActionTypes.UpdateSelectedAssetUnitAmount, amount),
+ setBuyOrderStateNone: () => createAction(ActionTypes.SetBuyOrderStateNone),
+ setBuyOrderStateValidating: () => createAction(ActionTypes.SetBuyOrderStateValidating),
setBuyOrderStateProcessing: (txHash: string, startTimeUnix: number, expectedEndTimeUnix: number) =>
- createAction(ActionTypes.SET_BUY_ORDER_STATE_PROCESSING, { txHash, startTimeUnix, expectedEndTimeUnix }),
- setBuyOrderStateFailure: (txHash: string) => createAction(ActionTypes.SET_BUY_ORDER_STATE_FAILURE, txHash),
- setBuyOrderStateSuccess: (txHash: string) => createAction(ActionTypes.SET_BUY_ORDER_STATE_SUCCESS, txHash),
- updateLatestBuyQuote: (buyQuote?: BuyQuote) => createAction(ActionTypes.UPDATE_LATEST_BUY_QUOTE, buyQuote),
- updateSelectedAsset: (asset: Asset) => createAction(ActionTypes.UPDATE_SELECTED_ASSET, asset),
- setAvailableAssets: (availableAssets: Asset[]) => createAction(ActionTypes.SET_AVAILABLE_ASSETS, availableAssets),
- setQuoteRequestStatePending: () => createAction(ActionTypes.SET_QUOTE_REQUEST_STATE_PENDING),
- setQuoteRequestStateFailure: () => createAction(ActionTypes.SET_QUOTE_REQUEST_STATE_FAILURE),
- setErrorMessage: (errorMessage: string) => createAction(ActionTypes.SET_ERROR_MESSAGE, errorMessage),
- hideError: () => createAction(ActionTypes.HIDE_ERROR),
- clearError: () => createAction(ActionTypes.CLEAR_ERROR),
- resetAmount: () => createAction(ActionTypes.RESET_AMOUNT),
+ createAction(ActionTypes.SetBuyOrderStateProcessing, { txHash, startTimeUnix, expectedEndTimeUnix }),
+ setBuyOrderStateFailure: (txHash: string) => createAction(ActionTypes.SetBuyOrderStateFailure, txHash),
+ setBuyOrderStateSuccess: (txHash: string) => createAction(ActionTypes.SetBuyOrderStateSuccess, txHash),
+ updateLatestBuyQuote: (buyQuote?: BuyQuote) => createAction(ActionTypes.UpdateLatestBuyQuote, buyQuote),
+ updateSelectedAsset: (asset: Asset) => createAction(ActionTypes.UpdateSelectedAsset, asset),
+ setAvailableAssets: (availableAssets: Asset[]) => createAction(ActionTypes.SetAvailableAssets, availableAssets),
+ setQuoteRequestStatePending: () => createAction(ActionTypes.SetQuoteRequestStatePending),
+ setQuoteRequestStateFailure: () => createAction(ActionTypes.SetQuoteRequestStateFailure),
+ setErrorMessage: (errorMessage: string) => createAction(ActionTypes.SetErrorMessage, errorMessage),
+ hideError: () => createAction(ActionTypes.HideError),
+ clearError: () => createAction(ActionTypes.ClearError),
+ resetAmount: () => createAction(ActionTypes.ResetAmount),
openStandardSlidingPanel: (content: StandardSlidingPanelContent) =>
- createAction(ActionTypes.OPEN_STANDARD_SLIDING_PANEL, content),
- closeStandardSlidingPanel: () => createAction(ActionTypes.CLOSE_STANDARD_SLIDING_PANEL),
- updateBaseCurrency: (baseCurrency: BaseCurrency) => createAction(ActionTypes.UPDATE_BASE_CURRENCY, baseCurrency),
+ createAction(ActionTypes.OpenStandardSlidingPanel, content),
+ closeStandardSlidingPanel: () => createAction(ActionTypes.CloseStandardSlidingPanel),
+ updateBaseCurrency: (baseCurrency: BaseCurrency) => createAction(ActionTypes.UpdateBaseCurrency, baseCurrency),
};
diff --git a/packages/instant/src/redux/analytics_middleware.ts b/packages/instant/src/redux/analytics_middleware.ts
index a86a16b1a..4b4d30213 100644
--- a/packages/instant/src/redux/analytics_middleware.ts
+++ b/packages/instant/src/redux/analytics_middleware.ts
@@ -21,7 +21,7 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
const curAccount = curState.providerState.account;
switch (nextAction.type) {
- case ActionTypes.SET_ACCOUNT_STATE_READY:
+ case ActionTypes.SetAccountStateReady:
if (curAccount.state === AccountState.Ready) {
const didJustTurnReady = prevAccount.state !== AccountState.Ready;
const didJustUpdateAddress =
@@ -38,13 +38,13 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
}
}
break;
- case ActionTypes.SET_ACCOUNT_STATE_LOCKED:
+ case ActionTypes.SetAccountStateLocked:
if (prevAccount.state !== AccountState.Locked && curAccount.state === AccountState.Locked) {
// if we are moving from account not locked to account locked, track `Account - Locked`
analytics.trackAccountLocked();
}
break;
- case ActionTypes.UPDATE_ACCOUNT_ETH_BALANCE:
+ case ActionTypes.UpdateAccountEthBalance:
if (
curAccount.state === AccountState.Ready &&
curAccount.ethBalanceInWei &&
@@ -58,7 +58,7 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
analytics.addEventProperties({ ethBalanceInUnitAmount });
}
break;
- case ActionTypes.UPDATE_SELECTED_ASSET:
+ case ActionTypes.UpdateSelectedAsset:
const selectedAsset = curState.selectedAsset;
if (selectedAsset) {
const assetName = selectedAsset.metaData.name;
@@ -79,7 +79,7 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
analytics.addEventProperties(selectedAssetEventProperties);
}
break;
- case ActionTypes.SET_AVAILABLE_ASSETS:
+ case ActionTypes.SetAvailableAssets:
const availableAssets = curState.availableAssets;
if (availableAssets) {
analytics.addEventProperties({
@@ -87,19 +87,19 @@ export const analyticsMiddleware: Middleware = store => next => middlewareAction
});
}
break;
- case ActionTypes.OPEN_STANDARD_SLIDING_PANEL:
+ case ActionTypes.OpenStandardSlidingPanel:
const openSlidingContent = curState.standardSlidingPanelSettings.content;
if (openSlidingContent === StandardSlidingPanelContent.InstallWallet) {
analytics.trackInstallWalletModalOpened();
}
break;
- case ActionTypes.CLOSE_STANDARD_SLIDING_PANEL:
+ case ActionTypes.CloseStandardSlidingPanel:
const closeSlidingContent = curState.standardSlidingPanelSettings.content;
if (closeSlidingContent === StandardSlidingPanelContent.InstallWallet) {
analytics.trackInstallWalletModalClosed();
}
break;
- case ActionTypes.UPDATE_BASE_CURRENCY:
+ case ActionTypes.UpdateBaseCurrency:
analytics.trackBaseCurrencyChanged(curState.baseCurrency);
analytics.addEventProperties({ baseCurrency: curState.baseCurrency });
}
diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts
index 8c13c9c72..0d8bb4b05 100644
--- a/packages/instant/src/redux/reducer.ts
+++ b/packages/instant/src/redux/reducer.ts
@@ -72,11 +72,11 @@ export const DEFAULT_STATE: DefaultState = {
export const createReducer = (initialState: State) => {
const reducer = (state: State = initialState, action: Action): State => {
switch (action.type) {
- case ActionTypes.SET_ACCOUNT_STATE_LOADING:
+ case ActionTypes.SetAccountStateLoading:
return reduceStateWithAccount(state, LOADING_ACCOUNT);
- case ActionTypes.SET_ACCOUNT_STATE_LOCKED:
+ case ActionTypes.SetAccountStateLocked:
return reduceStateWithAccount(state, LOCKED_ACCOUNT);
- case ActionTypes.SET_ACCOUNT_STATE_READY: {
+ case ActionTypes.SetAccountStateReady: {
const address = action.data;
let newAccount: AccountReady = {
state: AccountState.Ready,
@@ -91,7 +91,7 @@ export const createReducer = (initialState: State) => {
}
return reduceStateWithAccount(state, newAccount);
}
- case ActionTypes.UPDATE_ACCOUNT_ETH_BALANCE: {
+ case ActionTypes.UpdateAccountEthBalance: {
const { address, ethBalanceInWei } = action.data;
const currentAccount = state.providerState.account;
if (currentAccount.state !== AccountState.Ready || currentAccount.address !== address) {
@@ -104,17 +104,17 @@ export const createReducer = (initialState: State) => {
return reduceStateWithAccount(state, newAccount);
}
}
- case ActionTypes.UPDATE_ETH_USD_PRICE:
+ case ActionTypes.UpdateEthUsdPrice:
return {
...state,
ethUsdPrice: action.data,
};
- case ActionTypes.UPDATE_SELECTED_ASSET_UNIT_AMOUNT:
+ case ActionTypes.UpdateSelectedAssetUnitAmount:
return {
...state,
selectedAssetUnitAmount: action.data,
};
- case ActionTypes.UPDATE_LATEST_BUY_QUOTE:
+ case ActionTypes.UpdateLatestBuyQuote:
const newBuyQuoteIfExists = action.data;
const shouldUpdate =
_.isUndefined(newBuyQuoteIfExists) || doesBuyQuoteMatchState(newBuyQuoteIfExists, state);
@@ -127,29 +127,29 @@ export const createReducer = (initialState: State) => {
} else {
return state;
}
- case ActionTypes.SET_QUOTE_REQUEST_STATE_PENDING:
+ case ActionTypes.SetQuoteRequestStatePending:
return {
...state,
latestBuyQuote: undefined,
quoteRequestState: AsyncProcessState.Pending,
};
- case ActionTypes.SET_QUOTE_REQUEST_STATE_FAILURE:
+ case ActionTypes.SetQuoteRequestStateFailure:
return {
...state,
latestBuyQuote: undefined,
quoteRequestState: AsyncProcessState.Failure,
};
- case ActionTypes.SET_BUY_ORDER_STATE_NONE:
+ case ActionTypes.SetBuyOrderStateNone:
return {
...state,
buyOrderState: { processState: OrderProcessState.None },
};
- case ActionTypes.SET_BUY_ORDER_STATE_VALIDATING:
+ case ActionTypes.SetBuyOrderStateValidating:
return {
...state,
buyOrderState: { processState: OrderProcessState.Validating },
};
- case ActionTypes.SET_BUY_ORDER_STATE_PROCESSING:
+ case ActionTypes.SetBuyOrderStateProcessing:
const processingData = action.data;
const { startTimeUnix, expectedEndTimeUnix } = processingData;
return {
@@ -163,7 +163,7 @@ export const createReducer = (initialState: State) => {
},
},
};
- case ActionTypes.SET_BUY_ORDER_STATE_FAILURE:
+ case ActionTypes.SetBuyOrderStateFailure:
const failureTxHash = action.data;
if ('txHash' in state.buyOrderState) {
if (state.buyOrderState.txHash === failureTxHash) {
@@ -179,7 +179,7 @@ export const createReducer = (initialState: State) => {
}
}
return state;
- case ActionTypes.SET_BUY_ORDER_STATE_SUCCESS:
+ case ActionTypes.SetBuyOrderStateSuccess:
const successTxHash = action.data;
if ('txHash' in state.buyOrderState) {
if (state.buyOrderState.txHash === successTxHash) {
@@ -195,29 +195,29 @@ export const createReducer = (initialState: State) => {
}
}
return state;
- case ActionTypes.SET_ERROR_MESSAGE:
+ case ActionTypes.SetErrorMessage:
return {
...state,
latestErrorMessage: action.data,
latestErrorDisplayStatus: DisplayStatus.Present,
};
- case ActionTypes.HIDE_ERROR:
+ case ActionTypes.HideError:
return {
...state,
latestErrorDisplayStatus: DisplayStatus.Hidden,
};
- case ActionTypes.CLEAR_ERROR:
+ case ActionTypes.ClearError:
return {
...state,
latestErrorMessage: undefined,
latestErrorDisplayStatus: DisplayStatus.Hidden,
};
- case ActionTypes.UPDATE_SELECTED_ASSET:
+ case ActionTypes.UpdateSelectedAsset:
return {
...state,
selectedAsset: action.data,
};
- case ActionTypes.RESET_AMOUNT:
+ case ActionTypes.ResetAmount:
return {
...state,
latestBuyQuote: undefined,
@@ -225,12 +225,12 @@ export const createReducer = (initialState: State) => {
buyOrderState: { processState: OrderProcessState.None },
selectedAssetUnitAmount: undefined,
};
- case ActionTypes.SET_AVAILABLE_ASSETS:
+ case ActionTypes.SetAvailableAssets:
return {
...state,
availableAssets: action.data,
};
- case ActionTypes.OPEN_STANDARD_SLIDING_PANEL:
+ case ActionTypes.OpenStandardSlidingPanel:
return {
...state,
standardSlidingPanelSettings: {
@@ -238,7 +238,7 @@ export const createReducer = (initialState: State) => {
animationState: 'slidIn',
},
};
- case ActionTypes.CLOSE_STANDARD_SLIDING_PANEL:
+ case ActionTypes.CloseStandardSlidingPanel:
return {
...state,
standardSlidingPanelSettings: {
@@ -246,7 +246,7 @@ export const createReducer = (initialState: State) => {
animationState: 'slidOut',
},
};
- case ActionTypes.UPDATE_BASE_CURRENCY:
+ case ActionTypes.UpdateBaseCurrency:
return {
...state,
baseCurrency: action.data,
diff --git a/packages/instant/src/style/theme.ts b/packages/instant/src/style/theme.ts
index fd3f03c3f..49f3c81e6 100644
--- a/packages/instant/src/style/theme.ts
+++ b/packages/instant/src/style/theme.ts
@@ -11,7 +11,7 @@ const {
} = styledComponents;
export type Theme = { [key in ColorOption]: string };
-
+// tslint:disable:enum-naming
export enum ColorOption {
primaryColor = 'primaryColor',
black = 'black',
diff --git a/packages/instant/src/types.ts b/packages/instant/src/types.ts
index f07a407da..606294c93 100644
--- a/packages/instant/src/types.ts
+++ b/packages/instant/src/types.ts
@@ -27,8 +27,8 @@ export enum QuoteFetchOrigin {
}
export enum BaseCurrency {
- USD = 'USD',
- ETH = 'ETH',
+ USD = 'USD', // tslint:disable-line:enum-naming
+ ETH = 'ETH', // tslint:disable-line:enum-naming
}
export interface SimulatedProgress {
@@ -95,7 +95,7 @@ export enum Network {
export enum ZeroExInstantError {
AssetMetaDataNotAvailable = 'ASSET_META_DATA_NOT_AVAILABLE',
- InsufficientETH = 'INSUFFICIENT_ETH',
+ InsufficientETH = 'INSUFFICIENT_ETH', // tslint:disable-line:enum-naming
CouldNotSubmitTransaction = 'COULD_NOT_SUBMIT_TRANSACTION',
}
@@ -168,7 +168,7 @@ export enum WalletSuggestion {
export enum OperatingSystem {
Android = 'ANDROID',
- iOS = 'IOS',
+ iOS = 'IOS', // tslint:disable-line:enum-naming
Mac = 'MAC',
Windows = 'WINDOWS',
WindowsPhone = 'WINDOWS_PHONE',
diff --git a/packages/instant/src/util/analytics.ts b/packages/instant/src/util/analytics.ts
index 4faeaaf5a..fa8a72a2c 100644
--- a/packages/instant/src/util/analytics.ts
+++ b/packages/instant/src/util/analytics.ts
@@ -31,38 +31,38 @@ export const evaluateIfEnabled = (fnCall: () => void) => {
};
enum EventNames {
- INSTANT_OPENED = 'Instant - Opened',
- INSTANT_CLOSED = 'Instant - Closed',
- ACCOUNT_LOCKED = 'Account - Locked',
- ACCOUNT_READY = 'Account - Ready',
- ACCOUNT_UNLOCK_REQUESTED = 'Account - Unlock Requested',
- ACCOUNT_UNLOCK_DENIED = 'Account - Unlock Denied',
- ACCOUNT_ADDRESS_CHANGED = 'Account - Address Changed',
- BASE_CURRENCY_CHANGED = 'Base Currency - Changed',
- PAYMENT_METHOD_DROPDOWN_OPENED = 'Payment Method - Dropdown Opened',
- PAYMENT_METHOD_OPENED_ETHERSCAN = 'Payment Method - Opened Etherscan',
- PAYMENT_METHOD_COPIED_ADDRESS = 'Payment Method - Copied Address',
- BUY_NOT_ENOUGH_ETH = 'Buy - Not Enough Eth',
- BUY_STARTED = 'Buy - Started',
- BUY_SIGNATURE_DENIED = 'Buy - Signature Denied',
- BUY_SIMULATION_FAILED = 'Buy - Simulation Failed',
- BUY_UNKNOWN_ERROR = 'Buy - Unknown Error',
- BUY_TX_SUBMITTED = 'Buy - Tx Submitted',
- BUY_TX_SUCCEEDED = 'Buy - Tx Succeeded',
- BUY_TX_FAILED = 'Buy - Tx Failed',
- USD_PRICE_FETCH_FAILED = 'USD Price - Fetch Failed',
- INSTALL_WALLET_CLICKED = 'Install Wallet - Clicked',
- INSTALL_WALLET_MODAL_OPENED = 'Install Wallet - Modal - Opened',
- INSTALL_WALLET_MODAL_CLICKED_EXPLANATION = 'Install Wallet - Modal - Clicked Explanation',
- INSTALL_WALLET_MODAL_CLICKED_GET = 'Install Wallet - Modal - Clicked Get',
- INSTALL_WALLET_MODAL_CLOSED = 'Install Wallet - Modal - Closed',
- TOKEN_SELECTOR_OPENED = 'Token Selector - Opened',
- TOKEN_SELECTOR_CLOSED = 'Token Selector - Closed',
- TOKEN_SELECTOR_CHOSE = 'Token Selector - Chose',
- TOKEN_SELECTOR_SEARCHED = 'Token Selector - Searched',
- TRANSACTION_VIEWED = 'Transaction - Viewed',
- QUOTE_FETCHED = 'Quote - Fetched',
- QUOTE_ERROR = 'Quote - Error',
+ InstantOpened = 'Instant - Opened',
+ InstantClosed = 'Instant - Closed',
+ AccountLocked = 'Account - Locked',
+ AccountReady = 'Account - Ready',
+ AccountUnlockRequested = 'Account - Unlock Requested',
+ AccountUnlockDenied = 'Account - Unlock Denied',
+ AccountAddressChanged = 'Account - Address Changed',
+ BaseCurrencyChanged = 'Base Currency - Changed',
+ PaymentMethodDropdownOpened = 'Payment Method - Dropdown Opened',
+ PaymentMethodOpenedEtherscan = 'Payment Method - Opened Etherscan',
+ PaymentMethodCopiedAddress = 'Payment Method - Copied Address',
+ BuyNotEnoughEth = 'Buy - Not Enough Eth',
+ BuyStarted = 'Buy - Started',
+ BuySignatureDenied = 'Buy - Signature Denied',
+ BuySimulationFailed = 'Buy - Simulation Failed',
+ BuyUnknownError = 'Buy - Unknown Error',
+ BuyTxSubmitted = 'Buy - Tx Submitted',
+ BuyTxSucceeded = 'Buy - Tx Succeeded',
+ BuyTxFailed = 'Buy - Tx Failed',
+ UsdPriceFetchFailed = 'USD Price - Fetch Failed',
+ InstallWalletClicked = 'Install Wallet - Clicked',
+ InstallWalletModalOpened = 'Install Wallet - Modal - Opened',
+ InstallWalletModalClickedExplanation = 'Install Wallet - Modal - Clicked Explanation',
+ InstallWalletModalClickedGet = 'Install Wallet - Modal - Clicked Get',
+ InstallWalletModalClosed = 'Install Wallet - Modal - Closed',
+ TokenSelectorOpened = 'Token Selector - Opened',
+ TokenSelectorClosed = 'Token Selector - Closed',
+ TokenSelectorChose = 'Token Selector - Chose',
+ TokenSelectorSearched = 'Token Selector - Searched',
+ TransactionViewed = 'Transaction - Viewed',
+ QuoteFetched = 'Quote - Fetched',
+ QuoteError = 'Quote - Error',
}
const track = (eventName: EventNames, eventProperties: EventProperties = {}): void => {
@@ -125,7 +125,7 @@ export interface AnalyticsEventOptions {
baseCurrency?: string;
}
export enum TokenSelectorClosedVia {
- ClickedX = 'Clicked X',
+ ClickedX = 'Clicked X', // tslint:disable-line:enum-naming
TokenChose = 'Token Chose',
}
export const analytics = {
@@ -169,80 +169,80 @@ export const analytics = {
};
return eventOptions;
},
- trackInstantOpened: trackingEventFnWithoutPayload(EventNames.INSTANT_OPENED),
- trackInstantClosed: trackingEventFnWithoutPayload(EventNames.INSTANT_CLOSED),
- trackAccountLocked: trackingEventFnWithoutPayload(EventNames.ACCOUNT_LOCKED),
- trackAccountReady: (address: string) => trackingEventFnWithPayload(EventNames.ACCOUNT_READY)({ address }),
- trackAccountUnlockRequested: trackingEventFnWithoutPayload(EventNames.ACCOUNT_UNLOCK_REQUESTED),
- trackAccountUnlockDenied: trackingEventFnWithoutPayload(EventNames.ACCOUNT_UNLOCK_DENIED),
+ trackInstantOpened: trackingEventFnWithoutPayload(EventNames.InstantOpened),
+ trackInstantClosed: trackingEventFnWithoutPayload(EventNames.InstantClosed),
+ trackAccountLocked: trackingEventFnWithoutPayload(EventNames.AccountLocked),
+ trackAccountReady: (address: string) => trackingEventFnWithPayload(EventNames.AccountReady)({ address }),
+ trackAccountUnlockRequested: trackingEventFnWithoutPayload(EventNames.AccountUnlockRequested),
+ trackAccountUnlockDenied: trackingEventFnWithoutPayload(EventNames.AccountUnlockDenied),
trackAccountAddressChanged: (address: string) =>
- trackingEventFnWithPayload(EventNames.ACCOUNT_ADDRESS_CHANGED)({ address }),
+ trackingEventFnWithPayload(EventNames.AccountAddressChanged)({ address }),
trackBaseCurrencyChanged: (currencyChangedTo: BaseCurrency) =>
- trackingEventFnWithPayload(EventNames.BASE_CURRENCY_CHANGED)({ currencyChangedTo }),
- trackPaymentMethodDropdownOpened: trackingEventFnWithoutPayload(EventNames.PAYMENT_METHOD_DROPDOWN_OPENED),
- trackPaymentMethodOpenedEtherscan: trackingEventFnWithoutPayload(EventNames.PAYMENT_METHOD_OPENED_ETHERSCAN),
- trackPaymentMethodCopiedAddress: trackingEventFnWithoutPayload(EventNames.PAYMENT_METHOD_COPIED_ADDRESS),
+ trackingEventFnWithPayload(EventNames.BaseCurrencyChanged)({ currencyChangedTo }),
+ trackPaymentMethodDropdownOpened: trackingEventFnWithoutPayload(EventNames.PaymentMethodDropdownOpened),
+ trackPaymentMethodOpenedEtherscan: trackingEventFnWithoutPayload(EventNames.PaymentMethodOpenedEtherscan),
+ trackPaymentMethodCopiedAddress: trackingEventFnWithoutPayload(EventNames.PaymentMethodCopiedAddress),
trackBuyNotEnoughEth: (buyQuote: BuyQuote) =>
- trackingEventFnWithPayload(EventNames.BUY_NOT_ENOUGH_ETH)(buyQuoteEventProperties(buyQuote)),
+ trackingEventFnWithPayload(EventNames.BuyNotEnoughEth)(buyQuoteEventProperties(buyQuote)),
trackBuyStarted: (buyQuote: BuyQuote) =>
- trackingEventFnWithPayload(EventNames.BUY_STARTED)(buyQuoteEventProperties(buyQuote)),
+ trackingEventFnWithPayload(EventNames.BuyStarted)(buyQuoteEventProperties(buyQuote)),
trackBuySignatureDenied: (buyQuote: BuyQuote) =>
- trackingEventFnWithPayload(EventNames.BUY_SIGNATURE_DENIED)(buyQuoteEventProperties(buyQuote)),
+ trackingEventFnWithPayload(EventNames.BuySignatureDenied)(buyQuoteEventProperties(buyQuote)),
trackBuySimulationFailed: (buyQuote: BuyQuote) =>
- trackingEventFnWithPayload(EventNames.BUY_SIMULATION_FAILED)(buyQuoteEventProperties(buyQuote)),
+ trackingEventFnWithPayload(EventNames.BuySimulationFailed)(buyQuoteEventProperties(buyQuote)),
trackBuyUnknownError: (buyQuote: BuyQuote, errorMessage: string) =>
- trackingEventFnWithPayload(EventNames.BUY_UNKNOWN_ERROR)({
+ trackingEventFnWithPayload(EventNames.BuyUnknownError)({
...buyQuoteEventProperties(buyQuote),
errorMessage,
}),
trackBuyTxSubmitted: (buyQuote: BuyQuote, txHash: string, startTimeUnix: number, expectedEndTimeUnix: number) =>
- trackingEventFnWithPayload(EventNames.BUY_TX_SUBMITTED)({
+ trackingEventFnWithPayload(EventNames.BuyTxSubmitted)({
...buyQuoteEventProperties(buyQuote),
txHash,
expectedTxTimeMs: expectedEndTimeUnix - startTimeUnix,
}),
trackBuyTxSucceeded: (buyQuote: BuyQuote, txHash: string, startTimeUnix: number, expectedEndTimeUnix: number) =>
- trackingEventFnWithPayload(EventNames.BUY_TX_SUCCEEDED)({
+ trackingEventFnWithPayload(EventNames.BuyTxSucceeded)({
...buyQuoteEventProperties(buyQuote),
txHash,
expectedTxTimeMs: expectedEndTimeUnix - startTimeUnix,
actualTxTimeMs: new Date().getTime() - startTimeUnix,
}),
trackBuyTxFailed: (buyQuote: BuyQuote, txHash: string, startTimeUnix: number, expectedEndTimeUnix: number) =>
- trackingEventFnWithPayload(EventNames.BUY_TX_FAILED)({
+ trackingEventFnWithPayload(EventNames.BuyTxFailed)({
...buyQuoteEventProperties(buyQuote),
txHash,
expectedTxTimeMs: expectedEndTimeUnix - startTimeUnix,
actualTxTimeMs: new Date().getTime() - startTimeUnix,
}),
trackInstallWalletClicked: (walletSuggestion: WalletSuggestion) =>
- trackingEventFnWithPayload(EventNames.INSTALL_WALLET_CLICKED)({ walletSuggestion }),
+ trackingEventFnWithPayload(EventNames.InstallWalletClicked)({ walletSuggestion }),
trackInstallWalletModalClickedExplanation: trackingEventFnWithoutPayload(
- EventNames.INSTALL_WALLET_MODAL_CLICKED_EXPLANATION,
+ EventNames.InstallWalletModalClickedExplanation,
),
- trackInstallWalletModalClickedGet: trackingEventFnWithoutPayload(EventNames.INSTALL_WALLET_MODAL_CLICKED_GET),
- trackInstallWalletModalOpened: trackingEventFnWithoutPayload(EventNames.INSTALL_WALLET_MODAL_OPENED),
- trackInstallWalletModalClosed: trackingEventFnWithoutPayload(EventNames.INSTALL_WALLET_MODAL_CLOSED),
- trackTokenSelectorOpened: trackingEventFnWithoutPayload(EventNames.TOKEN_SELECTOR_OPENED),
+ trackInstallWalletModalClickedGet: trackingEventFnWithoutPayload(EventNames.InstallWalletModalClickedGet),
+ trackInstallWalletModalOpened: trackingEventFnWithoutPayload(EventNames.InstallWalletModalOpened),
+ trackInstallWalletModalClosed: trackingEventFnWithoutPayload(EventNames.InstallWalletModalClosed),
+ trackTokenSelectorOpened: trackingEventFnWithoutPayload(EventNames.TokenSelectorOpened),
trackTokenSelectorClosed: (closedVia: TokenSelectorClosedVia) =>
- trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_CLOSED)({ closedVia }),
+ trackingEventFnWithPayload(EventNames.TokenSelectorClosed)({ closedVia }),
trackTokenSelectorChose: (payload: { assetName: string; assetData: string }) =>
- trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_CHOSE)(payload),
+ trackingEventFnWithPayload(EventNames.TokenSelectorChose)(payload),
trackTokenSelectorSearched: (searchText: string) =>
- trackingEventFnWithPayload(EventNames.TOKEN_SELECTOR_SEARCHED)({ searchText }),
+ trackingEventFnWithPayload(EventNames.TokenSelectorSearched)({ searchText }),
trackTransactionViewed: (orderProcesState: OrderProcessState) =>
- trackingEventFnWithPayload(EventNames.TRANSACTION_VIEWED)({ orderState: orderProcesState }),
+ trackingEventFnWithPayload(EventNames.TransactionViewed)({ orderState: orderProcesState }),
trackQuoteFetched: (buyQuote: BuyQuote, fetchOrigin: QuoteFetchOrigin) =>
- trackingEventFnWithPayload(EventNames.QUOTE_FETCHED)({
+ trackingEventFnWithPayload(EventNames.QuoteFetched)({
...buyQuoteEventProperties(buyQuote),
fetchOrigin,
}),
trackQuoteError: (errorMessage: string, assetBuyAmount: BigNumber, fetchOrigin: QuoteFetchOrigin) => {
- trackingEventFnWithPayload(EventNames.QUOTE_ERROR)({
+ trackingEventFnWithPayload(EventNames.QuoteError)({
errorMessage,
assetBuyAmount: assetBuyAmount.toString(),
fetchOrigin,
});
},
- trackUsdPriceFailed: trackingEventFnWithoutPayload(EventNames.USD_PRICE_FETCH_FAILED),
+ trackUsdPriceFailed: trackingEventFnWithoutPayload(EventNames.UsdPriceFetchFailed),
};
diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts
index b009a327f..709561dbc 100644
--- a/packages/instant/src/util/asset.ts
+++ b/packages/instant/src/util/asset.ts
@@ -104,9 +104,8 @@ export const assetUtils = {
return assetDataGroupIfExists[Network.Mainnet];
},
getERC20AssetsFromAssets: (assets: Asset[]): ERC20Asset[] => {
- const erc20sOrUndefined = _.map(
- assets,
- asset => (asset.metaData.assetProxyId === AssetProxyId.ERC20 ? (asset as ERC20Asset) : undefined),
+ const erc20sOrUndefined = _.map(assets, asset =>
+ asset.metaData.assetProxyId === AssetProxyId.ERC20 ? (asset as ERC20Asset) : undefined,
);
return _.compact(erc20sOrUndefined);
},
diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json
index 79435426b..634512d9b 100644
--- a/packages/json-schemas/CHANGELOG.json
+++ b/packages/json-schemas/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "2.1.6",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "2.1.5",
"changes": [
@@ -48,8 +57,7 @@
"version": "2.1.0",
"changes": [
{
- "note":
- "Improve schemas by enforcing that amounts that must be whole numbers (e.g Order asset amounts) no longer allow decimal amounts",
+ "note": "Improve schemas by enforcing that amounts that must be whole numbers (e.g Order asset amounts) no longer allow decimal amounts",
"pr": 1173
},
{
@@ -63,8 +71,7 @@
"version": "2.0.0",
"changes": [
{
- "note":
- "Convert all schemas to JSON files so that they can be used with `json-schema` implemenations in other programming languages.",
+ "note": "Convert all schemas to JSON files so that they can be used with `json-schema` implemenations in other programming languages.",
"pr": 1145
}
],
@@ -255,8 +262,7 @@
"version": "0.8.0",
"changes": [
{
- "note":
- "Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades",
+ "note": "Update Order & SignedOrder schemas, remove ECSignature schema and add Hex schema as part of V2 upgrades",
"pr": 615
}
],
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 6d3373336..fd89ea9b8 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
+## v2.1.6 - _January 11, 2019_
+
+ * Dependencies updated
+
## v2.1.5 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 5103486db..ed980a9ee 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/json-schemas",
- "version": "2.1.5",
+ "version": "2.1.6",
"engines": {
"node": ">=6.12"
},
@@ -39,14 +39,14 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
- "@0x/typescript-typings": "^3.0.6",
+ "@0x/typescript-typings": "^3.0.7",
"@types/node": "*",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
},
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
- "@0x/utils": "^2.1.1",
+ "@0x/tslint-config": "^2.0.1",
+ "@0x/utils": "^3.0.0",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",
diff --git a/packages/metacoin/README.md b/packages/metacoin/README.md
index 4f9609dde..6f35dfc25 100644
--- a/packages/metacoin/README.md
+++ b/packages/metacoin/README.md
@@ -3,12 +3,12 @@
This is an example project that demonstrates how the many Ethereum dev tools developed by 0x can be used in any Solidity/TS project.
It supports:
-* Compiling & testing smart contracts
-* Generating typed contract wrappers
-* Solidity coverage
-* Solidity gas profiling
-* Running tests against Ganache
-* Running tests against our fork of Geth (it supports snapshotting & time travel)
+- Compiling & testing smart contracts
+- Generating typed contract wrappers
+- Solidity coverage
+- Solidity gas profiling
+- Running tests against Ganache
+- Running tests against our fork of Geth (it supports snapshotting & time travel)
## Contributing
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 6812ff823..5e336132a 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/metacoin",
- "version": "0.0.33",
+ "version": "0.0.34",
"engines": {
"node": ">=6.12"
},
@@ -29,28 +29,28 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
- "@0x/abi-gen": "^1.0.20",
+ "@0x/abi-gen": "^1.0.21",
"@0x/abi-gen-templates": "^1.0.1",
- "@0x/base-contract": "^3.0.11",
- "@0x/sol-coverage": "^1.0.0",
- "@0x/sol-profiler": "^1.0.0",
- "@0x/sol-trace": "^1.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/base-contract": "^3.0.12",
+ "@0x/sol-coverage": "^1.0.1",
+ "@0x/sol-profiler": "^1.0.1",
+ "@0x/sol-trace": "^1.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/mocha": "^5.2.2",
"copyfiles": "^2.0.0",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5",
"run-s": "^0.0.0"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/sol-compiler": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/sol-compiler": "^2.0.1",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json
index e09106bcd..13aca373b 100644
--- a/packages/migrations/CHANGELOG.json
+++ b/packages/migrations/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "2.3.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "2.3.0",
"changes": [
{
@@ -49,8 +58,7 @@
"version": "2.1.0",
"changes": [
{
- "note":
- "Export all type declarations used by the public interface, as well as the `ContractAddresses` mapping",
+ "note": "Export all type declarations used by the public interface, as well as the `ContractAddresses` mapping",
"pr": 1301
}
],
@@ -96,8 +104,7 @@
"version": "2.0.0",
"changes": [
{
- "note":
- "Contract artifacts have been moved to the new @0xproject/contract-artifacts package. v1 migrations have been removed. `runMigrationsAsync` returns the addresses of the contracts that were deployed.",
+ "note": "Contract artifacts have been moved to the new @0xproject/contract-artifacts package. v1 migrations have been removed. `runMigrationsAsync` returns the addresses of the contracts that were deployed.",
"pr": 1105
}
],
diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md
index 420769187..937ca0dce 100644
--- a/packages/migrations/CHANGELOG.md
+++ b/packages/migrations/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.3.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v2.3.0 - _January 9, 2019_
* Added migrations for Dutch Auction contract (#1465)
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 774236ab4..d52f09b59 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/migrations",
- "version": "2.3.0",
+ "version": "2.3.1",
"engines": {
"node": ">=6.12"
},
@@ -35,9 +35,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/tslint-config": "^2.0.0",
- "@0x/types": "^1.5.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/tslint-config": "^2.0.1",
+ "@0x/types": "^1.5.1",
"@types/yargs": "^10.0.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
@@ -48,18 +48,18 @@
"yargs": "^10.0.3"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
- "@0x/base-contract": "^3.0.11",
+ "@0x/abi-gen-wrappers": "^2.1.1",
+ "@0x/base-contract": "^3.0.12",
"@0x/contract-addresses": "^2.1.0",
"@0x/contract-artifacts": "^1.2.0",
- "@0x/order-utils": "^3.1.0",
- "@0x/sol-compiler": "^2.0.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/sol-compiler": "^2.0.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@ledgerhq/hw-app-eth": "^4.3.0",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethers": "~4.0.4",
"lodash": "^4.17.5"
},
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 3286b8412..9ab53fc0b 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.16",
+ "version": "1.0.17",
"engines": {
"node": ">=6.12"
},
@@ -47,7 +47,7 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/utils": "^2.0.8",
+ "@0x/utils": "^3.0.0",
"@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/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index d3f15f092..9a81e09d1 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,10 +1,18 @@
[
{
+ "timestamp": 1547225310,
+ "version": "3.1.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "3.1.0",
"changes": [
{
- "note":
- "Use new ABI encoder, add encoding/decoding logic for MultiAsset assetData, and add information to return values in orderStateUtils",
+ "note": "Use new ABI encoder, add encoding/decoding logic for MultiAsset assetData, and add information to return values in orderStateUtils",
"pr": 1363
}
],
@@ -78,23 +86,19 @@
"version": "3.0.0",
"changes": [
{
- "note":
- "Add signature validation, regular cancellation and `cancelledUpTo` checks to `validateOrderFillableOrThrowAsync`",
+ "note": "Add signature validation, regular cancellation and `cancelledUpTo` checks to `validateOrderFillableOrThrowAsync`",
"pr": 1235
},
{
- "note":
- "Improved the errors thrown by `validateOrderFillableOrThrowAsync` by making them more descriptive",
+ "note": "Improved the errors thrown by `validateOrderFillableOrThrowAsync` by making them more descriptive",
"pr": 1235
},
{
- "note":
- "Throw previously swallowed network errors when calling `validateOrderFillableOrThrowAsync` (see issue: #1218)",
+ "note": "Throw previously swallowed network errors when calling `validateOrderFillableOrThrowAsync` (see issue: #1218)",
"pr": 1235
},
{
- "note":
- "Modified the `AbstractOrderFilledCancelledFetcher` interface slightly such that `isOrderCancelledAsync` accepts a `signedOrder` instead of an `orderHash` param",
+ "note": "Modified the `AbstractOrderFilledCancelledFetcher` interface slightly such that `isOrderCancelledAsync` accepts a `signedOrder` instead of an `orderHash` param",
"pr": 1235
}
],
@@ -113,8 +117,7 @@
"version": "2.0.0",
"changes": [
{
- "note":
- "Added `ecSignOrderAsync` to first sign an order using `eth_signTypedData` and fallback to `eth_sign`.",
+ "note": "Added `ecSignOrderAsync` to first sign an order using `eth_signTypedData` and fallback to `eth_sign`.",
"pr": 1102
},
{
@@ -145,8 +148,7 @@
"version": "1.0.6",
"changes": [
{
- "note":
- "Add signerAddress normalization to `isValidECSignature` to avoid `invalid address recovery` error if caller supplies a checksummed address",
+ "note": "Add signerAddress normalization to `isValidECSignature` to avoid `invalid address recovery` error if caller supplies a checksummed address",
"pr": 1096
}
],
@@ -228,23 +230,19 @@
"pr": 953
},
{
- "note":
- "Update marketUtils api such that all optional parameters are bundled into one optional param and more defaults are provided",
+ "note": "Update marketUtils api such that all optional parameters are bundled into one optional param and more defaults are provided",
"pr": 954
},
{
- "note":
- "Instead of exporting signature util methods individually, they are now exported as `signatureUtils`",
+ "note": "Instead of exporting signature util methods individually, they are now exported as `signatureUtils`",
"pr": 924
},
{
- "note":
- "Export types: `SignedOrder`, `Order`, `OrderRelevantState`, `OrderState`, `ECSignature`, `ERC20AssetData`, `ERC721AssetData`, `AssetProxyId`, `SignerType`, `SignatureType`, `OrderStateValid`, `OrderStateInvalid`, `ExchangeContractErrs`, `TradeSide`, `TransferType`, `FindFeeOrdersThatCoverFeesForTargetOrdersOpts`, `FindOrdersThatCoverMakerAssetFillAmountOpts`, `FeeOrdersAndRemainingFeeAmount`, `OrdersAndRemainingFillAmount`, `Provider`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
+ "note": "Export types: `SignedOrder`, `Order`, `OrderRelevantState`, `OrderState`, `ECSignature`, `ERC20AssetData`, `ERC721AssetData`, `AssetProxyId`, `SignerType`, `SignatureType`, `OrderStateValid`, `OrderStateInvalid`, `ExchangeContractErrs`, `TradeSide`, `TransferType`, `FindFeeOrdersThatCoverFeesForTargetOrdersOpts`, `FindOrdersThatCoverMakerAssetFillAmountOpts`, `FeeOrdersAndRemainingFeeAmount`, `OrdersAndRemainingFillAmount`, `Provider`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
"pr": 924
},
{
- "note":
- "Rename `resultOrders` to `resultFeeOrders` for object returned by `findFeeOrdersThatCoverFeesForTargetOrders` in `marketUtils` api",
+ "note": "Rename `resultOrders` to `resultFeeOrders` for object returned by `findFeeOrdersThatCoverFeesForTargetOrders` in `marketUtils` api",
"pr": 997
},
{
@@ -252,8 +250,7 @@
"pr": 997
},
{
- "note":
- "Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees",
+ "note": "Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees",
"pr": 997
}
],
@@ -264,12 +261,10 @@
"changes": [
{
"pr": 914,
- "note":
- "Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts."
+ "note": "Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts."
},
{
- "note":
- "Added a synchronous `createOrder` method in `orderFactory`, updated public interfaces to support some optional parameters",
+ "note": "Added a synchronous `createOrder` method in `orderFactory`, updated public interfaces to support some optional parameters",
"pr": 936
},
{
@@ -313,8 +308,7 @@
"version": "1.0.0-rc.2",
"changes": [
{
- "note":
- "Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`"
+ "note": "Upgrade ethereumjs-abi dep including a fix so that addresses starting with 0 are properly decoded by `decodeERC20AssetData`"
}
],
"timestamp": 1532357734
@@ -377,8 +371,7 @@
"version": "0.0.5",
"changes": [
{
- "note":
- "Add orderStateUtils, a module for computing order state needed to decide if an order is still valid"
+ "note": "Add orderStateUtils, a module for computing order state needed to decide if an order is still valid"
}
],
"timestamp": 1527008794
diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md
index eb36616d1..2f4484aea 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
+## v3.1.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v3.1.0 - _January 9, 2019_
* Use new ABI encoder, add encoding/decoding logic for MultiAsset assetData, and add information to return values in orderStateUtils (#1363)
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index e59ea664f..ccd36405c 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
- "version": "3.1.0",
+ "version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@@ -35,8 +35,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/tslint-config": "^2.0.1",
"@types/bn.js": "^4.11.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
@@ -53,18 +53,18 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
- "@0x/assert": "^1.0.21",
- "@0x/base-contract": "^3.0.11",
+ "@0x/abi-gen-wrappers": "^2.1.1",
+ "@0x/assert": "^1.0.22",
+ "@0x/base-contract": "^3.0.12",
"@0x/contract-artifacts": "^1.2.0",
- "@0x/json-schemas": "^2.1.5",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/node": "*",
"bn.js": "^4.11.8",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
"ethers": "~4.0.4",
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index afd523f88..ad79000e3 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "2.4.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "2.4.0",
"changes": [
{
@@ -13,8 +22,7 @@
"version": "2.3.0",
"changes": [
{
- "note":
- "Added a WebSocket interface to OrderWatcher so that it can be used by a client written in any language",
+ "note": "Added a WebSocket interface to OrderWatcher so that it can be used by a client written in any language",
"pr": 1427
}
]
@@ -59,8 +67,7 @@
"version": "2.2.4",
"changes": [
{
- "note":
- "Fix the bug when order watcher was throwing an error on order removal when maker token was ZRX",
+ "note": "Fix the bug when order watcher was throwing an error on order removal when maker token was ZRX",
"pr": 1259
}
],
@@ -74,8 +81,7 @@
"pr": 1227
},
{
- "note":
- "Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
+ "note": "Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
}
],
"timestamp": 1542134075
@@ -106,8 +112,7 @@
"pr": 1118
},
{
- "note":
- "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter.",
+ "note": "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter.",
"pr": 1105
}
],
@@ -136,18 +141,15 @@
"version": "2.0.0",
"changes": [
{
- "note":
- "Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
+ "note": "Fixes dropped events issue by fetching logs by blockHash instead of blockNumber. Support for fetching by blockHash was added in Geth > v1.8.13 and Parity > v2.1.0. Infura works too.",
"pr": 1080
},
{
- "note":
- "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
+ "note": "Fix misunderstanding about blockstream interface callbacks and pass the raw JSON RPC responses to it",
"pr": 1080
},
{
- "note":
- "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
+ "note": "Add `transactionHash` to `OrderState` emitted by `OrderWatcher` subscriptions if the order's state change originated from a transaction.",
"pr": 1087
}
],
@@ -211,8 +213,7 @@
"version": "1.0.1-rc.4",
"changes": [
{
- "note":
- "Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
+ "note": "Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload`",
"pr": 924
},
{
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 600b9fa6f..84d3f303a 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
+## v2.4.1 - _January 11, 2019_
+
+ * Dependencies updated
+
## v2.4.0 - _January 9, 2019_
* Add support for `MultiAssetProxy` (#1363)
diff --git a/packages/order-watcher/README.md b/packages/order-watcher/README.md
index 385fe4715..a841775b6 100644
--- a/packages/order-watcher/README.md
+++ b/packages/order-watcher/README.md
@@ -36,7 +36,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
**Environmental Variables**
Several environmental variables can be set to configure the server:
-* `ORDER_WATCHER_HTTP_PORT` specifies the port that the http server will listen on
+- `ORDER_WATCHER_HTTP_PORT` specifies the port that the http server will listen on
and accept connections from. When this is not set, we default to 8080.
**Requests**
@@ -58,10 +58,10 @@ wsClient = create_connection("ws://127.0.0.1:8080")
With the connection established, you prepare the payload for your request. The payload is a json object with a format established by the [JSON RPC specification](https://www.jsonrpc.org/specification):
-* `id`: All requests require you to specify a numerical `id`. When the server responds to the request, the response will have the same `id` as the one supplied with your request.
-* `jsonrpc`: This is always the string `'2.0'`.
-* `method`: This specifies the OrderWatcher method you want to call. I.e., `'ADD_ORDER'`, `'REMOVE_ORDER'` or `'GET_STATS'`.
-* `params`: These contain the parameters needed by OrderWatcher to execute the method you called. For `ADD_ORDER`, provide `{ signedOrder: <your signedOrder> }`. For `REMOVE_ORDER`, provide `{ orderHash: <your orderHash> }`. For `GET_STATS`, no parameters are needed, so you may leave this empty.
+- `id`: All requests require you to specify a numerical `id`. When the server responds to the request, the response will have the same `id` as the one supplied with your request.
+- `jsonrpc`: This is always the string `'2.0'`.
+- `method`: This specifies the OrderWatcher method you want to call. I.e., `'ADD_ORDER'`, `'REMOVE_ORDER'` or `'GET_STATS'`.
+- `params`: These contain the parameters needed by OrderWatcher to execute the method you called. For `ADD_ORDER`, provide `{ signedOrder: <your signedOrder> }`. For `REMOVE_ORDER`, provide `{ orderHash: <your orderHash> }`. For `GET_STATS`, no parameters are needed, so you may leave this empty.
Next, convert the payload to a string and send it through the connection.
In Javascript:
@@ -92,11 +92,11 @@ wsClient.send(json.dumps(remove_order_payload));
**Response**
The server responds to all requests in a similar format. In the data field, you'll find another object containing the following fields:
-* `id`: The id corresponding to the request that the server is responding to. `UPDATE` responses are not based on any requests so the `id` field is omitted`.
-* `jsonrpc`: Always `'2.0'`.
-* `method`: The method the server is responding to. Eg. `ADD_ORDER`. When order states change the server may also initiate a response. In this case, method will be listed as `UPDATE`.
-* `result`: This field varies based on the method. `UPDATE` responses contain the new order state. `GET_STATS` responses contain the current order count. When there are errors, this field is omitted.
-* `error`: When there is an error executing a request, the [JSON RPC](https://www.jsonrpc.org/specification) error object is listed here. When the server responds successfully, this field is omitted.
+- `id`: The id corresponding to the request that the server is responding to. `UPDATE` responses are not based on any requests so the `id` field is omitted`.
+- `jsonrpc`: Always `'2.0'`.
+- `method`: The method the server is responding to. Eg. `ADD_ORDER`. When order states change the server may also initiate a response. In this case, method will be listed as `UPDATE`.
+- `result`: This field varies based on the method. `UPDATE` responses contain the new order state. `GET_STATS` responses contain the current order count. When there are errors, this field is omitted.
+- `error`: When there is an error executing a request, the [JSON RPC](https://www.jsonrpc.org/specification) error object is listed here. When the server responds successfully, this field is omitted.
In Javascript, the responses can be parsed using the `onmessage` callback:
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 5919759dd..06bb30001 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/order-watcher",
- "version": "2.4.0",
+ "version": "2.4.1",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -33,10 +33,10 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/migrations": "^2.3.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/migrations": "^2.3.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/tslint-config": "^2.0.1",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -58,21 +58,21 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^2.1.0",
- "@0x/assert": "^1.0.21",
- "@0x/base-contract": "^3.0.11",
+ "@0x/abi-gen-wrappers": "^2.1.1",
+ "@0x/assert": "^1.0.22",
+ "@0x/base-contract": "^3.0.12",
"@0x/contract-addresses": "^2.1.0",
"@0x/contract-artifacts": "^1.2.0",
- "@0x/contract-wrappers": "^4.2.0",
- "@0x/fill-scenarios": "^1.1.0",
- "@0x/json-schemas": "^2.1.5",
- "@0x/order-utils": "^3.1.0",
- "@0x/types": "^1.5.0",
- "@0x/typescript-typings": "^3.0.6",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/contract-wrappers": "^4.2.1",
+ "@0x/fill-scenarios": "^1.1.1",
+ "@0x/json-schemas": "^2.1.6",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/typescript-typings": "^3.0.7",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"bintrees": "^1.0.2",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"ethereumjs-blockstream": "6.0.0",
"ethers": "~4.0.4",
"lodash": "^4.17.5",
diff --git a/packages/pipeline/README.md b/packages/pipeline/README.md
index 40a64cdd1..4fc8e0ff9 100644
--- a/packages/pipeline/README.md
+++ b/packages/pipeline/README.md
@@ -164,20 +164,21 @@ set the`ZEROEX_DATA_PIPELINE_DB_URL` environment variable to a valid
#### Additional guidelines and tips:
-* Table names should be plural and separated by underscores (e.g.,
+- Table names should be plural and separated by underscores (e.g.,
`exchange_fill_events`).
-* Any table which contains data which comes directly from a third-party source
+- Any table which contains data which comes directly from a third-party source
should be namespaced in the `raw` PostgreSQL schema.
-* Column names in the database should be separated by underscores (e.g.,
+- Column names in the database should be separated by underscores (e.g.,
`maker_asset_type`).
-* Field names in entity classes (like any other fields in TypeScript) should
+- Field names in entity classes (like any other fields in TypeScript) should
be camel-cased (e.g., `makerAssetType`).
-* All timestamps should be stored as milliseconds since the Unix Epoch.
-* Use the `BigNumber` type for TypeScript code which deals with 256-bit
+- All timestamps should be stored as milliseconds since the Unix Epoch.
+- Use the `BigNumber` type for TypeScript code which deals with 256-bit
numbers from smart contracts or for any case where we are dealing with large
floating point numbers.
-* [TypeORM documentation](http://typeorm.io/#/) is pretty robust and can be a
+- [TypeORM documentation](http://typeorm.io/#/) is pretty robust and can be a
helpful resource.
+
* Scripts/parsers should perform minimum data transformation/normalization.
The idea here is to have a raw data feed that will be cleaned up and
synthesized in a separate step.
diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json
index 47150300d..56d4ecc98 100644
--- a/packages/pipeline/package.json
+++ b/packages/pipeline/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/pipeline",
- "version": "1.0.3",
+ "version": "1.0.4",
"private": true,
"description": "Data pipeline for offline analysis",
"scripts": {
@@ -27,7 +27,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.1",
"@types/axios": "^0.14.0",
"@types/ramda": "^0.25.38",
"chai": "^4.1.2",
@@ -39,23 +39,23 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/connect": "^3.0.11",
+ "@0x/connect": "^3.0.12",
"@0x/contract-addresses": "^2.1.0",
"@0x/contract-artifacts": "^1.2.0",
"@0x/contract-wrappers": "^3.0.0",
- "@0x/dev-utils": "^1.0.22",
- "@0x/order-utils": "^3.1.0",
- "@0x/subproviders": "^2.1.9",
- "@0x/types": "^1.5.0",
- "@0x/utils": "^2.1.1",
- "@0x/web3-wrapper": "^3.2.2",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/order-utils": "^3.1.1",
+ "@0x/subproviders": "^2.1.10",
+ "@0x/types": "^1.5.1",
+ "@0x/utils": "^3.0.0",
+ "@0x/web3-wrapper": "^3.2.3",
"@types/dockerode": "^2.5.9",
"@types/p-limit": "^2.0.0",
"async-parallel": "^1.2.3",
"axios": "^0.18.0",
"bottleneck": "^2.13.2",
"dockerode": "^2.5.7",
- "ethereum-types": "^1.1.4",
+ "ethereum-types": "^1.1.5",
"pg": "^7.5.0",
"prettier": "^1.15.3",
"ramda": "^0.25.0",
diff --git a/packages/pipeline/src/parsers/copper/index.ts b/packages/pipeline/src/parsers/copper/index.ts
index 6c0c5abd5..07da66d10 100644
--- a/packages/pipeline/src/parsers/copper/index.ts
+++ b/packages/pipeline/src/parsers/copper/index.ts
@@ -44,8 +44,8 @@ export interface CopperActivityParentResponse {
// custom activity types
export enum CopperActivityTypeCategory {
- user = 'user',
- system = 'system',
+ User = 'user',
+ System = 'system',
}
export interface CopperActivityTypeResponse {
id: number;
@@ -90,7 +90,7 @@ export enum CopperCustomFieldType {
Date = 'Date',
Checkbox = 'Checkbox',
Float = 'Float',
- URL = 'URL',
+ URL = 'URL', // tslint:disable-line:enum-naming
Percentage = 'Percentage',
Currency = 'Currency',
Connect = 'Connect',
diff --git a/packages/pipeline/src/scripts/pull_radar_relay_orders.ts b/packages/pipeline/src/scripts/pull_radar_relay_orders.ts
index 40bb6fc97..03fc764f2 100644
--- a/packages/pipeline/src/scripts/pull_radar_relay_orders.ts
+++ b/packages/pipeline/src/scripts/pull_radar_relay_orders.ts
@@ -29,18 +29,23 @@ async function getOrderbookAsync(): Promise<void> {
console.log(`Got ${rawOrders.records.length} orders.`);
console.log('Parsing orders...');
// Parse the sra orders, then add source url to each.
- const orders = R.pipe(parseSraOrders, R.map(setSourceUrl(RADAR_RELAY_URL)))(rawOrders);
+ const orders = R.pipe(
+ parseSraOrders,
+ R.map(setSourceUrl(RADAR_RELAY_URL)),
+ )(rawOrders);
// Save all the orders and update the observed time stamps in a single
// transaction.
console.log('Saving orders and updating timestamps...');
const observedTimestamp = Date.now();
- await connection.transaction(async (manager: EntityManager): Promise<void> => {
- for (const order of orders) {
- await manager.save(SraOrder, order);
- const orderObservation = createObservedTimestampForOrder(order, observedTimestamp);
- await manager.save(orderObservation);
- }
- });
+ await connection.transaction(
+ async (manager: EntityManager): Promise<void> => {
+ for (const order of orders) {
+ await manager.save(SraOrder, order);
+ const orderObservation = createObservedTimestampForOrder(order, observedTimestamp);
+ await manager.save(orderObservation);
+ }
+ },
+ );
}
const sourceUrlProp = R.lensProp('sourceUrl');
@@ -49,6 +54,8 @@ const sourceUrlProp = R.lensProp('sourceUrl');
* Sets the source url for a single order. Returns a new order instead of
* mutating the given one.
*/
-const setSourceUrl = R.curry((sourceURL: string, order: SraOrder): SraOrder => {
- return R.set(sourceUrlProp, sourceURL, order);
-});
+const setSourceUrl = R.curry(
+ (sourceURL: string, order: SraOrder): SraOrder => {
+ return R.set(sourceUrlProp, sourceURL, order);
+ },
+);
diff --git a/packages/pipeline/test/fixtures/copper/api_v1_list_leads.json b/packages/pipeline/test/fixtures/copper/api_v1_list_leads.json
index 5223976f9..e7161085d 100644
--- a/packages/pipeline/test/fixtures/copper/api_v1_list_leads.json
+++ b/packages/pipeline/test/fixtures/copper/api_v1_list_leads.json
@@ -305,8 +305,7 @@
"custom_fields": [
{
"custom_field_definition_id": 100764,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
},
{
"custom_field_definition_id": 103481,
@@ -345,8 +344,7 @@
"custom_fields": [
{
"custom_field_definition_id": 100764,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
},
{
"custom_field_definition_id": 103481,
@@ -385,13 +383,11 @@
"custom_fields": [
{
"custom_field_definition_id": 100764,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
},
{
"custom_field_definition_id": 103481,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
}
],
"date_created": 1489791470,
@@ -426,13 +422,11 @@
"custom_fields": [
{
"custom_field_definition_id": 100764,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5-----"
},
{
"custom_field_definition_id": 103481,
- "value":
- "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
+ "value": "|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------|--------1---------2---------3---------4---------5---------6---------7---------8---------9---------"
}
],
"date_created": 1489791672,
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 13109e613..30893cfc8 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "timestamp": 1547225310,
+ "version": "1.0.24",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1547040760,
"version": "1.0.23",
"changes": [
@@ -337,18 +346,15 @@
"version": "0.0.5",
"changes": [
{
- "note":
- "Handle `reflection` type rendering so that anonymous function type declarations render properly",
+ "note": "Handle `reflection` type rendering so that anonymous function type declarations render properly",
"pr": 465
},
{
- "note":
- "Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures.",
+ "note": "Rename `MethodSignature` to `Signature` and change it's props so that it can be used to render method and function signatures.",
"pr": 465
},
{
- "note":
- "Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks.",
+ "note": "Rename `MethodBlock` to `SignatureBlock` since it is not used to render method and function signature blocks.",
"pr": 465
},
{
@@ -362,8 +368,7 @@
"version": "0.0.3",
"changes": [
{
- "note":
- "Move TS typings from devDependencies to dependencies since they are needed by the package user."
+ "note": "Move TS typings from devDependencies to dependencies since they are needed by the package user."
}
],
"timestamp": 1521298800
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 01f987645..51c56cf41 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
+## v1.0.24 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.0.23 - _January 9, 2019_
* Dependencies updated
diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index 19c092e4d..7b1f4f80a 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -11,15 +11,15 @@ A full-page React component for rendering beautiful documentation for Solidity a
#### Features
-* Mobile optimized
-* Reads Javadoc-style comments in your code to generate class/method/argument/return/type comments.
-* Syntax highlighting support for TypeScript & Solidity
-* Type declaration linking
-* Type declaration popovers to avoid clicking through to the definition
-* Section/method/type anchors for easily pointing others to a specific part of your docs.
-* Version picker
-* Customizable sidebar header
-* Supports custom markdown sections so you can easily add an intro or installation instructions.
+- Mobile optimized
+- Reads Javadoc-style comments in your code to generate class/method/argument/return/type comments.
+- Syntax highlighting support for TypeScript & Solidity
+- Type declaration linking
+- Type declaration popovers to avoid clicking through to the definition
+- Section/method/type anchors for easily pointing others to a specific part of your docs.
+- Version picker
+- Customizable sidebar header
+- Supports custom markdown sections so you can easily add an intro or installation instructions.
## Installation
@@ -45,9 +45,9 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
Feel free to contribute to these improvements!
-* Allow user to pass in styling for all major elements similar to [Material-UI](http://www.material-ui.com/).
-* Allow user to define an alternative font and have it change everywhere.
-* Add source links to Solidity docs (currently unsupported by solc, which underlies sol-doc).
+- Allow user to pass in styling for all major elements similar to [Material-UI](http://www.material-ui.com/).
+- Allow user to define an alternative font and have it change everywhere.
+- Add source links to Solidity docs (currently unsupported by solc, which underlies sol-doc).
## Contributing
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 7cd0ae55a..3df2cd4df 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/react-docs",
- "version": "1.0.23",
+ "version": "1.0.24",
"engines": {
"node": ">=6.12"
},
@@ -24,8 +24,8 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.22",
- "@0x/tslint-config": "^2.0.0",
+ "@0x/dev-utils": "^1.0.23",
+ "@0x/tslint-config": "^2.0.1",
"@types/compare-versions": "^3.0.0",
"@types/styled-components": "4.0.0",
"make-promises-safe": "^1.1.0",
@@ -34,9 +34,9 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/react-shared": "^1.1.0",
- "@0x/types": "^1.5.0",
- "@0x/utils": "^2.1.1",
+ "@0x/react-shared": "^1.1.1",
+ "@0x/types": "^1.5.1",
+ "@0x/utils": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/material-ui": "^0.20.0",
"@types/node": "*",
@@ -47,13 +47,13 @@
"compare-versions": "^3.0.1",
"lodash": "^4.17.5",
"material-ui": "^0.20.0",
- "react": "^16.4.2",
- "react-dom": "^16.4.2",
+ "react": "^16.5.2",
+ "react-dom": "^16.5.2",
"react-markdown": "^3.2.2",
"react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
"react-tooltip": "^3.2.7",
"semver": "5.5.0",
- "styled-components": "^3.3.0"
+ "styled-components": "^4.0.1"
},
"publishConfig": {
"access": "public"
diff --git a/packages/react-docs/src/components/doc_reference.tsx b/packages/react-docs/src/components/doc_reference.tsx
index 85547576b..424fe9ecf 100644
--- a/packages/react-docs/src/components/doc_reference.tsx
+++ b/packages/react-docs/src/components/doc_reference.tsx
@@ -194,21 +194,19 @@ export class DocReference extends React.Component<DocReferenceProps, DocReferenc
<div>{functionDefs}</div>
</div>
)}
- {!_.isUndefined(docSection.events) &&
- docSection.events.length > 0 && (
- <div>
- <h2 style={headerStyle}>Events</h2>
- <div>{eventDefs}</div>
- </div>
- )}
+ {!_.isUndefined(docSection.events) && docSection.events.length > 0 && (
+ <div>
+ <h2 style={headerStyle}>Events</h2>
+ <div>{eventDefs}</div>
+ </div>
+ )}
{!_.isUndefined(docSection.externalExportToLink) &&
this._renderExternalExports(docSection.externalExportToLink)}
- {!_.isUndefined(typeDefs) &&
- typeDefs.length > 0 && (
- <div>
- <div>{typeDefs}</div>
- </div>
- )}
+ {!_.isUndefined(typeDefs) && typeDefs.length > 0 && (
+ <div>
+ <div>{typeDefs}</div>
+ </div>
+ )}
<div
style={{
width: '100%',
diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx
index 0df44ca1c..06896159f 100644
--- a/packages/react-docs/src/components/interface.tsx
+++ b/packages/react-docs/src/components/interface.tsx
@@ -45,7 +45,8 @@ export const Interface: React.SFC<InterfaceProps> = (props: InterfaceProps): any
typeDefinitionByName={props.typeDefinitionByName}
isInPopover={props.isInPopover}
/>
- )},
+ )}
+ ,
</span>
);
});
diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx
index 7cdf19bb0..3189d86cf 100644
--- a/packages/react-docs/src/components/signature_block.tsx
+++ b/packages/react-docs/src/components/signature_block.tsx
@@ -91,16 +91,14 @@ export class SignatureBlock extends React.Component<SignatureBlockProps, Signatu
/>
)}
{method.comment && <Comment comment={method.comment} className="py2" />}
- {method.parameters &&
- !_.isEmpty(method.parameters) &&
- hasExclusivelyNamedParams && (
- <div>
- <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
- ARGUMENTS
- </h4>
- {this._renderParameterDescriptions(method.parameters, method.name)}
- </div>
- )}
+ {method.parameters && !_.isEmpty(method.parameters) && hasExclusivelyNamedParams && (
+ <div>
+ <h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
+ ARGUMENTS
+ </h4>
+ {this._renderParameterDescriptions(method.parameters, method.name)}
+ </div>
+ )}
{method.returnComment && (
<div className="pt1 comment">
<h4 className="pb1 thin" style={{ borderBottom: '1px solid #e1e8ed' }}>
diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx
index fa3b658b4..894c3f560 100644
--- a/packages/react-docs/src/components/type.tsx
+++ b/packages/react-docs/src/components/type.tsx
@@ -53,7 +53,8 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
typeDefinitionByName={props.typeDefinitionByName}
docsInfo={props.docsInfo}
isInPopover={props.isInPopover}
- />[]
+ />
+ []
</span>
);
} else {
@@ -181,9 +182,11 @@ export const Type: React.SFC<TypeProps> = (props: TypeProps): any => {
});
typeName = (
<div>
- [{_.reduce(tupleTypes, (prev: React.ReactNode, curr: React.ReactNode) => {
+ [
+ {_.reduce(tupleTypes, (prev: React.ReactNode, curr: React.ReactNode) => {
return [prev, ', ', curr];
- })}]
+ })}
+ ]
</div>
);
break;
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index aaf2485d1..2494d1dae 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json