Merge pull request #103 from PolymathNetwork/fix/permission-bugs

Fix/permission bugs

package.json

@@ -50,7 +50,7 @@
     "@0x/subproviders": "^3.0.2",
     "@babel/polyfill": "^7.0.0",
     "@babel/runtime": "^7.2.0",
-    "@polymathnetwork/contract-wrappers": "3.0.0-beta.47",
+    "@polymathnetwork/contract-wrappers": "3.0.0-beta.52",
     "@types/sinon": "^7.5.0",
     "bluebird": "^3.5.5",
     "ethereum-address": "^0.0.4",

src/entities/SecurityToken/Permissions.ts

@@ -92,12 +92,12 @@ export class Permissions extends SubModule {
    *
    * @param delegateAddress wallet address of the delegate
    * @param role role to assign
-   * @param description description of the delegate (defaults to empty string, is ignored if the delegate already exists)
+   * @param description description of the delegate (is ignored if the delegate already exists)
    */
   public assignRole = async (args: {
     delegateAddress: string;
     role: SecurityTokenRole;
-    description?: string;
+    description: string;
   }) => {
     const { symbol } = this.securityToken;
 
@@ -126,6 +126,7 @@ export class Permissions extends SubModule {
       {
         symbol,
         assign: false,
+        description: '', // this is not used when revoking
         ...args,
       },
       this.context
@@ -256,7 +257,7 @@ export class Permissions extends SubModule {
     });
   };
 
-  private rolesPerFeature = {
+  public rolesPerFeature = {
     [Feature.Permissions]: [SecurityTokenRole.PermissionsAdministrator],
     [Feature.Shareholders]: [SecurityTokenRole.ShareholdersAdministrator],
     [Feature.Erc20Dividends]: [

src/entities/factories/CappedStoFactory.ts

@@ -3,7 +3,7 @@ import {
   BlockParamLiteral,
   conversionUtils,
   FULL_DECIMALS,
-  CappedSTOEvents_3_0_0,
+  CappedSTOEvents,
 } from '@polymathnetwork/contract-wrappers';
 import { Factory } from './Factory';
 import { Context } from '../../Context';
@@ -26,7 +26,7 @@ export class CappedStoFactory extends Factory<CappedSto, Params, UniqueIdentifie
     });
 
     const tokenPurchases = await module.getLogsAsync({
-      eventName: CappedSTOEvents_3_0_0.TokenPurchase,
+      eventName: CappedSTOEvents.TokenPurchase,
       blockRange: {
         fromBlock: BlockParamLiteral.Earliest,
         toBlock: BlockParamLiteral.Latest,

src/entities/factories/InvestmentFactory.ts

@@ -3,8 +3,8 @@ import {
   BlockParamLiteral,
   conversionUtils,
   FULL_DECIMALS,
-  CappedSTOEvents_3_0_0,
-  USDTieredSTOEvents_3_0_0,
+  CappedSTOEvents,
+  USDTieredSTOEvents,
 } from '@polymathnetwork/contract-wrappers';
 import { Factory } from './Factory';
 import { Context } from '../../Context';
@@ -30,7 +30,7 @@ export class InvestmentFactory extends Factory<Investment, Params, UniqueIdentif
       });
 
       const tokenPurchases = await module.getLogsAsync({
-        eventName: CappedSTOEvents_3_0_0.TokenPurchase,
+        eventName: CappedSTOEvents.TokenPurchase,
         blockRange: {
           fromBlock: BlockParamLiteral.Earliest,
           toBlock: BlockParamLiteral.Latest,
@@ -64,7 +64,7 @@ export class InvestmentFactory extends Factory<Investment, Params, UniqueIdentif
       });
 
       const tokenPurchases = await module.getLogsAsync({
-        eventName: USDTieredSTOEvents_3_0_0.TokenPurchase,
+        eventName: USDTieredSTOEvents.TokenPurchase,
         blockRange: {
           fromBlock: BlockParamLiteral.Earliest,
           toBlock: BlockParamLiteral.Latest,

src/entities/factories/UsdTieredStoFactory.ts

@@ -1,6 +1,6 @@
 import {
   ModuleName,
-  USDTieredSTOEvents_3_0_0,
+  USDTieredSTOEvents,
   BlockParamLiteral,
   conversionUtils,
   FULL_DECIMALS,
@@ -27,7 +27,7 @@ export class UsdTieredStoFactory extends Factory<UsdTieredSto, Params, UniqueIde
     });
 
     const tokenPurchases = await module.getLogsAsync({
-      eventName: USDTieredSTOEvents_3_0_0.TokenPurchase,
+      eventName: USDTieredSTOEvents.TokenPurchase,
       blockRange: {
         fromBlock: BlockParamLiteral.Earliest,
         toBlock: BlockParamLiteral.Latest,

src/procedures/AssignSecurityTokenRole.ts

@@ -13,7 +13,7 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
   public type = ProcedureType.AssignSecurityTokenRole;
 
   public async prepareTransactions() {
-    const { symbol, role, assign, description = '', delegateAddress } = this.args;
+    const { symbol, role, assign, description, delegateAddress } = this.args;
     const { contractWrappers } = this.context;
     const delegate = conversionUtils.checksumAddress(delegateAddress);
 
@@ -63,7 +63,8 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
     ))[0];
 
     const delegates = await permissionModule.getAllDelegates();
-    const exists = delegates.filter(element => element === delegate).length > 0;
+    const exists =
+      delegates.filter(element => element.toUpperCase() === delegate.toUpperCase()).length > 0;
 
     /**
      * In the following block we attempt to:
@@ -76,7 +77,9 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
         perm,
       });
 
-      const permitted = !!permittedDelegates.find(element => element === delegate);
+      const permitted = !!permittedDelegates.find(
+        element => element.toUpperCase() === delegate.toUpperCase()
+      );
 
       // Upcoming permission equals existing one
       if (permitted === assign) {
@@ -90,7 +93,7 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
     } else {
       // Delegate not found. Add them here
       await this.addTransaction(permissionModule.addDelegate, {
-        tag: PolyTransactionTag.ChangePermission,
+        tag: PolyTransactionTag.AddDelegate,
       })({ delegate, details: description });
     }
 

src/procedures/CreateCheckpoint.ts

@@ -1,4 +1,4 @@
-import { SecurityTokenEvents_3_0_0 } from '@polymathnetwork/contract-wrappers';
+import { SecurityTokenEvents } from '@polymathnetwork/contract-wrappers';
 import { Procedure } from './Procedure';
 import {
   CreateCheckpointProcedureArgs,
@@ -38,7 +38,7 @@ export class CreateCheckpoint extends Procedure<CreateCheckpointProcedureArgs, C
 
         const [event] = findEvents({
           logs,
-          eventName: SecurityTokenEvents_3_0_0.CheckpointCreated,
+          eventName: SecurityTokenEvents.CheckpointCreated,
         });
         if (event) {
           const { args: eventArgs } = event;

src/procedures/CreateErc20DividendDistribution.ts

@@ -1,6 +1,6 @@
 import {
   ModuleName,
-  ERC20DividendCheckpointEvents_3_0_0,
+  ERC20DividendCheckpointEvents,
   BigNumber,
 } from '@polymathnetwork/contract-wrappers';
 import { Procedure } from './Procedure';
@@ -75,7 +75,7 @@ export class CreateErc20DividendDistribution extends Procedure<
           const { logs } = receipt;
 
           const [event] = findEvents({
-            eventName: ERC20DividendCheckpointEvents_3_0_0.ERC20DividendDeposited,
+            eventName: ERC20DividendCheckpointEvents.ERC20DividendDeposited,
             logs,
           });
 

src/procedures/CreateEtherDividendDistribution.ts

@@ -1,6 +1,6 @@
 import {
   ModuleName,
-  EtherDividendCheckpointEvents_3_0_0,
+  EtherDividendCheckpointEvents,
   BigNumber,
 } from '@polymathnetwork/contract-wrappers';
 import { Procedure } from './Procedure';
@@ -67,7 +67,7 @@ export class CreateEtherDividendDistribution extends Procedure<
           const { logs } = receipt;
 
           const [event] = findEvents({
-            eventName: EtherDividendCheckpointEvents_3_0_0.EtherDividendDeposited,
+            eventName: EtherDividendCheckpointEvents.EtherDividendDeposited,
             logs,
           });
 

src/procedures/LaunchCappedSto.ts

@@ -2,7 +2,7 @@ import {
   ModuleName,
   BigNumber,
   CappedSTOFundRaiseType,
-  SecurityTokenEvents_3_0_0,
+  SecurityTokenEvents,
 } from '@polymathnetwork/contract-wrappers';
 import { Procedure } from './Procedure';
 import {
@@ -103,7 +103,7 @@ export class LaunchCappedSto extends Procedure<LaunchCappedStoProcedureArgs, Cap
           const { logs } = receipt;
 
           const [event] = findEvents({
-            eventName: SecurityTokenEvents_3_0_0.ModuleAdded,
+            eventName: SecurityTokenEvents.ModuleAdded,
             logs,
           });
 

src/procedures/LaunchUsdTieredSto.ts

@@ -2,7 +2,7 @@ import {
   ModuleName,
   BigNumber,
   FundRaiseType,
-  SecurityTokenEvents_3_0_0,
+  SecurityTokenEvents,
 } from '@polymathnetwork/contract-wrappers';
 import { Procedure } from './Procedure';
 import {
@@ -129,7 +129,7 @@ export class LaunchUsdTieredSto extends Procedure<LaunchUsdTieredStoProcedureArg
           const { logs } = receipt;
 
           const [event] = findEvents({
-            eventName: SecurityTokenEvents_3_0_0.ModuleAdded,
+            eventName: SecurityTokenEvents.ModuleAdded,
             logs,
           });
 

src/types/index.ts

@@ -143,6 +143,7 @@ export enum PolyTransactionTag {
   WithdrawTaxWithholdings = 'WithdrawTaxWithholdings',
   PushDividendPayment = 'PushDividendPayment',
   SetDividendsWallet = 'SetDividendsWallet',
+  AddDelegate = 'AddDelegate',
   ChangePermission = 'ChangePermission',
   ControllerTransfer = 'ControllerTransfer',
   PauseSto = 'PauseSto',
@@ -325,7 +326,7 @@ export interface AssignSecurityTokenRoleProcedureArgs {
   delegateAddress: string;
   role: SecurityTokenRole;
   assign: boolean;
-  description?: string;
+  description: string;
 }
 
 export interface AssignStoRoleProcedureArgs {