aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-07-05 18:03:34 +0800
committerFabio Berger <me@fabioberger.com>2018-07-05 18:03:34 +0800
commit3d67f122a501e49a005c4ebdb0a68be0f67fcea8 (patch)
treedfd62512ed2bd5c6af6ed87c1db9106908b02b93 /packages
parentb0daec838453eddbee50604b9f8ffffccd5a2be1 (diff)
downloaddexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar.gz
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar.bz2
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar.lz
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar.xz
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.tar.zst
dexon-sol-tools-3d67f122a501e49a005c4ebdb0a68be0f67fcea8.zip
Move 'from' check to sendTransaction
Diffstat (limited to 'packages')
-rw-r--r--packages/web3-wrapper/src/marshaller.ts3
-rw-r--r--packages/web3-wrapper/src/web3_wrapper.ts3
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/web3-wrapper/src/marshaller.ts b/packages/web3-wrapper/src/marshaller.ts
index 84c351387..7af61752d 100644
--- a/packages/web3-wrapper/src/marshaller.ts
+++ b/packages/web3-wrapper/src/marshaller.ts
@@ -74,9 +74,6 @@ export const marshaller = {
return tx;
},
marshalTxData(txData: Partial<TxData>): Partial<TxDataRPC> {
- if (_.isUndefined(txData.from)) {
- throw new Error(`txData is missing required "from" address.`);
- }
const callTxDataBase = {
...txData,
};
diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts
index d1e4c1edf..2d7b590b5 100644
--- a/packages/web3-wrapper/src/web3_wrapper.ts
+++ b/packages/web3-wrapper/src/web3_wrapper.ts
@@ -483,6 +483,9 @@ export class Web3Wrapper {
* @returns Transaction hash
*/
public async sendTransactionAsync(txData: TxData): Promise<string> {
+ if (_.isUndefined(txData.from)) {
+ throw new Error(`txData is missing required "from" address.`);
+ }
const txDataHex = marshaller.marshalTxData(txData);
const txHash = await this._sendRawPayloadAsync<string>({ method: 'eth_sendTransaction', params: [txDataHex] });
return txHash;