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

FIP-113: End Departed Rari Founders vesting of TRIBE #896

Merged
merged 26 commits into from
Jun 10, 2022
Merged

Conversation

thomas-waite
Copy link
Contributor

@thomas-waite thomas-waite commented Jun 10, 2022

FIP-113: End Departed Rari Founders vesting of TRIBE

Implements the on-chain DAO vote part of https://tribe.fei.money/t/fip-113-end-departed-rari-founders-vesting-of-tribe/4355

Specifically:

  1. Migrates the Rari infra team timelocks
  2. Claws back the vesting TRIBE of Jai Bhavnani and David Lucid

Timelock migration is performed by:

  • Set the beneficiary of the existing timelocks to the Tribal Council timelock
  • Deploy new Fei and Tribe timelocks for the Rari infra team
  • Set the beneficiary of the Rari infra team timelocks to be the new Rari ops multisig
  • Set the clawbackAdmin of the Rari infra team timelocks to be the Tribal Council timelock
  • Set the start time as now, the time at which they are deployed
  • Set the duration as the remaining duration of the existing timelocks (~580 days)
  • Mint the amount of Fei and allocate Tribe to the timelocks as is currently left on the original timelocks

The Rari Infra timelocks are linear, so we can simply mint/allocate remaining funds there and set the duration to the remaining duration.

PR Checklist - Feature (Proposal)

  • All Tests Passing
  • Proposal Added to ProposalsConfig
  • Fork Block Correct
  • Remove Any .only's on Tests
  • Update Documentation If Needed
  • Update Roles Config
  • Proposal Submitted

@thomas-waite thomas-waite self-assigned this Jun 10, 2022
@thomas-waite thomas-waite requested a review from a team as a code owner June 10, 2022 15:49
@thomas-waite thomas-waite changed the title FIP-113: End Departed Rari Founders Investing of TRIBE FIP-113: End Departed Rari Founders vesting of TRIBE Jun 10, 2022
@thomas-waite thomas-waite changed the title FIP-113: End Departed Rari Founders vesting of TRIBE [WIP] FIP-113: End Departed Rari Founders vesting of TRIBE Jun 10, 2022
@thomas-waite thomas-waite changed the title [WIP] FIP-113: End Departed Rari Founders vesting of TRIBE FIP-113: End Departed Rari Founders vesting of TRIBE Jun 10, 2022
proposals/dao/clawback.ts Outdated Show resolved Hide resolved
proposals/dao/clawback.ts Outdated Show resolved Hide resolved
@eswak
Copy link
Contributor

eswak commented Jun 10, 2022

just a minor change to do imo (change the factory for Rari infra team FEI's vesting), otherwise lgtm

edit: lol you commited the fix before I commented 💪

Copy link
Contributor

@eswak eswak left a comment

Choose a reason for hiding this comment

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

lgtm (still need to deploy)

Comment on lines 25 to 44
target: 'clawbackVestingContractA',
values: '0',
method: 'clawback()',
arguments: (addresses) => [],
description: 'Clawback the TRIBE of Jai Bhavnani and David Lucid'
},
{
target: 'clawbackVestingContractB',
values: '0',
method: 'clawback()',
arguments: (addresses) => [],
description: 'Clawback the TRIBE of Jai Bhavnani and David Lucid'
},
{
target: 'clawbackVestingContractC',
values: '0',
method: 'clawback()',
arguments: (addresses) => [],
description: 'Clawback the TRIBE of Jai Bhavnani and David Lucid'
}
Copy link
Contributor

Choose a reason for hiding this comment

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

the proposal should withdraw all the TRIBE from the timelock back to core after or at least approve some contract like the Tribal Council Timelock to do so

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Have approved the TC timelock for 20M and added checks that it was approved and can transfer

// const rariInfraTribeTimelock = await ethers.getContractAt(
// 'LinearTimelockedDelegator',
// addresses.rariInfraTribeTimelock
// );
Copy link
Contributor

Choose a reason for hiding this comment

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

remove this commented code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was leaving in in case I needed to do a redeploy (it's needed during deploy time) and will remove after

// );

// rariFeiTimelockRemainingDuration = await rariInfraFeiTimelock.remainingTime();
// rariTribeTimelockRemainingDuration = await rariInfraTribeTimelock.remainingTime();
Copy link
Contributor

Choose a reason for hiding this comment

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

remove commented code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was leaving in in case I needed to do a redeploy (it's needed during deploy time) and will remove after

@thomas-waite thomas-waite merged commit 13e6890 into develop Jun 10, 2022
@thomas-waite thomas-waite deleted the clawback branch June 10, 2022 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants