diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-02-07 03:45:55 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-02-07 03:45:55 +0800 |
| commit | 5fcb77e591c612be8beef1a3761132e053eaf8f3 (patch) | |
| tree | 824de6de4d114c9cb2b3aa3d0633fa6791a6ff71 /packages/0x.js | |
| parent | 83d0bad3a1e6635dedb46fbd99ee1bec5246d4bf (diff) | |
| parent | 629653425da973df0ac5d21d11da5a61c3a31e09 (diff) | |
| download | dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar.gz dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar.bz2 dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar.lz dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar.xz dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.tar.zst dexon-sol-tools-5fcb77e591c612be8beef1a3761132e053eaf8f3.zip | |
Merge branch 'development' into feature/testnet-faucets/order-dispenser
* development:
Update utils in top level package to 0.3.0
Add 0.2.0 back to yarn lock
Reword comment on any
Link to the wiki article in the README
Justify the any usage
Publish
Revert "Temp"
Changelog
Change the InjectedWeb3Subprovider to accept Web3.Provider
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 20 | ||||
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 1 |
2 files changed, 10 insertions, 11 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index a967cea16..013b4ae6e 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.31.1", + "version": "0.32.0", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -42,9 +42,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.1.6", - "@0xproject/dev-utils": "^0.0.9", - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/abi-gen": "^0.1.7", + "@0xproject/dev-utils": "^0.0.10", + "@0xproject/tslint-config": "^0.4.7", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.86", @@ -76,15 +76,15 @@ "typedoc": "~0.8.0", "typescript": "2.7.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.9.8", + "web3-typescript-typings": "^0.9.9", "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.0.15", - "@0xproject/json-schemas": "^0.7.7", - "@0xproject/types": "^0.1.8", - "@0xproject/utils": "^0.2.4", - "@0xproject/web3-wrapper": "^0.1.9", + "@0xproject/assert": "^0.0.16", + "@0xproject/json-schemas": "^0.7.8", + "@0xproject/types": "^0.1.9", + "@0xproject/utils": "^0.3.0", + "@0xproject/web3-wrapper": "^0.1.10", "bintrees": "^1.0.2", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts index 2fbf8c32d..d913e8d9b 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -196,7 +196,6 @@ export class ContractWrapper { } private async _reconcileBlockAsync(): Promise<void> { const latestBlock = await this._web3Wrapper.getBlockAsync(BlockParamLiteral.Latest); - console.log('latestBlock', latestBlock.number); // We need to coerce to Block type cause Web3.Block includes types for mempool blocks if (!_.isUndefined(this._blockAndLogStreamerIfExists)) { // If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined |