Check validator private key only for validators

hubble-exchange · Oct 2, 2023 · 568016d · 568016d
1 parent de86a58
commit 568016d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/plugin/evm/orderbook/tx_processor.go b/plugin/evm/orderbook/tx_processor.go
@@ -76,9 +76,6 @@ func NewLimitOrderTxProcessor(txPool *txpool.TxPool, memoryDb LimitOrderDatabase
 		panic(err)
 	}
 
-	if validatorPrivateKey == "" {
-		panic("private key is not supplied")
-	}
 	validatorAddress, err := getAddressFromPrivateKey(validatorPrivateKey)
 	if err != nil {
 		panic("Unable to get address from validator private key")
@@ -263,6 +260,10 @@ func getOrderBookContractCallMethod(tx *types.Transaction, orderBookABI abi.ABI,
 }
 
 func getAddressFromPrivateKey(key string) (common.Address, error) {
+	// blank key is allowed for non-validators
+	if key == "" {
+		return common.Address{}, nil
+	}
 	privateKey, err := crypto.HexToECDSA(key) // admin private key
 	if err != nil {
 		return common.Address{}, err

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -1156,9 +1156,17 @@ func attachEthService(handler *rpc.Server, apis []rpc.API, names []string) error
 }
 
 func (vm *VM) NewLimitOrderProcesser() LimitOrderProcesser {
-	validatorPrivateKey, err := loadPrivateKeyFromFile(vm.config.ValidatorPrivateKeyFile)
-	if err != nil {
-		panic(fmt.Sprint("please specify correct path for validator-private-key-file in chain.json ", err))
+	var validatorPrivateKey string
+	var err error
+	if vm.config.IsValidator {
+		validatorPrivateKey, err = loadPrivateKeyFromFile(vm.config.ValidatorPrivateKeyFile)
+		if err != nil {
+			panic(fmt.Sprint("please specify correct path for validator-private-key-file in chain.json ", err))
+		}
+		if validatorPrivateKey == "" {
+			panic("validator private key is empty")
+		}
+
 	}
 	return NewLimitOrderProcesser(
 		vm.ctx,