aboutsummaryrefslogtreecommitdiffstats
path: root/packages/subproviders/src
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-02-06 09:22:45 +0800
committerGitHub <noreply@github.com>2018-02-06 09:22:45 +0800
commit225baeb5cb8aed85d3e94a1d82a3c42ff5820d0e (patch)
treee7e2c65443a809d0e12ac987b84b8c079f949bad /packages/subproviders/src
parent20590b7d35208bf3fb79ce6f06198ea995b05f91 (diff)
parentcf171d28c70c49541a30534d2593a623dd126f24 (diff)
downloaddexon-0x-contracts-225baeb5cb8aed85d3e94a1d82a3c42ff5820d0e.tar.gz
dexon-0x-contracts-225baeb5cb8aed85d3e94a1d82a3c42ff5820d0e.tar.zst
dexon-0x-contracts-225baeb5cb8aed85d3e94a1d82a3c42ff5820d0e.zip
Merge branch 'development' into feature/subproviders/nonce-tracker
Diffstat (limited to 'packages/subproviders/src')
-rw-r--r--packages/subproviders/src/subproviders/injected_web3.ts11
1 files changed, 6 insertions, 5 deletions
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
}
}