License changes. Log when contracts are added to the registry

nuevoalex · nuevoalex · commit 14057cf946be · 2017-12-29T08:23:56.000-08:00
diff --git a/CRIBBED_CODE.txt b/CRIBBED_CODE.txt
@@ -0,0 +1,29 @@
+Licensing inclusion for the following files which were originally taken from the OpenZeppelin Solidity token contracts and later modified by us:
+
+source/libraries/token/BasicToken.sol
+source/libraries/token/ERC20.sol
+source/libraries/token/ERC20Basic.sol
+source/libraries/token/StandardToken.sol
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Smart Contract Solutions, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/source/contracts/Augur.sol b/source/contracts/Augur.sol
@@ -35,6 +35,7 @@ contract Augur is Controlled, Extractable {
     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);
+    event RegistryAddition(bytes32 key, address addition, bytes20 commitHash, bytes32 bytecodeHash);
 
     mapping(address => bool) private universes;
 
@@ -285,6 +286,11 @@ contract Augur is Controlled, Extractable {
         return true;
     }
 
+    function logContractAddedToRegistry(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public onlyControllerCaller returns (bool) {
+        RegistryAddition(_key, _address, _commitHash, _bytecodeHash);
+        return true;
+    }
+
     function getProtectedTokens() internal returns (address[] memory) {
         return new address[](0);
     }
diff --git a/source/contracts/Controller.sol b/source/contracts/Controller.sol
@@ -86,6 +86,7 @@ contract Controller is IController {
 
     function registerContract(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public onlyOwnerCaller returns (bool) {
         registry[_key] = ContractDetails(_key, _address, _commitHash, _bytecodeHash);
+        getAugur().logContractAddedToRegistry(_key, _address, _commitHash, _bytecodeHash);
         return true;
     }
 
diff --git a/source/contracts/libraries/Delegator.sol b/source/contracts/libraries/Delegator.sol
@@ -23,8 +23,9 @@ contract Delegator is DelegationTarget {
         assembly {
             //0x40 is the address where the next free memory slot is stored in Solidity
             let _calldataMemoryOffset := mload(0x40)
-            // Update the pointer at 0x40 to point at new free memory location so any theoretical allocation doesn't stomp our memory in this call
+            // new "memory end" including padding. The bitwise operations here ensure we get rounded up to the nearest 32 byte boundary
             let _size := and(add(calldatasize, 0x1f), not(0x1f))
+            // Update the pointer at 0x40 to point at new free memory location so any theoretical allocation doesn't stomp our memory in this call
             mstore(0x40, add(_calldataMemoryOffset, _size))
             // Copy method signature and parameters of this call into memory
             calldatacopy(_calldataMemoryOffset, 0x0, calldatasize)
diff --git a/source/contracts/libraries/token/BasicToken.sol b/source/contracts/libraries/token/BasicToken.sol
@@ -1,28 +1,3 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 Smart Contract Solutions, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
 pragma solidity 0.4.18;
 
 
diff --git a/source/contracts/libraries/token/ERC20.sol b/source/contracts/libraries/token/ERC20.sol
@@ -1,28 +1,3 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 Smart Contract Solutions, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
 pragma solidity 0.4.18;
 
 
diff --git a/source/contracts/libraries/token/ERC20Basic.sol b/source/contracts/libraries/token/ERC20Basic.sol
@@ -1,28 +1,3 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 Smart Contract Solutions, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
 pragma solidity 0.4.18;
 
 
diff --git a/source/contracts/libraries/token/StandardToken.sol b/source/contracts/libraries/token/StandardToken.sol
@@ -1,28 +1,3 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 Smart Contract Solutions, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
 pragma solidity 0.4.18;
 
 
diff --git a/source/libraries/ContractDeployer.ts b/source/libraries/ContractDeployer.ts
@@ -30,6 +30,7 @@ export class ContractDeployer {
 
     public async deploy(): Promise<void> {
         this.controller = await this.uploadController();
+        await this.uploadAugur();
         await this.uploadAllContracts();
         await this.initializeAllContracts();        
         await this.whitelistTradingContracts();
@@ -87,6 +88,19 @@ export class ContractDeployer {
         return controller;
     }
 
+    private async uploadAugur(): Promise<void> {
+        // We have to upload and initialize Augur first so it can log the registration and whitelisting of other contracts
+        const contract = await this.contracts.get("Augur");
+        const address = await this.construct(contract, [], `Uploading ${contract.contractName}`);
+        const commitHash = await ContractDeployer.getGitCommit();
+        const bytecodeHash = await ContractDeployer.getBytecodeSha(contract.bytecode);
+        const augur = new Augur(this.connector, this.accountManager, address, this.configuration.gasPrice);
+        contract.address = address;
+        const setControllerTransactionHash = await augur.setController(this.controller.address);
+        await this.connector.waitForTransactionReceipt(setControllerTransactionHash, `Initializing Augur.`);
+        await this.controller.registerContract(stringTo32ByteHex("Augur"), address, commitHash, bytecodeHash);
+    }
+
     private async uploadAllContracts(): Promise<void> {
         console.log('Uploading contracts...');
         const promises = [...this.contracts].map(contract => this.upload(contract));
@@ -99,6 +113,7 @@ export class ContractDeployer {
         if (contractName === 'Controller') return;
         if (contractName === 'Delegator') return;
         if (contractName === 'TimeControlled') return;
+        if (contractName === 'Augur') return;
         if (contractName === 'Time') contract = this.configuration.useNormalTime ? contract: this.contracts.get('TimeControlled');
         if (contract.relativeFilePath.startsWith('legacy_reputation/')) return;
         if (contract.relativeFilePath.startsWith('libraries/')) return;
@@ -182,7 +197,7 @@ export class ContractDeployer {
 
     private async initializeAllContracts(): Promise<void> {
         console.log('Initializing contracts...');
-        const contractsToInitialize = ["Augur","CompleteSets","CreateOrder","FillOrder","CancelOrder","Trade","ClaimTradingProceeds","OrdersFetcher","Time"];
+        const contractsToInitialize = ["CompleteSets","CreateOrder","FillOrder","CancelOrder","Trade","ClaimTradingProceeds","OrdersFetcher","Time"];
         const promises: Array<Promise<any>> = [];
         for (let contractName of contractsToInitialize) {
             promises.push(this.initializeContract(contractName));
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -266,6 +266,7 @@ def uploadAllContracts(self):
                 extension = path.splitext(filename)[1]
                 if extension != '.sol': continue
                 if name == 'controller': continue
+                if name == 'Augur': continue
                 if name == 'Time': continue # In testing and development we swap the Time library for a ControlledTime version which lets us manage block timestamp
                 contractsToDelegate = ['Orders', 'TradingEscapeHatch', 'Cash']
                 if name in contractsToDelegate:
@@ -300,7 +301,7 @@ def whitelistTradingContracts(self):
             self.contracts['Controller'].addToWhitelist(self.contracts[name].address)
 
     def initializeAllContracts(self):
-        contractsToInitialize = ['Augur','CompleteSets','CreateOrder','FillOrder','CancelOrder','Trade','ClaimTradingProceeds','OrdersFetcher', 'Time']
+        contractsToInitialize = ['CompleteSets','CreateOrder','FillOrder','CancelOrder','Trade','ClaimTradingProceeds','OrdersFetcher', 'Time']
         for contractName in contractsToInitialize:
             if getattr(self.contracts[contractName], "setController", None):
                 self.contracts[contractName].setController(self.contracts['Controller'].address)
@@ -326,6 +327,13 @@ def approveCentralAuthority(self):
             for contractName in contractsToApprove:
                 self.contracts[contractName].approve(authority.address, 2**254, sender=testerKey)
 
+    def uploadAugur(self):
+        # We have to upload Augur first so it can log when contracts are added to the registry
+        augur = self.upload("../source/contracts/Augur.sol")
+        self.contracts["Augur"].setController(self.contracts['Controller'].address)
+        self.contracts['Controller'].registerContract("Augur".ljust(32, '\x00'), augur.address, garbageBytes20, garbageBytes32)
+        return augur
+
     def uploadShareToken(self, controllerAddress = None):
         controllerAddress = controllerAddress if controllerAddress else self.contracts['Controller'].address
         self.ensureShareTokenDependencies()
@@ -426,6 +434,7 @@ def controllerSnapshot(fixture, baseSnapshot):
 @pytest.fixture(scope="session")
 def augurInitializedSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
+    fixture.uploadAugur()
     fixture.uploadAllContracts()
     fixture.initializeAllContracts()
     fixture.whitelistTradingContracts()
diff --git a/tests/libraries/test_cash_auto_wrapper.py b/tests/libraries/test_cash_auto_wrapper.py
@@ -27,8 +27,7 @@ def test_convertToAndFromCash(cash, cashWrapperHelper, controller, augur, chain)
 @pytest_fixture(scope='session')
 def localSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
-    fixture.uploadAndAddToController('../source/contracts/Augur.sol')
-    fixture.contracts['Augur'].setController(fixture.contracts['Controller'].address)
+    fixture.uploadAugur()
     fixture.uploadAndAddToController('../source/contracts/trading/Cash.sol')
     fixture.contracts['Cash'].setController(fixture.contracts['Controller'].address)
     fixture.uploadAndAddToController('solidity_test_helpers/CashWrapperHelper.sol')
diff --git a/tests/libraries/test_delegator.py b/tests/libraries/test_delegator.py
@@ -92,6 +92,7 @@ def test_delegationInputsAndOutputs(localFixture):
 @fixture(scope="session")
 def localSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
+    fixture.uploadAugur()
     name = "DelegatorHelper"
     targetName = "DelegatorHelperTarget"
     fixture.uploadAndAddToController("solidity_test_helpers/DelegatorHelper.sol", targetName, name)
diff --git a/tests/libraries/test_mailbox.py b/tests/libraries/test_mailbox.py
@@ -64,6 +64,8 @@ def test_mailbox_cash_happy_path(localFixture, mailbox, cash):
 def localSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
 
+    fixture.uploadAugur()
+
     # Upload a token
     fixture.uploadAndAddToController("solidity_test_helpers/StandardTokenHelper.sol")
 
diff --git a/tests/libraries/token/test_basic_token.py b/tests/libraries/token/test_basic_token.py
@@ -40,9 +40,8 @@ def test_basic_token_emit(localFixture, chain, mockToken):
 def localSnapshot(fixture, augurInitializedSnapshot):
     fixture.resetToSnapshot(augurInitializedSnapshot)
     controller = fixture.contracts['Controller']
+    mockAugur = fixture.uploadAndAddToController("solidity_test_helpers/MockAugur.sol", "Augur")
     mockToken = fixture.uploadAndAddToController("solidity_test_helpers/MockToken.sol")
-    mockAugur = fixture.uploadAndAddToController("solidity_test_helpers/MockAugur.sol")
-    controller.registerContract(stringToBytes('Augur'), mockAugur.address, twentyZeros, thirtyTwoZeros)
     return fixture.createSnapshot()
 
 @fixture
diff --git a/tests/solidity_test_helpers/MockAugur.sol b/tests/solidity_test_helpers/MockAugur.sol
@@ -167,4 +167,12 @@ contract MockAugur is Controlled {
     function logDisputeCrowdsourcerCompleted(IUniverse _universe, address _market, address _disputeCrowdsourcer) public returns (bool) {
         return true;
     }
+
+    function logContractAddedToWhitelist(address _addition) public returns (bool) {
+        return true;
+    }
+
+    function logContractAddedToRegistry(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public returns (bool) {
+        return true;
+    }
 }
diff --git a/tests/test_augur.py b/tests/test_augur.py
@@ -20,9 +20,8 @@ def test_augur_central_authority_for_cash(augur, cash):
 @pytest_fixture(scope="session")
 def localSnapshot(fixture, controllerSnapshot):
     fixture.resetToSnapshot(controllerSnapshot)
-    augur = fixture.uploadAndAddToController("../source/contracts/Augur.sol")
+    augur = fixture.uploadAugur()
     cash = fixture.uploadAndAddToController("../source/contracts/trading/Cash.sol")
-    augur.setController(fixture.contracts['Controller'].address)
     cash.setController(fixture.contracts['Controller'].address)
     fixture.approveCentralAuthority()
     snapshot = fixture.createSnapshot()
diff --git a/tests/test_controller.py b/tests/test_controller.py
@@ -21,13 +21,22 @@ def test_whitelists(localFixture, controller):
     assert controller.removeFromWhitelist(tester.a1, sender = tester.k1)
     with raises(TransactionFailed): controller.assertIsWhitelisted(tester.a1, sender = tester.k0)
 
-def test_registry(controller, decentralizedController):
+def test_registry(localFixture, controller, decentralizedController):
     key1 = 'abc'.ljust(32, '\x00')
     key2 = 'foo'.ljust(32, '\x00')
     with raises(TransactionFailed): controller.registerContract(key1, 123, garbageBytes20, garbageBytes32, sender = tester.k2)
     assert controller.lookup(key1, sender = tester.k2) == longToHexString(0)
     assert controller.addToWhitelist(tester.a1, sender = tester.k0)
-    assert controller.registerContract(key1, 123, garbageBytes20, garbageBytes32, sender = tester.k0)
+
+    registryAdditionLog = {
+        "key": key1,
+        "addition": longToHexString(123),
+        "commitHash": garbageBytes20,
+        "bytecodeHash": garbageBytes32
+    }
+    with AssertLog(localFixture, "RegistryAddition", registryAdditionLog):
+        assert controller.registerContract(key1, 123, garbageBytes20, garbageBytes32, sender = tester.k0)
+
     assert controller.lookup(key1, sender = tester.k2) == longToHexString(123)
     with raises(TransactionFailed): controller.assertOnlySpecifiedCaller(tester.a1, key2, sender = tester.k2)
     assert controller.registerContract(key2, tester.a1, garbageBytes20, garbageBytes32, sender = tester.k0)
@@ -93,8 +102,7 @@ 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)
+    fixture.uploadAugur()
     decentralizedController = fixture.upload('../source/contracts/Controller.sol', 'decentralizedController')
     decentralizedController.switchModeSoOnlyEmergencyStopsAndEscapeHatchesCanBeUsed(sender = tester.k0)
     return fixture.createSnapshot()
diff --git a/tests/trading/test_shareToken.py b/tests/trading/test_shareToken.py
@@ -127,6 +127,9 @@ def test_transferFrom(contractsFixture, market):
 def test_setController(contractsFixture, market):
     shareToken = contractsFixture.applySignature('ShareToken', market.getShareToken())
     newController = contractsFixture.upload('../source/contracts/Controller.sol', 'newController')
+    newAugur = contractsFixture.upload('../source/contracts/Augur.sol', "newAugur")
+    newAugur.setController(newController.address)
+    newController.registerContract("Augur".ljust(32, '\x00'), newAugur.address, garbageBytes20, garbageBytes32)
     newController.registerContract('shareToken'.ljust(32, '\x00'), shareToken.address, garbageBytes20, garbageBytes32)
 
     contractsFixture.contracts['Controller'].updateController(shareToken.address, newController.address, sender=tester.k0)

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ contract Controller is IController {`
`86`	`86`
`87`	`87`	`function registerContract(bytes32 _key, address _address, bytes20 _commitHash, bytes32 _bytecodeHash) public onlyOwnerCaller returns (bool) {`
`88`	`88`	`registry[_key] = ContractDetails(_key, _address, _commitHash, _bytecodeHash);`
	`89`	`+ getAugur().logContractAddedToRegistry(_key, _address, _commitHash, _bytecodeHash);`
`89`	`90`	`return true;`
`90`	`91`	`}`
`91`	`92`