Timestamp for voting windows

yam-finance · Jul 21, 2020 · 0c801f3 · 0c801f3
1 parent 20fa2c5
commit 0c801f3
Show file tree

Hide file tree

Showing 26 changed files with 556 additions and 321 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "balancer-gov",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "repository": "balancer-labs/balancer-gov",
   "license": "GPL-3.0",
   "scripts": {
@@ -42,6 +42,8 @@
     "numeral": "^2.0.4",
     "primer-support": "^5.0.0",
     "redis": "^3.0.2",
+    "remarkable": "^2.0.1",
+    "sanitize-html": "^1.27.1",
     "serve-static": "^1.14.1",
     "stylus": "^0.54.8",
     "stylus-loader": "^3.0.2",

diff --git a/server/api.ts b/server/api.ts
@@ -1,20 +1,11 @@
 import express from 'express';
-import { getDefaultProvider } from '@ethersproject/providers';
 import redis from './redis';
 import pinata from './pinata';
 import relayer from './relayer';
-import { verify, jsonParse } from './utils';
-const router = express.Router();
-
-let currentBlockNumber: number = 0;
+import { verify, jsonParse, sendError } from './utils';
+import pkg from '../package.json';
 
-setInterval(async () => {
-  const defaultProvider = getDefaultProvider();
-  const blockNumber: any = await defaultProvider.getBlockNumber();
-  currentBlockNumber = parseInt(blockNumber);
-  await redis.setAsync('currentBlockNumber', currentBlockNumber);
-  console.log('Block number', currentBlockNumber);
-}, 8e3)
+const router = express.Router();
 
 router.get('/:token/proposals', async (req, res) => {
   const { token } = req.params;
@@ -41,58 +32,65 @@ router.get('/:token/proposal/:id', async (req, res) => {
 router.post('/message', async (req, res) => {
   const body = req.body;
   const msg = jsonParse(body.msg);
+  const ts = (Date.now() / 1e3).toFixed();
+  const minBlock = (3600 * 24) / 15;
+
+  if (!body || !body.address || !body.msg || !body.sig)
+    return sendError(res, 'wrong message body');
 
   if (
-    !currentBlockNumber ||
-    !body ||
-    !body.address ||
-    !body.msg ||
-    !body.sig ||
     Object.keys(msg).length !== 5 ||
-    !msg.version ||
     !msg.token ||
-    !msg.type ||
-    !['proposal', 'vote'].includes(msg.type) ||
-    Object.keys(msg.payload).length === 0 ||
-    msg.type === 'proposal' && (
-      Object.keys(msg.payload).length !== 5 ||
+    !msg.payload ||
+    Object.keys(msg.payload).length === 0
+  ) return sendError(res, 'wrong signed message');
+
+  if (!msg.timestamp || typeof msg.timestamp !== 'string' || msg.timestamp > ts)
+    return sendError(res, 'wrong timestamp');
+
+  if (!msg.version || msg.version !== pkg.version)
+    return sendError(res, 'wrong version');
+
+  if (!msg.type || !['proposal', 'vote'].includes(msg.type))
+    return sendError(res, 'wrong message type');
+
+  if (!await verify(body.address, body.msg, body.sig))
+    return sendError(res, 'wrong signature');
+
+  if (msg.type === 'proposal') {
+    if (
+      Object.keys(msg.payload).length !== 6 ||
       !msg.payload.name ||
       msg.payload.name.length > 128 ||
       !msg.payload.body ||
-      msg.payload.body.length > 10240 ||
+      msg.payload.body.length > 5120 ||
       !msg.payload.choices ||
       msg.payload.choices.length < 2 ||
-      !msg.payload.startBlock ||
-      currentBlockNumber > msg.payload.startBlock ||
-      !msg.payload.endBlock ||
-      msg.payload.startBlock >= msg.payload.endBlock
-    ) ||
-    msg.type === 'vote' && (
-      Object.keys(msg.payload).length !== 2 ||
-      !msg.payload.proposal ||
-      !msg.payload.choice
-    )
-  ) {
-    console.log('unauthorized', body);
-    return res.status(500).json({ error: 'unauthorized' });
-  }
+      !msg.payload.snapshot
+    ) return sendError(res, 'wrong format proposal');
 
-  if (!await verify(body.address, body.msg, body.sig)) {
-    console.log('wrong signature', body);
-    return res.status(500).json({ error: 'wrong signature' });
+    if (
+      !msg.payload.start ||
+      ts > msg.payload.start ||
+      !msg.payload.end ||
+      msg.payload.start >= msg.payload.end
+    ) return sendError(res, 'wrong proposal period');
   }
 
   if (msg.type === 'vote') {
+    if (
+      Object.keys(msg.payload).length !== 2 ||
+      !msg.payload.proposal ||
+      !msg.payload.choice
+    ) return sendError(res, 'wrong format vote');
+
     const proposalRedis = await redis.hgetAsync(`token:${msg.token}:proposals`, msg.payload.proposal);
     const proposal = jsonParse(proposalRedis);
     if (
       !proposalRedis ||
-      currentBlockNumber > proposal.msg.payload.endBlock ||
-      proposal.msg.payload.startBlock > currentBlockNumber
-    ) {
-      console.log('wrong vote', body);
-      return res.status(500).json({ error: 'wrong vote' });
-    }
+      ts > proposal.msg.payload.end ||
+      proposal.msg.payload.start > ts
+    ) return sendError(res, 'wrong vote');
   }
 
   const authorIpfsRes = await pinata.pinJSONToIPFS({

diff --git a/server/utils.ts b/server/utils.ts
@@ -16,3 +16,10 @@ export async function verify(address, msg, sig) {
 export function clone(item) {
   return JSON.parse(JSON.stringify(item));
 }
+
+export function sendError(res, description) {
+  return res.status(500).json({
+    error: 'unauthorized',
+    error_description: description
+  });
+}
diff --git a/src/components/Block/Votes.vue b/src/components/Block/Votes.vue
@@ -12,12 +12,10 @@
       class="px-4 py-3 border-top d-flex"
     >
       <User :address="address" :verified="token.verified" class="column" />
-      <div class="flex-auto text-center">
-        <span
-          v-text="proposal.msg.payload.choices[vote.msg.payload.choice - 1]"
-          class="text-white ml-2 column"
-        />
-      </div>
+      <div
+        v-text="proposal.msg.payload.choices[vote.msg.payload.choice - 1]"
+        class="flex-auto text-center text-white"
+      />
       <div class="column text-right">
         <span
           v-text="
@@ -28,7 +26,7 @@
         <a
           @click="openReceiptModal(vote)"
           target="_blank"
-          class="ml-3"
+          class="ml-3 text-gray"
           title="Receipt"
         >
           <Icon name="signature" />
@@ -38,7 +36,7 @@
     <a
       v-if="!showAllVotes && Object.keys(votes).length > 10"
       @click="showAllVotes = true"
-      class="px-4 py-3 border-top text-center d-block text-white bg-gray-dark"
+      class="px-4 py-3 border-top text-center d-block bg-gray-dark"
     >
       See more
     </a>

diff --git a/src/components/Modal/About.vue b/src/components/Modal/About.vue
@@ -2,13 +2,28 @@
   <UiModal :open="open" @close="$emit('close')">
     <h3 class="m-4 mb-0 text-center">About</h3>
     <div class="m-4 mb-0 p-4 border rounded-2 text-white">
+      <div class="d-flex">
+        <span v-text="'Version'" class="flex-auto text-gray mr-1" />
+        {{ pkg.version }}
+      </div>
+      <div class="d-flex">
+        <span v-text="'License'" class="flex-auto text-gray mr-1" />
+        {{ pkg.license }}
+      </div>
       <div class="d-flex">
         <span v-text="'Network'" class="flex-auto text-gray mr-1" />
         {{ network === 'homestead' ? 'mainnet' : network }}
       </div>
       <div class="d-flex">
         <span v-text="'Block number'" class="flex-auto text-gray mr-1" />
-        {{ web3.blockNumber }}
+        <a
+          :href="_etherscanLink(web3.blockNumber, 'block')"
+          target="_blank"
+          class="float-right"
+        >
+          {{ $n(web3.blockNumber) }}
+          <Icon name="external-link" class="ml-1" />
+        </a>
       </div>
       <div class="d-flex">
         <span v-text="'IPFS server'" class="flex-auto text-gray mr-1" />

diff --git a/src/components/Modal/Confirm.vue b/src/components/Modal/Confirm.vue
@@ -5,7 +5,7 @@
       <div class="m-4 flex-auto text-center">
         <h4>Are you sure you want to vote for this option?</h4>
         <h4>This action <b>cannot</b> be undone.</h4>
-        <h4 class="p-3 my-3 border rounded-2 text-white">
+        <h4 class="p-3 my-3 border rounded-2">
           Option {{ selectedChoice }}:
           {{ proposal.msg.payload.choices[selectedChoice - 1] }}
         </h4>
@@ -42,13 +42,16 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['vote']),
+    ...mapActions(['send']),
     async handleSubmit() {
       this.loading = true;
-      await this.vote({
+      await this.send({
         token: this.token,
-        proposal: this.id,
-        choice: this.selectedChoice
+        type: 'vote',
+        payload: {
+          proposal: this.id,
+          choice: this.selectedChoice
+        }
       });
       this.$emit('reload');
       this.$emit('close');

diff --git a/src/components/Modal/SelectDate.vue b/src/components/Modal/SelectDate.vue
@@ -0,0 +1,23 @@
+<template>
+  <UiModal :open="open" @close="$emit('close')">
+    <h3 class="m-4 text-center">Select a date</h3>
+    <div class="modal-body">
+      <UiCalendar
+        @input="[$emit('input', input), $emit('close')]"
+        v-model="input"
+        class="mx-auto mb-7"
+      />
+    </div>
+  </UiModal>
+</template>
+
+<script>
+export default {
+  props: ['open'],
+  data() {
+    return {
+      input: ''
+    };
+  }
+};
+</script>