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.

Sign up for GitHub

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

Jump to bottom

refactor: revert auth extraction (backport #21507) #21529

Merged
merged 4 commits into from
Sep 3, 2024
Merged

refactor: revert auth extraction (backport #21507) #21529

merged 4 commits into from
Sep 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2024

Description

this pr reverts the extraction of auth from the cosmos sdk due to the dependency graph that exists

closes #21505

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, you can find examples of the prefixes below:

  • confirmed ! in 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

  • reviewed "Files changed" and left comments if necessary

  • included the necessary unit and integration tests

  • added a changelog entry to CHANGELOG.md

  • updated the relevant documentation or specification, including comments for documenting Go code

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

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage
This is an automatic backport of pull request #21507 done by [Mergify](https://mergify.com).

@tac0turtle @mergify
refactor: revert auth extraction (#21507)
9db63b7 
(cherry picked from commit 70488a8)

# Conflicts:
#	api/cosmos/auth/module/v1/module.pulsar.go
#	api/cosmos/tx/config/v1/config.pulsar.go
#	client/v2/go.mod
#	collections/README.md
#	collections/collections.go
#	collections/indexing.go
#	depinject/appconfig/README.md
#	go.mod
#	server/v2/cometbft/go.mod
#	x/accounts/defaults/lockup/go.mod
#	x/accounts/defaults/multisig/go.mod
#	x/auth/go.mod
#	x/auth/go.sum
#	x/authz/go.mod
#	x/bank/go.mod
#	x/circuit/go.mod
#	x/consensus/go.mod
#	x/distribution/go.mod
#	x/epochs/go.mod
#	x/evidence/go.mod
#	x/feegrant/go.mod
#	x/gov/go.mod
#	x/mint/go.mod
#	x/nft/go.mod
#	x/params/go.mod
#	x/protocolpool/go.mod
#	x/slashing/go.mod
#	x/staking/go.mod
#	x/upgrade/go.mod
@mergify mergify bot requested a review from a team as a code owner September 3, 2024 21:17
@mergify mergify bot added the conflicts label Sep 3, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 3, 2024

Cherry-pick of 70488a8 has failed:

On branch mergify/bp/release/v0.52.x/pr-21507
Your branch is up to date with 'origin/release/v0.52.x'.

You are currently cherry-picking commit 70488a89a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/test.yml
	modified:   CHANGELOG.md
	modified:   README.md
	modified:   UPGRADING.md
	modified:   baseapp/abci_test.go
	modified:   baseapp/abci_utils_test.go
	modified:   baseapp/baseapp_test.go
	modified:   baseapp/msg_service_router_test.go
	modified:   baseapp/utils_test.go
	modified:   client/tx/tx.go
	modified:   client/tx/tx_test.go
	modified:   client/tx_config.go
	modified:   client/v2/autocli/msg.go
	modified:   crypto/keyring/autocli.go
	modified:   crypto/keys/multisig/multisig_test.go
	modified:   docs/architecture/adr-011-generalize-genesis-accounts.md
	modified:   docs/architecture/adr-057-app-wiring.md
	modified:   proto/cosmos/tx/config/v1/config.proto
	modified:   runtime/app.go
	modified:   runtime/builder.go
	modified:   server/cmt_cmds.go
	modified:   server/mock/tx.go
	modified:   server/v2/cometbft/config.go
	modified:   simapp/ante.go
	modified:   simapp/app.go
	modified:   simapp/app_config.go
	modified:   simapp/app_di.go
	modified:   simapp/app_test.go
	modified:   simapp/genesis_account.go
	modified:   simapp/genesis_account_test.go
	modified:   simapp/go.mod
	modified:   simapp/mint_fn.go
	modified:   simapp/simd/cmd/commands.go
	modified:   simapp/simd/cmd/root.go
	modified:   simapp/simd/cmd/root_di.go
	modified:   simapp/simd/cmd/testnet.go
	modified:   simapp/simd/cmd/testnet_test.go
	modified:   simapp/test_helpers.go
	modified:   simapp/upgrades.go
	modified:   simapp/upgrades_test.go
	modified:   simapp/v2/app_config.go
	modified:   simapp/v2/app_di.go
	modified:   simapp/v2/app_test.go
	modified:   simapp/v2/genesis_account.go
	modified:   simapp/v2/genesis_account_test.go
	modified:   simapp/v2/go.mod
	modified:   simapp/v2/simdv2/cmd/commands.go
	modified:   simapp/v2/simdv2/cmd/root_di.go
	modified:   simapp/v2/simdv2/cmd/testnet.go
	modified:   tests/e2e/auth/keeper/account_retriever_test.go
	modified:   tests/e2e/auth/keeper/app_config.go
	modified:   tests/e2e/auth/keeper/keeper_bench_test.go
	modified:   tests/e2e/auth/keeper/module_test.go
	modified:   tests/e2e/auth/suite.go
	modified:   tests/e2e/authz/tx.go
	modified:   tests/e2e/baseapp/block_gas_test.go
	modified:   tests/e2e/baseapp/utils.go
	modified:   tests/e2e/gov/tx.go
	modified:   tests/e2e/tx/benchmarks_test.go
	modified:   tests/e2e/tx/service_test.go
	modified:   tests/go.mod
	modified:   tests/integration/auth/client/cli/suite_test.go
	modified:   tests/integration/auth/keeper/msg_server_test.go
	modified:   tests/integration/bank/app_test.go
	modified:   tests/integration/bank/bench_test.go
	modified:   tests/integration/bank/keeper/deterministic_test.go
	modified:   tests/integration/distribution/appconfig.go
	modified:   tests/integration/distribution/keeper/msg_server_test.go
	modified:   tests/integration/distribution/module_test.go
	modified:   tests/integration/evidence/app_config.go
	modified:   tests/integration/evidence/keeper/infraction_test.go
	modified:   tests/integration/example/example_test.go
	modified:   tests/integration/gov/abci_test.go
	modified:   tests/integration/gov/common_test.go
	modified:   tests/integration/gov/genesis_test.go
	modified:   tests/integration/gov/keeper/common_test.go
	modified:   tests/integration/gov/keeper/keeper_test.go
	modified:   tests/integration/gov/module_test.go
	modified:   tests/integration/mint/app_config.go
	modified:   tests/integration/mint/module_test.go
	modified:   tests/integration/protocolpool/app_config.go
	modified:   tests/integration/protocolpool/module_test.go
	modified:   tests/integration/rapidgen/rapidgen.go
	modified:   tests/integration/runtime/query_test.go
	modified:   tests/integration/server/grpc/out_of_gas_test.go
	modified:   tests/integration/server/grpc/server_test.go
	modified:   tests/integration/slashing/abci_test.go
	modified:   tests/integration/slashing/app_config.go
	modified:   tests/integration/slashing/keeper/keeper_test.go
	modified:   tests/integration/slashing/keeper/slash_redelegation_test.go
	modified:   tests/integration/slashing/slashing_test.go
	modified:   tests/integration/staking/app_config.go
	modified:   tests/integration/staking/keeper/common_test.go
	modified:   tests/integration/staking/keeper/deterministic_test.go
	modified:   tests/integration/staking/keeper/slash_test.go
	modified:   tests/integration/staking/module_test.go
	modified:   tests/integration/staking/simulation/operations_test.go
	modified:   tests/integration/tx/aminojson/aminojson_test.go
	modified:   tests/integration/tx/decode_test.go
	modified:   tests/integration/types/pagination_test.go
	modified:   tests/sims/authz/operations_test.go
	modified:   tests/sims/bank/operations_test.go
	modified:   tests/sims/distribution/app_config.go
	modified:   tests/sims/distribution/operations_test.go
	modified:   tests/sims/feegrant/operations_test.go
	modified:   tests/sims/gov/operations_test.go
	modified:   tests/sims/nft/app_config.go
	modified:   tests/sims/nft/operations_test.go
	modified:   tests/sims/protocolpool/app_config.go
	modified:   tests/sims/protocolpool/operations_test.go
	modified:   tests/sims/slashing/app_config.go
	modified:   tests/sims/slashing/operations_test.go
	modified:   testutil/cli/tx.go
	modified:   testutil/integration/router.go
	modified:   testutil/network/network.go
	modified:   testutil/network/util.go
	modified:   testutil/sims/app_helpers.go
	modified:   testutil/sims/state_helpers.go
	modified:   testutil/sims/tx_helpers.go
	modified:   testutil/x/counter/testutil/expected_keepers_mocks.go
	modified:   types/mempool/mempool_test.go
	modified:   types/mempool/priority_nonce_test.go
	modified:   types/mempool/sender_nonce.go
	modified:   types/mempool/sender_nonce_property_test.go
	modified:   types/mempool/signer_extraction_adapter.go
	modified:   types/module/module_test.go
	modified:   types/module/testutil/codec.go
	modified:   x/accounts/go.mod
	modified:   x/auth/ante/ante.go
	modified:   x/auth/ante/ante_test.go
	modified:   x/auth/ante/basic.go
	modified:   x/auth/ante/basic_test.go
	modified:   x/auth/ante/expected_keepers.go
	modified:   x/auth/ante/ext_test.go
	modified:   x/auth/ante/fee.go
	modified:   x/auth/ante/fee_test.go
	modified:   x/auth/ante/feegrant_test.go
	modified:   x/auth/ante/setup_test.go
	modified:   x/auth/ante/sigverify.go
	modified:   x/auth/ante/sigverify_internal_test.go
	modified:   x/auth/ante/sigverify_test.go
	modified:   x/auth/ante/testutil/expected_keepers_mocks.go
	modified:   x/auth/ante/testutil_test.go
	modified:   x/auth/ante/unordered.go
	modified:   x/auth/ante/unordered_test.go
	modified:   x/auth/ante/unorderedtx/manager_test.go
	modified:   x/auth/ante/unorderedtx/snapshotter_test.go
	modified:   x/auth/client/cli/broadcast.go
	modified:   x/auth/client/cli/encode.go
	modified:   x/auth/client/cli/encode_test.go
	modified:   x/auth/client/cli/query.go
	modified:   x/auth/client/cli/query_test.go
	modified:   x/auth/client/cli/tx_multisign.go
	modified:   x/auth/client/cli/tx_sign.go
	modified:   x/auth/client/cli/tx_simulate.go
	modified:   x/auth/client/cli/validate_sigs.go
	modified:   x/auth/client/testutil/helpers.go
	modified:   x/auth/client/tx_test.go
	modified:   x/auth/depinject.go
	modified:   x/auth/keeper/deterministic_test.go
	modified:   x/auth/keeper/genesis.go
	modified:   x/auth/keeper/grpc_query.go
	modified:   x/auth/keeper/grpc_query_test.go
	modified:   x/auth/keeper/keeper.go
	modified:   x/auth/keeper/keeper_test.go
	modified:   x/auth/keeper/migrations.go
	modified:   x/auth/keeper/msg_server.go
	modified:   x/auth/keeper/msg_server_test.go
	modified:   x/auth/migrations/legacytx/stdsig_test.go
	modified:   x/auth/module.go
	modified:   x/auth/proto/cosmos/auth/module/v1/module.proto
	modified:   x/auth/proto/cosmos/auth/v1beta1/auth.proto
	modified:   x/auth/proto/cosmos/auth/v1beta1/genesis.proto
	modified:   x/auth/proto/cosmos/auth/v1beta1/query.proto
	modified:   x/auth/proto/cosmos/auth/v1beta1/tx.proto
	modified:   x/auth/signing/adapter_test.go
	modified:   x/auth/simulation/genesis.go
	modified:   x/auth/simulation/genesis_test.go
	modified:   x/auth/simulation/proposals.go
	modified:   x/auth/simulation/proposals_test.go
	modified:   x/auth/tx/aux_test.go
	modified:   x/auth/tx/builder.go
	modified:   x/auth/tx/config/depinject.go
	modified:   x/auth/tx/config/module.go
	modified:   x/auth/tx/config_test.go
	modified:   x/auth/tx/gogotx.go
	modified:   x/auth/tx/legacy_amino_json.go
	modified:   x/auth/tx/service.go
	modified:   x/auth/tx/testutil/suite.go
	modified:   x/auth/types/account_test.go
	modified:   x/auth/types/auth.pb.go
	modified:   x/auth/types/codec.go
	modified:   x/auth/types/credentials_test.go
	modified:   x/auth/types/genesis.pb.go
	modified:   x/auth/types/genesis_test.go
	modified:   x/auth/types/params_test.go
	modified:   x/auth/types/query.pb.go
	modified:   x/auth/types/tx.pb.go
	modified:   x/auth/vesting/depinject.go
	modified:   x/auth/vesting/module.go
	modified:   x/auth/vesting/proto/cosmos/vesting/module/v1/module.proto
	modified:   x/auth/vesting/proto/cosmos/vesting/v1beta1/vesting.proto
	modified:   x/auth/vesting/types/codec.go
	modified:   x/auth/vesting/types/expected_keepers.go
	modified:   x/auth/vesting/types/genesis_test.go
	modified:   x/auth/vesting/types/vesting.pb.go
	modified:   x/auth/vesting/types/vesting_account.go
	modified:   x/auth/vesting/types/vesting_account_test.go
	modified:   x/authz/client/cli/tx.go
	modified:   x/authz/keeper/msg_server_test.go
	modified:   x/authz/module/abci_test.go
	modified:   x/authz/msgs_test.go
	modified:   x/bank/depinject.go
	modified:   x/bank/keeper/collections_test.go
	modified:   x/bank/keeper/grpc_query_test.go
	modified:   x/bank/keeper/keeper.go
	modified:   x/bank/keeper/keeper_test.go
	modified:   x/bank/keeper/msg_server_test.go
	modified:   x/bank/testutil/expected_keepers_mocks.go
	modified:   x/bank/types/expected_keepers.go
	modified:   x/circuit/ante/circuit_test.go
	modified:   x/circuit/depinject.go
	modified:   x/circuit/keeper/genesis_test.go
	modified:   x/circuit/keeper/keeper_test.go
	modified:   x/distribution/depinject.go
	modified:   x/distribution/keeper/allocation_test.go
	modified:   x/distribution/keeper/common_test.go
	modified:   x/distribution/keeper/delegation_test.go
	modified:   x/distribution/keeper/grpc_query_test.go
	modified:   x/distribution/keeper/keeper_test.go
	modified:   x/distribution/keeper/msg_server_test.go
	modified:   x/distribution/migrations/v4/migrate_funds_test.go
	modified:   x/feegrant/keeper/genesis_test.go
	modified:   x/feegrant/keeper/keeper.go
	modified:   x/feegrant/keeper/keeper_test.go
	modified:   x/feegrant/keeper/msg_server_test.go
	modified:   x/feegrant/module/abci_test.go
	modified:   x/feegrant/msgs_test.go
	modified:   x/genutil/client/cli/genaccount_test.go
	modified:   x/genutil/client/cli/gentx.go
	modified:   x/genutil/genaccounts.go
	modified:   x/gov/client/cli/prompt.go
	modified:   x/gov/client/cli/tx_test.go
	modified:   x/gov/client/utils/query.go
	modified:   x/gov/depinject.go
	modified:   x/gov/keeper/common_test.go
	modified:   x/gov/keeper/deposit_test.go
	modified:   x/group/go.mod
	modified:   x/group/keeper/genesis_test.go
	modified:   x/group/keeper/grpc_query_test.go
	modified:   x/group/keeper/keeper_test.go
	modified:   x/group/keeper/msg_server.go
	modified:   x/group/migrations/v2/gen_state.go
	modified:   x/group/migrations/v2/gen_state_test.go
	modified:   x/group/migrations/v2/migrate.go
	modified:   x/group/migrations/v2/migrate_test.go
	modified:   x/group/simulation/operations_test.go
	modified:   x/group/testutil/app_config.go
	modified:   x/mint/depinject.go
	modified:   x/mint/keeper/genesis_test.go
	modified:   x/mint/keeper/grpc_query_test.go
	modified:   x/mint/keeper/keeper_test.go
	modified:   x/mint/module_test.go
	modified:   x/protocolpool/depinject.go
	modified:   x/protocolpool/keeper/keeper_test.go
	modified:   x/slashing/depinject.go
	modified:   x/slashing/keeper/keeper_test.go
	modified:   x/staking/depinject.go
	modified:   x/staking/keeper/cons_pubkey_test.go
	modified:   x/staking/keeper/keeper_test.go
	modified:   x/staking/keeper/msg_server_test.go
	modified:   x/staking/keeper/validator_test.go
	modified:   x/upgrade/depinject.go
	modified:   x/upgrade/keeper/abci_test.go
	modified:   x/upgrade/keeper/grpc_query_test.go
	modified:   x/upgrade/keeper/keeper_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   api/cosmos/auth/module/v1/module.pulsar.go
	deleted by us:   api/cosmos/tx/config/v1/config.pulsar.go
	both modified:   client/v2/go.mod
	deleted by us:   collections/README.md
	deleted by us:   collections/collections.go
	deleted by us:   collections/indexing.go
	deleted by us:   depinject/appconfig/README.md
	both modified:   go.mod
	both modified:   server/v2/cometbft/go.mod
	both modified:   x/accounts/defaults/lockup/go.mod
	both modified:   x/accounts/defaults/multisig/go.mod
	deleted by them: x/auth/go.mod
	deleted by them: x/auth/go.sum
	both modified:   x/authz/go.mod
	both modified:   x/bank/go.mod
	both modified:   x/circuit/go.mod
	both modified:   x/consensus/go.mod
	both modified:   x/distribution/go.mod
	both modified:   x/epochs/go.mod
	both modified:   x/evidence/go.mod
	both modified:   x/feegrant/go.mod
	both modified:   x/gov/go.mod
	both modified:   x/mint/go.mod
	both modified:   x/nft/go.mod
	both modified:   x/params/go.mod
	both modified:   x/protocolpool/go.mod
	both modified:   x/slashing/go.mod
	both modified:   x/staking/go.mod
	both modified:   x/upgrade/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Sep 3, 2024

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@julienrbrt julienrbrt enabled auto-merge (squash) September 3, 2024 22:05
@julienrbrt julienrbrt merged commit 7d5ab19 into release/v0.52.x Sep 3, 2024
91 of 94 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.52.x/pr-21507 branch September 3, 2024 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

Assignees
No one assigned
Labels
C:CLI C:server/v2 cometbft C:server/v2 Issues related to server/v2 C:Simulations C:x/accounts/lockup C:x/accounts/multisig C:x/accounts C:x/auth C:x/authz C:x/bank C:x/circuit C:x/consensus C:x/distribution distribution module related C:x/epochs C:x/evidence C:x/feegrant C:x/genutil genutil module issues C:x/gov C:x/group C:x/mint C:x/nft C:x/params C:x/protocolpool C:x/slashing C:x/staking C:x/upgrade conflicts Type: ADR Type: Build Type: CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@julienrbrt @tac0turtle