minter: Add inflation bounds to inflation adjustment algorithm #645
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,8 +77,8 @@ const func: DeployFunction = async function(hre: HardhatRuntimeEnvironment) { | |
| config.minter.inflation, | ||
| config.minter.inflationChange, | ||
| config.minter.targetBondingRate, | ||
| config.minter.inflationCeiling, | ||
| config.minter.inflationFloor | ||
| ] | ||
| }) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,18 +20,17 @@ const func: DeployFunction = async function(hre: HardhatRuntimeEnvironment) { | |
| )) as Minter | ||
|
|
||
| const inflation = await minter.inflation() | ||
| const targetBondingRate = await minter.targetBondingRate() | ||
|
|
||
| await deploy("Minter", { | ||
| from: deployer, | ||
| args: [ | ||
| controllerDeployment.address, | ||
| inflation, | ||
| config.minter.inflationChange, | ||
| targetBondingRate, | ||
| config.minter.inflationCeiling, | ||
| config.minter.inflationFloor | ||
| ] | ||
| }) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,8 +24,8 @@ const gethDev = { | |
| inflation: 137, | ||
| inflationChange: 3, | ||
| targetBondingRate: 500000, | ||
| inflationCeiling: 200, | ||
| inflationFloor: 100 | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -54,8 +54,8 @@ const defaultConfig = { | |
| inflation: 137, | ||
| inflationChange: 3, | ||
| targetBondingRate: 500000, | ||
| inflationCeiling: 200, | ||
| inflationFloor: 100 | ||
| }, | ||
| treasury: { | ||
| minDelay: 0 // 0s initial proposal execution delay | ||
|
|
@@ -104,8 +104,8 @@ const rinkeby = { | |
| inflation: 137, | ||
| inflationChange: 3, | ||
| targetBondingRate: 0, | ||
| inflationCeiling: 200, | ||
| inflationFloor: 100 | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -133,8 +133,8 @@ const arbitrumRinkeby = { | |
| inflation: 137, | ||
| inflationChange: 3, | ||
| targetBondingRate: 0, | ||
| inflationCeiling: 200, | ||
| inflationFloor: 100 | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -162,16 +162,11 @@ const arbitrumMainnet = { | |
| roundLockAmount: 100000 | ||
| }, | ||
| minter: { | ||
| inflation: 651000, // Current value at round 3766, but is overwritten by `migrateOldMinterState` | ||
| inflationChange: 1000, // Set according to LIP-100 | ||
| targetBondingRate: 500000000, | ||
| inflationCeiling: 750000, // Set according to LIP-100 | ||
| inflationFloor: 50000 // Set according to LIP-100 | ||
| }, | ||
| treasury: { | ||
| minDelay: 0 // 0s initial proposal execution delay | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,8 +118,8 @@ describe("Governor update", () => { | |
|
|
||
| let migrateData | ||
| let migrateTarget | ||
| let migrateOldMinterStateData | ||
| let migrateOldMinterStateTarget | ||
| let grantRoleData | ||
| let grantRoleTarget | ||
| let revokeRoleData | ||
|
|
@@ -144,10 +144,10 @@ describe("Governor update", () => { | |
| ) | ||
| migrateTarget = minter.address | ||
|
|
||
| migrateOldMinterStateData = newMinter.interface.encodeFunctionData( | ||
| "migrateOldMinterState" | ||
| ) | ||
| migrateOldMinterStateTarget = newMinter.address | ||
|
|
||
| setInfoData = controller.interface.encodeFunctionData( | ||
| "setContractInfo", | ||
|
|
@@ -187,15 +187,15 @@ describe("Governor update", () => { | |
| const update = { | ||
| target: [ | ||
| migrateTarget, | ||
| migrateOldMinterStateTarget, | ||
| grantRoleTarget, | ||
| revokeRoleTarget, | ||
| setInfoTarget | ||
| ], | ||
| value: ["0", "0", "0", "0", "0"], | ||
| data: [ | ||
| migrateData, | ||
| migrateOldMinterStateData, | ||
| grantRoleData, | ||
| revokeRoleData, | ||
| setInfoData | ||
|
|
@@ -219,15 +219,15 @@ describe("Governor update", () => { | |
| const update = { | ||
| target: [ | ||
| migrateTarget, | ||
| migrateOldMinterStateTarget, | ||
| grantRoleTarget, | ||
| revokeRoleTarget, | ||
| setInfoTarget | ||
| ], | ||
| value: ["0", "0", "0", "0", "0"], | ||
| data: [ | ||
| migrateData, | ||
| migrateOldMinterStateData, | ||
| grantRoleData, | ||
| revokeRoleData, | ||
| setInfoData | ||
|
|
@@ -252,15 +252,15 @@ describe("Governor update", () => { | |
| const update = { | ||
| target: [ | ||
| migrateTarget, | ||
| migrateOldMinterStateTarget, | ||
| grantRoleTarget, | ||
| revokeRoleTarget, | ||
| setInfoTarget | ||
| ], | ||
| value: ["0", "0", "0", "0", "0"], | ||
| data: [ | ||
| migrateData, | ||
| migrateOldMinterStateData, | ||
| grantRoleData, | ||
| revokeRoleData, | ||
| setInfoData | ||
|
|
@@ -275,7 +275,7 @@ describe("Governor update", () => { | |
| ) | ||
| }) | ||
|
|
||
| it("step 2 'migrateOldMinterState' fails: wrong target", async () => { | ||
| const update = { | ||
| target: [ | ||
| migrateTarget, | ||
|
|
@@ -287,7 +287,7 @@ describe("Governor update", () => { | |
| value: ["0", "0", "0", "0", "0"], | ||
| data: [ | ||
| migrateData, | ||
| migrateOldMinterStateData, | ||
| grantRoleData, | ||
| revokeRoleData, | ||
| setInfoData | ||
|
|
@@ -297,22 +297,24 @@ describe("Governor update", () => { | |
|
|
||
| // Run the migrate to new minter update | ||
| await governor.stage(update, "0") | ||
| await expect(governor.execute(update)).to.be.revertedWith( | ||
| "Minter cannot be current Minter" | ||
| ) | ||
| }) | ||
|
|
||
| it("succesfully executes all updates", async () => { | ||
| const update = { | ||
| target: [ | ||
| migrateTarget, | ||
| migrateOldMinterStateTarget, | ||
| grantRoleTarget, | ||
| revokeRoleTarget, | ||
| setInfoTarget | ||
| ], | ||
| value: ["0", "0", "0", "0", "0"], | ||
| data: [ | ||
| migrateData, | ||
| migrateOldMinterStateData, | ||
| grantRoleData, | ||
| revokeRoleData, | ||
| setInfoData | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -155,8 +155,8 @@ describe("MinterUpgrade", () => { | |
| assert.notOk(inflationChange.eq(NEW_INFLATION_CHANGE)) | ||
|
|
||
| const targetBondingRate = await minter.targetBondingRate() | ||
| const inflationCeiling = await minter.inflationCeiling() | ||
| const inflationFloor = await minter.inflationFloor() | ||
|
|
||
| // Deploy the new Minter | ||
| const newMinter = await ( | ||
|
|
@@ -166,8 +166,8 @@ describe("MinterUpgrade", () => { | |
| 0, | ||
| NEW_INFLATION_CHANGE, | ||
| targetBondingRate, | ||
| inflationCeiling, | ||
| inflationFloor | ||
| ) | ||
|
|
||
| // Migrate from old Minter to new Minter | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the rename! Make sure there's no occurences of
[Mm]ax.+[Ii]nflationon the project anymore 👀