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

build: Cherry pick commits for patch release #414

Merged
merged 5 commits into from
Apr 12, 2024

Conversation

gibson042
Copy link

@gibson042 gibson042 commented Apr 12, 2024

Refs: Agoric/agoric-sdk#9224

Branch creation log:

$ git checkout -b gibson-2024-04-prep-hotfix v0.46.16-alpha.agoric.2.1

$ git log --oneline --graph -10 upstream/Agoric
* 1206d21b7e (upstream/HEAD, upstream/Agoric) fix(baseapp): Ignore events from simulated transactions (#413)
* f4acfd1b3f build(deps): Bump iavl to v0.19.7 (merge #412)
*   26f841fac4 (origin/Agoric, Agoric) Merge pull request #409 from agoric-labs/9224-abci-client-flag
|\  
| * e2ccda89e8 docs: changelog
| * 2dfc49e368 feat: feature flag to select ABCI client type
|/  
*   76e1519145 Merge pull request #408 from agoric-labs/jimlarson-doc-cleanup
|\  
| * 7d05dcdfd0 docs: update branch and tag conventions and policies
|/  
* fd885178a6 feat: configurable fee collector for DeductFeeDecorator (#407)
*   a0154d6890 Merge pull request #404 from agoric-labs/jimlarson-lint
|\  
| * e96708b346 chore: silence some lint warnings
|/  

$ git cherry-pick 2dfc49e368 e2ccda89e8 f4acfd1b3f 1206d21b7e
[gibson-2024-04-prep-hotfix 61a6f2ea66] feat: feature flag to select ABCI client type
 Author: Jim Larson <[email protected]>
 Date: Thu Apr 11 16:25:14 2024 -0700
 2 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 server/start_test.go
Auto-merging CHANGELOG-Agoric.md
[gibson-2024-04-prep-hotfix 8db9c69a12] docs: changelog
 Author: Jim Larson <[email protected]>
 Date: Thu Apr 11 16:31:45 2024 -0700
 1 file changed, 1 insertion(+)
Auto-merging CHANGELOG-Agoric.md
[gibson-2024-04-prep-hotfix 0b554fc472] build(deps): Bump iavl to v0.19.7 (merge #412)
 Date: Fri Apr 12 14:42:47 2024 -0400
 3 files changed, 5 insertions(+), 2 deletions(-)
Auto-merging CHANGELOG-Agoric.md
[gibson-2024-04-prep-hotfix 23324f6535] fix(baseapp): Ignore events from simulated transactions (#413)
 Date: Fri Apr 12 14:43:58 2024 -0400
 2 files changed, 5 insertions(+), 1 deletion(-)

$ vim CHANGELOG-Agoric.md 
$ git diff v0.46.16-alpha.agoric.2.1 -- CHANGELOG-Agoric.md
diff --git c/CHANGELOG-Agoric.md w/CHANGELOG-Agoric.md
index 0ff514930d..472a30acff 100644
--- c/CHANGELOG-Agoric.md
+++ w/CHANGELOG-Agoric.md
@@ -45,6 +45,17 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (auth, bank) Agoric/agoric-sdk#8989 Remove deprecated lien support
 
+## `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

$ git add CHANGELOG-Agoric.md 

$ git commit -m 'docs: Update changelog'
[gibson-2024-04-prep-hotfix 3468c72e55] docs: Update changelog
 1 file changed, 9 insertions(+), 4 deletions(-)

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md CHANGELOG-Agoric.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@gibson042 gibson042 requested a review from JimLarson April 12, 2024 19:09
@JimLarson
Copy link

Failing lint check expected - it fails in upstream at this version.

@gibson042 gibson042 merged commit 33c8d96 into Agoric-v0.46.16.2.x Apr 12, 2024
28 of 29 checks passed
@gibson042 gibson042 deleted the gibson-2024-04-prep-hotfix branch April 12, 2024 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants