Skip to content

Commit 56a0a5f

Browse files
Oren Sokolowskyorenyodfat
authored andcommitted
remove daoTracker
1 parent 02434cf commit 56a0a5f

24 files changed

+190
-539
lines changed

contracts/utils/DAOFactory.sol

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import "@openzeppelin/upgrades/contracts/upgradeability/ProxyAdmin.sol";
77
import "@openzeppelin/upgrades/contracts/upgradeability/AdminUpgradeabilityProxy.sol";
88
import "solidity-bytes-utils/contracts/BytesLib.sol";
99
import "../controller/Controller.sol";
10-
import "../utils/DAOTracker.sol";
1110
import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";
1211

1312

@@ -33,14 +32,11 @@ contract DAOFactory is Initializable {
3332
mapping(address=>Locks) public locks;
3433
App public app;
3534
string public constant PACKAGE_NAME = "DAOstack";
36-
DAOTracker private daoTracker;
3735
//this is here due to "stack too deep issue"
3836
uint64[3] private packageVersion;
3937

40-
function initialize(address _appContractAddress, DAOTracker _daoTracker) external initializer {
41-
require(_daoTracker != DAOTracker(0));
38+
function initialize(address _appContractAddress) external initializer {
4239
app = App(_appContractAddress);
43-
daoTracker = _daoTracker;
4440
}
4541

4642
/**
@@ -287,8 +283,6 @@ contract DAOFactory is Initializable {
287283
"Controller",
288284
address(avatar),
289285
abi.encodeWithSignature("initialize(address,address)", address(avatar), address(this)))));
290-
// Add the DAO to the tracking registry
291-
daoTracker.track(Avatar(address(avatar)), controller);
292286
// Transfer ownership:
293287
Avatar(address(avatar)).transferOwnership(address(controller));
294288
DAOToken(address(nativeToken)).transferOwnership(address(controller));

contracts/utils/DAOTracker.sol

Lines changed: 0 additions & 94 deletions
This file was deleted.

contracts/utils/DaoCreator.sol

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
pragma solidity ^0.5.13;
22

33
import "../controller/Controller.sol";
4-
import "../utils/DAOTracker.sol";
5-
64

75
/**
86
* @title ControllerCreator for creating a single controller.
@@ -29,13 +27,10 @@ contract DaoCreator {
2927
event InitialSchemesSet (address _avatar);
3028

3129
ControllerCreator private controllerCreator;
32-
DAOTracker private daoTracker;
3330

34-
constructor(ControllerCreator _controllerCreator, DAOTracker _daoTracker) public {
31+
constructor(ControllerCreator _controllerCreator) public {
3532
require(_controllerCreator != ControllerCreator(0));
36-
require(_daoTracker != DAOTracker(0));
3733
controllerCreator = _controllerCreator;
38-
daoTracker = _daoTracker;
3934
}
4035

4136
/**
@@ -192,9 +187,6 @@ contract DaoCreator {
192187
// Create Controller:
193188
Controller controller = Controller(controllerCreator.create(avatar));
194189

195-
// Add the DAO to the tracking registry
196-
daoTracker.track(avatar, controller);
197-
198190
// Transfer ownership:
199191
avatar.transferOwnership(address(controller));
200192
nativeToken.transferOwnership(address(controller));

migrations/2_deploy_organization.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var AbsoluteVote = artifacts.require('./AbsoluteVote.sol');
88
var ContributionReward = artifacts.require('./ContributionReward.sol');
99
var UpgradeScheme = artifacts.require('./UpgradeScheme.sol');
1010
var ControllerCreator = artifacts.require('./ControllerCreator.sol');
11-
var DAOTracker = artifacts.require('./DAOTracker.sol');
1211
const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
1312

1413

@@ -35,11 +34,9 @@ var accounts;
3534
//schemeRegistrar, upgradeScheme,globalConstraintRegistrar,simpleICO,contributionReward.
3635
module.exports = async function(deployer) {
3736
deployer.deploy(ControllerCreator, {gas: constants.ARC_GAS_LIMIT}).then(async function(){
38-
await deployer.deploy(DAOTracker, {gas: constants.ARC_GAS_LIMIT});
39-
var daoTracker = await DAOTracker.deployed();
4037
var controllerCreator = await ControllerCreator.deployed();
41-
await deployer.deploy(DaoCreator,controllerCreator.address,daoTracker.address, {gas: constants.ARC_GAS_LIMIT});
42-
var daoCreatorInst = await DaoCreator.deployed(controllerCreator.address,daoTracker.address,{gas: constants.ARC_GAS_LIMIT});
38+
await deployer.deploy(DaoCreator,controllerCreator.address, {gas: constants.ARC_GAS_LIMIT});
39+
var daoCreatorInst = await DaoCreator.deployed(controllerCreator.address,{gas: constants.ARC_GAS_LIMIT});
4340
// Create DAOstack:
4441

4542
await web3.eth.getAccounts(function(err,res) { accounts = res; });

0 commit comments

Comments
 (0)