forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-20 13:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix API penalty bug and add more info in api (#262)

Browse source 
* fix api bug

* remove cmd
This commit is contained in:
Liam 2023-05-16 21:23:02 +10:00 committed by GitHub
parent 5b75d3a904
commit 153f8d296d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
consensus/XDPoS/api.go
View file

@ -60,11 +60,13 @@ type SignerTypes struct {
}
type MasternodesStatus struct {
Number uint64
Round types.Round
MasternodesLen int
Masternodes []common.Address
PenaltyLen int
Penalty []common.Address
PenaltyLen int
Penalty []common.Address
Error error
}
type MessageStatus map[string]map[string]SignerTypes
@ -130,13 +132,22 @@ func (api *API) GetMasternodesByNumber(number *rpc.BlockNumber) MasternodesStatu
} else {
header = api.chain.GetHeaderByNumber(uint64(number.Int64()))
}
masternodes, penalties, err := api.XDPoS.EngineV2.CalcMasternodes(api.chain, header.Number, header.ParentHash)
round, err := api.XDPoS.EngineV2.GetRoundNumber(header)
if err != nil {
return MasternodesStatus{}
return MasternodesStatus{
Error: err,
}
}
masterNodes := api.XDPoS.EngineV2.GetMasternodes(api.chain, header)
penalties := api.XDPoS.EngineV2.GetPenalties(api.chain, header)
info := MasternodesStatus{
MasternodesLen: len(masternodes),
Masternodes: masternodes,
Number: header.Number.Uint64(),
Round: round,
MasternodesLen: len(masterNodes),
Masternodes: masterNodes,
PenaltyLen: len(penalties),
Penalty: penalties,
}

20
consensus/XDPoS/api_test.go
View file

