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: update sdk and tm (backport #3093) #3098

Merged
merged 7 commits into from
Feb 26, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

This is an automatic backport of pull request #3093 done by Mergify.
Cherry-pick of 738bb9f has failed:

On branch mergify/bp/v1.x/pr-3093
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 738bb9f.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   go.work.sum
	deleted by us:   test/testground/go.mod
	deleted by us:   test/testground/go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Uses v1.33.0 for tendermint and v1.20.1 for the SDK

(cherry picked from commit 738bb9f)

# Conflicts:
#	go.mod
#	go.sum
#	go.work.sum
#	test/testground/go.mod
#	test/testground/go.sum
@mergify mergify bot added the conflicts label Feb 9, 2024
@github-actions github-actions bot added the bot item was created by a bot label Feb 9, 2024
@celestia-bot celestia-bot requested a review from a team February 9, 2024 15:11
Copy link
Contributor

coderabbitai bot commented Feb 9, 2024

Important

Auto Review Skipped

Bot user detected.

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

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-tests for this file.
  • 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 tests 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 from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

go.mod Show resolved Hide resolved
@celestia-bot celestia-bot requested a review from a team February 9, 2024 17:26
@rootulp
Copy link
Collaborator

rootulp commented Feb 12, 2024

Question for @cmwaters: why do we need to backport this cosmos-sdk and tendermint bump? I'm not opposed just curious.

Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

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

A lot of failing CI tasks so I think this is still WIP

@rootulp rootulp marked this pull request as draft February 12, 2024 14:46
@cmwaters cmwaters marked this pull request as ready for review February 17, 2024 20:46
@rootulp
Copy link
Collaborator

rootulp commented Feb 19, 2024

test is failing on TestMaxBlockSize here

@celestia-bot celestia-bot requested a review from a team February 19, 2024 09:32
@cmwaters cmwaters dismissed rootulp’s stale review February 19, 2024 10:05

Checks are passing now

@cmwaters
Copy link
Contributor

Question for @cmwaters: why do we need to backport this cosmos-sdk and tendermint bump? I'm not opposed just curious.

No we don't have to. I don't think there's anything urgent. There are some nice changes like fixing some bug in the CAT pool and adding a bunch of metrics

@rootulp
Copy link
Collaborator

rootulp commented Feb 19, 2024

Are we planning on cutting a new v1.x release after this merges? In the past we've discussed only backporting fixes

@cmwaters cmwaters merged commit 9676c4d into v1.x Feb 26, 2024
24 of 25 checks passed
@cmwaters cmwaters deleted the mergify/bp/v1.x/pr-3093 branch February 26, 2024 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants