diff options
author | Jacob Evans <jacob@dekz.net> | 2018-02-07 03:27:01 +0800 |
---|---|---|
committer | Jacob Evans <jacob@dekz.net> | 2018-02-07 03:27:11 +0800 |
commit | 67d7540907b6467c4cdc6a23815ad152517b3328 (patch) | |
tree | e79791b69b72d71fe6d10d4cd4bd01a85eb3451d /packages/subproviders/src | |
parent | 225baeb5cb8aed85d3e94a1d82a3c42ff5820d0e (diff) | |
download | dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar.gz dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar.bz2 dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar.lz dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar.xz dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.tar.zst dexon-sol-tools-67d7540907b6467c4cdc6a23815ad152517b3328.zip |
Move BlockParam and BlockParamLiteral to shared types
Diffstat (limited to 'packages/subproviders/src')
-rw-r--r-- | packages/subproviders/src/index.ts | 2 | ||||
-rw-r--r-- | packages/subproviders/src/subproviders/nonce_tracker.ts | 4 | ||||
-rw-r--r-- | packages/subproviders/src/types.ts | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 4b3be4efd..67d52ee25 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -10,7 +10,7 @@ export { InjectedWeb3Subprovider } from './subproviders/injected_web3'; export { RedundantRPCSubprovider } from './subproviders/redundant_rpc'; export { LedgerSubprovider } from './subproviders/ledger'; export { NonceTrackerSubprovider } from './subproviders/nonce_tracker'; -export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient } from './types'; +export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient, NonceSubproviderErrors } from './types'; /** * A factory method for creating a LedgerEthereumClient usable in a browser context. diff --git a/packages/subproviders/src/subproviders/nonce_tracker.ts b/packages/subproviders/src/subproviders/nonce_tracker.ts index 2f94ea581..4b5c34f69 100644 --- a/packages/subproviders/src/subproviders/nonce_tracker.ts +++ b/packages/subproviders/src/subproviders/nonce_tracker.ts @@ -4,14 +4,16 @@ import EthereumTx = require('ethereumjs-tx'); import ethUtil = require('ethereumjs-util'); import providerEngineUtils = require('web3-provider-engine/util/rpc-cache-utils'); +import { BlockParamLiteral } from '@0xproject/types'; + import { - BlockParamLiteral, ErrorCallback, JSONRPCPayload, NonceSubproviderErrors, OptionalNextCallback, } from '../types'; + import { Subprovider } from './subprovider'; const NONCE_TOO_LOW_ERROR_MESSAGE = 'Transaction nonce is too low'; diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts index 86b118767..65b7f6c8f 100644 --- a/packages/subproviders/src/types.ts +++ b/packages/subproviders/src/types.ts @@ -118,10 +118,5 @@ export enum NonceSubproviderErrors { CannotDetermineAddressFromPayload = 'CANNOT_DETERMINE_ADDRESS_FROM_PAYLOAD', } -// Re-defined BlockParamLiteral here, rather than import it from 0x.js. -export enum BlockParamLiteral { - Pending = 'pending', -} - export type OptionalNextCallback = (callback?: (err: Error | null, result: any, cb: any) => void) => void; export type ErrorCallback = (err: Error | null, data?: any) => void; |