@ -17,6 +17,7 @@ func TestCalculateSignersVote(t *testing.T) {
masternodes := []common.Address{{1}, {2}, {3}}
vote1 := types.Vote{
Signature: types.Signature{1},
ProposedBlockInfo: &types.BlockInfo{
Hash: common.Hash{1},
Round: types.Round(10),
@ -27,10 +28,11 @@ func TestCalculateSignersVote(t *testing.T) {
vote1.SetSigner(common.Address{1})
vote2 := types.Vote{
Signature: types.Signature{2},
ProposedBlockInfo: &types.BlockInfo{
Hash: common.Hash{2},
Round: types.Round(11),
Number: big.NewInt(911),
Hash: common.Hash{1},
Round: types.Round(10),
Number: big.NewInt(910),
},
GapNumber: 450,
}
@ -40,9 +42,7 @@ func TestCalculateSignersVote(t *testing.T) {
votes.Add(&vote2)
calculateSigners(info, votes.Get(), masternodes)
//assert.Equal(t, info["xxx"].CurrentNumber, 2)
assert.Equal(t, 2, 2)
assert.Equal(t, info["10:450:910:0x0100000000000000000000000000000000000000000000000000000000000000"].CurrentNumber, 2)
}
func TestCalculateSignersTimeout(t *testing.T) {
@ -52,13 +52,15 @@ func TestCalculateSignersTimeout(t *testing.T) {
masternodes := []common.Address{{1}, {2}, {3}}
timeout1 := types.Timeout{
Signature: types.Signature{1},
Round: types.Round(10),
GapNumber: 450,
}
timeout1.SetSigner(common.Address{1})
timeout2 := types.Timeout{
Round: types.Round(11),
Signature: types.Signature{2},
Round: types.Round(10),
GapNumber: 450,
}
timeout1.SetSigner(common.Address{2})
@ -67,7 +69,5 @@ func TestCalculateSignersTimeout(t *testing.T) {
timeouts.Add(&timeout2)
calculateSigners(info, timeouts.Get(), masternodes)
//assert.Equal(t, info["xxx"].CurrentNumber, 2)
assert.Equal(t, 2, 2)
assert.Equal(t, info["10:450"].CurrentNumber, 2)
}

12
consensus/XDPoS/engines/engine_v2/engine.go
View file

@ -972,14 +972,20 @@ func (x *XDPoS_v2) GetMasternodesFromEpochSwitchHeader(epochSwitchHeader *types.
func (x *XDPoS_v2) GetMasternodes(chain consensus.ChainReader, header *types.Header) []common.Address {
epochSwitchInfo, err := x.getEpochSwitchInfo(chain, header, header.Hash())
if err != nil {
log.Error("[GetMasternodes] Adaptor v2 getEpochSwitchInfo has error, potentially bug", "err", err)
log.Error("[GetMasternodes] Adaptor v2 getEpochSwitchInfo has error", "err", err)
return []common.Address{}
}
return epochSwitchInfo.Masternodes
}
func (x *XDPoS_v2) CalcMasternodes(chain consensus.ChainReader, blockNum *big.Int, parentHash common.Hash) ([]common.Address, []common.Address, error) {
return x.calcMasternodes(chain, blockNum, parentHash)
// Given header, get master node from the epoch switch block of that epoch
func (x *XDPoS_v2) GetPenalties(chain consensus.ChainReader, header *types.Header) []common.Address {
epochSwitchInfo, err := x.getEpochSwitchInfo(chain, header, header.Hash())
if err != nil {
log.Error("[GetMasternodes] Adaptor v2 getEpochSwitchInfo has error", "err", err)
return []common.Address{}
}
return epochSwitchInfo.Penalties
}
func (x *XDPoS_v2) calcMasternodes(chain consensus.ChainReader, blockNum *big.Int, parentHash common.Hash) ([]common.Address, []common.Address, error) {

3
consensus/XDPoS/engines/engine_v2/epochSwitch.go
View file

@ -53,9 +53,12 @@ func (x *XDPoS_v2) getEpochSwitchInfo(chain consensus.ChainReader, header *types
log.Debug("[getEpochSwitchInfo] header is epoch switch", "hash", hash.Hex(), "number", h.Number.Uint64())
quorumCert, round, masternodes, err := x.getExtraFields(h)
if err != nil {
log.Error("[getEpochSwitchInfo] get extra field", "err", err, "number", h.Number.Uint64())
return nil, err
}
penalties := common.ExtractAddressFromBytes(h.Penalties)
epochSwitchInfo := &types.EpochSwitchInfo{
Penalties: penalties,
Masternodes: masternodes,
EpochSwitchBlockInfo: &types.BlockInfo{
Hash: hash,

1
consensus/XDPoS/engines/engine_v2/utils.go
View file

@ -138,6 +138,7 @@ func (x *XDPoS_v2) getExtraFields(header *types.Header) (*types.QuorumCert, type
var decodedExtraField types.ExtraFields_v2
err := utils.DecodeBytesExtraFields(header.Extra, &decodedExtraField)
if err != nil {
log.Error("[getExtraFields] error on decode extra fields", "err", err, "extra", header.Extra)
return nil, types.Round(0), masternodes, err
}
return decodedExtraField.QuorumCert, decodedExtraField.Round, masternodes, nil

15
consensus/tests/engine_v2_tests/penalty_test.go
View file

@ -136,3 +136,18 @@ func TestHookPenaltyV2LessThen150Blocks(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, 2, len(penalty))
}
func TestGetPenalties(t *testing.T) {
config := params.TestXDPoSMockChainConfig
blockchain, _, _, _, _ := PrepareXDCTestBlockChainWithPenaltyForV2Engine(t, int(config.XDPoS.Epoch)*3, config)
adaptor := blockchain.Engine().(*XDPoS.XDPoS)
header2699 := blockchain.GetHeaderByNumber(2699)
header1801 := blockchain.GetHeaderByNumber(1801)
penalty2699 := adaptor.EngineV2.GetPenalties(blockchain, header2699)
penalty1801 := adaptor.EngineV2.GetPenalties(blockchain, header1801)
assert.Equal(t, 1, len(penalty2699))
assert.Equal(t, 1, len(penalty1801))
}

1
core/types/consensus_v2.go
View file

@ -111,6 +111,7 @@ func (e *ExtraFields_v2) EncodeToBytes() ([]byte, error) {
}
type EpochSwitchInfo struct {
Penalties []common.Address
Masternodes []common.Address
EpochSwitchBlockInfo *BlockInfo
EpochSwitchParentBlockInfo *BlockInfo