smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2025-02-23 12:36:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

using merge sort

Browse Source
This commit is contained in:
Solovyov1796 2025-02-10 19:35:13 +08:00
parent 7900795654
commit d4066b6a3d
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/abci_utils.go
View File

@ -267,26 +267,32 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
remaing := gasPriceSuggestionBlockNum * int64(maxBlockGas) remaing := gasPriceSuggestionBlockNum * int64(maxBlockGas)
for len(txnInfoMap) > 0 && remaing > 0 { for len(txnInfoMap) > 0 && remaing > 0 {
// peek each sender's top // pop each sender's first continuous decreasing subsequence
sortSlice := make([]*txnInfo, 0, senderCnt) txnCnt := 0
senderNonceSortedSliceGroup := make([][]*txnInfo, 0, senderCnt)
for sender := range txnInfoMap { for sender := range txnInfoMap {
endIndex := findFirstContinuousDecreasingSubsequence(txnInfoMap[sender]) endIndex := findFirstContinuousDecreasingSubsequence(txnInfoMap[sender])
appendSlice := txnInfoMap[sender][:endIndex] appendSlice := txnInfoMap[sender][:endIndex]
sortSlice = append(sortSlice, appendSlice...) senderNonceSortedSliceGroup = append(senderNonceSortedSliceGroup, appendSlice)
txnCnt += len(appendSlice)
txnInfoMap[sender] = txnInfoMap[sender][endIndex:] txnInfoMap[sender] = txnInfoMap[sender][endIndex:]
if len(txnInfoMap[sender]) == 0 { if len(txnInfoMap[sender]) == 0 {
delete(txnInfoMap, sender) delete(txnInfoMap, sender)
} }
} }
sort.Slice(sortSlice, func(i, j int) bool { var gasPriceSortedSlice []*txnInfo
return sortSlice[i].gasPrice.Cmp(sortSlice[j].gasPrice) > 0 if len(senderNonceSortedSliceGroup) > 0 {
}) gasPriceSortedSlice = make([]*txnInfo, 0, len(senderNonceSortedSliceGroup[0]))
for i := range senderNonceSortedSliceGroup {
gasPriceSortedSlice = mergeSort(len(gasPriceSortedSlice)+len(senderNonceSortedSliceGroup[i]), gasPriceSortedSlice, senderNonceSortedSliceGroup[i])
}
}
for i := range sortSlice { for i := range gasPriceSortedSlice {
remaing -= int64(sortSlice[i].gasLimit) remaing -= int64(gasPriceSortedSlice[i].gasLimit)
if remaing <= 0 { if remaing <= 0 {
h.feemarketKeeper.SetSuggestionGasPrice(ctx, sortSlice[i].gasPrice) h.feemarketKeeper.SetSuggestionGasPrice(ctx, gasPriceSortedSlice[i].gasPrice)
break break
} }
} }
@ -476,3 +482,23 @@ func findFirstContinuousDecreasingSubsequence(data []*txnInfo) int {
return ll return ll
} }
func mergeSort(size int, left, right []*txnInfo) []*txnInfo {
result := make([]*txnInfo, 0, size)
i, j := 0, 0
for i < len(left) && j < len(right) {
if left[i].gasPrice.Cmp(right[j].gasPrice) > 0 {
result = append(result, left[i])
i++
} else {
result = append(result, right[j])
j++
}
}
result = append(result, left[i:]...)
result = append(result, right[j:]...)
return result
}