deploy: Move treasury deploy to deploy_contracts

deploy/deploy_contracts.ts

@@ -1,7 +1,7 @@
 import {HardhatRuntimeEnvironment} from "hardhat/types"
 import {DeployFunction} from "hardhat-deploy/types"
 import {ethers} from "hardhat"
-import {Contract} from "ethers"
+import {Contract, constants} from "ethers"
 import {DeployResult, Export} from "hardhat-deploy/dist/types"
 import fs from "fs"
 
@@ -11,7 +11,9 @@ import {
     RoundsManager,
     TicketBroker,
     LivepeerToken,
-    Governor
+    Governor,
+    LivepeerGovernor,
+    Treasury
 } from "../typechain"
 
 import ContractDeployer from "../utils/deployer"
@@ -213,6 +215,59 @@ const func: DeployFunction = async function(hre: HardhatRuntimeEnvironment) {
     await (await Governor.stage(transferOwnershipUpdate, 0)).wait()
     await (await Governor.execute(transferOwnershipUpdate)).wait()
 
+    // Treasury (LivepeerGovernor)
+
+    const treasury = await contractDeployer.deployAndRegister({
+        contract: "Treasury",
+        name: "Treasury",
+        args: []
+    })
+    const Treasury: Treasury = await ethers.getContractAt(
+        "Treasury",
+        treasury.address
+    )
+
+    await Treasury.initialize(
+        config.treasury.minDelay,
+        [], // governor will be added as a proposer later
+        [constants.AddressZero], // let anyone execute proposals
+        deployer // temporary admin role for deployer
+    ).then(tx => tx.wait())
+
+    const livepeerGovernor = await contractDeployer.deployAndRegister({
+        contract: "LivepeerGovernor",
+        name: "LivepeerGovernor",
+        args: [Controller.address],
+        proxy: true
+    })
+    const LivepeerGovernor: LivepeerGovernor = await ethers.getContractAt(
+        "LivepeerGovernor",
+        livepeerGovernor.address
+    )
+
+    await LivepeerGovernor.initialize(
+        config.livepeerGovernor.initialVotingDelay,
+        config.livepeerGovernor.initialVotingPeriod,
+        config.livepeerGovernor.initialProposalThreshold,
+        config.livepeerGovernor.initialQuorum,
+        config.livepeerGovernor.quota
+    ).then(tx => tx.wait())
+
+    // Now grant proposer and executor roles to governor and renounce deployer admin role
+    const roles = {
+        proposer: await Treasury.PROPOSER_ROLE(),
+        canceller: await Treasury.CANCELLER_ROLE(),
+        executor: await Treasury.EXECUTOR_ROLE(),
+        admin: await Treasury.TIMELOCK_ADMIN_ROLE()
+    }
+    for (const role of [roles.proposer, roles.canceller, roles.executor]) {
+        await Treasury.grantRole(role, LivepeerGovernor.address).then(tx =>
+            tx.wait()
+        )
+    }
+
+    await Treasury.renounceRole(roles.admin, deployer).then(tx => tx.wait())
+
     // Set BondingManager parameters
     const BondingManager: BondingManager = (await ethers.getContractAt(
         "BondingManager",

doc/devnet.md

@@ -14,14 +14,14 @@
 
 ## Deployment
 
-- `yarn deploy --network <network>` to deploy the `Contracts` and `Poll` tags
+- `yarn deploy --network <network>` to deploy all the core protocol contracts
 - `npx hardhat deploy --tags ARBITRUM_LPT_DUMMIES --network <network>` to deploy the L2 bridge no-ops
-- `npx hardhat deploy --tags LivepeerGovernor  --network <network>` to deploy the treasury and governor contracts
 
 ## Verification
 
 To verify all contracts that have been deployed in the network:
-- `yarn verify  --network <network>`
+
+- `yarn verify --network <network>`
 
 ## Housekeeping
 

test/integration/LivepeerGovernor.ts

@@ -47,9 +47,7 @@ describe("LivepeerGovernor", () => {
         signers = await ethers.getSigners()
         proposer = signers[0]
 
-        const fixture = await setupIntegrationTest({
-            tags: ["LivepeerGovernor"]
-        })
+        const fixture = await setupIntegrationTest()
         controller = await ethers.getContractAt(
             "Controller",
             fixture.Controller.address