add voteRankedChoice and getOptionVotingForRankedChoice

packages/dai-plugin-governance/src/GovPollingService.js

@@ -2,6 +2,7 @@ import { PrivateService } from '@makerdao/services-core';
 import { POLLING } from './utils/constants';
 import { MKR } from './utils/constants';
 import BigNumber from 'bignumber.js';
+import { fromBuffer } from './utils/helpers';
 
 const POSTGRES_MAX_INT = 2147483647;
 
@@ -29,6 +30,15 @@ export default class GovPollingService extends PrivateService {
     return this._pollingContract().vote(pollId, optionId);
   }
 
+  voteRankedChoice(pollId, rankings) {
+    const byteArray = new Uint8Array(32);
+    rankings.forEach((optionIndex, i) => {
+      byteArray[byteArray.length - i - 1] = optionIndex + 1;
+    });
+    const optionId = fromBuffer(byteArray).toString();
+    return this._pollingContract().vote(pollId, optionId);
+  }
+
   _pollingContract() {
     return this.get('smartContract').getContractByName(POLLING);
   }
@@ -71,6 +81,13 @@ export default class GovPollingService extends PrivateService {
     );
   }
 
+  async getOptionVotingForRankedChoice(address, pollId) {
+    return this.get('govQueryApi').getOptionVotingForRankedChoice(
+      address.toLowerCase(),
+      pollId
+    );
+  }
+
   async getNumUniqueVoters(pollId) {
     return this.get('govQueryApi').getNumUniqueVoters(pollId);
   }
@@ -105,7 +122,12 @@ export default class GovPollingService extends PrivateService {
       BigNumber(0)
     );
 
-    const tally = { rounds: 1, winner: null, options: {} };
+    const tally = {
+      rounds: 1,
+      winner: null,
+      totalMkrParticipation,
+      options: {}
+    };
     const defaultOptionObj = {
       firstChoice: BigNumber(0),
       transfer: BigNumber(0),

packages/dai-plugin-governance/src/GovQueryApiService.js

@@ -110,6 +110,19 @@ export default class QueryApi extends PublicService {
     return response.currentVote.nodes[0].optionId;
   }
 
+  async getOptionVotingForRankedChoice(address, pollId) {
+    const query = `{
+      currentVoteRankedChoice(argAddress: "${address}", argPollId: ${pollId}){
+        nodes{
+          optionIdRaw
+        }
+      }
+    }`;
+    const response = await this.getQueryResponse(this.serverUrl, query);
+    if (!response.currentVote.nodes[0]) return null;
+    return response.currentVote.nodes[0].optionId;
+  }
+
   async getBlockNumber(unixTime) {
     const query = `{
       timeToBlockNumber(argUnix: ${unixTime}){
@@ -130,14 +143,16 @@ export default class QueryApi extends PublicService {
     }`;
     const response = await this.getQueryResponseMemoized(this.serverUrl, query);
 
-    return response.voteMkrWeightsAtTimeRankedChoice.nodes.map(vote => {
-      const ballotBuffer = toBuffer(vote.optionIdRaw, { endian: 'little' });
-      const ballot = paddedArray(32 - ballotBuffer.length, ballotBuffer);
-      return {
-        ...vote,
-        ballot
-      };
-    });
+    return response.voteMkrWeightsAtTimeRankedChoice.nodes
+      .filter(vote => vote.optionIdRaw !== '0')
+      .map(vote => {
+        const ballotBuffer = toBuffer(vote.optionIdRaw, { endian: 'little' });
+        const ballot = paddedArray(32 - ballotBuffer.length, ballotBuffer);
+        return {
+          ...vote,
+          ballot
+        };
+      });
   }
 
   async getMkrSupport(pollId, unixTime) {

packages/dai-plugin-governance/umd/index.js.LICENSE.txt

@@ -0,0 +1,12 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <[email protected]> <http://feross.org>
+ * @license  MIT
+ */