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

fix: delete bor tx lookup on reorg

Browse source
This commit is contained in:
Jaynti Kanani 2020-10-27 20:45:54 +05:30
parent 30708baafd
commit 34e9724c0d
No known key found for this signature in database
GPG key ID: 4396982C976BAE5E
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/blockchain.go
View file

@ -498,6 +498,7 @@ func (bc *BlockChain) SetHead(head uint64) error {
rawdb.DeleteBody(db, hash, num) rawdb.DeleteBody(db, hash, num)
rawdb.DeleteReceipts(db, hash, num) rawdb.DeleteReceipts(db, hash, num)
rawdb.DeleteBorReceipt(db, hash, num) rawdb.DeleteBorReceipt(db, hash, num)
rawdb.DeleteBorTxLookupEntry(db, hash, num)
} }
// Todo(rjl493456442) txlookup, bloombits, etc // Todo(rjl493456442) txlookup, bloombits, etc
} }
@ -1462,10 +1463,14 @@ func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.
}) })
if len(blockLogs) > len(logs) { if len(blockLogs) > len(logs) {
// Write bor receipt
rawdb.WriteBorReceipt(blockBatch, block.Hash(), block.NumberU64(), &types.ReceiptForStorage{ rawdb.WriteBorReceipt(blockBatch, block.Hash(), block.NumberU64(), &types.ReceiptForStorage{
Status: types.ReceiptStatusSuccessful, // make receipt status successful Status: types.ReceiptStatusSuccessful, // make receipt status successful
Logs: blockLogs[len(logs):], // get state-sync logs from `state.Logs()` Logs: blockLogs[len(logs):], // get state-sync logs from `state.Logs()`
}) })
// Write bor tx reverse lookup
rawdb.WriteBorTxLookupEntry(blockBatch, block.Hash(), block.NumberU64())
} }
} }

36
core/rawdb/bor_receipt.go
View file

@ -14,6 +14,9 @@ var (
// bor receipt key // bor receipt key
borReceiptKey = types.BorReceiptKey borReceiptKey = types.BorReceiptKey
// bor derived tx hash
getDerivedBorTxHash = types.GetDerivedBorTxHash
// borTxLookupPrefix + hash -> transaction/receipt lookup metadata // borTxLookupPrefix + hash -> transaction/receipt lookup metadata
borTxLookupPrefix = []byte("matic-bor-tx-lookup-") borTxLookupPrefix = []byte("matic-bor-tx-lookup-")
@ -21,7 +24,7 @@ var (
freezerBorReceiptTable = "matic-bor-receipts" freezerBorReceiptTable = "matic-bor-receipts"
) )
// borTxLookupKey = borTxLookupPrefix + hash // borTxLookupKey = borTxLookupPrefix + bor tx hash
func borTxLookupKey(hash common.Hash) []byte { func borTxLookupKey(hash common.Hash) []byte {
return append(borTxLookupPrefix, hash.Bytes()...) return append(borTxLookupPrefix, hash.Bytes()...)
} }
@ -129,13 +132,9 @@ func WriteBorReceipt(db ethdb.KeyValueWriter, hash common.Hash, number uint64, b
} }
// Store the flattened receipt slice // Store the flattened receipt slice
key := borReceiptKey(number, hash) if err := db.Put(borReceiptKey(number, hash), bytes); err != nil {
if err := db.Put(key, bytes); err != nil {
log.Crit("Failed to store bor receipt", "err", err) log.Crit("Failed to store bor receipt", "err", err)
} }
// Write bor tx reverse lookup
WriteBorTxLookupEntry(db, types.GetDerivedBorTxHash(key), big.NewInt(0).SetUint64(number))
} }
// DeleteBorReceipt removes receipt data associated with a block hash. // DeleteBorReceipt removes receipt data associated with a block hash.
@ -175,9 +174,9 @@ func ReadBorTransaction(db ethdb.Reader, hash common.Hash) (*types.Transaction,
// //
// ReadBorTxLookupEntry retrieves the positional metadata associated with a transaction // ReadBorTxLookupEntry retrieves the positional metadata associated with a transaction
// hash to allow retrieving the bor transaction or bor receipt by hash. // hash to allow retrieving the bor transaction or bor receipt using tx hash.
func ReadBorTxLookupEntry(db ethdb.Reader, hash common.Hash) *uint64 { func ReadBorTxLookupEntry(db ethdb.Reader, txHash common.Hash) *uint64 {
data, _ := db.Get(borTxLookupKey(hash)) data, _ := db.Get(borTxLookupKey(txHash))
if len(data) == 0 { if len(data) == 0 {
return nil return nil
} }
@ -186,16 +185,23 @@ func ReadBorTxLookupEntry(db ethdb.Reader, hash common.Hash) *uint64 {
return &number return &number
} }
// WriteBorTxLookupEntry stores a positional metadata for bor transaction. // WriteBorTxLookupEntry stores a positional metadata for bor transaction using block hash and block number
func WriteBorTxLookupEntry(db ethdb.KeyValueWriter, hash common.Hash, number *big.Int) { func WriteBorTxLookupEntry(db ethdb.KeyValueWriter, hash common.Hash, number uint64) {
if err := db.Put(borTxLookupKey(hash), number.Bytes()); err != nil { txHash := types.GetDerivedBorTxHash(borReceiptKey(number, hash))
if err := db.Put(borTxLookupKey(txHash), big.NewInt(0).SetUint64(number).Bytes()); err != nil {
log.Crit("Failed to store bor transaction lookup entry", "err", err) log.Crit("Failed to store bor transaction lookup entry", "err", err)
} }
} }
// DeleteBorTxLookupEntry removes bor transaction data associated with a hash. // DeleteBorTxLookupEntry removes bor transaction data associated with block hash and block number
func DeleteBorTxLookupEntry(db ethdb.KeyValueWriter, hash common.Hash) { func DeleteBorTxLookupEntry(db ethdb.KeyValueWriter, hash common.Hash, number uint64) {
if err := db.Delete(borTxLookupKey(hash)); err != nil { txHash := types.GetDerivedBorTxHash(borReceiptKey(number, hash))
DeleteBorTxLookupEntryByTxHash(db, txHash)
}
// DeleteBorTxLookupEntryByTxHash removes bor transaction data associated with a bor tx hash.
func DeleteBorTxLookupEntryByTxHash(db ethdb.KeyValueWriter, txHash common.Hash) {
if err := db.Delete(borTxLookupKey(txHash)); err != nil {
log.Crit("Failed to delete bor transaction lookup entry", "err", err) log.Crit("Failed to delete bor transaction lookup entry", "err", err)
} }
} }