Skip to content

Conversation

@0xHansLee
Copy link
Collaborator

@0xHansLee 0xHansLee commented Jan 27, 2025

Only 1 conflict in x/distribution/keeper/delegation.go. Please take a look at the file carefully.

And also made some changes to fix ci.

gezerui0124 and others added 7 commits December 20, 2024 23:56
* chore(*): upgrade xcrypto version

* go mod tidy to update deps
* fix(ci): changelog reminder

* fix(ci): changelog reminder
* fix(staking): support periods changes

* fix(staking): support periods changes

* fix(staking): support periods changes

* fix(staking): support periods changes

* fix(staking): support periods changes

* fix(staking): support multiplier changes

* fix(staking): add debug logs

* fix(staking): add unit test

* fix(staking): double check staking potential rounding issue

* fix(distribution): truncate rewards stake to prevent over rewards

* fix(distribution): consistent rewards token check

* fix(distribution): prevent zero rewards token
# Conflicts:
#	x/distribution/keeper/delegation.go
@github-actions
Copy link

@0xHansLee your pull request is missing a changelog!

@0xHansLee 0xHansLee force-pushed the hans/port-private-to-public branch from c9503a7 to 5971a76 Compare January 27, 2025 22:29
@0xHansLee 0xHansLee force-pushed the hans/port-private-to-public branch from 5971a76 to ed2668f Compare January 27, 2025 22:32
@0xHansLee 0xHansLee force-pushed the hans/port-private-to-public branch 2 times, most recently from 72e181e to cc206d0 Compare January 28, 2025 00:28
@0xHansLee 0xHansLee force-pushed the hans/port-private-to-public branch 3 times, most recently from 812c53b to b089c5a Compare January 28, 2025 19:11
@0xHansLee 0xHansLee force-pushed the hans/port-private-to-public branch from b089c5a to 1485537 Compare January 28, 2025 19:24
@0xHansLee 0xHansLee merged commit 670a524 into piplabs/v0.50.10 Jan 28, 2025
49 of 55 checks passed
@0xHansLee 0xHansLee deleted the hans/port-private-to-public branch January 28, 2025 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants