Compare commits
217 Commits
@0x/react-
...
@0x/sol-re
Author | SHA1 | Date | |
---|---|---|---|
|
cf3787edbb | ||
|
89429c54a7 | ||
|
2cf57a48dd | ||
|
a091b2c19d | ||
|
89e398fa39 | ||
|
a5b7a35160 | ||
|
53fc860d61 | ||
|
749312c0e8 | ||
|
ffd14ab2f2 | ||
|
bf332d578c | ||
|
6c22594882 | ||
|
b8e3829fdb | ||
|
c317a69e7e | ||
|
4c60d59123 | ||
|
cee2954245 | ||
|
a8d9263062 | ||
|
7ae9e79235 | ||
|
15c9479ebe | ||
|
03dea585b4 | ||
|
d7df402c42 | ||
|
052ed21e9c | ||
|
36504646f9 | ||
|
60cdbbccae | ||
|
420333e3c3 | ||
|
b639843115 | ||
|
7a114a6ef1 | ||
|
686f27a96f | ||
|
6487fae113 | ||
|
87c287a5e2 | ||
|
e39ef60775 | ||
|
fb3605026e | ||
|
5b8c9122a2 | ||
|
08d0ff48c3 | ||
|
aa5af04447 | ||
|
39786c3ad5 | ||
|
7f2727236d | ||
|
d6644ed035 | ||
|
a2eede2ec9 | ||
|
ea14913b41 | ||
|
5868c91cfb | ||
|
fd034cc1e4 | ||
|
d00dd07435 | ||
|
16fc2c3776 | ||
|
82f29c395a | ||
|
03248244ff | ||
|
f05d2906e8 | ||
|
2c974b5f3f | ||
|
f412c36e23 | ||
|
eae255b0ff | ||
|
1f0f2076a9 | ||
|
80f1fe1373 | ||
|
571bc736e5 | ||
|
99016cc5a6 | ||
|
f1a7efc97e | ||
|
442de09bbe | ||
|
76dde294f1 | ||
|
edb3a61387 | ||
|
89f67b9bec | ||
|
9131ca1562 | ||
|
92d45a19d1 | ||
|
65af195054 | ||
|
9f47f90c6e | ||
|
472f89bd3d | ||
|
f17fe381bf | ||
|
26977f6408 | ||
|
c8c8219c05 | ||
|
e144ebbb93 | ||
|
aa9aa1f58a | ||
|
2e2e157fc8 | ||
|
219902a169 | ||
|
ab10119c5a | ||
|
5981823ac1 | ||
|
69054d85e8 | ||
|
3e596f6a8c | ||
|
c3884dfa32 | ||
|
a3d93d17cd | ||
|
c6c45095a8 | ||
|
21d9783ef8 | ||
|
89ce87f9f1 | ||
|
592e1a3e6f | ||
|
99176c2d54 | ||
|
ad0083dfa0 | ||
|
6919409c2b | ||
|
f360b2edd6 | ||
|
339ec3e8eb | ||
|
b0c22a222e | ||
|
ea18050589 | ||
|
117726c6d8 | ||
|
31d07fdac8 | ||
|
881655bb57 | ||
|
38949f7ea4 | ||
|
8d3e6f77b7 | ||
|
5865d1f62c | ||
|
e2607980eb | ||
|
f519f5744e | ||
|
fa24ec1a04 | ||
|
6e1014a647 | ||
|
0b46f44ad3 | ||
|
b811b51af9 | ||
|
b88e2c5483 | ||
|
cd333e0977 | ||
|
62706d83c4 | ||
|
284252e7a4 | ||
|
3ad857be6c | ||
|
7fec2f630c | ||
|
c081081448 | ||
|
54bd7df900 | ||
|
5afef5fe82 | ||
|
0c222f9890 | ||
|
e43988aa44 | ||
|
ee91f56bbe | ||
|
52b49fee24 | ||
|
31f096248d | ||
|
d91c41b29c | ||
|
c27a2b64ef | ||
|
fdaffb67e8 | ||
|
d32bf15b69 | ||
|
7536648f7a | ||
|
eb2fa8e4af | ||
|
5d3d2736f5 | ||
|
0574794496 | ||
|
3a23e795ac | ||
|
2dfca078fd | ||
|
9006e8fced | ||
|
6b8f8580d8 | ||
|
eb9d802146 | ||
|
6b11ca6c1d | ||
|
4c8178fc30 | ||
|
4616d6f59d | ||
|
5cb944fe1b | ||
|
50c4909f22 | ||
|
dd8b9bf987 | ||
|
0e3cd82348 | ||
|
3d4041ecd3 | ||
|
89e439c521 | ||
|
0f97771d5a | ||
|
74f0515370 | ||
|
f17c7e4a22 | ||
|
5fe98c816d | ||
|
f75cfd8aa4 | ||
|
7577d96671 | ||
|
58f5b6d0ad | ||
|
a11348ce6b | ||
|
a4825d8748 | ||
|
e3c0363db1 | ||
|
3fdc6e5e47 | ||
|
2ef8204ab4 | ||
|
72b4ee76fb | ||
|
3901380ffb | ||
|
fb24a18f3f | ||
|
1899493ca8 | ||
|
1581ced6ec | ||
|
5e8f53c7b7 | ||
|
370d15ed1d | ||
|
43b792f307 | ||
|
b844126516 | ||
|
43e55a963b | ||
|
9cf055c159 | ||
|
16b5157078 | ||
|
1ae9f68db8 | ||
|
e5d3e3b33a | ||
|
1c8ea1336e | ||
|
a4de585feb | ||
|
e624759bc7 | ||
|
0836ab370e | ||
|
66848ef80f | ||
|
f0b9365ca9 | ||
|
614ca51cb1 | ||
|
f31f9eb24e | ||
|
bc029df082 | ||
|
63b53acd48 | ||
|
50eee9a657 | ||
|
917952bc2a | ||
|
00afb2440d | ||
|
8cf720986e | ||
|
97c54f84f0 | ||
|
e485a98143 | ||
|
1e29f2875d | ||
|
61cd36cc96 | ||
|
a9b4c1cba8 | ||
|
5187017f21 | ||
|
73ea2dac6d | ||
|
e9232bf070 | ||
|
ee3538262d | ||
|
47b281b754 | ||
|
dfa03feb43 | ||
|
49beb6b7a3 | ||
|
6066db8f42 | ||
|
68c1818139 | ||
|
12087b6b70 | ||
|
15a3c234c5 | ||
|
bf7443c985 | ||
|
6c39d498c2 | ||
|
cacb8acf76 | ||
|
c1082b9b08 | ||
|
d3c5c68296 | ||
|
39fd3fd866 | ||
|
7ed95d3954 | ||
|
4dc91c86ae | ||
|
7d7f54c751 | ||
|
580e574c84 | ||
|
736e1717fa | ||
|
d6ac1a4f78 | ||
|
8a7c61c6f4 | ||
|
9a024fdacf | ||
|
135a623b1f | ||
|
ba0b9b259f | ||
|
45a24738b5 | ||
|
585ca203b0 | ||
|
561f441a5b | ||
|
30f7f83573 | ||
|
97646571a1 | ||
|
ac60d45969 | ||
|
afa52e280c | ||
|
c57c9752a2 | ||
|
b158a6d722 | ||
|
c616b53c9c |
@@ -4,7 +4,7 @@ jobs:
|
||||
build:
|
||||
resource_class: medium+
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
environment:
|
||||
CONTRACTS_COMMIT_HASH: '9ed05f5'
|
||||
working_directory: ~/repo
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
command: sudo npm install --global yarn@1.9.4
|
||||
- run:
|
||||
name: yarn
|
||||
command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
|
||||
command: yarn --frozen-lockfile --ignore-engines install
|
||||
- run: yarn build:ci:no_website
|
||||
- run: yarn build:ts
|
||||
- save_cache:
|
||||
@@ -26,7 +26,7 @@ jobs:
|
||||
build-website:
|
||||
resource_class: medium+
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
@@ -35,7 +35,7 @@ jobs:
|
||||
- run: cd packages/website && yarn build:prod
|
||||
test-contracts-ganache:
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
@@ -49,7 +49,7 @@ jobs:
|
||||
- run: yarn wsrun test:circleci @0x/contracts-protocol
|
||||
test-contracts-geth:
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
- image: 0xorg/devnet
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
@@ -67,7 +67,7 @@ jobs:
|
||||
test-publish:
|
||||
resource_class: medium+
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
- image: 0xorg/verdaccio
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
@@ -77,7 +77,7 @@ jobs:
|
||||
- run: yarn test:publish:circleci
|
||||
test-doc-generation:
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
@@ -100,7 +100,7 @@ jobs:
|
||||
- ~/repo/packages/pipeline/coverage/lcov.info
|
||||
test-rest:
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
@@ -118,7 +118,7 @@ jobs:
|
||||
- run: yarn wsrun test:circleci @0x/order-utils
|
||||
- run: yarn wsrun test:circleci @0x/order-watcher
|
||||
- run: yarn wsrun test:circleci @0x/sol-compiler
|
||||
- run: yarn wsrun test:circleci @0x/sol-cov
|
||||
- run: yarn wsrun test:circleci @0x/sol-tracing-utils
|
||||
- run: yarn wsrun test:circleci @0x/sol-doc
|
||||
- run: yarn wsrun test:circleci @0x/subproviders
|
||||
- run: yarn wsrun test:circleci @0x/web3-wrapper
|
||||
@@ -169,9 +169,9 @@ jobs:
|
||||
paths:
|
||||
- ~/repo/packages/sol-compiler/coverage/lcov.info
|
||||
- save_cache:
|
||||
key: coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
|
||||
key: coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- ~/repo/packages/sol-cov/coverage/lcov.info
|
||||
- ~/repo/packages/sol-tracing-utils/coverage/lcov.info
|
||||
- save_cache:
|
||||
key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
@@ -200,46 +200,30 @@ jobs:
|
||||
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/json_schemas
|
||||
cd python-packages
|
||||
python -m ensurepip
|
||||
python -m pip install .[dev]
|
||||
# HACK! installing the package should do the following
|
||||
# copy for us, but it's not working in CircleCI for some
|
||||
# reason. Zendesk support ticket raised (#43979) with
|
||||
# CircleCI.
|
||||
mkdir /usr/local/lib/python3.7/site-packages/zero_ex/json_schemas/schemas
|
||||
cp -R src/zero_ex/json_schemas/schemas/* /usr/local/lib/python3.7/site-packages/zero_ex/json_schemas/schemas
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/order_utils
|
||||
python -m ensurepip
|
||||
python -m pip install .[dev]
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/sra_client
|
||||
python -m ensurepip
|
||||
python -m pip install .[dev]
|
||||
./install
|
||||
- save_cache:
|
||||
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- '/usr/local/bin'
|
||||
- '/usr/local/lib/python3.7/site-packages'
|
||||
- '.eggs'
|
||||
- '.mypy_cache'
|
||||
- '.pytest_cache'
|
||||
- '.tox'
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/json_schemas
|
||||
coverage run setup.py test
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/order_utils
|
||||
coverage run setup.py test
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/sra_client
|
||||
coverage run setup.py test
|
||||
cd python-packages
|
||||
./cmd_pkgs_in_dep_order.py coverage run setup.py test
|
||||
- save_cache:
|
||||
key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- ~/repo/python-packages/contract_addresses/.coverage
|
||||
- save_cache:
|
||||
key: coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- ~/repo/python-packages/contract_artifacts/.coverage
|
||||
- save_cache:
|
||||
key: coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- ~/repo/python-packages/contract_demo/.coverage
|
||||
- save_cache:
|
||||
key: coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
@@ -292,31 +276,14 @@ jobs:
|
||||
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/json_schemas
|
||||
python -m ensurepip
|
||||
python -m pip install .[dev]
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/order_utils
|
||||
python -m ensurepip
|
||||
python -m pip install .[dev]
|
||||
- save_cache:
|
||||
key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
|
||||
paths:
|
||||
- '/usr/local/bin'
|
||||
- '/usr/local/lib/python3.7/site-packages'
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/json_schemas
|
||||
python setup.py lint
|
||||
- run:
|
||||
command: |
|
||||
cd python-packages/order_utils
|
||||
python setup.py lint
|
||||
cd python-packages
|
||||
./install
|
||||
./lint
|
||||
static-tests:
|
||||
working_directory: ~/repo
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
steps:
|
||||
- restore_cache:
|
||||
keys:
|
||||
@@ -327,7 +294,7 @@ jobs:
|
||||
- run: yarn bundlewatch
|
||||
submit-coverage:
|
||||
docker:
|
||||
- image: circleci/node:9
|
||||
- image: circleci/node:9-browsers
|
||||
working_directory: ~/repo
|
||||
steps:
|
||||
- restore_cache:
|
||||
@@ -368,7 +335,7 @@ jobs:
|
||||
- coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
|
||||
@@ -384,6 +351,18 @@ jobs:
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
|
||||
- restore_cache:
|
||||
keys:
|
||||
- coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
|
||||
@@ -421,7 +400,9 @@ workflows:
|
||||
requires:
|
||||
- test-rest
|
||||
- test-python
|
||||
- static-tests-python:
|
||||
requires:
|
||||
- test-python
|
||||
- test-python
|
||||
- static-tests-python
|
||||
# skip python tox run for now, as we don't yet have multiple test environments to support.
|
||||
#- test-rest-python
|
||||
|
5
.github/autolabeler.yml
vendored
@@ -13,7 +13,10 @@ instant: ['packages/instant']
|
||||
abi-gen-templates: ['packages/abi-gen-templates']
|
||||
abi-gen: ['packages/abi-gen']
|
||||
website: ['packages/website']
|
||||
sol-cov: ['packages/sol-cov']
|
||||
sol-coverage: ['packages/sol-coverage']
|
||||
sol-profiler: ['packages/sol-profiler']
|
||||
sol-trace: ['packages/sol-trace']
|
||||
sol-tracing-utils: ['packages/sol-tracing-utils']
|
||||
utils: ['packages/utils']
|
||||
tslint-config: ['packages/tslint-config']
|
||||
asset-buyer: ['packages/asset-buyer']
|
||||
|
2
.gitignore
vendored
@@ -91,7 +91,7 @@ contracts/interfaces/generated-artifacts/
|
||||
contracts/tokens/generated-artifacts/
|
||||
contracts/examples/generated-artifacts/
|
||||
contracts/extensions/generated-artifacts/
|
||||
packages/sol-cov/test/fixtures/artifacts/
|
||||
packages/sol-tracing-utils/test/fixtures/artifacts/
|
||||
packages/metacoin/artifacts/
|
||||
|
||||
# generated contract wrappers
|
||||
|
@@ -18,15 +18,16 @@ lib
|
||||
/contracts/extensions/generated-artifacts
|
||||
/packages/abi-gen-wrappers/src/generated-wrappers
|
||||
/packages/contract-artifacts/artifacts
|
||||
/python-packages/order_utils/src/zero_ex/contract_artifacts/artifacts
|
||||
/python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts
|
||||
/packages/json-schemas/schemas
|
||||
/python-packages/json_schemas/src/zero_ex/json_schemas/schemas
|
||||
/packages/metacoin/src/contract_wrappers
|
||||
/packages/metacoin/artifacts
|
||||
/packages/sra-spec/public/
|
||||
/packages/dev-tools-pages/ts/**/data.json
|
||||
package.json
|
||||
scripts/postpublish_utils.js
|
||||
packages/sol-cov/test/fixtures/artifacts
|
||||
packages/sol-coverage/test/fixtures/artifacts
|
||||
.pytest_cache
|
||||
.mypy_cache
|
||||
.tox
|
||||
|
@@ -24,7 +24,10 @@ packages/metacoin/ @LogvinovLeon
|
||||
packages/monorepo-scripts/ @fabioberger
|
||||
packages/order-utils/ @fabioberger @LogvinovLeon
|
||||
packages/sol-compiler/ @LogvinovLeon
|
||||
packages/sol-cov/ @LogvinovLeon
|
||||
packages/sol-coverage/ @LogvinovLeon
|
||||
packages/sol-profiler/ @LogvinovLeon
|
||||
packages/sol-trace/ @LogvinovLeon
|
||||
packages/sol-tracing-utils/ @LogvinovLeon
|
||||
packages/sol-resolver/ @LogvinovLeon
|
||||
packages/subproviders/ @fabioberger @dekz
|
||||
packages/verdaccio/ @albrow
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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.
|
||||
|
16
README.md
@@ -24,11 +24,13 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
|
||||
|
||||
### Python Packages
|
||||
|
||||
| Package | Version | Description |
|
||||
| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
|
||||
| [`0x-json-schemas`](/python-packages/json_schemas) | [](https://pypi.org/project/0x-json-schemas/) | 0x-related JSON schemas |
|
||||
| [`0x-order-utils`](/python-packages/order_utils) | [](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders |
|
||||
| [`0x-sra-client`](/python-packages/sra_client) | [](https://pypi.org/project/0x-sra-client/) | A Python client for interacting with servers conforming to the Standard Relayer API specification |
|
||||
| Package | Version | Description |
|
||||
| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
|
||||
| [`0x-contract-addresses`](/python-packages/contract_addresses) | [](https://pypi.org/project/0x-contract-addresses/) | A tiny utility library for getting known deployed contract addresses for a particular network |
|
||||
| [`0x-contract-artifacts`](/python-packages/contract_artifacts) | [](https://pypi.org/project/0x-contract-artifacts/) | 0x smart contract compilation artifacts |
|
||||
| [`0x-json-schemas`](/python-packages/json_schemas) | [](https://pypi.org/project/0x-json-schemas/) | 0x-related JSON schemas |
|
||||
| [`0x-order-utils`](/python-packages/order_utils) | [](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders |
|
||||
| [`0x-sra-client`](/python-packages/sra_client) | [](https://pypi.org/project/0x-sra-client/) | A Python client for interacting with servers conforming to the Standard Relayer API specification |
|
||||
|
||||
### Typescript/Javascript Packages
|
||||
|
||||
@@ -55,7 +57,9 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
|
||||
| -------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| [`@0x/web3-wrapper`](/packages/web3-wrapper) | [](https://www.npmjs.com/package/@0x/web3-wrapper) | An Ethereum JSON RPC client |
|
||||
| [`@0x/sol-compiler`](/packages/sol-compiler) | [](https://www.npmjs.com/package/@0x/sol-compiler) | A wrapper around solc-js that adds smart re-compilation, ability to compile an entire project, Solidity version specific compilation, standard input description support and much more. |
|
||||
| [`@0x/sol-cov`](/packages/sol-cov) | [](https://www.npmjs.com/package/@0x/sol-cov) | A solidity test coverage tool |
|
||||
| [`@0x/sol-coverage`](/packages/sol-coverage) | [](https://www.npmjs.com/package/@0x/sol-coverage) | A solidity test coverage tool |
|
||||
| [`@0x/sol-profiler`](/packages/sol-profiler) | [](https://www.npmjs.com/package/@0x/sol-profiler) | A solidity gas cost profiler |
|
||||
| [`@0x/sol-trace`](/packages/sol-trace) | [](https://www.npmjs.com/package/@0x/sol-trace) | A solidity stack trace tool |
|
||||
| [`@0x/sol-resolver`](/packages/sol-resolver) | [](https://www.npmjs.com/package/@0x/sol-resolver) | Import resolver for smart contracts dependencies |
|
||||
| [`@0x/subproviders`](/packages/subproviders) | [](https://www.npmjs.com/package/@0x/subproviders) | Web3 provider middlewares (e.g. LedgerSubprovider) |
|
||||
| [`@0x/sol-doc`](/packages/sol-doc) | [](https://www.npmjs.com/package/@0x/sol-doc) | Solidity documentation generator |
|
||||
|
@@ -20,7 +20,7 @@ TEST_PROVIDER=geth yarn test
|
||||
|
||||
## Code coverage
|
||||
|
||||
In order to see the Solidity code coverage output generated by `@0x/sol-cov`, run:
|
||||
In order to see the Solidity code coverage output generated by `@0x/sol-coverage`, run:
|
||||
|
||||
```
|
||||
yarn test:coverage
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-examples",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -33,13 +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/sol-cov": "^2.1.17",
|
||||
"@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": "*",
|
||||
@@ -59,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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.2.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "1.2.0",
|
||||
"changes": [
|
||||
|
@@ -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)
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-extensions",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,14 +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/sol-cov": "^2.1.17",
|
||||
"@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": "*",
|
||||
@@ -71,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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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": {
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-libs",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,13 +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/sol-cov": "^2.1.17",
|
||||
"@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,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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-multisig",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,13 +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/sol-cov": "^2.1.17",
|
||||
"@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",
|
||||
@@ -70,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": {
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "2.2.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2.2.0",
|
||||
"changes": [
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-protocol",
|
||||
"version": "2.2.0",
|
||||
"version": "2.2.1",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,12 +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/sol-cov": "^2.1.17",
|
||||
"@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": "*",
|
||||
@@ -69,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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-test-utils",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -40,17 +40,19 @@
|
||||
"typescript": "3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@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/sol-cov": "^2.1.17",
|
||||
"@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",
|
||||
@@ -61,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",
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import { devConstants } from '@0x/dev-utils';
|
||||
import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
|
||||
import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-coverage';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
let coverageSubprovider: CoverageSubprovider;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import { devConstants } from '@0x/dev-utils';
|
||||
import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
|
||||
import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-profiler';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
let profilerSubprovider: ProfilerSubprovider;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import { devConstants } from '@0x/dev-utils';
|
||||
import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov';
|
||||
import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-trace';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
let revertTraceSubprovider: RevertTraceSubprovider;
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-tokens",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,13 +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/sol-cov": "^2.1.17",
|
||||
"@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,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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.4",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.3",
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@0x/contracts-utils",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
@@ -44,13 +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/sol-cov": "^2.1.17",
|
||||
"@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": "*",
|
||||
@@ -71,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"
|
||||
},
|
||||
|
@@ -41,7 +41,7 @@
|
||||
},
|
||||
"config": {
|
||||
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
|
||||
"packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-cov ethereum-types asset-buyer migrations"
|
||||
"packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations"
|
||||
},
|
||||
"bundlewatch": {
|
||||
"files": [
|
||||
@@ -62,6 +62,9 @@
|
||||
"repoBranchBase": "development"
|
||||
}
|
||||
},
|
||||
"resolutions": {
|
||||
"graceful-fs": "4.1.15"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@0x-lerna-fork/lerna": "3.0.0-beta.26",
|
||||
"@0xproject/npm-cli-login": "^0.0.11",
|
||||
@@ -72,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"
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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"
|
||||
|
@@ -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": {
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"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
|
||||
}
|
||||
],
|
||||
|
@@ -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)
|
||||
|
@@ -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"
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.21",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.20",
|
||||
@@ -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
|
||||
}
|
||||
],
|
||||
|
@@ -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
|
||||
|
@@ -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",
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "1.0.22",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "1.0.21",
|
||||
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
},
|
||||
|
@@ -1,4 +1,14 @@
|
||||
[
|
||||
{
|
||||
"version": "4.0.0",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Raise custom InsufficientAssetLiquidityError error with amountAvailableToFill attribute",
|
||||
"pr": 1437
|
||||
}
|
||||
],
|
||||
"timestamp": 1547225310
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "3.0.5",
|
||||
@@ -81,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
|
||||
},
|
||||
{
|
||||
@@ -90,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
|
||||
},
|
||||
{
|
||||
@@ -117,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
|
||||
},
|
||||
{
|
||||
|
@@ -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
|
||||
|
@@ -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": "*",
|
||||
|
22
packages/asset-buyer/src/errors.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { BigNumber } from '@0x/utils';
|
||||
|
||||
import { AssetBuyerError } from './types';
|
||||
|
||||
/**
|
||||
* Error class representing insufficient asset liquidity
|
||||
*/
|
||||
export class InsufficientAssetLiquidityError extends Error {
|
||||
/**
|
||||
* The amount availabe to fill (in base units) factoring in slippage.
|
||||
*/
|
||||
public amountAvailableToFill: BigNumber;
|
||||
/**
|
||||
* @param amountAvailableToFill The amount availabe to fill (in base units) factoring in slippage
|
||||
*/
|
||||
constructor(amountAvailableToFill: BigNumber) {
|
||||
super(AssetBuyerError.InsufficientAssetLiquidity);
|
||||
this.amountAvailableToFill = amountAvailableToFill;
|
||||
// Setting prototype so instanceof works. See https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
|
||||
Object.setPrototypeOf(this, InsufficientAssetLiquidityError.prototype);
|
||||
}
|
||||
}
|
@@ -9,6 +9,7 @@ export { SignedOrder } from '@0x/types';
|
||||
export { BigNumber } from '@0x/utils';
|
||||
|
||||
export { AssetBuyer } from './asset_buyer';
|
||||
export { InsufficientAssetLiquidityError } from './errors';
|
||||
export { BasicOrderProvider } from './order_providers/basic_order_provider';
|
||||
export { StandardRelayerAPIOrderProvider } from './order_providers/standard_relayer_api_order_provider';
|
||||
export {
|
||||
|
@@ -102,7 +102,7 @@ export interface AssetBuyerOpts {
|
||||
}
|
||||
|
||||
/**
|
||||
* Possible errors thrown by an AssetBuyer instance or associated static methods.
|
||||
* Possible error messages thrown by an AssetBuyer instance or associated static methods.
|
||||
*/
|
||||
export enum AssetBuyerError {
|
||||
NoEtherTokenContractFound = 'NO_ETHER_TOKEN_CONTRACT_FOUND',
|
||||
|
@@ -3,6 +3,7 @@ import { BigNumber } from '@0x/utils';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
import { constants } from '../constants';
|
||||
import { InsufficientAssetLiquidityError } from '../errors';
|
||||
import { AssetBuyerError, BuyQuote, BuyQuoteInfo, OrdersAndFillableAmounts } from '../types';
|
||||
|
||||
import { orderUtils } from './order_utils';
|
||||
@@ -33,7 +34,18 @@ export const buyQuoteCalculator = {
|
||||
});
|
||||
// if we do not have enough orders to cover the desired assetBuyAmount, throw
|
||||
if (remainingFillAmount.gt(constants.ZERO_AMOUNT)) {
|
||||
throw new Error(AssetBuyerError.InsufficientAssetLiquidity);
|
||||
// We needed the amount they requested to buy, plus the amount for slippage
|
||||
const totalAmountRequested = assetBuyAmount.plus(slippageBufferAmount);
|
||||
const amountAbleToFill = totalAmountRequested.minus(remainingFillAmount);
|
||||
// multiplierNeededWithSlippage represents what we need to multiply the assetBuyAmount by
|
||||
// in order to get the total amount needed considering slippage
|
||||
// i.e. if slippagePercent was 0.2 (20%), multiplierNeededWithSlippage would be 1.2
|
||||
const multiplierNeededWithSlippage = new BigNumber(1).plus(slippagePercentage);
|
||||
// Given amountAvailableToFillConsideringSlippage * multiplierNeededWithSlippage = amountAbleToFill
|
||||
// We divide amountUnableToFill by multiplierNeededWithSlippage to determine amountAvailableToFillConsideringSlippage
|
||||
const amountAvailableToFillConsideringSlippage = amountAbleToFill.div(multiplierNeededWithSlippage).floor();
|
||||
|
||||
throw new InsufficientAssetLiquidityError(amountAvailableToFillConsideringSlippage);
|
||||
}
|
||||
// if we are not buying ZRX:
|
||||
// given the orders calculated above, find the fee-orders that cover the desired assetBuyAmount (with slippage)
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
|
||||
import { SignedOrder } from '@0x/types';
|
||||
import { BigNumber } from '@0x/utils';
|
||||
import * as chai from 'chai';
|
||||
import * as _ from 'lodash';
|
||||
@@ -8,6 +9,7 @@ import { AssetBuyerError, OrdersAndFillableAmounts } from '../src/types';
|
||||
import { buyQuoteCalculator } from '../src/utils/buy_quote_calculator';
|
||||
|
||||
import { chaiSetup } from './utils/chai_setup';
|
||||
import { testHelpers } from './utils/test_helpers';
|
||||
|
||||
chaiSetup.configure();
|
||||
const expect = chai.expect;
|
||||
@@ -15,6 +17,10 @@ const expect = chai.expect;
|
||||
// tslint:disable:custom-no-magic-numbers
|
||||
describe('buyQuoteCalculator', () => {
|
||||
describe('#calculate', () => {
|
||||
let firstOrder: SignedOrder;
|
||||
let firstRemainingFillAmount: BigNumber;
|
||||
let secondOrder: SignedOrder;
|
||||
let secondRemainingFillAmount: BigNumber;
|
||||
let ordersAndFillableAmounts: OrdersAndFillableAmounts;
|
||||
let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts;
|
||||
let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts;
|
||||
@@ -24,18 +30,18 @@ describe('buyQuoteCalculator', () => {
|
||||
// the second order has a rate of 2 makerAsset / WETH with a takerFee of 100 ZRX and has 200 / 200 makerAsset units left to fill (completely fillable)
|
||||
// generate one order for fees
|
||||
// the fee order has a rate of 1 ZRX / WETH with no taker fee and has 100 ZRX left to fill (completely fillable)
|
||||
const firstOrder = orderFactory.createSignedOrderFromPartial({
|
||||
firstOrder = orderFactory.createSignedOrderFromPartial({
|
||||
makerAssetAmount: new BigNumber(400),
|
||||
takerAssetAmount: new BigNumber(100),
|
||||
takerFee: new BigNumber(200),
|
||||
});
|
||||
const firstRemainingFillAmount = new BigNumber(200);
|
||||
const secondOrder = orderFactory.createSignedOrderFromPartial({
|
||||
firstRemainingFillAmount = new BigNumber(200);
|
||||
secondOrder = orderFactory.createSignedOrderFromPartial({
|
||||
makerAssetAmount: new BigNumber(200),
|
||||
takerAssetAmount: new BigNumber(100),
|
||||
takerFee: new BigNumber(100),
|
||||
});
|
||||
const secondRemainingFillAmount = secondOrder.makerAssetAmount;
|
||||
secondRemainingFillAmount = secondOrder.makerAssetAmount;
|
||||
ordersAndFillableAmounts = {
|
||||
orders: [firstOrder, secondOrder],
|
||||
remainingFillableMakerAssetAmounts: [firstRemainingFillAmount, secondRemainingFillAmount],
|
||||
@@ -61,18 +67,137 @@ describe('buyQuoteCalculator', () => {
|
||||
],
|
||||
};
|
||||
});
|
||||
it('should throw if not enough maker asset liquidity', () => {
|
||||
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
|
||||
describe('InsufficientLiquidityError', () => {
|
||||
it('should throw if not enough maker asset liquidity (multiple orders)', () => {
|
||||
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
ordersAndFillableAmounts,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(500),
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(400));
|
||||
});
|
||||
it('should throw if not enough maker asset liquidity (multiple orders with 20% slippage)', () => {
|
||||
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
ordersAndFillableAmounts,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(500),
|
||||
0,
|
||||
0.2,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(333));
|
||||
});
|
||||
it('should throw if not enough maker asset liquidity (multiple orders with 5% slippage)', () => {
|
||||
// we have 400 makerAsset units available to fill but attempt to calculate a quote for 500 makerAsset units
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
ordersAndFillableAmounts,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(600),
|
||||
0,
|
||||
0.05,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(380));
|
||||
});
|
||||
it('should throw if not enough maker asset liquidity (partially filled order)', () => {
|
||||
const firstOrderAndFillableAmount: OrdersAndFillableAmounts = {
|
||||
orders: [firstOrder],
|
||||
remainingFillableMakerAssetAmounts: [firstRemainingFillAmount],
|
||||
};
|
||||
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
firstOrderAndFillableAmount,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(201),
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(200));
|
||||
});
|
||||
it('should throw if not enough maker asset liquidity (completely fillable order)', () => {
|
||||
const completelyFillableOrder = orderFactory.createSignedOrderFromPartial({
|
||||
makerAssetAmount: new BigNumber(123),
|
||||
takerAssetAmount: new BigNumber(100),
|
||||
takerFee: new BigNumber(200),
|
||||
});
|
||||
const completelyFillableOrdersAndFillableAmount: OrdersAndFillableAmounts = {
|
||||
orders: [completelyFillableOrder],
|
||||
remainingFillableMakerAssetAmounts: [completelyFillableOrder.makerAssetAmount],
|
||||
};
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
completelyFillableOrdersAndFillableAmount,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(124),
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(123));
|
||||
});
|
||||
it('should throw with 1 amount available if no slippage', () => {
|
||||
const smallOrder = orderFactory.createSignedOrderFromPartial({
|
||||
makerAssetAmount: new BigNumber(1),
|
||||
takerAssetAmount: new BigNumber(1),
|
||||
takerFee: new BigNumber(0),
|
||||
});
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
{ orders: [smallOrder], remainingFillableMakerAssetAmounts: [smallOrder.makerAssetAmount] },
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(600),
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, new BigNumber(1));
|
||||
});
|
||||
it('should throw without amount available to fill if amount rounds to 0', () => {
|
||||
const smallOrder = orderFactory.createSignedOrderFromPartial({
|
||||
makerAssetAmount: new BigNumber(1),
|
||||
takerAssetAmount: new BigNumber(1),
|
||||
takerFee: new BigNumber(0),
|
||||
});
|
||||
const errorFunction = () => {
|
||||
buyQuoteCalculator.calculate(
|
||||
{ orders: [smallOrder], remainingFillableMakerAssetAmounts: [smallOrder.makerAssetAmount] },
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(600),
|
||||
0,
|
||||
0.2,
|
||||
false,
|
||||
);
|
||||
};
|
||||
testHelpers.expectInsufficientLiquidityError(expect, errorFunction, undefined);
|
||||
});
|
||||
});
|
||||
it('should not throw if order is fillable', () => {
|
||||
expect(() =>
|
||||
buyQuoteCalculator.calculate(
|
||||
ordersAndFillableAmounts,
|
||||
smallFeeOrderAndFillableAmount,
|
||||
new BigNumber(500),
|
||||
allFeeOrdersAndFillableAmounts,
|
||||
new BigNumber(300),
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
),
|
||||
).to.throw(AssetBuyerError.InsufficientAssetLiquidity);
|
||||
).to.not.throw();
|
||||
});
|
||||
it('should throw if not enough ZRX liquidity', () => {
|
||||
// we request 300 makerAsset units but the ZRX order is only enough to fill the first order, which only has 200 makerAssetUnits available
|
||||
|
26
packages/asset-buyer/test/utils/test_helpers.ts
Normal file
@@ -0,0 +1,26 @@
|
||||
import { BigNumber } from '@0x/utils';
|
||||
|
||||
import { InsufficientAssetLiquidityError } from '../../src/errors';
|
||||
|
||||
export const testHelpers = {
|
||||
expectInsufficientLiquidityError: (
|
||||
expect: Chai.ExpectStatic,
|
||||
functionWhichTriggersError: () => void,
|
||||
expectedAmountAvailableToFill?: BigNumber,
|
||||
): void => {
|
||||
let wasErrorThrown = false;
|
||||
try {
|
||||
functionWhichTriggersError();
|
||||
} catch (e) {
|
||||
wasErrorThrown = true;
|
||||
expect(e).to.be.instanceOf(InsufficientAssetLiquidityError);
|
||||
if (expectedAmountAvailableToFill) {
|
||||
expect(e.amountAvailableToFill).to.be.bignumber.equal(expectedAmountAvailableToFill);
|
||||
} else {
|
||||
expect(e.amountAvailableToFill).to.be.undefined();
|
||||
}
|
||||
}
|
||||
|
||||
expect(wasErrorThrown).to.be.true();
|
||||
},
|
||||
};
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "3.0.12",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "3.0.11",
|
||||
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
},
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "3.0.12",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"timestamp": 1547040760,
|
||||
"version": "3.0.11",
|
||||
@@ -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`"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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",
|
||||
|
@@ -1,4 +1,13 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1547225310,
|
||||
"version": "4.2.1",
|
||||
"changes": [
|
||||
{
|
||||
"note": "Dependencies updated"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "4.2.0",
|
||||
"changes": [
|
||||
@@ -52,8 +61,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 +89,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 +128,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 +180,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 +233,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 +260,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
|
||||
},
|
||||
{
|
||||
|
@@ -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)
|
||||
|
@@ -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",
|
||||
|
@@ -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(
|
||||
|
3
packages/dev-tools-pages/.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
public
|
||||
assets/fonts/*.woff
|
||||
assets/fonts/*.woff2
|
@@ -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
|
||||
|
||||
|
20
packages/dev-tools-pages/assets/crawl.html
Normal file
@@ -0,0 +1,20 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||
<title>Document</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<ul>
|
||||
<li><a href="/compiler">Compiler</a></li>
|
||||
<li><a href="/cov">Cov</a></li>
|
||||
<li><a href="/profiler">Profiler</a></li>
|
||||
<li><a href="/trace">Trace</a></li>
|
||||
|
||||
</ul>
|
||||
|
||||
</body>
|
||||
</html>
|
BIN
packages/dev-tools-pages/assets/favicons/compiler.ico
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
packages/dev-tools-pages/assets/favicons/cov.ico
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
packages/dev-tools-pages/assets/favicons/profiler.ico
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
packages/dev-tools-pages/assets/favicons/trace.ico
Normal file
After Width: | Height: | Size: 6.4 KiB |
BIN
packages/dev-tools-pages/assets/images/og-compiler.png
Normal file
After Width: | Height: | Size: 14 KiB |
BIN
packages/dev-tools-pages/assets/images/og-cov.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
packages/dev-tools-pages/assets/images/og-profiler.png
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
packages/dev-tools-pages/assets/images/og-trace.png
Normal file
After Width: | Height: | Size: 13 KiB |
14
packages/dev-tools-pages/assets/index.html
Normal file
@@ -0,0 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="ie=edge">
|
||||
<link rel="preload" href="/fonts/MaisonNeue-Book-subset.woff2" as="font" type="font/woff2" crossorigin>
|
||||
<link rel="preload" href="/fonts/MaisonNeue-Bold-subset.woff2" as="font" type="font/woff2" crossorigin>
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
</body>
|
||||
</html>
|
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "@0x/dev-tools-pages",
|
||||
"version": "0.0.11",
|
||||
"version": "0.0.12",
|
||||
"engines": {
|
||||
"node": ">=6.12"
|
||||
},
|
||||
"private": true,
|
||||
"description": "0x Dev tools pages",
|
||||
"scripts": {
|
||||
"build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
|
||||
"build": "node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production && react-snap",
|
||||
"build:ci": "yarn build",
|
||||
"build:dev": "../../node_modules/.bin/webpack --mode development",
|
||||
"clean": "shx rm -f public/bundle*",
|
||||
@@ -16,33 +16,43 @@
|
||||
},
|
||||
"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",
|
||||
"less": "^2.7.2",
|
||||
"lodash": "^4.17.5",
|
||||
"polished": "^1.9.2",
|
||||
"react": "^16.4.2",
|
||||
"react-document-title": "^2.0.3",
|
||||
"react-dom": "^16.4.2",
|
||||
"react-helmet": "^5.2.0",
|
||||
"styled-components": "^3.3.0"
|
||||
"react": "^16.5.2",
|
||||
"react-dom": "^16.5.2",
|
||||
"react-loadable": "^5.5.0",
|
||||
"react-lottie": "^1.2.3",
|
||||
"react-tabs": "^2.3.0",
|
||||
"styled-components": "^4.1.1",
|
||||
"styled-normalize": "^8.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/highlight.js": "^9.12.3",
|
||||
"@types/lodash": "4.14.104",
|
||||
"@types/node": "*",
|
||||
"@types/react": "^16.4.2",
|
||||
"@types/react-dom": "^16.0.7",
|
||||
"@types/react-helmet": "^5.0.6",
|
||||
"@types/react-loadable": "^5.4.1",
|
||||
"@types/react-lottie": "^1.2.0",
|
||||
"@types/react-router-dom": "^4.0.4",
|
||||
"@types/react-tabs": "^2.3.0",
|
||||
"@types/react-tap-event-plugin": "0.0.30",
|
||||
"@types/styled-components": "^4.0.0",
|
||||
"@types/styled-components": "4.1.1",
|
||||
"awesome-typescript-loader": "^5.2.1",
|
||||
"clean-webpack-plugin": "^0.1.19",
|
||||
"copy-webpack-plugin": "^4.5.4",
|
||||
"copyfiles": "^2.0.0",
|
||||
"css-loader": "0.23.x",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"less-loader": "^4.1.0",
|
||||
"make-promises-safe": "^1.1.0",
|
||||
"raw-loader": "^0.5.1",
|
||||
"react-snap": "^1.19.0",
|
||||
"react-svg-loader": "^2.1.0",
|
||||
"shx": "^0.2.2",
|
||||
"source-map-loader": "^0.2.4",
|
||||
"style-loader": "0.23.x",
|
||||
@@ -52,7 +62,15 @@
|
||||
"typescript": "3.0.1",
|
||||
"uglifyjs-webpack-plugin": "^2.0.1",
|
||||
"webpack": "^4.20.2",
|
||||
"webpack-bundle-analyzer": "^3.0.3",
|
||||
"webpack-cli": "3.1.2",
|
||||
"webpack-dev-server": "^3.1.9"
|
||||
},
|
||||
"reactSnap": {
|
||||
"source": "public",
|
||||
"puppeteerArgs": [
|
||||
"--no-sandbox",
|
||||
"--disable-setuid-sandbox"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
72
packages/dev-tools-pages/pages.js
Normal file
@@ -0,0 +1,72 @@
|
||||
const pages = [
|
||||
{
|
||||
title: 'sol-compiler',
|
||||
filename: 'compiler/index.html',
|
||||
template: 'assets/index.html',
|
||||
chunks: ['compiler'],
|
||||
favicon: 'assets/favicons/compiler.ico',
|
||||
minify: true,
|
||||
meta: {
|
||||
description: 'Solidity compilation that just works',
|
||||
'og-title': { property: 'og:title', content: 'sol-compiler' },
|
||||
'og-description': { property: 'og:description', content: 'Solidity compilation that just works' },
|
||||
'og-type': { property: 'og:type', content: 'website' },
|
||||
'og-image': { property: 'og:image', content: '/images/og-compiler' },
|
||||
'twitter:site': '@0xproject',
|
||||
'twitter:image': '/images/og-compiler',
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'sol-cov',
|
||||
filename: 'cov/index.html',
|
||||
template: 'assets/index.html',
|
||||
chunks: ['cov'],
|
||||
favicon: 'assets/favicons/cov.ico',
|
||||
minify: true,
|
||||
meta: {
|
||||
description: 'Solidity code coverage',
|
||||
'og-title': { property: 'og:title', content: 'sol-cov' },
|
||||
'og-description': { property: 'og:description', content: 'Solidity code coverage' },
|
||||
'og-type': { property: 'og:type', content: 'website' },
|
||||
'og-image': { property: 'og:image', content: '/images/og-cov' },
|
||||
'twitter:site': '@0xproject',
|
||||
'twitter:image': '/images/og-cov',
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'sol-profiler',
|
||||
filename: 'profiler/index.html',
|
||||
template: 'assets/index.html',
|
||||
chunks: ['profiler'],
|
||||
favicon: 'assets/favicons/profiler.ico',
|
||||
minify: true,
|
||||
meta: {
|
||||
description: 'Gas profiling for Solidity',
|
||||
'og-title': { property: 'og:title', content: 'sol-profiler' },
|
||||
'og-description': { property: 'og:description', content: 'Gas profiling for Solidity' },
|
||||
'og-type': { property: 'og:type', content: 'website' },
|
||||
'og-image': { property: 'og:image', content: '/images/og-profiler' },
|
||||
'twitter:site': '@0xproject',
|
||||
'twitter:image': '/images/og-profiler',
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'sol-trace',
|
||||
filename: 'trace/index.html',
|
||||
template: 'assets/index.html',
|
||||
chunks: ['trace'],
|
||||
favicon: 'assets/favicons/trace.ico',
|
||||
minify: true,
|
||||
meta: {
|
||||
description: 'Human-readable stack traces',
|
||||
'og-title': { property: 'og:title', content: 'sol-trace' },
|
||||
'og-description': { property: 'og:description', content: 'Human-readable stack traces' },
|
||||
'og-type': { property: 'og:type', content: 'website' },
|
||||
'og-image': { property: 'og:image', content: '/images/og-trace' },
|
||||
'twitter:site': '@0xproject',
|
||||
'twitter:image': '/images/og-trace',
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
module.exports = pages;
|
@@ -1,85 +0,0 @@
|
||||
/* Custom Basscss Responsive Utilities */
|
||||
|
||||
@media (max-width: 52em) {
|
||||
.sm-center {
|
||||
text-align: center;
|
||||
}
|
||||
.sm-align-middle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
.sm-align-top {
|
||||
vertical-align: top;
|
||||
}
|
||||
.sm-left-align {
|
||||
text-align: left;
|
||||
}
|
||||
.sm-right-align {
|
||||
text-align: right;
|
||||
}
|
||||
.sm-table-cell {
|
||||
display: table-cell;
|
||||
}
|
||||
.sm-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
.sm-right {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 52em) {
|
||||
.md-center {
|
||||
text-align: center;
|
||||
}
|
||||
.md-align-middle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
.md-align-top {
|
||||
vertical-align: top;
|
||||
}
|
||||
.md-left-align {
|
||||
text-align: left;
|
||||
}
|
||||
.md-right-align {
|
||||
text-align: right;
|
||||
}
|
||||
.md-table-cell {
|
||||
display: table-cell;
|
||||
}
|
||||
.md-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
.md-right {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 64em) {
|
||||
.lg-center {
|
||||
text-align: center;
|
||||
}
|
||||
.lg-align-middle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
.lg-align-top {
|
||||
vertical-align: top;
|
||||
}
|
||||
.lg-left-align {
|
||||
text-align: left;
|
||||
}
|
||||
.lg-right-align {
|
||||
text-align: right;
|
||||
}
|
||||
.lg-table-cell {
|
||||
display: table-cell;
|
||||
}
|
||||
.lg-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
.lg-right {
|
||||
float: right;
|
||||
}
|
||||
}
|
@@ -1,453 +0,0 @@
|
||||
/* Basscss Responsive Margin */
|
||||
|
||||
@media (max-width: 52em) {
|
||||
/* Modified by Fabio Berger to max-width from min-width */
|
||||
|
||||
.sm-m0 {
|
||||
margin: 0;
|
||||
}
|
||||
.sm-mt0 {
|
||||
margin-top: 0;
|
||||
}
|
||||
.sm-mr0 {
|
||||
margin-right: 0;
|
||||
}
|
||||
.sm-mb0 {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.sm-ml0 {
|
||||
margin-left: 0;
|
||||
}
|
||||
.sm-mx0 {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
.sm-my0 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.sm-m1 {
|
||||
margin: 0.5rem;
|
||||
}
|
||||
.sm-mt1 {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
.sm-mr1 {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.sm-mb1 {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.sm-ml1 {
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
.sm-mx1 {
|
||||
margin-left: 0.5rem;
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.sm-my1 {
|
||||
margin-top: 0.5rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.sm-m2 {
|
||||
margin: 1rem;
|
||||
}
|
||||
.sm-mt2 {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.sm-mr2 {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.sm-mb2 {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.sm-ml2 {
|
||||
margin-left: 1rem;
|
||||
}
|
||||
.sm-mx2 {
|
||||
margin-left: 1rem;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.sm-my2 {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.sm-m3 {
|
||||
margin: 2rem;
|
||||
}
|
||||
.sm-mt3 {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.sm-mr3 {
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.sm-mb3 {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
.sm-ml3 {
|
||||
margin-left: 2rem;
|
||||
}
|
||||
.sm-mx3 {
|
||||
margin-left: 2rem;
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.sm-my3 {
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.sm-m4 {
|
||||
margin: 4rem;
|
||||
}
|
||||
.sm-mt4 {
|
||||
margin-top: 4rem;
|
||||
}
|
||||
.sm-mr4 {
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.sm-mb4 {
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
.sm-ml4 {
|
||||
margin-left: 4rem;
|
||||
}
|
||||
.sm-mx4 {
|
||||
margin-left: 4rem;
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.sm-my4 {
|
||||
margin-top: 4rem;
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
|
||||
.sm-mxn1 {
|
||||
margin-left: -0.5rem;
|
||||
margin-right: -0.5rem;
|
||||
}
|
||||
.sm-mxn2 {
|
||||
margin-left: -1rem;
|
||||
margin-right: -1rem;
|
||||
}
|
||||
.sm-mxn3 {
|
||||
margin-left: -2rem;
|
||||
margin-right: -2rem;
|
||||
}
|
||||
.sm-mxn4 {
|
||||
margin-left: -4rem;
|
||||
margin-right: -4rem;
|
||||
}
|
||||
|
||||
.sm-ml-auto {
|
||||
margin-left: auto;
|
||||
}
|
||||
.sm-mr-auto {
|
||||
margin-right: auto;
|
||||
}
|
||||
.sm-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 52em) {
|
||||
.md-m0 {
|
||||
margin: 0;
|
||||
}
|
||||
.md-mt0 {
|
||||
margin-top: 0;
|
||||
}
|
||||
.md-mr0 {
|
||||
margin-right: 0;
|
||||
}
|
||||
.md-mb0 {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.md-ml0 {
|
||||
margin-left: 0;
|
||||
}
|
||||
.md-mx0 {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
.md-my0 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.md-m1 {
|
||||
margin: 0.5rem;
|
||||
}
|
||||
.md-mt1 {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
.md-mr1 {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.md-mb1 {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.md-ml1 {
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
.md-mx1 {
|
||||
margin-left: 0.5rem;
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.md-my1 {
|
||||
margin-top: 0.5rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.md-m2 {
|
||||
margin: 1rem;
|
||||
}
|
||||
.md-mt2 {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.md-mr2 {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.md-mb2 {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.md-ml2 {
|
||||
margin-left: 1rem;
|
||||
}
|
||||
.md-mx2 {
|
||||
margin-left: 1rem;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.md-my2 {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.md-m3 {
|
||||
margin: 2rem;
|
||||
}
|
||||
.md-mt3 {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.md-mr3 {
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.md-mb3 {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
.md-ml3 {
|
||||
margin-left: 2rem;
|
||||
}
|
||||
.md-mx3 {
|
||||
margin-left: 2rem;
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.md-my3 {
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.md-m4 {
|
||||
margin: 4rem;
|
||||
}
|
||||
.md-mt4 {
|
||||
margin-top: 4rem;
|
||||
}
|
||||
.md-mr4 {
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.md-mb4 {
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
.md-ml4 {
|
||||
margin-left: 4rem;
|
||||
}
|
||||
.md-mx4 {
|
||||
margin-left: 4rem;
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.md-my4 {
|
||||
margin-top: 4rem;
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
|
||||
.md-mxn1 {
|
||||
margin-left: -0.5rem;
|
||||
margin-right: -0.5rem;
|
||||
}
|
||||
.md-mxn2 {
|
||||
margin-left: -1rem;
|
||||
margin-right: -1rem;
|
||||
}
|
||||
.md-mxn3 {
|
||||
margin-left: -2rem;
|
||||
margin-right: -2rem;
|
||||
}
|
||||
.md-mxn4 {
|
||||
margin-left: -4rem;
|
||||
margin-right: -4rem;
|
||||
}
|
||||
|
||||
.md-ml-auto {
|
||||
margin-left: auto;
|
||||
}
|
||||
.md-mr-auto {
|
||||
margin-right: auto;
|
||||
}
|
||||
.md-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 64em) {
|
||||
.lg-m0 {
|
||||
margin: 0;
|
||||
}
|
||||
.lg-mt0 {
|
||||
margin-top: 0;
|
||||
}
|
||||
.lg-mr0 {
|
||||
margin-right: 0;
|
||||
}
|
||||
.lg-mb0 {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.lg-ml0 {
|
||||
margin-left: 0;
|
||||
}
|
||||
.lg-mx0 {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
.lg-my0 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.lg-m1 {
|
||||
margin: 0.5rem;
|
||||
}
|
||||
.lg-mt1 {
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
.lg-mr1 {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.lg-mb1 {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.lg-ml1 {
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
.lg-mx1 {
|
||||
margin-left: 0.5rem;
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
.lg-my1 {
|
||||
margin-top: 0.5rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.lg-m2 {
|
||||
margin: 1rem;
|
||||
}
|
||||
.lg-mt2 {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
.lg-mr2 {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.lg-mb2 {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.lg-ml2 {
|
||||
margin-left: 1rem;
|
||||
}
|
||||
.lg-mx2 {
|
||||
margin-left: 1rem;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
.lg-my2 {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.lg-m3 {
|
||||
margin: 2rem;
|
||||
}
|
||||
.lg-mt3 {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.lg-mr3 {
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.lg-mb3 {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
.lg-ml3 {
|
||||
margin-left: 2rem;
|
||||
}
|
||||
.lg-mx3 {
|
||||
margin-left: 2rem;
|
||||
margin-right: 2rem;
|
||||
}
|
||||
.lg-my3 {
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.lg-m4 {
|
||||
margin: 4rem;
|
||||
}
|
||||
.lg-mt4 {
|
||||
margin-top: 4rem;
|
||||
}
|
||||
.lg-mr4 {
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.lg-mb4 {
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
.lg-ml4 {
|
||||
margin-left: 4rem;
|
||||
}
|
||||
.lg-mx4 {
|
||||
margin-left: 4rem;
|
||||
margin-right: 4rem;
|
||||
}
|
||||
.lg-my4 {
|
||||
margin-top: 4rem;
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
|
||||
.lg-mxn1 {
|
||||
margin-left: -0.5rem;
|
||||
margin-right: -0.5rem;
|
||||
}
|
||||
.lg-mxn2 {
|
||||
margin-left: -1rem;
|
||||
margin-right: -1rem;
|
||||
}
|
||||
.lg-mxn3 {
|
||||
margin-left: -2rem;
|
||||
margin-right: -2rem;
|
||||
}
|
||||
.lg-mxn4 {
|
||||
margin-left: -4rem;
|
||||
margin-right: -4rem;
|
||||
}
|
||||
|
||||
.lg-ml-auto {
|
||||
margin-left: auto;
|
||||
}
|
||||
.lg-mr-auto {
|
||||
margin-right: auto;
|
||||
}
|
||||
.lg-mx-auto {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
}
|
@@ -1,134 +0,0 @@
|
||||
/* Basscss Responsive Padding */
|
||||
/* Modified by Fabio Berger to include xs prefix */
|
||||
|
||||
@media (max-width: 52em) { /* Modified by Fabio Berger to max-width from min-width */
|
||||
|
||||
.sm-p0 { padding: 0 }
|
||||
.sm-pt0 { padding-top: 0 }
|
||||
.sm-pr0 { padding-right: 0 }
|
||||
.sm-pb0 { padding-bottom: 0 }
|
||||
.sm-pl0 { padding-left: 0 }
|
||||
.sm-px0 { padding-left: 0; padding-right: 0 }
|
||||
.sm-py0 { padding-top: 0; padding-bottom: 0 }
|
||||
|
||||
.sm-p1 { padding: .5rem }
|
||||
.sm-pt1 { padding-top: .5rem }
|
||||
.sm-pr1 { padding-right: .5rem }
|
||||
.sm-pb1 { padding-bottom: .5rem }
|
||||
.sm-pl1 { padding-left: .5rem }
|
||||
.sm-px1 { padding-left: .5rem; padding-right: .5rem }
|
||||
.sm-py1 { padding-top: .5rem; padding-bottom: .5rem }
|
||||
|
||||
.sm-p2 { padding: 1rem }
|
||||
.sm-pt2 { padding-top: 1rem }
|
||||
.sm-pr2 { padding-right: 1rem }
|
||||
.sm-pb2 { padding-bottom: 1rem }
|
||||
.sm-pl2 { padding-left: 1rem }
|
||||
.sm-px2 { padding-left: 1rem; padding-right: 1rem }
|
||||
.sm-py2 { padding-top: 1rem; padding-bottom: 1rem }
|
||||
|
||||
.sm-p3 { padding: 2rem }
|
||||
.sm-pt3 { padding-top: 2rem }
|
||||
.sm-pr3 { padding-right: 2rem }
|
||||
.sm-pb3 { padding-bottom: 2rem }
|
||||
.sm-pl3 { padding-left: 2rem }
|
||||
.sm-px3 { padding-left: 2rem; padding-right: 2rem }
|
||||
.sm-py3 { padding-top: 2rem; padding-bottom: 2rem }
|
||||
|
||||
.sm-p4 { padding: 4rem }
|
||||
.sm-pt4 { padding-top: 4rem }
|
||||
.sm-pr4 { padding-right: 4rem }
|
||||
.sm-pb4 { padding-bottom: 4rem }
|
||||
.sm-pl4 { padding-left: 4rem }
|
||||
.sm-px4 { padding-left: 4rem; padding-right: 4rem }
|
||||
.sm-py4 { padding-top: 4rem; padding-bottom: 4rem }
|
||||
|
||||
}
|
||||
|
||||
@media (min-width: 52em) {
|
||||
|
||||
.md-p0 { padding: 0 }
|
||||
.md-pt0 { padding-top: 0 }
|
||||
.md-pr0 { padding-right: 0 }
|
||||
.md-pb0 { padding-bottom: 0 }
|
||||
.md-pl0 { padding-left: 0 }
|
||||
.md-px0 { padding-left: 0; padding-right: 0 }
|
||||
.md-py0 { padding-top: 0; padding-bottom: 0 }
|
||||
|
||||
.md-p1 { padding: .5rem }
|
||||
.md-pt1 { padding-top: .5rem }
|
||||
.md-pr1 { padding-right: .5rem }
|
||||
.md-pb1 { padding-bottom: .5rem }
|
||||
.md-pl1 { padding-left: .5rem }
|
||||
.md-px1 { padding-left: .5rem; padding-right: .5rem }
|
||||
.md-py1 { padding-top: .5rem; padding-bottom: .5rem }
|
||||
|
||||
.md-p2 { padding: 1rem }
|
||||
.md-pt2 { padding-top: 1rem }
|
||||
.md-pr2 { padding-right: 1rem }
|
||||
.md-pb2 { padding-bottom: 1rem }
|
||||
.md-pl2 { padding-left: 1rem }
|
||||
.md-px2 { padding-left: 1rem; padding-right: 1rem }
|
||||
.md-py2 { padding-top: 1rem; padding-bottom: 1rem }
|
||||
|
||||
.md-p3 { padding: 2rem }
|
||||
.md-pt3 { padding-top: 2rem }
|
||||
.md-pr3 { padding-right: 2rem }
|
||||
.md-pb3 { padding-bottom: 2rem }
|
||||
.md-pl3 { padding-left: 2rem }
|
||||
.md-px3 { padding-left: 2rem; padding-right: 2rem }
|
||||
.md-py3 { padding-top: 2rem; padding-bottom: 2rem }
|
||||
|
||||
.md-p4 { padding: 4rem }
|
||||
.md-pt4 { padding-top: 4rem }
|
||||
.md-pr4 { padding-right: 4rem }
|
||||
.md-pb4 { padding-bottom: 4rem }
|
||||
.md-pl4 { padding-left: 4rem }
|
||||
.md-px4 { padding-left: 4rem; padding-right: 4rem }
|
||||
.md-py4 { padding-top: 4rem; padding-bottom: 4rem }
|
||||
|
||||
}
|
||||
|
||||
@media (min-width: 64em) {
|
||||
|
||||
.lg-p0 { padding: 0 }
|
||||
.lg-pt0 { padding-top: 0 }
|
||||
.lg-pr0 { padding-right: 0 }
|
||||
.lg-pb0 { padding-bottom: 0 }
|
||||
.lg-pl0 { padding-left: 0 }
|
||||
.lg-px0 { padding-left: 0; padding-right: 0 }
|
||||
.lg-py0 { padding-top: 0; padding-bottom: 0 }
|
||||
|
||||
.lg-p1 { padding: .5rem }
|
||||
.lg-pt1 { padding-top: .5rem }
|
||||
.lg-pr1 { padding-right: .5rem }
|
||||
.lg-pb1 { padding-bottom: .5rem }
|
||||
.lg-pl1 { padding-left: .5rem }
|
||||
.lg-px1 { padding-left: .5rem; padding-right: .5rem }
|
||||
.lg-py1 { padding-top: .5rem; padding-bottom: .5rem }
|
||||
|
||||
.lg-p2 { padding: 1rem }
|
||||
.lg-pt2 { padding-top: 1rem }
|
||||
.lg-pr2 { padding-right: 1rem }
|
||||
.lg-pb2 { padding-bottom: 1rem }
|
||||
.lg-pl2 { padding-left: 1rem }
|
||||
.lg-px2 { padding-left: 1rem; padding-right: 1rem }
|
||||
.lg-py2 { padding-top: 1rem; padding-bottom: 1rem }
|
||||
|
||||
.lg-p3 { padding: 2rem }
|
||||
.lg-pt3 { padding-top: 2rem }
|
||||
.lg-pr3 { padding-right: 2rem }
|
||||
.lg-pb3 { padding-bottom: 2rem }
|
||||
.lg-pl3 { padding-left: 2rem }
|
||||
.lg-px3 { padding-left: 2rem; padding-right: 2rem }
|
||||
.lg-py3 { padding-top: 2rem; padding-bottom: 2rem }
|
||||
|
||||
.lg-p4 { padding: 4rem }
|
||||
.lg-pt4 { padding-top: 4rem }
|
||||
.lg-pr4 { padding-right: 4rem }
|
||||
.lg-pb4 { padding-bottom: 4rem }
|
||||
.lg-pl4 { padding-left: 4rem }
|
||||
.lg-px4 { padding-left: 4rem; padding-right: 4rem }
|
||||
.lg-py4 { padding-top: 4rem; padding-bottom: 4rem }
|
||||
|
||||
}
|
@@ -1,35 +0,0 @@
|
||||
/* Basscss Responsive Type Scale */
|
||||
/* Modified by Fabio Berger to include xs prefix */
|
||||
|
||||
@media (max-width: 52em) { /* Modified by Fabio Berger to max-width from min-width */
|
||||
.sm-h00 { font-size: 4rem }
|
||||
.sm-h0 { font-size: 3rem }
|
||||
.sm-h1 { font-size: 2rem }
|
||||
.sm-h2 { font-size: 1.5rem }
|
||||
.sm-h3 { font-size: 1.25rem }
|
||||
.sm-h4 { font-size: 1rem }
|
||||
.sm-h5 { font-size: .875rem }
|
||||
.sm-h6 { font-size: .75rem }
|
||||
}
|
||||
|
||||
@media (min-width: 52em) {
|
||||
.md-h00 { font-size: 4rem }
|
||||
.md-h0 { font-size: 3rem }
|
||||
.md-h1 { font-size: 2rem }
|
||||
.md-h2 { font-size: 1.5rem }
|
||||
.md-h3 { font-size: 1.25rem }
|
||||
.md-h4 { font-size: 1rem }
|
||||
.md-h5 { font-size: .875rem }
|
||||
.md-h6 { font-size: .75rem }
|
||||
}
|
||||
|
||||
@media (min-width: 64em) {
|
||||
.lg-h00 { font-size: 4rem }
|
||||
.lg-h0 { font-size: 3rem }
|
||||
.lg-h1 { font-size: 2rem }
|
||||
.lg-h2 { font-size: 1.5rem }
|
||||
.lg-h3 { font-size: 1.25rem }
|
||||
.lg-h4 { font-size: 1rem }
|
||||
.lg-h5 { font-size: .875rem }
|
||||
.lg-h6 { font-size: .75rem }
|
||||
}
|
Before Width: | Height: | Size: 684 B |