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

Feature: Tokenomics #926

Merged
merged 364 commits into from
Nov 21, 2023
Merged

Feature: Tokenomics #926

merged 364 commits into from
Nov 21, 2023

Conversation

shark0der
Copy link
Contributor

Context

Include relevant motivation and context. A link to the issue is enough if it contains all the relevant
information.

Changes proposed in this pull request

Include a summary of the change.

Test plan

Please describe the tests cases that you ran to verify your changes. Add further instructions on
how to run them if needed (i.e. migration / deployment scripts, env vars, etc).

Checklist

  • Rebased the base branch
  • Attached corresponding Github issue
  • Prefixed the name with the type of change (i.e. feat, chore, test)
  • Performed a self-review of my own code
  • Followed the style guidelines of this project
  • Made corresponding changes to the documentation
  • Didn't generate new warnings
  • Didn't generate failures on existing tests
  • Added tests that prove my fix is effective or that my feature works

Review

When reviewing a PR, please indicate intention in comments using the following emojis:

  • 🍰 = Nice to have but not essential.
  • 💡 = Suggestion or a comment based on personal opinion
  • 🔨 = I believe this should be changed.
  • 🤔 = I don’t understand something, do you mind giving me more context?
  • 🚀 = Feedback

@shark0der shark0der force-pushed the feature/tokenomics branch 2 times, most recently from 08c6f02 to 624db70 Compare September 15, 2023 07:10
@shark0der shark0der force-pushed the feature/tokenomics branch 5 times, most recently from 45b338d to 2e9ce54 Compare September 20, 2023 16:48
rackstar and others added 21 commits October 18, 2023 13:14
@rackstar @shark0der
Fix failing integration tests
1c059ca 
adjust stakeAmount and cover amounts to be inline with the new initial
NXM supply value

* buyCover
* expireCover
* recalculateEffectiveWeightsForAllProducts
@rackstar @shark0der
Add deadline parameter to swap integration tests
bc7413d
@rackstar @shark0der
Fix insufficient amount out swap integration tests
333e8c9
@rackstar
Swap integration - only mint 10000 NXM tokens for member
e1185db
@rackstar
Use ethers.constants.AddressZero
983be2b
@rackstar
Add minAmountOut fail and success tests
656c88e
@MilGard91 @shark0der
Ramm precision fixes
ee9eb3f
@MilGard91 @shark0der
Add getObservation to Ramm unit tests
52d7dae
@MilGard91 @shark0der
Add updateTwap to Ramm unit tests
001991a
@MilGard91 @shark0der
Fix overflow for twap by reducing precision to 1e9
7ddf18d
@MilGard91 @shark0der
Add getInternalPriceAndUpdateTwap to Ramm unit tests
628a57a
@MilGard91 @shark0der
Add getInternalPriceAndUpdateTwap to Ramm unit tests
9777fd4
@MilGard91 @shark0der
Fix failing tests
13a650b
@MilGard91 @shark0der
Fix precision in average price
07278bd
@MilGard91 @shark0der
Fix getObservation test
c475014
@shark0der
Force funtion to return a value
20e89b6
@MilGard91
Fix precision in test for internal price
aaa269f
@MilGard91
remove only
95b7a50
@roxdanila
Merge pull request #947 from NexusMutual/feature/tokenomics-oracle-un…
0481b6e 
…it-tests

Feature/tokenomics twap unit tests
@MilGard91
Add getInternalPrice method without update
9d3aa14
@MilGard91
Add test for getInternalPrice
dfb201c
rackstar and others added 19 commits November 19, 2023 17:10
@rackstar @shark0der
Add additional contract upgrade storage tests
2d6c92d 
* Assessment
* IndividualClaims
* YieldTokenIncidents
* TokenController
* Cover
@rackstar @shark0der
Fix basic fuctionality dependencies test
ce43222
@rackstar @shark0der
Fix comment
e12b36e
@shark0der
Fix tokenomics fork test
657c7d4
@roxdanila @shark0der
Fix lint
1288ce2
@shark0der
Add YieldTokenIncidents storage checks
241c63a
@shark0der
Cleanup unused imports
83cddd3
@shark0der
Add pool constructor check that PriceFeedOracle has oracles for all a…
df50496 
…ssets
@shark0der
Remove redundant imports in MCR.sol
1a53337
@shark0der
Fix gov proposals constants
f0b64d5
@shark0der
Add rETH oracle
ad15b34
@shark0der
Fix swap fork test and check Ramm pause
74bce3e
@shark0der
Fix basic functionality tests
d16531e
@MilGard91
Code formating
a85c209
@MilGard91
Fix upgradeCapitalPool tests
8cc1fff
@shark0der
Tweak oracle check revert message and prefix the setter with an under…
742cd0e 
…score
@shark0der
Update spot price b in fork test
65b0121
@shark0der
Add allowedPool storage check
4d765f7
@roxdanila @shark0der
Update Read Me
10bbe16
@shark0der shark0der marked this pull request as ready for review November 20, 2023 10:41
roxdanila
roxdanila approved these changes Nov 21, 2023
View reviewed changes
Copy link
Contributor

@roxdanila roxdanila left a comment

Choose a reason for hiding this comment

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

let's do this!

@roxdanila roxdanila merged commit a378b7b into release-candidate Nov 21, 2023
10 checks passed
@roxdanila roxdanila deleted the feature/tokenomics branch November 21, 2023 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roxdanila roxdanila roxdanila approved these changes

Assignees
No one assigned
Labels
feature tokenomics
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@shark0der @roxdanila @rackstar @MilGard91 @Gideonnn @mixplore