From 5f0b9ee4b8b11f02ce5f59601cef8fdbd7805b9e Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 30 Dec 2019 15:36:17 +0200 Subject: [PATCH 1/2] Update NewOrg event --- contracts/utils/DAOFactory.sol | 9 +++++++-- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contracts/utils/DAOFactory.sol b/contracts/utils/DAOFactory.sol index e89a8c9d..0a4a79a8 100644 --- a/contracts/utils/DAOFactory.sol +++ b/contracts/utils/DAOFactory.sol @@ -14,7 +14,12 @@ contract DAOFactory is Initializable { using BytesLib for bytes; using SafeMath for uint256; - event NewOrg (address indexed _avatar); + event NewOrg ( + address indexed _avatar, + address _controller, + address _daotoken, + address _reputation + ); event InitialSchemesSet (address indexed _avatar); event SchemeInstance(address indexed _scheme, string _name); /** @@ -291,7 +296,7 @@ contract DAOFactory is Initializable { locks[address(avatar)].sender = msg.sender; locks[address(avatar)].packageVersion = packageVersion; - emit NewOrg (address(avatar)); + emit NewOrg (address(avatar), address(controller), address(nativeToken), address(nativeReputation)); return (address(avatar)); } diff --git a/package-lock.json b/package-lock.json index d76f7b08..78579e8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc-experimental", - "version": "0.1.1-rc.2", + "version": "0.1.1-rc.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 70ed992b..e0a180c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc-experimental", - "version": "0.1.1-rc.2", + "version": "0.1.1-rc.3", "description": "A platform for building DAOs", "files": [ "contracts/", From 92e48d73117184fe953aa087fe74a49b739daadd Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 30 Dec 2019 15:41:01 +0200 Subject: [PATCH 2/2] Index --- contracts/utils/DAOFactory.sol | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contracts/utils/DAOFactory.sol b/contracts/utils/DAOFactory.sol index 0a4a79a8..77d756ea 100644 --- a/contracts/utils/DAOFactory.sol +++ b/contracts/utils/DAOFactory.sol @@ -16,9 +16,9 @@ contract DAOFactory is Initializable { event NewOrg ( address indexed _avatar, - address _controller, - address _daotoken, - address _reputation + address indexed _controller, + address indexed _reputation, + address _daotoken ); event InitialSchemesSet (address indexed _avatar); event SchemeInstance(address indexed _scheme, string _name); @@ -57,7 +57,7 @@ contract DAOFactory is Initializable { */ function forgeOrg ( string calldata _orgName, - bytes calldata _tokenInitData, + bytes calldata _tokenInitData, address[] calldata _founders, uint[] calldata _foundersTokenAmount, uint[] calldata _foundersReputationAmount, @@ -296,7 +296,7 @@ contract DAOFactory is Initializable { locks[address(avatar)].sender = msg.sender; locks[address(avatar)].packageVersion = packageVersion; - emit NewOrg (address(avatar), address(controller), address(nativeToken), address(nativeReputation)); + emit NewOrg (address(avatar), address(controller), address(nativeReputation), address(nativeToken)); return (address(avatar)); }