fix: return protocol version correctly

also throw an error in the TransferErc20 procedure if the provided token address corresponds to a
Security Token. The error message directs the user to the proper transfer functions in the security
token entity

Author: monitz87

src/Polymath.ts

@@ -9,7 +9,7 @@ import P from 'bluebird';
 import { Context } from './Context';
 import { getInjectedProvider } from './browserUtils';
 import { ErrorCode } from './types';
-import { Erc20TokenBalance, SecurityToken, SecurityTokenReservation } from './entities';
+import { Erc20TokenBalance, SecurityToken } from './entities';
 import { ReserveSecurityToken } from './procedures';
 import { PolymathError } from './PolymathError';
 import { PolymathBase } from './PolymathBase';
@@ -222,6 +222,17 @@ export class Polymath {
     return this.context.factories.securityTokenFactory.fetch(uid);
   };
 
+  /**
+   * Check if a token symbol (ticker) is available for reservation
+   *
+   * @param symbol security token symbol for which to check availability
+   */
+  public isSymbolAvailable = async (args: { symbol: string }) => {
+    const { symbol } = args;
+
+    return this.context.contractWrappers.securityTokenRegistry.tickerAvailable({ ticker: symbol });
+  };
+
   /**
    * Check if a token follows the ERC20 standard
    *
@@ -263,9 +274,13 @@ export class Polymath {
 
   /**
    * Get the current version of the Polymath Protocol
+   *
+   * @returns version string (i.e. 3.0.0)
    */
   public getLatestProtocolVersion = async () => {
-    await this.context.contractWrappers.securityTokenRegistry.getLatestProtocolVersion();
+    const version = await this.context.contractWrappers.securityTokenRegistry.getLatestProtocolVersion();
+
+    return version.map(vNum => vNum.toNumber()).join('.');
   };
 
   /**

src/procedures/TransferErc20.ts

@@ -16,11 +16,23 @@ export class TransferErc20 extends Procedure<TransferErc20ProcedureArgs> {
 
     const ownerAddress = await currentWallet.address();
 
-    const { polyToken } = contractWrappers;
+    const { polyToken, securityTokenRegistry } = contractWrappers;
 
     let token;
 
     if (tokenAddress) {
+      const isSecurityToken = await securityTokenRegistry.isSecurityToken({
+        securityTokenAddress: tokenAddress,
+      });
+
+      if (isSecurityToken) {
+        throw new PolymathError({
+          code: ErrorCode.ProcedureValidationError,
+          message:
+            "This address belongs to a Security Token. To transfer Security Tokens, use the functions in the Security Token's transfers namespace",
+        });
+      }
+
       try {
         token = await contractWrappers.getERC20TokenWrapper({ address: tokenAddress });
       } catch (err) {
@@ -58,7 +70,7 @@ export class TransferErc20 extends Procedure<TransferErc20ProcedureArgs> {
 
     await this.addTransaction(token.transfer, {
       tag: PolyTransactionTag.TransferErc20,
-      resolver: _receipt => {
+      resolver: async _receipt => {
         return factories.erc20TokenBalanceFactory.refresh(
           Erc20TokenBalance.generateId({ tokenAddress: address, walletAddress: receiver })
         );