Comparing v0.50.x against merge-base

.github/workflows/lint.yml

@@ -47,3 +47,4 @@ jobs:
         env:
           GIT_DIFF: ${{ env.GIT_DIFF }}
           LINT_DIFF: 1
+

.golangci.yml

@@ -28,7 +28,8 @@ linters:
     - ineffassign
     - misspell
     - nakedret
-    - nolintlint
+    # [AGORIC] Caused false-positives
+    # - nolintlint
     - staticcheck
     - revive
     - stylecheck

.mergify.yml

@@ -1,38 +1,15 @@
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>1"
+    queue_conditions:
+      - "#approved-reviews-by>0"
+      - base~=^Agoric
+      - label=automerge
+    merge_conditions:
+      - base~=^Agoric
+    merge_method: merge
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
-    conditions:
-      - "#approved-reviews-by>1"
-      - base=main
-      - label=A:automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
-  - name: backport patches to v0.50.x branch
-    conditions:
-      - base=main
-      - label=backport/v0.50.x
-    actions:
-      backport:
-        branches:
-          - release/v0.50.x
-  - name: backport patches to v0.47.x branch
-    conditions:
-      - base=main
-      - label=backport/v0.47.x
-    actions:
-      backport:
-        branches:
-          - release/v0.47.x
-  - name: backport patches to v0.46.x branch
+  - name: backport patches to Agoric branch
     conditions:
       - base=main
       - label=backport/0.46.x
@@ -47,4 +24,8 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - release/v0.45.x
+          - Agoric-ag0
+  - name: automerge to Agoric* with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue:

Agoric-branch-notes.md

