fix priv key not converted to pub key (#35)

bnb-chain · Mar 31, 2023 · ef87b45 · ef87b45
1 parent f6e81b3
commit ef87b45
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/assembler/bsc_assembler.go b/assembler/bsc_assembler.go
@@ -34,7 +34,7 @@ func NewBSCAssembler(cfg *config.Config, executor *executor.BSCExecutor, dao *da
 		bscExecutor:        executor,
 		daoManager:         dao,
 		greenfieldExecutor: greenfieldExecutor,
-		blsPubKey:          greenfieldExecutor.BlsPrivateKey,
+		blsPubKey:          greenfieldExecutor.BlsPubKey,
 		metricService:      ms,
 	}
 }

diff --git a/assembler/greenfield_assembler.go b/assembler/greenfield_assembler.go
@@ -43,7 +43,7 @@ func NewGreenfieldAssembler(cfg *config.Config, executor *executor.GreenfieldExe
 		greenfieldExecutor:               executor,
 		daoManager:                       dao,
 		bscExecutor:                      bscExecutor,
-		blsPubKey:                        executor.BlsPrivateKey,
+		blsPubKey:                        executor.BlsPubKey,
 		hasRetrievedSequenceByChannelMap: retrievedSequenceByChannelMap,
 		metricService:                    ms,
 	}

diff --git a/executor/greenfield_executor.go b/executor/greenfield_executor.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	_ "encoding/json"
 	"fmt"
+	"github.com/prysmaticlabs/prysm/crypto/bls/blst"
 	"time"
 
 	"github.com/avast/retry-go/v4"
@@ -39,6 +40,7 @@ type GreenfieldExecutor struct {
 	validators    []*tmtypes.Validator // used to cache validators
 	cdc           *codec.ProtoCodec
 	BlsPrivateKey []byte
+	BlsPubKey     []byte
 }
 
 func NewGreenfieldExecutor(cfg *config.Config) *GreenfieldExecutor {
@@ -51,11 +53,16 @@ func NewGreenfieldExecutor(cfg *config.Config) *GreenfieldExecutor {
 		panic(err)
 	}
 
-	blsPrivKey := viper.GetString(config.FlagConfigBlsPrivateKey)
-	if blsPrivKey == "" {
-		blsPrivKey = getGreenfieldBlsPrivateKey(&cfg.GreenfieldConfig)
+	blsPrivKeyStr := viper.GetString(config.FlagConfigBlsPrivateKey)
+	if blsPrivKeyStr == "" {
+		blsPrivKeyStr = getGreenfieldBlsPrivateKey(&cfg.GreenfieldConfig)
 	}
+	blsPrivKeyBts := ethcommon.Hex2Bytes(blsPrivKeyStr)
 
+	blsPrivKey, err := blst.SecretKeyFromBytes(blsPrivKeyBts)
+	if err != nil {
+		panic(err)
+	}
 	clients := sdkclient.NewGnfdCompositClients(
 		cfg.GreenfieldConfig.GRPCAddrs,
 		cfg.GreenfieldConfig.RPCAddrs,
@@ -68,7 +75,8 @@ func NewGreenfieldExecutor(cfg *config.Config) *GreenfieldExecutor {
 		address:       km.GetAddr().String(),
 		config:        cfg,
 		cdc:           Cdc(),
-		BlsPrivateKey: ethcommon.Hex2Bytes(blsPrivKey),
+		BlsPrivateKey: blsPrivKeyBts,
+		BlsPubKey:     blsPrivKey.PublicKey().Marshal(),
 	}
 }
 

diff --git a/vote/bsc_vote_processor.go b/vote/bsc_vote_processor.go
@@ -42,7 +42,7 @@ func NewBSCVoteProcessor(cfg *config.Config, dao *dao.DaoManager, signer *VoteSi
 		daoManager:   dao,
 		signer:       signer,
 		bscExecutor:  bscExecutor,
-		blsPublicKey: bscExecutor.GreenfieldExecutor.BlsPrivateKey,
+		blsPublicKey: bscExecutor.GreenfieldExecutor.BlsPubKey,
 	}
 }
 

diff --git a/vote/greenfield_vote_processor.go b/vote/greenfield_vote_processor.go
@@ -38,12 +38,13 @@ type GreenfieldVoteProcessor struct {
 
 func NewGreenfieldVoteProcessor(cfg *config.Config, dao *dao.DaoManager, signer *VoteSigner,
 	greenfieldExecutor *executor.GreenfieldExecutor) *GreenfieldVoteProcessor {
+
 	return &GreenfieldVoteProcessor{
 		config:             cfg,
 		daoManager:         dao,
 		signer:             signer,
 		greenfieldExecutor: greenfieldExecutor,
-		blsPublicKey:       greenfieldExecutor.BlsPrivateKey,
+		blsPublicKey:       greenfieldExecutor.BlsPubKey,
 	}
 }