From 95f11459f02bd20df5676fc1cbfc99eec3dcf4ab Mon Sep 17 00:00:00 2001 From: Rongjian Lan Date: Wed, 31 Jul 2019 13:13:23 -0700 Subject: [PATCH 1/7] Add test for validator info --- internal/genesis/foundational.go | 2 +- internal/genesis/genesis_test.go | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/internal/genesis/foundational.go b/internal/genesis/foundational.go index d2161ee04..2ff7b915b 100644 --- a/internal/genesis/foundational.go +++ b/internal/genesis/foundational.go @@ -316,7 +316,7 @@ var FoundationalNodeAccountsV0_1 = []DeployAccount{ {Index: "155", Address: "one10uyfuzaztcccz97w29v0k64rzmhj4k862kfh5q", BlsPublicKey: "e75e5a222bd9e9004385d593194606f48b3e6bf8a95c68830ea1cd8f56bbcdedcb680c9598c66230ea0c2b79a6c58296"}, {Index: "156", Address: "one1s3dx73sa5dzrksmds5recptale8pxsa4d4hzt4", BlsPublicKey: "87d4f6c37073a108b94a6e7799f62b2051c44892328bdcb8e5dd4f4596b1ba2952947c744b5daf183e9f8361282c9101"}, {Index: "157", Address: "one1vfglvsfuk52025r5apqlfaqky37462tsdjeemf", BlsPublicKey: "6d320742fbff3aa1877aadb9316a865edbdecb0fb74fc973272d73ec1deaff131b653c3ab7a2b26753c717347f450a00"}, - {Index: "158", Address: "one1pjn8zz5av5ddenaxmu6qrs381xuapygkeatxga", BlsPublicKey: "71c907378831009328f28db0e324848767b58e49eae1f2774e81276e25732bfea5ed8a567fed15afb010be05b9732b16"}, + {Index: "158", Address: "one1pjn8zz5av5ddenaxmu6qrs38lxuapygkeatxga", BlsPublicKey: "71c907378831009328f28db0e324848767b58e49eae1f2774e81276e25732bfea5ed8a567fed15afb010be05b9732b16"}, {Index: "159", Address: "one1fzh923dkauvyye7w68nc38j2dw54gldu5mheaz", BlsPublicKey: "b5c94a5071f942c77f3599098430b8f2dbd6da70c5ef830192bdef5638908cd1fa188059d7aecc8b721116b946c4cc8e"}, } diff --git a/internal/genesis/genesis_test.go b/internal/genesis/genesis_test.go index ce518b2f8..b2938271a 100644 --- a/internal/genesis/genesis_test.go +++ b/internal/genesis/genesis_test.go @@ -4,7 +4,12 @@ import ( "bufio" "fmt" "os" + "strconv" + "strings" "testing" + + "github.com/btcsuite/btcutil/bech32" + "github.com/harmony-one/bls/ffi/go/bls" ) func TestString(t *testing.T) { @@ -43,3 +48,33 @@ func testGenesisccounts(t *testing.T) { index++ } } + +func TestCommitteeAccounts(test *testing.T) { + testAccounts(test, FoundationalNodeAccounts) + testAccounts(test, FoundationalNodeAccountsV1) + testAccounts(test, HarmonyAccounts) + testAccounts(test, TNHarmonyAccounts) + testAccounts(test, TNFoundationalAccounts) +} + +func testAccounts(test *testing.T, accounts []DeployAccount) { + index := 0 + for _, account := range accounts { + accIndex, _ := strconv.Atoi(strings.Trim(account.Index, " ")) + if accIndex != index { + test.Error("Account index not in sequence", account.Index) + } + index++ + + _, _, err := bech32.Decode(account.Address) + if err != nil { + test.Error("Account address is not valid bech32 address", err) + } + + pubKey := bls.PublicKey{} + err = pubKey.DeserializeHexStr(account.BlsPublicKey) + if err != nil { + test.Error("Account bls public key is not valid", err) + } + } +} From e6c7b48e2625ec19b63cb57ccf3e7f0a63920880 Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Sun, 11 Aug 2019 23:06:30 +0000 Subject: [PATCH 2/7] Fix typo :) --- consensus/view_change.go | 2 +- node/node_explorer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/consensus/view_change.go b/consensus/view_change.go index 99aa58b1c..b52454d30 100644 --- a/consensus/view_change.go +++ b/consensus/view_change.go @@ -55,7 +55,7 @@ func (mode Mode) String() string { } else if mode == ViewChanging { return "ViewChanging" } else if mode == Syncing { - return "Sycning" + return "Syncing" } else if mode == Listening { return "Listening" } diff --git a/node/node_explorer.go b/node/node_explorer.go index 8a94727cf..7cc85d6cb 100644 --- a/node/node_explorer.go +++ b/node/node_explorer.go @@ -105,7 +105,7 @@ func (node *Node) AddNewBlockForExplorer() { if err := node.AddNewBlock(blocks[0]); err == nil { // Clean up the blocks to avoid OOM. node.Consensus.PbftLog.DeleteBlockByNumber(blocks[0].NumberU64()) - // Do dump all blocks from state sycning for explorer one time + // Do dump all blocks from state syncing for explorer one time // TODO: some blocks can be dumped before state syncing finished. // And they would be dumped again here. Please fix it. once.Do(func() { From 8f1f2726b78b48d2c61adfbdca668b9f086465cf Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Sun, 11 Aug 2019 10:13:21 +0000 Subject: [PATCH 3/7] Increase download register timeout "Register failed" seems to trigger too easily --- api/service/syncing/downloader/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/service/syncing/downloader/client.go b/api/service/syncing/downloader/client.go index 20b3e2302..fc2ddae00 100644 --- a/api/service/syncing/downloader/client.go +++ b/api/service/syncing/downloader/client.go @@ -72,7 +72,7 @@ func (client *Client) GetBlocks(hashes [][]byte) *pb.DownloaderResponse { // Register will register node's ip/port information to peers receive newly created blocks in future // hash is the bytes of "ip:port" string representation func (client *Client) Register(hash []byte, ip, port string) *pb.DownloaderResponse { - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() request := &pb.DownloaderRequest{Type: pb.DownloaderRequest_REGISTER} request.PeerHash = make([]byte, len(hash)) From fe09f62035ba6353b3dc57d7ece6de134ed3ffcc Mon Sep 17 00:00:00 2001 From: Nye Liu Date: Sun, 11 Aug 2019 09:37:28 +0000 Subject: [PATCH 4/7] Add target to errors so we know the misbehaving endpoint --- api/service/syncing/downloader/client.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/service/syncing/downloader/client.go b/api/service/syncing/downloader/client.go index fc2ddae00..0a174b149 100644 --- a/api/service/syncing/downloader/client.go +++ b/api/service/syncing/downloader/client.go @@ -47,7 +47,7 @@ func (client *Client) GetBlockHashes(startHash []byte, size uint32) *pb.Download request := &pb.DownloaderRequest{Type: pb.DownloaderRequest_HEADER, BlockHash: startHash, Size: size} response, err := client.dlClient.Query(ctx, request) if err != nil { - utils.Logger().Error().Err(err).Msg("[SYNC] GetBlockHashes query failed") + utils.Logger().Error().Err(err).Str("target", client.conn.Target()).Msg("[SYNC] GetBlockHashes query failed") } return response } @@ -64,7 +64,7 @@ func (client *Client) GetBlocks(hashes [][]byte) *pb.DownloaderResponse { } response, err := client.dlClient.Query(ctx, request) if err != nil { - utils.Logger().Error().Err(err).Msg("[SYNC] downloader/client.go:GetBlocks query failed") + utils.Logger().Error().Err(err).Str("target", client.conn.Target()).Msg("[SYNC] downloader/client.go:GetBlocks query failed") } return response } @@ -81,7 +81,7 @@ func (client *Client) Register(hash []byte, ip, port string) *pb.DownloaderRespo request.Port = port response, err := client.dlClient.Query(ctx, request) if err != nil || response == nil { - utils.Logger().Error().Err(err).Interface("response", response).Msg("[SYNC] client.go:Register failed") + utils.Logger().Error().Err(err).Str("target", client.conn.Target()).Interface("response", response).Msg("[SYNC] client.go:Register failed") } return response } @@ -103,7 +103,7 @@ func (client *Client) PushNewBlock(selfPeerHash [20]byte, blockHash []byte, time response, err := client.dlClient.Query(ctx, request) if err != nil { - utils.Logger().Error().Err(err).Msg("[SYNC] unable to send new block to unsync node") + utils.Logger().Error().Err(err).Str("target", client.conn.Target()).Msg("[SYNC] unable to send new block to unsync node") } return response } From 0584f3009db077b64e422a93eb1edfc80cf9d710 Mon Sep 17 00:00:00 2001 From: Christopher Liu Date: Sat, 10 Aug 2019 17:22:18 -0700 Subject: [PATCH 5/7] [Pangaea] Add Pangaea profile to wallet.ini (#1327) Also add more bootnodes to default, and replace devnet with beta. Betanet does not have official dns_zone, so currently using b.hmny.io. - Add generated go file --- .hmy/wallet.ini | 56 +++++++++++++++++------ cmd/client/wallet/generated_wallet.ini.go | 56 +++++++++++++++++------ 2 files changed, 82 insertions(+), 30 deletions(-) diff --git a/.hmy/wallet.ini b/.hmy/wallet.ini index d873fb57e..6629556e1 100644 --- a/.hmy/wallet.ini +++ b/.hmy/wallet.ini @@ -1,6 +1,8 @@ [default] bootnode = /ip4/100.26.90.187/tcp/9874/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv bootnode = /ip4/54.213.43.194/tcp/9874/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/13.113.101.219/tcp/12019/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX +bootnode = /ip4/99.81.170.167/tcp/12019/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj shards = 4 [default.shard0.rpc] @@ -33,23 +35,47 @@ rpc = 127.0.0.1:14556 rpc = 127.0.0.1:14558 rpc = 127.0.0.1:14560 -[devnet] -bootnode = /ip4/100.26.90.187/tcp/9871/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv -bootnode = /ip4/54.213.43.194/tcp/9871/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj +[beta] +bootnode = /ip4/54.213.43.194/tcp/9868/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/100.26.90.187/tcp/9868/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv +bootnode = /ip4/13.113.101.219/tcp/12018/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX shards = 4 -[devnet.shard0.rpc] -rpc = l0.t1.hmny.io:14555 -rpc = s0.t1.hmny.io:14555 +[beta.shard0.rpc] +rpc = l0.b.hmny.io:14555 +rpc = s0.b.hmny.io:14555 -[devnet.shard1.rpc] -rpc = l1.t1.hmny.io:14555 -rpc = s1.t1.hmny.io:14555 +[beta.shard1.rpc] +rpc = l1.b.hmny.io:14555 +rpc = s1.b.hmny.io:14555 -[devnet.shard2.rpc] -rpc = l2.t1.hmny.io:14555 -rpc = s2.t1.hmny.io:14555 +[beta.shard2.rpc] +rpc = l2.b.hmny.io:14555 +rpc = s2.b.hmny.io:14555 -[devnet.shard3.rpc] -rpc = l3.t1.hmny.io:14555 -rpc = s3.t1.hmny.io:14555 +[beta.shard3.rpc] +rpc = l3.b.hmny.io:14555 +rpc = s3.b.hmny.io:14555 + +[pangaea] +bootnode = /ip4/100.26.90.187/tcp/9867/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv +bootnode = /ip4/54.213.43.194/tcp/9867/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/13.113.101.219/tcp/9867/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX +bootnode = /ip4/99.81.170.167/tcp/9867/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj +shards = 4 + +[pangaea.shard0.rpc] +rpc = l0.p.hmny.io:14555 +rpc = s0.p.hmny.io:14555 + +[pangaea.shard1.rpc] +rpc = l1.p.hmny.io:14555 +rpc = s1.p.hmny.io:14555 + +[pangaea.shard2.rpc] +rpc = l2.p.hmny.io:14555 +rpc = s2.p.hmny.io:14555 + +[pangaea.shard3.rpc] +rpc = l3.p.hmny.io:14555 +rpc = s3.p.hmny.io:14555 diff --git a/cmd/client/wallet/generated_wallet.ini.go b/cmd/client/wallet/generated_wallet.ini.go index b1ed56eff..69c9ddf10 100644 --- a/cmd/client/wallet/generated_wallet.ini.go +++ b/cmd/client/wallet/generated_wallet.ini.go @@ -4,6 +4,8 @@ const ( defaultWalletIni = `[default] bootnode = /ip4/100.26.90.187/tcp/9874/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv bootnode = /ip4/54.213.43.194/tcp/9874/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/13.113.101.219/tcp/12019/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX +bootnode = /ip4/99.81.170.167/tcp/12019/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj shards = 4 [default.shard0.rpc] @@ -36,25 +38,49 @@ rpc = 127.0.0.1:14556 rpc = 127.0.0.1:14558 rpc = 127.0.0.1:14560 -[devnet] -bootnode = /ip4/100.26.90.187/tcp/9871/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv -bootnode = /ip4/54.213.43.194/tcp/9871/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj +[beta] +bootnode = /ip4/54.213.43.194/tcp/9868/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/100.26.90.187/tcp/9868/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv +bootnode = /ip4/13.113.101.219/tcp/12018/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX shards = 4 -[devnet.shard0.rpc] -rpc = l0.t1.hmny.io:14555 -rpc = s0.t1.hmny.io:14555 +[beta.shard0.rpc] +rpc = l0.b.hmny.io:14555 +rpc = s0.b.hmny.io:14555 -[devnet.shard1.rpc] -rpc = l1.t1.hmny.io:14555 -rpc = s1.t1.hmny.io:14555 +[beta.shard1.rpc] +rpc = l1.b.hmny.io:14555 +rpc = s1.b.hmny.io:14555 -[devnet.shard2.rpc] -rpc = l2.t1.hmny.io:14555 -rpc = s2.t1.hmny.io:14555 +[beta.shard2.rpc] +rpc = l2.b.hmny.io:14555 +rpc = s2.b.hmny.io:14555 -[devnet.shard3.rpc] -rpc = l3.t1.hmny.io:14555 -rpc = s3.t1.hmny.io:14555 +[beta.shard3.rpc] +rpc = l3.b.hmny.io:14555 +rpc = s3.b.hmny.io:14555 + +[pangaea] +bootnode = /ip4/100.26.90.187/tcp/9867/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv +bootnode = /ip4/54.213.43.194/tcp/9867/p2p/QmZJJx6AdaoEkGLrYG4JeLCKeCKDjnFz2wfHNHxAqFSGA9 +bootnode = /ip4/13.113.101.219/tcp/9867/p2p/QmQayinFSgMMw5cSpDUiD9pQ2WeP6WNmGxpZ6ou3mdVFJX +bootnode = /ip4/99.81.170.167/tcp/9867/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj +shards = 4 + +[pangaea.shard0.rpc] +rpc = l0.p.hmny.io:14555 +rpc = s0.p.hmny.io:14555 + +[pangaea.shard1.rpc] +rpc = l1.p.hmny.io:14555 +rpc = s1.p.hmny.io:14555 + +[pangaea.shard2.rpc] +rpc = l2.p.hmny.io:14555 +rpc = s2.p.hmny.io:14555 + +[pangaea.shard3.rpc] +rpc = l3.p.hmny.io:14555 +rpc = s3.p.hmny.io:14555 ` ) From 40bd8bba62f85e7b1f3fdbc10b72e07ac5d0a8b6 Mon Sep 17 00:00:00 2001 From: Christopher Liu Date: Mon, 12 Aug 2019 18:23:57 -0700 Subject: [PATCH 6/7] [Foundation] Add 4 more keys --- internal/configs/sharding/mainnet.go | 6 +++--- internal/genesis/foundational.go | 10 +++++++--- internal/genesis/genesis_test.go | 5 ++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/internal/configs/sharding/mainnet.go b/internal/configs/sharding/mainnet.go index 58a24238e..1a2b15a12 100644 --- a/internal/configs/sharding/mainnet.go +++ b/internal/configs/sharding/mainnet.go @@ -70,7 +70,7 @@ var mainnetV0 = MustNewInstance(4, 150, 112, genesis.HarmonyAccounts, genesis.Fo var mainnetV0_1 = MustNewInstance(4, 152, 112, genesis.HarmonyAccounts, genesis.FoundationalNodeAccountsV0_1, mainnetReshardingEpoch) var mainnetV0_2 = MustNewInstance(4, 200, 148, genesis.HarmonyAccounts, genesis.FoundationalNodeAccountsV0_2, mainnetReshardingEpoch) var mainnetV0_3 = MustNewInstance(4, 210, 148, genesis.HarmonyAccounts, genesis.FoundationalNodeAccountsV0_3, mainnetReshardingEpoch) -var mainnetV0_4 = MustNewInstance(4, 215, 148, genesis.HarmonyAccounts, genesis.FoundationalNodeAccountsV0_4, mainnetReshardingEpoch) +var mainnetV0_4 = MustNewInstance(4, 216, 148, genesis.HarmonyAccounts, genesis.FoundationalNodeAccountsV0_4, mainnetReshardingEpoch) -//var mainnetV0_2 = MustNewInstance(8, 200, 100) -//var mainnet6400 = MustNewInstance(16, 400, 50) +//var mainnetV1 = MustNewInstance(4, 400, 280) +//var mainnetV2 = MustNewInstance(6, 400, 199) diff --git a/internal/genesis/foundational.go b/internal/genesis/foundational.go index 2ff7b915b..eadc3f9fc 100644 --- a/internal/genesis/foundational.go +++ b/internal/genesis/foundational.go @@ -320,7 +320,7 @@ var FoundationalNodeAccountsV0_1 = []DeployAccount{ {Index: "159", Address: "one1fzh923dkauvyye7w68nc38j2dw54gldu5mheaz", BlsPublicKey: "b5c94a5071f942c77f3599098430b8f2dbd6da70c5ef830192bdef5638908cd1fa188059d7aecc8b721116b946c4cc8e"}, } -// FoundationalNodeAccountsV0_2 are the accounts for the foundational nodes from Epoch 2. +// FoundationalNodeAccountsV0_2 are the accounts for the foundational nodes from Epoch 5. var FoundationalNodeAccountsV0_2 = []DeployAccount{ {Index: "0", Address: "one1y0xcf40fg65n2ehm8fx5vda4thrkymhpg45ecj", BlsPublicKey: "9e70e8d76851f6e8dc648255acdd57bb5c49cdae7571aed43f86e9f140a6343caed2ffa860919d03e0912411fee4850a"}, {Index: "1", Address: "one18lp2w7ghhuajdpzl8zqeddza97u92wtkfcwpjk", BlsPublicKey: "fce3097d9fc234d34d6eaef3eecd0365d435d1118f69f2da1ed2a69ba725270771572e40347c222aca784cb973307b11"}, @@ -532,7 +532,7 @@ var FoundationalNodeAccountsV0_2 = []DeployAccount{ {Index: "207", Address: "one1zr57fc7txdwvcwd6w2rn4yg6tdy0j0tjhvyj8f", BlsPublicKey: "76ac6c7d29e5e47874619816d6a441645adb0138bd02aa71d5b654cfeb9bdc1d4dd66d4e493100d48aeb558824d63408"}, } -// FoundationalNodeAccountsV0_3 are the accounts for the foundational nodes from Epoch 3. +// FoundationalNodeAccountsV0_3 are the accounts for the foundational nodes from Epoch 8. var FoundationalNodeAccountsV0_3 = []DeployAccount{ {Index: "0", Address: "one1y0xcf40fg65n2ehm8fx5vda4thrkymhpg45ecj", BlsPublicKey: "9e70e8d76851f6e8dc648255acdd57bb5c49cdae7571aed43f86e9f140a6343caed2ffa860919d03e0912411fee4850a"}, {Index: "1", Address: "one18lp2w7ghhuajdpzl8zqeddza97u92wtkfcwpjk", BlsPublicKey: "fce3097d9fc234d34d6eaef3eecd0365d435d1118f69f2da1ed2a69ba725270771572e40347c222aca784cb973307b11"}, @@ -784,7 +784,7 @@ var FoundationalNodeAccountsV0_3 = []DeployAccount{ {Index: "247", Address: "one12adq0qpa64fp9yrwemawetapsxyv5964553rz3", BlsPublicKey: "c46b4c64ca8a76d11d4dc1472a928949e973b46ab41e0e2abdb9fd42b58791874a70796b8b747717f4206dc3fe571912"}, } -// FoundationalNodeAccountsV0_4 are the accounts for the foundational nodes from Epoch 4. +// FoundationalNodeAccountsV0_4 are the accounts for the foundational nodes from Epoch 10. var FoundationalNodeAccountsV0_4 = []DeployAccount{ {Index: "0", Address: "one1y0xcf40fg65n2ehm8fx5vda4thrkymhpg45ecj", BlsPublicKey: "9e70e8d76851f6e8dc648255acdd57bb5c49cdae7571aed43f86e9f140a6343caed2ffa860919d03e0912411fee4850a"}, {Index: "1", Address: "one18lp2w7ghhuajdpzl8zqeddza97u92wtkfcwpjk", BlsPublicKey: "fce3097d9fc234d34d6eaef3eecd0365d435d1118f69f2da1ed2a69ba725270771572e40347c222aca784cb973307b11"}, @@ -1054,4 +1054,8 @@ var FoundationalNodeAccountsV0_4 = []DeployAccount{ {Index: "265", Address: "one1e06d6ldcr846z866wtdzm4c5h0zrlazgacz30u", BlsPublicKey: "7ab1ca94c701efacd2511eb12106cc0e0da35ef5d25574a79d0e38a0ee931657d9d10c7c4867df8b732d28041e8daa09"}, {Index: "266", Address: "one1efyllkjzayyc72xna69qp64s6aw02ak9sfcxle", BlsPublicKey: "ca3cf15d43efa692e4fc8db6ebe0f63b23f12d4347ce399d67a243375e2f04bfe90e7a8f435b89c5774b061d73ab3485"}, {Index: "267", Address: "one1ypjapaa5mhtu32tc4ezg5d5xxl6mnl5qd9qff9", BlsPublicKey: "d93e40e252d36f40678ddda2837603eaa6510430ec223cc10421fe3add924b75320c647ba2cb9ba4eda7d286849b2f0f"}, + {Index: "268", Address: "one1mkx7gu70c47c83uee5agnp9zx20h3eqz3rau2d", BlsPublicKey: "f8b63af7bb83cf6fd963354a40e857a4b9b6ae3072bb8db6104070436cc7ba684e4c34ba2156c710eee3c69d6ab79981"}, + {Index: "269", Address: "one1z37zj4dvmlcvuy3n3ajq57pzvn2fuxvzh2uzwc", BlsPublicKey: "625c3b79a01fee63728e21a7cec7560655df565a07f1090333f167a45acaf2d8e66eedf8feb1faf4ede1be773a8e5895"}, + {Index: "270", Address: "one1n0q9vc37g9h6hjplkjjnll7uxz59mnceml67g4", BlsPublicKey: "fa656869591dd33dfb8c395a70303b82e8eefd19f535ce1ea71a9a2e68a74a1e0c8a203f65fd1452c579e7ffed238603"}, + {Index: "271", Address: "one1lp4spvwyfk9xpnwvn6wk6s49edmysgwmkdy4tj", BlsPublicKey: "9bc2c7dc0ad6c6f0294a615018b386ce2c863a62e96de0f6000f6c05f307eeafb07e2a2b68c69e09367831f42171e589"}, } diff --git a/internal/genesis/genesis_test.go b/internal/genesis/genesis_test.go index b2938271a..746c5d181 100644 --- a/internal/genesis/genesis_test.go +++ b/internal/genesis/genesis_test.go @@ -51,7 +51,10 @@ func testGenesisccounts(t *testing.T) { func TestCommitteeAccounts(test *testing.T) { testAccounts(test, FoundationalNodeAccounts) - testAccounts(test, FoundationalNodeAccountsV1) + testAccounts(test, FoundationalNodeAccountsV0_1) + testAccounts(test, FoundationalNodeAccountsV0_2) + testAccounts(test, FoundationalNodeAccountsV0_3) + testAccounts(test, FoundationalNodeAccountsV0_4) testAccounts(test, HarmonyAccounts) testAccounts(test, TNHarmonyAccounts) testAccounts(test, TNFoundationalAccounts) From 325c3aed158a74043cc24487ff8d0b25af59cf60 Mon Sep 17 00:00:00 2001 From: Christopher Liu Date: Mon, 12 Aug 2019 19:08:38 -0700 Subject: [PATCH 7/7] [Foundation] Fix typo in BLS key and test clarity - Replace broken key --- internal/genesis/foundational.go | 2 +- internal/genesis/genesis_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/genesis/foundational.go b/internal/genesis/foundational.go index eadc3f9fc..0acfd09b6 100644 --- a/internal/genesis/foundational.go +++ b/internal/genesis/foundational.go @@ -1036,7 +1036,7 @@ var FoundationalNodeAccountsV0_4 = []DeployAccount{ {Index: "247", Address: "one12adq0qpa64fp9yrwemawetapsxyv5964553rz3", BlsPublicKey: "c46b4c64ca8a76d11d4dc1472a928949e973b46ab41e0e2abdb9fd42b58791874a70796b8b747717f4206dc3fe571912"}, {Index: "248", Address: "one1dy45f05wtdyx8rn824j3fslc8sv0c50ksu8fwu", BlsPublicKey: "ca027bf6ca93fa5afd4b4145d3fe2738b9778b3a18ae43511a1c1ca827fad879f34c2fa450f39c37dceeed98e5de2480"}, {Index: "249", Address: "one1vzurzrkmzlvus7dwcguzdlt6pz6zgnuxdvsjaz", BlsPublicKey: "217dbe8eeeedba0b2917012dedb0e13f50462afee6e843b9c38d9a8bafc4c2c1fb60186eea9d89cd71aa18943f9bbc13"}, - {Index: "250", Address: "one1tecqw55n0dlcau4y26el35j5yr2yq4eku7ppcm", BlsPublicKey: "dde49e99ace7570f08fe666b86f8dleb7f84e09e4961609d570511ae88314ae39da6ba1883bf99e50f341cb87a7a7597"}, + {Index: "250", Address: "one12g4tzvgcg7lvqfrye9h5qvwz24psccsp3r2rew", BlsPublicKey: "08a80ef165db6660b7eb092905b401b28fde486be42ba5f72622033f45d4d23ba49bec50999de2906af74b1352ccfc99"}, {Index: "251", Address: "one1ltdr7wke9swudj022dnkkwrsgzsaqdtvhpuuqu", BlsPublicKey: "6a3d429b7eecc85bbd2db8c8fc88c57ce5ad71d314f34d393ce22618c62df9dd78210aff109fea7b5607fd055e303380"}, {Index: "252", Address: "one1ygq5gu7vtgfff65mcqvhsjxpadrygwc25k37zx", BlsPublicKey: "20eaf3d7968ac65d5508c4b4728fbfd34ac0c874d96b4d8809a09144aeeb30c35a5dd9e39dcdeb706a2490fb7ba5c507"}, {Index: "253", Address: "one1029yaac9572k79f4dq93838azru7qsg3hrzxdc", BlsPublicKey: "4dfdde892c9d61269e0884fc5eccea27a79de584b2a80ca2fe529d381ada513e8d6c1f884cb4e72aabe1a6b431a6f317"}, diff --git a/internal/genesis/genesis_test.go b/internal/genesis/genesis_test.go index 746c5d181..9be4390c5 100644 --- a/internal/genesis/genesis_test.go +++ b/internal/genesis/genesis_test.go @@ -65,19 +65,19 @@ func testAccounts(test *testing.T, accounts []DeployAccount) { for _, account := range accounts { accIndex, _ := strconv.Atoi(strings.Trim(account.Index, " ")) if accIndex != index { - test.Error("Account index not in sequence", account.Index) + test.Error("Account index", account.Index, "not in sequence") } index++ _, _, err := bech32.Decode(account.Address) if err != nil { - test.Error("Account address is not valid bech32 address", err) + test.Error("Account address", account.Address, "is not valid:", err) } pubKey := bls.PublicKey{} err = pubKey.DeserializeHexStr(account.BlsPublicKey) if err != nil { - test.Error("Account bls public key is not valid", err) + test.Error("Account bls public key", account.BlsPublicKey, "is not valid:", err) } } }