fix types; small tweaks in data model

Author: jellegerbrandy

src/dao.ts

@@ -15,9 +15,10 @@ import { IVote, IVoteQueryOptions, Vote } from './vote'
 
 export interface IDAOState {
   address: Address // address of the avatar
+  dao: DAO
+  memberCount: number
   name: string
   reputation: Reputation
-  memberCount: number
   reputationTotalSupply: typeof BN
   token: Token
   tokenName: string
@@ -96,6 +97,7 @@ export class DAO implements IStateful<IDAOState> {
       }
       return {
         address: item.id,
+        dao: this,
         memberCount: Number(item.reputationHoldersCount),
         name: item.name,
         reputation: new Reputation(item.nativeReputation.id, this.context),

src/index.ts

@@ -1,6 +1,4 @@
-import { Arc } from './arc'
-export { Arc }
-export default Arc
+export { Arc, IContractInfo } from './arc'
 export { DAO, IDAOState } from './dao'
 export { Member, IMemberState } from './member'
 export { ITransactionUpdate, ITransactionState } from './operation'
@@ -14,3 +12,5 @@ export { Token, ITokenState } from './token'
 export { Stake, IStake, IStakeQueryOptions } from './stake'
 export { Vote, IVote, IVoteQueryOptions } from './vote'
 export { Address } from './types'
+import { Arc } from './arc'
+export default Arc

src/proposal.ts

@@ -77,6 +77,7 @@ export interface IProposalState {
   paramsHash: string
   preBoostedAt: Date
   preBoostedVotePeriodLimit: number
+  proposal: Proposal
   proposer: Address
   proposingRepReward: typeof BN // in REP
   queuedVoteRequiredPercentage: number
@@ -100,8 +101,9 @@ export interface IProposalState {
   votesAgainst: typeof BN
   votesCount: number
   voteOnBehalf: Address
-  winningOutcome: IProposalOutcome
   votersReputationLossRatio: number // in 1000's
+  votingMachine: Address
+  winningOutcome: IProposalOutcome
   minimumDaoBounty: typeof BN // in GEN
 }
 
@@ -338,6 +340,7 @@ export class Proposal implements IStateful<IProposalState> {
           }
           votesAgainst
           votesFor
+          votingMachine
           winningOutcome
         }
       }
@@ -479,6 +482,7 @@ export class Proposal implements IStateful<IProposalState> {
         paramsHash: item.paramsHash,
         preBoostedAt: Number(item.preBoostedAt),
         preBoostedVotePeriodLimit: Number(item.preBoostedVotePeriodLimit),
+        proposal: this,
         proposer: item.proposer,
         proposingRepReward: new BN(item.proposingRepReward),
         queue: queueState,
@@ -503,6 +507,7 @@ export class Proposal implements IStateful<IProposalState> {
         votesAgainst: new BN(item.votesAgainst),
         votesCount: item.votes.length,
         votesFor: new BN(item.votesFor),
+        votingMachine: item.votingMachine,
         winningOutcome: IProposalOutcome[item.winningOutcome] as any
       }
     }
@@ -759,8 +764,8 @@ interface IProposalBaseCreateOptions {
   url?: string
 }
 
-export type IProposalCreateOptions = IProposalBaseCreateOptions & (
-  GenericScheme.IProposalCreateOptionsGS  &
-  SchemeRegistrar.IProposalCreateOptionsSR  &
-  ContributionReward.IProposalCreateOptionsCR
+export type IProposalCreateOptions = (
+  (IProposalBaseCreateOptions & GenericScheme.IProposalCreateOptionsGS ) |
+  (IProposalBaseCreateOptions & SchemeRegistrar.IProposalCreateOptionsSR) |
+  (IProposalBaseCreateOptions & ContributionReward.IProposalCreateOptionsCR)
 )