@leofcoin/standards 0.2.6 → 0.2.8

package/src/voting/private-voting.ts

@@ -1,114 +1,33 @@
 import ContractCreator, { ContractCreatorState } from '../contract-creator.js'
+import { IVoting } from './interfaces/i-voting.js'
 import { VoteResult, VoteView, VotingState } from './types.js'
+import Voting from './voting.js'
 
 export interface PrivateVotingState extends VotingState, ContractCreatorState {
-  voters
+  voters: address[]
 }
 
-export default class PrivateVoting extends ContractCreator {
+export default class PrivateVoting extends Voting implements IVoting {
   #voters: PrivateVotingState['voters']
-  #votes: PrivateVotingState['votes']
-  #votingDisabled: boolean
-  #votingDuration: number = 172800000
 
   constructor(state: PrivateVotingState) {
     super(state)
     if (state) {
       this.#voters = state.voters
-      this.#votes = state.votes
-      this.#votingDisabled = state.votingDisabled
-      this.#votingDuration = state.votingDuration
     } else {
       this.#voters = [msg.sender]
     }
   }
 
-  get votes() {
-    return { ...this.#votes }
-  }
-
-  get voters() {
-    return { ...this.#voters }
-  }
-
-  get votingDisabled() {
-    return this.#votingDisabled
-  }
-
-  /**
-   *
-   */
   get state(): PrivateVotingState {
     return {
       ...super.state,
-      voters: this.#voters,
-      votes: this.#votes,
-      votingDisabled: this.#votingDisabled,
-      votingDuration: this.#votingDuration
+      voters: this.#voters
     }
   }
 
-  get inProgress(): VoteView[] {
-    return Object.entries(this.#votes)
-      .filter(([id, vote]) => !vote.finished)
-      .map(([id, vote]) => {
-        return { ...vote, id }
-      })
-  }
-  /**
-   * create vote
-   * @param {string} vote
-   * @param {string} description
-   * @param {number} endTime
-   * @param {string} method function to run when agree amount is bigger
-   */
-
-  createVote(title: string, description: string, endTime: EpochTimeStamp, method: string, args: any[] = []) {
-    if (!this.canVote(msg.sender)) throw new Error(`Not allowed to create a vote`)
-    const id = crypto.randomUUID()
-    this.#votes[id] = {
-      title,
-      description,
-      method,
-      endTime,
-      args
-    }
-  }
-
-  canVote(address: address) {
-    return this.#voters.includes(address)
-  }
-
-  #enoughVotes(id) {
-    return this.#voters.length - 2 <= Object.keys(this.#votes[id]).length
-  }
-
-  #endVoting(voteId) {
-    let agree = Object.values(this.#votes[voteId].results).filter((result) => result === 1)
-    let disagree = Object.values(this.#votes[voteId].results).filter((result) => result === 0)
-    this.#votes[voteId].enoughVotes = this.#enoughVotes(voteId)
-    if (agree.length > disagree.length && this.#votes[voteId].enoughVotes)
-      this[this.#votes[voteId].method](...this.#votes[voteId].args)
-    this.#votes[voteId].finished = true
-  }
-
-  vote(voteId: string, vote: VoteResult) {
-    vote = Number(vote) as VoteResult
-    if (vote !== 0 && vote !== 0.5 && vote !== 1) throw new Error(`invalid vote value ${vote}`)
-    if (!this.#votes[voteId]) throw new Error(`Nothing found for ${voteId}`)
-    const ended = new Date().getTime() > this.#votes[voteId].endTime
-    if (ended && !this.#votes[voteId].finished) this.#endVoting(voteId)
-    if (ended) throw new Error('voting already ended')
-    if (!this.canVote(msg.sender)) throw new Error(`Not allowed to vote`)
-    this.#votes[voteId][msg.sender] = vote
-    if (this.#enoughVotes(voteId)) {
-      this.#endVoting(voteId)
-    }
-  }
-
-  #disableVoting() {
-    this.#votingDisabled = true
-    this.#voters = []
+  _canVote(): boolean {
+    return this.#voters.includes(msg.sender)
   }
 
   #grantVotingPower(address) {
@@ -119,27 +38,13 @@ export default class PrivateVoting extends ContractCreator {
     this.#voters.splice(this.#voters.indexOf(address))
   }
 
-  disableVoting() {
-    if (!this.canVote(msg.sender)) throw new Error('not a allowed')
-    if (this.#voters.length === 1) this.#disableVoting()
-    else {
-      this.createVote(
-        `disable voting`,
-        `Warning this disables all voting features forever`,
-        new Date().getTime() + this.#votingDuration,
-        '#disableVoting',
-        []
-      )
-    }
-  }
-
   grantVotingPower(address: address, voteId: string) {
-    if (this.#voters.length === 1 && this.canVote(msg.sender)) this.#grantVotingPower(address)
+    if (this.#voters.length === 1 && this._canVote()) this.#grantVotingPower(address)
     else {
       this.createVote(
         `grant voting power to ${address}`,
         `Should we grant ${address} voting power?`,
-        new Date().getTime() + this.#votingDuration,
+        new Date().getTime() + this.votingDuration,
         '#grantVotingPower',
         [address]
       )
@@ -147,24 +52,18 @@ export default class PrivateVoting extends ContractCreator {
   }
 
   revokeVotingPower(address: address, voteId: string) {
-    if (!this.canVote(msg.sender)) throw new Error('not a allowed to vote')
-    if (this.#voters.length === 1 && address === msg.sender && !this.#votingDisabled)
+    if (!this._canVote()) throw new Error('not a allowed to vote')
+    if (this.#voters.length === 1 && address === msg.sender && !this.votingDisabled)
       throw new Error('only one voter left, disable voting before making this contract voteless')
     if (this.#voters.length === 1) this.#revokeVotingPower(address)
     else {
       this.createVote(
         `revoke voting power for ${address}`,
         `Should we revoke ${address} it's voting power?`,
-        new Date().getTime() + this.#votingDuration,
+        new Date().getTime() + this.votingDuration,
         '#revokeVotingPower',
         [address]
       )
     }
   }
-
-  sync() {
-    for (const vote of this.inProgress) {
-      if (vote.endTime < new Date().getTime()) this.#endVoting(vote.id)
-    }
-  }
 }

package/src/voting/voting.ts

@@ -1,10 +1,12 @@
 import ContractCreator, { ContractCreatorState } from '../contract-creator.js'
-import { Vote, VoteResult, VoteView, VotingState } from './types.js'
+import { Vote, VoteResult, VoteView, VotingState as _VotingState } from './types.js'
+export declare interface VotingState extends _VotingState, ContractCreatorState {}
+
 export default class Voting extends ContractCreator {
   #votes: VotingState['votes'] = {}
   #votingDisabled: boolean = false
   #votingDuration: number = 172800000
-  constructor(state) {
+  constructor(state: VotingState) {
     super(state)
     if (state) {
       this.#votes = state.votes
@@ -25,7 +27,7 @@ export default class Voting extends ContractCreator {
     return this.#votingDisabled
   }
 
-  get state() {
+  get state(): VotingState {
     return {
       ...super.state,
       votes: this.#votes,
@@ -71,8 +73,7 @@ export default class Voting extends ContractCreator {
   #endVoting(voteId) {
     let agree = Object.values(this.#votes[voteId].results).filter((result) => result === 1)
     let disagree = Object.values(this.#votes[voteId].results).filter((result) => result === 0)
-    if (agree.length > disagree.length && this.#votes[voteId].enoughVotes)
-      this[this.#votes[voteId].method](...this.#votes[voteId].args)
+    if (agree.length > disagree.length) this[this.#votes[voteId].method](...this.#votes[voteId].args)
     this.#votes[voteId].finished = true
   }
 
@@ -114,7 +115,7 @@ export default class Voting extends ContractCreator {
     }
   }
 
-  _sync() {
+  sync() {
     for (const vote of this.votesInProgress) {
       if (vote.endTime < new Date().getTime()) this.#endVoting(vote.id)
     }

package/src/voting/interfaces/i-private-voting.ts

@@ -1,4 +0,0 @@
-export interface IPublicVoting {
-  _canVote(): Promise<any>
-  _beforeVote(): Promise<any>
-}

package/src/voting/interfaces/i-public-voting.ts

@@ -1,4 +0,0 @@
-export interface IPublicVoting {
-  _canVote(): Promise<any>
-  _beforeVote(): Promise<any>
-}