CI will fail if a Controlled contract is not Extractable

AugurProject · Jan 8, 2018 · f5d6878 · f5d6878
1 parent 4ba798f
commit f5d6878
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 70 deletions.
diff --git a/source/contracts/reporting/FeeToken.sol b/source/contracts/reporting/FeeToken.sol
@@ -4,9 +4,10 @@ import 'reporting/IFeeToken.sol';
 import 'reporting/IFeeWindow.sol';
 import 'libraries/DelegationTarget.sol';
 import 'libraries/token/VariableSupplyToken.sol';
+import 'libraries/Extractable.sol';
 
 
-contract FeeToken is DelegationTarget, VariableSupplyToken, IFeeToken {
+contract FeeToken is DelegationTarget, Extractable, VariableSupplyToken, IFeeToken {
     IFeeWindow private feeWindow;
 
     function initialize(IFeeWindow _feeWindow) public beforeInitialized returns (bool) {
@@ -45,4 +46,8 @@ contract FeeToken is DelegationTarget, VariableSupplyToken, IFeeToken {
         controller.getAugur().logFeeTokenBurned(feeWindow.getUniverse(), _target, _amount);
         return true;
     }
+
+    function getProtectedTokens() internal returns (address[] memory) {
+        return new address[](0);
+    }
 }
diff --git a/source/contracts/reporting/Mailbox.sol b/source/contracts/reporting/Mailbox.sol
@@ -6,9 +6,10 @@ import 'libraries/token/ERC20Basic.sol';
 import 'libraries/Initializable.sol';
 import 'reporting/IMailbox.sol';
 import 'trading/ICash.sol';
+import 'libraries/Extractable.sol';
 
 
-contract Mailbox is DelegationTarget, Ownable, Initializable, IMailbox {
+contract Mailbox is DelegationTarget, Extractable, Ownable, Initializable, IMailbox {
     function initialize(address _owner) public onlyInGoodTimes beforeInitialized returns (bool) {
         endInitialization();
         owner = _owner;
@@ -39,4 +40,12 @@ contract Mailbox is DelegationTarget, Ownable, Initializable, IMailbox {
         require(_token.transfer(owner, _balance));
         return true;
     }
+
+    function getProtectedTokens() internal returns (address[] memory) {
+        address[] memory _protectedTokens = new address[](2);
+        // address(1) is the sentinel value for Ether extraction
+        _protectedTokens[0] = address(1);
+        _protectedTokens[1] = ICash(controller.lookup("Cash"));
+        return _protectedTokens;
+    }
 }