From a7b31b86136c2bfed0fcbd9233ef0708c23f683f Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Tue, 19 Sep 2023 17:51:11 +0000
Subject: [PATCH] fixup! fix: halt-height behavior is not deterministic

---
 CHANGELOG-Agoric.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG.md        |  2 --
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 CHANGELOG-Agoric.md

diff --git a/CHANGELOG-Agoric.md b/CHANGELOG-Agoric.md
new file mode 100644
index 0000000000000..6962ec485d42f
--- /dev/null
+++ b/CHANGELOG-Agoric.md
@@ -0,0 +1,42 @@
+<!--
+Guiding Principles:
+
+Changelogs are for humans, not machines.
+There should be an entry for every single version.
+The same types of changes should be grouped.
+Versions and sections should be linkable.
+The latest version comes first.
+The release date of each version is displayed.
+Mention whether you follow Semantic Versioning.
+
+Usage:
+
+Change log entries are to be added to the Unreleased section under the
+appropriate stanza (see below). Each entry should ideally include a tag and
+the Github issue reference in the following format:
+
+* (<tag>) \#<issue-number> message
+
+The issue numbers will later be link-ified during the release process so you do
+not have to worry about including a link manually, but you can if you wish.
+
+Types of changes (Stanzas):
+
+"Features" for new features.
+"Improvements" for changes in existing functionality.
+"Deprecated" for soon-to-be removed features.
+"Bug Fixes" for any bug fixes.
+"Client Breaking" for breaking Protobuf, gRPC and REST routes used by end-users.
+"CLI Breaking" for breaking CLI commands.
+"API Breaking" for breaking exported APIs used by developers building on SDK.
+"State Machine Breaking" for any changes that result in a different AppState given same genesisState and txList.
+Ref: https://keepachangelog.com/en/1.0.0/
+-->
+
+# Changelog
+
+## [Unreleased]
+
+### Bug Fixes
+
+- (baseapp) [#305](https://github.com/agoric-labs/cosmos-sdk/pull/305) Make sure we don't execute blocks beyond the halt height. Port of [cosmos/cosmos-sdk#16639](https://github.com/cosmos/cosmos-sdk/pull/16639)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3a74a75a21cd..ae68bfc1653f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,8 +37,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-* (baseapp) [#305](https://github.com/agoric-labs/cosmos-sdk/pull/305) Make sure we don't execute blocks beyond the halt height.
-
 ## v0.45.11 - 2022-11-09
 
 ### Improvements