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

Develop -> Master #28

Merged
merged 168 commits into from
Dec 8, 2024
Merged

Develop -> Master #28

merged 168 commits into from
Dec 8, 2024

Conversation

Oighty
Copy link
Contributor

@Oighty Oighty commented Dec 2, 2024 •
edited by 0xJem
Loading

Oighty and others added 30 commits September 18, 2024 16:38
@Oighty
feat: yield repo and updated heart
c6d8c15
@Oighty
test: yield repo and updated heart
0f5ba5d
@Oighty
chore: lint
cc3e01d
@chefomi
Create EmissionManager.sol
a05f63a 
mint tokens and create axis market when premium greater than minimum

emit at supply * base rate * premium / min premium
@chefomi
Merge branch 'protocoloop' of https://github.com/OlympusDAO/bophades …
b455632 
…into protocoloop
@chefomi
add backing module and integrate
db08743 
comments should be descriptive enough (hopefully)
@chefomi
add some comments
3c684b1
@chefomi
fix conditional
fdb730c 
counter will always be at least one upon the if statement, so wait until 3
@chefomi
account for inventory edge case
16d6454 
perhaps there is an edge case where contract token balance is greater than amount to sell, which would have caused a revert on attempt to mint
@chefomi
remove redundancy
3dea8ed 
we can merge these conditionals together
@chefomi
typo
909e50c
@Oighty
fix: update bond market decimals and config
6937dfd
@Oighty
chore: some cleanup
ff3a170
@Oighty
fix: update yield repo with final changes
3f495b6
@Oighty
chore: lint
34b55d8
@Oighty
fix: emissions manager cleanup
a601816
@chefomi
add shutdown() and restart() logic
d68c8dd
@chefomi
mutable restart timeframe + init assignments
df87b58
@Oighty
fix: actually initialize vars
400a318
@chefomi
variable cant be constant
68736c1
@Oighty
Merge branch 'emissions-controller' of https://github.com/OlympusDAO/…
891c075 
…bophades into emissions-controller
@Oighty
merge
b8a65a3
@Oighty
fix: restart timeframe not constant
c168724
@Oighty
test: start test plan for emission manager
0af991d
@chefomi
have base rate taper changes
e06ee6a
@Oighty
fix: handle no previous sale
c622317
@Oighty
test: start test setup
f9391a1
@Oighty
test: initial emission controller test setup
fbdad72
@Oighty
fix: beatcounter
9fa1396
@Oighty
test: add'l emission manager tests
619cc89
0xJem and others added 28 commits November 13, 2024 15:17
@0xJem
Merge pull request #24 from OlympusDAO/deployment-scripts
adf49e1 
Improved deployment and proposal scripts (2)
@0xJem
Merge branch 'develop' into reserve-migrator
140210a
@0xJem
Shift OIP-168 proposal script to use ProposalScript
74f7cea
@0xJem
Merge branch 'reserve-migrator' into emissions-manager
4f063fb
@0xJem
Shift EmissionManager proposal script to use ProposalScript
07d8568
@Oighty
Merge pull request #21 from OlympusDAO/emissions-manager
fa55fee 
Activate Emissions Manager
@Oighty
proposal: remove YRF initialization from OCG proposal due to time sen…
ba6fe03 
…sitive values
@Oighty
proposal: also grant dao ms emissions_admin role and fix validation
886db59
@Oighty
proposal: move emission manager initialization to a MS transaction
798cd28
@Oighty
feat: look up receivables from CHREG in YRF
93a8041
@Oighty
script: move policy initializations to MS script so heart can beat af…
dce7e99 
…ter activation
@Oighty
fix: compile
08231a9
@0xJem
chore: linting
c7bc456
@Oighty
script: add emergency_shutdown to MS and don't beat heart in script
589f3a4
@Oighty
deploy: new contracts for usds migration
6ce3530
@Oighty
script: cleanup
7135e14
@Oighty
Merge branch 'reserve-migrator' of https://github.com/OlympusDAO/olym…
bba59a1 
…pus-v3 into reserve-migrator
@0xJem
Update deployment addresses. Mark OIP-168 proposal as submitted.
23e5ad6
@0xJem
Update proposal description
ae48f89
@Oighty
Merge branch 'reserve-migrator' of https://github.com/OlympusDAO/olym…
936e521 
…pus-v3 into reserve-migrator
@Oighty
proposal: emission manager final tweaks
e242564
@Oighty
script: remove operator initialization from USDS migration script
9334e49
@Oighty
script: revert previous change
b7c0c3a
@Oighty
script: add initial YRF values
c49d375
@Oighty
script: remove unused imports
252d4dd
@Oighty
chore: update lint rule
981d7ce
@Oighty
chore: remove OCG CI
e50b3ad
@Oighty
Merge pull request #18 from OlympusDAO/reserve-migrator
79b1624 
OIP-168: USDS Migrator
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 2, 2024

LCOV of commit 79b1624 during CI #78

Summary coverage rate:
  lines......: 69.4% (1365 of 1966 lines)
  functions..: 72.2% (296 of 410 functions)
  branches...: no data found

Files changed coverage rate:
                                                       |Lines       |Functions  |Branches    
  Filename                                             |Rate     Num|Rate    Num|Rate     Num
  ===========================================================================================
  src/policies/Heart.sol                               |76.9%     39|83.3%    12|    -      0
  src/policies/Operator.sol                            |85.6%    250|93.1%    29|    -      0

@Oighty Oighty merged commit a42b2fd into master Dec 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Oighty @chefomi @0xJem