Compare commits

...

14 Commits

Author SHA1 Message Date
Jacob Evans
15f75a08d5 Publish
- @0x/contracts-asset-proxy@3.2.5
 - @0x/contracts-broker@1.1.4
 - @0x/contracts-coordinator@3.1.5
 - @0x/contracts-dev-utils@1.3.3
 - @0x/contracts-erc1155@2.1.5
 - @0x/contracts-erc20-bridge-sampler@1.5.1
 - @0x/contracts-erc20@3.1.5
 - @0x/contracts-erc721@3.1.5
 - @0x/contracts-exchange-forwarder@4.2.5
 - @0x/contracts-exchange-libs@4.3.5
 - @0x/contracts-exchange@3.2.5
 - @0x/contracts-extensions@6.1.5
 - @0x/contracts-integrations@2.5.1
 - @0x/contracts-multisig@4.1.5
 - @0x/contracts-staking@2.0.12
 - @0x/contracts-test-utils@5.3.2
 - @0x/contracts-utils@4.4.3
 - 0x.js@9.1.5
 - @0x/asset-swapper@4.4.0
 - @0x/contract-addresses@4.9.0
 - @0x/contract-wrappers-test@12.2.13
 - @0x/contract-wrappers@13.6.3
 - @0x/instant@1.0.50
 - @0x/migrations@6.2.4
 - @0x/order-utils@10.2.4
 - @0x/orderbook@2.2.5
