Feature/pool 328 as the governor i wish to add controlled (#82)

pooltogether · Jul 31, 2020 · 8a2e9ef · 8a2e9ef
1 parent 06065c9
commit 8a2e9ef
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/contracts/prize-pool/PrizePool.sol b/contracts/prize-pool/PrizePool.sol
@@ -421,6 +421,13 @@ abstract contract PrizePool is OwnableUpgradeSafe, BaseRelayRecipient, Reentranc
     }
   }
 
+  /// @notice Allows the Governor to add Controlled Tokens to the Prize Pool
+  /// @param _controlledToken The address of the Controlled Token to add
+  function addControlledToken(address _controlledToken) external onlyOwner {
+    require(ControlledToken(_controlledToken).controller() == this, "PrizePool/token-ctrlr-mismatch");
+    _tokens.addAddress(_controlledToken);
+  }
+
   /// @notice Emergency shutdown of the Prize Pool by detaching the Prize Strategy
   /// @dev Called by the PrizeStrategy contract to issue an Emergency Shutdown of a corrupted Prize Strategy
   function detachPrizeStrategy() external onlyOwner {

diff --git a/test/CompoundPrizePool.test.js b/test/CompoundPrizePool.test.js
@@ -289,6 +289,31 @@ describe('CompoundPrizePool', function() {
       })
     })
 
+    describe('addControlledToken()', () => {
+      let newToken
+
+      beforeEach(async () => {
+        newToken = await deployMockContract(wallet, ControlledToken.abi, overrides)
+      })
+
+      it('should allow owner to add controlled tokens', async () => {
+        await newToken.mock.controller.returns(prizePool.address)
+        await expect(prizePool.addControlledToken(newToken.address))
+          .to.not.be.revertedWith('PrizePool/token-ctrlr-mismatch')
+      })
+
+      it('should not allow adding uncontrolled tokens', async () => {
+        await newToken.mock.controller.returns(newToken.address)
+        await expect(prizePool.addControlledToken(newToken.address))
+          .to.be.revertedWith('PrizePool/token-ctrlr-mismatch')
+      })
+
+      it('should not allow anyone else to call', async () => {
+        await expect(prizePool.connect(wallet2).addControlledToken(newToken.address))
+          .to.be.revertedWith('Ownable: caller is not the owner')
+      })
+    })
+
     describe('detachPrizeStrategy()', () => {
       it('should allow owner to detach', async () => {
         await prizePool.detachPrizeStrategy()