Compare commits

..

14 Commits

Author SHA1 Message Date
Jacob Evans
5921208ea6 Publish
- @0x/contracts-asset-proxy@3.1.2
 - @0x/contracts-coordinator@3.0.5
 - @0x/contracts-dev-utils@1.0.5
 - @0x/contracts-erc1155@2.0.5
 - @0x/contracts-erc20-bridge-sampler@1.2.0
 - @0x/contracts-erc20@3.0.5
 - @0x/contracts-erc721@3.0.5
 - @0x/contracts-exchange-forwarder@4.0.5
 - @0x/contracts-exchange-libs@4.1.1
 - @0x/contracts-exchange@3.1.1
 - @0x/contracts-extensions@5.1.4
 - @0x/contracts-integrations@2.2.2
 - @0x/contracts-multisig@4.0.5
 - @0x/contracts-staking@2.0.5
 - @0x/contracts-test-utils@5.1.2
 - @0x/contracts-utils@4.2.0
 - 0x.js@9.0.6
 - @0x/abi-gen@5.1.1
 - @0x/asset-swapper@4.1.0
 - @0x/base-contract@6.1.1
 - @0x/contract-addresses@4.4.0
 - @0x/contract-wrappers-test@12.2.6
 - @0x/contract-wrappers@13.4.1
 - @0x/contracts-gen@2.0.5
 - @0x/dev-utils@3.1.2
 - @0x/instant@1.0.43
 - @0x/migrations@6.0.1
 - @0x/monorepo-scripts@1.0.48
 - @0x/order-utils@10.1.2
 - @0x/orderbook@2.1.1
 - @0x/sol-compiler@4.0.5
 - @0x/sol-coverage@4.0.5
 - @0x/sol-doc@3.1.2
 - @0x/sol-profiler@4.0.5
 - @0x/sol-trace@3.0.5
 - @0x/sol-tracing-utils@7.0.5
 - @0x/subproviders@6.0.5
