log additions to the whitelist

Author: nuevoalex

source/contracts/Augur.sol

@@ -34,6 +34,7 @@ contract Augur is Controlled, Extractable {
     event TokensMinted(address indexed universe, address indexed token, address indexed target, uint256 amount);
     event TokensBurned(address indexed universe, address indexed token, address indexed target, uint256 amount);
     event FeeWindowCreated(address indexed universe, address feeWindow, uint256 startTime, uint256 endTime, uint256 id);
+    event WhitelistAddition(address addition);
 
     mapping(address => bool) private universes;
 
@@ -279,6 +280,11 @@ contract Augur is Controlled, Extractable {
         return true;
     }
 
+    function logContractAddedToWhitelist(address _addition) public onlyControllerCaller returns (bool) {
+        WhitelistAddition(_addition);
+        return true;
+    }
+
     function getProtectedTokens() internal returns (address[] memory) {
         return new address[](0);
     }

source/contracts/Controller.sol

@@ -66,6 +66,7 @@ contract Controller is IController {
 
     function addToWhitelist(address _target) public onlyWhitelistedCallers returns (bool) {
         whitelist[_target] = true;
+        getAugur().logContractAddedToWhitelist(_target);
         return true;
     }
 

source/libraries/ContractDeployer.ts

@@ -31,8 +31,8 @@ export class ContractDeployer {
     public async deploy(): Promise<void> {
         this.controller = await this.uploadController();
         await this.uploadAllContracts();
+        await this.initializeAllContracts();        
         await this.whitelistTradingContracts();
-        await this.initializeAllContracts();
 
         if(this.configuration.createGenesisUniverse) {
             this.universe = await this.createGenesisUniverse();

tests/conftest.py

@@ -427,8 +427,8 @@ def controllerSnapshot(fixture, baseSnapshot):
 def augurInitializedSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
     fixture.uploadAllContracts()
-    fixture.whitelistTradingContracts()
     fixture.initializeAllContracts()
+    fixture.whitelistTradingContracts()
     fixture.approveCentralAuthority()
     return fixture.createSnapshot()
 

tests/test_controller.py

@@ -3,14 +3,18 @@
 from ethereum.tools import tester
 from ethereum.tools.tester import TransactionFailed
 from pytest import raises, fixture
-from utils import longToHexString, bytesToHexString, stringToBytes, longTo32Bytes, garbageAddress, garbageBytes20, garbageBytes32, twentyZeros, thirtyTwoZeros
+from utils import AssertLog, longToHexString, bytesToHexString, stringToBytes, longTo32Bytes, garbageAddress, garbageBytes20, garbageBytes32, twentyZeros, thirtyTwoZeros
 from struct import pack
 
-def test_whitelists(controller):
+def test_whitelists(localFixture, controller):
     assert controller.assertIsWhitelisted(tester.a0, sender = tester.k2)
     with raises(TransactionFailed): controller.addToWhitelist(tester.a1, sender = tester.k1)
     with raises(TransactionFailed): controller.addToWhitelist(tester.a1, sender = tester.k2)
-    assert controller.addToWhitelist(tester.a1, sender = tester.k0)
+
+    whitelistAdditionLog = {"addition": bytesToHexString(tester.a1)}
+    with AssertLog(localFixture, "WhitelistAddition", whitelistAdditionLog):
+        assert controller.addToWhitelist(tester.a1, sender = tester.k0)
+    
     assert controller.assertIsWhitelisted(tester.a1, sender = tester.k2)
     with raises(TransactionFailed): controller.assertIsWhitelisted(tester.a2, sender = tester.k2)
     with raises(TransactionFailed): controller.removeFromWhitelist(tester.a1, sender = tester.k2)
@@ -89,6 +93,8 @@ def test_getContractDetails(controller):
 def localSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
     fixture.upload('solidity_test_helpers/ControllerUser.sol')
+    fixture.uploadAndAddToController('../source/contracts/Augur.sol')
+    fixture.contracts["Augur"].setController(fixture.contracts['Controller'].address)
     decentralizedController = fixture.upload('../source/contracts/Controller.sol', 'decentralizedController')
     decentralizedController.switchModeSoOnlyEmergencyStopsAndEscapeHatchesCanBeUsed(sender = tester.k0)
     return fixture.createSnapshot()