Compare commits

..

16 Commits

Author SHA1 Message Date
Marcin Wolny
39c77560a1 Invalid caching configuration 2022-09-20 15:45:26 +02:00
Savarn Dontamsetti
85905d5f19 fixing CI: ganache tests 2022-09-19 17:12:24 -04:00
Savarn Dontamsetti
e85ce9eb8f updating imports 2022-09-19 16:38:49 -04:00
Savarn Dontamsetti
0e29459c60 remvoing DODO V1 from Arbitrum Bridge Adapter 2022-09-19 16:37:55 -04:00
Noah Khamliche
43a705f41e remove duplicate DODOV2 2022-09-12 14:36:47 -04:00
Noah Khamliche
bffb064649 refactor bridgeAdapter to include currently deployed changes 2022-09-12 14:08:17 -04:00
Savarn Dontamsetti
846796ad36 adding Nerve Mixin to Arbitrum Bridge Adapter 2022-09-12 13:54:58 -04:00
Github Actions
1fa093be64 Publish
- @0x/contracts-erc20@3.3.43
 - @0x/contracts-test-utils@5.4.34
 - @0x/contracts-treasury@1.4.26
 - @0x/contracts-utils@4.8.24
 - @0x/contracts-zero-ex@0.37.3
 - @0x/asset-swapper@16.66.10
 - @0x/contract-addresses@6.23.3
 - @0x/contract-wrappers@13.22.3
 - @0x/protocol-utils@11.16.10
