poanetwork
/
istanbul-tools
mirror of https://github.com/poanetwork/istanbul-tools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #90 from getamis/feature/do-not-add-generated-accounts-into-validator-set 

charts, k8s: do not add generated accounts into validator set
This commit is contained in:
Miya Chen 2017-10-02 16:01:30 +08:00 committed by GitHub
parent 9cd60a5e53 3aa50bcb50
commit 952d49100a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/genesis.go
View File

@ -35,7 +35,7 @@ type GenesisChart struct {
args []string 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") chartPath := filepath.Join(chartBasePath, "genesis-block")
genesisPath := filepath.Join(chartPath, ".genesis") genesisPath := filepath.Join(chartPath, ".genesis")
err := os.MkdirAll(genesisPath, 0700) err := os.MkdirAll(genesisPath, 0700)
@ -50,9 +50,9 @@ func NewGenesisChart(addrs []common.Address, gasLimit uint64) *GenesisChart {
genesisFile: genesis.NewFileAt( genesisFile: genesis.NewFileAt(
genesisPath, genesisPath,
false, false,
genesis.Validators(addrs...), genesis.Validators(validators...),
genesis.GasLimit(gasLimit), 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)),
), ),
} }

7
k8s/blockchain.go
View File

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

2
k8s/ethereum_example.go
View File

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