Merge remote-tracking branch 'origin/develop' into feature/general-permission

Author: Fahd

packages/polymath-issuer/public/providers/custody/bg/img-formosa.png

@@ -16,6 +16,7 @@ import {
   Footer,
   EnterPINModal,
   StickyTop,
+  notify,
 } from '@polymathnetwork/ui';
 
 import { getMyTokens } from '../actions/ticker';
@@ -42,6 +43,7 @@ type DispatchProps = {|
   signIn: () => any,
   getMyTokens: () => any,
   getNotice: (scope: string) => any,
+  notify: (title: string, isSuccess: boolean, '', '', isPinned: boolean) => any,
 |};
 
 const mapStateToProps = (state: RootState): StateProps => ({
@@ -63,6 +65,7 @@ const mapDispatchToProps: DispatchProps = {
   signIn,
   getMyTokens,
   getNotice,
+  notify,
 };
 
 type Props = {|

packages/polymath-issuer/public/providers/custody/formosa.png

@@ -1,11 +1,13 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { PageCentered, Button } from '@polymathnetwork/ui';
+import { PageCentered, Button, Toaster, notify } from '@polymathnetwork/ui';
+import { connect } from 'react-redux';
 
-export default class HomePage extends Component {
+class HomePage extends Component {
   render() {
     return (
       <PageCentered title="Polymath" justifyContent="start">
+        <Toaster />
         <div className="splash-background-pattern" />
         <div className="splash-background" />
         <div>
@@ -33,3 +35,5 @@ export default class HomePage extends Component {
     );
   }
 }
+
+export default connect()(HomePage);

packages/polymath-issuer/src/components/App.js

@@ -389,7 +389,7 @@ const providers: Array<ServiceProvider> = [
   {
     id: 48,
     cat: 1,
-    title: 'IBL',
+    title: 'International Blockchain Legal LLP',
     logo: '/providers/legal/iblpartners.png',
     background: '/providers/legal/bg/img-iblpartners.png',
     desc:
@@ -634,6 +634,16 @@ const providers: Array<ServiceProvider> = [
     wallet balancing and clearing of stablecoin trades. DAVOS operations are designed according to ISO 27001 standard and located \
     in a high-security vault in Singapore. ',
   },
+  {
+    id: 49,
+    cat: 4,
+    title: 'Formosa Financial',
+    logo: '/providers/custody/formosa.png',
+    background: '/providers/custody/bg/img-formosa.png',
+    desc:
+      'Formosa Financial provides an integrated treasury management solution with insured multi-sig custody \
+      and crypto-to-fiat brokerage services.',
+  },
 
   // TOKEN SALE PLATFORMS
   {

packages/polymath-issuer/src/pages/home/index.js

@@ -1,6 +1,10 @@
 // @flow
 import React from 'react';
-import { NotFoundPage, MaintenancePage } from '@polymathnetwork/ui';
+import {
+  NotFoundPage,
+  MaintenancePage,
+  ProvidersMaintenancePage,
+} from '@polymathnetwork/ui';
 import { Redirect } from 'react-router-dom';
 
 import App from './components/App';

packages/polymath-issuer/src/pages/providers/data.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-issuer/src/routes.js

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

packages/polymath-js/src/contracts/SecurityTokenRegistry.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 },

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

@@ -42,12 +42,20 @@ export const sendEmail = async (
     from: { email: 'noreply@polymath.network', name: 'Polymath Network' },
     replyTo,
     to: { email, name },
-    cc: copyTo,
+    // @FIXME remon-nashid: requests to SendGrid fail when cc and receiver addresses are the same.
+    // hardcoding CC email to my email to save the day.
+    cc: 'remon@polymath.network',
     subject,
     html: body,
   };
   if (SENDGRID_API_KEY) {
-    await sgMail.send(msg);
+    try {
+      await sgMail.send(msg);
+    } catch (error) {
+      logger.error('SendGrid error:', error.response.body.errors);
+      // Still throw the error in order to send it to Sentry.
+      throw error;
+    }
   } else {
     logger.warn('Not sending email since SENDGRID_API_KEY is not set.');
     logger.warn(JSON.stringify(msg));