From 6027e275b18ea65d2e23b3bce9be6edba18bf989 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 23 Oct 2018 15:56:20 -0700 Subject: [PATCH 1/3] fix(web3-wrapper): Make getTransactionByHashAsync return the correct type --- packages/web3-wrapper/src/web3_wrapper.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index 3ba1536803..5dc252472a 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -23,7 +23,13 @@ import { import * as _ from 'lodash'; import { marshaller } from './marshaller'; -import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, NodeType, Web3WrapperErrors } from './types'; +import { + BlockWithoutTransactionDataRPC, + BlockWithTransactionDataRPC, + NodeType, + Web3WrapperErrors, + TransactionRPC, +} from './types'; import { utils } from './utils'; const BASE_TEN = 10; @@ -228,10 +234,11 @@ export class Web3Wrapper { */ public async getTransactionByHashAsync(txHash: string): Promise { assert.isHexString('txHash', txHash); - const transaction = await this.sendRawPayloadAsync({ + const transactionRpc = await this.sendRawPayloadAsync({ method: 'eth_getTransactionByHash', params: [txHash], }); + const transaction = marshaller.unmarshalTransaction(transactionRpc); return transaction; } /** From 075f3c9bfee89a472ed4de71f3613d269b6beb79 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 23 Oct 2018 16:00:40 -0700 Subject: [PATCH 2/3] chore(web3-wrapper): Update CHANGELOG.json --- packages/web3-wrapper/CHANGELOG.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index b8d06eac1e..6b554110f4 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,4 +1,14 @@ [ + { + "version": "3.1.1", + "changes": [ + { + "note": + "Fix bug in `getTransactionByHashAsync` which was causing the return value to have the wrong type (raw fields instead of unmarshalled fields).", + "pr": 1177 + } + ] + }, { "version": "3.1.0", "changes": [ From c2e8390d21adbd18f6c2b1a7d6255433582c325a Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 23 Oct 2018 16:12:48 -0700 Subject: [PATCH 3/3] chore: Fix linter --- packages/web3-wrapper/src/web3_wrapper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index 5dc252472a..56877fef3c 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -27,8 +27,8 @@ import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, NodeType, - Web3WrapperErrors, TransactionRPC, + Web3WrapperErrors, } from './types'; import { utils } from './utils';