@@ -927,17 +927,17 @@ Transaction Receipts
927
927
...
928
928
</account>
929
929
...
930
- </network> | _ })
930
+ </network> | _ } #as BLOCKITEM )
931
931
=> #rpcResponseSuccess( { "transactionHash": TXHASH
932
932
, "transactionIndex": #unparseQuantity(getIndexOf(TXID, TXLIST))
933
- , "blockHash": #unparseQuantity(1 )
933
+ , "blockHash": "0x" +String Keccak256(#rlpEncodeBlock(BLOCKITEM) )
934
934
, "blockNumber": #unparseQuantity(BN)
935
935
, "from": #unparseQuantity(TXFROM)
936
936
, "to": #unparseAccount(TT)
937
937
, "gasUsed": #unparseQuantity(CGAS)
938
938
, "cumulativeGasUsed": #unparseQuantity(CGAS)
939
939
, "contractAddress": #if TT ==K .Account #then #unparseQuantity(#newAddr(TXFROM, NONCE -Int 1)) #else null #fi
940
- , "logs": [#serializeLogs(LOGS, 0, TXID, TXHASH, BN, 1 )]
940
+ , "logs": [#serializeLogs(LOGS, 0, TXID, TXHASH, "0x" +String Keccak256(#rlpEncodeBlock(BLOCKITEM)), BN )]
941
941
, "status": #unparseQuantity(TXSTATUS)
942
942
, "logsBloom": #unparseDataByteArray(BLOOM)
943
943
, "v": #unparseQuantity(TW)
@@ -985,14 +985,14 @@ Transaction Receipts
985
985
rule #unparseIntListAux(.List, RESULT) => RESULT
986
986
rule #unparseIntListAux(L ListItem(I), RESULT) => #unparseIntListAux(L, (#unparseDataByteArray(#padToWidth(32,#asByteStack(I))), RESULT))
987
987
988
- syntax JSONs ::= #serializeLogs ( List, Int, Int, String, Int , Int ) [function]
989
- // -------------------------------------------------------------------------------
988
+ syntax JSONs ::= #serializeLogs ( List, Int, Int, String, String , Int ) [function]
989
+ // ----------------------------------------------------------------------------------
990
990
rule #serializeLogs (.List, _, _, _, _, _) => .JSONs
991
991
rule #serializeLogs (ListItem({ ACCT | TOPICS:List | DATA }) L, LI, TI, TH, BH, BN) => {
992
992
"logIndex": #unparseQuantity(LI),
993
993
"transactionIndex": #unparseQuantity(TI),
994
994
"transactionHash": TH,
995
- "blockHash": #unparseQuantity(BH) ,
995
+ "blockHash": BH ,
996
996
"blockNumber": #unparseQuantity(BN),
997
997
"address": #unparseQuantity(ACCT),
998
998
"data": #unparseDataByteArray(DATA),
0 commit comments