From d491929f0e83720acf57d6d1ad2c5e1a5e4a5551 Mon Sep 17 00:00:00 2001
From: simlecode <69969590+simlecode@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:38:26 +0800
Subject: [PATCH 1/5] chore: bump version to v1.15.1

---
 CHANGELOG.md             | 4 ++++
 pkg/constants/version.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cde669964..da747c7d92 100644
--- a/CHANGELOG.md
+++ b/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)]
diff --git a/pkg/constants/version.go b/pkg/constants/version.go
index e6ccdd8b56..dea0af9129 100644
--- a/pkg/constants/version.go
+++ b/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
 

From 06d7100c3b5e23a164aa8247dca456798a1bc5b7 Mon Sep 17 00:00:00 2001
From: simlecode <69969590+simlecode@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:17:06 +0800
Subject: [PATCH 2/5] chore: fix lint

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc92caf801..eb0a7814fa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,5 +70,5 @@ jobs:
           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

From 80a528c1b59518eb3c25993a9f602b1100e2cc39 Mon Sep 17 00:00:00 2001
From: simlecode <69969590+simlecode@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:42:18 +0800
Subject: [PATCH 3/5] fix: update dragon height

---
 fixtures/networks/mainnet.go | 2 +-
 pkg/config/config.go         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fixtures/networks/mainnet.go b/fixtures/networks/mainnet.go
index 3969ac2280..91f6196abe 100644
--- a/fixtures/networks/mainnet.go
+++ b/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},
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 15c69f9bd5..e04cb3ce82 100644
--- a/pkg/config/config.go
+++ b/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,
 }

From 42584c873e64a23e145d9fa2af0690f1b460a463 Mon Sep 17 00:00:00 2001
From: simlecode <69969590+simlecode@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:47:43 +0800
Subject: [PATCH 4/5] fix(events): order entries by insertion order when
 selecting

---
 pkg/events/filter/index.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/events/filter/index.go b/pkg/events/filter/index.go
index a536ba1e57..7249133abc 100644
--- a/pkg/events/filter/index.go
+++ b/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 {

From db71acaabf40145e939b766932090c1b01207825 Mon Sep 17 00:00:00 2001
From: simlecode <69969590+simlecode@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:25:34 +0800
Subject: [PATCH 5/5] fix(ci): add CODECOV_TOKEN

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eb0a7814fa..15d53f192c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,7 +67,7 @@ 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: false