Skip to content

Commit 88d15dd

Browse files
ben-kaufmanorenyodfat
authored andcommitted
Update ProxyCreated event (#701)
* Update ProxyCreated event * Add test * fix * Fix new version test
1 parent fb14319 commit 88d15dd

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

contracts/utils/DAOFactory.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ contract DAOFactory is Initializable {
2222
* @param _proxy Address of the created proxy.
2323
* @param _version of the created proxy.
2424
*/
25-
event ProxyCreated(address _proxy, uint64[3] _version);
25+
event ProxyCreated(address _proxy, address _implementation, string _contractName, uint64[3] _version);
2626

2727
struct Locks {
2828
address sender;
@@ -162,7 +162,7 @@ contract DAOFactory is Initializable {
162162
ImplementationProvider provider = ImplementationProvider(package.getContract(_packageVersion));
163163
address implementation = provider.getImplementation(_contractName);
164164
AdminUpgradeabilityProxy proxy = (new AdminUpgradeabilityProxy).value(msg.value)(implementation, _admin, _data);
165-
emit ProxyCreated(address(proxy), _packageVersion);
165+
emit ProxyCreated(address(proxy), implementation, _contractName, _packageVersion);
166166
return proxy;
167167
}
168168

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@daostack/arc-experimental",
3-
"version": "0.1.1-rc.1",
3+
"version": "0.1.1-rc.2",
44
"description": "A platform for building DAOs",
55
"files": [
66
"contracts/",

test/daofactory.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,9 @@ contract('DaoFactory', function(accounts) {
291291
var amountToMint = 10;
292292
await setup(accounts,amountToMint,amountToMint);
293293
var newVer = [0,2,0];
294+
const oldAvatarImplementation = registration.avatar.address;
294295
await helpers.registrationAddVersionToPackege(registration,newVer);
296+
295297
nativeTokenData = await new web3.eth.Contract(registration.daoToken.abi)
296298
.methods
297299
.initialize("TEST","TST",0,registration.daoFactory.address)
@@ -302,13 +304,17 @@ contract('DaoFactory', function(accounts) {
302304
var avatarAddress = tx.logs[4].args._avatar;
303305
assert.equal(tx.logs[2].event, "ProxyCreated");
304306
assert.equal(tx.logs[2].args._proxy, avatarAddress);
307+
assert.equal(tx.logs[2].args._implementation, oldAvatarImplementation);
308+
assert.equal(tx.logs[2].args._contractName, "Avatar");
305309
assert.equal(tx.logs[2].args._version[1].toNumber(),1);
306310

307-
tx = await registration.daoFactory.forgeOrg("testOrg",nativeTokenData,[accounts[0]],[amountToMint],[amountToMint],[0,0,0],{gas:constants.ARC_GAS_LIMIT});
311+
tx = await registration.daoFactory.forgeOrg("testOrg",nativeTokenData,[accounts[0]],[amountToMint],[amountToMint],[0,2,0],{gas:constants.ARC_GAS_LIMIT});
308312
assert.equal(tx.logs.length, 5);
309313
avatarAddress = tx.logs[4].args._avatar;
310314
assert.equal(tx.logs[2].event, "ProxyCreated");
311315
assert.equal(tx.logs[2].args._proxy, avatarAddress);
316+
assert.equal(tx.logs[2].args._implementation, registration.avatar.address);
317+
assert.equal(tx.logs[2].args._contractName, "Avatar");
312318
assert.equal(tx.logs[2].args._version[1].toNumber(),2);
313319

314320
});

0 commit comments

Comments
 (0)