Comparing v0.50.x against `merge-base` #432

michaelfig · 2024-12-18T19:21:28Z

Description

Closes: #XXXX

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...

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)

…s#13996) * chore: add group and gov/v1 in swagger (cosmos#13984) Co-authored-by: Marko <[email protected]> (cherry picked from commit cfa224c) # Conflicts: # client/docs/config.json # client/docs/swagger-ui/swagger.yaml * updates Co-authored-by: Julien Robert <[email protected]>

…os#14053)

…cosmos#13651) (cosmos#14082)

…4071) (cosmos#14091) * fix(group)!: Don't re-tally proposals after VP end (cosmos#14071) (cherry picked from commit 4ebe3aa) # Conflicts: # CHANGELOG.md * fix changelog and test Co-authored-by: Amaury <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…mos#14101) * fix: do not shadow clientCtx in start.go (cosmos#14086) (cherry picked from commit f96072d) # Conflicts: # server/start.go * updates Co-authored-by: Julien Robert <[email protected]>

(cherry picked from commit 9f46665) Co-authored-by: Aleksandr Bezobchuk <[email protected]>

@mbreithecker

* fix: remove duplicate ante events (cosmos#13983) ## Description After enabling the post-handler on our chain, we realised something odd with our transaction events. The ordering was `[ANTE, MSGS, ANTE, POST]`. After doing some digging, we realised that the context used inside the post-handler still contains the events from the ante-handler. This should be backported to v0.46.x and v0.47.x 😄 Happy to make it compatible with cosmos#13940 when that gets merged! cc @mbreithecker --- ### 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](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] 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](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) 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) (cherry picked from commit 25449b5) # Conflicts: # CHANGELOG.md * fix changelog Co-authored-by: John Letey <[email protected]> Co-authored-by: Julien Robert <[email protected]>

* feat: add store name in `tracekv`-emitted store traces (cosmos#11646) * feature: Clone and Merge methods on TraceContext * chore: use TraceContext.Merge method in SetTracingContext * feature: add Store name in TraceContext during execution * chore: update rootmulti Store TraceContext on *Store after Merge() * add changelog entry Co-authored-by: Gianguido Sorà <[email protected]>

…) (cosmos#14139) * fix: state listener observe writes at wrong time (cosmos#13516) * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync * synchronous abci call, and format doc * fix comment * update file streamer readme and fix typos * typo * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync synchronous abci call, and format doc fix comment update file streamer readme and fix typos typo * improve UX of file streamer, make it immediately usable after enabled - set default value to write_dir. - make write_dir based on home directory by default. - auto-create the directory if not exists. * get homePage from opts Co-authored-by: Marko <[email protected]> (cherry picked from commit 1f91ee2) # Conflicts: # CHANGELOG.md # api/cosmos/base/store/v1beta1/listening.pulsar.go # baseapp/abci.go # baseapp/streaming.go # docs/architecture/adr-038-state-listening.md # server/config/config.go # server/config/toml.go # simapp/app.go # simapp/app_v2.go # store/cachemulti/store.go # store/iavl/store.go # store/mem/store.go # store/rootmulti/store.go # store/streaming/constructor.go # store/streaming/constructor_test.go # store/streaming/file/README.md # store/streaming/file/service.go # store/streaming/file/service_test.go # store/types/listening.pb.go # store/types/store.go * `make proto-gen`, update changelog, delete uncessary files * fix conflicts * fix GetConfig Co-authored-by: yihuang <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…osmos#14169) * feat: support alternative query multistore (cosmos#13529) * support customize query multistore * Update CHANGELOG.md * fix test * Update baseapp/abci.go Co-authored-by: Aleksandr Bezobchuk <[email protected]> * Update baseapp/baseapp.go Co-authored-by: Aleksandr Bezobchuk <[email protected]> * Update baseapp/options.go Co-authored-by: Aleksandr Bezobchuk <[email protected]> * Apply suggestions from code review Co-authored-by: Marko <[email protected]> Co-authored-by: Aleksandr Bezobchuk <[email protected]> (cherry picked from commit 15accd7) # Conflicts: # CHANGELOG.md # baseapp/baseapp.go # baseapp/options.go * fix conflicts Co-authored-by: yihuang <[email protected]>

…) (cosmos#14138) * fix: state listener observe writes at wrong time (cosmos#13516) * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync * synchronous abci call, and format doc * fix comment * update file streamer readme and fix typos * typo * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync synchronous abci call, and format doc fix comment update file streamer readme and fix typos typo * improve UX of file streamer, make it immediately usable after enabled - set default value to write_dir. - make write_dir based on home directory by default. - auto-create the directory if not exists. * get homePage from opts Co-authored-by: Marko <[email protected]> (cherry picked from commit 1f91ee2) # Conflicts: # CHANGELOG.md # api/cosmos/base/store/v1beta1/listening.pulsar.go # baseapp/streaming.go # docs/architecture/adr-038-state-listening.md # server/config/toml.go # simapp/app_v2.go # store/cachemulti/store.go # store/iavl/store.go # store/mem/store.go # store/streaming/constructor.go # store/streaming/file/service.go # store/streaming/file/service_test.go # store/types/listening.pb.go # store/types/store.go * `make proto-gen`, update changelog, delete uncessary files * fix conflicts * fix conflicts * revert api breaking change * fix build * fix unit test Co-authored-by: yihuang <[email protected]> Co-authored-by: Julien Robert <[email protected]> Co-authored-by: Marko <[email protected]>

cosmos#14178) * refactor: provide a helper for baseapp options (cosmos#14175) * provide a helper for baseapp options * rename * changelog entry * fix spelling (cherry picked from commit 1b6192f) # Conflicts: # CHANGELOG.md # server/mock/app_test.go # simapp/simd/cmd/root.go * conflicts * lint Co-authored-by: Marko <[email protected]>

Co-authored-by: Aaron Craelius <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…) (cosmos#14236)

…) (cosmos#14235)

…osmos#14241) Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…osmos#14242) Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]>

Co-authored-by: Amaury <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…mos#14305) (cosmos#14309) Co-authored-by: Daniel Wedul <[email protected]> Co-authored-by: Julien Robert <[email protected]>

…osmos#14347) (cosmos#14400)

…14422)

…osmos#14459) Co-authored-by: yihuang <[email protected]>

…) (cosmos#14341) Co-authored-by: yihuang <[email protected]> Co-authored-by: marbar3778 <[email protected]> Co-authored-by: Matt Kocubinski <[email protected]>

Co-authored-by: yihuang <[email protected]> Co-authored-by: Julien Robert <[email protected]> Co-authored-by: Matt Kocubinski <[email protected]>

…4526) (cosmos#14528) Co-authored-by: Julien Robert <[email protected]>

ci(lint): make tolerant of deprecations

…ated-update ci(mergify): upgrade configuration to current format

mergify · 2024-12-18T19:22:13Z

⚠️ The sha of the head commit of this PR conflicts with #429. Mergify cannot evaluate rules on this PR. ⚠️

github-advanced-security

gosec found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

api/cosmos/vesting/v1beta1/vesting.pulsar.go

+		x.VestingPeriods = *clv.list
+	default:
+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.vesting.v1beta1.ClawbackVestingAccount"))


api/cosmos/vesting/v1beta1/vesting.pulsar.go

+		if fd.IsExtension() {
+			panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.vesting.v1beta1.ClawbackVestingAccount"))
+		}
+		panic(fmt.Errorf("message cosmos.vesting.v1beta1.ClawbackVestingAccount does not contain field %s", fd.FullName()))


michaelfig

@JeancarloBarrios, besides the things I've pointed out, I think the only missing [AGORIC] marked changes are related to baseapp/baseapp.go's Context keys for including TX hash and msg index.

I think those need to be preserved in merge-base, since our agoric-sdk/golang/cosmos/app doesn't have enough context itself to reproduce the functionality. We can still aspire to make it work in the agoric-sdk without requiring these changes to our forked cosmos-sdk, but we don't need to rush that work yet for our immediate goal.

.github/workflows/lint.yml

michaelfig · 2024-12-18T21:16:18Z

x/auth/vesting/testutil/expected_keepers_mocks.go

+}
+
+// NewMockStakingKeeper creates a new mock instance.
+func NewMockStakingKeeper(ctrl *gomock.Controller) MockStakingKeeper {


Seems this should be:

Suggested change

func NewMockStakingKeeper(ctrl *gomock.Controller) MockStakingKeeper {

func NewMockStakingKeeper(ctrl *gomock.Controller) *MockStakingKeeper {

baseapp/abci.go

michaelfig · 2024-12-30T17:48:16Z

server/config/config.go

@@ -29,6 +35,9 @@ const (
 	// DefaultGRPCMaxSendMsgSize defines the default gRPC max message size in
 	// bytes the server can send.
 	DefaultGRPCMaxSendMsgSize = math.MaxInt32
+
+	// DefaultABCIClientType defines the default ABCI client type to use with cometbft.
+	DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC]


There's some more references to DefaultABCIClientType and AbciClientType... in the server package from the Agoric branch. Please either leave some TODO comments as below, or complete the implementation.

Suggested change

DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC]

DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC] TODO: Use in `DefaultConfig().BaseConfig.ABCIClientType` initialization below

// [AGORIC] TODO: implement `FlagAbciClientType` in `server/start.go` module, `addStartNodeFlags`

baseapp/abci.go

for abci

mergify · 2024-12-31T16:20:38Z

⚠️ The sha of the head commit of this PR conflicts with #429. Mergify cannot evaluate rules on this PR. ⚠️

julienrbrt and others added 30 commits November 22, 2022 15:55

chore: bump tendermint to 0.34.24 (cosmos#13973)

49b9aed

fix(baseapp): fix snapshot interval bug (backport cosmos#14049) (cosm…

7bb7fa9

…os#14053)

refactor: use viper unmarshal in config.GetConfig function (backport …

c1f4ca1

…cosmos#13651) (cosmos#14082)

fix: do not shadow clientCtx in start.go (backport cosmos#14086) (cos…

85d6f66

…mos#14101) * fix: do not shadow clientCtx in start.go (cosmos#14086) (cherry picked from commit f96072d) # Conflicts: # server/start.go * updates Co-authored-by: Julien Robert <[email protected]>

fix: do not shadow clientCtx in start.go (cosmos#14086) (cosmos#14102)

8bf996f

chore: Test for Server Config Read cosmos#14125 (cosmos#14127)

6e5e302

(cherry picked from commit 9f46665) Co-authored-by: Aleksandr Bezobchuk <[email protected]>

feat: add --grpc client option (backport cosmos#14051) (cosmos#14192)

463f4e4

Co-authored-by: Aaron Craelius <[email protected]> Co-authored-by: Julien Robert <[email protected]>

refactor: cleanup store/streaming/constructor.go (backport cosmos#14044…

eb6d0ef

…) (cosmos#14236)

refactor: cleanup store/streaming/constructor.go (backport cosmos#14044…

0b6c346

…) (cosmos#14235)

chore: audit store/streaming/file/service.go (backport cosmos#14234) (c…

fcfa361

…osmos#14241) Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]>

chore: audit store/streaming/file/service.go (backport cosmos#14234) (c…

c0d85e3

…osmos#14242) Co-authored-by: Aleksandr Bezobchuk <[email protected]> Co-authored-by: Julien Robert <[email protected]>

fix: fix grpc flag conflict (backport cosmos#14244) (cosmos#14248)

79ac73d

chore: prepare 0.46.7 release (cosmos#14103)

4153b12

fix(gov): Fix v3 votes migrations (backport cosmos#14214) (cosmos#14277)

f71df80

Co-authored-by: Amaury <[email protected]> Co-authored-by: Julien Robert <[email protected]>

fix(store): Fix the TestFileStreamingService unit test. (backport cos…

9122aad

…mos#14305) (cosmos#14309) Co-authored-by: Daniel Wedul <[email protected]> Co-authored-by: Julien Robert <[email protected]>

feat(gov): support v1.Proposal in v1beta1.Proposal.Content (backport c…

e641907

…osmos#14347) (cosmos#14400)

feat!: remove x/gov/migrations/v046.Migrate_V046_6_To_V046_7 (cosmos#…

4ed7888

…14422)

fix: return anteEvents when postHandler fail (backport cosmos#14448) (c…

e7dd5e0

…osmos#14459) Co-authored-by: yihuang <[email protected]>

perf: optimize iteration on nested cache context (backport cosmos#13881…

77e66cf

…) (cosmos#14341) Co-authored-by: yihuang <[email protected]> Co-authored-by: marbar3778 <[email protected]> Co-authored-by: Matt Kocubinski <[email protected]>

chore: backport pr 13881 (cosmos#14349)

93fd49d

Co-authored-by: yihuang <[email protected]> Co-authored-by: Julien Robert <[email protected]> Co-authored-by: Matt Kocubinski <[email protected]>

fix: wrong address set in EventUpdateGroupPolicy (backport cosmos#1…

36784a8

…4526) (cosmos#14528) Co-authored-by: Julien Robert <[email protected]>

chore: prepare v0.45.12 release (cosmos#14623)

9f23566

michaelfig and others added 12 commits August 4, 2024 00:27

ci(lint): make tolerant of deprecations

b6f68ab

Merge pull request #422 from agoric-labs/mfig-ci-lint

2c7e403

ci(lint): make tolerant of deprecations

ci(mergify): upgrade configuration to current format

80a763a

Merge pull request #428 from agoric-labs/mergify/configuration-deprec…

57485f5

…ated-update ci(mergify): upgrade configuration to current format

Merge tag 'v0.46.16-alpha.agoric.2.4' into merge-base

411b159

Merge branch 'Agoric' into merge-base

7f78bf0

Merge branch 'Agoric' into merge-base

00e9624

Merge branch 'Agoric' into merge-base

c8084ca

Fix protos

0c8de44

Fix type returns

193891e

Fix type returns

51fe361

remove duplicate

375b089

michaelfig self-assigned this Dec 18, 2024

github-actions bot added C:x/auth Type: CI C:x/staking labels Dec 18, 2024

github-advanced-security bot found potential problems Dec 18, 2024

View reviewed changes

fix: add killing agoric process in the case of halt

b79e9dc

mergify bot mentioned this pull request Dec 29, 2024

chore: v0.50 upgrade #429

Draft

19 tasks

JeancarloBarrios added 2 commits December 29, 2024 20:59

fix: add event History

b62bd61

fix: added config for ABCIClientTuype

086d877

michaelfig commented Dec 30, 2024

View reviewed changes

JeancarloBarrios and others added 5 commits December 30, 2024 14:19

fix: typos and comments

3278616

for abci

fix: remove unnesasary matryx check workflow

892d0b9

fix: typos and comments

65eaff6

for abci

fix: staking keepers

60f97f1

fix: config

03ea5e4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comparing v0.50.x against `merge-base` #432

Comparing v0.50.x against `merge-base` #432

michaelfig commented Dec 18, 2024

mergify bot commented Dec 18, 2024

github-advanced-security bot left a comment

michaelfig left a comment

michaelfig Dec 18, 2024

michaelfig Dec 30, 2024

mergify bot commented Dec 31, 2024

	func NewMockStakingKeeper(ctrl *gomock.Controller) MockStakingKeeper {
	func NewMockStakingKeeper(ctrl gomock.Controller) MockStakingKeeper {

	DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC]
	DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC] TODO: Use in `DefaultConfig().BaseConfig.ABCIClientType` initialization below
	// [AGORIC] TODO: implement `FlagAbciClientType` in `server/start.go` module, `addStartNodeFlags`

Comparing v0.50.x against merge-base #432

Are you sure you want to change the base?

Comparing v0.50.x against merge-base #432

Conversation

michaelfig commented Dec 18, 2024

Description

Author Checklist

Reviewers Checklist

mergify bot commented Dec 18, 2024

github-advanced-security bot left a comment

Choose a reason for hiding this comment

michaelfig left a comment

Choose a reason for hiding this comment

michaelfig Dec 18, 2024

Choose a reason for hiding this comment

michaelfig Dec 30, 2024

Choose a reason for hiding this comment

mergify bot commented Dec 31, 2024

Comparing v0.50.x against `merge-base` #432

Comparing v0.50.x against `merge-base` #432