Skip to content

FIP-25 #184

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

Merged
Joeysantoro merged 1 commit into from
Sep 22, 2021
Merged

FIP-25 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contract-addresses/mainnetAddresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"feiRewardsDistributorAddress" : { "artifact": "IFeiRewardsDistributor", "address": "0xEf1a94AF192A88859EAF3F3D8C1B9705542174C5"},
"feiTribePairAddress": { "artifact": "IUniswapV2Pair", "address": "0x9928e4046d7c6513326cCeA028cD3e7a91c7590A"},
"governorAlphaAddress": { "artifact": "GovernorAlpha", "address": "0xE087F94c3081e1832dC7a22B48c6f2b5fAaE579B"},
"gUniFeiDaiLPAddress": {"address": "0x3D1556e84783672f2a3bd187a592520291442539"},
"indexAddress" : { "artifact": "IERC20", "address" : "0x0954906da0Bf32d5479e25f46056d22f08464cab" },
"indexCoopFusePoolDpiAddress" : {"artifact" : "CErc20Delegator", "address" : "0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963"},
"indexCoopFusePoolDpiPCVDepositAddress" : { "artifact" : "ERC20CompoundPCVDeposit", "address" : "0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66" },
Expand Down
11 changes: 9 additions & 2 deletions proposals/dao/fip_22.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ async function validate(addresses, oldContracts, contracts) {
aaveFeiPCVDeposit,
proxyAdmin,
fei,
aFei
aFei,
tribalChief
} = contracts;

const {
aaveTribeIncentivesControllerAddress,
aFeiVariableDebtAddress,
timelockAddress
timelockAddress,
gUniFeiDaiLPAddress
} = addresses;

expect(await fei.balanceOf(aaveFeiPCVDeposit.address)).to.be.bignumber.equal('0');
Expand All @@ -92,6 +94,11 @@ async function validate(addresses, oldContracts, contracts) {

const config = await incentivesController.getAssetData(aFeiVariableDebtAddress);
expect(config[1].toString()).to.be.equal(TRIBE_PER_SECOND);

// FIP-25:
expect((await tribalChief.totalAllocPoint()).toString()).to.be.equal('2100');
expect((await tribalChief.numPools()).toString()).to.be.equal('3');
expect(await tribalChief.stakedToken(2)).to.be.equal(gUniFeiDaiLPAddress);
}

module.exports = {
Expand Down
12 changes: 12 additions & 0 deletions proposals/description/fip_22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@
"1647993600"
],
"description" : "Set distribution end"
},
{
"target": "tribalChief",
"values": "0",
"method": "add(uint120,address,address,(uint128,uint128)[])",
"arguments": [
"100",
"0x3D1556e84783672f2a3bd187a592520291442539",
"0x0000000000000000000000000000000000000000",
[[0, 10000]]
],
"description": "Add G-UNI FEI-DAI pool to tribalchief"
}
]
}
13 changes: 11 additions & 2 deletions proposals/description/fip_22.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
This proposal adds 4M TRIBE of incentives to Aave and mints 25M FEI to deposit.
This proposal combines:
* FIP-22 - add 4M TRIBE of incentives to Aave and mints 25M FEI to deposit
* FIP-25 - add G-UNI FEI-DAI LP to staking rewards

FIP-22:
Specifically, the 4M TRIBE will incentivize only variable rate borrowing at a constant rate over 6 months.
The final rewards epoch time is on March 23, 2022: 1647993600.

Expand All @@ -13,4 +16,10 @@ This is required to allow the DAO to initiate the incentives. The new admin is t
This address is still controlled by the Fei DAO.

Forum discussion: https://tribe.fei.money/t/fip-22-aave-borrowing-incentives/3449
Code: https://github.com/fei-protocol/fei-protocol-core/pull/177
Code: https://github.com/fei-protocol/fei-protocol-core/pull/177

FIP-25:
Add G-UNI FEI-DAI LP to the TribalChief staking rewards at 100 AP.

Forum Discussion: https://tribe.fei.money/t/fip-25-a-case-for-directing-tribe-rewards-to-g-uni-pools/3459
Code: https://github.com/fei-protocol/fei-protocol-core/pull/184