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 | |
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
28 files changed, 92 insertions, 163 deletions
diff --git a/package.json b/package.json index 290b56444..4bc8dc0f8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" }, "devDependencies": { - "@0xproject/utils": "^0.2.0", + "@0xproject/utils": "^0.3.0", "async-child-process": "^1.1.1", "ethereumjs-testrpc": "^6.0.3", "lerna": "^2.5.1", 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 diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index e6173e182..10bd7e712 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/abi-gen", - "version": "0.1.6", + "version": "0.1.7", "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md", "dependencies": { - "@0xproject/utils": "^0.2.4", + "@0xproject/utils": "^0.3.0", "chalk": "^2.3.0", "glob": "^7.1.2", "handlebars": "^4.0.11", @@ -34,7 +34,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/tslint-config": "^0.4.7", "@types/glob": "^5.0.33", "@types/handlebars": "^4.0.36", "@types/mkdirp": "^0.5.1", @@ -44,6 +44,6 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" } } diff --git a/packages/assert/package.json b/packages/assert/package.json index dbee56d8b..b8da740d6 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.0.15", + "version": "0.0.16", "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", @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/tslint-config": "^0.4.7", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", @@ -38,8 +38,8 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/json-schemas": "^0.7.7", - "@0xproject/utils": "^0.2.4", + "@0xproject/json-schemas": "^0.7.8", + "@0xproject/utils": "^0.3.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" } diff --git a/packages/connect/package.json b/packages/connect/package.json index d1f54f000..d892e2d04 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/connect", - "version": "0.5.4", + "version": "0.5.5", "description": "A javascript library for interacting with the standard relayer api", "keywords": [ "connect", @@ -37,16 +37,16 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^0.0.15", - "@0xproject/json-schemas": "^0.7.7", - "@0xproject/utils": "^0.2.4", + "@0xproject/assert": "^0.0.16", + "@0xproject/json-schemas": "^0.7.8", + "@0xproject/utils": "^0.3.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.6", + "@0xproject/tslint-config": "^0.4.7", "@types/fetch-mock": "^5.12.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", @@ -65,6 +65,6 @@ "tslint": "5.8.0", "typedoc": "~0.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" } } diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b3b08fe29..b4074193d 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "contracts", - "version": "2.1.8", + "version": "2.1.9", "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { @@ -32,9 +32,9 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.0.9", - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/types": "^0.1.8", + "@0xproject/dev-utils": "^0.0.10", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/types": "^0.1.9", "@types/bluebird": "^3.5.3", "@types/lodash": "^4.14.86", "@types/node": "^8.0.53", @@ -54,15 +54,15 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8", + "web3-typescript-typings": "^0.9.9", "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.31.1", - "@0xproject/deployer": "^0.0.5", - "@0xproject/json-schemas": "^0.7.7", - "@0xproject/utils": "^0.2.4", - "@0xproject/web3-wrapper": "^0.1.9", + "0x.js": "^0.32.0", + "@0xproject/deployer": "^0.0.6", + "@0xproject/json-schemas": "^0.7.8", + "@0xproject/utils": "^0.3.0", + "@0xproject/web3-wrapper": "^0.1.10", "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 1a9495d24..49e0ec26a 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/deployer", - "version": "0.0.5", + "version": "0.0.6", "description": "Smart contract deployer of 0x protocol", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -31,11 +31,11 @@ "copyfiles": "^1.2.0", "types-bn": "^0.0.1", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" }, "dependencies": { - "@0xproject/utils": "^0.2.4", - "@0xproject/web3-wrapper": "^0.1.9", + "@0xproject/utils": "^0.3.0", + "@0xproject/web3-wrapper": "^0.1.10", "lodash": "^4.17.4", "solc": "^0.4.18", "web3": "^0.20.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index fca082583..2a1fe26f2 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/dev-utils", - "version": "0.0.9", + "version": "0.0.10", "description": "0x dev TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,8 +20,8 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/types": "^0.1.8", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/types": "^0.1.9", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -31,7 +31,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/utils": "^0.2.4", + "@0xproject/utils": "^0.3.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 f7a291ec2..02a8c1994 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "0.7.7", + "version": "0.7.8", "description": "0x-related json schemas", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -28,8 +28,8 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/utils": "^0.2.4", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/utils": "^0.3.0", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/long-lived-subscriptions-test/Dockerfile b/packages/long-lived-subscriptions-test/Dockerfile deleted file mode 100644 index 47d24ec08..000000000 --- a/packages/long-lived-subscriptions-test/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node - -WORKDIR /src - -COPY package.json . -RUN yarn install - -COPY . . - -CMD ["./lib/index.js"] diff --git a/packages/long-lived-subscriptions-test/package.json b/packages/long-lived-subscriptions-test/package.json deleted file mode 100644 index ec45d631a..000000000 --- a/packages/long-lived-subscriptions-test/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "long-lived-subscriptions-test", - "version": "0.0.1", - "description": "", - "scripts": { - "build:watch": "tsc -w", - "build": "tsc", - "start": "node lib/index.js", - "clean": "shx rm -rf lib", - "lint": "tslint --project . 'src/**/*.ts'" - }, - "dependencies": { - "0x.js": "^0.31.1", - "lodash": "^4.17.4", - "web3": "^0.20.0" - }, - "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@types/lodash": "^4.14.86", - "shx": "^0.2.2", - "tslint": "5.8.0", - "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" - } -} diff --git a/packages/long-lived-subscriptions-test/src/index.ts b/packages/long-lived-subscriptions-test/src/index.ts deleted file mode 100644 index 2d79dcc89..000000000 --- a/packages/long-lived-subscriptions-test/src/index.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { DecodedLogEvent, ExchangeEvents, LogFillContractEventArgs, ZeroEx } from '0x.js'; -import * as _ from 'lodash'; -import * as Web3 from 'web3'; - -const zeroExConfig = { - networkId: 1, -}; - -const RPC_URL = 'https://mainnet.infura.io/T5WSC8cautR4KXyYgsRs'; -// const RPC_URL = 'https://mainnet.0xproject.com'; - -const web3 = new Web3(new Web3.providers.HttpProvider(RPC_URL)); -const zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig); - -const subscribe = () => { - console.log('subscribing...'); - zeroEx.exchange.subscribe<LogFillContractEventArgs>( - ExchangeEvents.LogFill, - {}, - (err: Error | null, event?: DecodedLogEvent<LogFillContractEventArgs>) => { - if (_.isNull(err)) { - console.log('EVENT'); - console.log(event); - } else { - console.log('ERROR'); - console.log(err); - subscribe(); - } - }, - ); -}; -subscribe(); diff --git a/packages/long-lived-subscriptions-test/tsconfig.json b/packages/long-lived-subscriptions-test/tsconfig.json deleted file mode 100644 index 3d967d05f..000000000 --- a/packages/long-lived-subscriptions-test/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib" - }, - "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] -} diff --git a/packages/long-lived-subscriptions-test/tslint.json b/packages/long-lived-subscriptions-test/tslint.json deleted file mode 100644 index ffaefe83a..000000000 --- a/packages/long-lived-subscriptions-test/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["@0xproject/tslint-config"] -} diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 2ac81f2d3..cbc3daad2 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/monorepo-scripts", - "version": "0.1.8", + "version": "0.1.9", "private": true, "description": "Helper scripts for the monorepo", "scripts": { @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/tslint-config": "^0.4.7", "@types/glob": "^5.0.33", "@types/node": "^8.0.53", "shx": "^0.2.2", diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index 0469150c0..6ee8e2455 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG -## v0.4.0 - _January 28, 2017_ +## v0.4.0 - _Feburary 02, 2018_ + + * InjectedWeb3Subprovider accepts a Provider in the constructor, previously it was a Web3 object. + +## v0.3.5 - _January 28, 2018_ * Return a transaction hash from `_sendTransactionAsync` (#303) diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md index 78643ad55..0d8f85910 100644 --- a/packages/subproviders/README.md +++ b/packages/subproviders/README.md @@ -2,6 +2,8 @@ A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support. +We have written up a [Wiki](https://0xproject.com/wiki#Web3-Provider-Examples) article detailing some use cases of this subprovider package. + ## Installation ``` diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index ee283dff3..9137f3c77 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/subproviders", - "version": "0.3.5", + "version": "0.3.6", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "license": "Apache-2.0", @@ -18,8 +18,8 @@ "test:integration": "run-s clean build run_mocha_integration" }, "dependencies": { - "@0xproject/assert": "^0.0.15", - "@0xproject/utils": "^0.2.4", + "@0xproject/assert": "^0.0.16", + "@0xproject/utils": "^0.3.0", "bn.js": "^4.11.8", "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3", @@ -32,8 +32,8 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/utils": "^0.2.4", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/utils": "^0.3.0", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", @@ -50,7 +50,7 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8", + "web3-typescript-typings": "^0.9.9", "webpack": "^3.1.0" } } diff --git a/packages/subproviders/src/subproviders/injected_web3.ts b/packages/subproviders/src/subproviders/injected_web3.ts index bd29acb22..0d70180c4 100644 --- a/packages/subproviders/src/subproviders/injected_web3.ts +++ b/packages/subproviders/src/subproviders/injected_web3.ts @@ -1,17 +1,16 @@ import * as _ from 'lodash'; import Web3 = require('web3'); -import Web3ProviderEngine = require('web3-provider-engine'); /* * This class implements the web3-provider-engine subprovider interface and forwards * requests involving user accounts (getAccounts, sendTransaction, etc...) to the injected - * web3 instance in their browser. + * provider instance in their browser. * Source: https://github.com/MetaMask/provider-engine/blob/master/subproviders/subprovider.js */ export class InjectedWeb3Subprovider { private _injectedWeb3: Web3; - constructor(injectedWeb3: Web3) { - this._injectedWeb3 = injectedWeb3; + constructor(subprovider: Web3.Provider) { + this._injectedWeb3 = new Web3(subprovider); } public handleRequest( payload: Web3.JSONRPCRequestPayload, @@ -42,8 +41,10 @@ export class InjectedWeb3Subprovider { } } // Required to implement this method despite not needing it for this subprovider + // The engine argument type should be Web3ProviderEngine, but we've decided to keep it as type any + // to remove the provider engine depdency given this method is a noop // tslint:disable-next-line:prefer-function-over-method - public setEngine(engine: Web3ProviderEngine) { + public setEngine(engine: any) { // noop } } diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index b7a55aeb0..e38f4b6cd 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/testnet-faucets", - "version": "1.0.9", + "version": "1.0.10", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -15,8 +15,8 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.31.1", - "@0xproject/utils": "^0.2.4", + "0x.js": "^0.32.0", + "@0xproject/utils": "^0.3.0", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", @@ -27,7 +27,7 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/tslint-config": "^0.4.7", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "^4.14.86", @@ -39,7 +39,7 @@ "tslint": "5.8.0", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8", + "web3-typescript-typings": "^0.9.9", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index c2a8b0692..d48f17954 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.6", + "version": "0.4.7", "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 1fc8d52b9..6d8e93cfd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "0.1.8", + "version": "0.1.9", "description": "0x types", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,11 +20,11 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/types/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", + "@0xproject/tslint-config": "^0.4.7", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" }, "dependencies": { "bignumber.js": "~4.1.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index e276d5e5a..2a434d79a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.2.4", + "version": "0.3.0", "description": "0x TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,14 +20,14 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/types": "^0.1.8", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/types": "^0.1.9", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" }, "dependencies": { "bignumber.js": "~4.1.0", diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json index 651694e08..6f7106b56 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.8", + "version": "0.9.9", "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 baae437a7..33d2fde20 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.9", + "version": "0.1.10", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,17 +20,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.6", - "@0xproject/types": "^0.1.8", + "@0xproject/tslint-config": "^0.4.7", + "@0xproject/types": "^0.1.9", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8" + "web3-typescript-typings": "^0.9.9" }, "dependencies": { - "@0xproject/utils": "^0.2.4", + "@0xproject/utils": "^0.3.0", "lodash": "^4.17.4", "web3": "^0.20.0" } diff --git a/packages/website/package.json b/packages/website/package.json index 295675fa3..e13c4d44c 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.11", + "version": "0.0.12", "private": true, "description": "Website and 0x portal dapp", "scripts": { @@ -18,9 +18,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.31.1", - "@0xproject/subproviders": "^0.3.5", - "@0xproject/utils": "^0.2.4", + "0x.js": "^0.32.0", + "@0xproject/subproviders": "^0.3.6", + "@0xproject/utils": "^0.3.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", @@ -97,7 +97,7 @@ "style-loader": "0.13.x", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.8", + "web3-typescript-typings": "^0.9.9", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 71995e2cd..099efb405 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -100,7 +100,7 @@ export class Blockchain { // We catch all requests involving a users account and send it to the injectedWeb3 // instance. All other requests go to the public hosted node. provider = new ProviderEngine(); - provider.addProvider(new InjectedWeb3Subprovider(injectedWeb3)); + provider.addProvider(new InjectedWeb3Subprovider(injectedWeb3.currentProvider)); provider.addProvider(new FilterSubprovider()); provider.addProvider(new RedundantRPCSubprovider(publicNodeUrlsIfExistsForNetworkId)); provider.start(); |