Skip to content

DAOTracker Arc Version #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2019
Merged

DAOTracker Arc Version #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/universalSchemes/DaoCreator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ contract DaoCreator {
}

// Add the DAO to the tracking registry
daoTracker.track(avatar, controller);
daoTracker.track(avatar, controller, "");

// Transfer ownership:
avatar.transferOwnership(address(controller));
Expand Down
27 changes: 22 additions & 5 deletions contracts/utils/DAOTracker.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,24 @@ contract DAOTracker is Ownable {
// Only able to be set by the owner of the DAOTracker.
mapping(address=>bool) public blacklisted;

event TrackDAO(address indexed _avatar, address _controller, address _reputation, address _daoToken);
event BlacklistDAO(address indexed _avatar, string _explanationHash);
event ResetDAO(address indexed _avatar, string _explanationHash);
event TrackDAO(
address indexed _avatar,
address _controller,
address _reputation,
address _daoToken,
address _sender,
string _arcVersion
);

event BlacklistDAO(
address indexed _avatar,
string _explanationHash
);

event ResetDAO(
address indexed _avatar,
string _explanationHash
);

modifier onlyAvatarOwner(Avatar avatar) {
require(avatar.owner() == msg.sender,
Expand All @@ -43,7 +58,7 @@ contract DAOTracker is Ownable {
* @param _avatar the organization avatar
* @param _controller the organization controller
*/
function track(Avatar _avatar, ControllerInterface _controller)
function track(Avatar _avatar, ControllerInterface _controller, string memory _arcVersion)
public
onlyAvatarOwner(_avatar)
notBlacklisted(_avatar) {
Expand All @@ -56,7 +71,9 @@ contract DAOTracker is Ownable {
address(_avatar),
address(_controller),
address(_avatar.nativeReputation()),
address(_avatar.nativeToken())
address(_avatar.nativeToken()),
msg.sender,
_arcVersion
);
}

Expand Down
14 changes: 9 additions & 5 deletions test/daotracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const setup = async function () {

contract("DAOTracker", accounts => {

const arcVersionStub = "v0.0";

it("track", async () => {
const testSetup = await setup();
const avatar = testSetup.avatar.address;
Expand All @@ -30,7 +32,7 @@ contract("DAOTracker", accounts => {
const controller = testSetup.controller.address;

const tx = await testSetup.daoTracker.track(
avatar, controller, opts
avatar, controller, arcVersionStub, opts
);

// Verify Event
Expand All @@ -40,6 +42,8 @@ contract("DAOTracker", accounts => {
assert.equal(tx.logs[0].args._controller, controller);
assert.equal(tx.logs[0].args._reputation, reputation);
assert.equal(tx.logs[0].args._daoToken, daoToken);
assert.equal(tx.logs[0].args._sender, accounts[0]);
assert.equal(tx.logs[0].args._arcVersion, arcVersionStub);

// Verify Storage
const blacklisted = await testSetup.daoTracker.blacklisted(avatar);
Expand All @@ -53,7 +57,7 @@ contract("DAOTracker", accounts => {

try {
await testSetup.daoTracker.track(
avatar, controller, {gas: opts.gas, from: accounts[1]}
avatar, controller, arcVersionStub, {gas: opts.gas, from: accounts[1]}
);
assert.fail("This should never happen.");
} catch (e) {
Expand All @@ -67,7 +71,7 @@ contract("DAOTracker", accounts => {

try {
await testSetup.daoTracker.track(
"0x0000000000000000000000000000000000000000", controller, opts
"0x0000000000000000000000000000000000000000", controller, arcVersionStub, opts
);
assert.fail("This should never happen.");
} catch (e) {
Expand All @@ -81,7 +85,7 @@ contract("DAOTracker", accounts => {

try {
await testSetup.daoTracker.track(
avatar, "0x0000000000000000000000000000000000000000", opts
avatar, "0x0000000000000000000000000000000000000000", arcVersionStub, opts
);
assert.fail("This should never happen.");
} catch (e) {
Expand Down Expand Up @@ -138,7 +142,7 @@ contract("DAOTracker", accounts => {
const controller = testSetup.controller.address;

await testSetup.daoTracker.track(
avatar, controller, opts
avatar, controller, arcVersionStub, opts
);

let blacklisted = await testSetup.daoTracker.blacklisted(avatar);
Expand Down