crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up missing Provider interfaces and refactor providerUtils.standardizeOrThrow()

Browse Source
This commit is contained in:
Fabio Berger
2019-02-19 22:34:31 -08:00
parent fe1e8575ea
commit 1fa82c1077
72 changed files with 353 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/subproviders/src/index.ts
View File

@@ -52,7 +52,6 @@ export { ECSignature, EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Ty
export {
JSONRPCRequestPayload,
Provider,
SupportedProvider,
JSONRPCResponsePayload,
JSONRPCErrorCallback,

4
packages/subproviders/src/subproviders/metamask_subprovider.ts
View File

@@ -1,6 +1,6 @@
import { providerUtils } from '@0x/utils';
import { marshaller, Web3Wrapper } from '@0x/web3-wrapper';
import { JSONRPCRequestPayload, Provider, SupportedProvider } from 'ethereum-types';
import { JSONRPCRequestPayload, SupportedProvider, ZeroExProvider } from 'ethereum-types';
import * as ethUtil from 'ethereumjs-util';
import { Callback, ErrorCallback } from '../types';
@@ -17,7 +17,7 @@ import { Subprovider } from './subprovider';
*/
export class MetamaskSubprovider extends Subprovider {
private readonly _web3Wrapper: Web3Wrapper;
private readonly _provider: Provider;
private readonly _provider: ZeroExProvider;
/**
* Instantiates a new MetamaskSubprovider
* @param supportedProvider Web3 provider that should handle all user account related requests

7
packages/subproviders/src/subproviders/subprovider.ts
View File

@@ -1,5 +1,6 @@
import { promisify } from '@0x/utils';
import { JSONRPCRequestPayload, JSONRPCResponsePayload, ProviderEngineProvider } from 'ethereum-types';
import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
import Web3ProviderEngine = require('web3-provider-engine');
import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../types';
/**
@@ -8,7 +9,7 @@ import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../typ
*/
export abstract class Subprovider {
// tslint:disable-next-line:underscore-private-and-protected
private engine!: ProviderEngineProvider;
private engine!: Web3ProviderEngine;
protected static _createFinalPayload(
payload: Partial<JSONRPCRequestPayloadWithMethod>,
): Partial<JSONRPCRequestPayloadWithMethod> {
@@ -64,7 +65,7 @@ export abstract class Subprovider {
* directly.
* @param engine The ProviderEngine this subprovider is added to
*/
public setEngine(engine: ProviderEngineProvider): void {
public setEngine(engine: Web3ProviderEngine): void {
this.engine = engine;
}
}