diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-07-07 01:35:13 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-07-07 01:35:13 +0800 |
| commit | c753e24f0a84ae6410128cd05f1ad6932a4110a4 (patch) | |
| tree | cb1ae9f38fb9707396e24eec139953ba4c943b2d /packages | |
| parent | acfbba5476d48645eee7f471ecaa4b1142709939 (diff) | |
| download | dexon-sol-tools-c753e24f0a84ae6410128cd05f1ad6932a4110a4.tar.gz dexon-sol-tools-c753e24f0a84ae6410128cd05f1ad6932a4110a4.tar.zst dexon-sol-tools-c753e24f0a84ae6410128cd05f1ad6932a4110a4.zip | |
Export marshaller and use it to unmarshal tx dataa
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/subproviders/src/subproviders/signer.ts | 5 | ||||
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/index.ts | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index 08a9daceb..c6b25a7da 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,4 +1,4 @@ -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Web3Wrapper, marshaller } from '@0xproject/web3-wrapper'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; @@ -51,7 +51,8 @@ export class SignerSubprovider extends Subprovider { case 'eth_sendTransaction': const [txParams] = payload.params; try { - const txHash = await this._web3Wrapper.sendTransactionAsync(txParams); + const txData = marshaller.unmarshalTxData(txParams); + const txHash = await this._web3Wrapper.sendTransactionAsync(txData); end(null, txHash); } catch (err) { end(err); diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index f8b1dab85..fcbedbbf2 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "version": "0.7.3", + "changes": [ + { + "note": "Export `marshaller` utility file.", + "pr": 829 + } + ] + }, + { "timestamp": 1529397769, "version": "0.7.2", "changes": [ diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 66ef0a784..19fe0836c 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,2 +1,3 @@ export { Web3Wrapper, uniqueVersionIds, NodeType } from './web3_wrapper'; export { Web3WrapperErrors } from './types'; +export { marshaller } from './marshaller'; |