charts, k8s: do not add generated accounts into validator set

charts/genesis.go

@@ -35,7 +35,7 @@ type GenesisChart struct {
 	args        []string
 }
 
-func NewGenesisChart(addrs []common.Address, gasLimit uint64) *GenesisChart {
+func NewGenesisChart(validators []common.Address, allocs []common.Address, gasLimit uint64) *GenesisChart {
 	chartPath := filepath.Join(chartBasePath, "genesis-block")
 	genesisPath := filepath.Join(chartPath, ".genesis")
 	err := os.MkdirAll(genesisPath, 0700)
@@ -50,9 +50,9 @@ func NewGenesisChart(addrs []common.Address, gasLimit uint64) *GenesisChart {
 		genesisFile: genesis.NewFileAt(
 			genesisPath,
 			false,
-			genesis.Validators(addrs...),
+			genesis.Validators(validators...),
 			genesis.GasLimit(gasLimit),
-			genesis.Alloc(addrs, new(big.Int).Exp(big.NewInt(10), big.NewInt(50), nil)),
+			genesis.Alloc(append(validators, allocs...), new(big.Int).Exp(big.NewInt(10), big.NewInt(50), nil)),
 		),
 	}
 

k8s/blockchain.go

@@ -36,17 +36,16 @@ func NewBlockchain(numOfValidators int, numOfExtraAccounts int, gaslimit uint64,
 	extraKeys := make([][]*ecdsa.PrivateKey, numOfValidators)
 	extraAddrs := make([][]common.Address, numOfValidators)
 
-	allAddrs := addrs
-
+	var allocAddrs []common.Address
 	if numOfExtraAccounts > 0 {
 		for i := 0; i < numOfValidators; i++ {
 			extraKeys[i], _, extraAddrs[i] = istcommon.GenerateKeys(numOfExtraAccounts)
-			allAddrs = append(allAddrs, extraAddrs[i]...)
+			allocAddrs = append(allocAddrs, extraAddrs[i]...)
 		}
 	}
 
 	bc = &blockchain{
-		genesis:     charts.NewGenesisChart(allAddrs, uint64(gaslimit)),
+		genesis:     charts.NewGenesisChart(addrs, allocAddrs, uint64(gaslimit)),
 		staticNodes: charts.NewStaticNodesChart(nodekeys, ips),
 	}
 

k8s/ethereum_example.go

@@ -24,7 +24,7 @@ import (
 
 func ExampleK8SEthereum() {
 	_, nodekeys, addrs := common.GenerateKeys(1)
-	genesisChart := charts.NewGenesisChart(addrs, genesis.InitGasLimit)
+	genesisChart := charts.NewGenesisChart(addrs, nil, genesis.InitGasLimit)
 	if err := genesisChart.Install(false); err != nil {
 		log.Error("Failed to install genesis chart", "err", err)
 		return