Merge be8ba47 into 141e3fa

PolymathNetwork · Sep 27, 2018 · 46a6f3a · 46a6f3a
2 parents 141e3fa + be8ba47
commit 46a6f3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/contracts/tokens/SecurityToken.sol b/contracts/tokens/SecurityToken.sol
@@ -88,6 +88,7 @@ contract SecurityToken is StandardToken, DetailedERC20, ReentrancyGuard, Registr
 
     mapping (address => Checkpoint[]) public checkpointBalances;
     Checkpoint[] public checkpointTotalSupply;
+    uint256[] public checkpointTimes;
 
     // Records added modules - module list should be order agnostic!
     mapping (uint8 => address[]) public modules;
@@ -704,10 +705,19 @@ contract SecurityToken is StandardToken, DetailedERC20, ReentrancyGuard, Registr
     function createCheckpoint() external onlyModuleOrOwner(CHECKPOINT_KEY) returns(uint256) {
         require(currentCheckpointId < 2**256 - 1);
         currentCheckpointId = currentCheckpointId + 1;
+        checkpointTimes.push(now);
         emit CheckpointCreated(currentCheckpointId, now);
         return currentCheckpointId;
     }
 
+    /**
+     * @notice Gets list of times that checkpoints were created
+     * @return List of checkpoint times
+     */
+    function getCheckpointTimes() external view returns(uint256[]) {
+        return checkpointTimes;
+    }
+
     /**
      * @notice Queries totalSupply as of a defined checkpoint
      * @param _checkpointId Checkpoint ID to query

diff --git a/test/c_checkpoints.js b/test/c_checkpoints.js
@@ -320,6 +320,9 @@ contract('Checkpoints', accounts => {
                 ts.push(totalSupply);
                 console.log("Checkpoint: " + (j + 1) + " Balances: " + JSON.stringify(cps[cps.length - 1]) + " TotalSupply: " + JSON.stringify(totalSupply));
                 await I_SecurityToken.createCheckpoint({ from: token_owner });
+                let checkpointTimes = (await I_SecurityToken.getCheckpointTimes());
+                assert.equal(checkpointTimes.length, (j + 1));
+                console.log("Checkpoint Times: " + checkpointTimes);
                 let txs = Math.floor(Math.random() * 3);
                 for (let i = 0; i < txs; i++) {
                     let sender;