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

chore: v0.50 upgrade #429

Draft
wants to merge 2,498 commits into
base: Agoric
Choose a base branch
from
Draft

chore: v0.50 upgrade #429

wants to merge 2,498 commits into from

Conversation

JeancarloBarrios
Copy link

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

  • 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
  • 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)

mergify bot and others added 30 commits November 7, 2023 20:31
…osmos#18516)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julien Robert <[email protected]>
…osmos#18571)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julien Robert <[email protected]>
… rely on gogo code gen types. (backport cosmos#18541) (cosmos#18593)

Co-authored-by: testinginprod <[email protected]>
…cosmos#18618)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…cosmos#18630)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@JeancarloBarrios JeancarloBarrios changed the title Merge base chore: v0.50 upgrade Dec 16, 2024
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@JeancarloBarrios
Copy link
Author

JeancarloBarrios commented Dec 16, 2024

I know the PR is quite large but this are the files that where modified:

... All the files

R100 .github/workflows/atlas.yml .github/workflows/atlas.yml.DISABLED
R100 .github/workflows/dependencies-review.yml .github/workflows/dependencies-review.yml.DISABLED
M .github/workflows/labeler.yml
R100 .github/workflows/linkchecker.yml .github/workflows/linkchecker.yml.DISABLED
R100 .github/workflows/stale.yml .github/workflows/stale.yml.DISABLED
M .mergify.yml
A Agoric-branch-notes.md
A CHANGELOG-Agoric.md
M Makefile
M baseapp/abci.go
M baseapp/abci_test.go
M baseapp/baseapp.go
M baseapp/baseapp_test.go
M baseapp/state.go
A cosmovisor/README-Agoric.md
M cosmovisor/args.go
M cosmovisor/args_test.go
M cosmovisor/cmd/cosmovisor/help.go
M cosmovisor/cmd/cosmovisor/help_test.go
M cosmovisor/cmd/cosmovisor/main.go
M cosmovisor/cmd/cosmovisor/run.go
M cosmovisor/cmd/cosmovisor/version.go
M cosmovisor/cmd/cosmovisor/version_test.go
M cosmovisor/go.mod
M cosmovisor/process_test.go
M cosmovisor/upgrade.go
M cosmovisor/upgrade_test.go
M crypto/keyring/keyring.go
M docs/architecture/adr-049-state-sync-hooks.md
M go.mod
M go.sum
M proto/cosmos/vesting/v1beta1/tx.proto
M proto/cosmos/vesting/v1beta1/vesting.proto
M server/config/config.go
M server/config/toml.go
M server/grpc/server.go
M server/start.go
A server/start_test.go
M simapp/app.go
M snapshots/helpers_test.go
M snapshots/manager.go
M snapshots/manager_test.go
M snapshots/stream.go
M snapshots/types/snapshotter.go
M snapshots/types/util.go
M store/rootmulti/snapshot_test.go
M testutil/network/util.go
M types/coin.go
M types/coin_test.go
M types/events.go
M types/module/module.go
M types/router.go
M x/auth/ante/fee.go
M x/auth/ante/fee_test.go
M x/auth/keeper/account.go
M x/auth/keeper/genesis.go
M x/auth/keeper/grpc_query.go
M x/auth/keeper/keeper.go
M x/auth/keeper/migrations.go
M x/auth/keeper/params.go
A x/auth/spec/08_agoric.md
M x/auth/spec/README.md
M x/auth/vesting/client/cli/tx.go
M x/auth/vesting/client/testutil/suite.go
A x/auth/vesting/client/testutil/testdata/badjson
A x/auth/vesting/client/testutil/testdata/badperiod.json
A x/auth/vesting/client/testutil/testdata/badperiod2.json
A x/auth/vesting/client/testutil/testdata/periods1.json
A x/auth/vesting/cmd/vestcalc/README.md
A x/auth/vesting/cmd/vestcalc/vestcalc.go
A x/auth/vesting/cmd/vestcalc/vestcalc_test.go
M x/auth/vesting/exported/exported.go
M x/auth/vesting/module.go
M x/auth/vesting/msg_server.go
M x/auth/vesting/types/codec.go
M x/auth/vesting/types/expected_keepers.go
M x/auth/vesting/types/genesis_test.go
A x/auth/vesting/types/hooks.go
M x/auth/vesting/types/msgs.go
A x/auth/vesting/types/msgs_test.go
M x/auth/vesting/types/period.go
A x/auth/vesting/types/period_test.go
M x/auth/vesting/types/tx.pb.go
M x/auth/vesting/types/vesting.pb.go
M x/auth/vesting/types/vesting_account.go
A x/auth/vesting/types/vesting_account_internal_test.go
M x/auth/vesting/types/vesting_account_test.go
M x/bank/keeper/keeper_test.go
M x/bank/keeper/view.go
M x/bank/types/vesting.go
M x/distribution/keeper/delegation.go
M x/distribution/keeper/hooks.go
M x/distribution/keeper/keeper.go
M x/distribution/keeper/store.go
M x/distribution/spec/05_hooks.md
M x/distribution/types/expected_keepers.go
M x/gov/client/cli/tx.go
M x/params/types/table.go
M x/staking/keeper/delegation.go
M x/staking/keeper/delegation_test.go

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@michaelfig
Copy link
Collaborator

As discussed on a call with @JeancarloBarrios, I'll be reviewing using the nohistory-v0.50.x-agoric branch and merge-base to get smaller differences to approve.

Also, the cosmovisor changes are not needed anymore.

@mergify mergify bot mentioned this pull request Dec 18, 2024
19 tasks
@michaelfig
Copy link
Collaborator

It looks like all of the Agoric custom code was removed from merge-base. That must be fixed since agd relies on this code to do its job correctly.

Please look at git diff Agoric...merge-base and search the output for the regex \[AGORIC\], which marks the Agoric-specific code. If those lines begin with a -, then that is code which is critical to keep but has been removed. Let's work together on finding a way to preserve or port this custom code.

This is the output I get on my machine. Note all the removals and no corresponding additions.
--- a/.golangci.yml
+++ b/.golangci.yml
     # [AGORIC] Caused false-positives
--
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
-		// [AGORIC] Propagate the event history.
-	// [AGORIC] Remember event history for successful deliveries.
-	// [AGORIC] Make a best-effort attempt to kill our process.
--
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
-// [AGORIC] Context keys for including TX hash and msg index.
-		eventHistory: []abci.Event{}, // [AGORIC]: start with an empty history.
-		eventHistory: []abci.Event{}, // [AGORIC]: start with an empty history.
-	// [AGORIC] Add Tx hash to the context if absent.
-		// [AGORIC] Propagate the message index in the context.
--
--- a/baseapp/state.go
+++ b/baseapp/state.go
-	// [AGORIC] The accumulated events are passed to the EndBlocker in its context's
--
--- a/server/config/config.go
+++ b/server/config/config.go
-// [AGORIC] Valid values for FlagAbciClientType
-	DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC]
-			ABCIClientType:      DefaultABCIClientType, // [AGORIC]
--
--- a/server/start.go
+++ b/server/start.go
-	// [AGORIC] allow the ABCI client type to be configurable.
-// [AGORIC] Allows us to disable committingClient.
--
--- a/types/events.go
+++ b/types/events.go
-	// [AGORIC] Used to communicate the history through the context.
-// [AGORIC] This should be used to create the EventManager for use in EndBlockers.
-// [AGORIC] This should only be called in EndBlock processing.
--
--- a/types/module/module.go
+++ b/types/module/module.go
-	// [AGORIC] Reset the EventManager, preserving any existing event history.

