Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump v1.15.1 #6310

Merged
merged 5 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion fixtures/networks/mainnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion pkg/events/filter/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading