Merge pull request #656 from oasisprotocol/andrew7234/vote-round-time…

…stamp

[consensus] add height/timestamp to governance votes

analyzer/consensus/consensus.go

@@ -1008,6 +1008,7 @@ func (m *processor) queueVotes(batch *storage.QueryBatch, data *governanceData)
 			vote.ID,
 			vote.Submitter.String(),
 			vote.Vote,
+			data.Height,
 		)
 	}
 

analyzer/queries/queries.go

@@ -415,10 +415,11 @@ var (
       WHERE id = $1`
 
 	ConsensusVoteUpsert = `
-    INSERT INTO chain.votes (proposal, voter, vote)
-      VALUES ($1, $2, $3)
+    INSERT INTO chain.votes (proposal, voter, vote, height)
+      VALUES ($1, $2, $3, $4)
     ON CONFLICT (proposal, voter) DO UPDATE SET
-	    vote = excluded.vote;`
+	    vote = excluded.vote,
+      height = excluded.height;`
 
 	RuntimeBlockInsert = `
     INSERT INTO chain.runtime_blocks (runtime, round, version, timestamp, block_hash, prev_block_hash, io_root, state_root, messages_hash, in_messages_hash, num_transactions, gas_used, size)

api/spec/v1.yaml

@@ -2178,6 +2178,16 @@ components:
           type: string
           description: The vote cast.
           example: 'yes'
+        height:
+          type: integer
+          format: int64
+          description: The block height at which this vote was recorded.
+          example: *block_height_1
+        timestamp:
+          type: string
+          format: date-time
+          description: The second-granular consensus time of the block in which this vote was cast.
+          example: *iso_timestamp_1
 
     RuntimeBlockList:
       allOf:

storage/client/client.go

@@ -1054,6 +1054,8 @@ func (c *StorageClient) ProposalVotes(ctx context.Context, proposalID uint64, p
 		if err := res.rows.Scan(
 			&v.Address,
 			&v.Vote,
+			&v.Height,
+			&v.Timestamp,
 		); err != nil {
 			return nil, wrapError(err)
 		}

storage/client/queries/queries.go

@@ -246,10 +246,11 @@ const (
 			WHERE id = $1::bigint`
 
 	ProposalVotes = `
-		SELECT voter, vote
-			FROM chain.votes
+		SELECT votes.voter, votes.vote, votes.height, blocks.time
+			FROM chain.votes as votes
+			LEFT JOIN chain.blocks as blocks ON votes.height = blocks.height
 			WHERE proposal = $1::bigint
-		ORDER BY proposal DESC
+		ORDER BY height DESC, voter ASC
 		LIMIT $2::bigint
 		OFFSET $3::bigint`
 

storage/migrations/11_governance_votes.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE chain.votes
+    ADD COLUMN height UINT63; -- Can be NULL; when the vote comes from a genesis file, height is unknown.
+
+COMMIT;