2022-09-12 15:56:30 +00:00
Github Actions
8e9f358a02 Updated CHANGELOGS & MD docs 2022-09-12 15:56:27 +00:00
Noah Khamliche
0a2e8fc224 feat: add new fqt for optimism with balancerv2 (#577)
* add new fqt for optimism with balancerv2

* changelog

Co-authored-by: Noah Khamliche <0xnoah@Noahs-MacBook-Pro-2.local>
2022-09-09 15:50:23 -04:00
Github Actions
5653ee8f86 Publish
- @0x/contracts-erc20@3.3.42
 - @0x/contracts-test-utils@5.4.33
 - @0x/contracts-treasury@1.4.25
 - @0x/contracts-utils@4.8.23
 - @0x/contracts-zero-ex@0.37.2
 - @0x/asset-swapper@16.66.9
 - @0x/contract-addresses@6.23.2
 - @0x/contract-wrappers@13.22.2
 - @0x/protocol-utils@11.16.9
2022-09-07 14:10:14 +00:00
Github Actions
d180d5325d Updated CHANGELOGS & MD docs 2022-09-07 14:10:11 +00:00
Noah Khamliche
d249042b47 nwe fqt address and changelog (#574)
* nwe fqt address and changelog

* add pr

Co-authored-by: Noah Khamliche <0xnoah@Noahs-MacBook-Pro-2.local>
2022-09-07 09:52:42 -04:00
Github Actions
d3a6f79015 Publish
- @0x/contracts-erc20@3.3.41
 - @0x/contracts-test-utils@5.4.32
 - @0x/contracts-treasury@1.4.24
 - @0x/contracts-utils@4.8.22
 - @0x/contracts-zero-ex@0.37.1
 - @0x/asset-swapper@16.66.8
 - @0x/contract-addresses@6.23.1
 - @0x/contract-wrappers@13.22.1
 - @0x/protocol-utils@11.16.8
2022-09-02 19:31:26 +00:00
Github Actions
8c9dc96e5d Updated CHANGELOGS & MD docs 2022-09-02 19:31:23 +00:00
Noah Khamliche
fc0edba46b Fix/new arbitrum bridge adapter (#572)
* added new fqt with new bridge adapter for Arbitrum

* changelog

* changelog add pr

Co-authored-by: Noah Khamliche <0xnoah@Noahs-MacBook-Pro-2.local>
2022-09-02 15:16:00 -04:00
29 changed files with 419 additions and 56 deletions

View File

@@ -3,7 +3,7 @@ version: 2.1
parameters: parameters:
cache_version: cache_version:
type: string type: string
default: v4 default: v5
jobs: jobs:
build: build:
@@ -33,46 +33,46 @@ jobs:
- save_cache: - save_cache:
key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
paths: paths:
- ~/project/contracts/erc20/node_modules
- ~/project/contracts/test-utils/node_modules
- ~/project/contracts/treasury/node_modules
- ~/project/contracts/utils/node_modules
- ~/project/contracts/zero-ex/node_modules
- ~/project/node_modules - ~/project/node_modules
- ~/project/packages/asset-swapper/node_modules
- ~/project/packages/contract-addresses/node_modules
- ~/project/packages/contract-artifacts/node_modules
- ~/project/packages/contract-wrappers/node_modules
- ~/project/packages/protocol-utils/node_modules
- ~/.cache/yarn - ~/.cache/yarn
- save_cache: - save_cache:
key: lib-{{ .Environment.CIRCLE_BRANCH }} key: lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
paths: paths:
- ~/project/contracts/erc20/generated-artifacts/ - ~/project/contracts/erc20/generated-artifacts/
- ~/project/contracts/erc20/generated-wrappers/ - ~/project/contracts/erc20/generated-wrappers/
- ~/project/contracts/erc20/lib/ - ~/project/contracts/erc20/lib/
- ~/project/contracts/erc20/node_modules
- ~/project/contracts/erc20/test/generated-artifacts/ - ~/project/contracts/erc20/test/generated-artifacts/
- ~/project/contracts/erc20/test/generated-wrappers/ - ~/project/contracts/erc20/test/generated-wrappers/
- ~/project/contracts/test-utils/lib/ - ~/project/contracts/test-utils/lib/
- ~/project/contracts/test-utils/node_modules
- ~/project/contracts/treasury/generated-artifacts/ - ~/project/contracts/treasury/generated-artifacts/
- ~/project/contracts/treasury/generated-wrappers/ - ~/project/contracts/treasury/generated-wrappers/
- ~/project/contracts/treasury/lib/ - ~/project/contracts/treasury/lib/
- ~/project/contracts/treasury/node_modules
- ~/project/contracts/treasury/test/generated-artifacts/ - ~/project/contracts/treasury/test/generated-artifacts/
- ~/project/contracts/treasury/test/generated-wrappers/ - ~/project/contracts/treasury/test/generated-wrappers/
- ~/project/contracts/utils/generated-artifacts/ - ~/project/contracts/utils/generated-artifacts/
- ~/project/contracts/utils/generated-wrappers/ - ~/project/contracts/utils/generated-wrappers/
- ~/project/contracts/utils/lib/ - ~/project/contracts/utils/lib/
- ~/project/contracts/utils/node_modules
- ~/project/contracts/utils/test/generated-artifacts/ - ~/project/contracts/utils/test/generated-artifacts/
- ~/project/contracts/utils/test/generated-wrappers/ - ~/project/contracts/utils/test/generated-wrappers/
- ~/project/contracts/zero-ex/generated-artifacts/ - ~/project/contracts/zero-ex/generated-artifacts/
- ~/project/contracts/zero-ex/generated-wrappers/ - ~/project/contracts/zero-ex/generated-wrappers/
- ~/project/contracts/zero-ex/lib/ - ~/project/contracts/zero-ex/lib/
- ~/project/contracts/zero-ex/node_modules
- ~/project/contracts/zero-ex/test/generated-artifacts/ - ~/project/contracts/zero-ex/test/generated-artifacts/
- ~/project/contracts/zero-ex/test/generated-wrappers/ - ~/project/contracts/zero-ex/test/generated-wrappers/
- ~/project/packages/asset-swapper/node_modules
- ~/project/packages/contract-addresses/lib/ - ~/project/packages/contract-addresses/lib/
- ~/project/packages/contract-addresses/node_modules
- ~/project/packages/contract-artifacts/lib/ - ~/project/packages/contract-artifacts/lib/
- ~/project/packages/contract-artifacts/node_modules
- ~/project/packages/contract-wrappers/lib/ - ~/project/packages/contract-wrappers/lib/
- ~/project/packages/contract-wrappers/node_modules
- ~/project/packages/protocol-utils/lib/ - ~/project/packages/protocol-utils/lib/
- ~/project/packages/protocol-utils/node_modules
- store_artifacts: - store_artifacts:
path: ~/repo/packages/abi-gen/test-cli/output path: ~/repo/packages/abi-gen/test-cli/output
- store_artifacts: - store_artifacts:
@@ -88,7 +88,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< 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: xlarge resource_class: xlarge
@@ -101,7 +101,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< 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: xlarge resource_class: xlarge
@@ -112,7 +112,7 @@ jobs:
- restore_cache: - restore_cache:
keys: keys:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< 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: xlarge resource_class: xlarge
@@ -125,7 +125,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }} - cache-{{ checksum "yarn.lock" }}
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- 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: xlarge resource_class: xlarge
@@ -143,7 +143,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- run: | - run: |
yarn wsrun \ yarn wsrun \
-p @0x/contracts-multisig \ -p @0x/contracts-multisig \
@@ -173,7 +173,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- run: git submodule update --init --recursive - run: git submodule update --init --recursive
- run: - run:
command: forge test command: forge test
@@ -198,7 +198,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- run: - run:
command: yarn test:publish:circleci command: yarn test:publish:circleci
no_output_timeout: 1800 no_output_timeout: 1800
@@ -214,7 +214,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< 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
@@ -230,7 +230,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< 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
@@ -257,7 +257,10 @@ jobs:
- restore_cache: - restore_cache:
keys: keys:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- run: - run:
command: yarn lerna run lint command: yarn lerna run lint
- run: - run:
@@ -275,7 +278,7 @@ jobs:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- lib-{{ .Environment.CIRCLE_BRANCH }} - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >>
- restore_cache: - restore_cache:
keys: keys:
- coverage-contract-wrappers-test-{{ checksum "yarn.lock" }} - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "3.3.43",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "3.3.42",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "3.3.41",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1662046042, "timestamp": 1662046042,
"version": "3.3.40", "version": "3.3.40",

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v3.3.43 - _September 12, 2022_
* Dependencies updated
## v3.3.42 - _September 7, 2022_
* Dependencies updated
## v3.3.41 - _September 2, 2022_
* Dependencies updated
## v3.3.40 - _September 1, 2022_ ## v3.3.40 - _September 1, 2022_
* Dependencies updated * Dependencies updated

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-erc20", "name": "@0x/contracts-erc20",
"version": "3.3.40", "version": "3.3.43",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -53,8 +53,8 @@
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^5.8.1", "@0x/abi-gen": "^5.8.1",
"@0x/contracts-gen": "^2.0.47", "@0x/contracts-gen": "^2.0.47",
"@0x/contracts-test-utils": "^5.4.31", "@0x/contracts-test-utils": "^5.4.34",
"@0x/contracts-utils": "^4.8.21", "@0x/contracts-utils": "^4.8.24",
"@0x/dev-utils": "^5.0.0", "@0x/dev-utils": "^5.0.0",
"@0x/sol-compiler": "^4.8.2", "@0x/sol-compiler": "^4.8.2",
"@0x/ts-doc-gen": "^0.0.28", "@0x/ts-doc-gen": "^0.0.28",

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "5.4.34",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "5.4.33",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "5.4.32",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1662046042, "timestamp": 1662046042,
"version": "5.4.31", "version": "5.4.31",

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v5.4.34 - _September 12, 2022_
* Dependencies updated
## v5.4.33 - _September 7, 2022_
* Dependencies updated
## v5.4.32 - _September 2, 2022_
* Dependencies updated
## v5.4.31 - _September 1, 2022_ ## v5.4.31 - _September 1, 2022_
* Dependencies updated * Dependencies updated

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-test-utils", "name": "@0x/contracts-test-utils",
"version": "5.4.31", "version": "5.4.34",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -44,7 +44,7 @@
"dependencies": { "dependencies": {
"@0x/assert": "^3.0.35", "@0x/assert": "^3.0.35",
"@0x/base-contract": "^7.0.0", "@0x/base-contract": "^7.0.0",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/dev-utils": "^5.0.0", "@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",

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "1.4.26",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "1.4.25",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "1.4.24",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1662046042, "timestamp": 1662046042,
"version": "1.4.23", "version": "1.4.23",

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v1.4.26 - _September 12, 2022_
* Dependencies updated
## v1.4.25 - _September 7, 2022_
* Dependencies updated
## v1.4.24 - _September 2, 2022_
* Dependencies updated
## v1.4.23 - _September 1, 2022_ ## v1.4.23 - _September 1, 2022_
* Dependencies updated * Dependencies updated

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-treasury", "name": "@0x/contracts-treasury",
"version": "1.4.23", "version": "1.4.26",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -47,12 +47,12 @@
"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.1", "@0x/abi-gen": "^5.8.1",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/contracts-asset-proxy": "^3.7.19", "@0x/contracts-asset-proxy": "^3.7.19",
"@0x/contracts-erc20": "^3.3.40", "@0x/contracts-erc20": "^3.3.43",
"@0x/contracts-gen": "^2.0.47", "@0x/contracts-gen": "^2.0.47",
"@0x/contracts-staking": "^2.0.45", "@0x/contracts-staking": "^2.0.45",
"@0x/contracts-test-utils": "^5.4.31", "@0x/contracts-test-utils": "^5.4.34",
"@0x/sol-compiler": "^4.8.2", "@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",
@@ -73,7 +73,7 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^7.0.0", "@0x/base-contract": "^7.0.0",
"@0x/protocol-utils": "^11.16.7", "@0x/protocol-utils": "^11.16.10",
"@0x/subproviders": "^7.0.0", "@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",

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "4.8.24",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "4.8.23",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "4.8.22",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"timestamp": 1662046042, "timestamp": 1662046042,
"version": "4.8.21", "version": "4.8.21",

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v4.8.24 - _September 12, 2022_
* Dependencies updated
## v4.8.23 - _September 7, 2022_
* Dependencies updated
## v4.8.22 - _September 2, 2022_
* Dependencies updated
## v4.8.21 - _September 1, 2022_ ## v4.8.21 - _September 1, 2022_
* Dependencies updated * Dependencies updated

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-utils", "name": "@0x/contracts-utils",
"version": "4.8.21", "version": "4.8.24",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -52,7 +52,7 @@
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^5.8.1", "@0x/abi-gen": "^5.8.1",
"@0x/contracts-gen": "^2.0.47", "@0x/contracts-gen": "^2.0.47",
"@0x/contracts-test-utils": "^5.4.31", "@0x/contracts-test-utils": "^5.4.34",
"@0x/dev-utils": "^5.0.0", "@0x/dev-utils": "^5.0.0",
"@0x/order-utils": "^10.4.28", "@0x/order-utils": "^10.4.28",
"@0x/sol-compiler": "^4.8.2", "@0x/sol-compiler": "^4.8.2",

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "0.37.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "0.37.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "0.37.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "0.37.0", "version": "0.37.0",
"changes": [ "changes": [

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v0.37.3 - _September 12, 2022_
* Dependencies updated
## v0.37.2 - _September 7, 2022_
* Dependencies updated
## v0.37.1 - _September 2, 2022_
* Dependencies updated
## v0.37.0 - _September 1, 2022_ ## v0.37.0 - _September 1, 2022_
* Add support for OTC orders in the FillQuoteTransformer (#565) * Add support for OTC orders in the FillQuoteTransformer (#565)

View File

@@ -23,19 +23,29 @@ pragma experimental ABIEncoderV2;
import "./AbstractBridgeAdapter.sol"; import "./AbstractBridgeAdapter.sol";
import "./BridgeProtocols.sol"; import "./BridgeProtocols.sol";
import "./mixins/MixinBalancerV2.sol"; import "./mixins/MixinBalancerV2.sol";
import "./mixins/MixinBalancerV2Batch.sol";
import "./mixins/MixinCurve.sol"; import "./mixins/MixinCurve.sol";
import "./mixins/MixinCurveV2.sol";
import "./mixins/MixinDodoV2.sol"; import "./mixins/MixinDodoV2.sol";
import "./mixins/MixinKyberDmm.sol";
import "./mixins/MixinGMX.sol"; import "./mixins/MixinGMX.sol";
import "./mixins/MixinNerve.sol";
import "./mixins/MixinUniswapV3.sol"; import "./mixins/MixinUniswapV3.sol";
import "./mixins/MixinUniswapV2.sol";
import "./mixins/MixinZeroExBridge.sol"; import "./mixins/MixinZeroExBridge.sol";
contract ArbitrumBridgeAdapter is contract ArbitrumBridgeAdapter is
AbstractBridgeAdapter(42161, "Arbitrum"), AbstractBridgeAdapter(42161, "Arbitrum"),
MixinBalancerV2, MixinBalancerV2,
MixinBalancerV2Batch,
MixinCurve, MixinCurve,
MixinCurveV2,
MixinDodoV2, MixinDodoV2,
MixinKyberDmm,
MixinGMX, MixinGMX,
MixinNerve,
MixinUniswapV3, MixinUniswapV3,
MixinUniswapV2,
MixinZeroExBridge MixinZeroExBridge
{ {
constructor(IEtherTokenV06 weth) constructor(IEtherTokenV06 weth)
@@ -63,6 +73,12 @@ contract ArbitrumBridgeAdapter is
sellAmount, sellAmount,
order.bridgeData order.bridgeData
); );
} else if (protocolId == BridgeProtocols.BALANCERV2BATCH) {
if (dryRun) { return (0, true); }
boughtAmount = _tradeBalancerV2Batch(
sellAmount,
order.bridgeData
);
} else if (protocolId == BridgeProtocols.CURVE) { } else if (protocolId == BridgeProtocols.CURVE) {
if (dryRun) { return (0, true); } if (dryRun) { return (0, true); }
boughtAmount = _tradeCurve( boughtAmount = _tradeCurve(
@@ -71,6 +87,14 @@ contract ArbitrumBridgeAdapter is
sellAmount, sellAmount,
order.bridgeData order.bridgeData
); );
} else if (protocolId == BridgeProtocols.CURVEV2) {
if (dryRun) { return (0, true); }
boughtAmount = _tradeCurveV2(
sellToken,
buyToken,
sellAmount,
order.bridgeData
);
} else if (protocolId == BridgeProtocols.DODOV2) { } else if (protocolId == BridgeProtocols.DODOV2) {
if (dryRun) { return (0, true); } if (dryRun) { return (0, true); }
boughtAmount = _tradeDodoV2( boughtAmount = _tradeDodoV2(
@@ -78,6 +102,13 @@ contract ArbitrumBridgeAdapter is
sellAmount, sellAmount,
order.bridgeData order.bridgeData
); );
} else if (protocolId == BridgeProtocols.KYBERDMM) {
if (dryRun) { return (0, true); }
boughtAmount = _tradeKyberDmm(
buyToken,
sellAmount,
order.bridgeData
);
} else if (protocolId == BridgeProtocols.UNISWAPV3) { } else if (protocolId == BridgeProtocols.UNISWAPV3) {
if (dryRun) { return (0, true); } if (dryRun) { return (0, true); }
boughtAmount = _tradeUniswapV3( boughtAmount = _tradeUniswapV3(
@@ -85,9 +116,23 @@ contract ArbitrumBridgeAdapter is
sellAmount, sellAmount,
order.bridgeData order.bridgeData
); );
} else if (protocolId == BridgeProtocols.UNISWAPV2) {
if (dryRun) { return (0, true); }
boughtAmount = _tradeUniswapV2(
buyToken,
sellAmount,
order.bridgeData
);
} else if (protocolId == BridgeProtocols.GMX) { } else if (protocolId == BridgeProtocols.GMX) {
if (dryRun) { return (0, true); } if (dryRun) { return (0, true); }
boughtAmount = _tradeGMX( boughtAmount = _tradeGMX(
buyToken,
sellAmount,
order.bridgeData
);
} else if (protocolId == BridgeProtocols.NERVE) {
if (dryRun) { return (0, true); }
boughtAmount = _tradeNerve(
sellToken, sellToken,
sellAmount, sellAmount,
order.bridgeData order.bridgeData

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contracts-zero-ex", "name": "@0x/contracts-zero-ex",
"version": "0.37.0", "version": "0.37.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -57,10 +57,10 @@
"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.1", "@0x/abi-gen": "^5.8.1",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/contracts-erc20": "^3.3.40", "@0x/contracts-erc20": "^3.3.43",
"@0x/contracts-gen": "^2.0.47", "@0x/contracts-gen": "^2.0.47",
"@0x/contracts-test-utils": "^5.4.31", "@0x/contracts-test-utils": "^5.4.34",
"@0x/dev-utils": "^5.0.0", "@0x/dev-utils": "^5.0.0",
"@0x/order-utils": "^10.4.28", "@0x/order-utils": "^10.4.28",
"@0x/sol-compiler": "^4.8.2", "@0x/sol-compiler": "^4.8.2",
@@ -86,7 +86,7 @@
}, },
"dependencies": { "dependencies": {
"@0x/base-contract": "^7.0.0", "@0x/base-contract": "^7.0.0",
"@0x/protocol-utils": "^11.16.7", "@0x/protocol-utils": "^11.16.10",
"@0x/subproviders": "^7.0.0", "@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",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/asset-swapper", "name": "@0x/asset-swapper",
"version": "16.66.7", "version": "16.66.10",
"private": true, "private": true,
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
@@ -62,15 +62,15 @@
"dependencies": { "dependencies": {
"@0x/assert": "^3.0.35", "@0x/assert": "^3.0.35",
"@0x/base-contract": "^7.0.0", "@0x/base-contract": "^7.0.0",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/contract-wrappers": "^13.22.0", "@0x/contract-wrappers": "^13.22.3",
"@0x/contracts-erc20": "^3.3.40", "@0x/contracts-erc20": "^3.3.43",
"@0x/contracts-zero-ex": "^0.37.0", "@0x/contracts-zero-ex": "^0.37.3",
"@0x/dev-utils": "^5.0.0", "@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.7", "@0x/protocol-utils": "^11.16.10",
"@0x/quote-server": "^8.0.0", "@0x/quote-server": "^8.0.0",
"@0x/types": "^3.3.6", "@0x/types": "^3.3.6",
"@0x/utils": "^7.0.0", "@0x/utils": "^7.0.0",
@@ -95,7 +95,7 @@
"devDependencies": { "devDependencies": {
"@0x/abi-gen": "^5.8.1", "@0x/abi-gen": "^5.8.1",
"@0x/contracts-gen": "^2.0.47", "@0x/contracts-gen": "^2.0.47",
"@0x/contracts-test-utils": "^5.4.31", "@0x/contracts-test-utils": "^5.4.34",
"@0x/sol-compiler": "^4.8.2", "@0x/sol-compiler": "^4.8.2",
"@0x/subproviders": "^7.0.0", "@0x/subproviders": "^7.0.0",
"@0x/ts-doc-gen": "^0.0.28", "@0x/ts-doc-gen": "^0.0.28",

View File

@@ -1,4 +1,34 @@
[ [
{
"version": "6.23.3",
"changes": [
{
"note": "New FQT for Optimism with BalV2",
"pr": 577
}
],
"timestamp": 1662998180
},
{
"version": "6.23.2",
"changes": [
{
"note": "New FQT for arbitrum again",
"pr": 574
}
],
"timestamp": 1662559804
},
{
"version": "6.23.1",
"changes": [
{
"note": "New FQT for arbitrum",
"pr": 572
}
],
"timestamp": 1662147076
},
{ {
"version": "6.23.0", "version": "6.23.0",
"changes": [ "changes": [

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v6.23.3 - _September 12, 2022_
* New FQT for Optimism with BalV2 (#577)
## v6.23.2 - _September 7, 2022_
* New FQT for arbitrum again (#574)
## v6.23.1 - _September 2, 2022_
* New FQT for arbitrum (#572)
## v6.23.0 - _September 1, 2022_ ## v6.23.0 - _September 1, 2022_
* Remove contract addresses that are no longer needed (#564) * Remove contract addresses that are no longer needed (#564)

View File

@@ -294,7 +294,7 @@
"wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c", "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
"payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11", "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
"affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553", "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
"fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96", "fillQuoteTransformer": "0x845c75a791cceb1a451f4ca5778c011226dda95c",
"positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783" "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
} }
}, },
@@ -340,7 +340,7 @@
"wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49", "wethTransformer": "0x10e968968f49dd66a5efeebbb2edcb9c49c4fc49",
"payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02", "payTakerTransformer": "0xae3e8cf7bf340d7084f312dfae2aa8b01c885b02",
"affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa", "affiliateFeeTransformer": "0x05a24978471869327904ea13da3c4322128e2aaa",
"fillQuoteTransformer": "0x24760a755a4ffe4e44f661336fd0dc646fd6f723", "fillQuoteTransformer": "0x542c7dfc7959d8d03c5b738478213885ab3f214e",
"positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13" "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contract-addresses", "name": "@0x/contract-addresses",
"version": "6.23.0", "version": "6.23.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "13.22.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "13.22.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "13.22.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "13.22.0", "version": "13.22.0",
"changes": [ "changes": [

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v13.22.3 - _September 12, 2022_
* Dependencies updated
## v13.22.2 - _September 7, 2022_
* Dependencies updated
## v13.22.1 - _September 2, 2022_
* Dependencies updated
## v13.22.0 - _September 1, 2022_ ## v13.22.0 - _September 1, 2022_
* Remove deprecated contracts * Remove deprecated contracts

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/contract-wrappers", "name": "@0x/contract-wrappers",
"version": "13.22.0", "version": "13.22.3",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -57,7 +57,7 @@
"dependencies": { "dependencies": {
"@0x/assert": "^3.0.35", "@0x/assert": "^3.0.35",
"@0x/base-contract": "^7.0.0", "@0x/base-contract": "^7.0.0",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/json-schemas": "^6.4.4", "@0x/json-schemas": "^6.4.4",
"@0x/types": "^3.3.6", "@0x/types": "^3.3.6",
"@0x/utils": "^7.0.0", "@0x/utils": "^7.0.0",

View File

@@ -1,4 +1,31 @@
[ [
{
"timestamp": 1662998180,
"version": "11.16.10",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662559804,
"version": "11.16.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1662147076,
"version": "11.16.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{ {
"version": "11.16.7", "version": "11.16.7",
"changes": [ "changes": [

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG CHANGELOG
## v11.16.10 - _September 12, 2022_
* Dependencies updated
## v11.16.9 - _September 7, 2022_
* Dependencies updated
## v11.16.8 - _September 2, 2022_
* Dependencies updated
## v11.16.7 - _September 1, 2022_ ## v11.16.7 - _September 1, 2022_
* Add otc order info to transformer_utils (#565) * Add otc order info to transformer_utils (#565)

View File

@@ -1,6 +1,6 @@
{ {
"name": "@0x/protocol-utils", "name": "@0x/protocol-utils",
"version": "11.16.7", "version": "11.16.10",
"engines": { "engines": {
"node": ">=6.12" "node": ">=6.12"
}, },
@@ -63,8 +63,8 @@
}, },
"dependencies": { "dependencies": {
"@0x/assert": "^3.0.35", "@0x/assert": "^3.0.35",
"@0x/contract-addresses": "^6.23.0", "@0x/contract-addresses": "^6.23.3",
"@0x/contract-wrappers": "^13.22.0", "@0x/contract-wrappers": "^13.22.3",
"@0x/json-schemas": "^6.4.4", "@0x/json-schemas": "^6.4.4",
"@0x/subproviders": "^7.0.0", "@0x/subproviders": "^7.0.0",
"@0x/utils": "^7.0.0", "@0x/utils": "^7.0.0",

View File

@@ -105,8 +105,8 @@ export enum FillQuoteTransformerSide {
export enum FillQuoteTransformerOrderType { export enum FillQuoteTransformerOrderType {
Bridge, Bridge,
Limit, Limit,
Otc,
Rfq, Rfq,
Otc,
} }
/** /**