PoS_EVM
/
woop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #983 from rlan35/rj_fork

Browse Source 
Change shard state ECDSA address to use common address/byte format
pull/988/head
Rongjian Lan 6 years ago committed by GitHub
parent 072e926121 7f72493a28
commit f70cebaa2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      consensus/consensus.go
  2. 6
      core/resharding.go
  3. 44
      core/resharding_test.go
  4. 9
      core/types/shard_state.go
  5. 38
      core/types/shard_state_test.go

2
consensus/consensus.go
Unescape View File

@ -332,7 +332,7 @@ func accumulateRewards(
continue continue
} }
numAccounts++ numAccounts++
account := common.HexToAddress(member.EcdsaAddress) account := member.EcdsaAddress
getLogger().Info("rewarding block signer", getLogger().Info("rewarding block signer",
"account", account, "account", account,
"node", member.BlsPublicKey.Hex(), "node", member.BlsPublicKey.Hex(),

6
core/resharding.go
Unescape View File

@ -199,7 +199,7 @@ func (ss *ShardingState) UpdateShardingState(stakeInfo *map[common.Address]*stru
newNodeList := shard.NodeList newNodeList := shard.NodeList
for _, nodeID := range shard.NodeList { for _, nodeID := range shard.NodeList {
oldBlsPublicKeys[nodeID.BlsPublicKey] = true oldBlsPublicKeys[nodeID.BlsPublicKey] = true
_, ok := (*stakeInfo)[common.HexToAddress(nodeID.EcdsaAddress)] _, ok := (*stakeInfo)[nodeID.EcdsaAddress]
if ok { if ok {
// newNodeList = append(newNodeList, nodeID) // newNodeList = append(newNodeList, nodeID)
} else { } else {
@ -213,7 +213,7 @@ func (ss *ShardingState) UpdateShardingState(stakeInfo *map[common.Address]*stru
for addr, info := range *stakeInfo { for addr, info := range *stakeInfo {
_, ok := oldBlsPublicKeys[info.BlsPublicKey] _, ok := oldBlsPublicKeys[info.BlsPublicKey]
if !ok { if !ok {
newAddresses = append(newAddresses, types.NodeID{addr.Hex(), info.BlsPublicKey}) newAddresses = append(newAddresses, types.NodeID{addr, info.BlsPublicKey})
} }
} }
return newAddresses return newAddresses
@ -231,7 +231,7 @@ func GetInitShardState() types.ShardState {
pubKey := types.BlsPublicKey{} pubKey := types.BlsPublicKey{}
pubKey.FromLibBLSPublicKey(priKey.GetPublicKey()) pubKey.FromLibBLSPublicKey(priKey.GetPublicKey())
// TODO: directly read address for bls too // TODO: directly read address for bls too
curNodeID := types.NodeID{contract.GenesisAccounts[index].Address, pubKey} curNodeID := types.NodeID{common.HexToAddress(contract.GenesisAccounts[index].Address), pubKey}
com.NodeList = append(com.NodeList, curNodeID) com.NodeList = append(com.NodeList, curNodeID)
} }
shardState = append(shardState, com) shardState = append(shardState, com)

44
core/resharding_test.go
Unescape View File

@ -6,6 +6,8 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/ethereum/go-ethereum/common"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -46,7 +48,7 @@ func fakeGetInitShardState(numberOfShards, numOfNodes int) types.ShardState {
nid := strconv.Itoa(int(rand.Int63())) nid := strconv.Itoa(int(rand.Int63()))
blsPubKey := [48]byte{} blsPubKey := [48]byte{}
copy(blsPubKey1[:], []byte(nid)) copy(blsPubKey1[:], []byte(nid))
com.NodeList = append(com.NodeList, types.NodeID{nid, blsPubKey}) com.NodeList = append(com.NodeList, types.NodeID{common.BytesToAddress([]byte(nid)), blsPubKey})
} }
shardState = append(shardState, com) shardState = append(shardState, com)
} }
@ -61,7 +63,7 @@ func fakeNewNodeList(seed int64) []types.NodeID {
nid := strconv.Itoa(int(rand.Int63())) nid := strconv.Itoa(int(rand.Int63()))
blsPubKey := [48]byte{} blsPubKey := [48]byte{}
copy(blsPubKey1[:], []byte(nid)) copy(blsPubKey1[:], []byte(nid))
nodeList = append(nodeList, types.NodeID{nid, blsPubKey}) nodeList = append(nodeList, types.NodeID{common.BytesToAddress([]byte(nid)), blsPubKey})
} }
return nodeList return nodeList
} }
@ -73,16 +75,16 @@ func TestFakeNewNodeList(t *testing.T) {
func TestShuffle(t *testing.T) { func TestShuffle(t *testing.T) {
nodeList := []types.NodeID{ nodeList := []types.NodeID{
{"node1", blsPubKey1}, {common.Address{0x12}, blsPubKey1},
{"node2", blsPubKey2}, {common.Address{0x22}, blsPubKey2},
{"node3", blsPubKey3}, {common.Address{0x32}, blsPubKey3},
{"node4", blsPubKey4}, {common.Address{0x42}, blsPubKey4},
{"node5", blsPubKey5}, {common.Address{0x52}, blsPubKey5},
{"node6", blsPubKey6}, {common.Address{0x62}, blsPubKey6},
{"node7", blsPubKey7}, {common.Address{0x72}, blsPubKey7},
{"node8", blsPubKey8}, {common.Address{0x82}, blsPubKey8},
{"node9", blsPubKey9}, {common.Address{0x92}, blsPubKey9},
{"node10", blsPubKey10}, {common.Address{0x02}, blsPubKey10},
} }
cpList := []types.NodeID{} cpList := []types.NodeID{}
@ -113,12 +115,12 @@ func TestUpdateShardState(t *testing.T) {
shardState := fakeGetInitShardState(6, 10) shardState := fakeGetInitShardState(6, 10)
ss := &ShardingState{epoch: 1, rnd: 42, shardState: shardState, numShards: len(shardState)} ss := &ShardingState{epoch: 1, rnd: 42, shardState: shardState, numShards: len(shardState)}
newNodeList := []types.NodeID{ newNodeList := []types.NodeID{
{"node1", blsPubKey1}, {common.Address{0x12}, blsPubKey1},
{"node2", blsPubKey2}, {common.Address{0x22}, blsPubKey2},
{"node3", blsPubKey3}, {common.Address{0x32}, blsPubKey3},
{"node4", blsPubKey4}, {common.Address{0x42}, blsPubKey4},
{"node5", blsPubKey5}, {common.Address{0x52}, blsPubKey5},
{"node6", blsPubKey6}, {common.Address{0x62}, blsPubKey6},
} }
ss.Reshard(newNodeList, 0.2) ss.Reshard(newNodeList, 0.2)
@ -129,9 +131,9 @@ func TestAssignNewNodes(t *testing.T) {
shardState := fakeGetInitShardState(2, 2) shardState := fakeGetInitShardState(2, 2)
ss := &ShardingState{epoch: 1, rnd: 42, shardState: shardState, numShards: len(shardState)} ss := &ShardingState{epoch: 1, rnd: 42, shardState: shardState, numShards: len(shardState)}
newNodes := []types.NodeID{ newNodes := []types.NodeID{
{"node1", blsPubKey1}, {common.Address{0x12}, blsPubKey1},
{"node2", blsPubKey2}, {common.Address{0x22}, blsPubKey2},
{"node3", blsPubKey3}, {common.Address{0x32}, blsPubKey3},
} }
ss.assignNewNodes(newNodes) ss.assignNewNodes(newNodes)

9
core/types/shard_state.go
Unescape View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
"sort" "sort"
"strings"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/harmony-one/bls/ffi/go/bls" "github.com/harmony-one/bls/ffi/go/bls"
@ -94,13 +93,13 @@ func CompareBlsPublicKey(k1, k2 BlsPublicKey) int {
// NodeID represents node id (BLS address). // NodeID represents node id (BLS address).
type NodeID struct { type NodeID struct {
EcdsaAddress string EcdsaAddress common.Address
BlsPublicKey BlsPublicKey BlsPublicKey BlsPublicKey
} }
// CompareNodeID compares two node IDs. // CompareNodeID compares two node IDs.
func CompareNodeID(id1, id2 *NodeID) int { func CompareNodeID(id1, id2 *NodeID) int {
if c := strings.Compare(id1.EcdsaAddress, id2.EcdsaAddress); c != 0 { if c := bytes.Compare(id1.EcdsaAddress[:], id2.EcdsaAddress[:]); c != 0 {
return c return c
} }
if c := CompareBlsPublicKey(id1.BlsPublicKey, id2.BlsPublicKey); c != 0 { if c := CompareBlsPublicKey(id1.BlsPublicKey, id2.BlsPublicKey); c != 0 {
@ -205,9 +204,9 @@ func CompareNodeIDByBLSKey(n1 NodeID, n2 NodeID) int {
// Serialize serialize NodeID into bytes // Serialize serialize NodeID into bytes
func (n NodeID) Serialize() []byte { func (n NodeID) Serialize() []byte {
return append(n.BlsPublicKey[:], []byte(n.EcdsaAddress)...) return append(n.EcdsaAddress[:], n.BlsPublicKey[:]...)
} }
func (n NodeID) String() string { func (n NodeID) String() string {
return "ECDSA: " + n.EcdsaAddress + ", BLS: " + hex.EncodeToString(n.BlsPublicKey[:]) return "ECDSA: " + n.EcdsaAddress.Hex() + ", BLS: " + hex.EncodeToString(n.BlsPublicKey[:])
} }

38
core/types/shard_state_test.go
Unescape View File

@ -3,6 +3,8 @@ package types
import ( import (
"bytes" "bytes"
"testing" "testing"
"github.com/ethereum/go-ethereum/common"
) )
var ( var (
@ -29,14 +31,14 @@ func init() {
func TestGetHashFromNodeList(t *testing.T) { func TestGetHashFromNodeList(t *testing.T) {
l1 := []NodeID{ l1 := []NodeID{
{"node1", blsPubKey1}, {common.Address{0x11}, blsPubKey1},
{"node2", blsPubKey2}, {common.Address{0x22}, blsPubKey2},
{"node3", blsPubKey3}, {common.Address{0x33}, blsPubKey3},
} }
l2 := []NodeID{ l2 := []NodeID{
{"node2", blsPubKey2}, {common.Address{0x22}, blsPubKey2},
{"node1", blsPubKey1}, {common.Address{0x11}, blsPubKey1},
{"node3", blsPubKey3}, {common.Address{0x33}, blsPubKey3},
} }
h1 := GetHashFromNodeList(l1) h1 := GetHashFromNodeList(l1)
h2 := GetHashFromNodeList(l2) h2 := GetHashFromNodeList(l2)
@ -50,17 +52,17 @@ func TestHash(t *testing.T) {
com1 := Committee{ com1 := Committee{
ShardID: 22, ShardID: 22,
NodeList: []NodeID{ NodeList: []NodeID{
{"node11", blsPubKey11}, {common.Address{0x12}, blsPubKey11},
{"node22", blsPubKey22}, {common.Address{0x23}, blsPubKey22},
{"node1", blsPubKey1}, {common.Address{0x11}, blsPubKey1},
}, },
} }
com2 := Committee{ com2 := Committee{
ShardID: 2, ShardID: 2,
NodeList: []NodeID{ NodeList: []NodeID{
{"node4", blsPubKey4}, {common.Address{0x44}, blsPubKey4},
{"node5", blsPubKey5}, {common.Address{0x55}, blsPubKey5},
{"node6", blsPubKey6}, {common.Address{0x66}, blsPubKey6},
}, },
} }
shardState1 := ShardState{com1, com2} shardState1 := ShardState{com1, com2}
@ -69,17 +71,17 @@ func TestHash(t *testing.T) {
com3 := Committee{ com3 := Committee{
ShardID: 2, ShardID: 2,
NodeList: []NodeID{ NodeList: []NodeID{
{"node6", blsPubKey6}, {common.Address{0x66}, blsPubKey6},
{"node5", blsPubKey5}, {common.Address{0x55}, blsPubKey5},
{"node4", blsPubKey4}, {common.Address{0x44}, blsPubKey4},
}, },
} }
com4 := Committee{ com4 := Committee{
ShardID: 22, ShardID: 22,
NodeList: []NodeID{ NodeList: []NodeID{
{"node1", blsPubKey1}, {common.Address{0x11}, blsPubKey1},
{"node11", blsPubKey11}, {common.Address{0x12}, blsPubKey11},
{"node22", blsPubKey22}, {common.Address{0x23}, blsPubKey22},
}, },
} }

Write Preview
Loading…
Cancel
Save