From 627671066f86ba3d915380afa90ab27dd3ab7b48 Mon Sep 17 00:00:00 2001 From: benk10 Date: Sun, 22 Mar 2020 13:33:05 +0200 Subject: [PATCH 1/3] Remoce use of package keyword --- contracts/schemes/UpgradeScheme.sol | 10 ++-- package-lock.json | 89 +++++++++++++++++++++-------- package.json | 2 +- 3 files changed, 70 insertions(+), 31 deletions(-) diff --git a/contracts/schemes/UpgradeScheme.sol b/contracts/schemes/UpgradeScheme.sol index 930c957f..ab756435 100644 --- a/contracts/schemes/UpgradeScheme.sol +++ b/contracts/schemes/UpgradeScheme.sol @@ -45,7 +45,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init IntVoteInterface public votingMachine; bytes32 public voteParams; Avatar public avatar; - Package public package; + Package public arcPackage; /** * @dev initialize @@ -66,7 +66,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init avatar = _avatar; votingMachine = _votingMachine; voteParams = _voteParams; - package = _package; + arcPackage = _package; } /** @@ -89,7 +89,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init bytes32 contractNameBytes = proposal.contractsNames[i]; string memory contractName = contractNameBytes.toStr(); address updatedImp = ImplementationProvider( - package.getContract(proposal.packageVersion) + arcPackage.getContract(proposal.packageVersion) ).getImplementation(contractName); Controller controller = Controller(avatar.owner()); @@ -129,11 +129,11 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init _contractsNames.length == _contractsToUpgrade.length, "upgrade name and address arrays must have equal lengths" ); - require(package.hasVersion(_packageVersion), "Specified version doesn't exist in the Package"); + require(arcPackage.hasVersion(_packageVersion), "Specified version doesn't exist in the Package"); for (uint256 i = 0; i < _contractsToUpgrade.length; i++) { require( ImplementationProvider( - package.getContract(_packageVersion) + arcPackage.getContract(_packageVersion) ).getImplementation(_contractsNames[i].toStr()) != address(0), "Contract name does not exist in ArcHive package" ); diff --git a/package-lock.json b/package-lock.json index b89f4bc8..840fe2ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc-experimental", - "version": "0.1.1-rc.6", + "version": "0.1.1-rc.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1733,12 +1733,20 @@ }, "dependencies": { "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "dev": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } } } } @@ -3384,12 +3392,20 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "dev": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } } }, "ms": { @@ -7237,7 +7253,8 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true }, "minipass": { "version": "2.9.0", @@ -9713,9 +9730,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "resolve": { "version": "1.14.2", @@ -9742,11 +9759,18 @@ }, "dependencies": { "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + } } } } @@ -9904,11 +9928,18 @@ }, "dependencies": { "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + } } } } @@ -11142,12 +11173,20 @@ }, "dependencies": { "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "dev": true, "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } } } } diff --git a/package.json b/package.json index 2620cc57..97ad7301 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc-experimental", - "version": "0.1.1-rc.6", + "version": "0.1.1-rc.7", "description": "A platform for building DAOs", "files": [ "contracts/", From 26e40613f726b6107ac721261aa72f4ec2bf4aaf Mon Sep 17 00:00:00 2001 From: benk10 Date: Sun, 22 Mar 2020 13:35:26 +0200 Subject: [PATCH 2/3] Add decision to executed event --- contracts/schemes/UpgradeScheme.sol | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contracts/schemes/UpgradeScheme.sol b/contracts/schemes/UpgradeScheme.sol index ab756435..ac14423e 100644 --- a/contracts/schemes/UpgradeScheme.sol +++ b/contracts/schemes/UpgradeScheme.sol @@ -27,7 +27,8 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init event ProposalExecuted( address indexed _avatar, - bytes32 indexed _proposalId + bytes32 indexed _proposalId, + int256 _param ); event ProposalDeleted(address indexed _avatar, bytes32 indexed _proposalId); @@ -103,7 +104,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init delete organizationProposals[_proposalId]; emit ProposalDeleted(address(avatar), _proposalId); - emit ProposalExecuted(address(avatar), _proposalId); + emit ProposalExecuted(address(avatar), _proposalId, _decision); return true; } From 65c8a13bbbb2a774ff26c13bacb446d027ae1b89 Mon Sep 17 00:00:00 2001 From: benk10 Date: Sun, 22 Mar 2020 20:57:34 +0200 Subject: [PATCH 3/3] Update UpgradeScheme.sol --- contracts/schemes/UpgradeScheme.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/schemes/UpgradeScheme.sol b/contracts/schemes/UpgradeScheme.sol index ac14423e..a2191792 100644 --- a/contracts/schemes/UpgradeScheme.sol +++ b/contracts/schemes/UpgradeScheme.sol @@ -28,7 +28,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init event ProposalExecuted( address indexed _avatar, bytes32 indexed _proposalId, - int256 _param + bool _decision ); event ProposalDeleted(address indexed _avatar, bytes32 indexed _proposalId); @@ -104,7 +104,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init delete organizationProposals[_proposalId]; emit ProposalDeleted(address(avatar), _proposalId); - emit ProposalExecuted(address(avatar), _proposalId, _decision); + emit ProposalExecuted(address(avatar), _proposalId, _decision == 1); return true; }