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

fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) #1313

Merged
merged 3 commits into from
Mar 27, 2024
Merged

fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) #1313

merged 3 commits into from
Mar 27, 2024

Conversation

jaeseung-bae
Copy link
Contributor

@jaeseung-bae jaeseung-bae commented Mar 27, 2024 •
edited
Loading

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

@jaeseung-bae jaeseung-bae self-assigned this Mar 27, 2024
@CLAassistant
Copy link

CLAassistant commented Mar 27, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jaeseung-bae jaeseung-bae changed the title fix: correctly coalesce coins even with repeated denominations(cherry… fix: correctly coalesce coins even with repeated denominations(backport cosmos-sdk#13265) Mar 27, 2024
@jaeseung-bae jaeseung-bae changed the title fix: correctly coalesce coins even with repeated denominations(backport cosmos-sdk#13265) fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) Mar 27, 2024
@jaeseung-bae jaeseung-bae added A: bug Something isn't working backport/v0.48.x labels Mar 27, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 27, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.41%. Comparing base (9105ff4) to head (1c7ae0d).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1313      +/-   ##
==========================================
- Coverage   70.42%   70.41%   -0.01%     
==========================================
  Files         643      643              
  Lines       54761    54746      -15     
==========================================
- Hits        38563    38552      -11     
+ Misses      14024    14020       -4     
  Partials     2174     2174
Files Coverage Δ
types/coin.go 95.62% <100.00%> (+0.93%) ⬆️
x/auth/vesting/types/vesting_account.go 86.82% <ø> (ø)
x/gov/types/params.go 7.05% <ø> (ø)

@jaeseung-bae jaeseung-bae marked this pull request as ready for review March 27, 2024 08:30
@jaeseung-bae jaeseung-bae requested review from ulbqb and 170210 March 27, 2024 08:30
@Mdaiki0730
Copy link
Member

Please resolve the conflict.

@jaeseung-bae jaeseung-bae requested a review from Mdaiki0730 March 27, 2024 10:02
170210
170210 previously approved these changes Mar 27, 2024
View reviewed changes
@Mdaiki0730
Copy link
Member

It looks like the cla signature is missing. Could you please sign it?

@jaeseung-bae
Copy link
Contributor Author

It looks like the cla signature is missing. Could you please sign it?

I've signed CLA. I think it's because of cherry-pick from upstream.
Please ignore it.

@jaeseung-bae jaeseung-bae requested a review from 170210 March 27, 2024 10:57
@Mdaiki0730
Copy link
Member

I've signed CLA. I think it's because of cherry-pick from upstream.
Please ignore it.

Won't ignoring it block the merge?
Since cherry-pick has made it co-author, how about making only @jaeseung-bae 's commit?

@jaeseung-bae
Copy link
Contributor Author

I've signed CLA. I think it's because of cherry-pick from upstream.
Please ignore it.

Won't ignoring it block the merge? Since cherry-pick has made it co-author, how about making only @jaeseung-bae 's commit?

I was able to merge without sign from co-author.
I'll try to leave my commit only.

@jaeseung-bae jaeseung-bae merged commit 0176215 into Finschia:main Mar 27, 2024
38 checks passed
@jaeseung-bae jaeseung-bae deleted the fix/coalesce-coins branch March 27, 2024 11:38
mergify bot pushed a commit that referenced this pull request Mar 27, 2024
@jaeseung-bae @mergify
fix: correctly coalesce coins even with repeated denominations(backport
3988941 
cosmos/cosmos-sdk#13265) (#1313)

* fix: correctly coalesce coins even with repeated denominations

* chore: update changelog

(cherry picked from commit 0176215)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot mentioned this pull request Mar 27, 2024
Merged
5 tasks
0Tech added a commit that referenced this pull request Mar 29, 2024
@mergify @jaeseung-bae @0Tech
fix: correctly coalesce coins even with repeated denominations(backport
a14fa3e 
cosmos/cosmos-sdk#13265) (backport #1313) (#1320)

* fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) (#1313)

* fix: correctly coalesce coins even with repeated denominations

* chore: update changelog

(cherry picked from commit 0176215)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: jaeseung-bae <[email protected]>
Co-authored-by: Youngtaek Yoon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mdaiki0730 Mdaiki0730 Mdaiki0730 approved these changes

@0Tech 0Tech 0Tech approved these changes

@tkxkd0159 tkxkd0159 Awaiting requested review from tkxkd0159 tkxkd0159 is a code owner

@zemyblue zemyblue Awaiting requested review from zemyblue zemyblue is a code owner

@ulbqb ulbqb Awaiting requested review from ulbqb

@170210 170210 Awaiting requested review from 170210

Assignees

@jaeseung-bae jaeseung-bae

Labels
A: bug Something isn't working backport/v0.48.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jaeseung-bae @CLAassistant @Mdaiki0730 @0Tech @170210