forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-10 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix : wrong chainID on rpc (#1030)

Browse source
This commit is contained in:
SHIVAM SHARMA 2023-10-06 13:42:54 +05:30 committed by GitHub
parent 2e896e216c
commit 784be5f72a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/ethapi/api.go
View file

@ -1742,6 +1742,7 @@ func newRPCTransactionFromBlockIndex(b *types.Block, index uint64, config *param
// If the transaction is a bor transaction, we need to set the hash to the derived bor tx hash. BorTx is always the last index. // If the transaction is a bor transaction, we need to set the hash to the derived bor tx hash. BorTx is always the last index.
if borReceipt != nil && index == uint64(len(txs)-1) { if borReceipt != nil && index == uint64(len(txs)-1) {
rpcTx.Hash = borReceipt.TxHash rpcTx.Hash = borReceipt.TxHash
rpcTx.ChainID = nil
} }
return rpcTx return rpcTx

1
internal/ethapi/bor_api.go
View file

@ -44,6 +44,7 @@ func (s *BlockChainAPI) appendRPCMarshalBorTransaction(ctx context.Context, bloc
// newRPCTransaction calculates hash based on RLP of the transaction data. // newRPCTransaction calculates hash based on RLP of the transaction data.
// In case of bor block tx, we need simple derived tx hash (same as function argument) instead of RLP hash // In case of bor block tx, we need simple derived tx hash (same as function argument) instead of RLP hash
marshalledTx.Hash = txHash marshalledTx.Hash = txHash
marshalledTx.ChainID = nil
fields["transactions"] = append(formattedTxs, marshalledTx) fields["transactions"] = append(formattedTxs, marshalledTx)
} else { } else {
fields["transactions"] = append(formattedTxs, txHash) fields["transactions"] = append(formattedTxs, txHash)