2020-03-03 18:26:46 +11:00
Jacob Evans
29f9c5473d Updated CHANGELOGS & MD docs 2020-03-03 18:26:14 +11:00
Jacob Evans
ea1528aea6 [asset-swapper] Add latest BUSD Curve (#2506)
* [asset-swapper] Add latest BUSD Curve

* Update Compound Curve
2020-03-03 17:53:35 +11:00
David Sun
cded58c30d Merge pull request #2491 from 0xProject/fix/instant/support-erc721
[FIX] Instant + Asset-swapper support for ERC721
2020-03-01 14:57:18 -05:00
David Sun
da17b49b81 added changelog 2020-03-01 13:54:14 -05:00
David Sun
4728cdfa7c added changelog 2020-03-01 13:36:56 -05:00
David Sun
97fb843f01 prettier 2020-02-28 14:03:54 -05:00
David Sun
8afb044877 address feedback 2020-02-28 13:15:50 -05:00
David Sun
7f869868c9 prettier + lint 2020-02-28 13:13:46 -05:00
David Sun
31275228ac patch asset-swapper to support ERC721 2020-02-28 13:13:18 -05:00
Lawrence Forman
3b446e887a Merge pull request #2503 from 0xProject/feat/deploy-erc20-bridge-sampler
Redeploy `ERC20BridgeSampler`
2020-02-28 12:01:06 -05:00
Lawrence Forman
431196c391 @0x/contract-addresses: Redeploy ERC20BridgeSampler. 2020-02-28 01:18:24 -05:00
mzhu25
d574ca1628 Merge pull request #2501 from 0xProject/fix/bridge-sampler/get-liquidity-provider-from-registry
Fix getLiquidityProviderFromRegistry
2020-02-27 14:09:28 -08:00
Michael Zhu
f97e6892b6 Fix getLiquidityProviderFromRegistry 2020-02-27 13:39:03 -08:00
88 changed files with 1188 additions and 794 deletions

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "3.2.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "3.2.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.2.5 - _March 3, 2020_
* Dependencies updated
## v3.2.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-asset-proxy",
"version": "3.2.4",
"version": "3.2.5",
"engines": {
"node": ">=6.12"
},
@@ -53,8 +53,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
@@ -79,11 +79,11 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-erc1155": "^2.1.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/order-utils": "^10.2.3",
"@0x/contracts-erc1155": "^2.1.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/order-utils": "^10.2.4",
"@0x/types": "^3.1.2",
"@0x/typescript-typings": "^5.0.2",
"@0x/utils": "^5.4.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "1.1.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "1.1.3",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.1.4 - _March 3, 2020_
* Dependencies updated
## v1.1.3 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-broker",
"version": "1.1.3",
"version": "1.1.4",
"engines": {
"node": ">=6.12"
},
@@ -52,14 +52,14 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
@@ -85,7 +85,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/typescript-typings": "^5.0.2",
"@0x/utils": "^5.4.1",
"ethereum-types": "^3.1.0"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "3.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "3.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.5 - _March 3, 2020_
* Dependencies updated
## v3.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-coordinator",
"version": "3.1.4",
"version": "3.1.5",
"engines": {
"node": ">=6.12"
},
@@ -53,14 +53,14 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/dev-utils": "^3.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
@@ -86,8 +86,8 @@
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/base-contract": "^6.2.1",
"@0x/contract-addresses": "^4.8.0",
"@0x/contracts-utils": "^4.4.2",
"@0x/contract-addresses": "^4.9.0",
"@0x/contracts-utils": "^4.4.3",
"@0x/json-schemas": "^5.0.7",
"@0x/types": "^3.1.2",
"@0x/typescript-typings": "^5.0.2",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "1.3.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "1.3.2",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.3.3 - _March 3, 2020_
* Dependencies updated
## v1.3.2 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-dev-utils",
"version": "1.3.2",
"version": "1.3.3",
"engines": {
"node": ">=6.12"
},
@@ -43,10 +43,10 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/assert": "^3.0.7",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "2.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "2.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.5 - _March 3, 2020_
* Dependencies updated
## v2.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc1155",
"version": "2.1.4",
"version": "2.1.5",
"engines": {
"node": ">=6.12"
},
@@ -54,7 +54,7 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
@@ -81,7 +81,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/utils": "^5.4.1",
"@0x/web3-wrapper": "^7.0.7",
"lodash": "^4.17.11"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "1.5.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "1.5.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.5.1 - _March 3, 2020_
* Dependencies updated
## v1.5.0 - _February 27, 2020_
* Add generic liquidity provider sampling (#2487)

View File

@@ -562,8 +562,8 @@ contract ERC20BridgeSampler is
makerToken
);
(bool didSucceed, bytes memory returnData) = registryAddress.staticcall(callData);
if (didSucceed) {
return LibBytes.readAddress(returnData, 0);
if (didSucceed && returnData.length == 32) {
return LibBytes.readAddress(returnData, 12);
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20-bridge-sampler",
"version": "1.5.0",
"version": "1.5.1",
"engines": {
"node": ">=6.12"
},
@@ -51,13 +51,13 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "3.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "3.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.5 - _March 3, 2020_
* Dependencies updated
## v3.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "3.1.4",
"version": "3.1.5",
"engines": {
"node": ">=6.12"
},
@@ -53,8 +53,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "3.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "3.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.5 - _March 3, 2020_
* Dependencies updated
## v3.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc721",
"version": "3.1.4",
"version": "3.1.5",
"engines": {
"node": ">=6.12"
},
@@ -54,8 +54,8 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "4.2.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "4.2.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.2.5 - _March 3, 2020_
* Dependencies updated
## v4.2.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-forwarder",
"version": "4.2.4",
"version": "4.2.5",
"engines": {
"node": ">=6.12"
},
@@ -53,18 +53,18 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc1155": "^2.1.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc1155": "^2.1.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "4.3.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "4.3.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.3.5 - _March 3, 2020_
* Dependencies updated
## v4.3.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-libs",
"version": "4.3.4",
"version": "4.3.5",
"engines": {
"node": ">=6.12"
},
@@ -81,9 +81,9 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/order-utils": "^10.2.3",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/order-utils": "^10.2.4",
"@0x/types": "^3.1.2",
"@0x/typescript-typings": "^5.0.2",
"@0x/utils": "^5.4.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "3.2.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "3.2.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.2.5 - _March 3, 2020_
* Dependencies updated
## v3.2.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange",
"version": "3.2.4",
"version": "3.2.5",
"engines": {
"node": ">=6.12"
},
@@ -53,13 +53,13 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-multisig": "^4.1.4",
"@0x/contracts-staking": "^2.0.11",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-multisig": "^4.1.5",
"@0x/contracts-staking": "^2.0.12",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
@@ -89,11 +89,11 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc1155": "^2.1.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/order-utils": "^10.2.3",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc1155": "^2.1.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/order-utils": "^10.2.4",
"@0x/utils": "^5.4.1",
"lodash": "^4.17.11"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "6.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "6.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.1.5 - _March 3, 2020_
* Dependencies updated
## v6.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
"version": "6.1.4",
"version": "6.1.5",
"engines": {
"node": ">=6.12"
},
@@ -52,17 +52,17 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "2.5.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.5.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.5.1 - _March 3, 2020_
* Dependencies updated
## v2.5.0 - _February 27, 2020_
* Add `ChaiBridge` and `DydxBridge` gas benchmark tests. (#2478)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-integrations",
"version": "2.5.0",
"version": "2.5.1",
"engines": {
"node": ">=6.12"
},
@@ -52,21 +52,21 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-wrappers": "^13.6.2",
"@0x/contracts-broker": "^1.1.3",
"@0x/contracts-coordinator": "^3.1.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc20-bridge-sampler": "^1.5.0",
"@0x/contracts-exchange-forwarder": "^4.2.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-extensions": "^6.1.4",
"@0x/contract-addresses": "^4.9.0",
"@0x/contract-wrappers": "^13.6.3",
"@0x/contracts-broker": "^1.1.4",
"@0x/contracts-coordinator": "^3.1.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc20-bridge-sampler": "^1.5.1",
"@0x/contracts-exchange-forwarder": "^4.2.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-extensions": "^6.1.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/coordinator-server": "^1.0.5",
"@0x/dev-utils": "^3.2.1",
"@0x/migrations": "^6.2.3",
"@0x/order-utils": "^10.2.3",
"@0x/migrations": "^6.2.4",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.7",
@@ -92,16 +92,16 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/asset-swapper": "^4.3.2",
"@0x/asset-swapper": "^4.4.0",
"@0x/base-contract": "^6.2.1",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-erc1155": "^2.1.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-multisig": "^4.1.4",
"@0x/contracts-staking": "^2.0.11",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-erc1155": "^2.1.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-multisig": "^4.1.5",
"@0x/contracts-staking": "^2.0.12",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/types": "^3.1.2",
"@0x/typescript-typings": "^5.0.2",
"@0x/utils": "^5.4.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "4.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "4.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.5 - _March 3, 2020_
* Dependencies updated
## v4.1.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
"version": "4.1.4",
"version": "4.1.5",
"engines": {
"node": ">=6.12"
},
@@ -50,11 +50,11 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/sol-compiler": "^4.0.8",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "2.0.12",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "2.0.11",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.12 - _March 3, 2020_
* Dependencies updated
## v2.0.11 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-staking",
"version": "2.0.11",
"version": "2.0.12",
"engines": {
"node": ">=6.12"
},
@@ -54,14 +54,14 @@
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-exchange-libs": "^4.3.4",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-exchange-libs": "^4.3.5",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-utils": "^4.4.2",
"@0x/contracts-utils": "^4.4.3",
"@0x/dev-utils": "^3.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
@@ -88,7 +88,7 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/typescript-typings": "^5.0.2",
"@0x/utils": "^5.4.1",
"ethereum-types": "^3.1.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "5.3.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "5.3.1",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.3.2 - _March 3, 2020_
* Dependencies updated
## v5.3.1 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "5.3.1",
"version": "5.3.2",
"engines": {
"node": ">=6.12"
},
@@ -44,10 +44,10 @@
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/base-contract": "^6.2.1",
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-addresses": "^4.9.0",
"@0x/dev-utils": "^3.2.1",
"@0x/json-schemas": "^5.0.7",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-coverage": "^4.0.8",
"@0x/sol-profiler": "^4.0.8",
"@0x/sol-trace": "^3.0.8",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "4.4.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "4.4.2",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.4.3 - _March 3, 2020_
* Dependencies updated
## v4.4.2 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "4.4.2",
"version": "4.4.3",
"engines": {
"node": ">=6.12"
},
@@ -52,9 +52,9 @@
"devDependencies": {
"@0x/abi-gen": "^5.2.2",
"@0x/contracts-gen": "^2.0.8",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/dev-utils": "^3.2.1",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/sol-compiler": "^4.0.8",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.2",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "9.1.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "9.1.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v9.1.5 - _March 3, 2020_
* Dependencies updated
## v9.1.4 - _February 27, 2020_
* Dependencies updated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "9.1.4",
"version": "9.1.5",
"engines": {
"node": ">=6.12"
},
@@ -46,9 +46,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-addresses": "^4.9.0",
"@0x/dev-utils": "^3.2.1",
"@0x/migrations": "^6.2.3",
"@0x/migrations": "^6.2.4",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@types/lodash": "4.14.104",
@@ -79,10 +79,10 @@
"dependencies": {
"@0x/abi-gen-wrappers": "^5.4.0-beta.3",
"@0x/assert": "^3.0.7",
"@0x/asset-swapper": "^4.3.2",
"@0x/asset-swapper": "^4.4.0",
"@0x/base-contract": "^6.2.1",
"@0x/contract-wrappers": "^13.6.2",
"@0x/order-utils": "^10.2.3",
"@0x/contract-wrappers": "^13.6.3",
"@0x/order-utils": "^10.2.4",
"@0x/subproviders": "^6.0.8",
"@0x/types": "^3.1.2",
"@0x/typescript-typings": "^5.0.2",

View File

@@ -1,4 +1,26 @@
[
{
"version": "4.4.0",
"changes": [
{
"note": "Add support for ERC721 assets",
"pr": 2491
},
{
"note": "Add destroy for gas heartbeat",
"pr": 2492
},
{
"note": "Added `BUSD` Curve",
"pr": 2506
},
{
"note": "Updated `Compound` Curve address",
"pr": 2506
}
],
"timestamp": 1583220306
},
{
"version": "4.3.2",
"changes": [

View File

@@ -5,6 +5,13 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.4.0 - _March 3, 2020_
* Add support for ERC721 assets (#2491)
* Add destroy for gas heartbeat (#2492)
* Added `BUSD` Curve (#2506)
* Updated `Compound` Curve address (#2506)
## v4.3.2 - _February 27, 2020_
* Fix order native pruning by fill amount (#2500)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/asset-swapper",
"version": "4.3.2",
"version": "4.4.0",
"engines": {
"node": ">=6.12"
},
@@ -42,11 +42,11 @@
"homepage": "https://0x.org/asset-swapper",
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-wrappers": "^13.6.2",
"@0x/contract-addresses": "^4.9.0",
"@0x/contract-wrappers": "^13.6.3",
"@0x/json-schemas": "^5.0.7",
"@0x/order-utils": "^10.2.3",
"@0x/orderbook": "^2.2.4",
"@0x/order-utils": "^10.2.4",
"@0x/orderbook": "^2.2.5",
"@0x/utils": "^5.4.1",
"@0x/web3-wrapper": "^7.0.7",
"heartbeats": "^5.0.1",
@@ -54,10 +54,10 @@
},
"devDependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/dev-utils": "^3.2.1",
"@0x/mesh-rpc-client": "^7.0.4-beta-0xv3",
"@0x/migrations": "^6.2.3",
"@0x/migrations": "^6.2.4",
"@0x/subproviders": "^6.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",

View File

@@ -68,8 +68,8 @@ const DEFAULT_SWAP_QUOTE_REQUEST_OPTS: SwapQuoteRequestOpts = {
// Mainnet Curve configuration
const DEFAULT_CURVE_OPTS: { [source: string]: { version: number; curveAddress: string; tokens: string[] } } = {
[ERC20BridgeSource.CurveUsdcDai]: {
version: 0,
curveAddress: '0x2e60cf74d81ac34eb21eeff58db4d385920ef419',
version: 1,
curveAddress: '0xa2b47e3d5c44877cca798226b7b8118f9bfb7a56',
tokens: ['0x6b175474e89094c44da98b954eedeac495271d0f', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'],
},
[ERC20BridgeSource.CurveUsdcDaiUsdt]: {
@@ -91,6 +91,16 @@ const DEFAULT_CURVE_OPTS: { [source: string]: { version: number; curveAddress: s
'0x0000000000085d4780b73119b644ae5ecd22b376',
],
},
[ERC20BridgeSource.CurveUsdcDaiUsdtBusd]: {
version: 1,
curveAddress: '0x79a8c46dea5ada233abaffd40f3a0a2b1e5a4f27',
tokens: [
'0x6b175474e89094c44da98b954eedeac495271d0f',
'0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
'0xdac17f958d2ee523a2206206994597c13d831ec7',
'0x4fabb145d64652a948d72533023f6e7a623c7c53',
],
},
};
export const constants = {

View File

@@ -234,6 +234,7 @@ export enum SwapQuoterError {
InsufficientAssetLiquidity = 'INSUFFICIENT_ASSET_LIQUIDITY',
AssetUnavailable = 'ASSET_UNAVAILABLE',
NoGasPriceProvidedOrEstimated = 'NO_GAS_PRICE_PROVIDED_OR_ESTIMATED',
AssetDataUnsupported = 'ASSET_DATA_UNSUPPORTED',
}
/**

View File

@@ -11,9 +11,11 @@ export const SELL_SOURCES = [
ERC20BridgeSource.Uniswap,
ERC20BridgeSource.Eth2Dai,
ERC20BridgeSource.Kyber,
// All Curve Sources
ERC20BridgeSource.CurveUsdcDai,
ERC20BridgeSource.CurveUsdcDaiUsdt,
ERC20BridgeSource.CurveUsdcDaiUsdtTusd,
ERC20BridgeSource.CurveUsdcDaiUsdtBusd,
];
/**

View File

@@ -1,5 +1,6 @@
import { ContractAddresses } from '@0x/contract-addresses';
import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
import { SignedOrder } from '@0x/types';
import { AbiEncoder, BigNumber } from '@0x/utils';
import { constants } from '../../constants';
@@ -20,6 +21,22 @@ const { INFINITE_TIMESTAMP_SEC, WALLET_SIGNATURE } = marketOperationUtilConstant
export class CreateOrderUtils {
private readonly _contractAddress: ContractAddresses;
// utility function for asset-swapper to ignore market operation utils for specific asset types
public static convertNativeOrderToFullyFillableOptimizedOrders(order: SignedOrder): OptimizedMarketOrder {
return {
...order,
fillableMakerAssetAmount: order.makerAssetAmount,
fillableTakerAssetAmount: order.takerAssetAmount,
fillableTakerFeeAmount: order.takerFee,
fill: {
source: ERC20BridgeSource.Native,
totalMakerAssetAmount: order.makerAssetAmount,
totalTakerAssetAmount: order.takerAssetAmount,
subFills: [],
},
};
}
constructor(contractAddress: ContractAddresses) {
this._contractAddress = contractAddress;
}
@@ -92,6 +109,7 @@ export class CreateOrderUtils {
case ERC20BridgeSource.CurveUsdcDai:
case ERC20BridgeSource.CurveUsdcDaiUsdt:
case ERC20BridgeSource.CurveUsdcDaiUsdtTusd:
case ERC20BridgeSource.CurveUsdcDaiUsdtBusd:
return this._contractAddress.curveBridge;
default:
break;
@@ -110,11 +128,7 @@ function createBridgeOrder(
isBuy: boolean = false,
): OptimizedMarketOrder {
let makerAssetData;
if (
fill.source === ERC20BridgeSource.CurveUsdcDai ||
fill.source === ERC20BridgeSource.CurveUsdcDaiUsdt ||
fill.source === ERC20BridgeSource.CurveUsdcDaiUsdtTusd
) {
if (Object.keys(constants.DEFAULT_CURVE_OPTS).includes(fill.source)) {
const { curveAddress, tokens, version } = constants.DEFAULT_CURVE_OPTS[fill.source];
const fromTokenIdx = tokens.indexOf(takerToken);
const toTokenIdx = tokens.indexOf(makerToken);

View File

@@ -199,11 +199,7 @@ const samplerOperations = {
batchedOperation = samplerOperations.getUniswapSellQuotes(makerToken, takerToken, takerFillAmounts);
} else if (source === ERC20BridgeSource.Kyber) {
batchedOperation = samplerOperations.getKyberSellQuotes(makerToken, takerToken, takerFillAmounts);
} else if (
source === ERC20BridgeSource.CurveUsdcDai ||
source === ERC20BridgeSource.CurveUsdcDaiUsdt ||
source === ERC20BridgeSource.CurveUsdcDaiUsdtTusd
) {
} else if (Object.keys(constants.DEFAULT_CURVE_OPTS).includes(source)) {
const { curveAddress, tokens } = constants.DEFAULT_CURVE_OPTS[source];
const fromTokenIdx = tokens.indexOf(takerToken);
const toTokenIdx = tokens.indexOf(makerToken);

View File

@@ -31,6 +31,7 @@ export enum ERC20BridgeSource {
CurveUsdcDai = 'Curve_USDC_DAI',
CurveUsdcDaiUsdt = 'Curve_USDC_DAI_USDT',
CurveUsdcDaiUsdtTusd = 'Curve_USDC_DAI_USDT_TUSD',
CurveUsdcDaiUsdtBusd = 'Curve_USDC_DAI_USDT_BUSD',
}
// Internal `fillData` field for `Fill` objects.

View File

@@ -1,5 +1,5 @@
import { orderCalculationUtils } from '@0x/order-utils';
import { SignedOrder } from '@0x/types';
import { assetDataUtils, orderCalculationUtils } from '@0x/order-utils';
import { AssetProxyId, SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
import * as _ from 'lodash';
@@ -14,10 +14,12 @@ import {
SwapQuoteBase,
SwapQuoteInfo,
SwapQuoteOrdersBreakdown,
SwapQuoterError,
} from '../types';
import { fillableAmountsUtils } from './fillable_amounts_utils';
import { MarketOperationUtils } from './market_operation_utils';
import { CreateOrderUtils } from './market_operation_utils/create_order';
import { ERC20BridgeSource, OptimizedMarketOrder } from './market_operation_utils/types';
import { ProtocolFeeUtils } from './protocol_fee_utils';
import { utils } from './utils';
@@ -126,6 +128,10 @@ export class SwapQuoteCalculator {
operation: MarketOperation,
opts: CalculateSwapQuoteOpts,
): Promise<SwapQuote> {
// checks if maker asset is ERC721 or ERC20 and taker asset is ERC20
if (!utils.isSupportedAssetDataInOrders(prunedOrders)) {
throw Error(SwapQuoterError.AssetDataUnsupported);
}
// since prunedOrders do not have fillState, we will add a buffer of fillable orders to consider that some native are orders are partially filled
const slippageBufferAmount = assetFillAmount.multipliedBy(slippagePercentage).integerValue();
@@ -137,18 +143,30 @@ export class SwapQuoteCalculator {
...opts,
fees: _.mapValues(opts.fees, (v, k) => v.times(gasPrice)),
};
if (operation === MarketOperation.Buy) {
resultOrders = await this._marketOperationUtils.getMarketBuyOrdersAsync(
prunedOrders,
assetFillAmount.plus(slippageBufferAmount),
_opts,
const firstOrderMakerAssetData = !!prunedOrders[0]
? assetDataUtils.decodeAssetDataOrThrow(prunedOrders[0].makerAssetData)
: { assetProxyId: '' };
if (firstOrderMakerAssetData.assetProxyId === AssetProxyId.ERC721) {
// HACK: to conform ERC721 orders to the output of market operation utils, assumes complete fillable
resultOrders = prunedOrders.map(o =>
CreateOrderUtils.convertNativeOrderToFullyFillableOptimizedOrders(o),
);
} else {
resultOrders = await this._marketOperationUtils.getMarketSellOrdersAsync(
prunedOrders,
assetFillAmount.plus(slippageBufferAmount),
_opts,
);
if (operation === MarketOperation.Buy) {
resultOrders = await this._marketOperationUtils.getMarketBuyOrdersAsync(
prunedOrders,
assetFillAmount.plus(slippageBufferAmount),
_opts,
);
} else {
resultOrders = await this._marketOperationUtils.getMarketSellOrdersAsync(
prunedOrders,
assetFillAmount.plus(slippageBufferAmount),
_opts,
);
}
}
}

View File

@@ -1,5 +1,5 @@
import { assetDataUtils } from '@0x/order-utils';
import { AssetData, ERC20AssetData, ERC20BridgeAssetData, Order } from '@0x/types';
import { AssetData, AssetProxyId, ERC20AssetData, ERC20BridgeAssetData, Order, SignedOrder } from '@0x/types';
import { BigNumber, NULL_BYTES } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -7,6 +7,21 @@ import { constants } from '../constants';
// tslint:disable:no-unnecessary-type-assertion
export const utils = {
isSupportedAssetDataInOrders(orders: SignedOrder[]): boolean {
const firstOrderMakerAssetData = !!orders[0]
? assetDataUtils.decodeAssetDataOrThrow(orders[0].makerAssetData)
: { assetProxyId: '' };
return orders.every(o => {
const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(o.takerAssetData);
const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(o.makerAssetData);
return (
(makerAssetData.assetProxyId === AssetProxyId.ERC20 ||
makerAssetData.assetProxyId === AssetProxyId.ERC721) &&
takerAssetData.assetProxyId === AssetProxyId.ERC20 &&
firstOrderMakerAssetData.assetProxyId === makerAssetData.assetProxyId
); // checks that all native order maker assets are of the same type
});
},
numberPercentageToEtherTokenAmountPercentage(percentage: number): BigNumber {
return Web3Wrapper.toBaseUnitAmount(constants.ONE_AMOUNT, constants.ETHER_TOKEN_DECIMALS).multipliedBy(
percentage,

View File

@@ -204,6 +204,7 @@ describe('MarketOperationUtils tests', () => {
[ERC20BridgeSource.CurveUsdcDai]: _.times(NUM_SAMPLES, () => 0),
[ERC20BridgeSource.CurveUsdcDaiUsdt]: _.times(NUM_SAMPLES, () => 0),
[ERC20BridgeSource.CurveUsdcDaiUsdtTusd]: _.times(NUM_SAMPLES, () => 0),
[ERC20BridgeSource.CurveUsdcDaiUsdtBusd]: _.times(NUM_SAMPLES, () => 0),
};
function findSourceWithMaxOutput(rates: RatesBySource): ERC20BridgeSource {
@@ -274,11 +275,7 @@ describe('MarketOperationUtils tests', () => {
runLimit: 0,
sampleDistributionBase: 1,
bridgeSlippage: 0,
excludedSources: [
ERC20BridgeSource.CurveUsdcDai,
ERC20BridgeSource.CurveUsdcDaiUsdt,
ERC20BridgeSource.CurveUsdcDaiUsdtTusd,
],
excludedSources: Object.keys(assetSwapperConstants.DEFAULT_CURVE_OPTS) as ERC20BridgeSource[],
};
beforeEach(() => {
@@ -545,11 +542,7 @@ describe('MarketOperationUtils tests', () => {
numSamples: NUM_SAMPLES,
runLimit: 0,
sampleDistributionBase: 1,
excludedSources: [
ERC20BridgeSource.CurveUsdcDai,
ERC20BridgeSource.CurveUsdcDaiUsdt,
ERC20BridgeSource.CurveUsdcDaiUsdtTusd,
],
excludedSources: Object.keys(assetSwapperConstants.DEFAULT_CURVE_OPTS) as ERC20BridgeSource[],
};
beforeEach(() => {

View File

@@ -1,4 +1,14 @@
[
{
"version": "4.9.0",
"changes": [
{
"note": "Redeploy `ERC20BridgeSampler`",
"pr": 2503
}
],
"timestamp": 1583220306
},
{
"version": "4.8.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.9.0 - _March 3, 2020_
* Redeploy `ERC20BridgeSampler` (#2503)
## v4.8.0 - _February 27, 2020_
* Added Broker, GodsUnchainedValidator, ChainlinkStopLimit to index.ts (#2498)

View File

@@ -20,7 +20,7 @@
"devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547",
"erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
"uniswapBridge": "0x533344cfdf2a3e911e2cf4c6f5ed08e791f5355f",
"erc20BridgeSampler": "0x43cfd1027bcc01d3df714d9e7bf989622e4bbec1",
"erc20BridgeSampler": "0xb2dee8cf2a06fbf0942fda5521f890b6e9911bfe",
"kyberBridge": "0xf342f3a80fdc9b48713d58fe97e17f5cc764ee62",
"eth2DaiBridge": "0xe3379a1956f4a79f39eb2e87bb441419e167538e",
"chaiBridge": "0x77c31eba23043b9a72d13470f3a3a311344d7438",
@@ -114,7 +114,7 @@
"erc20BridgeProxy": "0xfb2dd2a1366de37f7241c83d47da58fd503e2c64",
"uniswapBridge": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
"eth2DaiBridge": "0x9485d65c6a2fae0d519cced5bd830e57c41998a9",
"erc20BridgeSampler": "0x0937795148f54f08538390d936e898163684b33f",
"erc20BridgeSampler": "0x4f1556e5fe03a0da39091260f78d2cf765baa091",
"kyberBridge": "0xde7b2747624a647600fdb349184d0448ab954929",
"chaiBridge": "0x0000000000000000000000000000000000000000",
"dydxBridge": "0x0000000000000000000000000000000000000000",

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers-test",
"version": "12.2.12",
"version": "12.2.13",
"engines": {
"node": ">=6.12"
},
@@ -31,11 +31,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contract-wrappers-test/README.md",
"devDependencies": {
"@0x/contract-wrappers": "^13.6.2",
"@0x/contracts-test-utils": "^5.3.1",
"@0x/contract-wrappers": "^13.6.3",
"@0x/contracts-test-utils": "^5.3.2",
"@0x/dev-utils": "^3.2.1",
"@0x/migrations": "^6.2.3",
"@0x/order-utils": "^10.2.3",
"@0x/migrations": "^6.2.4",
"@0x/order-utils": "^10.2.4",
"@0x/subproviders": "^6.0.8",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "13.6.3",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "13.6.2",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v13.6.3 - _March 3, 2020_
* Dependencies updated
## v13.6.2 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
"version": "13.6.2",
"version": "13.6.3",
"engines": {
"node": ">=6.12"
},
@@ -52,7 +52,7 @@
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/base-contract": "^6.2.1",
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-addresses": "^4.9.0",
"@0x/json-schemas": "^5.0.7",
"@0x/types": "^3.1.2",
"@0x/utils": "^5.4.1",

View File

@@ -1,4 +1,17 @@
[
{
"version": "4.2.0",
"changes": [
{
"note": "Clean up heartbeat functions on close",
"pr": 2492
},
{
"note": "Fix ERC721 asset support",
"pr": 2491
}
]
},
{
"version": "4.1.0",
"changes": [

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/instant",
"version": "1.0.49",
"version": "1.0.50",
"engines": {
"node": ">=6.12"
},
@@ -44,8 +44,8 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/asset-swapper": "^4.3.2",
"@0x/contract-wrappers": "^13.6.2",
"@0x/asset-swapper": "^4.4.0",
"@0x/contract-wrappers": "^13.6.3",
"@0x/json-schemas": "^5.0.7",
"@0x/subproviders": "^6.0.8",
"@0x/utils": "^5.4.1",

View File

@@ -72,7 +72,9 @@ export class InstantHeading extends React.PureComponent<InstantHeadingProps, {}>
overflow="hidden"
borderRadius="50%"
>
<Image src={asset.metaData.imageUrl} height="100%" objectFit="cover" />
<Flex justify="center" align="center" height="100%">
<Image src={asset.metaData.imageUrl} height="100%" objectFit="cover" />
</Flex>
</Container>
</Flex>
</Container>

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "6.2.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "6.2.3",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.2.4 - _March 3, 2020_
* Dependencies updated
## v6.2.3 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/migrations",
"version": "6.2.3",
"version": "6.2.4",
"engines": {
"node": ">=6.12"
},
@@ -62,20 +62,20 @@
},
"dependencies": {
"@0x/base-contract": "^6.2.1",
"@0x/contract-addresses": "^4.8.0",
"@0x/contract-wrappers": "^13.6.2",
"@0x/contracts-asset-proxy": "^3.2.4",
"@0x/contracts-coordinator": "^3.1.4",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-erc1155": "^2.1.4",
"@0x/contracts-erc20": "^3.1.4",
"@0x/contracts-erc721": "^3.1.4",
"@0x/contracts-exchange": "^3.2.4",
"@0x/contracts-exchange-forwarder": "^4.2.4",
"@0x/contracts-extensions": "^6.1.4",
"@0x/contracts-multisig": "^4.1.4",
"@0x/contracts-staking": "^2.0.11",
"@0x/contracts-utils": "^4.4.2",
"@0x/contract-addresses": "^4.9.0",
"@0x/contract-wrappers": "^13.6.3",
"@0x/contracts-asset-proxy": "^3.2.5",
"@0x/contracts-coordinator": "^3.1.5",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/contracts-erc1155": "^2.1.5",
"@0x/contracts-erc20": "^3.1.5",
"@0x/contracts-erc721": "^3.1.5",
"@0x/contracts-exchange": "^3.2.5",
"@0x/contracts-exchange-forwarder": "^4.2.5",
"@0x/contracts-extensions": "^6.1.5",
"@0x/contracts-multisig": "^4.1.5",
"@0x/contracts-staking": "^2.0.12",
"@0x/contracts-utils": "^4.4.3",
"@0x/sol-compiler": "^4.0.8",
"@0x/subproviders": "^6.0.8",
"@0x/typescript-typings": "^5.0.2",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "10.2.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "10.2.3",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v10.2.4 - _March 3, 2020_
* Dependencies updated
## v10.2.3 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
"version": "10.2.3",
"version": "10.2.4",
"engines": {
"node": ">=6.12"
},
@@ -64,7 +64,7 @@
},
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/contract-wrappers": "^13.6.2",
"@0x/contract-wrappers": "^13.6.3",
"@0x/json-schemas": "^5.0.7",
"@0x/utils": "^5.4.1",
"@0x/web3-wrapper": "^7.0.7",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1583220306,
"version": "2.2.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1582837861,
"version": "2.2.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.2.5 - _March 3, 2020_
* Dependencies updated
## v2.2.4 - _February 27, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/orderbook",
"version": "2.2.4",
"version": "2.2.5",
"description": "Library for retrieving and syncing a remote orderbook locally",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -48,9 +48,9 @@
"dependencies": {
"@0x/assert": "^3.0.7",
"@0x/connect": "^6.0.7",
"@0x/contracts-dev-utils": "^1.3.2",
"@0x/contracts-dev-utils": "^1.3.3",
"@0x/mesh-rpc-client": "^7.0.4-beta-0xv3",
"@0x/order-utils": "^10.2.3",
"@0x/order-utils": "^10.2.4",
"@0x/utils": "^5.4.1"
}
}