aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/0x.js/CHANGELOG.md5
-rw-r--r--packages/0x.js/package.json24
-rw-r--r--packages/0x.js/src/contract_wrappers/exchange_wrapper.ts6
-rw-r--r--packages/0x.js/test/exchange_wrapper_test.ts33
-rw-r--r--packages/abi-gen/package.json8
-rw-r--r--packages/assert/package.json10
-rw-r--r--packages/chai-as-promised-typescript-typings/package.json2
-rw-r--r--packages/chai-typescript-typings/package.json2
-rw-r--r--packages/connect/CHANGELOG.md4
-rw-r--r--packages/connect/package.json16
-rw-r--r--packages/contracts/package.json22
-rw-r--r--packages/dev-utils/package.json6
-rw-r--r--packages/json-schemas/package.json8
-rw-r--r--packages/kovan-faucets/package.json10
-rw-r--r--packages/monorepo-scripts/package.json4
-rw-r--r--packages/subproviders/package.json14
-rw-r--r--packages/tslint-config/package.json2
-rw-r--r--packages/types/package.json6
-rw-r--r--packages/utils/CHANGELOG.md2
-rw-r--r--packages/utils/package.json4
-rw-r--r--packages/web3-typescript-typings/CHANGELOG.md1
-rw-r--r--packages/web3-typescript-typings/index.d.ts2
-rw-r--r--packages/web3-typescript-typings/package.json2
-rw-r--r--packages/web3-wrapper/package.json10
-rw-r--r--packages/website/package.json10
25 files changed, 124 insertions, 89 deletions
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index ab2537879..84997389a 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,9 +1,10 @@
# CHANGELOG
-## v0.x.x - _TBD, 2018_
+## v0.30.0 - _January 17, 2018_
* Add an error parameter to the order watcher callback (#312)
- * Fix the bug making it impossible to catch some errors from awaitTransactionMinedAsync (#312)
+ * Fix a bug making it impossible to catch some errors from awaitTransactionMinedAsync (#312)
+ * Fix a bug in fillOrdersUpTo validation making it impossible to fill up to if user doesn't have enough balance to fully fill all the orders (#321)
## v0.29.1 - _January 11, 2018_
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index f9b92f21b..1405e1bf7 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "0.29.2",
+ "version": "0.30.0",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": ["0x.js", "0xproject", "ethereum", "tokens", "exchange"],
"main": "lib/src/index.js",
@@ -38,10 +38,10 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0xproject/abi-gen": "^0.1.1",
- "@0xproject/dev-utils": "^0.0.4",
- "@0xproject/tslint-config": "^0.4.1",
- "@0xproject/types": "^0.1.3",
+ "@0xproject/abi-gen": "^0.1.2",
+ "@0xproject/dev-utils": "^0.0.5",
+ "@0xproject/tslint-config": "^0.4.2",
+ "@0xproject/types": "^0.1.4",
"@types/bintrees": "^1.0.2",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "^4.14.86",
@@ -52,9 +52,9 @@
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
- "chai-as-promised-typescript-typings": "^0.0.3",
+ "chai-as-promised-typescript-typings": "^0.0.4",
"chai-bignumber": "^2.0.1",
- "chai-typescript-typings": "^0.0.1",
+ "chai-typescript-typings": "^0.0.2",
"copyfiles": "^1.2.0",
"coveralls": "^3.0.0",
"dirty-chai": "^2.0.1",
@@ -73,14 +73,14 @@
"typedoc": "~0.8.0",
"typescript": "~2.6.1",
"web3-provider-engine": "^13.0.1",
- "web3-typescript-typings": "^0.9.3",
+ "web3-typescript-typings": "^0.9.4",
"webpack": "^3.1.0"
},
"dependencies": {
- "@0xproject/assert": "^0.0.10",
- "@0xproject/json-schemas": "^0.7.2",
- "@0xproject/utils": "^0.1.3",
- "@0xproject/web3-wrapper": "^0.1.4",
+ "@0xproject/assert": "^0.0.11",
+ "@0xproject/json-schemas": "^0.7.3",
+ "@0xproject/utils": "^0.2.0",
+ "@0xproject/web3-wrapper": "^0.1.5",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index e1d80e01a..be88cdb20 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -258,16 +258,18 @@ export class ExchangeWrapper extends ContractWrapper {
? SHOULD_VALIDATE_BY_DEFAULT
: orderTransactionOpts.shouldValidate;
if (shouldValidate) {
+ let filledTakerTokenAmount = new BigNumber(0);
const zrxTokenAddress = this.getZRXTokenAddress();
const exchangeTradeEmulator = new ExchangeTransferSimulator(this._tokenWrapper, BlockParamLiteral.Latest);
for (const signedOrder of signedOrders) {
- await this._orderValidationUtils.validateFillOrderThrowIfInvalidAsync(
+ const singleFilledTakerTokenAmount = await this._orderValidationUtils.validateFillOrderThrowIfInvalidAsync(
exchangeTradeEmulator,
signedOrder,
- fillTakerTokenAmount,
+ fillTakerTokenAmount.minus(filledTakerTokenAmount),
takerAddress,
zrxTokenAddress,
);
+ filledTakerTokenAmount = filledTakerTokenAmount.plus(singleFilledTakerTokenAmount);
}
}
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts
index 39a5be61d..d2a2149a0 100644
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -536,7 +536,7 @@ describe('ExchangeWrapper', () => {
),
).to.be.rejectedWith(ExchangeContractErrs.BatchOrdersMustHaveAtLeastOneItem);
});
- it('should successfully fill up to specified amount', async () => {
+ it('should successfully fill up to specified amount when all orders are fully funded', async () => {
const txHash = await zeroEx.exchange.fillOrdersUpToAsync(
signedOrders,
fillUpToAmount,
@@ -550,6 +550,37 @@ describe('ExchangeWrapper', () => {
const remainingFillAmount = fillableAmount.minus(1);
expect(anotherFilledAmount).to.be.bignumber.equal(remainingFillAmount);
});
+ it('should successfully fill up to specified amount even if filling all orders would fail', async () => {
+ const missingBalance = new BigNumber(1); // User will still have enough balance to fill up to 9,
+ // but won't have 10 to fully fill all orders in a batch.
+ await zeroEx.token.transferAsync(makerTokenAddress, makerAddress, coinbase, missingBalance);
+ const txHash = await zeroEx.exchange.fillOrdersUpToAsync(
+ signedOrders,
+ fillUpToAmount,
+ shouldThrowOnInsufficientBalanceOrAllowance,
+ takerAddress,
+ );
+ await zeroEx.awaitTransactionMinedAsync(txHash);
+ const filledAmount = await zeroEx.exchange.getFilledTakerAmountAsync(signedOrderHashHex);
+ const anotherFilledAmount = await zeroEx.exchange.getFilledTakerAmountAsync(anotherOrderHashHex);
+ expect(filledAmount).to.be.bignumber.equal(fillableAmount);
+ const remainingFillAmount = fillableAmount.minus(1);
+ expect(anotherFilledAmount).to.be.bignumber.equal(remainingFillAmount);
+ });
+ });
+ describe('failed batch fills', () => {
+ it("should fail validation if user doesn't have enough balance without fill up to", async () => {
+ const missingBalance = new BigNumber(2); // User will only have enough balance to fill up to 8
+ await zeroEx.token.transferAsync(makerTokenAddress, makerAddress, coinbase, missingBalance);
+ return expect(
+ zeroEx.exchange.fillOrdersUpToAsync(
+ signedOrders,
+ fillUpToAmount,
+ shouldThrowOnInsufficientBalanceOrAllowance,
+ takerAddress,
+ ),
+ ).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance);
+ });
});
describe('order transaction options', () => {
const emptyFillUpToAmount = new BigNumber(0);
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index 05f7a8778..87364c73e 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "Generate contract wrappers from ABI and handlebars templates",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -22,7 +22,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md",
"dependencies": {
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/utils": "^0.2.0",
"chalk": "^2.3.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
@@ -33,7 +33,7 @@
"yargs": "^10.0.3"
},
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/glob": "^5.0.33",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
@@ -43,6 +43,6 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3"
+ "web3-typescript-typings": "^0.9.4"
}
}
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 2d5165e3d..5d1f9b4d2 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
- "version": "0.0.10",
+ "version": "0.0.11",
"description": "Provides a standard way of performing type and schema validation across 0x projects",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -23,12 +23,12 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
"chai": "^4.0.1",
- "chai-typescript-typings": "^0.0.1",
+ "chai-typescript-typings": "^0.0.2",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
@@ -37,8 +37,8 @@
"typescript": "~2.6.1"
},
"dependencies": {
- "@0xproject/json-schemas": "^0.7.2",
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/json-schemas": "^0.7.3",
+ "@0xproject/utils": "^0.2.0",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
}
diff --git a/packages/chai-as-promised-typescript-typings/package.json b/packages/chai-as-promised-typescript-typings/package.json
index 6ef4184b0..8c5314be5 100644
--- a/packages/chai-as-promised-typescript-typings/package.json
+++ b/packages/chai-as-promised-typescript-typings/package.json
@@ -1,6 +1,6 @@
{
"name": "chai-as-promised-typescript-typings",
- "version": "0.0.3",
+ "version": "0.0.4",
"description": "Typescript type definitions for chai-as-promised",
"main": "index.d.ts",
"types": "index.d.ts",
diff --git a/packages/chai-typescript-typings/package.json b/packages/chai-typescript-typings/package.json
index 71040b554..db7cba863 100644
--- a/packages/chai-typescript-typings/package.json
+++ b/packages/chai-typescript-typings/package.json
@@ -1,6 +1,6 @@
{
"name": "chai-typescript-typings",
- "version": "0.0.1",
+ "version": "0.0.2",
"description": "Typescript type definitions for chai",
"main": "index.d.ts",
"types": "index.d.ts",
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index d8e99b5d3..e02020204 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -1,12 +1,12 @@
# CHANGELOG
-## v0.x.x - _TBD, 2017_
+## v0.5.0 - _January 17, 2018_
* Sanitize api endpoint url and remove trailing slashes (#318)
* Improve error message text in HttpClient (#318)
* Stop appending '/v0' to api endpoint url in HttpClient (#318)
-## v0.4.0 - _January 11, 2017_
+## v0.4.0 - _January 11, 2018_
* Prevent getFeesAsync method on HttpClient from mutating input (#296)
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 4ca9e65a2..45a01b475 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
- "version": "0.4.1",
+ "version": "0.5.0",
"description": "A javascript library for interacting with the standard relayer api",
"keywords": ["connect", "0xproject", "ethereum", "tokens", "exchange"],
"main": "lib/src/index.js",
@@ -31,16 +31,16 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md",
"dependencies": {
- "@0xproject/assert": "^0.0.10",
- "@0xproject/json-schemas": "^0.7.2",
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/assert": "^0.0.11",
+ "@0xproject/json-schemas": "^0.7.3",
+ "@0xproject/utils": "^0.2.0",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"websocket": "^1.0.25"
},
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/fetch-mock": "^5.12.1",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
@@ -48,8 +48,8 @@
"@types/websocket": "^0.0.34",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
- "chai-as-promised-typescript-typings": "^0.0.3",
- "chai-typescript-typings": "^0.0.1",
+ "chai-as-promised-typescript-typings": "^0.0.4",
+ "chai-typescript-typings": "^0.0.2",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"fetch-mock": "^5.13.1",
@@ -59,6 +59,6 @@
"tslint": "5.8.0",
"typedoc": "~0.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3"
+ "web3-typescript-typings": "^0.9.4"
}
}
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index d184410ca..1cf716f92 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "contracts",
- "version": "2.1.3",
+ "version": "2.1.4",
"description": "Smart contract components of 0x protocol",
"main": "index.js",
"directories": {
@@ -31,9 +31,9 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
"devDependencies": {
- "@0xproject/dev-utils": "^0.0.4",
- "@0xproject/tslint-config": "^0.4.1",
- "@0xproject/types": "^0.1.3",
+ "@0xproject/dev-utils": "^0.0.5",
+ "@0xproject/tslint-config": "^0.4.2",
+ "@0xproject/types": "^0.1.4",
"@types/bluebird": "^3.5.3",
"@types/lodash": "^4.14.86",
"@types/node": "^8.0.53",
@@ -41,9 +41,9 @@
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
- "chai-as-promised-typescript-typings": "^0.0.3",
+ "chai-as-promised-typescript-typings": "^0.0.4",
"chai-bignumber": "^2.0.1",
- "chai-typescript-typings": "^0.0.1",
+ "chai-typescript-typings": "^0.0.2",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
@@ -53,14 +53,14 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3",
+ "web3-typescript-typings": "^0.9.4",
"yargs": "^10.0.3"
},
"dependencies": {
- "0x.js": "^0.29.2",
- "@0xproject/json-schemas": "^0.7.2",
- "@0xproject/utils": "^0.1.3",
- "@0xproject/web3-wrapper": "^0.1.4",
+ "0x.js": "^0.30.0",
+ "@0xproject/json-schemas": "^0.7.3",
+ "@0xproject/utils": "^0.2.0",
+ "@0xproject/web3-wrapper": "^0.1.5",
"bluebird": "^3.5.0",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 44a78c1b1..4a68dc2d4 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
- "version": "0.0.4",
+ "version": "0.0.5",
"description": "0x dev TS utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -19,7 +19,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -29,7 +29,7 @@
"typescript": "~2.6.1"
},
"dependencies": {
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/utils": "^0.2.0",
"ethereumjs-util": "^5.1.2",
"lodash": "^4.17.4",
"request-promise-native": "^1.0.5"
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index ae2a54f5e..0f2fd156a 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/json-schemas",
- "version": "0.7.2",
+ "version": "0.7.3",
"description": "0x-related json schemas",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -27,13 +27,13 @@
"lodash.values": "^4.3.0"
},
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/tslint-config": "^0.4.2",
+ "@0xproject/utils": "^0.2.0",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
- "chai-typescript-typings": "^0.0.1",
+ "chai-typescript-typings": "^0.0.2",
"dirty-chai": "^2.0.1",
"lodash.foreach": "^4.5.0",
"mocha": "^4.0.1",
diff --git a/packages/kovan-faucets/package.json b/packages/kovan-faucets/package.json
index bb5106496..eab0dc677 100644
--- a/packages/kovan-faucets/package.json
+++ b/packages/kovan-faucets/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/kovan_faucets",
- "version": "1.0.4",
+ "version": "1.0.5",
"description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
"main": "server.js",
"scripts": {
@@ -14,8 +14,8 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.29.2",
- "@0xproject/utils": "^0.1.3",
+ "0x.js": "^0.30.0",
+ "@0xproject/utils": "^0.2.0",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.3",
"express": "^4.15.2",
@@ -25,7 +25,7 @@
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.86",
@@ -36,7 +36,7 @@
"source-map-loader": "^0.1.6",
"tslint": "5.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3",
+ "web3-typescript-typings": "^0.9.4",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
}
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 77a3ad3ce..6a62e22dd 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/monorepo-scripts",
- "version": "0.1.3",
+ "version": "0.1.4",
"private": true,
"description": "Helper scripts for the monorepo",
"scripts": {
@@ -19,7 +19,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/glob": "^5.0.33",
"@types/node": "^8.0.53",
"shx": "^0.2.2",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 9aff386b0..05464a11e 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
- "version": "0.3.0",
+ "version": "0.3.1",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"license": "Apache-2.0",
@@ -17,8 +17,8 @@
"test:integration": "run-s clean build run_mocha_integration"
},
"dependencies": {
- "@0xproject/assert": "^0.0.10",
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/assert": "^0.0.11",
+ "@0xproject/utils": "^0.2.0",
"bn.js": "^4.11.8",
"es6-promisify": "^5.0.0",
"ethereumjs-tx": "^1.3.3",
@@ -31,16 +31,16 @@
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/tslint-config": "^0.4.2",
+ "@0xproject/utils": "^0.2.0",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
- "chai-as-promised-typescript-typings": "^0.0.3",
- "chai-typescript-typings": "^0.0.1",
+ "chai-as-promised-typescript-typings": "^0.0.4",
+ "chai-typescript-typings": "^0.0.2",
"dirty-chai": "^2.0.1",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 06caadfd4..a53a8ab8a 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
- "version": "0.4.1",
+ "version": "0.4.2",
"description": "Lint rules related to 0xProject for TSLint",
"main": "tslint.json",
"scripts": {
diff --git a/packages/types/package.json b/packages/types/package.json
index 4ef7f1b23..ef8c29c7c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/types",
- "version": "0.1.3",
+ "version": "0.1.4",
"description": "0x types",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -19,13 +19,13 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/types/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "~2.6.1"
},
"dependencies": {
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/utils": "^0.2.0",
"web3": "^0.20.0"
}
}
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index e77a7fa03..efee30dd1 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -1,6 +1,6 @@
# CHANGELOG
-## vx.x.x
+## v0.2.0 - _January 17, 2018_
* Add `onError` parameter to `intervalUtils.setAsyncExcludingInterval` (#312)
* Add `intervalUtils.setInterval` (#312)
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 11a0dbcb0..7cc58c35b 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
- "version": "0.1.3",
+ "version": "0.2.0",
"description": "0x TS utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -19,7 +19,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
+ "@0xproject/tslint-config": "^0.4.2",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
diff --git a/packages/web3-typescript-typings/CHANGELOG.md b/packages/web3-typescript-typings/CHANGELOG.md
index e77b6e113..46f70d864 100644
--- a/packages/web3-typescript-typings/CHANGELOG.md
+++ b/packages/web3-typescript-typings/CHANGELOG.md
@@ -3,3 +3,4 @@
## v0.9.3 - _January 11, 2018_
* Add type for getData on a contract
+* Fixed the `defaultAccount` not allowing for `undefined` value (#320)
diff --git a/packages/web3-typescript-typings/index.d.ts b/packages/web3-typescript-typings/index.d.ts
index b4fc146b3..ff379cb3d 100644
--- a/packages/web3-typescript-typings/index.d.ts
+++ b/packages/web3-typescript-typings/index.d.ts
@@ -170,7 +170,7 @@ declare module 'web3' {
gasPrice: BigNumber.BigNumber;
accounts: string[];
blockNumber: number;
- defaultAccount: string;
+ defaultAccount?: string;
defaultBlock: Web3.BlockParam;
syncing: Web3.SyncingResult;
compile: {
diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json
index c16e9ac31..5bf357566 100644
--- a/packages/web3-typescript-typings/package.json
+++ b/packages/web3-typescript-typings/package.json
@@ -1,6 +1,6 @@
{
"name": "web3-typescript-typings",
- "version": "0.9.3",
+ "version": "0.9.4",
"description": "Typescript type definitions for web3",
"main": "index.d.ts",
"types": "index.d.ts",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 8c20f3f2e..f2802bfbf 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/web3-wrapper",
- "version": "0.1.4",
+ "version": "0.1.5",
"description": "Wraps around web3 and gives a nicer interface",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -19,17 +19,17 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
"devDependencies": {
- "@0xproject/tslint-config": "^0.4.1",
- "@0xproject/types": "^0.1.3",
+ "@0xproject/tslint-config": "^0.4.2",
+ "@0xproject/types": "^0.1.4",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3"
+ "web3-typescript-typings": "^0.9.4"
},
"dependencies": {
- "@0xproject/utils": "^0.1.3",
+ "@0xproject/utils": "^0.2.0",
"lodash": "^4.17.4",
"web3": "^0.20.0"
}
diff --git a/packages/website/package.json b/packages/website/package.json
index 83733f060..7d0f775d4 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.6",
+ "version": "0.0.7",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -21,9 +21,9 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.29.2",
- "@0xproject/subproviders": "^0.3.0",
- "@0xproject/utils": "^0.1.3",
+ "0x.js": "^0.30.0",
+ "@0xproject/subproviders": "^0.3.1",
+ "@0xproject/utils": "^0.2.0",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -101,7 +101,7 @@
"style-loader": "0.13.x",
"tslint": "5.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.9.3",
+ "web3-typescript-typings": "^0.9.4",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 22:00:37 +0800