merge PR 477 from 1.0 (#508)

* merge PR 477 from 1.0

* fix text failure

* fix test

* fix tests

* unit test

* bump version to .45

Author: dkent600

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/arc.js",
-  "version": "2.0.0-experimental.44",
+  "version": "2.0.0-experimental.45",
   "description": "",
   "keywords": [],
   "main": "dist/lib/index.js",

package.json

@@ -118,9 +118,9 @@ export class FundingRequest
     }
 
     return {
-        ...baseState,
-        pluginParams: fundingRequestParams
-      }
+      ...baseState,
+      pluginParams: fundingRequestParams
+    }
   }
 
   private static fragmentField: { name: string, fragment: DocumentNode } | undefined
@@ -138,7 +138,7 @@ export class FundingRequest
       method: 'propose',
       args: [
         options.beneficiary,
-        options.amount.toNumber(),
+        options.amount.toString(),
         options.descriptionHash || ''
       ]
     }
@@ -157,7 +157,7 @@ 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 joinAndQuit = (await dao.plugin({ where: { name: 'JoinAndQuit' } }))
         const joinAndQuitState = await joinAndQuit.fetchState() as IJoinAndQuitState
         const deadline = joinAndQuitState.pluginParams.fundingGoalDeadline
         const now = new Date()

src/plugins/fundingRequest/plugin.ts

