Remove use of package keyword (#720)

* Remoce use of package keyword

* Add decision to executed event

* Update UpgradeScheme.sol

Author: ben-kaufman

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,
+        bool _decision
     );
 
     event ProposalDeleted(address indexed _avatar, bytes32 indexed _proposalId);
@@ -45,7 +46,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 +67,7 @@ contract UpgradeScheme is VotingMachineCallbacks, ProposalExecuteInterface, Init
         avatar = _avatar;
         votingMachine = _votingMachine;
         voteParams = _voteParams;
-        package = _package;
+        arcPackage = _package;
     }
 
     /**
@@ -89,7 +90,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());
@@ -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 == 1);
         return true;
     }
 
@@ -129,11 +130,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"
             );

package-lock.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/",