|
|
|
@ -17,7 +17,6 @@ import ( |
|
|
|
"github.com/harmony-one/harmony/core" |
|
|
|
"github.com/harmony-one/harmony/core" |
|
|
|
"github.com/harmony-one/harmony/core/types" |
|
|
|
"github.com/harmony-one/harmony/core/types" |
|
|
|
"github.com/harmony-one/harmony/core/vm" |
|
|
|
"github.com/harmony-one/harmony/core/vm" |
|
|
|
internal_bls "github.com/harmony-one/harmony/crypto/bls" |
|
|
|
|
|
|
|
internal_common "github.com/harmony-one/harmony/internal/common" |
|
|
|
internal_common "github.com/harmony-one/harmony/internal/common" |
|
|
|
"github.com/harmony-one/harmony/internal/params" |
|
|
|
"github.com/harmony-one/harmony/internal/params" |
|
|
|
"github.com/harmony-one/harmony/internal/utils" |
|
|
|
"github.com/harmony-one/harmony/internal/utils" |
|
|
|
@ -144,9 +143,6 @@ func (s *PublicBlockChainAPI) GetBlocks(ctx context.Context, blockStart, blockEn |
|
|
|
|
|
|
|
|
|
|
|
// GetValidators returns validators list for a particular epoch.
|
|
|
|
// GetValidators returns validators list for a particular epoch.
|
|
|
|
func (s *PublicBlockChainAPI) GetValidators(ctx context.Context, epoch int64) (map[string]interface{}, error) { |
|
|
|
func (s *PublicBlockChainAPI) GetValidators(ctx context.Context, epoch int64) (map[string]interface{}, error) { |
|
|
|
if err := s.isBeaconShard(); err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
committee, err := s.b.GetValidators(big.NewInt(epoch)) |
|
|
|
committee, err := s.b.GetValidators(big.NewInt(epoch)) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
@ -179,6 +175,20 @@ func (s *PublicBlockChainAPI) GetValidators(ctx context.Context, epoch int64) (m |
|
|
|
return result, nil |
|
|
|
return result, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// GetValidatorKeys returns list of bls public keys in the committee for a particular epoch.
|
|
|
|
|
|
|
|
func (s *PublicBlockChainAPI) GetValidatorKeys(ctx context.Context, epoch int64) ([]string, error) { |
|
|
|
|
|
|
|
committee, err := s.b.GetValidators(big.NewInt(epoch)) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
validators := make([]string, len(committee.Slots)) |
|
|
|
|
|
|
|
for i, v := range committee.Slots { |
|
|
|
|
|
|
|
validators[i] = v.BLSPublicKey.Hex() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return validators, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// IsLastBlock checks if block is last epoch block.
|
|
|
|
// IsLastBlock checks if block is last epoch block.
|
|
|
|
func (s *PublicBlockChainAPI) IsLastBlock(blockNum uint64) (bool, error) { |
|
|
|
func (s *PublicBlockChainAPI) IsLastBlock(blockNum uint64) (bool, error) { |
|
|
|
if err := s.isBeaconShard(); err != nil { |
|
|
|
if err := s.isBeaconShard(); err != nil { |
|
|
|
@ -203,44 +213,46 @@ func (s *PublicBlockChainAPI) GetBlockSigners(ctx context.Context, blockNr uint6 |
|
|
|
if err := s.isBlockGreaterThanLatest(blockNr); err != nil { |
|
|
|
if err := s.isBlockGreaterThanLatest(blockNr); err != nil { |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
block, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
slots, mask, err := s.b.GetBlockSigners(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
blockWithSigners, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr+1)) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
committee, err := s.b.GetValidators(block.Epoch()) |
|
|
|
signers := []string{} |
|
|
|
if err != nil { |
|
|
|
for _, validator := range slots { |
|
|
|
return nil, err |
|
|
|
oneAddress, err := internal_common.AddressToBech32(validator.EcdsaAddress) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
blsPublicKey := new(bls.PublicKey) |
|
|
|
|
|
|
|
validator.BLSPublicKey.ToLibBLSPublicKey(blsPublicKey) |
|
|
|
|
|
|
|
if ok, err := mask.KeyEnabled(blsPublicKey); err == nil && ok { |
|
|
|
|
|
|
|
signers = append(signers, oneAddress) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
pubkeys := make([]*bls.PublicKey, len(committee.Slots)) |
|
|
|
return signers, nil |
|
|
|
for i, validator := range committee.Slots { |
|
|
|
} |
|
|
|
pubkeys[i] = new(bls.PublicKey) |
|
|
|
|
|
|
|
validator.BLSPublicKey.ToLibBLSPublicKey(pubkeys[i]) |
|
|
|
// GetBlockSignerKeys returns bls public keys that signed the block.
|
|
|
|
|
|
|
|
func (s *PublicBlockChainAPI) GetBlockSignerKeys(ctx context.Context, blockNr uint64) ([]string, error) { |
|
|
|
|
|
|
|
if blockNr == 0 || blockNr >= uint64(s.BlockNumber()) { |
|
|
|
|
|
|
|
return []string{}, nil |
|
|
|
} |
|
|
|
} |
|
|
|
mask, err := internal_bls.NewMask(pubkeys, nil) |
|
|
|
if err := s.isBlockGreaterThanLatest(blockNr); err != nil { |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
err = mask.SetMask(blockWithSigners.Header().LastCommitBitmap()) |
|
|
|
slots, mask, err := s.b.GetBlockSigners(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
result := []string{} |
|
|
|
signers := []string{} |
|
|
|
for _, validator := range committee.Slots { |
|
|
|
for _, validator := range slots { |
|
|
|
oneAddress, err := internal_common.AddressToBech32(validator.EcdsaAddress) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
blsPublicKey := new(bls.PublicKey) |
|
|
|
blsPublicKey := new(bls.PublicKey) |
|
|
|
validator.BLSPublicKey.ToLibBLSPublicKey(blsPublicKey) |
|
|
|
validator.BLSPublicKey.ToLibBLSPublicKey(blsPublicKey) |
|
|
|
if ok, err := mask.KeyEnabled(blsPublicKey); err == nil && ok { |
|
|
|
if ok, err := mask.KeyEnabled(blsPublicKey); err == nil && ok { |
|
|
|
result = append(result, oneAddress) |
|
|
|
signers = append(signers, validator.BLSPublicKey.Hex()) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return result, nil |
|
|
|
return signers, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// IsBlockSigner returns true if validator with address signed blockNr block.
|
|
|
|
// IsBlockSigner returns true if validator with address signed blockNr block.
|
|
|
|
@ -251,32 +263,11 @@ func (s *PublicBlockChainAPI) IsBlockSigner(ctx context.Context, blockNr uint64, |
|
|
|
if err := s.isBlockGreaterThanLatest(blockNr); err != nil { |
|
|
|
if err := s.isBlockGreaterThanLatest(blockNr); err != nil { |
|
|
|
return false, err |
|
|
|
return false, err |
|
|
|
} |
|
|
|
} |
|
|
|
block, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
slots, mask, err := s.b.GetBlockSigners(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return false, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
blockWithSigners, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr+1)) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return false, err |
|
|
|
return false, err |
|
|
|
} |
|
|
|
} |
|
|
|
committee, err := s.b.GetValidators(block.Epoch()) |
|
|
|
for _, validator := range slots { |
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return false, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
pubkeys := make([]*bls.PublicKey, len(committee.Slots)) |
|
|
|
|
|
|
|
for i, validator := range committee.Slots { |
|
|
|
|
|
|
|
pubkeys[i] = new(bls.PublicKey) |
|
|
|
|
|
|
|
validator.BLSPublicKey.ToLibBLSPublicKey(pubkeys[i]) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
mask, err := internal_bls.NewMask(pubkeys, nil) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return false, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
err = mask.SetMask(blockWithSigners.Header().LastCommitBitmap()) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return false, err |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
for _, validator := range committee.Slots { |
|
|
|
|
|
|
|
oneAddress, err := internal_common.AddressToBech32(validator.EcdsaAddress) |
|
|
|
oneAddress, err := internal_common.AddressToBech32(validator.EcdsaAddress) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return false, err |
|
|
|
return false, err |
|
|
|
@ -629,17 +620,16 @@ func (s *PublicBlockChainAPI) getAllValidatorInformation( |
|
|
|
validatorsNum = len(addresses) - start |
|
|
|
validatorsNum = len(addresses) - start |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
validators := make([]*staking.ValidatorRPCEnhanced, validatorsNum) |
|
|
|
validators := []*staking.ValidatorRPCEnhanced{} |
|
|
|
block, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
block, err := s.b.BlockByNumber(ctx, rpc.BlockNumber(blockNr)) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
return nil, errors.Wrapf(err, "could not retrieve the block information for block number: %d", blockNr) |
|
|
|
return nil, errors.Wrapf(err, "could not retrieve the block information for block number: %d", blockNr) |
|
|
|
} |
|
|
|
} |
|
|
|
for i := start; i < start+validatorsNum; i++ { |
|
|
|
for i := start; i < start+validatorsNum; i++ { |
|
|
|
information, err := s.b.GetValidatorInformation(addresses[i], block) |
|
|
|
information, err := s.b.GetValidatorInformation(addresses[i], block) |
|
|
|
if err != nil { |
|
|
|
if err == nil { |
|
|
|
return nil, err |
|
|
|
validators = append(validators, information) |
|
|
|
} |
|
|
|
} |
|
|
|
validators[i-start] = information |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return validators, nil |
|
|
|
return validators, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
Leo Chen
5 years ago