Merge PR #1168: Governance MVP

docs/spec/governance/state.md

@@ -31,8 +31,7 @@ const (
 type Procedure struct {
   VotingPeriod      int64               //  Length of the voting period. Initial value: 2 weeks
   MinDeposit        int64               //  Minimum deposit for a proposal to enter voting period. 
-  VoteTypes         []VoteType          //  Vote types available to voters. 
-  ProposalTypes     []ProposalType      //  Proposal types available to submitters. 
+  ProposalTypes     []string            //  Types available to submitters. {PlainTextProposal, SoftwareUpgradeProposal}
   Threshold         rational.Rational   //  Minimum propotion of Yes votes for proposal to pass. Initial value: 0.5
   Veto              rational.Rational   //  Minimum value of Veto votes to Total votes ratio for proposal to be vetoed. Initial value: 1/3
   MaxDepositPeriod  int64               //  Maximum period for Atom holders to deposit on a proposal. Initial value: 2 months

docs/spec/governance/transactions.md

@@ -183,8 +183,8 @@ vote on the proposal.
 ```go
   type TxGovVote struct {
     ProposalID           int64           //  proposalID of the proposal
-    Option               string          //  option from OptionSet chosen by the voter
-    Address      crypto.address //  Address of the validator voter wants to tie its vote to
+    Option               string          //  option chosen by the voter
+    ValidatorAddress      crypto.address //  Address of the validator voter wants to tie its vote to
   }
 ```
 
@@ -224,17 +224,15 @@ handled:
       throw
     
     validator = load(CurrentValidators, txGovVote.Address)
-    
-    if  !proposal.InitProcedure.OptionSet.includes(txGovVote.Option) OR 
-        (validator == nil) then 
-     
-      // Throws if
-      // Option is not in Option Set of procedure that was active when vote opened OR if
-      // Address is not the address of a current validator
-      
-      throw
-      
-    option = load(Options, <txGovVote.ProposalID>:<sender>:<txGovVote.Address>)
+        if (validator == nil) then 
+         
+          // Throws if
+          // ValidatorAddress is not the address of a current validator
+          
+          throw
+          
+        else
+           option = load(Options, <txGovVote.ProposalID>:<sender>:<txGovVote.ValidatorAddress>)
 
     if (option != nil)
      // sender has already voted with the Atoms bonded to Address