Merge pull request #1092 from alajko/allkeys

update one key

consensus/consensus.go

@@ -16,6 +16,7 @@ import (
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/types"
 	bls_cosi "github.com/harmony-one/harmony/crypto/bls"
+	common2 "github.com/harmony-one/harmony/internal/common"
 	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
 	"github.com/harmony-one/harmony/internal/ctxerror"
 	"github.com/harmony-one/harmony/internal/genesis"
@@ -351,7 +352,7 @@ func accumulateRewards(
 		}
 		numAccounts++
 		account := member.EcdsaAddress
-		signers = append(signers, account.Hex())
+		signers = append(signers, common2.MustAddressToBech32(account))
 		state.AddBalance(account, BlockReward)
 		totalAmount = new(big.Int).Add(totalAmount, BlockReward)
 	}

internal/genesis/foundational.go

@@ -24,8 +24,8 @@ var GenesisFNAccounts = [...]DeployAccount{
 	{Index: "19", Address: "one1s7s40ku4ms63066h34xwmm5j5k4jwk74gml5nx", BlsPublicKey: "9b58fac96afe10ad8832c1752ef35c7169826aeb05505e25002320e63e6200a9c9bc10233a9a258797084122d4b2a411"},
 	{Index: "20", Address: "one1zgmd5s6fyv9rm2vuf3augqf3ucnp9a2j0h09u3", BlsPublicKey: "15efd5a3af35b9fca2b0e7264b585b47b0f08d9658ac11df3ee5237be634d2fbfa610bf9bd8eef5fecb38828e250340d"},
 	{Index: "21", Address: "one10dw0xnkm6qvpmsmeszw5wn29et9jmek9sc6dmw", BlsPublicKey: "3f9c6d55095433092416ed39bcac4fb1c7aee67f7b658c09266201a094708f7101ae8dfdddca13ed3021ca798f731992"},
-	{Index: "22", Address: "one1ldthk5zyrea6w60rptcfyzlftd8fsn9fhkeps7", BlsPublicKey: "0xe4727b3185b807983d2775983f5a6c269736b7000ff6ff4435354473ff0539707ff4584f5b2b7fb1f7275271e34ac88c"},
-	{Index: "23", Address: "one17nacqwrnwgq7pk8eehn7j6jphxt0draqpkztpf", BlsPublicKey: "0x249b2776b64f0fb04fb76f184da218541b727970e9ae3b79e1dd0ed673567a5fd8c4870cf604eb14c5a004972d5f5f13"},
+	{Index: "22", Address: "one1ldthk5zyrea6w60rptcfyzlftd8fsn9fhkeps7", BlsPublicKey: "e4727b3185b807983d2775983f5a6c269736b7000ff6ff4435354473ff0539707ff4584f5b2b7fb1f7275271e34ac88c"},
+	{Index: "23", Address: "one17nacqwrnwgq7pk8eehn7j6jphxt0draqpkztpf", BlsPublicKey: "249b2776b64f0fb04fb76f184da218541b727970e9ae3b79e1dd0ed673567a5fd8c4870cf604eb14c5a004972d5f5f13"},
 	{Index: "24", Address: "one16ru662mq0yh6lup030g09kwwy7g8yfcxc5fcfp", BlsPublicKey: "d35d26c704c0094abf6c1b19e1d6ea6021eb20bf347e9c20ff5a710bde93e9d41977ba6eb5191809758cceff59132508"},
 	{Index: "25", Address: "one1mk6g87mtgcyy95xp0v87q0srggmusp950gpn3w", BlsPublicKey: "325c13b66bb05cbd7ec95d78e754cde2afdfef83490253ba96a64b3be73fb862bab57dadd42816462a0aafa48fa08d06"},
 	{Index: "26", Address: "one16295hjtqyr0z22swaqthv7mvmvn2gltnj5gera", BlsPublicKey: "fca5bb8c78055a4927bb3b8e60917e87dffd00d5f4a818111113c6ddff4e4af69f0d878a49c8f39c0842c15b40d0d603"},
@@ -51,7 +51,7 @@ var GenesisFNAccounts = [...]DeployAccount{
 	{Index: "46", Address: "one12zelq8ax3k48tfzl5zz37ndknremq6um62dwxa", BlsPublicKey: "0171f68b35f45281222ff9008d40301d20fb5c328fd8126cf24f50f15b879b818c14b4f98b58ad7864cb75509993190b"},
 	{Index: "47", Address: "one1df4tldae3amrkyrf96tg9pqccjvkjetattl4w8", BlsPublicKey: "3fc212e1bb7594018c0882d2aa1818e9401209f8e41cdee613fd6bec096872d55c01ea02e091063f6ce49dbca49b3f14"},
 	{Index: "48", Address: "one1yeay879a7dln5ltnchytx8eennpz332qn7yjx3", BlsPublicKey: "ad94bb49728b51a77b8912e70e260b37b8dab638988ead18413f772546944e2b42370e570cc1e01a862de82c1e7b0081"},
-	{Index: "49", Address: "one1thzdvxjya045z4ysyy6z52gt6unxyw3c2wzjrr", BlsPublicKey: "61ab5ea474ad05b00e173aa0e62ce8539feea043d086b9b445a12b558dc4b1221a352b2debad01447144f1934acc398f"},
+	{Index: "49", Address: "one19r5zqdc6a3lud076rd90xgquptqd5sgcr7wr6d", BlsPublicKey: "61ab5ea474ad05b00e173aa0e62ce8539feea043d086b9b445a12b558dc4b1221a352b2debad01447144f1934acc398f"},
 	{Index: "50", Address: "one1tqwwn2rh58fjafysl9rgpxjgjz8wdjmqgdwlv3", BlsPublicKey: "7534285f7b04f505ff327e592370b6687d9dcc18e6fdd29bd97b54fdb13139113d715e76982fd9594ca876ecfd50fa11"},
 	{Index: "51", Address: "one15n4k4d7cw5wyyf3pt3fnwuvcweuxmmq0knpnyh", BlsPublicKey: "04bd80917f8a95b5074eeb3e413f810585eed1974057080d7f1422928113d3cb8a36d6d8e665dae71148a28d74d59b95"},
 	{Index: "52", Address: "one18ky073zdrrmme3fs7h63wyzguuj6a3uukuc3gk", BlsPublicKey: "457e99a40be9356c4acc53f02de4480927e0c6c0733087a46f53b59744affb2776700625370c09bf4e778e715a5f6e8a"},
@@ -136,4 +136,6 @@ var GenesisFNAccounts = [...]DeployAccount{
 	{Index: "131", Address: "one1ljvq9tkvfp583zzl85mgjh3qjvjufnuwmn7krv", BlsPublicKey: "37644619ae24ffa2ab63dde85f8116effddaa500c6e28c57a5f100cb8a97262ed97f671d903a9c32a53301eec1100b96"},
 	{Index: "132", Address: "one12c23ekslj469g0g0tu9jcvecfkla7rahmrhe37", BlsPublicKey: "19101de3d0578c3146a1904f25a3344a998dcb0a18433dc5cc977d05f378676b0652b4a64fa8dff6c819cfd52dc94c14"},
 	{Index: "133", Address: "one19l9equxmql4jkcah8g4f6qva732npajarffj6q", BlsPublicKey: "f531f442dc19d2967fbcdcab68e77b16bc49cd05698ed8a56b39f3704315915c2b2b0175be6982be7238290b3504d487"},
+	{Index: "134", Address: "one1wzcaddcvcv5uzh9pwzf4yj3tjyggytg047nh5e", BlsPublicKey: "973b7982df903ead1b26ef85d09aa240793be520a55e886bfcd03cfd34eae138bfb4fd5f6342c9bc3e091206c5743b81"},
+	{Index: "135", Address: "one1j2z4vp5eash0307hgmqf7carunc4rj5q7nnh27", BlsPublicKey: "d74a4ed86677cf82b585d973b12c7cb40ec53115cbd87ec6f1f1cd2abddad1ba0ec9b0f6066b48632084a299025e8806"},
 }