Merge branch 'feature/tx-status'

ethereumproject · Jul 26, 2018 · 8a3bc2d · 8a3bc2d
2 parents 382aa8f + 7381d19
commit 8a3bc2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/eth/api.go b/eth/api.go
@@ -1226,7 +1226,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(txHash common.Hash) (ma
 	// We're not fully compatible with EIP-609 - just return status for all blocks.
 	fields["status"] = nil
 	if receipt.Status != types.TxStatusUnknown {
-		fields["status"] = receipt.Status
+		fields["status"] = rpc.NewHexNumber(receipt.Status)
 	}
 
 	return fields, nil

diff --git a/internal/jsre/ethereum_js.go b/internal/jsre/ethereum_js.go
@@ -3827,6 +3827,7 @@ var outputTransactionReceiptFormatter = function (receipt){
         receipt.transactionIndex = utils.toDecimal(receipt.transactionIndex);
     receipt.cumulativeGasUsed = utils.toDecimal(receipt.cumulativeGasUsed);
     receipt.gasUsed = utils.toDecimal(receipt.gasUsed);
+    receipt.status = utils.toDecimal(receipt.status);
 
     if(utils.isArray(receipt.logs)) {
         receipt.logs = receipt.logs.map(function(log){