forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 19:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #524 from gzliudan/revert-pr320

Browse source 
Revert PR320
This commit is contained in:
Daniel Liu 2024-04-22 21:04:44 +08:00 committed by GitHub
commit 3b9fc516f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/database_util.go
View file

@ -262,10 +262,6 @@ func GetBlockReceipts(db DatabaseReader, hash common.Hash, number uint64) types.
receipts[i].BlockHash = hash receipts[i].BlockHash = hash
receipts[i].BlockNumber = big.NewInt(0).SetUint64(number) receipts[i].BlockNumber = big.NewInt(0).SetUint64(number)
receipts[i].TransactionIndex = uint(i) receipts[i].TransactionIndex = uint(i)
for _, log := range receipts[i].Logs {
// update BlockHash to fix #208
log.BlockHash = hash
}
} }
return receipts return receipts
} }

5
eth/filters/api.go
View file

@ -28,7 +28,6 @@ import (
ethereum "github.com/XinFinOrg/XDPoSChain" ethereum "github.com/XinFinOrg/XDPoSChain"
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/common/hexutil"
"github.com/XinFinOrg/XDPoSChain/core"
"github.com/XinFinOrg/XDPoSChain/core/types" "github.com/XinFinOrg/XDPoSChain/core/types"
"github.com/XinFinOrg/XDPoSChain/ethdb" "github.com/XinFinOrg/XDPoSChain/ethdb"
"github.com/XinFinOrg/XDPoSChain/event" "github.com/XinFinOrg/XDPoSChain/event"
@ -443,10 +442,6 @@ func (api *PublicFilterAPI) GetFilterChanges(id rpc.ID) (interface{}, error) {
case LogsSubscription: case LogsSubscription:
logs := f.logs logs := f.logs
f.logs = nil f.logs = nil
for _, log := range logs {
// update BlockHash to fix #208
log.BlockHash = core.GetCanonicalHash(api.chainDb, log.BlockNumber)
}
return returnLogs(logs), nil return returnLogs(logs), nil
} }
} }