From d8ba11f4924eb8513f5feeb17288f91d16b386c3 Mon Sep 17 00:00:00 2001 From: alexander-sei Date: Fri, 28 Aug 2026 19:54:28 +0200 Subject: [PATCH 1/2] BACKPORT-CONFLICT --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e649a7f7..2f2edecd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,20 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## v6.6 sei-chain +<<<<<<< HEAD * [#4006](https://github.com/sei-protocol/sei-chain/pull/4006) Backport `release/v6.6`: Disable transaction and evidence submission and mempool gossip in freeze mode +======= +* [#4053](https://github.com/sei-protocol/sei-chain/pull/4053) Backport `release/v6.6`: Validate snapshots before publication +* [#4050](https://github.com/sei-protocol/sei-chain/pull/4050) Backport `release/v6.6`: Fix memiavl snapshot race condition +* [#4048](https://github.com/sei-protocol/sei-chain/pull/4048) Backport `release/v6.6`: Bound frozen RPC router batch allocations +* [#4034](https://github.com/sei-protocol/sei-chain/pull/4034) Backport `release/v6.6`: Bound block reference parsing depth +* [#4024](https://github.com/sei-protocol/sei-chain/pull/4024) Backport `release/v6.6`: Add frozen RPC router and Docker integration cluster (#3989) +* [#4007](https://github.com/sei-protocol/sei-chain/pull/4007) Backport `release/v6.6`: Use iterative traversal for memiavl snapshot writes +* [#4006](https://github.com/sei-protocol/sei-chain/pull/4006) Backport `release/v6.6`: Disable mempool traffic in freeze mode +* [#3978](https://github.com/sei-protocol/sei-chain/pull/3978) Backport `release/v6.6`: Add freeze mode for historical EVM RPC +* [#3966](https://github.com/sei-protocol/sei-chain/pull/3966) Bump version to v6.6.2 in prep for patch release +* [#3965](https://github.com/sei-protocol/sei-chain/pull/3965) Backport `release/v6.6`: Update v6.6 change log in prep to cut v6.6.2 patch +>>>>>>> ea3836f (Update v6.6 change log in prep to cut v6.6.3 patch (#4033)) * [#3957](https://github.com/sei-protocol/sei-chain/pull/3957) Backport `release/v6.6`: Add context cancellation to SS DB layer * [#3954](https://github.com/sei-protocol/sei-chain/pull/3954) Backport `release/v6.6`: feat(seeds): ship Sei Labs seeds as the default bootstrap-peers * [#3951](https://github.com/sei-protocol/sei-chain/pull/3951) Backport `release/v6.6`: Tolerate failed Codex review executions From 75c1e0f2d8cfe8b75453f020f02823110c61d389 Mon Sep 17 00:00:00 2001 From: alexander-sei Date: Fri, 28 Aug 2026 20:05:14 +0200 Subject: [PATCH 2/2] Resolve v6.6 changelog conflicts Clean up the v6.6 changelog section by removing merge conflict markers and preserving the correct release notes for the patch series. This keeps the changelog consistent with the backported fixes and prevents duplicate or conflicting entries in the release history. --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f2edecd65..485c528802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,9 +30,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## v6.6 sei-chain -<<<<<<< HEAD -* [#4006](https://github.com/sei-protocol/sei-chain/pull/4006) Backport `release/v6.6`: Disable transaction and evidence submission and mempool gossip in freeze mode -======= * [#4053](https://github.com/sei-protocol/sei-chain/pull/4053) Backport `release/v6.6`: Validate snapshots before publication * [#4050](https://github.com/sei-protocol/sei-chain/pull/4050) Backport `release/v6.6`: Fix memiavl snapshot race condition * [#4048](https://github.com/sei-protocol/sei-chain/pull/4048) Backport `release/v6.6`: Bound frozen RPC router batch allocations @@ -43,7 +40,6 @@ sei-chain * [#3978](https://github.com/sei-protocol/sei-chain/pull/3978) Backport `release/v6.6`: Add freeze mode for historical EVM RPC * [#3966](https://github.com/sei-protocol/sei-chain/pull/3966) Bump version to v6.6.2 in prep for patch release * [#3965](https://github.com/sei-protocol/sei-chain/pull/3965) Backport `release/v6.6`: Update v6.6 change log in prep to cut v6.6.2 patch ->>>>>>> ea3836f (Update v6.6 change log in prep to cut v6.6.3 patch (#4033)) * [#3957](https://github.com/sei-protocol/sei-chain/pull/3957) Backport `release/v6.6`: Add context cancellation to SS DB layer * [#3954](https://github.com/sei-protocol/sei-chain/pull/3954) Backport `release/v6.6`: feat(seeds): ship Sei Labs seeds as the default bootstrap-peers * [#3951](https://github.com/sei-protocol/sei-chain/pull/3951) Backport `release/v6.6`: Tolerate failed Codex review executions