Skip to content

Conversation

@markonmars
Copy link
Collaborator

@markonmars markonmars commented Feb 20, 2025

This PR aligns this repository with the work done here - mars-protocol/core-contracts#3

Probably best to review by commit

  • the first two commits cherry pick relevant commits from core-contracts
  • the following commits are adjustments to suit osmosis deployment (without perps)

markonmars and others added 4 commits February 20, 2025 19:45
* add revenue share to rewards collector

* fmt

* remove v2.0 migration test

* update types

* improve pop_array methods

* remove estimate exact out for reward amounts

* improve tests for rewards collector

* small tidy

* safety fund and revenue share use same denom

* fix integration test

* update schema

* generate types

* update deploy scripts

* make distribute method configurable

* tidy comments

* review comments

* fix ibc integration test

* update types and schema

* enforce rc config cannot have fee_collector_denom the same as other denoms
… 2.1.0 -> 2.1.1) (#208)

* add revenue share to rewards collector

* fmt

* remove v2.0 migration test

* update types

* improve pop_array methods

* remove estimate exact out for reward amounts

* improve tests for rewards collector

* small tidy

* safety fund and revenue share use same denom

* fix integration test

* update schema

* generate types

* update deploy scripts

* make distribute method configurable

* tidy comments

* review comments

* fix ibc integration test

* update types and schema

* enforce rc config cannot have fee_collector_denom the same as other denoms

* add neutron migration

* fix migration tests for neutron rc

* migration for address provider

* update schema

* add osmosis RC migration

* fix old migration test

* fix old migration test

* clear old state on migration

* fmt
@markonmars markonmars changed the title Update release Add revenue share to Rewards Collector Apr 1, 2025
@markonmars markonmars merged commit 430d796 into master Apr 1, 2025
5 checks passed
@markonmars markonmars deleted the align-master branch April 1, 2025 09:14
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.

5 participants