Compare commits
11 Commits
elyas/curv
...
protocol@2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2be10bc72f | ||
|
|
abdc02f066 | ||
|
|
b7ef5473cd | ||
|
|
e43cdda22f | ||
|
|
416f2ec24c | ||
|
|
4f7fe66d74 | ||
|
|
eb394383d8 | ||
|
|
92e681f21b | ||
|
|
3f65dd6049 | ||
|
|
4425c316a3 | ||
|
|
9058839645 |
@@ -1,5 +1,10 @@
|
|||||||
version: 2.1
|
version: 2.1
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
cache_version:
|
||||||
|
type: string
|
||||||
|
default: v3
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
@@ -12,6 +17,9 @@ jobs:
|
|||||||
- checkout
|
- checkout
|
||||||
- run: git submodule update --init --recursive
|
- run: git submodule update --init --recursive
|
||||||
- run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
|
- run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
|
||||||
|
- restore_cache:
|
||||||
|
keys:
|
||||||
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run:
|
- run:
|
||||||
name: install-yarn
|
name: install-yarn
|
||||||
command: npm install --force --global yarn@1.22.0
|
command: npm install --force --global yarn@1.22.0
|
||||||
@@ -19,74 +27,102 @@ jobs:
|
|||||||
name: yarn
|
name: yarn
|
||||||
command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
|
command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
|
||||||
- setup_remote_docker
|
- setup_remote_docker
|
||||||
- run: yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci || yarn build:ci
|
- run: yarn build:ci
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: repo-{{ .Environment.CIRCLE_SHA1 }}
|
key: repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
paths:
|
paths:
|
||||||
- ~/repo
|
- ~/repo
|
||||||
|
- ~/.cache/yarn
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/repo/packages/abi-gen/test-cli/output
|
path: ~/repo/packages/abi-gen/test-cli/output
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
path: ~/repo/packages/contract-wrappers/generated_docs
|
path: ~/repo/packages/contract-wrappers/generated_docs
|
||||||
test-exchange-ganache:
|
test-exchange-ganache:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
|
||||||
test-integrations-ganache:
|
test-integrations-ganache:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
|
||||||
test-contracts-staking-ganache:
|
test-contracts-staking-ganache:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
|
||||||
test-contracts-extra-ganache:
|
test-contracts-extra-ganache:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}
|
||||||
- run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
|
||||||
test-contracts-rest-ganache:
|
test-contracts-rest-ganache:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
|
- run: |
|
||||||
|
git diff --name-only development >> changed.txt
|
||||||
|
if ! grep -q \.sol changed.txt; then
|
||||||
|
circleci-agent step halt
|
||||||
|
fi
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn wsrun -p @0x/contracts-multisig -p @0x/contracts-utils -p @0x/contracts-exchange-libs -p @0x/contracts-erc20 -p @0x/contracts-erc721 -p @0x/contracts-erc1155 -p @0x/contracts-asset-proxy -p @0x/contracts-broker -p @0x/contracts-zero-ex -m --serial -c test:circleci
|
- run: |
|
||||||
|
yarn wsrun \
|
||||||
|
-p @0x/contracts-multisig \
|
||||||
|
-p @0x/contracts-utils \
|
||||||
|
-p @0x/contracts-exchange-libs \
|
||||||
|
-p @0x/contracts-erc20 \
|
||||||
|
-p @0x/contracts-erc721 \
|
||||||
|
-p @0x/contracts-erc1155 \
|
||||||
|
-p @0x/contracts-asset-proxy \
|
||||||
|
-p @0x/contracts-broker \
|
||||||
|
-p @0x/contracts-zero-ex \
|
||||||
|
-m --serial -c test:circleci
|
||||||
test-foundry:
|
test-foundry:
|
||||||
resource_class: medium+
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: ghcr.io/foundry-rs/foundry:latest
|
- image: ghcr.io/foundry-rs/foundry:latest
|
||||||
working_directory: ~/repo/contracts/zero-ex
|
working_directory: ~/repo/contracts/zero-ex
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
|
- run: |
|
||||||
|
git diff --name-only development >> changed.txt
|
||||||
|
if ! grep -q \.sol changed.txt; then
|
||||||
|
circleci-agent step halt
|
||||||
|
fi
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
# - run: forge install
|
# - run: forge install
|
||||||
- run: forge test
|
- run: forge test
|
||||||
test-publish:
|
test-publish:
|
||||||
@@ -98,9 +134,15 @@ jobs:
|
|||||||
- image: 0xorg/verdaccio
|
- image: 0xorg/verdaccio
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
|
- run: |
|
||||||
|
git diff --name-only development >> changed.txt
|
||||||
|
if ! grep -q packages/ changed.txt; then
|
||||||
|
circleci-agent step halt
|
||||||
|
fi
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run:
|
- run:
|
||||||
command: yarn test:publish:circleci
|
command: yarn test:publish:circleci
|
||||||
no_output_timeout: 1800
|
no_output_timeout: 1800
|
||||||
@@ -111,9 +153,10 @@ jobs:
|
|||||||
- image: node:16
|
- image: node:16
|
||||||
working_directory: ~/repo
|
working_directory: ~/repo
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run:
|
- run:
|
||||||
command: yarn test:generate_docs:circleci
|
command: yarn test:generate_docs:circleci
|
||||||
no_output_timeout: 1200
|
no_output_timeout: 1200
|
||||||
@@ -124,40 +167,48 @@ jobs:
|
|||||||
environment:
|
environment:
|
||||||
RUST_ROUTER: 'true'
|
RUST_ROUTER: 'true'
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
|
||||||
- run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
|
||||||
- run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
|
||||||
- run: yarn wsrun -p @0x/contract-wrappers-test -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/contract-wrappers-test -m --serial -c test:circleci
|
||||||
- run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
|
- run: yarn wsrun -p @0x/order-utils -m --serial -c test:circleci
|
||||||
- run: yarn wsrun -p @0x/asset-swapper -m --serial -c test:circleci
|
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
|
key: coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- ~/repo/packages/contract-wrappers-test/coverage/lcov.info
|
- ~/repo/packages/contract-wrappers-test/coverage/lcov.info
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
|
key: coverage-order-utils-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- ~/repo/packages/order-utils/coverage/lcov.info
|
- ~/repo/packages/order-utils/coverage/lcov.info
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
|
key: coverage-web3-wrapper-{{ checksum "yarn.lock" }}
|
||||||
paths:
|
paths:
|
||||||
- ~/repo/packages/web3-wrapper/coverage/lcov.info
|
- ~/repo/packages/web3-wrapper/coverage/lcov.info
|
||||||
static-tests:
|
static-tests:
|
||||||
resource_class: large
|
resource_class: large
|
||||||
working_directory: ~/repo
|
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
steps:
|
steps:
|
||||||
|
- checkout
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- run: yarn lerna run lint
|
- run:
|
||||||
- run: yarn prettier:ci
|
command: yarn lerna run lint
|
||||||
- run: yarn deps_versions:ci
|
working_directory: ~/repo
|
||||||
- run: yarn diff_md_docs:ci
|
- run:
|
||||||
|
command: yarn prettier:ci
|
||||||
|
working_directory: ~/repo
|
||||||
|
- run:
|
||||||
|
command: yarn deps_versions:ci
|
||||||
|
working_directory: ~/repo
|
||||||
|
- run:
|
||||||
|
command: yarn diff_md_docs:ci
|
||||||
|
working_directory: ~/repo
|
||||||
submit-coverage:
|
submit-coverage:
|
||||||
docker:
|
docker:
|
||||||
- image: node:16
|
- image: node:16
|
||||||
@@ -165,16 +216,16 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- repo-{{ .Environment.CIRCLE_SHA1 }}
|
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
|
- coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
|
- coverage-order-utils-{{ checksum "yarn.lock" }}
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
|
- coverage-contracts-{{ checksum "yarn.lock" }}
|
||||||
- run: yarn report_coverage
|
- run: yarn report_coverage
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
|
|||||||
13
README.md
13
README.md
@@ -34,7 +34,6 @@ These packages are all under development. See [/contracts/README.md](/contracts/
|
|||||||
|
|
||||||
| Package | Version | Description |
|
| Package | Version | Description |
|
||||||
| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
|
| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
|
||||||
| [`@0x/asset-swapper`](/packages/asset-swapper) | [](https://www.npmjs.com/package/@0x/asset-swapper) | Package used to find and create aggregated swaps |
|
|
||||||
| [`@0x/protocol-utils`](/packages/protocol-utils) | [](https://www.npmjs.com/package/@0x/protocol-utils) | A set of utilities for generating, parsing, signing and validating 0x orders |
|
| [`@0x/protocol-utils`](/packages/protocol-utils) | [](https://www.npmjs.com/package/@0x/protocol-utils) | A set of utilities for generating, parsing, signing and validating 0x orders |
|
||||||
| [`@0x/contract-addresses`](/packages/contract-addresses) | [](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
|
| [`@0x/contract-addresses`](/packages/contract-addresses) | [](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
|
||||||
| [`@0x/contract-wrappers`](/packages/contract-wrappers) | [](https://www.npmjs.com/package/@0x/contract-wrappers) | JS/TS wrappers for interacting with the 0x smart contracts |
|
| [`@0x/contract-wrappers`](/packages/contract-wrappers) | [](https://www.npmjs.com/package/@0x/contract-wrappers) | JS/TS wrappers for interacting with the 0x smart contracts |
|
||||||
@@ -82,7 +81,7 @@ yarn build
|
|||||||
To build a specific package:
|
To build a specific package:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
PKG=@0x/asset-swapper yarn build
|
PKG=@0x/protocol-utils yarn build
|
||||||
```
|
```
|
||||||
|
|
||||||
To build all contracts packages:
|
To build all contracts packages:
|
||||||
@@ -105,7 +104,7 @@ To watch a specific package and all it's dependent packages:
|
|||||||
PKG=[NPM_PACKAGE_NAME] yarn watch
|
PKG=[NPM_PACKAGE_NAME] yarn watch
|
||||||
|
|
||||||
e.g
|
e.g
|
||||||
PKG=@0x/asset-swapper yarn watch
|
PKG=@0x/protocol-utils yarn watch
|
||||||
```
|
```
|
||||||
|
|
||||||
### Clean
|
### Clean
|
||||||
@@ -119,7 +118,7 @@ yarn clean
|
|||||||
Clean a specific package
|
Clean a specific package
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
PKG=@0x/asset-swapper yarn clean
|
PKG=@0x/protocol-utils yarn clean
|
||||||
```
|
```
|
||||||
|
|
||||||
### Rebuild
|
### Rebuild
|
||||||
@@ -133,7 +132,7 @@ yarn rebuild
|
|||||||
To re-build (clean & build) a specific package & it's deps:
|
To re-build (clean & build) a specific package & it's deps:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
PKG=@0x/asset-swapper yarn rebuild
|
PKG=@0x/protocol-utils yarn rebuild
|
||||||
```
|
```
|
||||||
|
|
||||||
### Lint
|
### Lint
|
||||||
@@ -147,7 +146,7 @@ yarn lint
|
|||||||
Lint a specific package:
|
Lint a specific package:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
PKG=@0x/asset-swapper yarn lint
|
PKG=@0x/protocol-utils yarn lint
|
||||||
```
|
```
|
||||||
|
|
||||||
### Run Tests
|
### Run Tests
|
||||||
@@ -161,7 +160,7 @@ yarn test
|
|||||||
Run a specific package's test:
|
Run a specific package's test:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
PKG=@0x/asset-swapper yarn test
|
PKG=@0x/protocol-utils yarn test
|
||||||
```
|
```
|
||||||
|
|
||||||
Run all contracts packages tests:
|
Run all contracts packages tests:
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "3.3.38",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "3.3.37",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "3.3.36",
|
"version": "3.3.36",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v3.3.38 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v3.3.37 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v3.3.36 - _August 10, 2022_
|
## v3.3.36 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contracts-erc20",
|
"name": "@0x/contracts-erc20",
|
||||||
"version": "3.3.36",
|
"version": "3.3.38",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -51,18 +51,18 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/abi-gen": "^5.8.0",
|
"@0x/abi-gen": "^5.8.1",
|
||||||
"@0x/contracts-gen": "^2.0.46",
|
"@0x/contracts-gen": "^2.0.47",
|
||||||
"@0x/contracts-test-utils": "^5.4.27",
|
"@0x/contracts-test-utils": "^5.4.29",
|
||||||
"@0x/contracts-utils": "^4.8.17",
|
"@0x/contracts-utils": "^4.8.19",
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/ts-doc-gen": "^0.0.28",
|
"@0x/ts-doc-gen": "^0.0.28",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/typescript-typings": "^5.3.1",
|
"@0x/typescript-typings": "^5.3.1",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"@types/lodash": "4.14.104",
|
"@types/lodash": "4.14.104",
|
||||||
"@types/mocha": "^5.2.7",
|
"@types/mocha": "^5.2.7",
|
||||||
"@types/node": "12.12.54",
|
"@types/node": "12.12.54",
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
"chai-as-promised": "^7.1.0",
|
"chai-as-promised": "^7.1.0",
|
||||||
"chai-bignumber": "^3.0.0",
|
"chai-bignumber": "^3.0.0",
|
||||||
"dirty-chai": "^2.0.1",
|
"dirty-chai": "^2.0.1",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"lodash": "^4.17.11",
|
"lodash": "^4.17.11",
|
||||||
"make-promises-safe": "^1.1.0",
|
"make-promises-safe": "^1.1.0",
|
||||||
"mocha": "^6.2.0",
|
"mocha": "^6.2.0",
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"ethers": "~4.0.4"
|
"ethers": "~4.0.4"
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "5.4.29",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "5.4.28",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "5.4.27",
|
"version": "5.4.27",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v5.4.29 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v5.4.28 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v5.4.27 - _August 10, 2022_
|
## v5.4.27 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contracts-test-utils",
|
"name": "@0x/contracts-test-utils",
|
||||||
"version": "5.4.27",
|
"version": "5.4.29",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"npm-run-all": "^4.1.2",
|
"npm-run-all": "^4.1.2",
|
||||||
"shx": "^0.2.2",
|
"shx": "^0.2.2",
|
||||||
@@ -42,20 +42,20 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/assert": "^3.0.34",
|
"@0x/assert": "^3.0.35",
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/json-schemas": "^6.4.4",
|
"@0x/json-schemas": "^6.4.4",
|
||||||
"@0x/order-utils": "^10.4.28",
|
"@0x/order-utils": "^10.4.28",
|
||||||
"@0x/sol-coverage": "^4.0.45",
|
"@0x/sol-coverage": "^4.0.46",
|
||||||
"@0x/sol-profiler": "^4.1.35",
|
"@0x/sol-profiler": "^4.1.36",
|
||||||
"@0x/sol-trace": "^3.0.45",
|
"@0x/sol-trace": "^3.0.46",
|
||||||
"@0x/subproviders": "^6.6.5",
|
"@0x/subproviders": "^7.0.0",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/typescript-typings": "^5.3.1",
|
"@0x/typescript-typings": "^5.3.1",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"@types/bn.js": "^4.11.0",
|
"@types/bn.js": "^4.11.0",
|
||||||
"@types/js-combinatorics": "^0.5.29",
|
"@types/js-combinatorics": "^0.5.29",
|
||||||
"@types/lodash": "4.14.104",
|
"@types/lodash": "4.14.104",
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
"chai-bignumber": "^3.0.0",
|
"chai-bignumber": "^3.0.0",
|
||||||
"decimal.js": "^10.2.0",
|
"decimal.js": "^10.2.0",
|
||||||
"dirty-chai": "^2.0.1",
|
"dirty-chai": "^2.0.1",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"ethereumjs-util": "^7.0.10",
|
"ethereumjs-util": "^7.0.10",
|
||||||
"ethers": "~4.0.4",
|
"ethers": "~4.0.4",
|
||||||
"js-combinatorics": "^0.5.3",
|
"js-combinatorics": "^0.5.3",
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ async function _getGanacheOrGethErrorAsync(ganacheError: string, gethError: stri
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function _getInsufficientFundsErrorMessageAsync(): Promise<string> {
|
async function _getInsufficientFundsErrorMessageAsync(): Promise<string> {
|
||||||
return _getGanacheOrGethErrorAsync("sender doesn't have enough funds", 'insufficient funds');
|
return _getGanacheOrGethErrorAsync('insufficient funds for gas * price + value', 'insufficient funds');
|
||||||
}
|
}
|
||||||
|
|
||||||
async function _getTransactionFailedErrorMessageAsync(): Promise<string> {
|
async function _getTransactionFailedErrorMessageAsync(): Promise<string> {
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "1.4.21",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "1.4.20",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "1.4.19",
|
"version": "1.4.19",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v1.4.21 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v1.4.20 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v1.4.19 - _August 10, 2022_
|
## v1.4.19 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contracts-treasury",
|
"name": "@0x/contracts-treasury",
|
||||||
"version": "1.4.19",
|
"version": "1.4.21",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -46,14 +46,14 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/abi-gen": "^5.8.0",
|
"@0x/abi-gen": "^5.8.1",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/contracts-asset-proxy": "^3.7.19",
|
"@0x/contracts-asset-proxy": "^3.7.19",
|
||||||
"@0x/contracts-erc20": "^3.3.36",
|
"@0x/contracts-erc20": "^3.3.38",
|
||||||
"@0x/contracts-gen": "^2.0.46",
|
"@0x/contracts-gen": "^2.0.47",
|
||||||
"@0x/contracts-staking": "^2.0.45",
|
"@0x/contracts-staking": "^2.0.45",
|
||||||
"@0x/contracts-test-utils": "^5.4.27",
|
"@0x/contracts-test-utils": "^5.4.29",
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/ts-doc-gen": "^0.0.28",
|
"@0x/ts-doc-gen": "^0.0.28",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@types/isomorphic-fetch": "^0.0.35",
|
"@types/isomorphic-fetch": "^0.0.35",
|
||||||
@@ -72,14 +72,14 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/protocol-utils": "^11.16.3",
|
"@0x/protocol-utils": "^11.16.5",
|
||||||
"@0x/subproviders": "^6.6.5",
|
"@0x/subproviders": "^7.0.0",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/typescript-typings": "^5.3.1",
|
"@0x/typescript-typings": "^5.3.1",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"ethereumjs-util": "^7.0.10"
|
"ethereumjs-util": "^7.0.10"
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "4.8.19",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "4.8.18",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "4.8.17",
|
"version": "4.8.17",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v4.8.19 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v4.8.18 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v4.8.17 - _August 10, 2022_
|
## v4.8.17 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contracts-utils",
|
"name": "@0x/contracts-utils",
|
||||||
"version": "4.8.17",
|
"version": "4.8.19",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -50,15 +50,15 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/abi-gen": "^5.8.0",
|
"@0x/abi-gen": "^5.8.1",
|
||||||
"@0x/contracts-gen": "^2.0.46",
|
"@0x/contracts-gen": "^2.0.47",
|
||||||
"@0x/contracts-test-utils": "^5.4.27",
|
"@0x/contracts-test-utils": "^5.4.29",
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/order-utils": "^10.4.28",
|
"@0x/order-utils": "^10.4.28",
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"@types/bn.js": "^4.11.0",
|
"@types/bn.js": "^4.11.0",
|
||||||
"@types/lodash": "4.14.104",
|
"@types/lodash": "4.14.104",
|
||||||
"@types/mocha": "^5.2.7",
|
"@types/mocha": "^5.2.7",
|
||||||
@@ -79,11 +79,11 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/typescript-typings": "^5.3.1",
|
"@0x/typescript-typings": "^5.3.1",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"bn.js": "^4.11.8",
|
"bn.js": "^4.11.8",
|
||||||
"ethereum-types": "^3.7.0"
|
"ethereum-types": "^3.7.1"
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
"access": "public"
|
"access": "public"
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "0.36.5",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "0.36.4",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "0.36.3",
|
"version": "0.36.3",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v0.36.5 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v0.36.4 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v0.36.3 - _August 10, 2022_
|
## v0.36.3 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -0,0 +1,113 @@
|
|||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
/*
|
||||||
|
|
||||||
|
Copyright 2022 ZeroEx Intl.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
pragma solidity ^0.6.5;
|
||||||
|
pragma experimental ABIEncoderV2;
|
||||||
|
|
||||||
|
import "./AbstractBridgeAdapter.sol";
|
||||||
|
import "./BridgeProtocols.sol";
|
||||||
|
import "./mixins/MixinBalancerV2.sol";
|
||||||
|
import "./mixins/MixinCurve.sol";
|
||||||
|
import "./mixins/MixinDodoV2.sol";
|
||||||
|
import "./mixins/MixinGMX.sol";
|
||||||
|
import "./mixins/MixinUniswapV3.sol";
|
||||||
|
import "./mixins/MixinZeroExBridge.sol";
|
||||||
|
|
||||||
|
contract ArbitrumBridgeAdapter is
|
||||||
|
AbstractBridgeAdapter(42161, "Arbitrum"),
|
||||||
|
MixinBalancerV2,
|
||||||
|
MixinCurve,
|
||||||
|
MixinDodoV2,
|
||||||
|
MixinGMX,
|
||||||
|
MixinUniswapV3,
|
||||||
|
MixinZeroExBridge
|
||||||
|
{
|
||||||
|
constructor(IEtherTokenV06 weth)
|
||||||
|
public
|
||||||
|
MixinCurve(weth)
|
||||||
|
{}
|
||||||
|
|
||||||
|
function _trade(
|
||||||
|
BridgeOrder memory order,
|
||||||
|
IERC20TokenV06 sellToken,
|
||||||
|
IERC20TokenV06 buyToken,
|
||||||
|
uint256 sellAmount,
|
||||||
|
bool dryRun
|
||||||
|
)
|
||||||
|
internal
|
||||||
|
override
|
||||||
|
returns (uint256 boughtAmount, bool supportedSource)
|
||||||
|
{
|
||||||
|
uint128 protocolId = uint128(uint256(order.source) >> 128);
|
||||||
|
if (protocolId == BridgeProtocols.BALANCERV2) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeBalancerV2(
|
||||||
|
sellToken,
|
||||||
|
buyToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
} else if (protocolId == BridgeProtocols.CURVE) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeCurve(
|
||||||
|
sellToken,
|
||||||
|
buyToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
} else if (protocolId == BridgeProtocols.DODOV2) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeDodoV2(
|
||||||
|
sellToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
} else if (protocolId == BridgeProtocols.UNISWAPV3) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeUniswapV3(
|
||||||
|
sellToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
} else if (protocolId == BridgeProtocols.GMX) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeGMX(
|
||||||
|
sellToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
} else if (protocolId == BridgeProtocols.UNKNOWN) {
|
||||||
|
if (dryRun) { return (0, true); }
|
||||||
|
boughtAmount = _tradeZeroExBridge(
|
||||||
|
sellToken,
|
||||||
|
buyToken,
|
||||||
|
sellAmount,
|
||||||
|
order.bridgeData
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
emit BridgeFill(
|
||||||
|
order.source,
|
||||||
|
sellToken,
|
||||||
|
buyToken,
|
||||||
|
sellAmount,
|
||||||
|
boughtAmount
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contracts-zero-ex",
|
"name": "@0x/contracts-zero-ex",
|
||||||
"version": "0.36.3",
|
"version": "0.36.5",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -56,14 +56,14 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/abi-gen": "^5.8.0",
|
"@0x/abi-gen": "^5.8.1",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/contracts-erc20": "^3.3.36",
|
"@0x/contracts-erc20": "^3.3.38",
|
||||||
"@0x/contracts-gen": "^2.0.46",
|
"@0x/contracts-gen": "^2.0.47",
|
||||||
"@0x/contracts-test-utils": "^5.4.27",
|
"@0x/contracts-test-utils": "^5.4.29",
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/order-utils": "^10.4.28",
|
"@0x/order-utils": "^10.4.28",
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/ts-doc-gen": "^0.0.28",
|
"@0x/ts-doc-gen": "^0.0.28",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@typechain/ethers-v5": "^10.0.0",
|
"@typechain/ethers-v5": "^10.0.0",
|
||||||
@@ -85,14 +85,14 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/protocol-utils": "^11.16.3",
|
"@0x/protocol-utils": "^11.16.5",
|
||||||
"@0x/subproviders": "^6.6.5",
|
"@0x/subproviders": "^7.0.0",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/typescript-typings": "^5.3.1",
|
"@0x/typescript-typings": "^5.3.1",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"ethereumjs-util": "^7.0.10",
|
"ethereumjs-util": "^7.0.10",
|
||||||
"ethers": "~4.0.4"
|
"ethers": "~4.0.4"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
let maker: string;
|
let maker: string;
|
||||||
let sender: string;
|
let sender: string;
|
||||||
let notSigner: string;
|
let notSigner: string;
|
||||||
let signers: string[];
|
const signers: string[] = [];
|
||||||
let zeroEx: IZeroExContract;
|
let zeroEx: IZeroExContract;
|
||||||
let feature: MetaTransactionsFeatureContract;
|
let feature: MetaTransactionsFeatureContract;
|
||||||
let feeToken: TestMintableERC20TokenContract;
|
let feeToken: TestMintableERC20TokenContract;
|
||||||
@@ -45,7 +45,8 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
const REENTRANCY_FLAG_MTX = 0x1;
|
const REENTRANCY_FLAG_MTX = 0x1;
|
||||||
|
|
||||||
before(async () => {
|
before(async () => {
|
||||||
[owner, maker, sender, notSigner, ...signers] = await env.getAccountAddressesAsync();
|
let possibleSigners: string[];
|
||||||
|
[owner, maker, sender, notSigner, ...possibleSigners] = await env.getAccountAddressesAsync();
|
||||||
transformERC20Feature = await TestMetaTransactionsTransformERC20FeatureContract.deployFrom0xArtifactAsync(
|
transformERC20Feature = await TestMetaTransactionsTransformERC20FeatureContract.deployFrom0xArtifactAsync(
|
||||||
artifacts.TestMetaTransactionsTransformERC20Feature,
|
artifacts.TestMetaTransactionsTransformERC20Feature,
|
||||||
env.provider,
|
env.provider,
|
||||||
@@ -74,20 +75,26 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
env.txDefaults,
|
env.txDefaults,
|
||||||
{},
|
{},
|
||||||
);
|
);
|
||||||
// Fund signers with fee tokens.
|
|
||||||
await Promise.all(
|
// some accounts returned can be unfunded
|
||||||
signers.map(async signer => {
|
for (const possibleSigner of possibleSigners) {
|
||||||
await feeToken.mint(signer, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync();
|
const balance = await env.web3Wrapper.getBalanceInWeiAsync(possibleSigner);
|
||||||
await feeToken.approve(zeroEx.address, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync({ from: signer });
|
if (balance.isGreaterThan(0)) {
|
||||||
}),
|
signers.push(possibleSigner);
|
||||||
);
|
await feeToken
|
||||||
|
.approve(zeroEx.address, MAX_FEE_AMOUNT)
|
||||||
|
.awaitTransactionSuccessAsync({ from: possibleSigner });
|
||||||
|
await feeToken.mint(possibleSigner, MAX_FEE_AMOUNT).awaitTransactionSuccessAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function getRandomMetaTransaction(fields: Partial<MetaTransactionFields> = {}): MetaTransaction {
|
function getRandomMetaTransaction(fields: Partial<MetaTransactionFields> = {}): MetaTransaction {
|
||||||
return new MetaTransaction({
|
return new MetaTransaction({
|
||||||
signer: _.sampleSize(signers)[0],
|
signer: _.sampleSize(signers)[0],
|
||||||
sender,
|
sender,
|
||||||
minGasPrice: getRandomInteger('2', '1e9'),
|
// TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
|
minGasPrice: ZERO_AMOUNT,
|
||||||
maxGasPrice: getRandomInteger('1e9', '100e9'),
|
maxGasPrice: getRandomInteger('1e9', '100e9'),
|
||||||
expirationTimeSeconds: new BigNumber(Math.floor(_.now() / 1000) + 360),
|
expirationTimeSeconds: new BigNumber(Math.floor(_.now() / 1000) + 360),
|
||||||
salt: new BigNumber(hexUtils.random()),
|
salt: new BigNumber(hexUtils.random()),
|
||||||
@@ -145,6 +152,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
gasPrice: mtx.minGasPrice,
|
gasPrice: mtx.minGasPrice,
|
||||||
value: mtx.value,
|
value: mtx.value,
|
||||||
};
|
};
|
||||||
|
|
||||||
const rawResult = await feature.executeMetaTransaction(mtx, signature).callAsync(callOpts);
|
const rawResult = await feature.executeMetaTransaction(mtx, signature).callAsync(callOpts);
|
||||||
expect(rawResult).to.eq(RAW_ORDER_SUCCESS_RESULT);
|
expect(rawResult).to.eq(RAW_ORDER_SUCCESS_RESULT);
|
||||||
const receipt = await feature.executeMetaTransaction(mtx, signature).awaitTransactionSuccessAsync(callOpts);
|
const receipt = await feature.executeMetaTransaction(mtx, signature).awaitTransactionSuccessAsync(callOpts);
|
||||||
@@ -434,7 +442,8 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('fails if gas price too low', async () => {
|
// Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
|
it.skip('fails if gas price too low', async () => {
|
||||||
const mtx = getRandomMetaTransaction();
|
const mtx = getRandomMetaTransaction();
|
||||||
const mtxHash = mtx.getHash();
|
const mtxHash = mtx.getHash();
|
||||||
const signature = await mtx.getSignatureWithProviderAsync(env.provider);
|
const signature = await mtx.getSignatureWithProviderAsync(env.provider);
|
||||||
@@ -453,7 +462,8 @@ blockchainTests.resets('MetaTransactions feature', env => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('fails if gas price too high', async () => {
|
// Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
|
it.skip('fails if gas price too high', async () => {
|
||||||
const mtx = getRandomMetaTransaction();
|
const mtx = getRandomMetaTransaction();
|
||||||
const mtxHash = mtx.getHash();
|
const mtxHash = mtx.getHash();
|
||||||
const signature = await mtx.getSignatureWithProviderAsync(env.provider);
|
const signature = await mtx.getSignatureWithProviderAsync(env.provider);
|
||||||
|
|||||||
@@ -938,7 +938,8 @@ blockchainTests.resets('NativeOrdersFeature', env => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('fails if no protocol fee attached', async () => {
|
// TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
|
it.skip('fails if no protocol fee attached', async () => {
|
||||||
const order = getTestLimitOrder();
|
const order = getTestLimitOrder();
|
||||||
await testUtils.prepareBalancesForOrdersAsync([order]);
|
await testUtils.prepareBalancesForOrdersAsync([order]);
|
||||||
const tx = zeroEx
|
const tx = zeroEx
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import {
|
|||||||
TestWethContract,
|
TestWethContract,
|
||||||
} from './wrappers';
|
} from './wrappers';
|
||||||
|
|
||||||
blockchainTests.resets('ProtocolFees', env => {
|
// TODO: dekz Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
|
blockchainTests.resets.skip('ProtocolFees', env => {
|
||||||
const FEE_MULTIPLIER = 70e3;
|
const FEE_MULTIPLIER = 70e3;
|
||||||
let taker: string;
|
let taker: string;
|
||||||
let unauthorized: string;
|
let unauthorized: string;
|
||||||
@@ -62,7 +63,7 @@ blockchainTests.resets('ProtocolFees', env => {
|
|||||||
it('should disallow unauthorized initialization', async () => {
|
it('should disallow unauthorized initialization', async () => {
|
||||||
const pool = hexUtils.random();
|
const pool = hexUtils.random();
|
||||||
|
|
||||||
await protocolFees.collectProtocolFee(pool).awaitTransactionSuccessAsync({ value: singleFeeAmount });
|
await protocolFees.collectProtocolFee(pool).awaitTransactionSuccessAsync({ value: 1e9 });
|
||||||
await protocolFees.transferFeesForPool(pool).awaitTransactionSuccessAsync();
|
await protocolFees.transferFeesForPool(pool).awaitTransactionSuccessAsync();
|
||||||
|
|
||||||
const feeCollector = new FeeCollectorContract(
|
const feeCollector = new FeeCollectorContract(
|
||||||
@@ -89,6 +90,7 @@ blockchainTests.resets('ProtocolFees', env => {
|
|||||||
feeCollector2Address = await protocolFees.getFeeCollector(pool2).callAsync();
|
feeCollector2Address = await protocolFees.getFeeCollector(pool2).callAsync();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Ganache gasPrice opcode is returning 0, cannot influence it up to test this case
|
||||||
it('should revert if insufficient ETH transferred', async () => {
|
it('should revert if insufficient ETH transferred', async () => {
|
||||||
const tooLittle = singleFeeAmount.minus(1);
|
const tooLittle = singleFeeAmount.minus(1);
|
||||||
const tx = protocolFees.collectProtocolFee(pool1).awaitTransactionSuccessAsync({ value: tooLittle });
|
const tx = protocolFees.collectProtocolFee(pool1).awaitTransactionSuccessAsync({ value: tooLittle });
|
||||||
|
|||||||
@@ -52,7 +52,7 @@
|
|||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"contractsPackages": "@0x/contracts-erc20 @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-zero-ex @0x/contracts-treasury",
|
"contractsPackages": "@0x/contracts-erc20 @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-zero-ex @0x/contracts-treasury",
|
||||||
"nonContractPackages": "@0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test @0x/asset-swapper",
|
"nonContractPackages": "@0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test",
|
||||||
"ignoreTestsForPackages": "",
|
"ignoreTestsForPackages": "",
|
||||||
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
|
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
|
||||||
"packagesWithDocPages": "@0x/contract-wrappers",
|
"packagesWithDocPages": "@0x/contract-wrappers",
|
||||||
@@ -75,7 +75,6 @@
|
|||||||
"wsrun": "^5.2.4"
|
"wsrun": "^5.2.4"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"merkle-patricia-tree": "3.0.0",
|
|
||||||
"**/bignumber.js": "^9.0.2"
|
"**/bignumber.js": "^9.0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,13 @@
|
|||||||
{
|
{
|
||||||
"note": "Offboard Cream",
|
"note": "Offboard Cream",
|
||||||
"pr": 546
|
"pr": 546
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"note": "Change WooFi gas estimates",
|
||||||
|
"pr": 551
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"timestamp": 1661145612
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
|
|||||||
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v16.66.4 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Offboard Cream (#546)
|
||||||
|
* Change WooFi gas estimates (#551)
|
||||||
|
|
||||||
## v16.66.3 - _August 10, 2022_
|
## v16.66.3 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
> :warning: **@0x/asset-swapper has been deprecated!** The `asset-swapper` code has been moved to [0x-api](https://github.com/0xProject/0x-api). Please do not open a PR with `asset-swapper` changes.
|
||||||
|
|
||||||
## @0x/asset-swapper
|
## @0x/asset-swapper
|
||||||
|
|
||||||
Convenience package for swapping assets represented on the Ethereum blockchain using 0x. The package helps to perform all the off-chain computations to execute a marketBuy or marketSell function execution with 0x exchange contracts, or 0x extension contracts. Given some liquidity (0x signed orders), it helps estimate the cost of buying or selling a certain asset (giving a range) and then provide varying consumable outputs to execute the buy or sell.
|
Convenience package for swapping assets represented on the Ethereum blockchain using 0x. The package helps to perform all the off-chain computations to execute a marketBuy or marketSell function execution with 0x exchange contracts, or 0x extension contracts. Given some liquidity (0x signed orders), it helps estimate the cost of buying or selling a certain asset (giving a range) and then provide varying consumable outputs to execute the buy or sell.
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/asset-swapper",
|
"name": "@0x/asset-swapper",
|
||||||
"version": "16.66.3",
|
"version": "16.66.5",
|
||||||
|
"private": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -8,8 +9,8 @@
|
|||||||
"main": "lib/src/index.js",
|
"main": "lib/src/index.js",
|
||||||
"types": "lib/src/index.d.ts",
|
"types": "lib/src/index.d.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "yarn pre_build && tsc -b",
|
"build": "#yarn pre_build && tsc -b",
|
||||||
"build:ts": "tsc -b",
|
"build:ts": "#tsc -b",
|
||||||
"watch": "tsc -w -p tsconfig.json",
|
"watch": "tsc -w -p tsconfig.json",
|
||||||
"watch:contracts": "sol-compiler -w",
|
"watch:contracts": "sol-compiler -w",
|
||||||
"build:ci": "yarn build",
|
"build:ci": "yarn build",
|
||||||
@@ -19,11 +20,11 @@
|
|||||||
"lint-contracts": "#solhint -c .solhint.json contracts/**/**/**/**/*.sol",
|
"lint-contracts": "#solhint -c .solhint.json contracts/**/**/**/**/*.sol",
|
||||||
"prettier": "prettier --write '**/*.{ts,tsx,json}' --config ../../.prettierrc --ignore-path ../../.prettierignore",
|
"prettier": "prettier --write '**/*.{ts,tsx,json}' --config ../../.prettierrc --ignore-path ../../.prettierignore",
|
||||||
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-wrappers/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
|
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-wrappers/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
|
||||||
"test": "yarn run_mocha",
|
"test": "#yarn run_mocha",
|
||||||
"rebuild_and_test": "run-s clean build test",
|
"rebuild_and_test": "run-s clean build test",
|
||||||
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
|
||||||
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
|
||||||
"test:circleci": "yarn test:coverage",
|
"test:circleci": "#yarn test:coverage",
|
||||||
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*_test.js' lib/test/global_hooks.js --timeout 30000 --bail --exit",
|
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*_test.js' lib/test/global_hooks.js --timeout 30000 --bail --exit",
|
||||||
"clean": "shx rm -rf lib test_temp generated_docs test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
|
"clean": "shx rm -rf lib test_temp generated_docs test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
|
||||||
"diff_docs": "git diff --exit-code ./docs",
|
"diff_docs": "git diff --exit-code ./docs",
|
||||||
@@ -59,21 +60,21 @@
|
|||||||
"registry": "git@github.com:0xProject/gitpkg-registry.git"
|
"registry": "git@github.com:0xProject/gitpkg-registry.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/assert": "^3.0.34",
|
"@0x/assert": "^3.0.35",
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/contract-wrappers": "^13.20.8",
|
"@0x/contract-wrappers": "^13.21.2",
|
||||||
"@0x/contracts-erc20": "^3.3.36",
|
"@0x/contracts-erc20": "^3.3.38",
|
||||||
"@0x/contracts-zero-ex": "^0.36.3",
|
"@0x/contracts-zero-ex": "^0.36.5",
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/fast-abi": "^0.0.5",
|
"@0x/fast-abi": "^0.0.5",
|
||||||
"@0x/json-schemas": "^6.4.4",
|
"@0x/json-schemas": "^6.4.4",
|
||||||
"@0x/neon-router": "^0.3.5",
|
"@0x/neon-router": "^0.3.5",
|
||||||
"@0x/protocol-utils": "^11.16.3",
|
"@0x/protocol-utils": "^11.16.5",
|
||||||
"@0x/quote-server": "^8.0.0",
|
"@0x/quote-server": "^8.0.0",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"@balancer-labs/sdk": "0.1.6",
|
"@balancer-labs/sdk": "0.1.6",
|
||||||
"@bancor/sdk": "0.2.9",
|
"@bancor/sdk": "0.2.9",
|
||||||
"@ethersproject/abi": "^5.0.1",
|
"@ethersproject/abi": "^5.0.1",
|
||||||
@@ -84,7 +85,7 @@
|
|||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"axios-mock-adapter": "^1.19.0",
|
"axios-mock-adapter": "^1.19.0",
|
||||||
"balancer-labs-sor-v1": "npm:@balancer-labs/sor@0.3.2",
|
"balancer-labs-sor-v1": "npm:@balancer-labs/sor@0.3.2",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"graphql": "^15.4.0",
|
"graphql": "^15.4.0",
|
||||||
"graphql-request": "^3.4.0",
|
"graphql-request": "^3.4.0",
|
||||||
"heartbeats": "^5.0.1",
|
"heartbeats": "^5.0.1",
|
||||||
@@ -92,11 +93,11 @@
|
|||||||
"msw": "^0.44.2"
|
"msw": "^0.44.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/abi-gen": "^5.8.0",
|
"@0x/abi-gen": "^5.8.1",
|
||||||
"@0x/contracts-gen": "^2.0.46",
|
"@0x/contracts-gen": "^2.0.47",
|
||||||
"@0x/contracts-test-utils": "^5.4.27",
|
"@0x/contracts-test-utils": "^5.4.29",
|
||||||
"@0x/sol-compiler": "^4.8.1",
|
"@0x/sol-compiler": "^4.8.2",
|
||||||
"@0x/subproviders": "^6.6.5",
|
"@0x/subproviders": "^7.0.0",
|
||||||
"@0x/ts-doc-gen": "^0.0.28",
|
"@0x/ts-doc-gen": "^0.0.28",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@types/lodash": "4.14.137",
|
"@types/lodash": "4.14.137",
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ function valueByChainId<T>(rest: Partial<{ [key in ChainId]: T }>, defaultValue:
|
|||||||
[ChainId.Fantom]: defaultValue,
|
[ChainId.Fantom]: defaultValue,
|
||||||
[ChainId.Celo]: defaultValue,
|
[ChainId.Celo]: defaultValue,
|
||||||
[ChainId.Optimism]: defaultValue,
|
[ChainId.Optimism]: defaultValue,
|
||||||
|
[ChainId.Arbitrum]: defaultValue,
|
||||||
|
|
||||||
...(rest || {}),
|
...(rest || {}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -550,7 +552,6 @@ export const POLYGON_TOKENS = {
|
|||||||
nUSD: '0xb6c473756050de474286bed418b77aeac39b02af',
|
nUSD: '0xb6c473756050de474286bed418b77aeac39b02af',
|
||||||
ANY: '0x6aB6d61428fde76768D7b45D8BFeec19c6eF91A8',
|
ANY: '0x6aB6d61428fde76768D7b45D8BFeec19c6eF91A8',
|
||||||
WOO: '0x1b815d120b3ef02039ee11dc2d33de7aa4a8c603',
|
WOO: '0x1b815d120b3ef02039ee11dc2d33de7aa4a8c603',
|
||||||
deUSDC: '0x1ddcaa4ed761428ae348befc6718bcb12e63bfaa',
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const AVALANCHE_TOKENS = {
|
export const AVALANCHE_TOKENS = {
|
||||||
@@ -578,7 +579,6 @@ export const AVALANCHE_TOKENS = {
|
|||||||
FRAX: '0xd24c2ad096400b6fbcd2ad8b24e7acbc21a1da64',
|
FRAX: '0xd24c2ad096400b6fbcd2ad8b24e7acbc21a1da64',
|
||||||
YUSD: '0x111111111111ed1d73f860f57b2798b683f2d325',
|
YUSD: '0x111111111111ed1d73f860f57b2798b683f2d325',
|
||||||
WOO: '0xabc9547b534519ff73921b1fba6e672b5f58d083',
|
WOO: '0xabc9547b534519ff73921b1fba6e672b5f58d083',
|
||||||
deUSDC: '0x28690ec942671aC8d9Bc442B667EC338eDE6dFd3',
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CELO_TOKENS = {
|
export const CELO_TOKENS = {
|
||||||
@@ -733,7 +733,6 @@ export const CURVE_V2_POOLS = {
|
|||||||
export const CURVE_POLYGON_POOLS = {
|
export const CURVE_POLYGON_POOLS = {
|
||||||
aave: '0x445fe580ef8d70ff569ab36e80c647af338db351',
|
aave: '0x445fe580ef8d70ff569ab36e80c647af338db351',
|
||||||
ren: '0xc2d95eef97ec6c17551d45e77b590dc1f9117c67',
|
ren: '0xc2d95eef97ec6c17551d45e77b590dc1f9117c67',
|
||||||
deUSDC: '0xda43bfd7ecc6835aa6f1761ced30b986a574c0d2'
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CURVE_V2_POLYGON_POOLS = {
|
export const CURVE_V2_POLYGON_POOLS = {
|
||||||
@@ -744,7 +743,6 @@ export const CURVE_AVALANCHE_POOLS = {
|
|||||||
aave: '0x7f90122bf0700f9e7e1f688fe926940e8839f353',
|
aave: '0x7f90122bf0700f9e7e1f688fe926940e8839f353',
|
||||||
mim: '0xaea2e71b631fa93683bcf256a8689dfa0e094fcd',
|
mim: '0xaea2e71b631fa93683bcf256a8689dfa0e094fcd',
|
||||||
USDC: '0x3a43a5851a3e3e0e25a3c1089670269786be1577',
|
USDC: '0x3a43a5851a3e3e0e25a3c1089670269786be1577',
|
||||||
deUSDC: '0xd39016475200ab8957e9c772c949ef54bda69111'
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CURVE_V2_AVALANCHE_POOLS = {
|
export const CURVE_V2_AVALANCHE_POOLS = {
|
||||||
@@ -1468,11 +1466,6 @@ export const CURVE_POLYGON_INFOS: { [name: string]: CurveInfo } = {
|
|||||||
pool: CURVE_POLYGON_POOLS.ren,
|
pool: CURVE_POLYGON_POOLS.ren,
|
||||||
gasSchedule: 350e3,
|
gasSchedule: 350e3,
|
||||||
}),
|
}),
|
||||||
[CURVE_POLYGON_POOLS.deUSDC]: createCurveExchangeUnderlyingPool({
|
|
||||||
tokens: [POLYGON_TOKENS.deUSDC, POLYGON_TOKENS.amDAI, POLYGON_TOKENS.amUSDC, POLYGON_TOKENS.amUSDT],
|
|
||||||
pool: CURVE_POLYGON_POOLS.deUSDC,
|
|
||||||
gasSchedule: 150e3,
|
|
||||||
}),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CURVE_V2_POLYGON_INFOS: { [name: string]: CurveInfo } = {
|
export const CURVE_V2_POLYGON_INFOS: { [name: string]: CurveInfo } = {
|
||||||
@@ -1504,11 +1497,6 @@ export const CURVE_AVALANCHE_INFOS: { [name: string]: CurveInfo } = {
|
|||||||
pool: CURVE_AVALANCHE_POOLS.USDC,
|
pool: CURVE_AVALANCHE_POOLS.USDC,
|
||||||
gasSchedule: 150e3,
|
gasSchedule: 150e3,
|
||||||
}),
|
}),
|
||||||
[CURVE_AVALANCHE_POOLS.deUSDC]: createCurveExchangePool({
|
|
||||||
tokens: [AVALANCHE_TOKENS.deUSDC, AVALANCHE_TOKENS.aDAI, AVALANCHE_TOKENS.aUSDC, AVALANCHE_TOKENS.aUSDT],
|
|
||||||
pool: CURVE_AVALANCHE_POOLS.deUSDC,
|
|
||||||
gasSchedule: 300e3,
|
|
||||||
}),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CURVE_V2_AVALANCHE_INFOS: { [name: string]: CurveInfo } = {
|
export const CURVE_V2_AVALANCHE_INFOS: { [name: string]: CurveInfo } = {
|
||||||
@@ -2671,14 +2659,34 @@ export const DEFAULT_GAS_SCHEDULE: Required<GasSchedule> = {
|
|||||||
[ERC20BridgeSource.WOOFi]: (fillData?: FillData) => {
|
[ERC20BridgeSource.WOOFi]: (fillData?: FillData) => {
|
||||||
const woofiFillData = fillData as WOOFiFillData;
|
const woofiFillData = fillData as WOOFiFillData;
|
||||||
const quoteTokenAddresses = [BSC_TOKENS.USDT, AVALANCHE_TOKENS.nUSDC, FANTOM_TOKENS.USDC, POLYGON_TOKENS.USDC];
|
const quoteTokenAddresses = [BSC_TOKENS.USDT, AVALANCHE_TOKENS.nUSDC, FANTOM_TOKENS.USDC, POLYGON_TOKENS.USDC];
|
||||||
|
const hasQuoteToken =
|
||||||
if (
|
|
||||||
quoteTokenAddresses.includes(woofiFillData.takerToken) ||
|
quoteTokenAddresses.includes(woofiFillData.takerToken) ||
|
||||||
quoteTokenAddresses.includes(woofiFillData.makerToken)
|
quoteTokenAddresses.includes(woofiFillData.makerToken);
|
||||||
) {
|
if (woofiFillData.chainId === ChainId.BSC) {
|
||||||
return 500e3;
|
if (hasQuoteToken) {
|
||||||
|
return 550e3;
|
||||||
|
} else {
|
||||||
|
return 100e4;
|
||||||
|
}
|
||||||
|
} else if (woofiFillData.chainId === ChainId.Avalanche) {
|
||||||
|
if (hasQuoteToken) {
|
||||||
|
return 300e3;
|
||||||
|
} else {
|
||||||
|
return 550e3;
|
||||||
|
}
|
||||||
|
} else if (woofiFillData.chainId === ChainId.Polygon) {
|
||||||
|
if (hasQuoteToken) {
|
||||||
|
return 500e3;
|
||||||
|
} else {
|
||||||
|
return 700e3;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return 100e4;
|
// Fantom
|
||||||
|
if (hasQuoteToken) {
|
||||||
|
return 400e3;
|
||||||
|
} else {
|
||||||
|
return 600e3;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -1371,8 +1371,9 @@ export class SamplerOperations {
|
|||||||
makerToken: string,
|
makerToken: string,
|
||||||
makerFillAmounts: BigNumber[],
|
makerFillAmounts: BigNumber[],
|
||||||
): SourceQuoteOperation<WOOFiFillData> {
|
): SourceQuoteOperation<WOOFiFillData> {
|
||||||
|
const chainId = this.chainId;
|
||||||
return new SamplerContractOperation({
|
return new SamplerContractOperation({
|
||||||
fillData: { poolAddress, takerToken, makerToken },
|
fillData: { poolAddress, takerToken, makerToken, chainId },
|
||||||
source: ERC20BridgeSource.WOOFi,
|
source: ERC20BridgeSource.WOOFi,
|
||||||
contract: this._samplerContract,
|
contract: this._samplerContract,
|
||||||
function: this._samplerContract.sampleSellsFromWooPP,
|
function: this._samplerContract.sampleSellsFromWooPP,
|
||||||
@@ -1386,8 +1387,9 @@ export class SamplerOperations {
|
|||||||
makerToken: string,
|
makerToken: string,
|
||||||
makerFillAmounts: BigNumber[],
|
makerFillAmounts: BigNumber[],
|
||||||
): SourceQuoteOperation<WOOFiFillData> {
|
): SourceQuoteOperation<WOOFiFillData> {
|
||||||
|
const chainId = this.chainId;
|
||||||
return new SamplerContractOperation({
|
return new SamplerContractOperation({
|
||||||
fillData: { poolAddress, takerToken, makerToken },
|
fillData: { poolAddress, takerToken, makerToken, chainId },
|
||||||
source: ERC20BridgeSource.WOOFi,
|
source: ERC20BridgeSource.WOOFi,
|
||||||
contract: this._samplerContract,
|
contract: this._samplerContract,
|
||||||
function: this._samplerContract.sampleBuysFromWooPP,
|
function: this._samplerContract.sampleBuysFromWooPP,
|
||||||
|
|||||||
@@ -377,6 +377,8 @@ export interface WOOFiFillData extends FillData {
|
|||||||
poolAddress: string;
|
poolAddress: string;
|
||||||
takerToken: string;
|
takerToken: string;
|
||||||
makerToken: string;
|
makerToken: string;
|
||||||
|
// Only needed for gas estimation
|
||||||
|
chainId: ChainId;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface VelodromeFillData extends FillData {
|
export interface VelodromeFillData extends FillData {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ blockchainTests.resets('BalanceChecker contract', env => {
|
|||||||
|
|
||||||
const testResults = await contract.balances([owner, owner2], [makerToken.address, ETH_ADDRESS]).callAsync();
|
const testResults = await contract.balances([owner, owner2], [makerToken.address, ETH_ADDRESS]).callAsync();
|
||||||
|
|
||||||
expect(testResults).to.eql([new BigNumber(100), new BigNumber(100000000000000000000)]);
|
expect(testResults).to.eql([new BigNumber(100), new BigNumber(1000000000000000000000)]);
|
||||||
});
|
});
|
||||||
it('it throws an error if the input arrays of different lengths', async () => {
|
it('it throws an error if the input arrays of different lengths', async () => {
|
||||||
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
const accounts = await web3Wrapper.getAvailableAddressesAsync();
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ export const testHelpers = {
|
|||||||
const { endpoint, mmApiKey, requestData, responseData, responseCode } = mockedResponse;
|
const { endpoint, mmApiKey, requestData, responseData, responseCode } = mockedResponse;
|
||||||
const requestHeaders = {
|
const requestHeaders = {
|
||||||
Accept: 'application/json, text/plain, */*',
|
Accept: 'application/json, text/plain, */*',
|
||||||
'Content-Type': 'application/json;charset=utf-8',
|
'Content-Type': 'application/json',
|
||||||
Authorization: `Bearer ${mmApiKey}`,
|
Authorization: `Bearer ${mmApiKey}`,
|
||||||
};
|
};
|
||||||
mockedAxios
|
mockedAxios
|
||||||
|
|||||||
@@ -1,11 +1,21 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "6.21.0",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Arbitrum addresses: need to be updated when deployed"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timestamp": 1661459661
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "6.20.1",
|
"version": "6.20.1",
|
||||||
"changes": [
|
"changes": [
|
||||||
{
|
{
|
||||||
"note": "Revert: Remove contract addresses that are no longer needed"
|
"note": "Revert: Remove contract addresses that are no longer needed"
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"timestamp": 1661145612
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "6.20.0",
|
"version": "6.20.0",
|
||||||
|
|||||||
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v6.21.0 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Arbitrum addresses: need to be updated when deployed
|
||||||
|
|
||||||
|
## v6.20.1 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Revert: Remove contract addresses that are no longer needed
|
||||||
|
|
||||||
|
## v6.20.0 - _Invalid date_
|
||||||
|
|
||||||
|
* Remove contract addresses that are no longer needed (#548)
|
||||||
|
|
||||||
## v6.19.2 - _August 10, 2022_
|
## v6.19.2 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -544,5 +544,47 @@
|
|||||||
"fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
|
"fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
|
||||||
"positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
|
"positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"42161": {
|
||||||
|
"erc20Proxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"erc721Proxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"zrxToken": "0x0000000000000000000000000000000000000000",
|
||||||
|
"etherToken": "0x4200000000000000000000000000000000000006",
|
||||||
|
"exchangeV2": "0x0000000000000000000000000000000000000000",
|
||||||
|
"exchange": "0x0000000000000000000000000000000000000000",
|
||||||
|
"assetProxyOwner": "0x0000000000000000000000000000000000000000",
|
||||||
|
"zeroExGovernor": "0x0000000000000000000000000000000000000000",
|
||||||
|
"forwarder": "0x0000000000000000000000000000000000000000",
|
||||||
|
"coordinatorRegistry": "0x0000000000000000000000000000000000000000",
|
||||||
|
"coordinator": "0x0000000000000000000000000000000000000000",
|
||||||
|
"multiAssetProxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"staticCallProxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"erc1155Proxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"devUtils": "0x0000000000000000000000000000000000000000",
|
||||||
|
"zrxVault": "0x0000000000000000000000000000000000000000",
|
||||||
|
"staking": "0x0000000000000000000000000000000000000000",
|
||||||
|
"stakingProxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
|
||||||
|
"erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
|
||||||
|
"chaiBridge": "0x0000000000000000000000000000000000000000",
|
||||||
|
"dydxBridge": "0x0000000000000000000000000000000000000000",
|
||||||
|
"godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
|
||||||
|
"broker": "0x0000000000000000000000000000000000000000",
|
||||||
|
"chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
|
||||||
|
"maximumGasPrice": "0x0000000000000000000000000000000000000000",
|
||||||
|
"dexForwarderBridge": "0x0000000000000000000000000000000000000000",
|
||||||
|
"exchangeProxyGovernor": "0x1fe80d5ad9464dba2d60b88e449305f184823f8a",
|
||||||
|
"exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
|
||||||
|
"exchangeProxyTransformerDeployer": "0x29f80c1f685e19ae1807063eda432f431ac623d0",
|
||||||
|
"exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
|
||||||
|
"exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
|
||||||
|
"zrxTreasury": "0x0000000000000000000000000000000000000000",
|
||||||
|
"transformers": {
|
||||||
|
"wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
|
||||||
|
"payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
|
||||||
|
"affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
|
||||||
|
"fillQuoteTransformer": "0x24760a755a4ffe4e44f661336fd0dc646fd6f723",
|
||||||
|
"positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contract-addresses",
|
"name": "@0x/contract-addresses",
|
||||||
"version": "6.19.2",
|
"version": "6.21.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export enum ChainId {
|
|||||||
Avalanche = 43114,
|
Avalanche = 43114,
|
||||||
Fantom = 250,
|
Fantom = 250,
|
||||||
Celo = 42220,
|
Celo = 42220,
|
||||||
// Arbitrum = 42161,
|
Arbitrum = 42161,
|
||||||
Optimism = 10,
|
Optimism = 10,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,13 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "3.18.1",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "3.18.0",
|
"version": "3.18.0",
|
||||||
"changes": [
|
"changes": [
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v3.18.1 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v3.18.0 - _March 31, 2022_
|
## v3.18.0 - _March 31, 2022_
|
||||||
|
|
||||||
* Regenerate all artifacts (#449)
|
* Regenerate all artifacts (#449)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contract-artifacts",
|
"name": "@0x/contract-artifacts",
|
||||||
"version": "3.18.0",
|
"version": "3.18.1",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-artifacts",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-artifacts",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@types/mocha": "^5.2.7",
|
"@types/mocha": "^5.2.7",
|
||||||
"chai": "^4.0.1",
|
"chai": "^4.0.1",
|
||||||
"lodash": "^4.17.11",
|
"lodash": "^4.17.11",
|
||||||
|
|||||||
@@ -1,11 +1,21 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "13.21.2",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "13.21.1",
|
"version": "13.21.1",
|
||||||
"changes": [
|
"changes": [
|
||||||
{
|
{
|
||||||
"note": "Revert: Remove deprecated contracts"
|
"note": "Revert: Remove deprecated contracts"
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"timestamp": 1661145612
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "13.21.0",
|
"version": "13.21.0",
|
||||||
|
|||||||
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v13.21.2 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v13.21.1 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Revert: Remove deprecated contracts
|
||||||
|
|
||||||
|
## v13.21.0 - _Invalid date_
|
||||||
|
|
||||||
|
* Remove deprecated contracts
|
||||||
|
|
||||||
## v13.20.8 - _August 10, 2022_
|
## v13.20.8 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/contract-wrappers",
|
"name": "@0x/contract-wrappers",
|
||||||
"version": "13.20.8",
|
"version": "13.21.2",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -55,14 +55,14 @@
|
|||||||
"typescript": "4.6.3"
|
"typescript": "4.6.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/assert": "^3.0.34",
|
"@0x/assert": "^3.0.35",
|
||||||
"@0x/base-contract": "^6.5.0",
|
"@0x/base-contract": "^7.0.0",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/json-schemas": "^6.4.4",
|
"@0x/json-schemas": "^6.4.4",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"ethers": "~4.0.4"
|
"ethers": "~4.0.4"
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
|
|||||||
@@ -1,4 +1,22 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"timestamp": 1661459661,
|
||||||
|
"version": "11.16.5",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"timestamp": 1661145612,
|
||||||
|
"version": "11.16.4",
|
||||||
|
"changes": [
|
||||||
|
{
|
||||||
|
"note": "Dependencies updated"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"timestamp": 1660093941,
|
"timestamp": 1660093941,
|
||||||
"version": "11.16.3",
|
"version": "11.16.3",
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
|
|||||||
|
|
||||||
CHANGELOG
|
CHANGELOG
|
||||||
|
|
||||||
|
## v11.16.5 - _August 25, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
|
## v11.16.4 - _August 22, 2022_
|
||||||
|
|
||||||
|
* Dependencies updated
|
||||||
|
|
||||||
## v11.16.3 - _August 10, 2022_
|
## v11.16.3 - _August 10, 2022_
|
||||||
|
|
||||||
* Dependencies updated
|
* Dependencies updated
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@0x/protocol-utils",
|
"name": "@0x/protocol-utils",
|
||||||
"version": "11.16.3",
|
"version": "11.16.5",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.12"
|
"node": ">=6.12"
|
||||||
},
|
},
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils",
|
"homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@0x/dev-utils": "^4.2.14",
|
"@0x/dev-utils": "^5.0.0",
|
||||||
"@0x/ts-doc-gen": "^0.0.28",
|
"@0x/ts-doc-gen": "^0.0.28",
|
||||||
"@0x/tslint-config": "^4.1.4",
|
"@0x/tslint-config": "^4.1.4",
|
||||||
"@0x/types": "^3.3.6",
|
"@0x/types": "^3.3.6",
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
"@types/mocha": "^5.2.7",
|
"@types/mocha": "^5.2.7",
|
||||||
"@types/node": "12.12.54",
|
"@types/node": "12.12.54",
|
||||||
"@types/web3-provider-engine": "^14.0.0",
|
"@types/web3-provider-engine": "^14.0.0",
|
||||||
"ethereum-types": "^3.7.0",
|
"ethereum-types": "^3.7.1",
|
||||||
"mocha": "^6.2.0",
|
"mocha": "^6.2.0",
|
||||||
"npm-run-all": "^4.1.2",
|
"npm-run-all": "^4.1.2",
|
||||||
"shx": "^0.2.2",
|
"shx": "^0.2.2",
|
||||||
@@ -62,13 +62,13 @@
|
|||||||
"web3-provider-engine": "14.0.6"
|
"web3-provider-engine": "14.0.6"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@0x/assert": "^3.0.34",
|
"@0x/assert": "^3.0.35",
|
||||||
"@0x/contract-addresses": "^6.19.2",
|
"@0x/contract-addresses": "^6.21.0",
|
||||||
"@0x/contract-wrappers": "^13.20.8",
|
"@0x/contract-wrappers": "^13.21.2",
|
||||||
"@0x/json-schemas": "^6.4.4",
|
"@0x/json-schemas": "^6.4.4",
|
||||||
"@0x/subproviders": "^6.6.5",
|
"@0x/subproviders": "^7.0.0",
|
||||||
"@0x/utils": "^6.5.3",
|
"@0x/utils": "^7.0.0",
|
||||||
"@0x/web3-wrapper": "^7.6.5",
|
"@0x/web3-wrapper": "^8.0.0",
|
||||||
"chai": "^4.0.1",
|
"chai": "^4.0.1",
|
||||||
"ethereumjs-util": "^7.0.10",
|
"ethereumjs-util": "^7.0.10",
|
||||||
"ethers": "~4.0.4",
|
"ethers": "~4.0.4",
|
||||||
|
|||||||
Reference in New Issue
Block a user