@@ -0,0 +1,37 @@
+We use the following branches:
+
+- `Agoric` - the trunk for our cosmos-sdk fork, used by [agoric-sdk](https://github.com/Agoric/agoric-sdk).
+    - New features which we plan to use in a near-future release are added here.
+    - Most releases are tagged here.
+- `Agoric-vX.Y.Z-alpha.agoric.A.x` - a lazily-created release branch.
+    - Branched off of release tag `vX.Y.Z-alpha.agoric.A`.
+    - Created when we need a new release that omits some changes present on trunk.
+    - Prefer to contain only cherry-picks from trunk.
+- Pattern can be extended to sub-sub-branches should the need arise.
+
+Tag convention:
+
+- `vX.Y.Z-alpha.agoric.A` for tagged releases on the `Agoric` branch:
+    - `vX.Y.Z` is the version of the latest integrated cosmos/cosmos-sdk release.
+    - The `A` is an increasing sequence resetting to `1` after the integration of a new cosmos/cosmos-sdk release.
+- `vX.Y.Z-alpha.agoric.A.B` for "patch" releases on branch `Agoric-vX.Y.Z-alpha.agoric.A.x`.
+    - `B` starts at 1 and increases sequentially.
+- Pattern can be extended to releases on sub-sub-branches should the need arise.
+
+For new features:
+
+- New features should be landed on `Agoric` first, then cherry-picked to a release branch as needed.
+- Create a new development branch off of `Agoric`.
+- Make changes, indicating code specific to our fork by ensuring the presence of a preceding or same-line
+  comment including "[AGORIC]" (e.g., `// [AGORIC] Propagate the event history.`).
+- Test, review, merge PR with `automerge` label for mergify.io
+    - Don't forget to update `CHANGELOG-Agoric.md` with the change and a link to its PR.
+
+Upon new cosmos-sdk releases, see [upgrading the Interchain Stack](https://github.com/Agoric/agoric-sdk/wiki/Upgrading-the-Interchain-Stack).
+
+Historical work:
+- [ag0](https://github.com/Agoric/ag0) [Agoric mainnet](https://agoric.com)
+  phase 0's [gaiad-equivalent](https://github.com/cosmos/gaia)
+- `Agoric-ag0` - should be identical to
+  [cosmos/cosmos-sdk](https://github.com/cosmos/cosmos-sdk) + changes needed by
+  `ag0`

CHANGELOG-Agoric.md

@@ -0,0 +1,128 @@
+<!--
+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 (Agoric fork)
+
+## Unreleased
+
+### API Breaking
+
+* (auth, bank) Agoric/agoric-sdk#8989 Remove deprecated lien support
+
+### Bug Fixes
+
+* (baseapp) [#338](https://github.com/agoric-labs/cosmos-sdk/pull/338) Make sure we don't execute blocks beyond the halt height. Restored from [#305](https://github.com/agoric-labs/cosmos-sdk/pull/305) but compatible with older `SIGINT`, `SIGTERM` logic
+
+## `v0.46.16-alpha.agoric.2.4` - 2024-04-19
+
+### Improvements
+
+* (server) [#419](https://github.com/agoric-labs/cosmos-sdk/pull/419) More unit tests for flag vs toml precedence for ABCI client type.
+
+## `v0.46.16-alpha.agoric.2.3` - 2024-04-17
+
+### Improvements
+
+* (baseapp) [#415](https://github.com/agoric-labs/cosmos-sdk/pull/415) Unit tests and documentation for event history.
+* (server) [#416](https://github.com/agoric-labs/cosmos-sdk/pull/416) Config entry to select ABCI client type.
+
+### Bug Fixes
+
+* (baseapp) [#415](https://github.com/agoric-labs/cosmos-sdk/pull/415) Avoid duplicates in event history.
+
+## `v0.46.16-alpha.agoric.2.2` - 2024-04-12
+
+### Improvements
+
+* (server) [#409](https://github.com/agoric-labs/cosmos-sdk/pull/409) Flag to select ABCI client type.
+* (deps) [#412](https://github.com/agoric-labs/cosmos-sdk/pull/412) Bump iavl to v0.19.7
+
+### Bug Fixes
+
+* (baseapp) [#413](https://github.com/agoric-labs/cosmos-sdk/pull/413) Ignore events from simulated transactions
+
+## `v0.46.16-alpha.agoric.2.1` - 2024-03-08
+
+### Improvements
+
+* (auth) [#407](https://github.com/agoric-labs/cosmos-sdk/pull/407) Configurable fee collector module account in DeductFeeDecorator. (backport #407)
+
+## `v0.46.16-alpha.agoric.2` - 2024-02-08
+
+* Agoric/agoric-sdk#8871 Have `tx gov submit-proposal` accept either new or legacy syntax
+
+### Bug Fixes
+
+* (crypto) [#19371](https://github.com/cosmos/cosmos-sdk/pull/19371) Avoid cli redundant log in stdout, log to stderr instead.
+
+## `v0.46.16-alpha.agoric.1` - 2024-02-05
+
+* Agoric/agoric-sdk#8224 Merge [cosmos/cosmos-sdk v0.46.16](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.16)
+
+### Bug Fixes
+
+* Agoric/agoric-sdk#8719 MsgClawback returns the wrong Type
+
+## `v0.45.16-alpha.agoric.3` - 2023-12-04
+
+* (vesting) [#342](https://github.com/agoric-labs/cosmos-sdk/pull/342) recipient can return clawback vesting grant to funder
+
+## `v0.45.16-alpha.agoric.2` - 2023-11-08
+
+### Bug Fixes
+
+* (baseapp) [#337](https://github.com/agoric-labs/cosmos-sdk/pull/337) revert [#305](https://github.com/agoric-labs/cosmos-sdk/pull/305) which causes test failures in agoric-sdk
+
+## `v0.45.16-alpha.agoric.1` - 2023-09-22
+
+### Improvements
+
+* Agoric/agoric-sdk#8223 Merge [cosmos/cosmos-sdk v0.45.16](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.16)
+* (vesting) [#303](https://github.com/agoric-labs/cosmos-sdk/pull/303) Improve vestcalc comments and documentation.
+
+### Bug Fixes
+
+* (snapshots) [#304](https://github.com/agoric-labs/cosmos-sdk/pull/304) raise the per snapshot item limit. Fixes [Agoric/agoric-sdk#8325](https://github.com/Agoric/agoric-sdk/issues/8325)
+* (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)
+
+## `v0.45.11-alpha.agoric.2` - 2023-03-23
+
+### Improvements
+
+* (snapshot) [#13400](https://github.com/cosmos/cosmos-sdk/pull/13400) Fix snapshot checksum issue in golang 1.19.
+
+### API Breaking Changes
+
+* (store) [#11825](https://github.com/cosmos/cosmos-sdk/pull/11825) Make extension snapshotter interface safer to use, renamed the util function `WriteExtensionItem` to `WriteExtensionPayload`.