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

Merge branch 'block-receipt' of github.com:maticnetwork/bor into block-receipt

Browse source
This commit is contained in:
Jaynti Kanani 2020-12-08 17:47:20 +05:30
commit bc44ada4b9
No known key found for this signature in database
GPG key ID: 4396982C976BAE5E
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/types/bor_receipt.go
View file

@ -9,6 +9,11 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
) )
// TenToTheFive - To be used while sorting bor logs
//
// Sorted using ( blockNumber * (10 ** 5) + logIndex )
const TenToTheFive uint64 = 100000
var ( var (
borReceiptPrefix = []byte("matic-bor-receipt-") // borReceiptPrefix + number + block hash -> bor block receipt borReceiptPrefix = []byte("matic-bor-receipt-") // borReceiptPrefix + number + block hash -> bor block receipt
@ -83,8 +88,10 @@ func DeriveFieldsForBorLogs(logs []*Log, hash common.Hash, number uint64, txInde
// MergeBorLogs merges receipt logs and block receipt logs // MergeBorLogs merges receipt logs and block receipt logs
func MergeBorLogs(logs []*Log, borLogs []*Log) []*Log { func MergeBorLogs(logs []*Log, borLogs []*Log) []*Log {
result := append(logs, borLogs...) result := append(logs, borLogs...)
sort.SliceStable(result, func(i int, j int) bool { sort.SliceStable(result, func(i int, j int) bool {
return (result[i].BlockNumber*100000 + uint64(result[i].Index)) < (result[j].BlockNumber*100000 + uint64(result[j].Index)) return (result[i].BlockNumber*TenToTheFive + uint64(result[i].Index)) < (result[j].BlockNumber*TenToTheFive + uint64(result[j].Index))
}) })
return result return result
} }