aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src/web3_wrapper.ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-12-02 12:47:05 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-12-02 13:31:50 +0800
commiteb667f653c4ee87132390844afaecf409c7575c8 (patch)
treed2d3c9b1a44bc9a93442617b0e2892cc901c5612 /packages/0x.js/src/web3_wrapper.ts
parent6cbd0d4537be3e51866c407dc01fb0efca0b50c2 (diff)
downloaddexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar.gz
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar.bz2
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar.lz
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar.xz
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.tar.zst
dexon-sol-tools-eb667f653c4ee87132390844afaecf409c7575c8.zip
Adjust 0x.js to use generated wrappers
Diffstat (limited to 'packages/0x.js/src/web3_wrapper.ts')
-rw-r--r--packages/0x.js/src/web3_wrapper.ts21
1 files changed, 12 insertions, 9 deletions
diff --git a/packages/0x.js/src/web3_wrapper.ts b/packages/0x.js/src/web3_wrapper.ts
index a031de486..0f23272a7 100644
--- a/packages/0x.js/src/web3_wrapper.ts
+++ b/packages/0x.js/src/web3_wrapper.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
import * as Web3 from 'web3';
import {Contract} from './contract';
-import {Artifact, ArtifactContractName, TransactionReceipt, ZeroExError} from './types';
+import {Artifact, ArtifactContractName, TransactionReceipt, TxData, ZeroExError} from './types';
interface RawLogEntry {
logIndex: string|null;
@@ -29,9 +29,9 @@ const CONTRACT_NAME_TO_NOT_FOUND_ERROR: {[contractName: string]: ZeroExError} =
export class Web3Wrapper {
private web3: Web3;
private networkId: number;
- private defaults: Partial<Web3.TxData>;
+ private defaults: Partial<TxData>;
private jsonRpcRequestId: number;
- constructor(provider: Web3.Provider, networkId: number, defaults?: Partial<Web3.TxData>) {
+ constructor(provider: Web3.Provider, networkId: number, defaults?: Partial<TxData>) {
if (_.isUndefined((provider as any).sendAsync)) {
// Web3@1.0 provider doesn't support synchronous http requests,
// so it only has an async `send` method, instead of a `send` and `sendAsync` in web3@0.x.x`
@@ -44,6 +44,9 @@ export class Web3Wrapper {
this.defaults = defaults || {};
this.jsonRpcRequestId = 0;
}
+ public getContractDefaults(): Partial<TxData> {
+ return this.defaults;
+ }
public setProvider(provider: Web3.Provider, networkId: number) {
this.networkId = networkId;
this.web3.setProvider(provider);
@@ -72,8 +75,9 @@ export class Web3Wrapper {
public getNetworkId(): number {
return this.networkId;
}
- public async getContractInstanceFromArtifactAsync<A extends Web3.ContractInstance>(artifact: Artifact,
- address?: string): Promise<A> {
+ public async getContractInstanceFromArtifactAsync(
+ artifact: Artifact, address?: string,
+ ): Promise<Web3.ContractInstance> {
let contractAddress: string;
if (_.isUndefined(address)) {
const networkId = this.getNetworkId();
@@ -88,7 +92,7 @@ export class Web3Wrapper {
if (!doesContractExist) {
throw new Error(CONTRACT_NAME_TO_NOT_FOUND_ERROR[artifact.contract_name]);
}
- const contractInstance = this.getContractInstance<A>(
+ const contractInstance = this.getContractInstance(
artifact.abi, contractAddress,
);
return contractInstance;
@@ -152,10 +156,9 @@ export class Web3Wrapper {
const formattedLogs = _.map(rawLogs, this.formatLog.bind(this));
return formattedLogs;
}
- private getContractInstance<A extends Web3.ContractInstance>(abi: Web3.ContractAbi, address: string): A {
+ private getContractInstance(abi: Web3.ContractAbi, address: string): Web3.ContractInstance {
const web3ContractInstance = this.web3.eth.contract(abi).at(address);
- const contractInstance = new Contract(web3ContractInstance, this.defaults) as any as A;
- return contractInstance;
+ return web3ContractInstance;
}
private async getNetworkAsync(): Promise<number> {
const networkId = await promisify(this.web3.version.getNetwork)();