Applied Agoric changes without history

.github/workflows/labeler.yml

@@ -6,6 +6,6 @@ jobs:
   labeler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@main
+      - uses: actions/labeler@v4 # v5 is broken, ref https://github.com/actions/labeler/issues/712. Do not bump.
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.mergify.yml

@@ -1,50 +1,33 @@
 queue_rules:
   - name: default
     conditions:
-      - "#approved-reviews-by>1"
+      - base~=^Agoric
+
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
+  - name: automerge to Agoric* with label automerge and branch protection passing
     conditions:
-      - "#approved-reviews-by>1"
-      - base=main
-      - label=A:automerge
+      - "#approved-reviews-by>0"
+      - base~=^Agoric
+      - label=automerge
     actions:
       queue:
         name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
-  - name: backport patches to v0.46.x branch
-    conditions:
-      - base=main
-      - label=backport/0.46.x
-    actions:
-      backport:
-        branches:
-          - release/v0.46.x
-  - name: backport patches to v0.45.x branch
-    conditions:
-      - base=main
-      - label=backport/0.45.x
-    actions:
-      backport:
-        branches:
-          - release/v0.45.x
-  - name: backport patches to v0.44.x branch
+        method: merge
+      # commit_message: title+body
+  - name: backport patches to Agoric branch
     conditions:
-      - base=main
-      - label=backport/0.44.x
+      - base=Agoric-ag0
+      - label=backport/Agoric
     actions:
       backport:
         branches:
-          - release/v0.44.x
-  - name: backport patches to v0.42.x branch
+          - Agoric
+  - name: backport patches to Agoric-ag0 branch
     conditions:
-      - base=main
-      - label=backport/0.42.x (Stargate)
+      - base=Agoric
+      - label=backport/Agoric-ag0
     actions:
       backport:
         branches:
-          - release/v0.42.x
+          - Agoric-ag0

Agoric-branch-notes.md

@@ -0,0 +1,25 @@
+We have:
+
+- `Agoric` - the head of this branch should be eventually used by the
+  [agoric-sdk](https://github.com/Agoric/agoric-sdk).
+- [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`
+
+For new features:
+
+- Create a new development branch off of `Agoric` or `Agoric-ag0`
+- Test, review, merge PR with `automerge` label for mergify.io
+- Add `backport/ag0` label or `backport/Agoric` to have mergify port the PR to
+  the other branch
+
+Upon new cosmos-sdk releases:
+
+- Say we now have `cosmos/[email protected]`
+- Merge `upstream/v0.43.0-rc0` into `Agoric`, create tag `v0.43.0-rc0.agoric`
+- Push tag to origin
+- Use that tag in the `agoric-sdk/go.mod` in the `replace` directive for `cosmos-sdk`
+- build `agoric-sdk` and do any manual tests locally
+- submit a PR against `agoric-sdk` for CI tests to run, then merge

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
+
+### Improvements
+
+* (auth) [#407](https://github.com/agoric-labs/cosmos-sdk/pull/407) Configurable fee collector module account in DeductFeeDecorator.
+
+### API Breaking
+
+* (auth, bank) Agoric/agoric-sdk#8989 Remove deprecated lien support
+
+## `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) #??? 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 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`.

Makefile

@@ -10,7 +10,8 @@ BINDIR ?= $(GOPATH)/bin
 BUILDDIR ?= $(CURDIR)/build
 SIMAPP = ./simapp
 MOCKS_DIR = $(CURDIR)/tests/mocks
-HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
+PR_TARGET_REPO = https://github.com/agoric-labs/cosmos-sdk.git
+PR_TARGET_BRANCH = Agoric
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
@@ -415,9 +416,9 @@ proto-lint:
 	@$(DOCKER_BUF) lint --error-format=json
 
 proto-check-breaking:
-	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
+	@$(DOCKER_BUF) breaking --against $(PR_TARGET_REPO)#branch=$(PR_TARGET_BRANCH)
 
-TM_URL              = https://raw.githubusercontent.com/cometbft/cometbft/v0.34.28/proto/tendermint
+TM_URL              = https://raw.githubusercontent.com/agoric-labs/cometbft/v0.34.30-alpha.agoric.1/proto/tendermint
 
 TM_CRYPTO_TYPES     = proto/tendermint/crypto
 TM_ABCI_TYPES       = proto/tendermint/abci