Merge pull request #630 from PolymathNetwork/bug/refreshed-tokens

Read refreshed tokens events

Author: FahdW

packages/polymath-js/src/contracts/SecurityTokenRegistry.js

@@ -24,6 +24,7 @@ import type {
 
 const NEW_SECURITY_TOKEN_EVENT = 'NewSecurityToken';
 const REGISTER_TICKER_EVENT = 'RegisterTicker';
+const REFRESHED_SECURITY_TOKEN_EVENT = 'SecurityTokenRefreshed';
 
 class SecurityTokenRegistry extends Contract {
   constructor(artifact: any, address: string) {
@@ -190,25 +191,28 @@ class SecurityTokenRegistry extends Contract {
       token.owner = await contract.owner();
 
       // get token issuing tx hash
+      const eventOpts = {
+        filter: { _securityTokenAddress: token.address },
+        fromBlock: 0,
+        toBlock: 'latest',
+      };
+
       let events = await this._contractWS.getPastEvents(
         NEW_SECURITY_TOKEN_EVENT,
-        {
-          filter: { _securityTokenAddress: token.address },
-          fromBlock: 0,
-          toBlock: 'latest',
-        }
+        eventOpts
+      );
+      const events3 = await this._contractWS.getPastEvents(
+        REFRESHED_SECURITY_TOKEN_EVENT,
+        eventOpts
       );
       if (semver.eq(this.version, LATEST_PROTOCOL_VERSION)) {
         const str2 = new SecurityTokenRegistry(artifact2, this.address);
         const events2 = await str2._contractWS.getPastEvents(
           NEW_SECURITY_TOKEN_EVENT,
-          {
-            filter: { _securityTokenAddress: token.address },
-            fromBlock: 0,
-            toBlock: 'latest',
-          }
+          eventOpts
         );
-        events = [...events, ...events2];
+
+        events = [...events, ...events2, ...events3];
       }
       token.txHash = events[0].transactionHash;
       token.timestamp = await this._getBlockDate(events[0].blockNumber);

packages/polymath-offchain/src/startup/__tests__/setupWeb3.js

@@ -112,6 +112,7 @@ const contractMock = jest.fn().mockImplementation(() => {
       RegisterTicker: registerTickerListenerMock,
       ModuleAdded: moduleAddedListenerMock,
       NewSecurityToken: newSecurityTokenListenerMock,
+      SecurityTokenRefreshed: newSecurityTokenListenerMock,
     },
     getPastEvents: getPastEventsMock,
     methods: {

packages/polymath-offchain/src/startup/setupWeb3.js

@@ -11,7 +11,7 @@ import logger from 'winston';
 import Web3 from 'web3';
 import { User } from '../models';
 import PolymathRegistryArtifact from '@polymathnetwork/polymath-scripts/fixtures/contracts/PolymathRegistry.json';
-import SecurityTokenRegistryArtifact from '@polymathnetwork/polymath-scripts/fixtures/contracts/ISecurityTokenRegistry.json';
+import SecurityTokenRegistryArtifact from '@polymathnetwork/polymath-scripts/fixtures/contracts/SecurityTokenRegistry.json';
 import SecurityTokenArtifact from '@polymathnetwork/polymath-scripts/fixtures/contracts/ISecurityToken.json';
 import CappedSTOArtifact from '@polymathnetwork/polymath-scripts/fixtures/contracts/CappedSTO.json';
 import STOModuleFactoryArtifacts from '@polymathnetwork/polymath-scripts/fixtures/contracts/ModuleFactory.json';
@@ -512,6 +512,10 @@ export const addTokenCreateListener = async (networkId: string) => {
     newSecurityTokenHandler(contract, networkId, error, result)
   );
 
+  contract.events.SecurityTokenRefreshed({}, (error, result) =>
+    newSecurityTokenHandler(contract, networkId, error, result)
+  );
+
   logger.info(
     `[SETUP] Listening for Security Token deployments in ${NETWORKS[
       networkId
@@ -526,14 +530,17 @@ export const addTokenCreateListener = async (networkId: string) => {
 export const addSTOListeners = async (networkId: string) => {
   const contract = await getSTRContract(networkId);
   try {
-    const previousTokenEvents = await contract.getPastEvents(
-      'NewSecurityToken',
-      {
-        fromBlock: 0,
-        toBlock: 'latest',
-      }
-    );
+    let newSTs = await contract.getPastEvents('NewSecurityToken', {
+      fromBlock: 0,
+      toBlock: 'latest',
+    });
+
+    let refreshedSTs = await contract.getPastEvents('SecurityTokenRefreshed', {
+      fromBlock: 0,
+      toBlock: 'latest',
+    });
 
+    const previousTokenEvents = [...newSTs, ...refreshedSTs];
     for (let event of previousTokenEvents) {
       const {
         returnValues: { _securityTokenAddress, _ticker },