fix: compilation and test issues in the project

comment out example code we need to change once GTM included

abi-wrappers changes for imports

various test changes

Author: Victor Wiebe

examples/countTransferManager.ts

@@ -123,7 +123,7 @@ window.addEventListener('load', async () => {
     name: ModuleName.GeneralTransferManager,
     address: generalTMAddress,
   });
-  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
+//  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
 
   const randomBeneficiary1 = '0x3444444444444444444444444444444444444444';
   const randomBeneficiary2 = '0x5544444444444444444444444444444444444444';

examples/generalTransferManager.ts

@@ -95,7 +95,7 @@ window.addEventListener('load', async () => {
   //                 [false, false, false],
   //                 [false, false, false],
   //                 { from: token_owner }
-  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
+//  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
   const randomBeneficiary1 = '0x3444444444444444444444444444444444444444';
   const randomBeneficiary2 = '0x5544444444444444444444444444444444444444';
 
@@ -105,19 +105,18 @@ window.addEventListener('load', async () => {
   console.log(await tickerSecurityTokenInstance.balanceOf({ owner: randomBeneficiary1 }));
   console.log(await tickerSecurityTokenInstance.balanceOf({ owner: myAddress }));
 
-  // Disallow all transfers between token holders
-  await generalTM.changeAllowAllTransfers({ allowAllTransfers: false });
+  // Disallow all transfers between token holders//
+//  await generalTM.changeAllowAllTransfers({ allowAllTransfers: false });
 
   // Add whitelist special users
-  await generalTM.modify({
-    investors: [randomBeneficiary1, randomBeneficiary2, myAddress],
-    canBuyFromSTO: [true, true, true],
-    canReceiveAfters: [new Date(2018, 1), new Date(2018, 1), new Date(2018, 1)],
-    canSendAfters: [new Date(), new Date(), new Date(2018, 2)],
-    expiryTimes: [new Date(2035, 1), new Date(2035, 1), new Date(2035, 1)],
+  await generalTM.modifyKYCData({
+    investor: randomBeneficiary1,
+    canReceiveAfter: new Date(2018, 1),
+    canSendAfter: new Date(2018, 2),
+    expiryTime:  new Date(2035, 1),
   });
 
-  await generalTM.changeAllowAllWhitelistTransfers({ allowAllWhitelistTransfers: true });
+//  await generalTM.changeAllowAllWhitelistTransfers({ allowAllWhitelistTransfers: true });
 
   // Verify we can make transfers
   console.log(

examples/investInCappedSTO.ts

@@ -2,6 +2,7 @@ import { RedundantSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/su
 import { CappedSTOEvents } from '@polymathnetwork/abi-wrappers';
 import { ApiConstructorParams, PolymathAPI } from '../src/PolymathAPI';
 import { ModuleName } from '../src';
+import BigNumber from 'bignumber.js';
 
 // This file acts as a valid sandbox.ts file in root directory for invest in a capped STO token on an unlocked node (like ganache)
 
@@ -35,9 +36,7 @@ window.addEventListener('load', async () => {
   });
 
   const investorAddress = await polymathAPI.getAccount();
-  const whitelist = await generalTM.whitelist({
-    investorAddress,
-  });
+  const whitelist = await generalTM.getAllKYCData();
 
   await cappedSTO.subscribeAsync({
     eventName: CappedSTOEvents.TokenPurchase,
@@ -52,10 +51,8 @@ window.addEventListener('load', async () => {
   });
 
   const investIn = async () => {
-    const whitelist = await generalTM.whitelist({
-      investorAddress,
-    });
-    if (whitelist.canBuyFromSTO) {
+    const whitelist = await generalTM.getAllKYCData();
+    if (whitelist[0].investor) {
       await cappedSTO.buyTokens({
         beneficiary: investorAddress,
         value: new BigNumber(2),
@@ -66,7 +63,7 @@ window.addEventListener('load', async () => {
     }
   };
 
-  if (whitelist.canBuyFromSTO) {
+  if (whitelist[0].investor) {
     await investIn();
   } else {
     console.log('Your address is not approved to participate in this token sale.');

examples/mintTokenToInvestor.ts

@@ -30,9 +30,9 @@ window.addEventListener('load', async () => {
     address: generalTMAddress,
   });
 
-  const listInvestors = await generalTM.getInvestors();
+  const listInvestors = await generalTM.getAllKYCData();
   const found = listInvestors.find(function(addr) {
-    return addr == investorAddress;
+    return addr.investor == investorAddress;
   });
 
   await TEST.subscribeAsync({

examples/volumeRestrictionTransferManager.ts

@@ -119,7 +119,7 @@ window.addEventListener('load', async () => {
     name: ModuleName.GeneralTransferManager,
     address: generalTMAddress,
   });
-  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
+//  await generalTM.changeAllowAllTransfers({ allowAllTransfers: true });
 
   // Mint yourself some tokens and make some transfers
   await tickerSecurityTokenInstance.issue({ investor: myAddress, value: new BigNumber(1000), data: '' });

src/contract_wrappers/modules/transfer_manager/__tests__/general_transfer_manager_wrapper.test.ts

@@ -475,6 +475,7 @@ describe('GeneralTransferManagerWrapper', () => {
       const expectedResult = [
         [new BigNumber(1), new BigNumber(2), new BigNumber(3)],
         [new BigNumber(1), new BigNumber(2), new BigNumber(3)],
+        [new BigNumber(1), new BigNumber(2), new BigNumber(3)],
       ];
       // Mocked method
       const mockedMethod = mock(MockedCallMethod);
@@ -486,7 +487,12 @@ describe('GeneralTransferManagerWrapper', () => {
       // Real call
       const result = await target.getKYCData(mockedParams);
       // Result expectation
-      expect(result).toBe(expectedResult);
+
+      for (let i = 0; i < 3; i += 1) {
+        expect(dateToBigNumber(result[i].canSendAfter)).toEqual(expectedResult[1][i]);
+        expect(dateToBigNumber(result[i].canReceiveAfter)).toEqual(expectedResult[2][i]);
+        expect(dateToBigNumber(result[i].expiryTime)).toEqual(expectedResult[3][i]);
+      }
       // Verifications
       verify(mockedContract.getKYCData).once();
       verify(mockedMethod.callAsync()).once();
@@ -542,7 +548,7 @@ describe('GeneralTransferManagerWrapper', () => {
       // Real call
       await expect(target.subscribeAsync(mockedParams)).rejects.toEqual(
         new Error(
-          `Expected eventName to be one of: 'ChangeIssuanceAddress', 'AllowAllTransfers', 'AllowAllWhitelistTransfers', 'AllowAllWhitelistIssuances', 'AllowAllBurnTransfers', 'ChangeSigningAddress', 'ChangeDefaults', 'ModifyWhitelist', 'Pause', 'Unpause', encountered: Transfer`,
+          `Expected eventName to be one of: 'ChangeIssuanceAddress', 'ChangeDefaults', 'ModifyKYCData', 'ModifyInvestorFlag', 'ModifyTransferRequirements', 'Pause', 'Unpause', encountered: Transfer`,
         ),
       );
     });

src/contract_wrappers/registries/__tests__/module_registry_wrapper.test.ts

@@ -103,7 +103,7 @@ describe('ModuleRegistryWrapper', () => {
       // Stub the get types
       const mockedGetTypesMethod = mock(MockedCallMethod);
       const types = [new BigNumber(1), new BigNumber(2)];
-      when(mockedModuleFactoryContract.types).thenReturn(instance(mockedGetTypesMethod));
+      when(mockedModuleFactoryContract.getTypes).thenReturn(instance(mockedGetTypesMethod));
       when(mockedGetTypesMethod.callAsync()).thenResolve(types);
 
       // Mock contract paused
@@ -166,7 +166,7 @@ describe('ModuleRegistryWrapper', () => {
       verify(mockedContractFactory.getModuleFactoryContract(moduleFactoryAddress)).twice();
       verify(mockedModuleFactoryOwnerMethod.callAsync()).once();
       verify(mockedModuleFactoryContract.owner).once();
-      verify(mockedModuleFactoryContract.types).once();
+      verify(mockedModuleFactoryContract.getTypes).once();
       verify(mockedGetTypesMethod.callAsync()).once();
       verify(mockedFeatureRegistryContract.getFeatureStatus).once();
       verify(mockedGetFeatureStatusMethod.callAsync(Feature.CustomModulesAllowed)).once();

src/contract_wrappers/registries/__tests__/security_token_registry_wrapper.test.ts

@@ -880,13 +880,11 @@ describe('SecurityTokenRegistryWrapper', () => {
     test('should call getSecurityTokenData', async () => {
       // Params and result expected
       const expectedDeployedDate = new Date(2019, 1);
-      const expectedVersion = [new BigNumber(3), new BigNumber(0), new BigNumber(0)];
       const expectedResult = [
         'TICK',
         '0x0123456789012345678901234567890123456789',
         'Details',
         dateToBigNumber(expectedDeployedDate),
-        expectedVersion,
       ];
       const securityTokenAddress = '0x0123456789012345678901234567890123456789';
       // Mocked method
@@ -903,10 +901,6 @@ describe('SecurityTokenRegistryWrapper', () => {
       expect(result.owner).toBe(expectedResult[1]);
       expect(result.tokenDetails).toBe(expectedResult[2]);
       expect(result.deployedAt).toEqual(expectedDeployedDate);
-      const unpackVersion = expectedVersion.map(num => {
-        return num.toNumber();
-      });
-      expect(result.version).toEqual(unpackVersion.join('.'));
       // Verifications
       verify(mockedContract.getSecurityTokenData).once();
       verify(mockedMethod.callAsync(securityTokenAddress)).once();
@@ -2138,7 +2132,7 @@ describe('SecurityTokenRegistryWrapper', () => {
       // Real call
       await expect(target.subscribeAsync(mockedParams)).rejects.toEqual(
         new Error(
-          `Expected eventName to be one of: 'Pause', 'Unpause', 'TickerRemoved', 'ChangeExpiryLimit', 'ChangeSecurityLaunchFee', 'ChangeTickerRegistrationFee', 'ChangeFeeCurrency', 'OwnershipTransferred', 'ChangeTickerOwnership', 'NewSecurityTokenCreated', 'NewSecurityToken', 'RegisterTicker', 'SecurityTokenRefreshed', 'ProtocolFactorySet', 'LatestVersionSet', 'ProtocolFactoryRemoved', encountered: Transfer`,
+          `Expected eventName to be one of: 'Pause', 'Unpause', 'TickerRemoved', 'ChangeExpiryLimit', 'ChangeSecurityLaunchFee', 'ChangeTickerRegistrationFee', 'ChangeFeeCurrency', 'OwnershipTransferred', 'ChangeTickerOwnership', 'NewSecurityToken', 'RegisterTicker', 'SecurityTokenRefreshed', 'ProtocolFactorySet', 'LatestVersionSet', 'ProtocolFactoryRemoved', encountered: Transfer`,
         ),
       );
     });

src/contract_wrappers/registries/module_registry_wrapper.ts

@@ -240,7 +240,7 @@ export default class ModuleRegistryWrapper extends ContractWrapper {
         'Calling address must be owner without custom modules allowed feature status',
       );
     }
-    const getTypesResult = await (await this.moduleFactoryContract(params.moduleFactory)).types.callAsync();
+    const getTypesResult = await (await this.moduleFactoryContract(params.moduleFactory)).getTypes.callAsync();
     // Check for duplicates
     if (getTypesResult.length > 1) {
       assert.assert(getTypesResult.length === new Set(getTypesResult).size, 'Type mismatch');

src/contract_wrappers/registries/security_token_registry_wrapper.ts

@@ -13,7 +13,6 @@ import {
   ISecurityTokenRegistryTickerRemovedEventArgs,
   ISecurityTokenRegistryChangeTickerOwnershipEventArgs,
   ISecurityTokenRegistryChangeFeeCurrencyEventArgs,
-  ISecurityTokenRegistryNewSecurityTokenCreatedEventArgs,
   ISecurityTokenRegistrySecurityTokenRefreshedEventArgs,
   ISecurityTokenRegistryProtocolFactorySetEventArgs,
   ISecurityTokenRegistryLatestVersionSetEventArgs,
@@ -62,15 +61,6 @@ interface GetChangeFeeCurrencyLogsAsyncParams extends GetLogsAsyncParams {
   eventName: ISecurityTokenRegistryEvents.ChangeFeeCurrency;
 }
 
-interface NewSecurityTokenCreatedSubscribeAsyncParams extends SubscribeAsyncParams {
-  eventName: ISecurityTokenRegistryEvents.NewSecurityTokenCreated;
-  callback: EventCallback<ISecurityTokenRegistryNewSecurityTokenCreatedEventArgs>;
-}
-
-interface GetNewSecurityTokenCreatedLogsAsyncParams extends GetLogsAsyncParams {
-  eventName: ISecurityTokenRegistryEvents.NewSecurityTokenCreated;
-}
-
 interface SecurityTokenRefreshedSubscribeAsyncParams extends SubscribeAsyncParams {
   eventName: ISecurityTokenRegistryEvents.SecurityTokenRefreshed;
   callback: EventCallback<ISecurityTokenRegistrySecurityTokenRefreshedEventArgs>;
@@ -199,7 +189,6 @@ interface GetUnpauseLogsAsyncParams extends GetLogsAsyncParams {
 
 interface SecurityTokenRegistrySubscribeAsyncParams extends Subscribe {
   (params: ChangeFeeCurrencySubscribeAsyncParams): Promise<string>;
-  (params: NewSecurityTokenCreatedSubscribeAsyncParams): Promise<string>;
   (params: SecurityTokenRefreshedSubscribeAsyncParams): Promise<string>;
   (params: ProtocolFactorySetSubscribeAsyncParams): Promise<string>;
   (params: LatestVersionSetSubscribeAsyncParams): Promise<string>;
@@ -220,9 +209,6 @@ interface GetISecurityTokenRegistryLogsAsyncParams extends GetLogs {
   (params: GetChangeFeeCurrencyLogsAsyncParams): Promise<
     LogWithDecodedArgs<ISecurityTokenRegistryChangeFeeCurrencyEventArgs>[]
   >;
-  (params: GetNewSecurityTokenCreatedLogsAsyncParams): Promise<
-    LogWithDecodedArgs<ISecurityTokenRegistryNewSecurityTokenCreatedEventArgs>[]
-  >;
   (params: GetSecurityTokenRefreshedLogsAsyncParams): Promise<
     LogWithDecodedArgs<ISecurityTokenRegistrySecurityTokenRefreshedEventArgs>[]
   >;
@@ -500,7 +486,6 @@ interface SecurityTokenData {
   owner: string;
   tokenDetails: string;
   deployedAt: Date;
-  version: string;
 }
 
 interface TickerDetails {
@@ -563,15 +548,11 @@ export default class SecurityTokenRegistryWrapper extends ContractWrapper {
   public getSecurityTokenData = async (params: SecurityTokenAddressParams) => {
     assert.isETHAddressHex('securityTokenAddress', params.securityTokenAddress);
     const result = await (await this.contract).getSecurityTokenData.callAsync(params.securityTokenAddress);
-    const unpackVersion = result[4].map(num => {
-      return num.toNumber();
-    });
     const typedResult: SecurityTokenData = {
       ticker: result[0],
       owner: result[1],
       tokenDetails: result[2],
       deployedAt: bigNumberToDate(result[3]),
-      version: unpackVersion.join('.'),
     };
     return typedResult;
   };