2020-02-04 20:22:07 +10:00
Jacob Evans
f89c78abd1 Updated CHANGELOGS & MD docs 2020-02-04 20:21:45 +10:00
David Sun
74d3b9334c Add liquidity source breakdown to asset-swapper (#2465)
* add liquidity source breakdown to asset-swapper

* remove debug line

* use OptimizedMarketOrder metadata

* updated change-log

* prettier + lint

* bug fixes

* fixes

* Prettier

* Fix types

Co-authored-by: Jacob Evans <dekz@dekz.net>
2020-02-04 19:03:28 +10:00
Xianny
919fc66b9d Stop hardcoding contract addresses (#2461)
* stop hardcoding contract addresses

* update changelog

* export ContractAddresses for docs
2020-02-04 17:49:45 +10:00
Francesco Agosti
400fb5a5bb Merge pull request #2468 from 0xProject/feat/fix-test-publish
Bump maxBuffer?
2020-02-03 19:59:03 -08:00
fragosti
3bb4f9085c Add post-instal step 2020-02-03 18:13:31 -08:00
Jacob Evans
714c6cec3c Bump maxBuffer? 2020-02-03 17:50:32 -08:00
Lawrence Forman
cb69921202 ERC20BridgeSampler: Unlock full sampling on Kovan (#2459)
* `@0x/contracts-utils`: Update kovan addresses in `DeploymentConstants`

* `@0x/contracts-erc20-bridge-sampler`: Make source IDs static on all networks, not inherited from `DeploymentConstants`.

* `@0x/contract-addresses`: Update `ERC20BridgeSampler` addresses on mainnet and kovan.

Co-authored-by: Lawrence Forman <me@merklejerk.com>
2020-01-31 11:27:28 -05:00
Jacob Evans
277a0adac9 [base-contract] throw string revert error (#2453) 2020-01-24 07:48:26 +10:00
Jacob Evans
02d14f504f Remove docs from sol-doc gitignore 2020-01-23 12:10:42 +10:00
Jacob Evans
1ab7664a60 Publish
- @0x/contracts-integrations@2.2.1
 - 0x.js@9.0.5
 - @0x/asset-swapper@4.0.1
 - @0x/instant@1.0.42
2020-01-23 11:58:27 +10:00
Jacob Evans
1be46ffb7e Updated CHANGELOGS & MD docs 2020-01-23 11:58:10 +10:00
Lawrence Forman
6ca52aed0d @0x/asset-swapper: Fix understimated protocol fee in worst case quote. (#2452) 2020-01-22 18:22:56 -05:00
Jacob Evans
74e20970e2 Create docs folder for sol-doc 2020-01-22 18:56:10 +10:00
120 changed files with 1499 additions and 946 deletions

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.1.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "3.1.1",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.2 - _February 4, 2020_
* Dependencies updated
## v3.1.1 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-asset-proxy",
"version": "3.1.1",
"version": "3.1.2",
"engines": {
"node": ">=6.12"
},
@@ -51,12 +51,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -79,13 +79,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc1155": "^2.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/order-utils": "^10.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc1155": "^2.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/order-utils": "^10.1.2",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "3.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.0.5 - _February 4, 2020_
* Dependencies updated
## v3.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-coordinator",
"version": "3.0.4",
"version": "3.0.5",
"engines": {
"node": ">=6.12"
},
@@ -52,16 +52,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/dev-utils": "^3.1.1",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/dev-utils": "^3.1.2",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.4",
@@ -85,9 +85,9 @@
},
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/base-contract": "^6.1.0",
"@0x/contract-addresses": "^4.3.0",
"@0x/contracts-utils": "^4.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/contract-addresses": "^4.4.0",
"@0x/contracts-utils": "^4.2.0",
"@0x/json-schemas": "^5.0.4",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "1.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "1.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.0.5 - _February 4, 2020_
* Dependencies updated
## v1.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-dev-utils",
"version": "1.0.4",
"version": "1.0.5",
"engines": {
"node": ">=6.12"
},
@@ -41,10 +41,10 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/abi-gen": "^5.1.1",
"@0x/assert": "^3.0.4",
"@0x/contracts-gen": "^2.0.4",
"@0x/sol-compiler": "^4.0.4",
"@0x/contracts-gen": "^2.0.5",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@types/node": "*",
@@ -59,7 +59,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0"
"@0x/base-contract": "^6.1.1"
},
"publishConfig": {
"access": "public"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "2.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "2.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.5 - _February 4, 2020_
* Dependencies updated
## v2.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc1155",
"version": "2.0.4",
"version": "2.0.5",
"engines": {
"node": ">=6.12"
},
@@ -52,11 +52,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -80,8 +80,8 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",
"lodash": "^4.17.11"

View File

@@ -1,4 +1,14 @@
[
{
"version": "1.2.0",
"changes": [
{
"note": "Make source IDs static on all networks, not inherited from `DeploymentConstants`.",
"pr": 2459
}
],
"timestamp": 1580811564
},
{
"version": "1.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v1.2.0 - _February 4, 2020_
* Make source IDs static on all networks, not inherited from `DeploymentConstants`. (#2459)
## v1.1.0 - _January 22, 2020_
* Add batch functions to query quotes (#2427)

View File

@@ -40,6 +40,9 @@ contract ERC20BridgeSampler is
uint256 constant internal KYBER_SAMPLE_CALL_GAS = 1500e3;
uint256 constant internal UNISWAP_SAMPLE_CALL_GAS = 150e3;
uint256 constant internal ETH2DAI_SAMPLE_CALL_GAS = 1000e3;
address constant private UNISWAP_SOURCE = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
address constant private ETH2DAI_SOURCE = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e;
address constant private KYBER_SOURCE = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755;
/// @dev Query batches of native orders and sample sell quotes on multiple DEXes at once.
/// @param orders Batches of Native orders to query.
@@ -606,13 +609,13 @@ contract ERC20BridgeSampler is
view
returns (uint256[] memory makerTokenAmounts)
{
if (source == _getEth2DaiAddress()) {
if (source == ETH2DAI_SOURCE) {
return sampleSellsFromEth2Dai(takerToken, makerToken, takerTokenAmounts);
}
if (source == _getUniswapExchangeFactoryAddress()) {
if (source == UNISWAP_SOURCE) {
return sampleSellsFromUniswap(takerToken, makerToken, takerTokenAmounts);
}
if (source == _getKyberNetworkProxyAddress()) {
if (source == KYBER_SOURCE) {
return sampleSellsFromKyberNetwork(takerToken, makerToken, takerTokenAmounts);
}
revert("ERC20BridgeSampler/UNSUPPORTED_SOURCE");
@@ -634,10 +637,10 @@ contract ERC20BridgeSampler is
view
returns (uint256[] memory takerTokenAmounts)
{
if (source == _getEth2DaiAddress()) {
if (source == ETH2DAI_SOURCE) {
return sampleBuysFromEth2Dai(takerToken, makerToken, makerTokenAmounts);
}
if (source == _getUniswapExchangeFactoryAddress()) {
if (source == UNISWAP_SOURCE) {
return sampleBuysFromUniswap(takerToken, makerToken, makerTokenAmounts);
}
revert("ERC20BridgeSampler/UNSUPPORTED_SOURCE");

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20-bridge-sampler",
"version": "1.1.0",
"version": "1.2.0",
"engines": {
"node": ">=6.12"
},
@@ -50,16 +50,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.4",
"@types/lodash": "4.14.104",
@@ -79,7 +79,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -15,7 +15,6 @@ import { TestERC20BridgeSamplerContract } from './wrappers';
blockchainTests('erc20-bridge-sampler', env => {
let testContract: TestERC20BridgeSamplerContract;
let allSources: { [name: string]: string };
const RATE_DENOMINATOR = constants.ONE_ETHER;
const MIN_RATE = new BigNumber('0.01');
const MAX_RATE = new BigNumber('100');
@@ -30,6 +29,11 @@ blockchainTests('erc20-bridge-sampler', env => {
const INVALID_ASSET_DATA = hexUtils.random(37);
const SELL_SOURCES = ['Eth2Dai', 'Kyber', 'Uniswap'];
const BUY_SOURCES = ['Eth2Dai', 'Uniswap'];
const SOURCE_IDS: { [source: string]: string } = {
Uniswap: '0xc0a47dfe034b400b47bdad5fecda2621de6c4d95',
Eth2Dai: '0x39755357759ce0d7f32dc8dc45414cca409ae24e',
Kyber: '0x818e6fecd516ecc3849daf6845e3ec868087b755',
};
const EMPTY_ORDERS_ERROR = 'ERC20BridgeSampler/EMPTY_ORDERS';
const UNSUPPORTED_ASSET_PROXY_ERROR = 'ERC20BridgeSampler/UNSUPPORTED_ASSET_PROXY';
const INVALID_ASSET_DATA_ERROR = 'ERC20BridgeSampler/INVALID_ASSET_DATA';
@@ -45,14 +49,6 @@ blockchainTests('erc20-bridge-sampler', env => {
env.txDefaults,
{},
);
allSources = _.zipObject(
['Uniswap', 'Eth2Dai', 'Kyber'],
[
await testContract.uniswap().callAsync(),
await testContract.eth2Dai().callAsync(),
await testContract.kyber().callAsync(),
],
);
});
function getPackedHash(...args: string[]): string {
@@ -340,7 +336,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const takerTokenAmounts = getSampleAmounts(TAKER_TOKEN);
const expectedFillableAmounts = ORDERS.map(getDeterministicFillableTakerAssetAmount);
const [orderInfos] = await testContract
.queryOrdersAndSampleSells(ORDERS, SIGNATURES, SELL_SOURCES.map(n => allSources[n]), takerTokenAmounts)
.queryOrdersAndSampleSells(ORDERS, SIGNATURES, SELL_SOURCES.map(n => SOURCE_IDS[n]), takerTokenAmounts)
.callAsync();
expect(orderInfos).to.deep.eq(expectedFillableAmounts);
});
@@ -349,14 +345,14 @@ blockchainTests('erc20-bridge-sampler', env => {
const sampleAmounts = getSampleAmounts(TAKER_TOKEN);
const expectedQuotes = getDeterministicSellQuotes(TAKER_TOKEN, MAKER_TOKEN, SELL_SOURCES, sampleAmounts);
const [, quotes] = await testContract
.queryOrdersAndSampleSells(ORDERS, SIGNATURES, SELL_SOURCES.map(n => allSources[n]), sampleAmounts)
.queryOrdersAndSampleSells(ORDERS, SIGNATURES, SELL_SOURCES.map(n => SOURCE_IDS[n]), sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
it('throws if no orders are passed in', async () => {
const tx = testContract
.queryOrdersAndSampleSells([], [], SELL_SOURCES.map(n => allSources[n]), getSampleAmounts(TAKER_TOKEN))
.queryOrdersAndSampleSells([], [], SELL_SOURCES.map(n => SOURCE_IDS[n]), getSampleAmounts(TAKER_TOKEN))
.callAsync();
return expect(tx).to.revertWith(EMPTY_ORDERS_ERROR);
});
@@ -366,7 +362,7 @@ blockchainTests('erc20-bridge-sampler', env => {
.queryOrdersAndSampleSells(
ORDERS,
SIGNATURES,
[...SELL_SOURCES.map(n => allSources[n]), randomAddress()],
[...SELL_SOURCES.map(n => SOURCE_IDS[n]), randomAddress()],
getSampleAmounts(TAKER_TOKEN),
)
.callAsync();
@@ -381,7 +377,7 @@ blockchainTests('erc20-bridge-sampler', env => {
makerAssetData: INVALID_ASSET_PROXY_ASSET_DATA,
})),
SIGNATURES,
SELL_SOURCES.map(n => allSources[n]),
SELL_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(TAKER_TOKEN),
)
.callAsync();
@@ -396,7 +392,7 @@ blockchainTests('erc20-bridge-sampler', env => {
takerAssetData: INVALID_ASSET_PROXY_ASSET_DATA,
})),
SIGNATURES,
SELL_SOURCES.map(n => allSources[n]),
SELL_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(TAKER_TOKEN),
)
.callAsync();
@@ -411,7 +407,7 @@ blockchainTests('erc20-bridge-sampler', env => {
makerAssetData: INVALID_ASSET_DATA,
})),
SIGNATURES,
SELL_SOURCES.map(n => allSources[n]),
SELL_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(TAKER_TOKEN),
)
.callAsync();
@@ -426,7 +422,7 @@ blockchainTests('erc20-bridge-sampler', env => {
takerAssetData: INVALID_ASSET_DATA,
})),
SIGNATURES,
SELL_SOURCES.map(n => allSources[n]),
SELL_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(TAKER_TOKEN),
)
.callAsync();
@@ -446,7 +442,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const takerTokenAmounts = getSampleAmounts(MAKER_TOKEN);
const expectedFillableAmounts = ORDERS.map(getDeterministicFillableMakerAssetAmount);
const [orderInfos] = await testContract
.queryOrdersAndSampleBuys(ORDERS, SIGNATURES, BUY_SOURCES.map(n => allSources[n]), takerTokenAmounts)
.queryOrdersAndSampleBuys(ORDERS, SIGNATURES, BUY_SOURCES.map(n => SOURCE_IDS[n]), takerTokenAmounts)
.callAsync();
expect(orderInfos).to.deep.eq(expectedFillableAmounts);
});
@@ -455,14 +451,14 @@ blockchainTests('erc20-bridge-sampler', env => {
const sampleAmounts = getSampleAmounts(MAKER_TOKEN);
const expectedQuotes = getDeterministicBuyQuotes(TAKER_TOKEN, MAKER_TOKEN, BUY_SOURCES, sampleAmounts);
const [, quotes] = await testContract
.queryOrdersAndSampleBuys(ORDERS, SIGNATURES, BUY_SOURCES.map(n => allSources[n]), sampleAmounts)
.queryOrdersAndSampleBuys(ORDERS, SIGNATURES, BUY_SOURCES.map(n => SOURCE_IDS[n]), sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
it('throws if no orders are passed in', async () => {
const tx = testContract
.queryOrdersAndSampleBuys([], [], BUY_SOURCES.map(n => allSources[n]), getSampleAmounts(MAKER_TOKEN))
.queryOrdersAndSampleBuys([], [], BUY_SOURCES.map(n => SOURCE_IDS[n]), getSampleAmounts(MAKER_TOKEN))
.callAsync();
return expect(tx).to.revertWith(EMPTY_ORDERS_ERROR);
});
@@ -472,7 +468,7 @@ blockchainTests('erc20-bridge-sampler', env => {
.queryOrdersAndSampleBuys(
ORDERS,
SIGNATURES,
[...BUY_SOURCES.map(n => allSources[n]), randomAddress()],
[...BUY_SOURCES.map(n => SOURCE_IDS[n]), randomAddress()],
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -485,7 +481,7 @@ blockchainTests('erc20-bridge-sampler', env => {
.queryOrdersAndSampleBuys(
ORDERS,
SIGNATURES,
sources.map(n => allSources[n]),
sources.map(n => SOURCE_IDS[n]),
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -500,7 +496,7 @@ blockchainTests('erc20-bridge-sampler', env => {
makerAssetData: INVALID_ASSET_PROXY_ASSET_DATA,
})),
SIGNATURES,
BUY_SOURCES.map(n => allSources[n]),
BUY_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -515,7 +511,7 @@ blockchainTests('erc20-bridge-sampler', env => {
takerAssetData: INVALID_ASSET_PROXY_ASSET_DATA,
})),
SIGNATURES,
BUY_SOURCES.map(n => allSources[n]),
BUY_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -530,7 +526,7 @@ blockchainTests('erc20-bridge-sampler', env => {
makerAssetData: INVALID_ASSET_DATA,
})),
SIGNATURES,
BUY_SOURCES.map(n => allSources[n]),
BUY_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -545,7 +541,7 @@ blockchainTests('erc20-bridge-sampler', env => {
takerAssetData: INVALID_ASSET_DATA,
})),
SIGNATURES,
BUY_SOURCES.map(n => allSources[n]),
BUY_SOURCES.map(n => SOURCE_IDS[n]),
getSampleAmounts(MAKER_TOKEN),
)
.callAsync();
@@ -561,7 +557,7 @@ blockchainTests('erc20-bridge-sampler', env => {
it('returns empty quotes with no sample amounts', async () => {
const emptyQuotes = _.times(SELL_SOURCES.length, () => []);
const quotes = await testContract
.sampleSells(SELL_SOURCES.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, [])
.sampleSells(SELL_SOURCES.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, [])
.callAsync();
expect(quotes).to.deep.eq(emptyQuotes);
});
@@ -570,7 +566,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const sampleAmounts = getSampleAmounts(TAKER_TOKEN);
const expectedQuotes = getDeterministicSellQuotes(TAKER_TOKEN, MAKER_TOKEN, SELL_SOURCES, sampleAmounts);
const quotes = await testContract
.sampleSells(SELL_SOURCES.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.sampleSells(SELL_SOURCES.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
@@ -580,7 +576,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const sources = _.sampleSize(SELL_SOURCES, 1);
const expectedQuotes = getDeterministicSellQuotes(TAKER_TOKEN, MAKER_TOKEN, sources, sampleAmounts);
const quotes = await testContract
.sampleSells(sources.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.sampleSells(sources.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
@@ -588,7 +584,7 @@ blockchainTests('erc20-bridge-sampler', env => {
it('throws with an unsupported source', async () => {
const tx = testContract
.sampleSells(
[...SELL_SOURCES.map(n => allSources[n]), randomAddress()],
[...SELL_SOURCES.map(n => SOURCE_IDS[n]), randomAddress()],
TAKER_TOKEN,
MAKER_TOKEN,
getSampleAmounts(TAKER_TOKEN),
@@ -606,7 +602,7 @@ blockchainTests('erc20-bridge-sampler', env => {
it('returns empty quotes with no sample amounts', async () => {
const emptyQuotes = _.times(BUY_SOURCES.length, () => []);
const quotes = await testContract
.sampleBuys(BUY_SOURCES.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, [])
.sampleBuys(BUY_SOURCES.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, [])
.callAsync();
expect(quotes).to.deep.eq(emptyQuotes);
});
@@ -615,7 +611,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const sampleAmounts = getSampleAmounts(MAKER_TOKEN);
const expectedQuotes = getDeterministicBuyQuotes(TAKER_TOKEN, MAKER_TOKEN, BUY_SOURCES, sampleAmounts);
const quotes = await testContract
.sampleBuys(BUY_SOURCES.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.sampleBuys(BUY_SOURCES.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
@@ -625,7 +621,7 @@ blockchainTests('erc20-bridge-sampler', env => {
const sources = _.sampleSize(BUY_SOURCES, 1);
const expectedQuotes = getDeterministicBuyQuotes(TAKER_TOKEN, MAKER_TOKEN, sources, sampleAmounts);
const quotes = await testContract
.sampleBuys(sources.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.sampleBuys(sources.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, sampleAmounts)
.callAsync();
expect(quotes).to.deep.eq(expectedQuotes);
});
@@ -633,7 +629,7 @@ blockchainTests('erc20-bridge-sampler', env => {
it('throws with an unsupported source', async () => {
const tx = testContract
.sampleBuys(
[...BUY_SOURCES.map(n => allSources[n]), randomAddress()],
[...BUY_SOURCES.map(n => SOURCE_IDS[n]), randomAddress()],
TAKER_TOKEN,
MAKER_TOKEN,
getSampleAmounts(MAKER_TOKEN),
@@ -645,7 +641,7 @@ blockchainTests('erc20-bridge-sampler', env => {
it('throws if kyber is passed in as a source', async () => {
const sources = [...BUY_SOURCES, 'Kyber'];
const tx = testContract
.sampleBuys(sources.map(n => allSources[n]), TAKER_TOKEN, MAKER_TOKEN, getSampleAmounts(MAKER_TOKEN))
.sampleBuys(sources.map(n => SOURCE_IDS[n]), TAKER_TOKEN, MAKER_TOKEN, getSampleAmounts(MAKER_TOKEN))
.callAsync();
return expect(tx).to.revertWith(UNSUPPORTED_SOURCE_ERROR);
});

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "3.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.0.5 - _February 4, 2020_
* Dependencies updated
## v3.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc20",
"version": "3.0.4",
"version": "3.0.5",
"engines": {
"node": ">=6.12"
},
@@ -51,12 +51,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -82,7 +82,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0"
"@0x/base-contract": "^6.1.1"
},
"publishConfig": {
"access": "public"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "3.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.0.5 - _February 4, 2020_
* Dependencies updated
## v3.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-erc721",
"version": "3.0.4",
"version": "3.0.5",
"engines": {
"node": ">=6.12"
},
@@ -52,12 +52,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -84,7 +84,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0"
"@0x/base-contract": "^6.1.1"
},
"publishConfig": {
"access": "public"

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "4.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "4.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.0.5 - _February 4, 2020_
* Dependencies updated
## v4.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-forwarder",
"version": "4.0.4",
"version": "4.0.5",
"engines": {
"node": ">=6.12"
},
@@ -52,20 +52,20 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc1155": "^2.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc1155": "^2.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -90,7 +90,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/typescript-typings": "^5.0.1",
"ethereum-types": "^3.0.0"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "4.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "4.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.1 - _February 4, 2020_
* Dependencies updated
## v4.1.0 - _January 22, 2020_
* Reference functions for `matchOrders` and `matchOrdersWithMaximalFill`. (#2437)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange-libs",
"version": "4.1.0",
"version": "4.1.1",
"engines": {
"node": ">=6.12"
},
@@ -52,11 +52,11 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/subproviders": "^6.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/subproviders": "^6.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.4",
@@ -80,10 +80,10 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/order-utils": "^10.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/order-utils": "^10.1.2",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.1 - _February 4, 2020_
* Dependencies updated
## v3.1.0 - _January 22, 2020_
* Uses updated event decoding to properly decodes arrays and objects. (#2443)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-exchange",
"version": "3.1.0",
"version": "3.1.1",
"engines": {
"node": ">=6.12"
},
@@ -52,16 +52,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-multisig": "^4.0.4",
"@0x/contracts-staking": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-multisig": "^4.0.5",
"@0x/contracts-staking": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -88,12 +88,12 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc1155": "^2.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/order-utils": "^10.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc1155": "^2.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/order-utils": "^10.1.2",
"@0x/utils": "^5.2.0",
"lodash": "^4.17.11"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "5.1.4",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "5.1.3",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.1.4 - _February 4, 2020_
* Dependencies updated
## v5.1.3 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-extensions",
"version": "5.1.3",
"version": "5.1.4",
"engines": {
"node": ">=6.12"
},
@@ -52,19 +52,19 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -91,7 +91,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/typescript-typings": "^5.0.1",
"ethereum-types": "^3.0.0"
},

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1580811564,
"version": "2.2.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579744659,
"version": "2.2.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.2.0",
"changes": [

View File

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.2.2 - _February 4, 2020_
* Dependencies updated
## v2.2.1 - _January 23, 2020_
* Dependencies updated
## v2.2.0 - _January 22, 2020_
* Add mainnet contract wrapper `callAsync()` revert behavior tests. (#2433)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-integrations",
"version": "2.2.0",
"version": "2.2.2",
"engines": {
"node": ">=6.12"
},
@@ -51,20 +51,20 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contract-addresses": "^4.3.0",
"@0x/contract-wrappers": "^13.4.0",
"@0x/contracts-coordinator": "^3.0.4",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-exchange-forwarder": "^4.0.4",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-utils": "^4.1.0",
"@0x/abi-gen": "^5.1.1",
"@0x/contract-addresses": "^4.4.0",
"@0x/contract-wrappers": "^13.4.1",
"@0x/contracts-coordinator": "^3.0.5",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-exchange-forwarder": "^4.0.5",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-utils": "^4.2.0",
"@0x/coordinator-server": "^1.0.5",
"@0x/dev-utils": "^3.1.1",
"@0x/migrations": "^6.0.0",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/dev-utils": "^3.1.2",
"@0x/migrations": "^6.0.1",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.4",
"@azure/core-asynciterator-polyfill": "^1.0.0",
@@ -89,16 +89,16 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/asset-swapper": "^4.0.0",
"@0x/base-contract": "^6.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-erc1155": "^2.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-multisig": "^4.0.4",
"@0x/contracts-staking": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/asset-swapper": "^4.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-erc1155": "^2.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-multisig": "^4.0.5",
"@0x/contracts-staking": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "4.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "4.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.0.5 - _February 4, 2020_
* Dependencies updated
## v4.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-multisig",
"version": "4.0.4",
"version": "4.0.5",
"engines": {
"node": ">=6.12"
},
@@ -49,14 +49,14 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
"@0x/utils": "^5.2.0",
@@ -78,7 +78,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/typescript-typings": "^5.0.1",
"ethereum-types": "^3.0.0"
},

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "2.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "2.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.5 - _February 4, 2020_
* Dependencies updated
## v2.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-staking",
"version": "2.0.4",
"version": "2.0.5",
"engines": {
"node": ">=6.12"
},
@@ -53,16 +53,16 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-exchange-libs": "^4.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-utils": "^4.1.0",
"@0x/dev-utils": "^3.1.1",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-exchange-libs": "^4.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-utils": "^4.2.0",
"@0x/dev-utils": "^3.1.2",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -87,8 +87,8 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",
"ethereum-types": "^3.0.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "5.1.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "5.1.1",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.1.2 - _February 4, 2020_
* Dependencies updated
## v5.1.1 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-test-utils",
"version": "5.1.1",
"version": "5.1.2",
"engines": {
"node": ">=6.12"
},
@@ -34,7 +34,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/test-utils/README.md",
"devDependencies": {
"@0x/sol-compiler": "^4.0.4",
"@0x/sol-compiler": "^4.0.5",
"@0x/tslint-config": "^4.0.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -43,15 +43,15 @@
},
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/base-contract": "^6.1.0",
"@0x/contract-addresses": "^4.3.0",
"@0x/dev-utils": "^3.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contract-addresses": "^4.4.0",
"@0x/dev-utils": "^3.1.2",
"@0x/json-schemas": "^5.0.4",
"@0x/order-utils": "^10.1.1",
"@0x/sol-coverage": "^4.0.4",
"@0x/sol-profiler": "^4.0.4",
"@0x/sol-trace": "^3.0.4",
"@0x/subproviders": "^6.0.4",
"@0x/order-utils": "^10.1.2",
"@0x/sol-coverage": "^4.0.5",
"@0x/sol-profiler": "^4.0.5",
"@0x/sol-trace": "^3.0.5",
"@0x/subproviders": "^6.0.5",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,4 +1,14 @@
[
{
"version": "4.2.0",
"changes": [
{
"note": "Update kovan addresses in `DeploymentConstants`",
"pr": 2459
}
],
"timestamp": 1580811564
},
{
"version": "4.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.2.0 - _February 4, 2020_
* Update kovan addresses in `DeploymentConstants` (#2459)
## v4.1.0 - _January 22, 2020_
* Replaced ethers with 0x ABI Encoder for decoding logs. Fixes decoding for arrays/objects. (#2443)

View File

@@ -26,22 +26,30 @@ contract DeploymentConstants {
// address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C;
/// @dev Mainnet address of the KyberNeworkProxy contract.
address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755;
// /// @dev Kovan address of the KyberNeworkProxy contract.
// address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x692f391bCc85cefCe8C237C01e1f636BbD70EA4D;
/// @dev Mainnet address of the `UniswapExchangeFactory` contract.
address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
// /// @dev Kovan address of the `UniswapExchangeFactory` contract.
// address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xD3E51Ef092B2845f10401a0159B2B96e8B6c3D30;
/// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract.
address constant private ETH2DAI_ADDRESS = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e;
// /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract.
// address constant private ETH2DAI_ADDRESS = 0x4A6bC4e803c62081ffEbCc8d227B5a87a58f1F8F ;
/// @dev Mainnet address of the `ERC20BridgeProxy` contract
address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0x8ED95d1746bf1E4dAb58d8ED4724f1Ef95B20Db0;
// /// @dev Kovan address of the `ERC20BridgeProxy` contract
// address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xFb2DD2A1366dE37f7241C83d47DA58fd503E2C64;
///@dev Mainnet address of the `Dai` (multi-collateral) contract
address constant private DAI_ADDRESS = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
// ///@dev Kovan address of the `Dai` (multi-collateral) contract
// address constant private DAI_ADDRESS = 0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa;
/// @dev Mainnet address of the `Chai` contract
address constant private CHAI_ADDRESS = 0x06AF07097C9Eeb7fD685c692751D5C66dB49c215;
/// @dev Mainnet address of the 0x DevUtils contract.
address constant private DEV_UTILS_ADDRESS = 0xcCc2431a7335F21d9268bA62F0B32B0f2EFC463f;
// /// @dev Kovan address of the 0x DevUtils contract.
// address constant private DEV_UTILS_ADDRESS = 0x56A8Da16fd8a65768c97913402212EAB60531BaE;
// address constant private DEV_UTILS_ADDRESS = 0x161793Cdca4fF9E766A706c2C49c36AC1340bbcd;
/// @dev Kyber ETH pseudo-address.
address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
/// @dev Mainnet address of the dYdX contract.

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-utils",
"version": "4.1.0",
"version": "4.2.0",
"engines": {
"node": ">=6.12"
},
@@ -50,12 +50,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
"devDependencies": {
"@0x/abi-gen": "^5.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/dev-utils": "^3.1.1",
"@0x/order-utils": "^10.1.1",
"@0x/sol-compiler": "^4.0.4",
"@0x/abi-gen": "^5.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/dev-utils": "^3.1.2",
"@0x/order-utils": "^10.1.2",
"@0x/sol-compiler": "^4.0.5",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
"@0x/web3-wrapper": "^7.0.4",
@@ -79,7 +79,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",
"bn.js": "^4.11.8",

View File

@@ -1,4 +1,22 @@
[
{
"timestamp": 1580811564,
"version": "9.0.6",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579744659,
"version": "9.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "9.0.4",
"changes": [

View File

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v9.0.6 - _February 4, 2020_
* Dependencies updated
## v9.0.5 - _January 23, 2020_
* Dependencies updated
## v9.0.4 - _January 22, 2020_
* Update exports. (#2432)

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "9.0.4",
"version": "9.0.6",
"engines": {
"node": ">=6.12"
},
@@ -46,9 +46,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/contract-addresses": "^4.3.0",
"@0x/dev-utils": "^3.1.1",
"@0x/migrations": "^6.0.0",
"@0x/contract-addresses": "^4.4.0",
"@0x/dev-utils": "^3.1.2",
"@0x/migrations": "^6.0.1",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@types/lodash": "4.14.104",
@@ -79,11 +79,11 @@
"dependencies": {
"@0x/abi-gen-wrappers": "^5.4.0-beta.3",
"@0x/assert": "^3.0.4",
"@0x/asset-swapper": "^4.0.0",
"@0x/base-contract": "^6.1.0",
"@0x/contract-wrappers": "^13.4.0",
"@0x/order-utils": "^10.1.1",
"@0x/subproviders": "^6.0.4",
"@0x/asset-swapper": "^4.1.0",
"@0x/base-contract": "^6.1.1",
"@0x/contract-wrappers": "^13.4.1",
"@0x/order-utils": "^10.1.2",
"@0x/subproviders": "^6.0.5",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "5.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "5.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v5.1.1 - _February 4, 2020_
* Dependencies updated
## v5.1.0 - _January 22, 2020_
* Catch empty call reverts on live networks. (#2433)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/abi-gen",
"version": "5.1.0",
"version": "5.1.1",
"engines": {
"node": ">=6.12"
},
@@ -81,12 +81,12 @@
},
"devDependencies": {
"@0x/assert": "^3.0.4",
"@0x/base-contract": "^6.1.0",
"@0x/contracts-gen": "^2.0.4",
"@0x/dev-utils": "^3.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-gen": "^2.0.5",
"@0x/dev-utils": "^3.1.2",
"@0x/json-schemas": "^5.0.4",
"@0x/sol-compiler": "^4.0.4",
"@0x/subproviders": "^6.0.4",
"@0x/sol-compiler": "^4.0.5",
"@0x/subproviders": "^6.0.5",
"@0x/tslint-config": "^4.0.0",
"@0x/web3-wrapper": "^7.0.4",
"@types/glob": "5.0.35",

View File

@@ -1,4 +1,28 @@
[
{
"version": "4.1.0",
"changes": [
{
"note": "Allow contract addresses to be passed as optional constructor ags instead of hardcoding",
"pr": 2461
},
{
"note": "Add swap quote liquidity source breakdown",
"pr": 2465
}
],
"timestamp": 1580811564
},
{
"version": "4.0.1",
"changes": [
{
"note": "Fix underestimated protocol fee in worst case quote.",
"pr": 2452
}
],
"timestamp": 1579744659
},
{
"version": "4.0.0",
"changes": [

View File

@@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.1.0 - _February 4, 2020_
* Allow contract addresses to be passed as optional constructor ags instead of hardcoding (#2461)
* Add swap quote liquidity source breakdown (#2465)
## v4.0.1 - _January 23, 2020_
* Fix underestimated protocol fee in worst case quote. (#2452)
## v4.0.0 - _January 22, 2020_
* Upgrade to new `Forwarder` contract with flat affiliate fees. (#2432)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/asset-swapper",
"version": "4.0.0",
"version": "4.1.0",
"engines": {
"node": ">=6.12"
},
@@ -41,23 +41,23 @@
"homepage": "https://0x.org/asset-swapper",
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/contract-addresses": "^4.3.0",
"@0x/contract-wrappers": "^13.4.0",
"@0x/contract-addresses": "^4.4.0",
"@0x/contract-wrappers": "^13.4.1",
"@0x/json-schemas": "^5.0.4",
"@0x/order-utils": "^10.1.1",
"@0x/orderbook": "^2.1.0",
"@0x/order-utils": "^10.1.2",
"@0x/orderbook": "^2.1.1",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",
"heartbeats": "^5.0.1",
"lodash": "^4.17.11"
},
"devDependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/dev-utils": "^3.1.1",
"@0x/base-contract": "^6.1.1",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/dev-utils": "^3.1.2",
"@0x/mesh-rpc-client": "^7.0.4-beta-0xv3",
"@0x/migrations": "^6.0.0",
"@0x/subproviders": "^6.0.4",
"@0x/migrations": "^6.0.1",
"@0x/subproviders": "^6.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",

View File

@@ -1,3 +1,4 @@
export { ContractAddresses } from '@0x/contract-addresses';
export { WSOpts } from '@0x/mesh-rpc-client';
export {
AcceptedRejectedOrders,
@@ -53,6 +54,7 @@ export {
SwapQuoterOpts,
SwapQuoteConsumerError,
SignedOrderWithFillableAmounts,
SwapQuoteOrdersBreakdown,
} from './types';
export {
ERC20BridgeSource,

View File

@@ -42,7 +42,7 @@ export class SwapQuoteConsumer implements SwapQuoteConsumerBase {
const provider = providerUtils.standardizeOrThrow(supportedProvider);
this.provider = provider;
this.chainId = chainId;
this._contractAddresses = getContractAddressesForChainOrThrow(chainId);
this._contractAddresses = options.contractAddresses || getContractAddressesForChainOrThrow(chainId);
this._exchangeConsumer = new ExchangeSwapQuoteConsumer(supportedProvider, this._contractAddresses, options);
this._forwarderConsumer = new ForwarderSwapQuoteConsumer(supportedProvider, this._contractAddresses, options);
}

View File

@@ -159,7 +159,7 @@ export class SwapQuoter {
this.orderbook = orderbook;
this.expiryBufferMs = expiryBufferMs;
this.permittedOrderFeeTypes = permittedOrderFeeTypes;
this._contractAddresses = getContractAddressesForChainOrThrow(chainId);
this._contractAddresses = options.contractAddresses || getContractAddressesForChainOrThrow(chainId);
this._devUtilsContract = new DevUtilsContract(this._contractAddresses.devUtils, provider);
this._protocolFeeUtils = new ProtocolFeeUtils(constants.PROTOCOL_FEE_UTILS_POLLING_INTERVAL_IN_MS);
this._orderStateUtils = new OrderStateUtils(this._devUtilsContract);

View File

@@ -1,3 +1,4 @@
import { ContractAddresses } from '@0x/contract-wrappers';
import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
@@ -87,6 +88,7 @@ export interface SwapQuoteConsumerBase {
*/
export interface SwapQuoteConsumerOpts {
chainId: number;
contractAddresses?: ContractAddresses;
}
/**
@@ -140,6 +142,7 @@ export interface SwapQuoteBase {
orders: SignedOrder[];
bestCaseQuoteInfo: SwapQuoteInfo;
worstCaseQuoteInfo: SwapQuoteInfo;
sourceBreakdown: SwapQuoteOrdersBreakdown;
}
/**
@@ -175,6 +178,13 @@ export interface SwapQuoteInfo {
protocolFeeInWeiAmount: BigNumber;
}
/**
* percentage breakdown of each liquidity source used in quote
*/
export interface SwapQuoteOrdersBreakdown {
[source: string]: BigNumber;
}
/**
* slippagePercentage: The percentage buffer to add to account for slippage. Affects max ETH price estimates. Defaults to 0.2 (20%).
* gasPrice: gas price to determine protocolFee amount, default to ethGasStation fast amount
@@ -198,6 +208,7 @@ export interface SwapQuoterOpts extends OrderPrunerOpts {
chainId: number;
orderRefreshIntervalMs: number;
expiryBufferMs: number;
contractAddresses?: ContractAddresses;
}
/**

View File

@@ -11,7 +11,9 @@ import {
MarketSellSwapQuote,
SignedOrderWithFillableAmounts,
SwapQuote,
SwapQuoteBase,
SwapQuoteInfo,
SwapQuoteOrdersBreakdown,
} from '../types';
import { fillableAmountsUtils } from './fillable_amounts_utils';
@@ -176,7 +178,9 @@ export class SwapQuoteCalculator {
true,
);
const quoteBase = {
const breakdown = this._getSwapQuoteOrdersBreakdown(resultOrders, operation);
const quoteBase: SwapQuoteBase = {
takerAssetData,
makerAssetData,
// Remove fill metadata.
@@ -184,6 +188,7 @@ export class SwapQuoteCalculator {
bestCaseQuoteInfo,
worstCaseQuoteInfo,
gasPrice,
sourceBreakdown: breakdown,
};
if (operation === MarketOperation.Buy) {
@@ -298,7 +303,7 @@ export class SwapQuoteCalculator {
filledOrders.push(order);
}
const protocolFeeInWeiAmount = await this._protocolFeeUtils.calculateWorstCaseProtocolFeeAsync(
filledOrders,
!worstCase ? filledOrders : orders,
gasPrice,
);
return {
@@ -387,7 +392,7 @@ export class SwapQuoteCalculator {
filledOrders.push(order);
}
const protocolFeeInWeiAmount = await this._protocolFeeUtils.calculateWorstCaseProtocolFeeAsync(
filledOrders,
!worstCase ? filledOrders : orders,
gasPrice,
);
return {
@@ -398,6 +403,34 @@ export class SwapQuoteCalculator {
protocolFeeInWeiAmount,
};
}
// tslint:disable-next-line: prefer-function-over-method
private _getSwapQuoteOrdersBreakdown(
orders: OptimizedMarketOrder[],
operation: MarketOperation,
): SwapQuoteOrdersBreakdown {
// HACK: to shut up linter
const breakdown: SwapQuoteOrdersBreakdown = {};
// total asset amount (accounting for slippage protection)
const totalAssetAmount = BigNumber.sum(
...[
constants.ZERO_AMOUNT,
...orders.map(o => (operation === MarketOperation.Buy ? o.makerAssetAmount : o.takerAssetAmount)),
],
);
return orders.reduce((acc: SwapQuoteOrdersBreakdown, order: OptimizedMarketOrder): SwapQuoteOrdersBreakdown => {
const assetAmount = operation === MarketOperation.Buy ? order.makerAssetAmount : order.takerAssetAmount;
const { source } = order.fill;
return {
...acc,
...{
[source]: (!!acc[source] ? acc[source].plus(assetAmount) : assetAmount).dividedBy(totalAssetAmount),
},
};
}, breakdown);
}
}
function getTakerAssetAmountBreakDown(

View File

@@ -98,7 +98,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEELESS,
@@ -117,7 +117,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEELESS,
// baseUnitAmount(10),
@@ -134,7 +134,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_TAKER_ASSET,
@@ -152,7 +152,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_TAKER_ASSET,
@@ -170,7 +170,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_MAKER_ASSET,
@@ -188,7 +188,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_MAKER_ASSET,
@@ -206,7 +206,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// MIXED_TEST_ORDERS,
@@ -224,7 +224,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketSellSwapQuoteAsync(
// MIXED_TEST_ORDERS,
@@ -312,7 +312,7 @@ describe('swapQuoteCalculator', () => {
takerAssetAmount: assetSellAmount,
totalTakerAssetAmount: assetSellAmount,
makerAssetAmount: baseUnitAmount(1.6),
protocolFeeInWeiAmount: baseUnitAmount(15, 4),
protocolFeeInWeiAmount: baseUnitAmount(45, 4),
});
});
it('calculates a correct swapQuote with no slippage (takerAsset denominated fee orders)', async () => {
@@ -391,7 +391,7 @@ describe('swapQuoteCalculator', () => {
takerAssetAmount: assetSellAmount.minus(baseUnitAmount(1.2)),
totalTakerAssetAmount: assetSellAmount,
makerAssetAmount: baseUnitAmount(1.8),
protocolFeeInWeiAmount: baseUnitAmount(15, 4),
protocolFeeInWeiAmount: baseUnitAmount(30, 4),
});
});
it('calculates a correct swapQuote with no slippage (makerAsset denominated fee orders)', async () => {
@@ -472,7 +472,7 @@ describe('swapQuoteCalculator', () => {
takerAssetAmount: assetSellAmount.minus(baseUnitAmount(2)),
totalTakerAssetAmount: assetSellAmount,
makerAssetAmount: baseUnitAmount(0.8),
protocolFeeInWeiAmount: baseUnitAmount(15, 4),
protocolFeeInWeiAmount: baseUnitAmount(45, 4),
});
});
});
@@ -485,7 +485,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEELESS,
@@ -503,7 +503,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEELESS,
@@ -521,7 +521,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_TAKER_ASSET,
@@ -539,7 +539,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_TAKER_ASSET,
@@ -557,7 +557,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_MAKER_ASSET,
@@ -575,7 +575,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// testOrders.SIGNED_ORDERS_WITH_FILLABLE_AMOUNTS_FEE_IN_MAKER_ASSET,
@@ -593,7 +593,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// MIXED_TEST_ORDERS,
@@ -611,7 +611,7 @@ describe('swapQuoteCalculator', () => {
// exchangeAddress: contractAddresses.exchange,
// chainId: TESTRPC_CHAIN_ID,
// });
// const swapQuoteCalculator = new SwapQuoteCalculator(protocolFeeUtils, marketOperationUtils);
// const swapQuoteCalculator = new SwapQuoteCalculator( protocolFeeUtils, marketOperationUtils);
// const errorFunction = async () => {
// await swapQuoteCalculator.calculateMarketBuySwapQuoteAsync(
// MIXED_TEST_ORDERS,

View File

@@ -1,6 +1,7 @@
import { BigNumber } from '@0x/utils';
import * as _ from 'lodash';
import { ERC20BridgeSource } from '../../src';
import { constants } from '../../src/constants';
import { MarketOperation, SignedOrderWithFillableAmounts, SwapQuote } from '../../src/types';
import { ProtocolFeeUtils } from '../../src/utils/protocol_fee_utils';
@@ -26,6 +27,10 @@ export async function getFullyFillableSwapQuoteWithNoFeesAsync(
protocolFeeInWeiAmount: await protocolFeeUtils.calculateWorstCaseProtocolFeeAsync(orders, gasPrice),
};
const breakdown = {
[ERC20BridgeSource.Native]: new BigNumber(1),
};
const quoteBase = {
makerAssetData,
takerAssetData,
@@ -33,6 +38,7 @@ export async function getFullyFillableSwapQuoteWithNoFeesAsync(
gasPrice,
bestCaseQuoteInfo: quoteInfo,
worstCaseQuoteInfo: quoteInfo,
sourceBreakdown: breakdown,
};
if (operation === MarketOperation.Buy) {

View File

@@ -1,4 +1,14 @@
[
{
"version": "6.1.1",
"changes": [
{
"note": "Throw Error when revert is StringRevertError",
"pr": 2453
}
],
"timestamp": 1580811564
},
{
"version": "6.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.1.1 - _February 4, 2020_
* Throw Error when revert is StringRevertError (#2453)
## v6.1.0 - _January 22, 2020_
* Support catching empty reverts on live networks. (#2433)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/base-contract",
"version": "6.1.0",
"version": "6.1.1",
"engines": {
"node": ">=6.12"
},

View File

@@ -142,14 +142,14 @@ export class BaseContract {
let revertError: RevertError;
try {
revertError = decodeThrownErrorAsRevertError(error);
// Re-cast StringRevertErrors as plain Errors for backwards-compatibility.
if (revertError instanceof StringRevertError) {
throw new Error(revertError.values.message as string);
}
} catch (err) {
// Can't decode it.
return;
}
// Re-cast StringRevertErrors as plain Errors for backwards-compatibility.
if (revertError instanceof StringRevertError) {
throw new Error(revertError.values.message as string);
}
throw revertError;
}
protected static _throwIfUnexpectedEmptyCallResult(rawCallResult: string, methodAbi: AbiEncoder.Method): void {

View File

@@ -1,4 +1,14 @@
[
{
"version": "4.4.0",
"changes": [
{
"note": "Update `ERC20BridgeSampler` on mainnet and kovan.",
"pr": 2459
}
],
"timestamp": 1580811564
},
{
"version": "4.3.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.4.0 - _February 4, 2020_
* Update `ERC20BridgeSampler` on mainnet and kovan. (#2459)
## v4.3.0 - _January 22, 2020_
* Update `DevUtils` mainnet, Ropsten, Rinkeby, Kovan addresses with PR#2440 changes (#2446)

View File

@@ -23,7 +23,7 @@
"devUtils": "0x161793cdca4ff9e766a706c2c49c36ac1340bbcd",
"erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
"uniswapBridge": "0x533344cfdf2a3e911e2cf4c6f5ed08e791f5355f",
"erc20BridgeSampler": "0x25840bf3582cb9e5acabbf45148b3092ac3f6b56",
"erc20BridgeSampler": "0x19b883391f61ae82d282a93f829353fdc5920f7f",
"kyberBridge": "0xf342f3a80fdc9b48713d58fe97e17f5cc764ee62",
"eth2DaiBridge": "0xe97ea901d034ba2e018155264f77c417ce7717f9",
"chaiBridge": "0x77c31eba23043b9a72d13470f3a3a311344d7438",
@@ -112,10 +112,10 @@
"staking": "0x32b06d5611a03737a5f1834a24ccd641033fd89c",
"stakingProxy": "0xbab9145f1d57cd4bb0c9aa2d1ece0a5b6e734d34",
"erc20BridgeProxy": "0xfb2dd2a1366de37f7241c83d47da58fd503e2c64",
"uniswapBridge": "0x0000000000000000000000000000000000000000",
"eth2DaiBridge": "0x0000000000000000000000000000000000000000",
"erc20BridgeSampler": "0x8c9f255253bcf2c9539c887fee4d71c69fd035b9",
"kyberBridge": "0x0000000000000000000000000000000000000000",
"uniswapBridge": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568",
"eth2DaiBridge": "0xd5a01c9b4e154d483aa57012a1115613df0032b1",
"erc20BridgeSampler": "0x476898f5aCf513d35d655F8128cE647a6D590094",
"kyberBridge": "0xde7b2747624a647600fdb349184d0448ab954929",
"chaiBridge": "0x0000000000000000000000000000000000000000",
"dydxBridge": "0x0000000000000000000000000000000000000000"
},

View File

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

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers-test",
"version": "12.2.5",
"version": "12.2.6",
"engines": {
"node": ">=6.12"
},
@@ -31,12 +31,12 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contract-wrappers-test/README.md",
"devDependencies": {
"@0x/contract-wrappers": "^13.4.0",
"@0x/contracts-test-utils": "^5.1.1",
"@0x/dev-utils": "^3.1.1",
"@0x/migrations": "^6.0.0",
"@0x/order-utils": "^10.1.1",
"@0x/subproviders": "^6.0.4",
"@0x/contract-wrappers": "^13.4.1",
"@0x/contracts-test-utils": "^5.1.2",
"@0x/dev-utils": "^3.1.2",
"@0x/migrations": "^6.0.1",
"@0x/order-utils": "^10.1.2",
"@0x/subproviders": "^6.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "13.4.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "13.4.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v13.4.1 - _February 4, 2020_
* Dependencies updated
## v13.4.0 - _January 22, 2020_
* Update `DevUtils` wrapper (#2436)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contract-wrappers",
"version": "13.4.0",
"version": "13.4.1",
"engines": {
"node": ">=6.12"
},
@@ -51,8 +51,8 @@
},
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/base-contract": "^6.1.0",
"@0x/contract-addresses": "^4.3.0",
"@0x/base-contract": "^6.1.1",
"@0x/contract-addresses": "^4.4.0",
"@0x/json-schemas": "^5.0.4",
"@0x/types": "^3.1.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "2.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "2.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.0.5 - _February 4, 2020_
* Dependencies updated
## v2.0.4 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/contracts-gen",
"version": "2.0.4",
"version": "2.0.5",
"engines": {
"node": ">=6.12"
},
@@ -27,7 +27,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts-gen/README.md",
"dependencies": {
"@0x/sol-compiler": "^4.0.4",
"@0x/sol-compiler": "^4.0.5",
"@0x/sol-resolver": "^3.0.2",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "3.1.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "3.1.1",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v3.1.2 - _February 4, 2020_
* Dependencies updated
## v3.1.1 - _January 22, 2020_
* Set default `hardfork` option for ganache provider to `"istanbul"` (#2432)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/dev-utils",
"version": "3.1.1",
"version": "3.1.2",
"engines": {
"node": ">=6.12"
},
@@ -46,7 +46,7 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/subproviders": "^6.0.4",
"@0x/subproviders": "^6.0.5",
"@0x/types": "^3.1.1",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/instant",
"version": "1.0.41",
"version": "1.0.43",
"engines": {
"node": ">=6.12"
},
@@ -44,10 +44,10 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/asset-swapper": "^4.0.0",
"@0x/contract-wrappers": "^13.4.0",
"@0x/asset-swapper": "^4.1.0",
"@0x/contract-wrappers": "^13.4.1",
"@0x/json-schemas": "^5.0.4",
"@0x/subproviders": "^6.0.4",
"@0x/subproviders": "^6.0.5",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",
"babel-runtime": "^6.26.0",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "6.0.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "6.0.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v6.0.1 - _February 4, 2020_
* Dependencies updated
## v6.0.0 - _January 22, 2020_
* Update Forwarder deployment (#2432)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/migrations",
"version": "6.0.0",
"version": "6.0.1",
"engines": {
"node": ">=6.12"
},
@@ -43,7 +43,7 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/dev-utils": "^3.1.1",
"@0x/dev-utils": "^3.1.2",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -61,24 +61,24 @@
"yargs": "^10.0.3"
},
"dependencies": {
"@0x/base-contract": "^6.1.0",
"@0x/contract-addresses": "^4.3.0",
"@0x/base-contract": "^6.1.1",
"@0x/contract-addresses": "^4.4.0",
"@0x/contract-artifacts": "^3.4.0",
"@0x/contract-wrappers": "^13.4.0",
"@0x/contracts-asset-proxy": "^3.1.1",
"@0x/contracts-coordinator": "^3.0.4",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-erc1155": "^2.0.4",
"@0x/contracts-erc20": "^3.0.4",
"@0x/contracts-erc721": "^3.0.4",
"@0x/contracts-exchange": "^3.1.0",
"@0x/contracts-exchange-forwarder": "^4.0.4",
"@0x/contracts-extensions": "^5.1.3",
"@0x/contracts-multisig": "^4.0.4",
"@0x/contracts-staking": "^2.0.4",
"@0x/contracts-utils": "^4.1.0",
"@0x/sol-compiler": "^4.0.4",
"@0x/subproviders": "^6.0.4",
"@0x/contract-wrappers": "^13.4.1",
"@0x/contracts-asset-proxy": "^3.1.2",
"@0x/contracts-coordinator": "^3.0.5",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/contracts-erc1155": "^2.0.5",
"@0x/contracts-erc20": "^3.0.5",
"@0x/contracts-erc721": "^3.0.5",
"@0x/contracts-exchange": "^3.1.1",
"@0x/contracts-exchange-forwarder": "^4.0.5",
"@0x/contracts-extensions": "^5.1.4",
"@0x/contracts-multisig": "^4.0.5",
"@0x/contracts-staking": "^2.0.5",
"@0x/contracts-utils": "^4.2.0",
"@0x/sol-compiler": "^4.0.5",
"@0x/subproviders": "^6.0.5",
"@0x/typescript-typings": "^5.0.1",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0x/monorepo-scripts",
"version": "1.0.47",
"version": "1.0.48",
"engines": {
"node": ">=6.12"
},

View File

@@ -46,6 +46,9 @@ function logIfDefined(x: any): void {
}
}
// tslint:disable-next-line:custom-no-magic-numbers
const FIVE_MB = 1024 * 1024 * 5;
(async () => {
const IS_LOCAL_PUBLISH = process.env.IS_LOCAL_PUBLISH === 'true';
const registry = IS_LOCAL_PUBLISH ? 'http://localhost:4873/' : 'https://registry.npmjs.org/';
@@ -125,6 +128,7 @@ async function testInstallPackageAsync(
utils.log(`Installing ${packageName}@${lastChangelogVersion}`);
await execAsync(`npm install --save ${packageName}@${lastChangelogVersion} --registry=${registry}`, {
cwd: testDirectory,
maxBuffer: FIVE_MB,
});
const indexFilePath = path.join(testDirectory, 'index.ts');
await writeFileAsync(indexFilePath, `import * as Package from '${packageName}';\nconsole.log(Package);\n`);
@@ -152,9 +156,7 @@ async function testInstallPackageAsync(
if (!isUnrunnablePkg) {
const transpiledIndexFilePath = path.join(testDirectory, 'index.js');
utils.log(`Running test script with ${packageName} imported`);
// tslint:disable-next-line:custom-no-magic-numbers
const fiveMb = 1024 * 1024 * 5;
await execAsync(`node ${transpiledIndexFilePath}`, { maxBuffer: fiveMb });
await execAsync(`node ${transpiledIndexFilePath}`, { maxBuffer: FIVE_MB });
utils.log(`Successfully ran test script with ${packageName} imported`);
}
await rimrafAsync(testDirectory);

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "10.1.2",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "10.1.1",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v10.1.2 - _February 4, 2020_
* Dependencies updated
## v10.1.1 - _January 22, 2020_
* Dependencies updated

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/order-utils",
"version": "10.1.1",
"version": "10.1.2",
"engines": {
"node": ">=6.12"
},
@@ -39,8 +39,8 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
"devDependencies": {
"@0x/dev-utils": "^3.1.1",
"@0x/subproviders": "^6.0.4",
"@0x/dev-utils": "^3.1.2",
"@0x/subproviders": "^6.0.5",
"@0x/ts-doc-gen": "^0.0.22",
"@0x/tslint-config": "^4.0.0",
"@0x/types": "^3.1.1",
@@ -64,7 +64,7 @@
},
"dependencies": {
"@0x/assert": "^3.0.4",
"@0x/contract-wrappers": "^13.4.0",
"@0x/contract-wrappers": "^13.4.1",
"@0x/json-schemas": "^5.0.4",
"@0x/utils": "^5.2.0",
"@0x/web3-wrapper": "^7.0.4",

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "2.1.1",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"version": "2.1.0",
"changes": [

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v2.1.1 - _February 4, 2020_
* Dependencies updated
## v2.1.0 - _January 22, 2020_
* Added `getBatchOrdersAsync` for fetching batches of orders (#2427)

View File

@@ -1,6 +1,6 @@
{
"name": "@0x/orderbook",
"version": "2.1.0",
"version": "2.1.1",
"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.4",
"@0x/connect": "^6.0.4",
"@0x/contracts-dev-utils": "^1.0.4",
"@0x/contracts-dev-utils": "^1.0.5",
"@0x/mesh-rpc-client": "^7.0.4-beta-0xv3",
"@0x/order-utils": "^10.1.1",
"@0x/order-utils": "^10.1.2",
"@0x/utils": "^5.2.0"
}
}

View File

@@ -1,4 +1,13 @@
[
{
"timestamp": 1580811564,
"version": "4.0.5",
"changes": [
{
"note": "Dependencies updated"
}
]
},
{
"timestamp": 1579682890,
"version": "4.0.4",

View File

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
## v4.0.5 - _February 4, 2020_
* Dependencies updated
## v4.0.4 - _January 22, 2020_
* Dependencies updated

Some files were not shown because too many files have changed in this diff Show More