chore(backport): Backport Tenderdash 0.7 to 0.8

abci/example/kvstore/helpers.go

@@ -1,16 +1,17 @@
 package kvstore
 
 import (
- types2 "github.com/tendermint/tendermint/types"
+ tmtypes "github.com/tendermint/tendermint/types"
 
  "github.com/tendermint/tendermint/abci/types"
  "github.com/tendermint/tendermint/crypto"
  "github.com/tendermint/tendermint/crypto/bls12381"
  cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
 )
 
-func ValUpdate(pubKey crypto.PubKey, proTxHash crypto.ProTxHash) types.ValidatorUpdate {
- return types.UpdateValidator(proTxHash, pubKey.Bytes(), types2.DefaultDashVotingPower)
+func ValUpdate(
+ pubKey crypto.PubKey, proTxHash crypto.ProTxHash, address tmtypes.ValidatorAddress) types.ValidatorUpdate {
+ return types.UpdateValidator(proTxHash, pubKey.Bytes(), tmtypes.DefaultDashVotingPower, address.String())
 }
 
 // RandValidatorSetUpdate returns a list of cnt validators for initializing
@@ -21,7 +22,7 @@ func RandValidatorSetUpdate(cnt int) types.ValidatorSetUpdate {
 
  privKeys, proTxHashes, thresholdPublicKey := bls12381.CreatePrivLLMQDataDefaultThreshold(cnt)
  for i := 0; i < cnt; i++ {
- res[i] = ValUpdate(privKeys[i].PubKey(), proTxHashes[i])
+ res[i] = ValUpdate(privKeys[i].PubKey(), proTxHashes[i], tmtypes.RandValidatorAddress())
  }
  thresholdPublicKeyABCI, err := cryptoenc.PubKeyToProto(thresholdPublicKey)
  if err != nil {

abci/example/kvstore/kvstore_test.go

@@ -183,9 +183,9 @@ func makeApplyBlock(
  }
 
  kvstore.BeginBlock(types.RequestBeginBlock{Hash: hash, Header: header})
- for _, tx := range txs {
+ for i, tx := range txs {
  if r := kvstore.DeliverTx(types.RequestDeliverTx{Tx: tx}); r.IsErr() {
- t.Fatal(r)
+ t.Fatal(fmt.Sprintf("i=%d, tx=%s, err=%s", i, tx, r.String()))
  }
  }
  resEndBlock := kvstore.EndBlock(types.RequestEndBlock{Height: header.Height})

abci/example/kvstore/persistent_kvstore.go

@@ -108,7 +108,7 @@ func (app *PersistentKVStoreApplication) Query(reqQuery types.RequestQuery) (res
 
  return resQuery
  case "/val":
- key := []byte("val:" + string(reqQuery.Data))
+ key := []byte(valSetTxKey(string(reqQuery.Data)))
  value, err := app.app.state.db.Get(key)
  if err != nil {
  panic(err)
@@ -233,6 +233,12 @@ func (app *PersistentKVStoreApplication) ValidatorSet() (validatorSet types.Vali
  return validatorSet
 }
 
+// valSetTxKey generates a key for validator set change transaction, like:
+// `val:BASE64ENCODINGOFPROTXHASH`
+func valSetTxKey(proTxHashBase64 string) string {
+ return ValidatorSetChangePrefix + proTxHashBase64
+}
+
 func MakeValSetChangeTx(proTxHash []byte, pubkey *cryptoproto.PublicKey, power int64) []byte {
  pubStr := ""
  if pubkey != nil {
@@ -243,12 +249,11 @@ func MakeValSetChangeTx(proTxHash []byte, pubkey *cryptoproto.PublicKey, power i
  pubStr = base64.StdEncoding.EncodeToString(pk.Bytes())
  }
  proTxHashStr := base64.StdEncoding.EncodeToString(proTxHash)
- return []byte(fmt.Sprintf("val:%s!%s!%d", proTxHashStr, pubStr, power))
+ return []byte(valSetTxKey(proTxHashStr) + "!" + pubStr + "!" + strconv.FormatInt(power, 10))
 }
 
 func MakeValSetRemovalTx(proTxHash []byte) []byte {
- proTxHashStr := base64.StdEncoding.EncodeToString(proTxHash)
- return []byte(fmt.Sprintf("val:%s!!%d", proTxHashStr, 0))
+ return MakeValSetChangeTx(proTxHash, nil, 0)
 }
 
 func MakeThresholdPublicKeyChangeTx(thresholdPublicKey cryptoproto.PublicKey) []byte {
@@ -317,7 +322,7 @@ func (app *PersistentKVStoreApplication) execValidatorTx(tx []byte) types.Respon
  Code: code.CodeTypeEncodingError,
  Log: fmt.Sprintf("Power (%s) is not an int", powerS)}
  }
- return app.updateValidatorSet(types.UpdateValidator(proTxHash, pubkey, power))
+ return app.updateValidatorSet(types.UpdateValidator(proTxHash, pubkey, power, ""))
 }
 
 // format is "tpk:pubkey"
@@ -364,7 +369,7 @@ func (app *PersistentKVStoreApplication) updateValidatorSet(v types.ValidatorUpd
  if v.ProTxHash == nil {
  panic(fmt.Errorf("proTxHash can not be nil"))
  }
- key := []byte("val:" + string(v.ProTxHash))
+ key := []byte(valSetTxKey(string(v.ProTxHash)))
 
  if v.Power == 0 {
  // remove validator

abci/tests/server/client.go

@@ -23,7 +23,7 @@ func InitChain(client abcicli.Client) error {
  pubkey := privKeys[i].PubKey().Bytes()
  proTxHash := proTxHashes[i]
  power := 100
- vals[i] = types.UpdateValidator(proTxHash, pubkey, int64(power))
+ vals[i] = types.UpdateValidator(proTxHash, pubkey, int64(power), "")
  }
  abciThresholdPublicKey, err := encoding.PubKeyToProto(thresholdPublicKey)
  if err != nil {

abci/types/pubkey.go

@@ -7,13 +7,15 @@ import (
  crypto2 "github.com/tendermint/tendermint/proto/tendermint/crypto"
 )
 
-func UpdateValidator(proTxHash []byte, pk []byte, power int64) ValidatorUpdate {
+func UpdateValidator(proTxHash crypto.ProTxHash, pubkeyBytes []byte, power int64, nodeAddress string) ValidatorUpdate {
  valUpdate := ValidatorUpdate{
- Power: power,
- ProTxHash: proTxHash,
+ Power: power,
+ ProTxHash: proTxHash,
+ NodeAddress: nodeAddress,
  }
- if len(pk) > 0 {
- pke := bls12381.PubKey(pk)
+
+ if len(pubkeyBytes) > 0 {
+ pke := bls12381.PubKey(pubkeyBytes)
  pkp, err := cryptoenc.PubKeyToProto(pke)
  if err != nil {
  panic(err)