Copy link

mergify bot commented Dec 29, 2024

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

Copy link

mergify bot commented Dec 30, 2024

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

Copy link

mergify bot commented Dec 30, 2024

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

@JeancarloBarrios
Copy link
Author

It looks like all of the Agoric custom code was removed from merge-base. That must be fixed since agd relies on this code to do its job correctly.

Please look at git diff Agoric...merge-base and search the output for the regex \[AGORIC\], which marks the Agoric-specific code. If those lines begin with a -, then that is code which is critical to keep but has been removed. Let's work together on finding a way to preserve or port this custom code.

This is the output I get on my machine. Note all the removals and no corresponding additions.

--- a/.golangci.yml
+++ b/.golangci.yml
     # [AGORIC] Caused false-positives
--
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
-		// [AGORIC] Propagate the event history.
-	// [AGORIC] Remember event history for successful deliveries.
-	// [AGORIC] Make a best-effort attempt to kill our process.
--
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
-// [AGORIC] Context keys for including TX hash and msg index.
-		eventHistory: []abci.Event{}, // [AGORIC]: start with an empty history.
-		eventHistory: []abci.Event{}, // [AGORIC]: start with an empty history.
-	// [AGORIC] Add Tx hash to the context if absent.
-		// [AGORIC] Propagate the message index in the context.
--
--- a/baseapp/state.go
+++ b/baseapp/state.go
-	// [AGORIC] The accumulated events are passed to the EndBlocker in its context's
--
--- a/server/config/config.go
+++ b/server/config/config.go
-// [AGORIC] Valid values for FlagAbciClientType
-	DefaultABCIClientType = AbciClientTypeCommitting // [AGORIC]
-			ABCIClientType:      DefaultABCIClientType, // [AGORIC]
--
--- a/server/start.go
+++ b/server/start.go
-	// [AGORIC] allow the ABCI client type to be configurable.
-// [AGORIC] Allows us to disable committingClient.
--
--- a/types/events.go
+++ b/types/events.go
-	// [AGORIC] Used to communicate the history through the context.
-// [AGORIC] This should be used to create the EventManager for use in EndBlockers.
-// [AGORIC] This should only be called in EndBlock processing.
--
--- a/types/module/module.go
+++ b/types/module/module.go
-	// [AGORIC] Reset the EventManager, preserving any existing event history.

I believe i address them all but server, @michaelfig maybe is worth jumping on a call because also the tradition abci methods now work diferently. I ported it to the new mechanism but worth checking together

Copy link

mergify bot commented Dec 30, 2024

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

Copy link

mergify bot commented Dec 30, 2024

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

Copy link

mergify bot commented Dec 30, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.