Skip to content
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

Fix Saigon Hard fork on testnet #495

Merged
merged 1 commit into from
Dec 24, 2024
Merged

Fix Saigon Hard fork on testnet #495

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
8 changes: 8 additions & 0 deletions consensus/misc/forks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,11 @@ func ApplySaigonHardFork(statedb *state.StateDB, saigonBlock *big.Int, headBlock
statedb.AddBalance(common.SaigonEcoSystemFundAddress, ecoSystemFund)
}
}

// ApplySaigonHardFork mint additional token to EcoSystem Multisig once. For testnet only.
func ApplySaigonHardForkTestnet(statedb *state.StateDB, saigonBlock *big.Int, headBlock *big.Int, posv *params.PosvConfig) {
if headBlock.Cmp(saigonBlock) == 0 && posv != nil {
ecoSystemFund := new(big.Int).Mul(new(big.Int).Mul(common.SaigonEcoSystemFundAnnually, new(big.Int).SetUint64(params.Ether)), new(big.Int).SetUint64(common.SaigonEcoSystemFundTotalRepeat))
statedb.AddBalance(posv.FoudationWalletAddr, ecoSystemFund)
}
}
6 changes: 5 additions & 1 deletion core/chain_makers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
misc.ApplyDAOHardFork(statedb)
}
if config.SaigonBlock != nil && config.SaigonBlock.Cmp(b.header.Number) <= 0 {
misc.ApplySaigonHardFork(statedb, config.SaigonBlock, b.header.Number)
if common.IsTestnet {
misc.ApplySaigonHardForkTestnet(statedb, config.SaigonBlock, b.header.Number, config.Posv)
} else {
misc.ApplySaigonHardFork(statedb, config.SaigonBlock, b.header.Number)
}
}
// Execute any user modifications to the block and finalize it
if gen != nil {
Expand Down
12 changes: 10 additions & 2 deletions core/state_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, tra
statedb.DeleteAddress(common.HexToAddress(common.BlockSigners))
}
if p.config.SaigonBlock != nil && p.config.SaigonBlock.Cmp(block.Number()) <= 0 {
misc.ApplySaigonHardFork(statedb, p.config.SaigonBlock, block.Number())
if common.IsTestnet {
misc.ApplySaigonHardForkTestnet(statedb, p.config.SaigonBlock, block.Number(), p.config.Posv)
} else {
misc.ApplySaigonHardFork(statedb, p.config.SaigonBlock, block.Number())
}
}
parentState := statedb.Copy()
InitSignerInTransactions(p.config, header, block.Transactions())
Expand Down Expand Up @@ -155,7 +159,11 @@ func (p *StateProcessor) ProcessBlockNoValidator(cBlock *CalculatedBlock, stated
statedb.DeleteAddress(common.HexToAddress(common.BlockSigners))
}
if p.config.SaigonBlock != nil && p.config.SaigonBlock.Cmp(block.Number()) <= 0 {
misc.ApplySaigonHardFork(statedb, p.config.SaigonBlock, block.Number())
if common.IsTestnet {
misc.ApplySaigonHardForkTestnet(statedb, p.config.SaigonBlock, block.Number(), p.config.Posv)
} else {
misc.ApplySaigonHardFork(statedb, p.config.SaigonBlock, block.Number())
}
}
if cBlock.stop {
return nil, nil, 0, ErrStopPreparingBlock
Expand Down
6 changes: 5 additions & 1 deletion miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,11 @@ func (self *worker) commitNewWork() {
work.state.DeleteAddress(common.HexToAddress(common.BlockSigners))
}
if self.config.SaigonBlock != nil && self.config.SaigonBlock.Cmp(header.Number) <= 0 {
misc.ApplySaigonHardFork(work.state, self.config.SaigonBlock, header.Number)
if common.IsTestnet {
misc.ApplySaigonHardForkTestnet(work.state, self.config.SaigonBlock, header.Number, self.config.Posv)
} else {
misc.ApplySaigonHardFork(work.state, self.config.SaigonBlock, header.Number)
}
}
// won't grasp txs at checkpoint
var (
Expand Down