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

fix: run proto disto on epoch #8106

Merged
merged 5 commits into from
Apr 22, 2024
Merged

fix: run proto disto on epoch #8106

merged 5 commits into from
Apr 22, 2024

Conversation

PaddyMc
Copy link
Collaborator

@PaddyMc PaddyMc commented Apr 19, 2024

Closes: #8089
Change from this PR: #8054

What is the purpose of the change

Needed to redo the PR from osmosis main as e2e won't work rn for external contributors

Fixes the registration of epoch hooks in protorev.
EpochHooks are set for protorev by the EpochHooks() method. Those are created as an EpochHooks item, and not directly as part of the keeper.

In #7564 we added hooks directly to the keeper which were never registered with the epoch hooks. Instead of having these live in separate places I've just combined the newly added logic into the existing AfterEpoch hook.

All logic remains the same.

Testing and Verifying

Existing unit test coverage still applies to all changes--I've simply copy/pasted some of those to organize all epoch-specific logic into one place within protorev.

Not sure if you have e2e tests somewhere that I can update to test protorev distributions?

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes?
  • Changelog entry added to Unreleased section of CHANGELOG.md?

Where is the change documented?

  • Specification (x/{module}/README.md)
  • Osmosis documentation site
  • Code comments?
  • N/A

Summary by CodeRabbit

  • New Features
    • Enabled ProtoRev distribution on epoch.
    • Added a deactivated smart account module.
  • Bug Fixes
    • Reset validator signing info missed blocks counter.
    • Deleted legacy behavior related to lockups unbonding at small block heights on a testnet.
  • Refactor
    • Improved profit calculation and distribution process for the ProtoRev module.
    • Restructured epoch-related hooks to enhance module efficiency.
  • Tests
    • Updated test cases to reflect new logic in profit distribution and epoch handling.

@PaddyMc PaddyMc requested a review from p0mvn as a code owner April 19, 2024 09:42
Copy link
Contributor

coderabbitai bot commented Apr 19, 2024

Walkthrough

The recent updates primarily focus on the ProtoRev module within the Osmosis blockchain framework, enhancing the distribution of profits at epoch ends. Key changes include the implementation of profit calculations, adjustments in the handling of epoch hooks, and the restructuring of test cases to accommodate these modifications.

Changes

File Path Change Summary
x/protorev/keeper/epoch_hook.go Introduced CalculateDistributeProfits method and added CurrentBaseDenomProfits method.
x/protorev/keeper/hooks.go Moved epoch hook implementations from Hooks to Keeper struct.
x/protorev/keeper/hooks_test.go, x/protorev/keeper/rebalance_test.go Updated test cases for epoch end and trade execution adjustments.
CHANGELOG.md Documented updates including enabling ProtoRev distro and other module adjustments.

Assessment against linked issues

Objective (#8089) Addressed Explanation
ProtoRev latest update to ensure distro happens at epoch

🐇🎉
To the epochs we end,
And the profits we send,
On chains that extend,
May our code never bend,
🌟🚀🌌

This whimsical celebration by a rabbit marks the successful enhancement of the ProtoRev module, ensuring timely and accurate profit distributions with each epoch, aligning perfectly with the cosmos of blockchain innovations.


Recent Review Details

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between edf6da8 and e043b86.
Files selected for processing (1)
  • x/protorev/keeper/epoch_hook.go (2 hunks)
Files skipped from review as they are similar to previous changes (1)
  • x/protorev/keeper/epoch_hook.go

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.

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

@PaddyMc PaddyMc changed the title Feat/run proto disto on epoch fix: run proto disto on epoch Apr 19, 2024
@PaddyMc PaddyMc added the V:state/breaking State machine breaking PR label Apr 19, 2024
Copy link
Collaborator Author

@PaddyMc PaddyMc left a comment

Choose a reason for hiding this comment

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

Debugged through the epoch to ensure this code runs as expected:

{"level":"info","module":"server","time":"2024-04-19T10:43:55Z","message":"distributeInternal CL for pool id 1671 finished"}
{"level":"info","module":"server","time":"2024-04-19T10:43:55Z","message":"x/incentives AfterEpochEnd finished distribution"}
{"level":"info","module":"server","mint":"mintedCoins","time":"2024-04-19T10:43:55Z","message":"AfterEpochEnd, minted coins"}
{"level":"info","module":"server","module":"mint","recepientModule":"fee_collector","distributionCoin":"91324200913uosmo","height":15040473,"time":"2024-04-19T10:43:55Z","message":"distributeToModule"}
{"level":"info","module":"server","module":"mint","recepientModule":"poolincentives","distributionCoin":"36529680365uosmo","height":15040473,"time":"2024-04-19T10:43:55Z","message":"distributeToModule"}
{"level":"info","module":"server","module":"poolincentives","totalMintedAmount":"36529680369","height":15040473,"time":"2024-04-19T10:43:55Z","message":"AllocateAsset minted amount"}
> github.com/osmosis-labs/osmosis/v24/x/protorev/keeper.EpochHooks.AfterEpochEnd() /root/github.com/osmosis-labs/osmosis/x/protorev/keeper/epoch_hook.go:43 (hits goroutine(52):1 total:1) (PC: 0x37f99b2)
    38:	func (h EpochHooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, epochNumber int64) error {
    39:		if h.k.GetProtoRevEnabled(ctx) {
    40:			switch epochIdentifier {
    41:			case "day":
    42:				// Calculate and distribute protorev profits
=>  43:				err := h.CalculateDistributeProfits(ctx)
    44:				if err != nil {
    45:					return err
    46:				}
    47:	
    48:				// Increment number of days since module genesis to properly calculate developer fees after cyclic arbitrage trades

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Actionable comments outside the diff hunks (8)
CHANGELOG.md (8)

Line range hint 325-325: Correct the punctuation in the heading.

-## v6.4.0
+## v6.4.0.

Line range hint 588-588: Replace the bare URL with a markdown link.

-https://github.com/osmosis-labs/osmosis/releases/tag/v6.4.0
+[v6.4.0](https://github.com/osmosis-labs/osmosis/releases/tag/v6.4.0)

Line range hint 646-646: Replace the bare URL with a markdown link.

-https://github.com/osmosis-labs/osmosis/releases/tag/v6.3.1
+[v6.3.1](https://github.com/osmosis-labs/osmosis/releases/tag/v6.3.1)

Line range hint 986-986: Ensure heading levels increment by one level at a time.

-#### Golang API breaks
+### Golang API breaks

Line range hint 998-998: Ensure heading levels increment by one level at a time.

-#### Bug Fixes
+### Bug Fixes

Line range hint 1007-1007: Ensure heading levels increment by one level at a time.

-#### Features
+### Features

Line range hint 1012-1012: Ensure heading levels increment by one level at a time.

-#### SDK fork updates
+### SDK fork updates

Line range hint 1064-1064: Ensure heading levels increment by one level at a time.

-#### IAVL fork updates
+### IAVL fork updates

@PaddyMc PaddyMc closed this Apr 22, 2024
@PaddyMc PaddyMc reopened this Apr 22, 2024
@PaddyMc PaddyMc merged commit 7a420c8 into main Apr 22, 2024
1 check passed
@PaddyMc PaddyMc deleted the feat/run-proto-disto-on-epoch branch April 22, 2024 09:21
@github-actions github-actions bot mentioned this pull request May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
V:state/breaking State machine breaking PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ProtoRev latest update to ensure distro happens at epoch
2 participants