From a72eae7ea84be60792b214b52f2f363b881197b2 Mon Sep 17 00:00:00 2001 From: fragosti Date: Thu, 5 Jul 2018 18:32:28 -0700 Subject: Unmarshall txn data in SignerSubprovider before calling web3wrapper sendTransactionAsync --- packages/subproviders/src/subproviders/signer.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/subproviders/src') diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index 08a9daceb..1fb613da0 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,4 +1,5 @@ -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 +52,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); -- cgit v1.2.3 From acfbba5476d48645eee7f471ecaa4b1142709939 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 6 Jul 2018 10:23:24 -0700 Subject: Revert moving formatUtils into utils --- packages/subproviders/src/subproviders/signer.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'packages/subproviders/src') diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index 1fb613da0..08a9daceb 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,5 +1,4 @@ -import { Web3Wrapper, marshaller } from '@0xproject/web3-wrapper'; - +import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; @@ -52,8 +51,7 @@ export class SignerSubprovider extends Subprovider { case 'eth_sendTransaction': const [txParams] = payload.params; try { - const txData = marshaller.unmarshalTxData(txParams); - const txHash = await this._web3Wrapper.sendTransactionAsync(txData); + const txHash = await this._web3Wrapper.sendTransactionAsync(txParams); end(null, txHash); } catch (err) { end(err); -- cgit v1.2.3 From c753e24f0a84ae6410128cd05f1ad6932a4110a4 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 6 Jul 2018 10:35:13 -0700 Subject: Export marshaller and use it to unmarshal tx dataa --- packages/subproviders/src/subproviders/signer.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/subproviders/src') 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); -- cgit v1.2.3 From 72fb1ee36f5ca7bceebb1ad2eac707295ccbe9c2 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 6 Jul 2018 11:30:01 -0700 Subject: Fix linting issues --- packages/subproviders/src/subproviders/signer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders/src') diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index c6b25a7da..f7329e00c 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,4 +1,4 @@ -import { Web3Wrapper, marshaller } from '@0xproject/web3-wrapper'; +import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; -- cgit v1.2.3