Merge pull request #220 from fei-protocol/feat/feirari-ard-rda-deploy

ElliotFriedman · web-flow · commit 0468a7374883 · 2021-10-05T16:04:59.000-07:00
Added Deployment and Validation Scripts for RDA and ARD
diff --git a/contracts/mock/MockRewardsDistributor.sol b/contracts/mock/MockRewardsDistributor.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.0;
 
 import "./../staking/TribalChief.sol";
 import "../refs/CoreRef.sol";
-import "../feirari/IRewardsDistributorAdmin.sol";
+import "../staking/feirari/IRewardsDistributorAdmin.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
 contract MockRewardsDistributor is IRewardsDistributorAdmin, Ownable {
diff --git a/contracts/staking/feirari/AutoRewardsDistributor.sol b/contracts/staking/feirari/AutoRewardsDistributor.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
-import "./../staking/ITribalChief.sol";
-import "../refs/CoreRef.sol";
+import "./../ITribalChief.sol";
+import "../../refs/CoreRef.sol";
 import "./IRewardsDistributorAdmin.sol";
 
 /// @notice Controller Contract to set tribe per block in Rewards Distributor Admin on Rari
@@ -40,6 +40,8 @@ contract AutoRewardsDistributor is CoreRef {
         tribalChiefRewardIndex = _tribalChiefRewardIndex;
         rewardsDistributorAdmin = _rewardsDistributorAdmin;
         tribalChief = _tribalChief;
+
+        _setContractAdminRole(keccak256("TRIBAL_CHIEF_ADMIN_ROLE"));
     }
 
     /// @notice helper function that gets all needed state from the TribalChief contract
diff --git a/contracts/staking/feirari/IRewardsDistributorAdmin.sol b/contracts/staking/feirari/IRewardsDistributorAdmin.sol
diff --git a/contracts/staking/feirari/RewardsDistributorAdmin.sol b/contracts/staking/feirari/RewardsDistributorAdmin.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "../refs/CoreRef.sol";
+import "../../refs/CoreRef.sol";
 import "./IRewardsDistributorAdmin.sol";
 import "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
 
diff --git a/proposals/dao/feiRari.ts b/proposals/dao/feiRari.ts
@@ -0,0 +1,36 @@
+import { expect } from 'chai';
+import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc, ValidateUpgradeFunc } from '../../types/types';
+import { ethers } from 'hardhat';
+
+const toBN = ethers.BigNumber.from;
+const e18 = ethers.constants.WeiPerEther;
+
+const setup: SetupUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {};
+const run: RunUpgradeFunc = async (addresses, oldContracts, contracts, logging = false) => {};
+const teardown: TeardownUpgradeFunc = async (addresses, oldContracts, contracts, logging) => {};
+
+const validate: ValidateUpgradeFunc = async (addresses, oldContracts, contracts) => {
+  const poolAllocPoints = 1000;
+  const totalAllocPoint = 3100;
+  const seventyFiveTribe = toBN('75').mul(toBN(e18));
+
+  const { autoRewardsDistributor, rewardsDistributorAdmin } = contracts;
+  const { rariRewardsDistributorDelegator } = addresses;
+
+  const AUTO_REWARDS_DISTRIBUTOR_ROLE = await rewardsDistributorAdmin.AUTO_REWARDS_DISTRIBUTOR_ROLE();
+
+  /// check that the contracts were wired together properly
+  expect(await rewardsDistributorAdmin.hasRole(AUTO_REWARDS_DISTRIBUTOR_ROLE, autoRewardsDistributor.address)).to.be
+    .true;
+  expect(await autoRewardsDistributor.rewardsDistributorAdmin()).to.be.equal(rewardsDistributorAdmin.address);
+  expect(await rewardsDistributorAdmin.isContractAdmin(contracts.optimisticTimelock.address)).to.be.true;
+  expect(await rewardsDistributorAdmin.rewardsDistributorContract()).to.be.equal(rariRewardsDistributorDelegator);
+
+  const expectedTribePerBlock = seventyFiveTribe.mul(toBN(poolAllocPoints)).div(toBN(totalAllocPoint));
+  const [actualTribePerBlock, updateNeeded] = await autoRewardsDistributor.getNewRewardSpeed();
+  /// ensure the newly calculated tribe per block is correct
+  expect(updateNeeded).to.be.true;
+  expect(actualTribePerBlock).to.be.equal(expectedTribePerBlock);
+};
+
+export { validate, setup, run, teardown };
diff --git a/scripts/deploy/feiRari.ts b/scripts/deploy/feiRari.ts
@@ -0,0 +1,41 @@
+import hre, { ethers } from 'hardhat';
+
+async function deploy(deployAddress, addresses, logging = false) {
+  const { core, rariPool8Tribe, rariRewardsDistributorDelegator, tribalChief } = addresses;
+
+  const tribalChiefIndex = 3;
+  /// do not incentivize borrowing, instead incentivize supplying
+  const isBorrowIncentivized = false;
+
+  /// calculate the address of the RDA that has not been deployed, then pass that
+  /// into the autorewards distributor constructor so no admin actions are needed to wire the contracts together
+  const signer = await ethers.getSigner(deployAddress);
+  const currentNonce = Number(
+    await hre.network.provider.request({
+      method: 'eth_getTransactionCount',
+      params: [signer.address]
+    })
+  );
+  const futureRDAAddress = ethers.utils.getContractAddress({ from: signer.address, nonce: currentNonce + 1 });
+
+  const autoRewardsDistributorFactory = await ethers.getContractFactory('AutoRewardsDistributor');
+  const autoRewardsDistributor = await autoRewardsDistributorFactory
+    .connect(signer)
+    .deploy(core, futureRDAAddress, tribalChief, tribalChiefIndex, rariPool8Tribe, isBorrowIncentivized);
+
+  logging && console.log('AutoRewardsDistributor deployed to: ', autoRewardsDistributor.address);
+
+  const rewardsDistributorAdminFactory = await ethers.getContractFactory('RewardsDistributorAdmin');
+  const rewardsDistributorAdmin = await rewardsDistributorAdminFactory
+    .connect(signer)
+    .deploy(core, rariRewardsDistributorDelegator, [autoRewardsDistributor.address]);
+
+  logging && console.log('RewardsDistributorAdmin deployed to: ', rewardsDistributorAdmin.address);
+
+  return {
+    autoRewardsDistributor,
+    rewardsDistributorAdmin
+  };
+}
+
+module.exports = { deploy };
diff --git a/test/integration/proposals_config.json b/test/integration/proposals_config.json
@@ -13,5 +13,10 @@
         "deploy" : true,
         "exec" : false,
         "proposerAddress" : "0xb81cf4981Ef648aaA73F07a18B03970f04d5D8bF"
