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

Redemption fee #92

Merged
merged 10 commits into from
Jul 14, 2020
Merged

Redemption fee #92

merged 10 commits into from
Jul 14, 2020

Conversation

alsco77
Copy link
Contributor

@alsco77 alsco77 commented Jul 14, 2020

Upgrade type: Proxy contract upgrade
Affected file: Masset.sol
Proxy address: 0xe2f2a5C287993345a840Db3B0845fbC70f5935a5
New version: 1.1

Description

Adds a redemption fee property for use in redeemMasset

  • New storage prop: redemptionFee 🚨
  • New function: setRedemptionFee - Allow fee to be updated by governance
  • Changed function signature: Update signature and existing calls to _settleRedemption. Now accepts uint instead of bool

Deployment plan

  • Write and comprehensively test the upgrade
  • Get external PR review from specialist
  • Deploy Masset v1.1 to Ropsten/Mainnet
  • Use 'DiffChecker' to validate the prev and future contracts once verified
  • Call proposeUpgrade on the DelayedProxyAdmin with implementation addresses
  • Accept on Ropsten and test
  • Wait 1 week
  • Accept on Mainnet FORK by unlocking the gov address
  • Accept on Mainnet

Mainnet Details

Deployed address: 0xe4c5b1765bf420016027177289908c5a3ea7668e
ProposeUpgrade tx: 14:13 CET 07/08
AcceptUpgrade tx: 10:40 CET 07/15

Ropsten Details

Deployed address: 0x121a86dd617c0584cf1bdffc92e36d9100000ca7
ProposeUpgrade tx: 12:13 CET 07/02
AcceptUpgrade tx: 14:07 CET 07/02

Copy link
Contributor

@JamesLefrere JamesLefrere left a comment

Choose a reason for hiding this comment

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

LGTM

@alsco77 alsco77 merged commit c7b3054 into master Jul 14, 2020
@alsco77 alsco77 deleted the redemption-fee branch July 14, 2020 15:32
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.

None yet

2 participants