update contracts

adibas03 · Nov 26, 2018 · 6a3dc02 · 6a3dc02
1 parent 5de631a
commit 6a3dc02
Show file tree

Hide file tree

Showing 5 changed files with 16,502 additions and 4 deletions.
diff --git a/build/contracts/Deployer.json b/build/contracts/Deployer.json
diff --git a/build/contracts/Will.json b/build/contracts/Will.json
diff --git a/build/contracts/WillWallet.json b/build/contracts/WillWallet.json
diff --git a/contracts/Deployer.sol b/contracts/Deployer.sol
@@ -10,7 +10,7 @@ contract Deployer is Pausable {
   }
 
   enum ContractTypes { will, wallet, willwallet }
-  event ContractDeployed(string _type, address _contract, address indexed creator);
+  event ContractDeployed(string contractType, address indexed contractAddress, address indexed creator);
 
   function _transferOwnership(address _contract, address _newOwner)
   internal

diff --git a/contracts/Will.sol b/contracts/Will.sol
@@ -12,10 +12,10 @@ contract Will is Ownable {
   uint256 constant decimals = 8; //Allow fractions for disposition
   uint256 waitingTime; //How long to wait before initiating distribution
   uint256 lastInteraction; //Last time contract was interacted with
-  address[] beneficiaries; //Address for each beneficiary
-  mapping( address => uint256) disposition; //Percentage of total balacne to be sent to each beneficiary
+  address[] public beneficiaries; //Address for each beneficiary
+  mapping( address => uint256) public disposition; //Percentage of total balacne to be sent to each beneficiary
 
-  event BeneficiaryUpdated( address _beneficiary, uint256 _disposition, uint256 _timestamp); //Notify of update to beneficiaries / disposition
+  event BeneficiaryUpdated( address beneficiary, uint256 disposition, uint256 timestamp); //Notify of update to beneficiaries / disposition
 
   constructor (uint256 _waitTime )
     public
@@ -31,6 +31,12 @@ contract Will is Ownable {
     return 10**decimals;
   }
 
+  function totalBeneficiaries ()
+    public view
+  returns (uint) {
+    return beneficiaries.length;
+  }
+
   function totalDisposed ()
     public view
   returns (uint256 _total) {//Total amount already disposed