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/website | |
| 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/website')
| -rw-r--r-- | packages/website/package.json | 10 | ||||
| -rw-r--r-- | packages/website/ts/blockchain.ts | 2 |
2 files changed, 6 insertions, 6 deletions
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(); |