+    },
+    "feiRari": {
+        "deploy" : true,
+        "exec" : false,
+        "proposerAddress" : "0xb81cf4981Ef648aaA73F07a18B03970f04d5D8bF"
     }
 }
diff --git a/test/unit/staking/feirari/AutoRewardsDistributor.test.ts b/test/unit/staking/feirari/AutoRewardsDistributor.test.ts
@@ -1,12 +1,12 @@
-import { expectRevert, balance, getAddresses, getCore } from '../../helpers';
+import { expectRevert, balance, getAddresses, getCore } from '../../../helpers';
 import { expect } from 'chai';
 import hre, { ethers, artifacts } from 'hardhat';
 import { Signer, BigNumber } from 'ethers';
-import { AutoRewardsDistributor } from '../../../types/contracts/AutoRewardsDistributor';
-import { MockRewardsDistributor } from '../../../types/contracts/MockRewardsDistributor';
-import { MockTribalChief } from '../../../types/contracts/MockTribalChief';
-import { Core } from '../../../types/contracts/Core';
-import { Tribe } from '../../../types/contracts/Tribe';
+import { AutoRewardsDistributor } from '../../../../types/contracts/AutoRewardsDistributor';
+import { MockRewardsDistributor } from '../../../../types/contracts/MockRewardsDistributor';
+import { MockTribalChief } from '../../../../types/contracts/MockTribalChief';
+import { Core } from '../../../../types/contracts/Core';
+import { Tribe } from '../../../../types/contracts/Tribe';
 
 const toBN = ethers.BigNumber.from;
 
diff --git a/test/unit/staking/feirari/RewardsDistributorAdmin.test.ts b/test/unit/staking/feirari/RewardsDistributorAdmin.test.ts
@@ -1,11 +1,11 @@
-import { expectRevert, getAddresses, getCore } from '../../helpers';
+import { expectRevert, getAddresses, getCore } from '../../../helpers';
 import { expect } from 'chai';
 import hre, { ethers, artifacts } from 'hardhat';
 import { Signer, utils } from 'ethers';
 import testHelpers from '@openzeppelin/test-helpers';
-import { Core } from '../../../types/contracts/Core';
-import { RewardsDistributorAdmin } from '../../../types/contracts/RewardsDistributorAdmin';
-import { MockRewardsDistributor } from '../../../types/contracts/MockRewardsDistributor';
+import { Core } from '../../../../types/contracts/Core';
+import { RewardsDistributorAdmin } from '../../../../types/contracts/RewardsDistributorAdmin';
+import { MockRewardsDistributor } from '../../../../types/contracts/MockRewardsDistributor';
 import { keccak256 } from 'ethers/lib/utils';
 
 const toBN = ethers.BigNumber.from;
diff --git a/types/types.ts b/types/types.ts
@@ -127,6 +127,8 @@ export interface MainnetContracts {
   aaveTribeIncentivesController: ethers.Contract;
   optimisticTimelock: ethers.Contract;
   feiDAO: ethers.Contract;
+  autoRewardsDistributor: ethers.Contract;
+  rewardsDistributorAdmin: ethers.Contract;
 }
 
 export interface MainnetContractAddresses {
@@ -159,6 +161,8 @@ export interface MainnetContractAddresses {
   rariPool8Tribe: string;
   curve3Metapool: string;
   tribalChiefOptimisticMultisig: string;
+  stakingTokenWrapperRari: string;
+  rariRewardsDistributorDelegator: string;
 }
 
 export type ProposalConfig = {

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,10 @@`
`13`	`13`	`"deploy" : true,`
`14`	`14`	`"exec" : false,`
`15`	`15`	`"proposerAddress" : "0xb81cf4981Ef648aaA73F07a18B03970f04d5D8bF"`
	`16`	`+ },`
	`17`	`+ "feiRari": {`
	`18`	`+ "deploy" : true,`
	`19`	`+ "exec" : false,`
	`20`	`+ "proposerAddress" : "0xb81cf4981Ef648aaA73F07a18B03970f04d5D8bF"`
`16`	`21`	`}`
`17`	`22`	`}`