Merge pull request #6310 from filecoin-project/chore/bump-v1.15.1

chore: bump v1.15.1

.github/workflows/test.yml

@@ -67,8 +67,8 @@ jobs:
       - name: Upload
         uses: codecov/codecov-action@v3
         with:
-          token:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage_unit.txt,./coverage_integration.txt,./coverage_venus_shared.txt
           name: venus
-          fail_ci_if_error: true
+          fail_ci_if_error: false
           verbose: true

CHANGELOG.md

@@ -1,5 +1,9 @@
 # venus changelog
 
+## v1.15.1
+
+* fix: update UpgradeDragonHeight to 3855360
+
 ## v1.15.0
 
 * feat: import data by uuid [[#6197](https://github.com/filecoin-project/venus/pull/6197)]

fixtures/networks/mainnet.go

@@ -70,7 +70,7 @@ func Mainnet() *NetworkConf {
 				UpgradeWatermelonHeight:           3469380,           // 2023-12-12T13:30:00Z
 				UpgradeWatermelonFixHeight:        -100,              // This fix upgrade only ran on calibrationnet
 				UpgradeWatermelonFix2Height:       -101,              // This fix upgrade only ran on calibrationnet
-				UpgradeDragonHeight:               3817920,           // 2024-04-11T14:00:00Z
+				UpgradeDragonHeight:               3855360,           // 2024-04-24T14:00:00Z
 				UpgradeCalibrationDragonFixHeight: -102,              // This fix upgrade only ran on calibrationnet
 			},
 			DrandSchedule:           map[abi.ChainEpoch]config.DrandEnum{0: 5, 51000: 1},

pkg/config/config.go

@@ -377,8 +377,8 @@ var DefaultForkUpgradeParam = &ForkUpgradeConfig{
 	UpgradeWatermelonFixHeight: -1,
 	// This fix upgrade only ran on calibrationnet
 	UpgradeWatermelonFix2Height: -2,
-	UpgradeDragonHeight:         3817920,
-	UpgradePhoenixHeight:        3817920 + 120,
+	UpgradeDragonHeight:         3855360,
+	UpgradePhoenixHeight:        3855360 + 120,
 	// This fix upgrade only ran on calibrationnet
 	UpgradeCalibrationDragonFixHeight: -3,
 }

pkg/constants/version.go

@@ -5,7 +5,7 @@ import (
 )
 
 // BuildVersion is the local build version, set by build system
-const BuildVersion = "1.15.0"
+const BuildVersion = "1.15.1"
 
 var CurrentCommit string
 

pkg/events/filter/index.go

@@ -555,7 +555,8 @@ func (ei *EventIndex) prefillFilter(ctx context.Context, f *eventFilter, exclude
 		s = s + " WHERE " + strings.Join(clauses, " AND ")
 	}
 
-	s += " ORDER BY event.height DESC"
+	// retain insertion order of event_entry rows with the implicit _rowid_ column
+	s += " ORDER BY event.height DESC, event_entry._rowid_ ASC"
 
 	stmt, err := ei.db.Prepare(s)
 	if err != nil {