protoc and update everything

example/kvstore/helpers.go

@@ -8,9 +8,12 @@ import (
 // RandVal creates one random validator, with a key derived
 // from the input value
 func RandVal(i int) types.Validator {
-	pubkey := cmn.RandBytes(33)
+	addr := cmn.RandBytes(20)
+	pubkey := cmn.RandBytes(32)
 	power := cmn.RandUint16() + 1
-	return types.Validator{pubkey, int64(power)}
+	v := types.Ed25519Validator(pubkey, int64(power))
+	v.Address = addr
+	return v
 }
 
 // RandVals returns a list of cnt validators for initializing

example/kvstore/kvstore_test.go

@@ -198,7 +198,7 @@ func valsEqual(t *testing.T, vals1, vals2 []types.Validator) {
 	sort.Sort(types.Validators(vals2))
 	for i, v1 := range vals1 {
 		v2 := vals2[i]
-		if !bytes.Equal(v1.PubKey, v2.PubKey) ||
+		if !bytes.Equal(v1.PubKey.Data, v2.PubKey.Data) ||
 			v1.Power != v2.Power {
 			t.Fatalf("vals dont match at index %d. got %X/%d , expected %X/%d", i, v2.PubKey, v2.Power, v1.PubKey, v1.Power)
 		}

example/kvstore/persistent_kvstore.go

@@ -129,15 +129,16 @@ func (app *PersistentKVStoreApplication) Validators() (validators []types.Valida
 	return
 }
 
-func MakeValSetChangeTx(pubkey []byte, power int64) []byte {
-	return []byte(cmn.Fmt("val:%X/%d", pubkey, power))
+func MakeValSetChangeTx(pubkey types.PubKey, power int64) []byte {
+	return []byte(cmn.Fmt("val:%X/%d", pubkey.Data, power))
 }
 
 func isValidatorTx(tx []byte) bool {
 	return strings.HasPrefix(string(tx), ValidatorSetChangePrefix)
 }
 
-// format is "val:pubkey1/power1,addr2/power2,addr3/power3"tx
+// format is "val:pubkey/power"
+// pubkey is raw 32-byte ed25519 key
 func (app *PersistentKVStoreApplication) execValidatorTx(tx []byte) types.ResponseDeliverTx {
 	tx = tx[len(ValidatorSetChangePrefix):]
 
@@ -150,19 +151,13 @@ func (app *PersistentKVStoreApplication) execValidatorTx(tx []byte) types.Respon
 	}
 	pubkeyS, powerS := pubKeyAndPower[0], pubKeyAndPower[1]
 
-	// decode the pubkey, ensuring its go-crypto encoded
+	// decode the pubkey
 	pubkey, err := hex.DecodeString(pubkeyS)
 	if err != nil {
 		return types.ResponseDeliverTx{
 			Code: code.CodeTypeEncodingError,
 			Log:  fmt.Sprintf("Pubkey (%s) is invalid hex", pubkeyS)}
 	}
-	/*_, err = crypto.PubKeyFromBytes(pubkey)
-	if err != nil {
-		return types.ResponseDeliverTx{
-			Code: code.CodeTypeEncodingError,
-			Log:  fmt.Sprintf("Pubkey (%X) is invalid go-crypto encoded", pubkey)}
-	}*/
 
 	// decode the power
 	power, err := strconv.ParseInt(powerS, 10, 64)
@@ -173,12 +168,12 @@ func (app *PersistentKVStoreApplication) execValidatorTx(tx []byte) types.Respon
 	}
 
 	// update
-	return app.updateValidator(types.Validator{pubkey, power})
+	return app.updateValidator(types.Ed25519Validator(pubkey, int64(power)))
 }
 
 // add, update, or remove a validator
 func (app *PersistentKVStoreApplication) updateValidator(v types.Validator) types.ResponseDeliverTx {
-	key := []byte("val:" + string(v.PubKey))
+	key := []byte("val:" + string(v.PubKey.Data))
 	if v.Power == 0 {
 		// remove validator
 		if !app.app.state.db.Has(key) {