diff --git a/.dockerignore b/.dockerignore index 457006e02..831a82699 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,5 +3,9 @@ build/_workspace build/_bin tests/testdata +build/bin -Dockerfile \ No newline at end of file +Dockerfile +genesis/node_modules/ +genesis/.git/ +.git/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index bc2af63f3..805c411be 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,5 @@ geth.exe geth /datadir build.cmd -build.bash \ No newline at end of file +build.bash +.deps \ No newline at end of file diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 1739f1953..d75bb4008 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1774,12 +1774,12 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { cfg.Genesis = core.DefaultYoloV3GenesisBlock() case ctx.GlobalBool(ChilizMainnetFlag.Name): if !ctx.GlobalIsSet(NetworkIdFlag.Name) { - cfg.NetworkId = 17243 + cfg.NetworkId = 88888 } cfg.Genesis = core.DefaultChilizMainnetGenesisBlock() case ctx.GlobalBool(ChilizTestnetFlag.Name): if !ctx.GlobalIsSet(NetworkIdFlag.Name) { - cfg.NetworkId = 17242 + cfg.NetworkId = 88880 } cfg.Genesis = core.DefaultChilizTestnetGenesisBlock() case ctx.GlobalBool(DeveloperFlag.Name): diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go index f28bc9252..a57d76216 100644 --- a/consensus/parlia/parlia.go +++ b/consensus/parlia/parlia.go @@ -58,7 +58,7 @@ const ( initialBackOffTime = uint64(1) // second processBackOffTime = uint64(1) // second - systemRewardPercent = 4 // it means 1/2^4 = 1/16 percentage of gas fee incoming will be distributed to system + systemRewardPercent = 3 // it means 1/3 percentage of gas fee incoming will be distributed to system ) @@ -1066,7 +1066,7 @@ func (p *Parlia) distributeIncoming(val common.Address, state *state.StateDB, he doDistributeSysReward := state.GetBalance(common.HexToAddress(systemcontract.SystemRewardContract)).Cmp(maxSystemBalance) < 0 if doDistributeSysReward { var rewards = new(big.Int) - rewards = rewards.Rsh(balance, systemRewardPercent) + rewards = rewards.Div(balance, big.NewInt(systemRewardPercent)) if rewards.Cmp(common.Big0) > 0 { err := p.distributeToSystem(rewards, state, header, chain, txs, receipts, receivedTxs, usedGas, mining) if err != nil { diff --git a/genesis b/genesis index 3815fcc3b..9da1722c9 160000 --- a/genesis +++ b/genesis @@ -1 +1 @@ -Subproject commit 3815fcc3beeb76490f361b19d228c344785fe3b4 +Subproject commit 9da1722c97c2fd86e9718394fc869c062ce6a6b7 diff --git a/params/config.go b/params/config.go index 29d196d3f..07cb64c7b 100644 --- a/params/config.go +++ b/params/config.go @@ -330,7 +330,7 @@ var ( } ChilizMainnetChainConfig = &ChainConfig{ - ChainID: big.NewInt(17243), + ChainID: big.NewInt(88888), HomesteadBlock: big.NewInt(0), EIP150Block: big.NewInt(0), EIP155Block: big.NewInt(0), @@ -351,7 +351,7 @@ var ( } ChilizTestnetChainConfig = &ChainConfig{ - ChainID: big.NewInt(17242), + ChainID: big.NewInt(88880), HomesteadBlock: big.NewInt(0), EIP150Block: big.NewInt(0), EIP155Block: big.NewInt(0),