8000 fix(vesting): delegated on addGrant (backport #2880) by mergify[bot] · Pull Request #2881 · evmos/evmos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(vesting): delegated on addGrant (backport #2880) #2881

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
Merged
merged 4 commits into from
Sep 25, 2024
Merged

fix(vesting): delegated on addGrant (backport #2880) #2881

merged 4 commits into from
Sep 25, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Sep 25, 2024

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

  • tackled an existing issue or discussed with a team member
  • left instructions on how to review the changes
  • targeted the correct branch (see PR Targeting)

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

  • added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • confirmed all author checklist items have been addressed
  • confirmed that this PR does not change production code
  • reviewed content
  • tested instructions (if applicable)
  • confirmed all CI checks have passed

Summary by CodeRabbit

  • New Features

    • Improved calculation of free delegated amounts during vesting account creation and grant addition.
    • Introduced a new AddGrant method for merging clawback vesting grants into existing accounts.
    • Enhanced handling of pre-existing delegations in vesting account tests.

  • Bug Fixes

    • Corrected terminology in the ClawbackVestingAccount documentation for clarity on "free" tokens.

  • Tests

    • Expanded test cases for vesting accounts to include scenarios with pre-existing delegations.
This is an automatic backport of pull request #2880 done by [Mergify](https://mergify.com).

@GAtom22 @mergify
fix(vesting): delegated on addGrant (#2880)
8f50ced 
* fix(vesting): delegated on creation and addGrant

* add changelog entry

* update comments


8000
* update comments

* Update x/vesting/keeper/msg_server_test.go

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com>

* Update x/vesting/keeper/msg_server_test.go

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com>

* update comments

* remove init value for DelegatedFree

* move addGrant to clawback acc type

* update chlog

* address review comments

---------

Signed-off-by: Tom <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit 1d66cbc)

# Conflicts:
#	CHANGELOG.md
#	x/vesting/keeper/msg_server.go
#	x/vesting/keeper/msg_server_test.go
@mergify mergify bot requested a review from a team as a code owner September 25, 2024 13:18
@mergify mergify bot added the conflicts label Sep 25, 2024
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Sep 25, 2024

Cherry-pick of 1d66cbc has failed:

On branch mergify/bp/rama/release-v20/pr-2880
Your branch is up to date with 'origin/rama/release-v20'.

You are currently cherry-picking commit 1d66cbc4.
  (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:   x/vesting/types/clawback_vesting_account.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/vesting/keeper/msg_server.go
	both modified:   x/vesting/keeper/msg_server_test.go

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 mergify bot requested review from hanchon and GAtom22 and removed request for a team September 25, 2024 13:18
@mergify mergify bot mentioned this pull request Sep 25, 2024
Merged
9 tasks
@coderabbitai coderabbitai
Copy link
Contributor
coderabbitai bot commented Sep 25, 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.

🪧 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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • 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/schema.v2.json

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.

@github-actions github-actions bot added the tests label Sep 25, 2024
@GAtom22 GAtom22 merged commit d454750 into rama/release-v20 Sep 25, 2024
20 of 22 checks passed
@GAtom22 GAtom22 deleted the mergify/bp/rama/release-v20/pr-2880 branch September 25, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GAtom22 GAtom22 GAtom22 approved these changes

@hanchon hanchon Awaiting requested review from hanchon hanchon is a code owner automatically assigned from evmos/core-engineering

Assignees
No one assigned
Labels
conflicts tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@GAtom22
0