diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-05 19:52:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-05 19:52:43 +0800 |
commit | 7f7ddee0f95f3ed3e903c230088dbee4648771bd (patch) | |
tree | cbaae6089347793d7b205d696d517cf2e1de38ab /packages/website/ts/blockchain.ts | |
parent | 674e56cea69fe96ddd0071d3c4c5b5ea8ae299bf (diff) | |
parent | b99c797945dacae09be1e1e2d58f806423fedffa (diff) | |
download | dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar.gz dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar.bz2 dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar.lz dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar.xz dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.tar.zst dexon-sol-tools-7f7ddee0f95f3ed3e903c230088dbee4648771bd.zip |
Merge pull request #501 from 0xProject/feature/provider-over-wrapper
Use Provider over web3Wrapper
Diffstat (limited to 'packages/website/ts/blockchain.ts')
-rw-r--r-- | packages/website/ts/blockchain.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 72cb94c02..fd34ab82d 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -23,6 +23,7 @@ import { LedgerWalletSubprovider, RedundantRPCSubprovider, } from '@0xproject/subproviders'; +import { Provider } from '@0xproject/types'; import { BigNumber, intervalUtils, logUtils, promisify } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; @@ -73,11 +74,11 @@ export class Blockchain { private _web3Wrapper?: Web3Wrapper; private _blockchainWatcher?: BlockchainWatcher; private _userAddressIfExists: string; - private _cachedProvider: Web3.Provider; + private _cachedProvider: Provider; private _cachedProviderNetworkId: number; private _ledgerSubprovider: LedgerWalletSubprovider; private _defaultGasPrice: BigNumber; - private static _getNameGivenProvider(provider: Web3.Provider): string { + private static _getNameGivenProvider(provider: Provider): string { const providerType = utils.getProviderType(provider); const providerNameIfExists = providerToName[providerType]; if (_.isUndefined(providerNameIfExists)) { @@ -377,7 +378,7 @@ export class Blockchain { } public isValidAddress(address: string): boolean { const lowercaseAddress = address.toLowerCase(); - return this._web3Wrapper.isAddress(lowercaseAddress); + return Web3Wrapper.isAddress(lowercaseAddress); } public async pollTokenBalanceAsync(token: Token) { utils.assert(this._doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses); |