aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper/src
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-03-09 02:47:13 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-03-09 02:47:13 +0800
commit260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423 (patch)
treeb9b943e46f93c4c61f29b31e69bd932b920134db /packages/web3-wrapper/src
parent9286dc284ca56cbaa5b4015b3b9549eb710977ce (diff)
parenta691de7d55d2f712a9601dd2440f155fcb0a9a14 (diff)
downloaddexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar.gz
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar.bz2
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar.lz
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar.xz
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.tar.zst
dexon-0x-contracts-260bb8218f8207bcc9f1f7d0d9ddf2d4356fd423.zip
Merge branch 'master' of github.com:0xProject/0x-monorepo
* 'master' of github.com:0xProject/0x-monorepo: (171 commits) Fix bugs in postpublish_utils.js Update @0xproject/utils in top-level package.json Changelog tweaks Publish Updated CHANGELOGS Fix typo Add PR number to changelog entry Add changelog update to subproviders package Add `numberOfAccounts` param to `LedgerSubprovider` method `getAccountsAsync` and add tests Remove unnecessary type assertion Fix comments Add comments Don't need any external packages for 0x connect docs yet Instead of adding `@0xproject/types` to tsconfig.json, let's only add it when calling TypeDoc Fix styling Make prettier ignore postpublish_utils Update yarn.lock Update yarn.lock Update all mentions of the repo name being `0x.js` to `0x-monorepo` Add hack comment ...
Diffstat (limited to 'packages/web3-wrapper/src')
-rw-r--r--packages/web3-wrapper/src/index.ts18
1 files changed, 10 insertions, 8 deletions
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index a2878fc2a..a07805344 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -41,7 +41,8 @@ export class Web3Wrapper {
}
public async isSenderAddressAvailableAsync(senderAddress: string): Promise<boolean> {
const addresses = await this.getAvailableAddressesAsync();
- return _.includes(addresses, senderAddress);
+ const normalizedAddress = senderAddress.toLowerCase();
+ return _.includes(addresses, normalizedAddress);
}
public async getNodeVersionAsync(): Promise<string> {
const nodeVersion = await promisify<string>(this._web3.version.getNode)();
@@ -96,7 +97,8 @@ export class Web3Wrapper {
}
public async getAvailableAddressesAsync(): Promise<string[]> {
const addresses = await promisify<string[]>(this._web3.eth.getAccounts)();
- return addresses;
+ const normalizedAddresses = _.map(addresses, address => address.toLowerCase());
+ return normalizedAddresses;
}
public async getLogsAsync(filter: Web3.FilterObject): Promise<Web3.LogEntry[]> {
let fromBlock = filter.fromBlock;
@@ -126,14 +128,14 @@ export class Web3Wrapper {
const web3Contract = this._web3.eth.contract(abi);
return web3Contract;
}
- public getContractInstance(abi: Web3.ContractAbi, address: string): Web3.ContractInstance {
- const web3ContractInstance = this.getContractFromAbi(abi).at(address);
- return web3ContractInstance;
- }
- public async estimateGasAsync(data: string): Promise<number> {
- const gas = await promisify<number>(this._web3.eth.estimateGas)({ data });
+ public async estimateGasAsync(txData: Partial<Web3.TxData>): Promise<number> {
+ const gas = await promisify<number>(this._web3.eth.estimateGas)(txData);
return gas;
}
+ public async callAsync(callData: Web3.CallData, defaultBlock?: Web3.BlockParam): Promise<string> {
+ const rawCalllResult = await promisify<string>(this._web3.eth.call)(callData, defaultBlock);
+ return rawCalllResult;
+ }
public async sendTransactionAsync(txData: Web3.TxData): Promise<string> {
const txHash = await promisify<string>(this._web3.eth.sendTransaction)(txData);
return txHash;