This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
Merge development into 3.0 #2170
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… apply hidden and custom labels to filters from algolia. Added sorting guides (alphabetically) and tools (by community maintenance and alphabetically).
…parallel option for terser. Added target browsers and cache directory option for babel-loader
…l option to Terser plugin, added cache loader and caching directory to mdx / babel loaders.
… other loaders in webpack config
…ode-sass as a dev dependency as it's needed by sass-loader
…y / suspense. Removed loadable nad its types from package.json
…s on image and its container in mdx
xianny
requested review from
BMillman19,
dekz,
fabioberger,
feuGeneA,
fragosti,
hysz and
steveklebanoff
as code owners
xianny
force-pushed
the
merge-development-into-3.0
branch
3 times, most recently
from
b03f0df
to
7639866
Compare
This merge resolves conflicts in contracts/* packages and abi-gen Tests in contracts/* are passing Tests in packages/* are failing. The main issue is refactoring the SignedOrder type to conform with the v3 spec. There may be other smaller refactors needed to get tests passing again.
xianny
force-pushed
the
merge-development-into-3.0
branch
from
7639866
to
f5bf800
Compare
feuGeneA
approved these changes
Sep 18, 2019
fabioberger
approved these changes
Sep 18, 2019
| @@ -101,7 +101,7 @@ function filterOutExpiredAndNonOpenOrders( | |||
| */ | |||
| function getValidOrdersWithRemainingFillableMakerAssetAmountsFromOnChain( | |||
| inputOrders: SignedOrder[], | |||
| ordersAndTradersInfo: OrderAndTraderInfo[], | |||
| ordersAndTradersInfo: any[], | |||
There was a problem hiding this comment.
I think ideally we would keep this as a specific type, but given asset-swapper is basically replacing this package seems fine
|
Changes to |
BMillman19
approved these changes
Sep 18, 2019
albrow
suggested changes
Sep 18, 2019
There was a problem hiding this comment.
Given the size of this PR, I was only really able to look at files for which I am the code owner.
It looks like some changes to contract-addresses were accidentally left out of this PR. See my other comment. The CircleCI config file also looks a little wonky to me but maybe that is intentional or we are planning to address it later.
.circleci/config.yml
Outdated
| @@ -90,7 +71,7 @@ jobs: | |||
| - restore_cache: | |||
| keys: | |||
| - repo-{{ .Environment.CIRCLE_SHA1 }} | |||
| - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-staking | |||
There was a problem hiding this comment.
Did we mean to remove 0x/contracts-staking here?
.circleci/config.yml
Outdated
| - run: yarn wsrun test:circleci @0x/assert | ||
| - run: yarn wsrun test:circleci @0x/base-contract | ||
| # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0. |
There was a problem hiding this comment.
This diff looks messed up to me, but maybe I am just missing some context. There are basically duplicated steps for development and 3.0 (e.g. build and build-3.0, test-rest and test-rest-3.0). In this PR we are removing comments and steps related to 3.0 in some places and adding them back in other places. For example we are removing the comment TODO(dorothy-zbornak): Re-enable after updating this package for 3.0. here but it gets added again further up in the file.
Shouldn't the end state of this PR be that all the steps with the -3.0 suffix get removed and we consolidate everything into a single set of steps? Or are we planning to do that in a subsequent PR?
There was a problem hiding this comment.
We haven't been building ts packages in the 3.0 branch. The plan is to refactor packages piecemeal in subsequent PRs. For now we're just trying to reconcile development changes with 3.0, and then continue working on 3.0
I did move some things around in this file because I wound up checking out the development version and manually applying some of the 3.0 changes. That's why the diff is harder to read, apologies for that.
There was a problem hiding this comment.
👍 I see. I think it would be less confusing if (rather than adding separate steps with a 3.0 suffix) we simply commented or changed the existing steps as needed in order to get the tests working on this branch. But if you are happy with the current state of .circleci/config.yml I'm okay with it. I care a lot more about the end state of the config file after we get all the tests passing.
| @@ -1,6 +1,6 @@ | |||
| [ | |||
| { | |||
| "version": "3.2.0", | |||
There was a problem hiding this comment.
Is there a reason we changed this from 3.2.0 to 3.0.0?
There was a problem hiding this comment.
In 3.0 branch currently the previous version is 2.2.5. Not sure why - the next biggest version jump should be to next major version 3.0.0.
| @@ -1,6 +1,6 @@ | |||
| ## AssetProxy | |||
|
|
|||
| This package contains the implementations of all of the [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts available within the 0x protocol. These contracts are responsible for decoding the `assetData` sent to them and performing the actual transfer of assets. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package. | |||
| This package contains the implementations of all of the [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts available within the 0x protocol. These contracts are responsible for decoding the `assetData` sent to them and performing the actual transfer of assets. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package. | |||
There was a problem hiding this comment.
All these version numbers should be updated from v2 to v3 at some point.
| "version": "3.2.0", | ||
| "changes": [ | ||
| { | ||
| "note": "Added `getNetworkIdByExchangeAddressOrThrow`", |
There was a problem hiding this comment.
The getNetworkIdByExchangeAddressOrThrow function is not actually included in this PR. AFAICT it doesn't exist in the merge-development-into-3.0 branch. The change was made in this PR: #2096.
xianny
force-pushed
the
merge-development-into-3.0
branch
from
59c126d
to
b9d6cef
Compare
xianny
force-pushed
the
merge-development-into-3.0
branch
from
d64b87e
to
95a8ffb
Compare
xianny
force-pushed
the
merge-development-into-3.0
branch
from
95a8ffb
to
13d2445
Compare
jalextowle
pushed a commit
that referenced
this pull request
Sep 23, 2019
* Added longer timeout for algolia admin operations. Added an option to apply hidden and custom labels to filters from algolia. Added sorting guides (alphabetically) and tools (by community maintenance and alphabetically).
* Fixed some types in guides
* Updated webpack, webpack-dev-server, webpack-bundle-analyzer, webpack-cli versions
* Updated / cleaned up babel and mdx packages
* Updated terser webpack plugin; Removed uglify plugin (unused). Added parallel option for terser. Added target browsers and cache directory option for babel-loader
* Webpack changes: using eval-source-map for development, added parallel option to Terser plugin, added cache loader and caching directory to mdx / babel loaders.
* Removed unusued pkg: body-scroll-lock
* Removed unused jsonschema / @types/jsonschema packages
* Removed unused less node package, adjusted less loader rules to match other loaders in webpack config
* Removed unusued node-sass package. Left sass-loader for webpack intact.
* Removed unused package react-lazyload
* Removed unused package react-typist
* Removed react-tap-event types as it's not used anymore. Reinstalled node-sass as a dev dependency as it's needed by sass-loader
* Moves @0x/types and @0x/typescript-typings to devDependencies
* Replaced react loadable (only used in Icon) with the native react lazy / suspense. Removed loadable nad its types from package.json
* Removed unused make-promises-safe package
* Moved animations to public and compressed files
* Added opening step links in new tab if the url is valid
* Moved @0x/types back to dependencies.
* Added animation wrapper with positioning props. Updated animations for core concepts.
* Replaced images for core concepts. Fixed a bug causing duplicate props on image and its container in mdx
* Remove legacy FAQ
* Update yarn.lock
* Add MD docs diff test to CI
* Remove unused dep
* Update docs to latest format
* Update yarn.lock
* Update ts-doc-gen with fix for multi-link lines
* Final docs gen
* Fix home route
* Update yarn.lock
* Add Golang Mesh RPC package and update versions
* Update the tools MDX files from authoritative S3 before build and dev server start
* Gitignore the tool MDX files in website repo
* Redirect old docs pages and wiki to new doc pages
* Move out Algolia indexing command-line tool out of website and remove need to expose admin key
* Add updating tools from S3 and indexing content on Algolia to deployment commands
* Add note about admin API env var needed for indexing docs
* Remove scripts gitignore since we don't have monorepo scripts in each package anymore
* Segregate indexes by environment
* Fixed 404 display for docs pages
* Removed webpack bundle analyzer
* Fix search and indexing
* Use `yarn` because otherwise the flags don't get passed down properly
* Improve indexing comment
* Remove legacy doc pages
* Fix linter errors
* Fix clean command to remove bundles recursively
* Revert react and react-dom versions in Instant
* Remove old doc md files
* Fix links
* Fix prettier
* Combine @0x/utils exports
* Update doc links
* Remove unused components
* Fix TS error
* Add missing new line
* Update Guides
* Ignore auto-generated MDX in website repo
* Prettier fix
* Add all guides to the sitemap.txt
* Add MMing guide
* Fix Get Started links
* Add 0x Extensions guide
* Replace all links to wiki with links to guides section
* Fix all /docs/{pkg} links to /docs/tools/{pkg}
* Remove deployer endpoint that is no longer used
* Fix links in Core Concepts
* Fixed regex to not remove hashes on links beyond the initial one
* Fixed huge width on instant screenshot
* Cleaned up core concept illustrations
* Started updating tool titles
* Fixed sectionizing headings in docs: Nested sections do not get wrapped in parent sections anymore; only sectionizing headings that need to be sectionized (i.e. that appear in the table of contents)
* Stylstic fix for the new way we sectionize headings / table of contents
* Change CoordinatorWrapper constructor to take a provider
* Added autolinking headings in mdx docs
* Refactor doc generation script to only generate MD docs and to have them reflect what is exported in their respective index.ts files
* Update ts-doc-gen
* Pass in provider, not Web3Wrapper
* Add back logic to prune out private methods
* Write algolia_metadata to utils dir
* Remove duplicate algolia_meta
* Add more packages to those we generate docs for and remove unused flags
* Update reference.mdx files
* Hide tools from homepage that have isHidden flag
* Link 0x.js to it's reference page
* Update tool naming to be more human readable
* Remove order-watcher reference doc
* Add blurb about on-chain API Explorer
* Add "On-chain" prefix to section name
* Remove committed reference file
* Sorting guides by difficulty and alphabetically
* Pushed sorting guides titles case-insensitive
* Sorting tools by difficulty and alphabetically. Removed icons from featured tools. Extracted common difficultyOrder constant
* Update ts-doc-gen so that it properly converts module relative links to anchor links
* Update doc references
* Remove "Relayers" topic/tag
* Prettier fix
* Remove hr so we don't have a bunch in a row
* Cleaned up CLI tag and added link to tools on API page
* Cleaned up some Guide titles
* Added bug bounty program guide
* Fixed a bug in algolia_meta
* Thrid level of nesting / temporary webpack config
* Open help link in new tab
* Link Python tools to doc pages not PyPi
* Fix links in guides
* Remove unused variables
* Revert webpack config
* Extracted common styles for levels of nesting deeper than 1 in the mdx table of contents
* Smoother animation on active table of contents state change
* Autolink headings in mdx only up to h3. Added heading sizes (in px) for h4,h5,h6 in mdx headings
* Fix prettier
* Adjusted font-size for paragraph, ordered and unordered lists. Fixed line-heights and colors too.
* Update ts-doc-gen and the reference docs
* Replace 0xproject.com urls with 0x.org
* Update README links
* Fix header sizes to display optimally in sidebar
* Fixed an issue with other nodes than text being parsed incorrectly in the table of contents
* Fixed styles for table of contents
* Use a different babel plugin that works in a production webpack build
* Unbroke build process / generating toc
* Changed line-height to 1.6 for paragraph
* Adjust scrollbar / toc height to available space
* Fixed some types
* Remove unnecessary link
* Fix casing on TypeScript
* Fix casing of PyPI
* Remove doc gen from abi-gen-wrappers since it'll be tested via contract-wrappers
* Fix MD docs and make sure generated contract wrappers are being rendered
* Remove generated docs in clean
* Correctly copying code samples
* Several additional fixes to the reference MDX docs
* Changed tools to Tools & Libraries - top nav left as just tools
* Changed references from Asset Buyer to Asset Swapper
* Changed trader keyword to trading
* Nevermind, changed back to Trader
* Sneaking in updated product dropdown menu titles based on Will's feedback
* Removed the word wiki from resources dropdown
* Open legal guide in same window
* Removed the isCommunity filter / custom filter labels functionality (only used for that before)
* Update ts-doc-gen version to one that fixes issues with Object Literals and removes Hierarchy sections and Module headers
* update yarn.lock
* Remove unused code
* Remove unused import
* Remove unused imports
* Remove unused import
* Fix prettier
* Update outdating dep version
* Created a color scheme for code snippets. Fixed language not being passed to some code blocks in two guides.
* Update abi-gen-wrappers dep version
* Update Algolia to production account
* Fix prettier
* Fix prettier in algolia_meta
* Remove packages/dev-tools-pages folder and update yarn.lock
* Remove other random references to dev-tools-pages
* Fix website
* Changed the order of indices in search suggestions
* Removed a comment
* Added scrollbar size adjustment on resize / scroll
* Rendering sidebar on mobile without any event listeners / taxing calculations / changes in height
* Added a performance comment
* Simplified table of contents
* Update ganache-cli to later version
* Remove bundle dirs too
* Added keeping active link in view when scrolling content in the docs
* Increase available memory for webpack
* Update contract addresses
* Update market-making guide to mention Mesh as an alternative to SRA
* Update Web3 Provider Explained guide
* Re-wrote Ganache Setup guide into a Setting up a local 0x testnet guide
* Export more of abi-gen-wrappers from contract-wrappers
* Final update of reference docs
* Add contract-wrappers MD docs and update it's index.ts so that no types are missing
* Fix prettier
* Increase the memory allocation for building the website
* Remove use of remove type
* Check if link is a valid url in mdx inline link: if so, open in a new tab, if not, same tab.
* Print out which snapshot version is being downloaded
* Updated CHANGELOGS & MD docs
* Publish
- @0x/contracts-asset-proxy@2.2.7
- @0x/contracts-coordinator@2.0.12
- @0x/contracts-dev-utils@0.0.9
- @0x/contracts-erc1155@1.1.14
- @0x/contracts-erc20@2.2.13
- @0x/contracts-erc721@2.1.14
- @0x/contracts-exchange-forwarder@3.0.11
- @0x/contracts-exchange-libs@3.0.7
- @0x/contracts-exchange@2.1.13
- @0x/contracts-extensions@4.0.7
- @0x/contracts-multisig@3.1.13
- @0x/contracts-test-utils@3.1.15
- @0x/contracts-utils@3.2.3
- 0x.js@7.0.1
- @0x/abi-gen-wrappers@5.3.1
- @0x/abi-gen@4.2.0
- @0x/assert@2.1.5
- @0x/asset-buyer@6.1.13
- @0x/asset-swapper@1.0.3
- @0x/base-contract@5.3.3
- @0x/connect@5.0.18
- @0x/contract-artifacts@2.2.1
- @0x/contract-wrappers@12.0.0
- @0x/contracts-gen@1.0.14
- @0x/dev-tools-pages@0.0.30
- @0x/dev-utils@2.3.2
- ethereum-types@2.1.5
- @0x/fill-scenarios@3.0.18
- @0x/instant@1.0.30
- @0x/json-schemas@4.0.1
- @0x/migrations@4.3.1
- @0x/monorepo-scripts@1.0.36
- @0x/order-utils@8.3.1
- @0x/sol-compiler@3.1.14
- @0x/sol-coverage@3.0.11
- @0x/sol-doc@2.0.18
- @0x/sol-profiler@3.1.13
- @0x/sol-resolver@2.0.10
- @0x/sol-trace@2.0.19
- @0x/sol-tracing-utils@6.0.18
- @0x/sra-spec@2.0.16
- @0x/subproviders@5.0.3
- @0x/testnet-faucets@1.0.86
- @0x/types@2.4.2
- @0x/typescript-typings@4.2.5
- @0x/utils@4.5.1
- @0x/web3-wrapper@6.0.12
- @0x/website@0.0.89
* Remove the website from the monorepo
* Update yarn.lock
* Remove website files that were accidentally merged back in
* Use local EVM for pure functions (#2108)
* add local evm for pure functions
* increase container size to >=8gb for static-tests
* increase max bundle size because of ethereumjs-vm dependency
* add declarations for ethereumjs-vm in @0x/typescript-typings
* Make `OrdersChannelSubscriptionOpts` conform to SRAv2
* Make it easier to use validateOrderFillableOrThrowAsync (#2096)
* make it easier to use validateOrderFillableOrThrowAsync
* add unit tests, use DevUtils
* remove dependency on @0x/order-utils from @0x/migrations
* add devUtils to contract-wrappers (#2146)
* Delete docs in S3 bucket before uploading latest version so we only ever have one version uploaded at a time
* Update to new ts-doc-gen version that fixes links in "Inherited from" lines
* try to fix instant build
* Remove redoc-cli as a dep from sra-spec
* Smooth out some last incompatible types
* Fix prettier
* Add terser-webpack-plugin to 0x.js deps
* @0x/orderbook
* AssetSwapper to use @0x/orderbook
* Remove unused imported type
* Prevent double websocket connections
* Fix build error
* fixed consumer inconsistency bug
* linted + added convenience functionality
* minor changes/typo fixes
* updated websocket
* updated for prettier
* Fix versions and exported types
* move log tests to @0x/abi-gen; delete exchange_wrapper_test (#2160)
* Remove unused exported types
* Fix exports from asset-swapper
* Update exported types for docs
* Update mesh client dep
* Move perPage and 18 precision lower to re-use
* fix ABI encoding/decoding functions (#2165)
* Fix typo at contract import (#2102)
* Updated CHANGELOGS & MD docs
* Publish
- @0x/contracts-asset-proxy@2.2.8
- @0x/contracts-coordinator@2.0.13
- @0x/contracts-dev-utils@0.0.10
- @0x/contracts-erc1155@1.1.15
- @0x/contracts-erc20@2.2.14
- @0x/contracts-erc721@2.1.15
- @0x/contracts-exchange-forwarder@3.0.12
- @0x/contracts-exchange-libs@3.0.8
- @0x/contracts-exchange@2.1.14
- @0x/contracts-extensions@4.0.8
- @0x/contracts-multisig@3.1.14
- @0x/contracts-test-utils@3.1.16
- @0x/contracts-utils@3.2.4
- 0x.js@7.0.2
- @0x/abi-gen-wrappers@5.3.2
- @0x/abi-gen@4.2.1
- @0x/assert@2.1.6
- @0x/asset-buyer@6.1.14
- @0x/asset-swapper@2.0.0
- @0x/base-contract@5.4.0
- @0x/connect@5.0.19
- @0x/contract-addresses@3.2.0
- @0x/contract-artifacts@2.2.2
- @0x/contract-wrappers@12.1.0
- @0x/contracts-gen@1.0.15
- @0x/dev-utils@2.3.3
- ethereum-types@2.1.6
- @0x/fill-scenarios@3.0.19
- @0x/instant@1.0.31
- @0x/json-schemas@4.0.2
- @0x/migrations@4.3.2
- @0x/monorepo-scripts@1.0.37
- @0x/order-utils@8.4.0
- @0x/orderbook@0.0.2
- @0x/sol-compiler@3.1.15
- @0x/sol-coverage@3.0.12
- @0x/sol-doc@2.0.19
- @0x/sol-profiler@3.1.14
- @0x/sol-resolver@2.0.11
- @0x/sol-trace@2.0.20
- @0x/sol-tracing-utils@6.0.19
- @0x/sra-spec@2.0.17
- @0x/subproviders@5.0.4
- @0x/testnet-faucets@1.0.87
- @0x/types@2.4.3
- @0x/typescript-typings@4.3.0
- @0x/utils@4.5.2
- @0x/web3-wrapper@6.0.13
* fix circleci diff
* update changelog
dorothy-zbornak
pushed a commit
that referenced
this pull request
Feb 27, 2020
* Added longer timeout for algolia admin operations. Added an option to apply hidden and custom labels to filters from algolia. Added sorting guides (alphabetically) and tools (by community maintenance and alphabetically).
* Fixed some types in guides
* Updated webpack, webpack-dev-server, webpack-bundle-analyzer, webpack-cli versions
* Updated / cleaned up babel and mdx packages
* Updated terser webpack plugin; Removed uglify plugin (unused). Added parallel option for terser. Added target browsers and cache directory option for babel-loader
* Webpack changes: using eval-source-map for development, added parallel option to Terser plugin, added cache loader and caching directory to mdx / babel loaders.
* Removed unusued pkg: body-scroll-lock
* Removed unused jsonschema / @types/jsonschema packages
* Removed unused less node package, adjusted less loader rules to match other loaders in webpack config
* Removed unusued node-sass package. Left sass-loader for webpack intact.
* Removed unused package react-lazyload
* Removed unused package react-typist
* Removed react-tap-event types as it's not used anymore. Reinstalled node-sass as a dev dependency as it's needed by sass-loader
* Moves @0x/types and @0x/typescript-typings to devDependencies
* Replaced react loadable (only used in Icon) with the native react lazy / suspense. Removed loadable nad its types from package.json
* Removed unused make-promises-safe package
* Moved animations to public and compressed files
* Added opening step links in new tab if the url is valid
* Moved @0x/types back to dependencies.
* Added animation wrapper with positioning props. Updated animations for core concepts.
* Replaced images for core concepts. Fixed a bug causing duplicate props on image and its container in mdx
* Remove legacy FAQ
* Update yarn.lock
* Add MD docs diff test to CI
* Remove unused dep
* Update docs to latest format
* Update yarn.lock
* Update ts-doc-gen with fix for multi-link lines
* Final docs gen
* Fix home route
* Update yarn.lock
* Add Golang Mesh RPC package and update versions
* Update the tools MDX files from authoritative S3 before build and dev server start
* Gitignore the tool MDX files in website repo
* Redirect old docs pages and wiki to new doc pages
* Move out Algolia indexing command-line tool out of website and remove need to expose admin key
* Add updating tools from S3 and indexing content on Algolia to deployment commands
* Add note about admin API env var needed for indexing docs
* Remove scripts gitignore since we don't have monorepo scripts in each package anymore
* Segregate indexes by environment
* Fixed 404 display for docs pages
* Removed webpack bundle analyzer
* Fix search and indexing
* Use `yarn` because otherwise the flags don't get passed down properly
* Improve indexing comment
* Remove legacy doc pages
* Fix linter errors
* Fix clean command to remove bundles recursively
* Revert react and react-dom versions in Instant
* Remove old doc md files
* Fix links
* Fix prettier
* Combine @0x/utils exports
* Update doc links
* Remove unused components
* Fix TS error
* Add missing new line
* Update Guides
* Ignore auto-generated MDX in website repo
* Prettier fix
* Add all guides to the sitemap.txt
* Add MMing guide
* Fix Get Started links
* Add 0x Extensions guide
* Replace all links to wiki with links to guides section
* Fix all /docs/{pkg} links to /docs/tools/{pkg}
* Remove deployer endpoint that is no longer used
* Fix links in Core Concepts
* Fixed regex to not remove hashes on links beyond the initial one
* Fixed huge width on instant screenshot
* Cleaned up core concept illustrations
* Started updating tool titles
* Fixed sectionizing headings in docs: Nested sections do not get wrapped in parent sections anymore; only sectionizing headings that need to be sectionized (i.e. that appear in the table of contents)
* Stylstic fix for the new way we sectionize headings / table of contents
* Change CoordinatorWrapper constructor to take a provider
* Added autolinking headings in mdx docs
* Refactor doc generation script to only generate MD docs and to have them reflect what is exported in their respective index.ts files
* Update ts-doc-gen
* Pass in provider, not Web3Wrapper
* Add back logic to prune out private methods
* Write algolia_metadata to utils dir
* Remove duplicate algolia_meta
* Add more packages to those we generate docs for and remove unused flags
* Update reference.mdx files
* Hide tools from homepage that have isHidden flag
* Link 0x.js to it's reference page
* Update tool naming to be more human readable
* Remove order-watcher reference doc
* Add blurb about on-chain API Explorer
* Add "On-chain" prefix to section name
* Remove committed reference file
* Sorting guides by difficulty and alphabetically
* Pushed sorting guides titles case-insensitive
* Sorting tools by difficulty and alphabetically. Removed icons from featured tools. Extracted common difficultyOrder constant
* Update ts-doc-gen so that it properly converts module relative links to anchor links
* Update doc references
* Remove "Relayers" topic/tag
* Prettier fix
* Remove hr so we don't have a bunch in a row
* Cleaned up CLI tag and added link to tools on API page
* Cleaned up some Guide titles
* Added bug bounty program guide
* Fixed a bug in algolia_meta
* Thrid level of nesting / temporary webpack config
* Open help link in new tab
* Link Python tools to doc pages not PyPi
* Fix links in guides
* Remove unused variables
* Revert webpack config
* Extracted common styles for levels of nesting deeper than 1 in the mdx table of contents
* Smoother animation on active table of contents state change
* Autolink headings in mdx only up to h3. Added heading sizes (in px) for h4,h5,h6 in mdx headings
* Fix prettier
* Adjusted font-size for paragraph, ordered and unordered lists. Fixed line-heights and colors too.
* Update ts-doc-gen and the reference docs
* Replace 0xproject.com urls with 0x.org
* Update README links
* Fix header sizes to display optimally in sidebar
* Fixed an issue with other nodes than text being parsed incorrectly in the table of contents
* Fixed styles for table of contents
* Use a different babel plugin that works in a production webpack build
* Unbroke build process / generating toc
* Changed line-height to 1.6 for paragraph
* Adjust scrollbar / toc height to available space
* Fixed some types
* Remove unnecessary link
* Fix casing on TypeScript
* Fix casing of PyPI
* Remove doc gen from abi-gen-wrappers since it'll be tested via contract-wrappers
* Fix MD docs and make sure generated contract wrappers are being rendered
* Remove generated docs in clean
* Correctly copying code samples
* Several additional fixes to the reference MDX docs
* Changed tools to Tools & Libraries - top nav left as just tools
* Changed references from Asset Buyer to Asset Swapper
* Changed trader keyword to trading
* Nevermind, changed back to Trader
* Sneaking in updated product dropdown menu titles based on Will's feedback
* Removed the word wiki from resources dropdown
* Open legal guide in same window
* Removed the isCommunity filter / custom filter labels functionality (only used for that before)
* Update ts-doc-gen version to one that fixes issues with Object Literals and removes Hierarchy sections and Module headers
* update yarn.lock
* Remove unused code
* Remove unused import
* Remove unused imports
* Remove unused import
* Fix prettier
* Update outdating dep version
* Created a color scheme for code snippets. Fixed language not being passed to some code blocks in two guides.
* Update abi-gen-wrappers dep version
* Update Algolia to production account
* Fix prettier
* Fix prettier in algolia_meta
* Remove packages/dev-tools-pages folder and update yarn.lock
* Remove other random references to dev-tools-pages
* Fix website
* Changed the order of indices in search suggestions
* Removed a comment
* Added scrollbar size adjustment on resize / scroll
* Rendering sidebar on mobile without any event listeners / taxing calculations / changes in height
* Added a performance comment
* Simplified table of contents
* Update ganache-cli to later version
* Remove bundle dirs too
* Added keeping active link in view when scrolling content in the docs
* Increase available memory for webpack
* Update contract addresses
* Update market-making guide to mention Mesh as an alternative to SRA
* Update Web3 Provider Explained guide
* Re-wrote Ganache Setup guide into a Setting up a local 0x testnet guide
* Export more of abi-gen-wrappers from contract-wrappers
* Final update of reference docs
* Add contract-wrappers MD docs and update it's index.ts so that no types are missing
* Fix prettier
* Increase the memory allocation for building the website
* Remove use of remove type
* Check if link is a valid url in mdx inline link: if so, open in a new tab, if not, same tab.
* Print out which snapshot version is being downloaded
* Updated CHANGELOGS & MD docs
* Publish
- @0x/contracts-asset-proxy@2.2.7
- @0x/contracts-coordinator@2.0.12
- @0x/contracts-dev-utils@0.0.9
- @0x/contracts-erc1155@1.1.14
- @0x/contracts-erc20@2.2.13
- @0x/contracts-erc721@2.1.14
- @0x/contracts-exchange-forwarder@3.0.11
- @0x/contracts-exchange-libs@3.0.7
- @0x/contracts-exchange@2.1.13
- @0x/contracts-extensions@4.0.7
- @0x/contracts-multisig@3.1.13
- @0x/contracts-test-utils@3.1.15
- @0x/contracts-utils@3.2.3
- 0x.js@7.0.1
- @0x/abi-gen-wrappers@5.3.1
- @0x/abi-gen@4.2.0
- @0x/assert@2.1.5
- @0x/asset-buyer@6.1.13
- @0x/asset-swapper@1.0.3
- @0x/base-contract@5.3.3
- @0x/connect@5.0.18
- @0x/contract-artifacts@2.2.1
- @0x/contract-wrappers@12.0.0
- @0x/contracts-gen@1.0.14
- @0x/dev-tools-pages@0.0.30
- @0x/dev-utils@2.3.2
- ethereum-types@2.1.5
- @0x/fill-scenarios@3.0.18
- @0x/instant@1.0.30
- @0x/json-schemas@4.0.1
- @0x/migrations@4.3.1
- @0x/monorepo-scripts@1.0.36
- @0x/order-utils@8.3.1
- @0x/sol-compiler@3.1.14
- @0x/sol-coverage@3.0.11
- @0x/sol-doc@2.0.18
- @0x/sol-profiler@3.1.13
- @0x/sol-resolver@2.0.10
- @0x/sol-trace@2.0.19
- @0x/sol-tracing-utils@6.0.18
- @0x/sra-spec@2.0.16
- @0x/subproviders@5.0.3
- @0x/testnet-faucets@1.0.86
- @0x/types@2.4.2
- @0x/typescript-typings@4.2.5
- @0x/utils@4.5.1
- @0x/web3-wrapper@6.0.12
- @0x/website@0.0.89
* Remove the website from the monorepo
* Update yarn.lock
* Remove website files that were accidentally merged back in
* Use local EVM for pure functions (#2108)
* add local evm for pure functions
* increase container size to >=8gb for static-tests
* increase max bundle size because of ethereumjs-vm dependency
* add declarations for ethereumjs-vm in @0x/typescript-typings
* Make `OrdersChannelSubscriptionOpts` conform to SRAv2
* Make it easier to use validateOrderFillableOrThrowAsync (#2096)
* make it easier to use validateOrderFillableOrThrowAsync
* add unit tests, use DevUtils
* remove dependency on @0x/order-utils from @0x/migrations
* add devUtils to contract-wrappers (#2146)
* Delete docs in S3 bucket before uploading latest version so we only ever have one version uploaded at a time
* Update to new ts-doc-gen version that fixes links in "Inherited from" lines
* try to fix instant build
* Remove redoc-cli as a dep from sra-spec
* Smooth out some last incompatible types
* Fix prettier
* Add terser-webpack-plugin to 0x.js deps
* @0x/orderbook
* AssetSwapper to use @0x/orderbook
* Remove unused imported type
* Prevent double websocket connections
* Fix build error
* fixed consumer inconsistency bug
* linted + added convenience functionality
* minor changes/typo fixes
* updated websocket
* updated for prettier
* Fix versions and exported types
* move log tests to @0x/abi-gen; delete exchange_wrapper_test (#2160)
* Remove unused exported types
* Fix exports from asset-swapper
* Update exported types for docs
* Update mesh client dep
* Move perPage and 18 precision lower to re-use
* fix ABI encoding/decoding functions (#2165)
* Fix typo at contract import (#2102)
* Updated CHANGELOGS & MD docs
* Publish
- @0x/contracts-asset-proxy@2.2.8
- @0x/contracts-coordinator@2.0.13
- @0x/contracts-dev-utils@0.0.10
- @0x/contracts-erc1155@1.1.15
- @0x/contracts-erc20@2.2.14
- @0x/contracts-erc721@2.1.15
- @0x/contracts-exchange-forwarder@3.0.12
- @0x/contracts-exchange-libs@3.0.8
- @0x/contracts-exchange@2.1.14
- @0x/contracts-extensions@4.0.8
- @0x/contracts-multisig@3.1.14
- @0x/contracts-test-utils@3.1.16
- @0x/contracts-utils@3.2.4
- 0x.js@7.0.2
- @0x/abi-gen-wrappers@5.3.2
- @0x/abi-gen@4.2.1
- @0x/assert@2.1.6
- @0x/asset-buyer@6.1.14
- @0x/asset-swapper@2.0.0
- @0x/base-contract@5.4.0
- @0x/connect@5.0.19
- @0x/contract-addresses@3.2.0
- @0x/contract-artifacts@2.2.2
- @0x/contract-wrappers@12.1.0
- @0x/contracts-gen@1.0.15
- @0x/dev-utils@2.3.3
- ethereum-types@2.1.6
- @0x/fill-scenarios@3.0.19
- @0x/instant@1.0.31
- @0x/json-schemas@4.0.2
- @0x/migrations@4.3.2
- @0x/monorepo-scripts@1.0.37
- @0x/order-utils@8.4.0
- @0x/orderbook@0.0.2
- @0x/sol-compiler@3.1.15
- @0x/sol-coverage@3.0.12
- @0x/sol-doc@2.0.19
- @0x/sol-profiler@3.1.14
- @0x/sol-resolver@2.0.11
- @0x/sol-trace@2.0.20
- @0x/sol-tracing-utils@6.0.19
- @0x/sra-spec@2.0.17
- @0x/subproviders@5.0.4
- @0x/testnet-faucets@1.0.87
- @0x/types@2.4.3
- @0x/typescript-typings@4.3.0
- @0x/utils@4.5.2
- @0x/web3-wrapper@6.0.13
* fix circleci diff
* update changelog
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge changes from development into 3.0.
This resolves conflicts in
contracts/*andabi-gen. Tests are passing incontracts/*.There were not too many merge conflicts, but this includes all the changes from
developmentover the past few months. There were a lot of changes and they may not ALL be applied correctly in the merge. I suggest reviewers look at code they have worked on recently, and/or compare this branch withdevelopment.Compared with
development(should only contain changes by protocol team): #2174Testing instructions
Types of changes
Checklist:
[WIP]if necessary.