feat: add all missing TieredSto properties and some for CappedSto

monitz87 · monitz87 · commit fef668b472d6 · 2019-10-30T17:41:17.000-03:00
diff --git a/src/entities/Sto.ts b/src/entities/Sto.ts
@@ -24,12 +24,17 @@ export interface Params {
   startTime: Date;
   endTime: Date;
   fundraiseTypes: Currency[];
+  raisedFundsWallet: string;
+  unsoldTokensWallet: string;
   raisedAmount: BigNumber;
   soldTokensAmount: BigNumber;
   investorAmount: number;
   investments: Investment[];
   paused: boolean;
   capReached: boolean;
+  isFinalized: boolean;
+  preMintAllowed: boolean;
+  beneficialInvestmentsAllowed: boolean;
 }
 
 export abstract class Sto<P> extends Entity<P> {
@@ -47,6 +52,10 @@ export abstract class Sto<P> extends Entity<P> {
 
   public endTime: Date;
 
+  public raisedFundsWallet: string;
+
+  public unsoldTokensWallet: string;
+
   public raisedAmount: BigNumber;
 
   public soldTokensAmount: BigNumber;
@@ -61,6 +70,12 @@ export abstract class Sto<P> extends Entity<P> {
 
   public capReached: boolean;
 
+  public isFinalized: boolean;
+
+  public preMintAllowed: boolean;
+
+  public beneficialInvestmentsAllowed: boolean;
+
   protected context: Context;
 
   public static unserialize(serialized: string) {
@@ -87,12 +102,17 @@ export abstract class Sto<P> extends Entity<P> {
       fundraiseTypes,
       startTime,
       endTime,
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount,
       soldTokensAmount,
       investorAmount,
       investments,
       paused,
       capReached,
+      isFinalized,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
     } = params;
 
     this.address = address;
@@ -101,13 +121,18 @@ export abstract class Sto<P> extends Entity<P> {
     this.stoType = stoType;
     this.startTime = startTime;
     this.endTime = endTime;
+    this.raisedFundsWallet = raisedFundsWallet;
+    this.unsoldTokensWallet = unsoldTokensWallet;
     this.raisedAmount = raisedAmount;
     this.soldTokensAmount = soldTokensAmount;
     this.investorAmount = investorAmount;
     this.investments = investments;
     this.fundraiseTypes = fundraiseTypes;
     this.paused = paused;
     this.capReached = capReached;
+    this.isFinalized = isFinalized;
+    this.preMintAllowed = preMintAllowed;
+    this.beneficialInvestmentsAllowed = beneficialInvestmentsAllowed;
     this.context = context;
   }
 
@@ -175,26 +200,42 @@ export abstract class Sto<P> extends Entity<P> {
     const {
       uid,
       securityTokenId,
+      address,
       securityTokenSymbol,
       fundraiseTypes,
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount,
       soldTokensAmount,
       investorAmount,
       investments,
       startTime,
       endTime,
+      capReached,
+      isFinalized,
+      paused,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
     } = this;
 
     return {
       uid,
       securityTokenId,
+      address,
       securityTokenSymbol,
       fundraiseTypes,
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount,
       soldTokensAmount,
       investorAmount,
       startTime,
       endTime,
+      capReached,
+      isFinalized,
+      paused,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
       investments: investments.map(investment => investment.toPojo()),
     };
   }
@@ -205,12 +246,17 @@ export abstract class Sto<P> extends Entity<P> {
       startTime,
       endTime,
       fundraiseTypes,
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount,
       soldTokensAmount,
       investorAmount,
       investments,
       paused,
       capReached,
+      isFinalized,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
     } = params;
 
     if (securityTokenSymbol) {
@@ -229,6 +275,14 @@ export abstract class Sto<P> extends Entity<P> {
       this.fundraiseTypes = fundraiseTypes;
     }
 
+    if (raisedFundsWallet) {
+      this.raisedFundsWallet = raisedFundsWallet;
+    }
+
+    if (unsoldTokensWallet) {
+      this.unsoldTokensWallet = unsoldTokensWallet;
+    }
+
     if (raisedAmount) {
       this.raisedAmount = raisedAmount;
     }
@@ -252,5 +306,17 @@ export abstract class Sto<P> extends Entity<P> {
     if (capReached !== undefined) {
       this.capReached = capReached;
     }
+
+    if (isFinalized !== undefined) {
+      this.isFinalized = isFinalized;
+    }
+
+    if (preMintAllowed !== undefined) {
+      this.preMintAllowed = preMintAllowed;
+    }
+
+    if (beneficialInvestmentsAllowed !== undefined) {
+      this.beneficialInvestmentsAllowed = beneficialInvestmentsAllowed;
+    }
   }
 }
diff --git a/src/entities/TieredSto.ts b/src/entities/TieredSto.ts
@@ -6,8 +6,12 @@ import { Context } from '../Context';
 export { UniqueIdentifiers };
 
 export interface Tier {
-  cap: BigNumber;
-  rate: BigNumber;
+  tokensOnSale: BigNumber;
+  tokensSold: BigNumber;
+  price: BigNumber;
+  tokensWithDiscount: BigNumber;
+  tokensSoldAtDiscount: BigNumber;
+  discountedPrice: BigNumber;
 }
 
 export interface Params extends StoParams {
diff --git a/src/entities/factories/CappedStoFactory.ts b/src/entities/factories/CappedStoFactory.ts
@@ -4,6 +4,7 @@ import {
   conversionUtils,
   FULL_DECIMALS,
   CappedSTOEvents,
+  isCappedSTO_3_1_0,
 } from '@polymathnetwork/contract-wrappers';
 import { Factory } from './Factory';
 import { Context } from '../../Context';
@@ -19,8 +20,11 @@ export class CappedStoFactory extends Factory<CappedSto, Params, UniqueIdentifie
     const { securityTokenId, stoType, address } = CappedSto.unserialize(uid);
 
     const { symbol } = SecurityToken.unserialize(securityTokenId);
+    const {
+      context: { contractWrappers, factories },
+    } = this;
 
-    const module = await this.context.contractWrappers.moduleFactory.getModuleInstance({
+    const module = await contractWrappers.moduleFactory.getModuleInstance({
       name: ModuleName.CappedSTO,
       address,
     });
@@ -43,8 +47,33 @@ export class CappedStoFactory extends Factory<CappedSto, Params, UniqueIdentifie
     const [
       paused,
       capReached,
+      beneficialInvestmentsAllowed,
+      raisedFundsWallet,
       { fundsRaised, investorCount, totalTokensSold, isRaisedInPoly, ...details },
-    ] = await Promise.all([module.paused(), module.capReached(), module.getSTODetails()]);
+    ] = await Promise.all([
+      module.paused(),
+      module.capReached(),
+      module.allowBeneficialInvestments(),
+      module.wallet(),
+      module.getSTODetails(),
+    ]);
+
+    let preMintAllowed = false;
+    let isFinalized = capReached || details.endTime <= new Date();
+    let unsoldTokensWallet: string;
+
+    if (isCappedSTO_3_1_0(module)) {
+      [preMintAllowed, unsoldTokensWallet, isFinalized] = await Promise.all([
+        module.preMintAllowed(),
+        module.getTreasuryWallet(),
+        module.isFinalized(),
+      ]);
+    } else {
+      const securityToken = await contractWrappers.tokenFactory.getSecurityTokenInstanceFromTicker(
+        symbol
+      );
+      unsoldTokensWallet = await securityToken.owner();
+    }
 
     const stoId = CappedSto.generateId({
       securityTokenId,
@@ -53,14 +82,16 @@ export class CappedStoFactory extends Factory<CappedSto, Params, UniqueIdentifie
     });
 
     const investmentEntities = investments.map(({ index, ...investment }) =>
-      this.context.factories.investmentFactory.create(
-        Investment.generateId({ securityTokenId, stoId, index }),
-        { securityTokenSymbol: symbol, ...investment }
-      )
+      factories.investmentFactory.create(Investment.generateId({ securityTokenId, stoId, index }), {
+        securityTokenSymbol: symbol,
+        ...investment,
+      })
     );
 
     return {
       fundraiseTypes: isRaisedInPoly ? [Currency.POLY] : [Currency.ETH],
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount: fundsRaised,
       soldTokensAmount: totalTokensSold,
       investorAmount: investorCount,
@@ -72,6 +103,9 @@ export class CappedStoFactory extends Factory<CappedSto, Params, UniqueIdentifie
       address,
       paused,
       capReached,
+      isFinalized,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
     };
   };
 
diff --git a/src/entities/factories/TieredStoFactory.ts b/src/entities/factories/TieredStoFactory.ts
@@ -4,14 +4,15 @@ import {
   BlockParamLiteral,
   conversionUtils,
   FULL_DECIMALS,
+  isUSDTieredSTO_3_1_0,
 } from '@polymathnetwork/contract-wrappers';
-import { zipWith } from 'lodash';
+import { range } from 'lodash';
 import { Factory } from './Factory';
 import { Context } from '../../Context';
 import { Currency } from '../../types';
 import { SecurityToken } from '../SecurityToken';
 import { Investment } from '../Investment';
-import { TieredSto, Params, UniqueIdentifiers } from '../TieredSto';
+import { TieredSto, Params, UniqueIdentifiers, Tier } from '../TieredSto';
 
 const { weiToValue } = conversionUtils;
 
@@ -46,6 +47,10 @@ export class TieredStoFactory extends Factory<TieredSto, Params, UniqueIdentifie
     const [
       paused,
       capReached,
+      isFinalized,
+      beneficialInvestmentsAllowed,
+      raisedFundsWallet,
+      numberOfTiers,
       {
         tokensSold,
         capPerTier,
@@ -57,7 +62,65 @@ export class TieredStoFactory extends Factory<TieredSto, Params, UniqueIdentifie
         isRaisedInSC,
         ...details
       },
-    ] = await Promise.all([module.paused(), module.capReached(), module.getSTODetails()]);
+    ] = await Promise.all([
+      module.paused(),
+      module.capReached(),
+      module.isFinalized(),
+      module.allowBeneficialInvestments(),
+      module.wallet(),
+      module.getNumberOfTiers(),
+      module.getSTODetails(),
+    ]);
+
+    let preMintAllowed = false;
+    let unsoldTokensWallet: string;
+    let tiers: Tier[];
+    let rawTiers;
+
+    if (isUSDTieredSTO_3_1_0(module)) {
+      [preMintAllowed, unsoldTokensWallet, rawTiers] = await Promise.all([
+        module.preMintAllowed(),
+        module.getTreasuryWallet(),
+        Promise.all(range(numberOfTiers).map(tier => module.tiers({ tier }))),
+      ]);
+      tiers = rawTiers.map(
+        ({
+          tokenTotal,
+          totalTokensSoldInTier,
+          rate,
+          soldDiscountPoly,
+          tokensDiscountPoly,
+          rateDiscountPoly,
+        }) => ({
+          tokensOnSale: tokenTotal,
+          tokensSold: totalTokensSoldInTier,
+          price: rate,
+          tokensWithDiscount: tokensDiscountPoly,
+          tokensSoldAtDiscount: soldDiscountPoly,
+          discountedPrice: rateDiscountPoly,
+        })
+      );
+    } else {
+      unsoldTokensWallet = await module.treasuryWallet();
+      rawTiers = await Promise.all(range(numberOfTiers).map(tier => module.tiers({ tier })));
+      tiers = rawTiers.map(
+        ({
+          tokenTotal,
+          mintedTotal,
+          rate,
+          tokensDiscountPoly,
+          mintedDiscountPoly,
+          rateDiscountPoly,
+        }) => ({
+          tokensOnSale: tokenTotal,
+          tokensSold: mintedTotal,
+          price: rate,
+          tokensWithDiscount: tokensDiscountPoly,
+          tokensSoldAtDiscount: mintedDiscountPoly,
+          discountedPrice: rateDiscountPoly,
+        })
+      );
+    }
 
     const stoId = TieredSto.generateId({
       securityTokenId,
@@ -72,8 +135,6 @@ export class TieredStoFactory extends Factory<TieredSto, Params, UniqueIdentifie
       )
     );
 
-    const tiers = zipWith(capPerTier, ratePerTier, (cap, rate) => ({ cap, rate }));
-
     const fundraiseTypes = [];
 
     if (isRaisedInETH) {
@@ -90,6 +151,8 @@ export class TieredStoFactory extends Factory<TieredSto, Params, UniqueIdentifie
 
     return {
       fundraiseTypes,
+      raisedFundsWallet,
+      unsoldTokensWallet,
       raisedAmount: fundsRaised,
       investorAmount: investorCount,
       soldTokensAmount: tokensSold,
@@ -102,6 +165,9 @@ export class TieredStoFactory extends Factory<TieredSto, Params, UniqueIdentifie
       address,
       paused,
       capReached,
+      isFinalized,
+      preMintAllowed,
+      beneficialInvestmentsAllowed,
     };
   };
 