@@ -1,3 +1,4 @@
+import BN from 'bn.js'
 import gql from 'graphql-tag'
 import {
   Address,
@@ -27,7 +28,7 @@ export interface IGenericPluginState extends IPluginState {
 
 export interface IProposalCreateOptionsGS extends IProposalBaseCreateOptions {
   callData?: string
-  value?: number
+  value?: BN
 }
 
 export interface IInitParamsGS {
@@ -43,7 +44,7 @@ export class GenericPlugin extends ProposalPlugin<
   IGenericPluginState,
   IGenericPluginProposalState,
   IProposalCreateOptionsGS
-> {
+  > {
   public static fragment = {
     name: 'GenericpluginParams',
     fragment: gql`
@@ -129,7 +130,7 @@ export class GenericPlugin extends ProposalPlugin<
     return {
       contract: this.context.getContract(options.plugin as string),
       method: 'proposeCall',
-      args: [options.callData, options.value, options.descriptionHash]
+      args: [options.callData, options.value.toString(), options.descriptionHash]
     }
   }
 

src/plugins/genericPlugin/plugin.ts

@@ -1,3 +1,4 @@
+import BN from 'bn.js'
 import gql from 'graphql-tag'
 import { from, Observable } from 'rxjs'
 import { concatMap } from 'rxjs/operators'
@@ -25,6 +26,7 @@ export interface IGenericPluginProposalState extends IProposalState {
   callData: string
   executed: boolean
   returnValue: string
+  value: BN
 }
 
 export class GenericPluginProposal extends Proposal<IGenericPluginProposalState> {
@@ -38,6 +40,7 @@ export class GenericPluginProposal extends Proposal<IGenericPluginProposalState>
           callData
           executed
           returnValue
+          value
         }
       }
     `
@@ -79,7 +82,8 @@ export class GenericPluginProposal extends Proposal<IGenericPluginProposalState>
       callData: item.genericScheme.callData,
       contractToCall: item.genericScheme.contractToCall,
       executed: item.genericScheme.executed,
-      returnValue: item.genericScheme.returnValue
+      returnValue: item.genericScheme.returnValue,
+      value: new BN(item.genericScheme.value)
     }
   }
 

src/plugins/genericPlugin/proposal.ts

@@ -2,8 +2,10 @@ import { first } from 'rxjs/operators'
 import { Arc, DAO, IProposalOutcome, IProposalStage, IProposalState, IProposalCreateOptionsCR, LATEST_ARC_VERSION, GenericPlugin, GenericPluginProposal, IGenericPluginProposalState } from '../src'
 
 import BN from 'bn.js'
-import { createAProposal, firstResult, getTestAddresses, getTestDAO, ITestAddresses, newArc,
-  toWei, voteToPassProposal, waitUntilTrue, createCRProposal, getTestScheme } from './utils'
+import {
+  createAProposal, firstResult, getTestAddresses, getTestDAO, ITestAddresses, newArc,
+  toWei, voteToPassProposal, waitUntilTrue, createCRProposal, getTestScheme
+} from './utils'
 import { BigNumber } from 'ethers/utils'
 import { ethers } from 'ethers'
 import { ContributionRewardProposal } from '../src'
@@ -29,7 +31,7 @@ describe('Claim rewards', () => {
     const states: IProposalState[] = []
     const lastState = () => states[states.length - 1]
 
-    if(!arc.web3) throw new Error("Web3 provider not set")
+    if (!arc.web3) throw new Error("Web3 provider not set")
 
     // make sure that the DAO has enough Ether to pay for the reward
     await arc.web3.getSigner().sendTransaction({
@@ -98,7 +100,7 @@ describe('Claim rewards', () => {
 
     const gen = arc.GENToken()
     await gen.transfer(dao.id, externalTokenReward).send()
-    const daoBalance =  await firstResult(arc.GENToken().balanceOf(dao.id))
+    const daoBalance = await firstResult(arc.GENToken().balanceOf(dao.id))
     expect(Number(daoBalance.toString())).toBeGreaterThanOrEqual(Number(externalTokenReward.toString()))
     const options: IProposalCreateOptionsCR = {
       beneficiary,
@@ -141,36 +143,36 @@ describe('Claim rewards', () => {
   })
 
   it('redeemRewards should also work for expired proposals', async () => {
-     const proposal = new ContributionRewardProposal(arc, testAddresses.queuedProposalId)
-     await proposal.redeemRewards().send()
+    const proposal = new ContributionRewardProposal(arc, testAddresses.queuedProposalId)
+    await proposal.redeemRewards().send()
   })
 
   it('works with non-CR proposal', async () => {
 
     testAddresses = getTestAddresses()
-    const genericSchemes = await arc.plugins({where: {name: 'GenericScheme' }}).pipe(first()).toPromise()
+    const genericSchemes = await arc.plugins({ where: { name: 'GenericScheme' } }).pipe(first()).toPromise()
     const genericScheme = genericSchemes[0] as GenericPlugin
     const genericSchemeState = await genericScheme.state({}).pipe(first()).toPromise()
 
-    dao  = new DAO(arc, genericSchemeState.dao.id)
+    dao = new DAO(arc, genericSchemeState.dao.id)
 
     const beneficiary = await arc.getAccount().pipe(first()).toPromise()
     const stakeAmount = new BN(123456789)
     await arc.GENToken().transfer(dao.id, stakeAmount).send()
-    const actionMockABI = arc.getABI({abiName: 'ActionMock', version: LATEST_ARC_VERSION})
+    const actionMockABI = arc.getABI({ abiName: 'ActionMock', version: LATEST_ARC_VERSION })
 
-    if(!arc.web3) throw new Error("Web3 provider not set")
+    if (!arc.web3) throw new Error("Web3 provider not set")
 
     const callData = new ethers.utils.Interface(actionMockABI).functions.test2.encode([dao.id])
 
     const tx = await genericScheme.createProposal({
       callData,
       dao: dao.id,
       plugin: genericSchemeState.address,
-      value: 0
+      value: new BN("0")
     }).send()
 
-    if(!tx.result) throw new Error('Response yielded no result')
+    if (!tx.result) throw new Error('Response yielded no result')
 
     const proposal = new GenericPluginProposal(arc, tx.result.id)
     const proposalStates: IGenericPluginProposalState[] = []
@@ -203,11 +205,11 @@ describe('Claim rewards', () => {
       return lastState() && lastState().stage === IProposalStage.Executed
     })
 
-    if(!beneficiary) throw new Error("Beneficiary not set")
+    if (!beneficiary) throw new Error("Beneficiary not set")
 
-    const prevBalance =  await firstResult(arc.GENToken().balanceOf(beneficiary))
+    const prevBalance = await firstResult(arc.GENToken().balanceOf(beneficiary))
     await proposal.redeemRewards(beneficiary).send()
-    const newBalance =  await firstResult(arc.GENToken().balanceOf(beneficiary))
+    const newBalance = await firstResult(arc.GENToken().balanceOf(beneficiary))
     expect(newBalance.sub(prevBalance).toString()).toEqual(stakeAmount.toString())
 
   })

test/proposal-claim-reward.spec.ts

@@ -7,8 +7,8 @@ import {
   GenericPlugin,
   GenericPluginProposal,
   LATEST_ARC_VERSION
-  } from '../src'
-import { newArc, voteToPassProposal, waitUntilTrue, getTestScheme } from './utils'
+} from '../src'
+import { newArc, voteToPassProposal, waitUntilTrue, getTestScheme, BN } from './utils'
 import { ethers } from 'ethers'
 
 jest.setTimeout(60000)
@@ -24,31 +24,31 @@ describe('Proposal', () => {
   })
 
   it('Check proposal state is correct', async () => {
-    const daos = await arc.daos({where: { name: 'Nectar DAO'}}).pipe(first()).toPromise()
+    const daos = await arc.daos({ where: { name: 'Nectar DAO' } }).pipe(first()).toPromise()
     const dao = daos[0]
     if (dao === undefined) {
       throw Error(`Could not find "Nectar DAO"`)
     }
     const states: IProposalState[] = []
     const lastState = (): IProposalState => states[states.length - 1]
 
-    const actionMockABI = arc.getABI({abiName: 'ActionMock', version: LATEST_ARC_VERSION})
+    const actionMockABI = arc.getABI({ abiName: 'ActionMock', version: LATEST_ARC_VERSION })
 
-    if(!arc.web3) throw new Error('Web3 provider not set')
+    if (!arc.web3) throw new Error('Web3 provider not set')
 
     const callData = new ethers.utils.Interface(actionMockABI).functions.test2.encode([dao.id])
 
-    const plugins = await dao.plugins({ where: {name: 'GenericScheme' }}).pipe(first()).toPromise() as GenericPlugin[]
+    const plugins = await dao.plugins({ where: { name: 'GenericScheme' } }).pipe(first()).toPromise() as GenericPlugin[]
     const genericScheme = plugins[0]
 
     const tx = await genericScheme.createProposal({
       dao: dao.id,
       callData,
-      value: 0,
+      value: new BN('1'),
       plugin: getTestScheme('GenericScheme')
     }).send()
 
-    if(!tx.result) throw new Error('Create proposal yielded no result')
+    if (!tx.result) throw new Error('Create proposal yielded no result')
 
     const proposal = new GenericPluginProposal(arc, tx.result.id)
 
@@ -64,7 +64,8 @@ describe('Proposal', () => {
     expect(lastState()).toMatchObject({
       callData,
       executed: false,
-      returnValue: null
+      returnValue: null,
+      value: new BN('1')
     })
 
     // accept the proposal by voting the hell out of it