Skip to content

updates System rewards percentage #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitry123 merged 1 commit into from
Mar 28, 2022
Merged

updates System rewards percentage #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@
build/_workspace
build/_bin
tests/testdata
build/bin

Dockerfile
Dockerfile
genesis/node_modules/
genesis/.git/
.git/
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ geth.exe
geth
/datadir
build.cmd
build.bash
build.bash
.deps
4 changes: 2 additions & 2 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions consensus/parlia/parlia.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

)

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion genesis
Open in desktop
Submodule genesis updated 1 files
+29 −27 create-genesis.go
4 changes: 2 additions & 2 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand Down