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

[VEN-1151][VEN-1152][VEN-2046] send reserves to PSR and remove PSR contracts #207

Merged
merged 64 commits into from
Oct 31, 2023

Conversation

GitGuru7
Copy link
Contributor

Description

This PR will add feature to move reserves fund from vToken to protocolShareReserve

Resolves [VEN-1151][VEN-1152]

Checklist

  • I have updated the documentation to account for the changes in the code.
  • If I added new functionality, I added tests covering it.
  • If I fixed a bug, I added a test preventing this bug from silently reappearing again.
  • My contribution follows Venus contribution guidelines.

@GitGuru7 GitGuru7 self-assigned this Apr 28, 2023
@GitGuru7 GitGuru7 changed the base branch from develop to feature/automatic-reward-allocation April 28, 2023 10:46
@GitGuru7 GitGuru7 marked this pull request as ready for review June 27, 2023 08:38
contracts/RiskFund/IProtocolShareReserve.sol Outdated Show resolved Hide resolved
contracts/VToken.sol Outdated Show resolved Hide resolved
contracts/VToken.sol Show resolved Hide resolved
@GitGuru7 GitGuru7 changed the title [VEN-1151][VEN-1152] send funds to protocol share reserves [VEN-1151][VEN-1152] send reserves to protocolShareReserve Jul 5, 2023
web3rover
web3rover previously approved these changes Jul 6, 2023
0xlucian
0xlucian previously approved these changes Jul 7, 2023
@chechu chechu added the audit label Jul 10, 2023
@Debugger022 Debugger022 self-requested a review July 20, 2023 14:34
@GitGuru7 GitGuru7 changed the base branch from feature/automatic-reward-allocation to automatic-income-allocation July 24, 2023 13:18
@GitGuru7 GitGuru7 changed the base branch from automatic-income-allocation to develop July 25, 2023 08:03
@GitGuru7 GitGuru7 dismissed 0xlucian’s stale review July 25, 2023 08:03

The base branch was changed.

[VEN-1950]: Quantstamp audit fix on AIA
kkirka
kkirka previously approved these changes Sep 20, 2023
contracts/VToken.sol Show resolved Hide resolved
@kkirka
Copy link
Collaborator

kkirka commented Sep 20, 2023

@GitGuru7 maybe we want to include this reduceReservesBlockDelta to AddMarketInput so that we don't accidentally forget to set this value?

@GitGuru7
Copy link
Contributor Author

GitGuru7 commented Sep 25, 2023

@GitGuru7 maybe we want to include this reduceReservesBlockDelta to AddMarketInput so that we don't accidentally forget to set this value?

@kkirka if you're referring to the PoolRegistry addMarket input, we can certainly add it so that we don't have to initialise it each time we add a new market in the VIP, but I'd prefer to keep it outside the scope of this ticket WDYT?

cc: @chechu

@chechu chechu removed the audit label Oct 22, 2023
@chechu
Copy link
Member

chechu commented Oct 22, 2023

@GitGuru7 maybe we want to include this reduceReservesBlockDelta to AddMarketInput so that we don't accidentally forget to set this value?

@kkirka if you're referring to the PoolRegistry addMarket input, we can certainly add it so that we don't have to initialise it each time we add a new market in the VIP, but I'd prefer to keep it outside the scope of this ticket WDYT?

cc: @chechu

We have VEN-2094 for it. Out of the scope for this PR

contracts/VToken.sol Outdated Show resolved Hide resolved
@GitGuru7 GitGuru7 changed the title [VEN-1151][VEN-1152] send reserves to protocolShareReserve [VEN-1151][VEN-1152][VEN-2046] send reserves to PSR and remove PSR contracts Oct 27, 2023
@GitGuru7 GitGuru7 force-pushed the feature/VEN-1151-VEN-1152 branch from eb9bd5d to b139a9f Compare October 27, 2023 09:22
@github-actions
Copy link

Code Coverage

Package Line Rate Branch Rate Health
contracts 96% 78%
contracts.Lens 95% 65%
contracts.Pool 100% 92%
contracts.Rewards 95% 62%
contracts.RiskFund 89% 61%
contracts.Shortfall 100% 85%
contracts.lib 100% 89%
Summary 96% (1447 / 1509) 75% (447 / 598)

@GitGuru7 GitGuru7 merged commit d2e36ac into develop Oct 31, 2023
3 checks passed
@chechu chechu mentioned this pull request Oct 31, 2023
@kkirka kkirka deleted the feature/VEN-1151-VEN-1152 branch November 29, 2023 15:46
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