aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-02 17:23:39 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-02 17:23:39 +0800
commita740498c8061bc7a3dafae82929b358e61bac2d4 (patch)
treeabf66a0df929cee19b356bde959fcb7ff3b92b79 /src
parentf663a15c9b000d639bd0d58d0c177e6de9d47346 (diff)
downloaddexon-0x-contracts-a740498c8061bc7a3dafae82929b358e61bac2d4.tar.gz
dexon-0x-contracts-a740498c8061bc7a3dafae82929b358e61bac2d4.tar.zst
dexon-0x-contracts-a740498c8061bc7a3dafae82929b358e61bac2d4.zip
Introduce coinBase account
Add makerAccount parameter Adjust tests Add more assertions to success test
Diffstat (limited to 'src')
-rw-r--r--src/0x.js.ts6
-rw-r--r--src/web3_wrapper.ts3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts
index a613d5f48..6713ec885 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -124,6 +124,12 @@ export class ZeroEx {
this.web3Wrapper.setDefaultAccount(account);
}
/**
+ * Gets default account for sending transactions.
+ */
+ public getTransactionSenderAccount(): string {
+ return this.web3Wrapper.getDefaultAccount();
+ }
+ /**
* Computes the orderHash given the order parameters and returns it as a hex encoded string.
*/
public async getOrderHashHexAsync(order: Order): Promise<string> {
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index c1263222a..900c127d5 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -17,6 +17,9 @@ export class Web3Wrapper {
public isAddress(address: string): boolean {
return this.web3.isAddress(address);
}
+ public getDefaultAccount(): string {
+ return this.web3.eth.defaultAccount;
+ }
public setDefaultAccount(address: string): void {
this.web3.eth.defaultAccount = address;
}