use "@daostack/migration-experimental": "0.1.2-rc.6-v2", (#523)

* use     "@daostack/migration-experimental": "0.1.2-rc.6-v2",

* JoinAndQuit - > Join

Author: orenyodfat

docker-compose.yml

@@ -26,18 +26,18 @@ services:
       GRAPH_GRAPHQL_MAX_FIRST: '1000'
 
   ipfs:
-    image: daostack/test-env-experimental-ipfs:4.0.17
+    image: daostack/test-env-experimental-ipfs:4.0.18
     ports:
       - 5001:5001
 
   postgres:
-    image: daostack/test-env-experimental-postgres:4.0.17
+    image: daostack/test-env-experimental-postgres:4.0.18
     ports:
       - 9432:5432
     environment:
       POSTGRES_PASSWORD: 'letmein'
 
   ganache:
-    image: daostack/test-env-experimental-ganache:4.0.17
+    image: daostack/test-env-experimental-ganache:4.0.18
     ports:
       - 8545:8545

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/arc.js",
-  "version": "2.0.0-experimental.49",
+  "version": "2.0.0-experimental.50",
   "description": "",
   "keywords": [],
   "main": "dist/lib/index.js",
@@ -72,8 +72,8 @@
     ]
   },
   "devDependencies": {
-    "@daostack/migration-experimental": "0.1.2-rc.2-v0",
-    "@daostack/test-env-experimental": "4.0.17",
+    "@daostack/migration-experimental": "0.1.2-rc.6-v2",
+    "@daostack/test-env-experimental": "4.0.18",
     "@types/graphql": "^14.2.2",
     "@types/isomorphic-fetch": "^0.0.34",
     "@types/jest": "^24.0.15",

package.json

@@ -4,7 +4,7 @@ export * from './plugins/proposal'
 export * from './plugins/proposalPlugin'
 export * from './plugins/contributionReward'
 export * from './plugins/contributionRewardExt'
-export * from './plugins/joinAndQuit'
+export * from './plugins/join'
 export * from './plugins/competition'
 export * from './plugins/fundingRequest'
 export * from './plugins/genericPlugin'

src/index.ts

@@ -19,7 +19,7 @@ import {
   transactionErrorHandler,
   transactionResultHandler
 } from '../../index'
-import { IJoinAndQuitState } from '../joinAndQuit'
+import { IJoinState } from '../join'
 
 export interface IFundingRequestState extends IPluginState {
   pluginParams: {
@@ -157,15 +157,15 @@ export class FundingRequest
       if (err.message.match(/funding is not allowed yet/)) {
         const state = await this.fetchState()
         const dao = state.dao.entity
-        const joinAndQuit = (await dao.plugin({ where: { name: 'JoinAndQuit' } }))
-        const joinAndQuitState = await joinAndQuit.fetchState() as IJoinAndQuitState
-        const deadline = joinAndQuitState.pluginParams.fundingGoalDeadline
+        const join = (await dao.plugin({ where: { name: 'Join' } }))
+        const joinState = await join.fetchState() as IJoinState
+        const deadline = joinState.pluginParams.fundingGoalDeadline
         const now = new Date()
         if (deadline < now) {
           return new Error(`${err.message}: fundingGoal deadline ${deadline} has passed before reaching the funding goal`)
 
         }
-        return new Error(`${err.message}: funding goal: ${fromWei(joinAndQuitState.pluginParams.fundingGoal)}, deadline: ${joinAndQuitState.pluginParams.fundingGoalDeadline}`)
+        return new Error(`${err.message}: funding goal: ${fromWei(joinState.pluginParams.fundingGoal)}, deadline: ${joinState.pluginParams.fundingGoalDeadline}`)
       }
       throw err
     }

src/plugins/fundingRequest/plugin.ts

@@ -7,12 +7,12 @@ import {
   Arc,
   getEventArgs,
   IGenesisProtocolParams,
-  IJoinAndQuitProposalState,
+  IJoinProposalState,
   IPluginState,
   IProposalBaseCreateOptions,
   ITransaction,
   ITransactionReceipt,
-  JoinAndQuitProposal,
+  JoinProposal,
   mapGenesisProtocolParams,
   Plugin,
   ProposalPlugin,
@@ -21,7 +21,7 @@ import {
 } from '../../index'
 import { NULL_ADDRESS, secondSinceEpochToDate } from '../../utils'
 
-export interface IJoinAndQuitState extends IPluginState {
+export interface IJoinState extends IPluginState {
   pluginParams: {
     votingMachine: Address
     voteParams: IGenesisProtocolParams
@@ -33,7 +33,7 @@ export interface IJoinAndQuitState extends IPluginState {
    }
 }
 
-export interface IProposalCreateOptionsJoinAndQuit extends IProposalBaseCreateOptions {
+export interface IProposalCreateOptionsJoin extends IProposalBaseCreateOptions {
   fee: BN
 }
 
@@ -51,17 +51,17 @@ export interface IInitParamsJQ {
   rageQuitEnable: boolean
 }
 
-export class JoinAndQuit extends ProposalPlugin<
-  IJoinAndQuitState,
-  IJoinAndQuitProposalState,
-  IProposalCreateOptionsJoinAndQuit> {
+export class Join extends ProposalPlugin<
+  IJoinState,
+  IJoinProposalState,
+  IProposalCreateOptionsJoin> {
 
   public static get fragment() {
     if (!this.fragmentField) {
       this.fragmentField = {
-        name: 'JoinAndQuitParams',
-        fragment: gql` fragment JoinAndQuitParams on ControllerScheme {
-          joinAndQuitParams {
+        name: 'JoinParams',
+        fragment: gql` fragment JoinParams on ControllerScheme {
+          joinParams {
             id
             votingMachine
             voteParams {
@@ -97,7 +97,7 @@ export class JoinAndQuit extends ProposalPlugin<
 
     Object.keys(initParams).forEach((key) => {
       if (initParams[key] === undefined) {
-        throw new Error(`JoinAndQuit's initialize parameter '${key}' cannot be undefined`)
+        throw new Error(`Join's initialize parameter '${key}' cannot be undefined`)
       }
     })
 
@@ -116,25 +116,25 @@ export class JoinAndQuit extends ProposalPlugin<
     ]
   }
 
-  public static itemMap(context: Arc, item: any, queriedId?: string): IJoinAndQuitState | null {
+  public static itemMap(context: Arc, item: any, queriedId?: string): IJoinState | null {
     if (!item) {
       return null
     }
 
-    if (!item.joinAndQuitParams) {
-      throw new Error(`Plugin ${queriedId ? `with id '${queriedId}'` : ''}wrongly instantiated as JoinAndQuit Plugin`)
+    if (!item.joinParams) {
+      throw new Error(`Plugin ${queriedId ? `with id '${queriedId}'` : ''}wrongly instantiated as Join Plugin`)
     }
 
     const baseState = Plugin.itemMapToBaseState(context, item)
 
     const fundingRequestParams = {
-      voteParams: mapGenesisProtocolParams(item.joinAndQuitParams.voteParams),
-      votingMachine: item.joinAndQuitParams.votingMachine,
-      fundingToken: item.joinAndQuitParams.fundingToken,
-      minFeeToJoin: new BN(item.joinAndQuitParams.minFeeToJoin),
-      memberReputation: new BN(item.joinAndQuitParams.memberReputation),
-      fundingGoal: new BN(item.joinAndQuitParams.fundingGoal),
-      fundingGoalDeadline: secondSinceEpochToDate(item.joinAndQuitParams.fundingGoalDeadline)
+      voteParams: mapGenesisProtocolParams(item.joinParams.voteParams),
+      votingMachine: item.joinParams.votingMachine,
+      fundingToken: item.joinParams.fundingToken,
+      minFeeToJoin: new BN(item.joinParams.minFeeToJoin),
+      memberReputation: new BN(item.joinParams.memberReputation),
+      fundingGoal: new BN(item.joinParams.fundingGoal),
+      fundingGoalDeadline: secondSinceEpochToDate(item.joinParams.fundingGoalDeadline)
     }
 
     return {
@@ -145,10 +145,10 @@ export class JoinAndQuit extends ProposalPlugin<
 
   private static fragmentField: { name: string, fragment: DocumentNode } | undefined
 
-  public async createProposalTransaction(options: IProposalCreateOptionsJoinAndQuit): Promise<ITransaction> {
+  public async createProposalTransaction(options: IProposalCreateOptionsJoin): Promise<ITransaction> {
 
     if (options.plugin === undefined) {
-      throw new Error(`Missing argument "plugin" for JoinAndQuit in Proposal.create()`)
+      throw new Error(`Missing argument "plugin" for Join in Proposal.create()`)
     }
 
     const state = this.fetchState()
@@ -176,13 +176,13 @@ export class JoinAndQuit extends ProposalPlugin<
 
   public createProposalTransactionMap(): transactionResultHandler<any> {
     return async (receipt: ITransactionReceipt) => {
-      const args = getEventArgs(receipt, 'JoinInProposal', 'JoinAndQuit.createProposal')
+      const args = getEventArgs(receipt, 'JoinInProposal', 'Join.createProposal')
       const proposalId = args[1]
-      return new JoinAndQuitProposal(this.context, proposalId)
+      return new JoinProposal(this.context, proposalId)
     }
   }
 
-  public createProposalErrorHandler(options: IProposalCreateOptionsJoinAndQuit): transactionErrorHandler {
+  public createProposalErrorHandler(options: IProposalCreateOptionsJoin): transactionErrorHandler {
     return async (err) => {
       throw err
     }

src/plugins/joinAndQuit/index.ts renamed to src/plugins/join/index.ts

@@ -12,30 +12,30 @@ import {
   IProposalState,
   ITransaction,
   ITransactionReceipt,
-  JoinAndQuit,
+  Join,
   Operation,
   Plugin,
   Proposal,
   toIOperationObservable
 } from '../../index'
 
-export interface IJoinAndQuitProposalState extends IProposalState {
+export interface IJoinProposalState extends IProposalState {
   proposedMember: Address
   dao: IEntityRef<DAO>
   funding: BN,
   executed: boolean,
   reputationMinted: BN
 }
 
-export class JoinAndQuitProposal extends Proposal<IJoinAndQuitProposalState> {
+export class JoinProposal extends Proposal<IJoinProposalState> {
 
   public static get fragment() {
     if (!this.fragmentField) {
       this.fragmentField = {
-        name: 'JoinAndQuitProposalFields',
+        name: 'JoinProposalFields',
         fragment: gql`
-          fragment JoinAndQuitProposalFields on Proposal {
-            joinAndQuit {
+          fragment JoinProposalFields on Proposal {
+            join {
               id
               dao { id }
               proposedMember
@@ -51,39 +51,39 @@ export class JoinAndQuitProposal extends Proposal<IJoinAndQuitProposalState> {
     return this.fragmentField
   }
 
-  public static itemMap(context: Arc, item: any, query?: string): IJoinAndQuitProposalState | null {
+  public static itemMap(context: Arc, item: any, query?: string): IJoinProposalState | null {
 
     if (!item) { return null }
 
-    const joinAndQuitState = JoinAndQuit.itemMap(context, item.scheme, query)
+    const joinState = Join.itemMap(context, item.scheme, query)
 
-    if (!joinAndQuitState) { return null }
+    if (!joinState) { return null }
 
-    const joinAndQuit = new JoinAndQuit(context, joinAndQuitState)
-    const joinAndQuitProposal = new JoinAndQuitProposal(context, item.id)
+    const join = new Join(context, joinState)
+    const joinProposal = new JoinProposal(context, item.id)
 
     const baseState = Proposal.itemMapToBaseState(
       context,
       item,
-      joinAndQuit,
-      joinAndQuitProposal,
-      'JoinAndQuit'
+      join,
+      joinProposal,
+      'Join'
     )
 
     if (baseState == null) { return null }
 
     return {
       ...baseState,
-      proposedMember: item.joinAndQuit.proposedMember,
-      funding: new BN(item.joinAndQuit.funding),
-      executed: item.joinAndQuit.executed,
-      reputationMinted: new BN(item.joinAndQuit.reputationMinted)
+      proposedMember: item.join.proposedMember,
+      funding: new BN(item.join.funding),
+      executed: item.join.executed,
+      reputationMinted: new BN(item.join.reputationMinted)
     }
   }
 
   private static fragmentField: { name: string, fragment: DocumentNode } | undefined
 
-  public state(apolloQueryOptions: IApolloQueryOptions): Observable<IJoinAndQuitProposalState> {
+  public state(apolloQueryOptions: IApolloQueryOptions): Observable<IJoinProposalState> {
     const query = gql`query ProposalState
       {
         proposal(id: "${this.id}") {
@@ -101,8 +101,8 @@ export class JoinAndQuitProposal extends Proposal<IJoinAndQuitProposalState> {
     `
 
     const result = this.context.getObservableObject(
-      this.context, query, JoinAndQuitProposal.itemMap, this.id, apolloQueryOptions
-      ) as Observable<IJoinAndQuitProposalState>
+      this.context, query, JoinProposal.itemMap, this.id, apolloQueryOptions
+      ) as Observable<IJoinProposalState>
     return result
   }
   /**

src/plugins/joinAndQuit/plugin.ts renamed to src/plugins/join/plugin.ts

@@ -44,7 +44,7 @@ export type IProposalCreateOptionsPM =
   IProposalCreateOptions<'Competition'> |
   IProposalCreateOptions<'ContributionRewardExt'> |
   IProposalCreateOptions<'FundingRequest'> |
-  IProposalCreateOptions<'JoinAndQuit'> |
+  IProposalCreateOptions<'Join'> |
   IProposalCreateOptions<'SchemeRegistrar'> |
   IProposalCreateOptions<'SchemeFactory'> |
   IProposalCreateOptions<'ReputationFromToken'>

src/plugins/joinAndQuit/proposal.ts renamed to src/plugins/join/proposal.ts

@@ -25,12 +25,12 @@ import {
   IProposalCreateOptionsCRExt,
   IProposalCreateOptionsFundingRequest,
   IProposalCreateOptionsGS,
-  IProposalCreateOptionsJoinAndQuit,
+  IProposalCreateOptionsJoin,
   IProposalCreateOptionsPM,
   IProposalCreateOptionsSR,
   IProposalState,
-  JoinAndQuit,
-  JoinAndQuitProposal,
+  Join,
+  JoinProposal,
   Plugin,
   PluginManagerPlugin,
   PluginManagerProposal,
@@ -45,7 +45,7 @@ import {
 
 export const ProposalPlugins = {
   FundingRequest,
-  JoinAndQuit,
+  Join,
   GenericScheme: GenericPlugin,
   SchemeRegistrar: PluginRegistrarPlugin,
   ContributionReward: ContributionRewardPlugin,
@@ -69,7 +69,7 @@ export const Proposals = {
   Competition: CompetitionProposal,
   ContributionRewardExt: ContributionRewardExtProposal,
   FundingRequest: FundingRequestProposal,
-  JoinAndQuit: JoinAndQuitProposal,
+  Join: JoinProposal,
   SchemeRegistrar: PluginRegistrarProposal,
   SchemeRegistrarAdd: PluginRegistrarProposal,
   SchemeRegistrarRemove: PluginRegistrarProposal,
@@ -83,7 +83,7 @@ export interface IInitParams {
   Competition: IInitParamsCompetition,
   ContributionRewardExt: IInitParamsCRExt,
   FundingRequest: IInitParamsFR,
-  JoinAndQuit: IInitParamsJQ,
+  Join: IInitParamsJQ,
   SchemeRegistrar: IInitParamsSR,
   SchemeFactory: IInitParamsPM,
   ReputationFromToken: IInitParamsRT
@@ -98,7 +98,7 @@ export type ProposalCreateOptions =
   IProposalCreateOptionsComp |
   IProposalCreateOptionsCR |
   IProposalCreateOptionsFundingRequest |
-  IProposalCreateOptionsJoinAndQuit |
+  IProposalCreateOptionsJoin |
   IProposalCreateOptionsPM
 
 export abstract class AnyProposal extends Proposal<IProposalState> { }