Compare commits

..

11 Commits

Author SHA1 Message Date
Github Actions
907adf9145 Publish
- @0x/contracts-asset-proxy@3.6.8
 - @0x/contracts-broker@1.1.16
 - @0x/contracts-coordinator@3.1.17
 - @0x/contracts-dev-utils@1.3.15
 - @0x/contracts-erc1155@2.1.17
 - @0x/contracts-erc20@3.2.11
 - @0x/contracts-erc721@3.1.17
 - @0x/contracts-exchange-forwarder@4.2.17
 - @0x/contracts-exchange-libs@4.3.17
 - @0x/contracts-exchange@3.2.17
 - @0x/contracts-extensions@6.2.11
 - @0x/contracts-integrations@2.7.14
 - @0x/contracts-multisig@4.1.17
 - @0x/contracts-staking@2.0.24
 - @0x/contracts-test-utils@5.3.14
 - @0x/contracts-utils@4.6.2
 - @0x/contracts-zero-ex@0.11.1
 - @0x/asset-swapper@5.4.1
 - @0x/contract-addresses@5.6.0
 - @0x/contract-wrappers-test@12.2.27
 - @0x/contract-wrappers@13.10.3
 - @0x/migrations@6.5.3
 - @0x/order-utils@10.4.9
2020-12-07 22:56:33 +00:00
Github Actions
c046fe6220 Updated CHANGELOGS & MD docs 2020-12-07 22:56:27 +00:00
Lawrence Forman
84bf20de41 Update CHANGELOG.json (#75)
* Update CHANGELOG.json

* Update CHANGELOG.json
2020-12-07 17:17:43 -05:00
Lawrence Forman
f5a6f74d9a Update mainnet and ropsten transformer addresses for hot-pants release (#70)
Co-authored-by: Lawrence Forman <me@merklejerk.com>
2020-12-07 16:41:56 -05:00
Github Actions
7c7fc51ccf Publish
- @0x/contracts-integrations@2.7.13
 - @0x/asset-swapper@5.4.0
2020-12-07 20:42:41 +00:00
Github Actions
fa22f6de0d Updated CHANGELOGS & MD docs 2020-12-07 20:42:34 +00:00
Kim Persson
4f41214af2 feat: add takerAssetToEthRate and makerAssetToEthRate to quote response (#49)
* ADDS expose ethToTakerAssetRate and ethToTakerAssetRate

* REFACTORS rename to more correct takerAssetToEth/makerAssetToEth naming

* ADDS asset-swapper change log entry
2020-12-07 20:40:56 +01:00
Github Actions
607b7169bc Publish
- @0x/contracts-integrations@2.7.12
 - @0x/asset-swapper@5.3.1
2020-12-03 23:05:32 +00:00
Github Actions
1253490a38 Updated CHANGELOGS & MD docs 2020-12-03 23:05:26 +00:00
Alex Kroeger
0a37a588e8 Added BalanceChecker contract (#60)
* Added BalanceChecker contract

* Upgraded to solidity 0.6, simplified contract, added tests

* uint -> uint256

* export BalanceChecker contract wrapper

* prettier

* removed superfluous test code

* prettier
2020-12-03 14:31:45 -08:00
Greg Hysz
23ee108089 updated release names (#72) 2020-12-03 11:00:44 -08:00
80 changed files with 671 additions and 185 deletions

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "3.6.8",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "3.6.7",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.6.8 - _December 7, 2020_
* Dependencies updated
## v3.6.7 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-asset-proxy",
"version": "3.6.7",
"version": "3.6.8",
"engines": {
"node": ">=6.12"
},
@@ -52,10 +52,10 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contract-wrappers": "^13.10.2",
"@0x/contract-wrappers": "^13.10.3",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
@@ -80,11 +80,11 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-erc1155": "^2.1.16",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/order-utils": "^10.4.8",
"@0x/contracts-erc1155": "^2.1.17",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/order-utils": "^10.4.9",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",
"@0x/utils": "^6.1.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "1.1.16",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "1.1.15",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.1.16 - _December 7, 2020_
* Dependencies updated
## v1.1.15 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-broker",
"version": "1.1.15",
"version": "1.1.16",
"engines": {
"node": ">=6.12"
},
@@ -52,14 +52,14 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",
@@ -85,7 +85,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/typescript-typings": "^5.1.6",
"@0x/utils": "^6.1.1",
"ethereum-types": "^3.4.0"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "3.1.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "3.1.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.17 - _December 7, 2020_
* Dependencies updated
## v3.1.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-coordinator",
"version": "3.1.16",
"version": "3.1.17",
"engines": {
"node": ">=6.12"
},
@@ -53,12 +53,12 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-gen": "^2.0.23",
"@0x/dev-utils": "^4.1.2",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",
@@ -84,10 +84,10 @@
"dependencies": {
"@0x/assert": "^3.0.19",
"@0x/base-contract": "^6.2.13",
"@0x/contract-addresses": "^5.5.0",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contract-addresses": "^5.6.0",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/json-schemas": "^5.3.4",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "1.3.15",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "1.3.14",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.3.15 - _December 7, 2020_
* Dependencies updated
## v1.3.14 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-dev-utils",
"version": "1.3.14",
"version": "1.3.15",
"engines": {
"node": ">=6.12"
},
@@ -43,10 +43,10 @@
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/assert": "^3.0.19",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "2.1.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "2.1.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.17 - _December 7, 2020_
* Dependencies updated
## v2.1.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc1155",
"version": "2.1.16",
"version": "2.1.17",
"engines": {
"node": ">=6.12"
},
@@ -54,7 +54,7 @@
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
@@ -81,7 +81,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/utils": "^6.1.1",
"@0x/web3-wrapper": "^7.2.10",
"lodash": "^4.17.11"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "3.2.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "3.2.10",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.2.11 - _December 7, 2020_
* Dependencies updated
## v3.2.10 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "3.2.10",
"version": "3.2.11",
"engines": {
"node": ">=6.12"
},
@@ -53,8 +53,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "3.1.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "3.1.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.17 - _December 7, 2020_
* Dependencies updated
## v3.1.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc721",
"version": "3.1.16",
"version": "3.1.17",
"engines": {
"node": ">=6.12"
},
@@ -54,8 +54,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "4.2.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "4.2.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.2.17 - _December 7, 2020_
* Dependencies updated
## v4.2.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-forwarder",
"version": "4.2.16",
"version": "4.2.17",
"engines": {
"node": ">=6.12"
},
@@ -53,18 +53,18 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc1155": "^2.1.16",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc1155": "^2.1.17",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "4.3.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "4.3.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.3.17 - _December 7, 2020_
* Dependencies updated
## v4.3.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-libs",
"version": "4.3.16",
"version": "4.3.17",
"engines": {
"node": ">=6.12"
},
@@ -81,9 +81,9 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/order-utils": "^10.4.8",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/order-utils": "^10.4.9",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",
"@0x/utils": "^6.1.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "3.2.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "3.2.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.2.17 - _December 7, 2020_
* Dependencies updated
## v3.2.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange",
"version": "3.2.16",
"version": "3.2.17",
"engines": {
"node": ">=6.12"
},
@@ -53,13 +53,13 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-multisig": "^4.1.16",
"@0x/contracts-staking": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-multisig": "^4.1.17",
"@0x/contracts-staking": "^2.0.24",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
@@ -89,11 +89,11 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc1155": "^2.1.16",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/order-utils": "^10.4.8",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc1155": "^2.1.17",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/order-utils": "^10.4.9",
"@0x/utils": "^6.1.1",
"lodash": "^4.17.11"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "6.2.11",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "6.2.10",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.2.11 - _December 7, 2020_
* Dependencies updated
## v6.2.10 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
"version": "6.2.10",
"version": "6.2.11",
"engines": {
"node": ">=6.12"
},
@@ -53,16 +53,16 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",
@@ -91,7 +91,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/typescript-typings": "^5.1.6",
"ethereum-types": "^3.4.0"
},

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-integrations",
"version": "2.7.11",
"version": "2.7.14",
"private": true,
"engines": {
"node": ">=6.12"
@@ -53,20 +53,20 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contract-addresses": "^5.5.0",
"@0x/contract-wrappers": "^13.10.2",
"@0x/contracts-broker": "^1.1.15",
"@0x/contracts-coordinator": "^3.1.16",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-exchange-forwarder": "^4.2.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-extensions": "^6.2.10",
"@0x/contract-addresses": "^5.6.0",
"@0x/contract-wrappers": "^13.10.3",
"@0x/contracts-broker": "^1.1.16",
"@0x/contracts-coordinator": "^3.1.17",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-exchange-forwarder": "^4.2.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-extensions": "^6.2.11",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-utils": "^4.6.2",
"@0x/coordinator-server": "^1.0.5",
"@0x/dev-utils": "^4.1.2",
"@0x/migrations": "^6.5.2",
"@0x/order-utils": "^10.4.8",
"@0x/migrations": "^6.5.3",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/tslint-config": "^4.1.3",
"@0x/web3-wrapper": "^7.2.10",
@@ -92,17 +92,17 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/asset-swapper": "^5.3.0",
"@0x/asset-swapper": "^5.4.1",
"@0x/base-contract": "^6.2.13",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-erc1155": "^2.1.16",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-multisig": "^4.1.16",
"@0x/contracts-staking": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-zero-ex": "^0.11.0",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-erc1155": "^2.1.17",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-multisig": "^4.1.17",
"@0x/contracts-staking": "^2.0.24",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-zero-ex": "^0.11.1",
"@0x/subproviders": "^6.2.2",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "4.1.17",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "4.1.16",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.17 - _December 7, 2020_
* Dependencies updated
## v4.1.16 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
"version": "4.1.16",
"version": "4.1.17",
"engines": {
"node": ">=6.12"
},
@@ -50,11 +50,11 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/tslint-config": "^4.1.3",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "2.0.24",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "2.0.23",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.24 - _December 7, 2020_
* Dependencies updated
## v2.0.23 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-staking",
"version": "2.0.23",
"version": "2.0.24",
"engines": {
"node": ">=6.12"
},
@@ -54,14 +54,14 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-utils": "^4.6.2",
"@0x/dev-utils": "^4.1.2",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",
@@ -88,7 +88,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/typescript-typings": "^5.1.6",
"@0x/utils": "^6.1.1",
"ethereum-types": "^3.4.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "5.3.14",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "5.3.13",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.3.14 - _December 7, 2020_
* Dependencies updated
## v5.3.13 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "5.3.13",
"version": "5.3.14",
"engines": {
"node": ">=6.12"
},
@@ -44,10 +44,10 @@
"dependencies": {
"@0x/assert": "^3.0.19",
"@0x/base-contract": "^6.2.13",
"@0x/contract-addresses": "^5.5.0",
"@0x/contract-addresses": "^5.6.0",
"@0x/dev-utils": "^4.1.2",
"@0x/json-schemas": "^5.3.4",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-coverage": "^4.0.23",
"@0x/sol-profiler": "^4.1.13",
"@0x/sol-trace": "^3.0.23",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "4.6.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "4.6.1",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.6.2 - _December 7, 2020_
* Dependencies updated
## v4.6.1 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "4.6.1",
"version": "4.6.2",
"engines": {
"node": ">=6.12"
},
@@ -52,9 +52,9 @@
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/dev-utils": "^4.1.2",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/sol-compiler": "^4.4.0",
"@0x/tslint-config": "^4.1.3",
"@0x/types": "^3.3.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "0.11.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "0.11.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v0.11.1 - _December 7, 2020_
* Dependencies updated
## v0.11.0 - _December 3, 2020_
* Turn `LibTokenSpender` into `FixinTokenSpender` (#38)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-zero-ex",
"version": "0.11.0",
"version": "0.11.1",
"engines": {
"node": ">=6.12"
},
@@ -55,9 +55,9 @@
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
"devDependencies": {
"@0x/abi-gen": "^5.4.12",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/dev-utils": "^4.1.2",
"@0x/sol-compiler": "^4.4.0",
"@0x/ts-doc-gen": "^0.0.28",
@@ -76,7 +76,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/subproviders": "^6.2.2",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",

View File

@@ -7,24 +7,27 @@ Releases
This page outlines upcoming releases and expected changes.
+-------------+---------------------------------------------------------------+----------------------+------------+
| **Release** | **Overview** | **Est Release Date** | **Status** |
+-------------+---------------------------------------------------------------+----------------------+------------+
| `VIP`_ | PLP VIP | 12/01/20 | Timelocked |
+-------------+---------------------------------------------------------------+----------------------+------------+
| `Hancock`_ | Remove calldata signing / DeFi Saver Fix / Allowance on Proxy | 12/07/20 | Testing |
+-------------+---------------------------------------------------------------+----------------------+------------+
| `Tinker`_ | V4 Orders | Early January 2021 | In Audits |
+-------------+---------------------------------------------------------------+----------------------+------------+
.. table::
:widths: 20 60 10 10
VIP
+--------------+---------------------------------------------------------------+----------------------+------------+
| **Release** | **Overview** | **Est Release Date** | **Status** |
+--------------+---------------------------------------------------------------+----------------------+------------+
| `Plop`_ | PLP VIP | 12/01/20 | Timelocked |
+--------------+---------------------------------------------------------------+----------------------+------------+
| `Hot-Pants`_ | Remove calldata signing / DeFi Saver Fix / Allowance on Proxy | 12/07/20 | Testing |
+--------------+---------------------------------------------------------------+----------------------+------------+
| `Tinker`_ | V4 Orders | Early January 2021 | In Audits |
+--------------+---------------------------------------------------------------+----------------------+------------+
Plop
----
- Deploy the `LiquidityProviderFeature <../architecture/features.html>`_, which enables optimized trades directly with `PLP <../advanced/plp.html>`_
Hancock
-------
Hot-Pants
----------
- Removes calldata signing from ``TransformERC20`` Feature.
- Redeploying all `Transformers <../architecture/transformers.html>`_ (new interface w/o ``calldataHash``)

View File

@@ -1,4 +1,32 @@
[
{
"timestamp": 1607381756,
"version": "5.4.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "5.4.0",
"changes": [
{
"note": "Add `takerAssetToEthRate` and `makerAssetToEthRate` to swap quote response",
"pr": 49
}
],
"timestamp": 1607373752
},
{
"timestamp": 1607036724,
"version": "5.3.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "5.3.0",
"changes": [

View File

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.4.1 - _December 7, 2020_
* Dependencies updated
## v5.4.0 - _December 7, 2020_
* Add `takerAssetToEthRate` and `makerAssetToEthRate` to swap quote response (#49)
## v5.3.1 - _December 3, 2020_
* Dependencies updated
## v5.3.0 - _December 3, 2020_
* Added Crypto.com (#43)

View File

@@ -0,0 +1,89 @@
/*
Copyright 2020 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;
// ERC20 contract interface
abstract contract IToken {
/// @dev Query the balance of owner
/// @param _owner The address from which the balance will be retrieved
/// @return Balance of owner
function balanceOf(address _owner) public virtual view returns (uint256);
/// @param _owner The address of the account owning tokens
/// @param _spender The address of the account able to transfer the tokens
/// @return Amount of remaining tokens allowed to spent
function allowance(address _owner, address _spender) public virtual view returns (uint256);
}
contract BalanceChecker {
/*
Check the token balances of wallet-token pairs.
Pass 0xeee... as a "token" address to get ETH balance.
Possible error throws:
- extremely large arrays for user and or tokens (gas cost too high)
Returns a one-dimensional that's user.length long.
*/
function balances(address[] calldata users, address[] calldata tokens) external view returns (uint256[] memory) {
// make sure the users array and tokens array are of equal length
require(users.length == tokens.length, "users array is a different length than the tokens array");
uint256[] memory addrBalances = new uint256[](users.length);
for(uint i = 0; i < users.length; i++) {
if (tokens[i] != address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
addrBalances[i] = IToken(tokens[i]).balanceOf(users[i]);
} else {
addrBalances[i] = users[i].balance; // ETH balance
}
}
return addrBalances;
}
/*
Check the allowances of an array of owner-spender-tokens
Returns 0 for 0xeee... (ETH)
Possible error throws:
- extremely large arrays for user and or tokens (gas cost too high)
Returns a one-dimensional array that's owners.length long.
*/
function allowances(address[] calldata owners, address[] calldata spenders, address[] calldata tokens) external view returns (uint256[] memory) {
// make sure the arrays are all of equal length
require(owners.length == spenders.length, "all arrays must be of equal length");
require(owners.length == tokens.length, "all arrays must be of equal length");
uint256[] memory addrAllowances = new uint256[](owners.length);
for(uint i = 0; i < owners.length; i++) {
if (tokens[i] != address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) {
addrAllowances[i] = IToken(tokens[i]).allowance(owners[i], spenders[i]);
} else {
// ETH
addrAllowances[i] = 0;
}
}
return addrAllowances;
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/asset-swapper",
"version": "5.3.0",
"version": "5.4.1",
"engines": {
"node": ">=6.12"
},
@@ -36,9 +36,9 @@
"publish:private": "yarn build && gitpkg publish"
},
"config": {
"publicInterfaceContracts": "ERC20BridgeSampler",
"publicInterfaceContracts": "ERC20BridgeSampler,BalanceChecker",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
"abis": "./test/generated-artifacts/@(ApproximateBuys|BalancerSampler|CurveSampler|DODOSampler|DeploymentConstants|DummyLiquidityProvider|ERC20BridgeSampler|Eth2DaiSampler|IBalancer|ICurve|IEth2Dai|IKyberNetwork|IMStable|IMooniswap|IMultiBridge|IShell|IUniswapExchangeQuotes|IUniswapV2Router01|KyberSampler|LiquidityProviderSampler|MStableSampler|MooniswapSampler|MultiBridgeSampler|NativeOrderSampler|SamplerUtils|ShellSampler|SushiSwapSampler|TestERC20BridgeSampler|TestNativeOrderSampler|TwoHopSampler|UniswapSampler|UniswapV2Sampler).json",
"abis": "./test/generated-artifacts/@(ApproximateBuys|BalanceChecker|BalancerSampler|CurveSampler|DODOSampler|DeploymentConstants|DummyLiquidityProvider|ERC20BridgeSampler|Eth2DaiSampler|IBalancer|ICurve|IEth2Dai|IKyberNetwork|IMStable|IMooniswap|IMultiBridge|IShell|IUniswapExchangeQuotes|IUniswapV2Router01|KyberSampler|LiquidityProviderSampler|MStableSampler|MooniswapSampler|MultiBridgeSampler|NativeOrderSampler|SamplerUtils|ShellSampler|SushiSwapSampler|TestERC20BridgeSampler|TestNativeOrderSampler|TwoHopSampler|UniswapSampler|UniswapV2Sampler).json",
"postpublish": {
"assets": []
}
@@ -59,11 +59,11 @@
"dependencies": {
"@0x/assert": "^3.0.19",
"@0x/base-contract": "^6.2.13",
"@0x/contract-addresses": "^5.5.0",
"@0x/contract-wrappers": "^13.10.2",
"@0x/contract-addresses": "^5.6.0",
"@0x/contract-wrappers": "^13.10.3",
"@0x/dev-utils": "^4.1.2",
"@0x/json-schemas": "^5.3.4",
"@0x/order-utils": "^10.4.8",
"@0x/order-utils": "^10.4.9",
"@0x/orderbook": "0xProject/gitpkg-registry#0x-orderbook-v2.2.7-e10a81023",
"@0x/quote-server": "^3.1.0",
"@0x/types": "^3.3.1",
@@ -87,16 +87,16 @@
},
"devDependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-exchange-libs": "^4.3.16",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-exchange-libs": "^4.3.17",
"@0x/contracts-gen": "^2.0.23",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-zero-ex": "^0.11.0",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/contracts-utils": "^4.6.2",
"@0x/contracts-zero-ex": "^0.11.1",
"@0x/mesh-rpc-client": "^9.4.2",
"@0x/migrations": "^6.5.2",
"@0x/migrations": "^6.5.3",
"@0x/sol-compiler": "^4.4.0",
"@0x/subproviders": "^6.2.2",
"@0x/ts-doc-gen": "^0.0.28",

View File

@@ -5,5 +5,9 @@
*/
import { ContractArtifact } from 'ethereum-types';
import * as BalanceChecker from '../generated-artifacts/BalanceChecker.json';
import * as ERC20BridgeSampler from '../generated-artifacts/ERC20BridgeSampler.json';
export const artifacts = { ERC20BridgeSampler: ERC20BridgeSampler as ContractArtifact };
export const artifacts = {
ERC20BridgeSampler: ERC20BridgeSampler as ContractArtifact,
BalanceChecker: BalanceChecker as ContractArtifact,
};

View File

@@ -177,7 +177,7 @@ export {
} from './utils/quote_report_generator';
export { QuoteRequestor } from './utils/quote_requestor';
export { rfqtMocker } from './utils/rfqt_mocker';
export { ERC20BridgeSamplerContract } from './wrappers';
export { ERC20BridgeSamplerContract, BalanceCheckerContract } from './wrappers';
import { ERC20BridgeSource } from './utils/market_operation_utils/types';
export type Native = ERC20BridgeSource.Native;
export type MultiHop = ERC20BridgeSource.MultiHop;

View File

@@ -198,6 +198,8 @@ export interface SwapQuoteBase {
isTwoHop: boolean;
makerTokenDecimals: number;
takerTokenDecimals: number;
takerAssetToEthRate: BigNumber;
makerAssetToEthRate: BigNumber;
}
/**

View File

@@ -543,6 +543,10 @@ export class MarketOperationUtils {
exchangeProxyOverhead: opts.exchangeProxyOverhead || (() => ZERO_AMOUNT),
};
// NOTE: For sell quotes input is the taker asset and for buy quotes input is the maker asset
const takerAssetToEthRate = side === MarketOperation.Sell ? ethToInputRate : ethToOutputRate;
const makerAssetToEthRate = side === MarketOperation.Sell ? ethToOutputRate : ethToInputRate;
// Find the unoptimized best rate to calculate savings from optimizer
const _unoptimizedPath = fillsToSortedPaths(fills, side, inputAmount, optimizerOpts)[0];
const unoptimizedPath = _unoptimizedPath ? _unoptimizedPath.collapse(orderOpts) : undefined;
@@ -565,6 +569,8 @@ export class MarketOperationUtils {
marketSideLiquidity,
adjustedRate: bestTwoHopRate,
unoptimizedPath,
takerAssetToEthRate,
makerAssetToEthRate,
};
}
@@ -598,6 +604,8 @@ export class MarketOperationUtils {
marketSideLiquidity,
adjustedRate: optimalPathRate,
unoptimizedPath,
takerAssetToEthRate,
makerAssetToEthRate,
};
}

View File

@@ -346,6 +346,8 @@ export interface OptimizerResult {
marketSideLiquidity: MarketSideLiquidity;
adjustedRate: BigNumber;
unoptimizedPath?: CollapsedPath;
takerAssetToEthRate: BigNumber;
makerAssetToEthRate: BigNumber;
}
export interface OptimizerResultWithReport extends OptimizerResult {

View File

@@ -170,7 +170,14 @@ function createSwapQuote(
gasPrice: BigNumber,
gasSchedule: FeeSchedule,
): SwapQuote {
const { optimizedOrders, quoteReport, sourceFlags, unoptimizedPath } = optimizerResult;
const {
optimizedOrders,
quoteReport,
sourceFlags,
unoptimizedPath,
takerAssetToEthRate,
makerAssetToEthRate,
} = optimizerResult;
const isTwoHop = sourceFlags === SOURCE_FLAGS[ERC20BridgeSource.MultiHop];
// Calculate quote info
@@ -203,6 +210,8 @@ function createSwapQuote(
sourceBreakdown,
makerTokenDecimals,
takerTokenDecimals,
takerAssetToEthRate,
makerAssetToEthRate,
quoteReport,
isTwoHop,
};

View File

@@ -3,4 +3,5 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
export * from '../generated-wrappers/balance_checker';
export * from '../generated-wrappers/erc20_bridge_sampler';

View File

@@ -6,6 +6,7 @@
import { ContractArtifact } from 'ethereum-types';
import * as ApproximateBuys from '../test/generated-artifacts/ApproximateBuys.json';
import * as BalanceChecker from '../test/generated-artifacts/BalanceChecker.json';
import * as BalancerSampler from '../test/generated-artifacts/BalancerSampler.json';
import * as CurveSampler from '../test/generated-artifacts/CurveSampler.json';
import * as DeploymentConstants from '../test/generated-artifacts/DeploymentConstants.json';
@@ -39,6 +40,7 @@ import * as UniswapSampler from '../test/generated-artifacts/UniswapSampler.json
import * as UniswapV2Sampler from '../test/generated-artifacts/UniswapV2Sampler.json';
export const artifacts = {
ApproximateBuys: ApproximateBuys as ContractArtifact,
BalanceChecker: BalanceChecker as ContractArtifact,
BalancerSampler: BalancerSampler as ContractArtifact,
CurveSampler: CurveSampler as ContractArtifact,
DODOSampler: DODOSampler as ContractArtifact,

View File

@@ -0,0 +1,60 @@
import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
import { blockchainTests, constants, expect, web3Wrapper } from '@0x/contracts-test-utils';
import { BigNumber } from '@0x/utils';
import * as _ from 'lodash';
import { artifacts } from '../artifacts';
import { BalanceCheckerContract } from '../wrappers';
// tslint:disable: custom-no-magic-numbers
const ETH_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
blockchainTests.resets('BalanceChecker contract', env => {
let contract: BalanceCheckerContract;
before(async () => {
contract = await BalanceCheckerContract.deployFrom0xArtifactAsync(
artifacts.BalanceChecker,
env.provider,
env.txDefaults,
{},
);
});
describe('getBalances', () => {
it('returns the correct array for a successful call', async () => {
const makerToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
erc20Artifacts.DummyERC20Token,
env.provider,
env.txDefaults,
artifacts,
constants.DUMMY_TOKEN_NAME,
constants.DUMMY_TOKEN_SYMBOL,
new BigNumber(18),
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
);
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const owner = accounts[0];
const owner2 = accounts[1];
await makerToken.mint(new BigNumber(100)).awaitTransactionSuccessAsync({ from: owner });
const testResults = await contract.balances([owner, owner2], [makerToken.address, ETH_ADDRESS]).callAsync();
expect(testResults).to.eql([new BigNumber(100), new BigNumber(100000000000000000000)]);
});
it('it throws an error if the input arrays of different lengths', async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const owner = accounts[0];
try {
await contract.balances([owner], [ETH_ADDRESS, ETH_ADDRESS]).callAsync();
expect.fail();
} catch (error) {
expect(error.message).to.eql('users array is a different length than the tokens array');
}
});
});
});

View File

@@ -41,6 +41,8 @@ export async function getFullyFillableSwapQuoteWithNoFeesAsync(
unoptimizedOrders: orders.map(order => ({ ...order, fills: [] })),
sourceBreakdown: breakdown,
isTwoHop: false,
takerAssetToEthRate: constants.ZERO_AMOUNT,
makerAssetToEthRate: constants.ZERO_AMOUNT,
};
if (operation === MarketOperation.Buy) {

View File

@@ -4,6 +4,7 @@
* -----------------------------------------------------------------------------
*/
export * from '../test/generated-wrappers/approximate_buys';
export * from '../test/generated-wrappers/balance_checker';
export * from '../test/generated-wrappers/balancer_sampler';
export * from '../test/generated-wrappers/curve_sampler';
export * from '../test/generated-wrappers/d_o_d_o_sampler';

View File

@@ -3,8 +3,10 @@
"compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [
"generated-artifacts/BalanceChecker.json",
"generated-artifacts/ERC20BridgeSampler.json",
"test/generated-artifacts/ApproximateBuys.json",
"test/generated-artifacts/BalanceChecker.json",
"test/generated-artifacts/BalancerSampler.json",
"test/generated-artifacts/CurveSampler.json",
"test/generated-artifacts/DODOSampler.json",

View File

@@ -1,4 +1,14 @@
[
{
"version": "5.6.0",
"changes": [
{
"note": "Update mainnet and ropsten transformer addresses for hot-pants release",
"pr": 70
}
],
"timestamp": 1607381756
},
{
"version": "5.5.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.6.0 - _December 7, 2020_
* Update mainnet and ropsten transformer addresses for hot-pants release (#70)
## v5.5.0 - _December 3, 2020_
* Update ganache snapshot addresses (#59)

View File

@@ -34,10 +34,10 @@
"exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18",
"exchangeProxyLiquidityProviderSandbox": "0xdb971b18ea5075734cec1241732cc1b41031dfc9",
"transformers": {
"wethTransformer": "0x68c0bb685099dc7cb5c5ce2b26185945b357383e",
"payTakerTransformer": "0x49b9df2c58491764cf40cb052dd4243df63622c7",
"affiliateFeeTransformer": "0x4581b59a05ba373b9f67676f66bdb5fcd67e7567",
"fillQuoteTransformer": "0xfbfb26935f15db6a319a43db5085245a6df1e408"
"wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
"payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
"affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
"fillQuoteTransformer": "0x74c35f17a19d4ee0ddd65cc21c671806913f9176"
}
},
"3": {
@@ -75,10 +75,10 @@
"exchangeProxyFlashWallet": "0x22f9dcf4647084d6c31b2765f6910cd85c178c18",
"exchangeProxyLiquidityProviderSandbox": "0xb8afda68a9834969a69ebd4aab201feff814d170",
"transformers": {
"wethTransformer": "0x8d822fe2b42f60531203e288f5f357fa79474437",
"payTakerTransformer": "0x150652244723102faeaefa4c79597d097ffa26c6",
"affiliateFeeTransformer": "0xa39b40642e8e00435857a0fe7d0655e08cc2217e",
"fillQuoteTransformer": "0x3fb85e0c1e9e0ba4ba9a4072442a2540c0473db1"
"wethTransformer": "0x05ad19aa3826e0609a19568ffbd1dfe86c6c7184",
"payTakerTransformer": "0x6d0ebf2bcd9cc93ec553b60ad201943dcca4e291",
"affiliateFeeTransformer": "0x6588256778ca4432fa43983ac685c45efb2379e2",
"fillQuoteTransformer": "0x5ec162400ec00f0f3ef1d8aae1fed37742d5dc81"
}
},
"4": {

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers-test",
"version": "12.2.26",
"version": "12.2.27",
"engines": {
"node": ">=6.12"
},
@@ -31,11 +31,11 @@
},
"homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-wrappers-test",
"devDependencies": {
"@0x/contract-wrappers": "^13.10.2",
"@0x/contracts-test-utils": "^5.3.13",
"@0x/contract-wrappers": "^13.10.3",
"@0x/contracts-test-utils": "^5.3.14",
"@0x/dev-utils": "^4.1.2",
"@0x/migrations": "^6.5.2",
"@0x/order-utils": "^10.4.8",
"@0x/migrations": "^6.5.3",
"@0x/order-utils": "^10.4.9",
"@0x/subproviders": "^6.2.2",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "13.10.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "13.10.2",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v13.10.3 - _December 7, 2020_
* Dependencies updated
## v13.10.2 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
"version": "13.10.2",
"version": "13.10.3",
"engines": {
"node": ">=6.12"
},
@@ -57,7 +57,7 @@
"dependencies": {
"@0x/assert": "^3.0.19",
"@0x/base-contract": "^6.2.13",
"@0x/contract-addresses": "^5.5.0",
"@0x/contract-addresses": "^5.6.0",
"@0x/json-schemas": "^5.3.4",
"@0x/types": "^3.3.1",
"@0x/utils": "^6.1.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "6.5.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "6.5.2",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.5.3 - _December 7, 2020_
* Dependencies updated
## v6.5.2 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/migrations",
"version": "6.5.2",
"version": "6.5.3",
"engines": {
"node": ">=6.12"
},
@@ -68,20 +68,20 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.13",
"@0x/contract-addresses": "^5.5.0",
"@0x/contracts-asset-proxy": "^3.6.7",
"@0x/contracts-coordinator": "^3.1.16",
"@0x/contracts-dev-utils": "^1.3.14",
"@0x/contracts-erc1155": "^2.1.16",
"@0x/contracts-erc20": "^3.2.10",
"@0x/contracts-erc721": "^3.1.16",
"@0x/contracts-exchange": "^3.2.16",
"@0x/contracts-exchange-forwarder": "^4.2.16",
"@0x/contracts-extensions": "^6.2.10",
"@0x/contracts-multisig": "^4.1.16",
"@0x/contracts-staking": "^2.0.23",
"@0x/contracts-utils": "^4.6.1",
"@0x/contracts-zero-ex": "^0.11.0",
"@0x/contract-addresses": "^5.6.0",
"@0x/contracts-asset-proxy": "^3.6.8",
"@0x/contracts-coordinator": "^3.1.17",
"@0x/contracts-dev-utils": "^1.3.15",
"@0x/contracts-erc1155": "^2.1.17",
"@0x/contracts-erc20": "^3.2.11",
"@0x/contracts-erc721": "^3.1.17",
"@0x/contracts-exchange": "^3.2.17",
"@0x/contracts-exchange-forwarder": "^4.2.17",
"@0x/contracts-extensions": "^6.2.11",
"@0x/contracts-multisig": "^4.1.17",
"@0x/contracts-staking": "^2.0.24",
"@0x/contracts-utils": "^4.6.2",
"@0x/contracts-zero-ex": "^0.11.1",
"@0x/sol-compiler": "^4.4.0",
"@0x/subproviders": "^6.2.2",
"@0x/typescript-typings": "^5.1.6",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1607381756,
"version": "10.4.9",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1606961263,
"version": "10.4.8",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v10.4.9 - _December 7, 2020_
* Dependencies updated
## v10.4.8 - _December 3, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
"version": "10.4.8",
"version": "10.4.9",
"engines": {
"node": ">=6.12"
},
@@ -69,8 +69,8 @@
},
"dependencies": {
"@0x/assert": "^3.0.19",
"@0x/contract-addresses": "^5.5.0",
"@0x/contract-wrappers": "^13.10.2",
"@0x/contract-addresses": "^5.6.0",
"@0x/contract-wrappers": "^13.10.3",
"@0x/json-schemas": "^5.3.4",
"@0x/utils": "^6.1.1",
"@0x/web3-wrapper": "^7.2.10",