Skip to content

Update ProxyCreated event #701

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 4 commits into from
Dec 29, 2019
Merged

Update ProxyCreated event #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1afc3cc
Update ProxyCreated event
ben-kaufman Dec 26, 2019
1a7b6b0
Add test
ben-kaufman Dec 26, 2019
1b5d333
fix
ben-kaufman Dec 26, 2019
57b2bc8
Fix new version test
ben-kaufman Dec 26, 2019
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
4 changes: 2 additions & 2 deletions contracts/utils/DAOFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract DAOFactory is Initializable {
* @param _proxy Address of the created proxy.
* @param _version of the created proxy.
*/
event ProxyCreated(address _proxy, uint64[3] _version);
event ProxyCreated(address _proxy, address _implementation, string _contractName, uint64[3] _version);

struct Locks {
address sender;
Expand Down Expand Up @@ -162,7 +162,7 @@ contract DAOFactory is Initializable {
ImplementationProvider provider = ImplementationProvider(package.getContract(_packageVersion));
address implementation = provider.getImplementation(_contractName);
AdminUpgradeabilityProxy proxy = (new AdminUpgradeabilityProxy).value(msg.value)(implementation, _admin, _data);
emit ProxyCreated(address(proxy), _packageVersion);
emit ProxyCreated(address(proxy), implementation, _contractName, _packageVersion);
return proxy;
}

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@daostack/arc-experimental",
"version": "0.1.1-rc.1",
"version": "0.1.1-rc.2",
"description": "A platform for building DAOs",
"files": [
"contracts/",
Expand Down
8 changes: 7 additions & 1 deletion test/daofactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,9 @@ contract('DaoFactory', function(accounts) {
var amountToMint = 10;
await setup(accounts,amountToMint,amountToMint);
var newVer = [0,2,0];
const oldAvatarImplementation = registration.avatar.address;
await helpers.registrationAddVersionToPackege(registration,newVer);

nativeTokenData = await new web3.eth.Contract(registration.daoToken.abi)
.methods
.initialize("TEST","TST",0,registration.daoFactory.address)
Expand All @@ -302,13 +304,17 @@ contract('DaoFactory', function(accounts) {
var avatarAddress = tx.logs[4].args._avatar;
assert.equal(tx.logs[2].event, "ProxyCreated");
assert.equal(tx.logs[2].args._proxy, avatarAddress);
assert.equal(tx.logs[2].args._implementation, oldAvatarImplementation);
assert.equal(tx.logs[2].args._contractName, "Avatar");
assert.equal(tx.logs[2].args._version[1].toNumber(),1);

tx = await registration.daoFactory.forgeOrg("testOrg",nativeTokenData,[accounts[0]],[amountToMint],[amountToMint],[0,0,0],{gas:constants.ARC_GAS_LIMIT});
tx = await registration.daoFactory.forgeOrg("testOrg",nativeTokenData,[accounts[0]],[amountToMint],[amountToMint],[0,2,0],{gas:constants.ARC_GAS_LIMIT});
assert.equal(tx.logs.length, 5);
avatarAddress = tx.logs[4].args._avatar;
assert.equal(tx.logs[2].event, "ProxyCreated");
assert.equal(tx.logs[2].args._proxy, avatarAddress);
assert.equal(tx.logs[2].args._implementation, registration.avatar.address);
assert.equal(tx.logs[2].args._contractName, "Avatar");
assert.equal(tx.logs[2].args._version[1].toNumber(),2);

});
Expand Down