improve upgrade config

HaoyangLiu · HaoyangLiu · commit 3789ea31ddde · 2020-08-07T17:15:09.000+08:00
diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go
@@ -508,7 +508,7 @@ func (api *RetestethAPI) mineBlock() error {
 	if api.chainConfig.DAOForkSupport && api.chainConfig.DAOForkBlock != nil && api.chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(statedb)
 	}
-	systemcontractupgrade.UpgradeBuildInSystemContract(header.Number, statedb)
+	systemcontractupgrade.UpgradeBuildInSystemContract(api.chainConfig, header.Number, statedb)
 	gasPool := new(core.GasPool).AddGas(header.GasLimit)
 	txCount := 0
 	var txs []*types.Transaction
diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -208,7 +208,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 		if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 {
 			misc.ApplyDAOHardFork(statedb)
 		}
-		systemcontractupgrade.UpgradeBuildInSystemContract(b.header.Number, statedb)
+		systemcontractupgrade.UpgradeBuildInSystemContract(config, b.header.Number, statedb)
 		// Execute any user modifications to the block
 		if gen != nil {
 			gen(i, b)
diff --git a/core/state_processor.go b/core/state_processor.go
@@ -67,7 +67,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 		misc.ApplyDAOHardFork(statedb)
 	}
 	// Handle upgrade build-in system contract code
-	systemcontractupgrade.UpgradeBuildInSystemContract(block.Number(), statedb)
+	systemcontractupgrade.UpgradeBuildInSystemContract(p.config, block.Number(), statedb)
 	// Iterate over and process the individual transactions
 	posa, isPoSA := p.engine.(consensus.PoSA)
 	commonTxs := make([]*types.Transaction, 0, len(block.Transactions()))
diff --git a/core/systemcontractupgrade/system-contract-upgrade.go b/core/systemcontractupgrade/system-contract-upgrade.go
diff --git a/miner/worker.go b/miner/worker.go
@@ -901,7 +901,7 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
 	if w.chainConfig.DAOForkSupport && w.chainConfig.DAOForkBlock != nil && w.chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {
 		misc.ApplyDAOHardFork(env.state)
 	}
-	systemcontractupgrade.UpgradeBuildInSystemContract(header.Number, env.state)
+	systemcontractupgrade.UpgradeBuildInSystemContract(w.chainConfig, header.Number, env.state)
 	// Accumulate the uncles for the current block
 	uncles := make([]*types.Header, 0, 2)
 	commitUncles := func(blocks map[common.Hash]*types.Block) {

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ func (api *RetestethAPI) mineBlock() error {`
`508`	`508`	`if api.chainConfig.DAOForkSupport && api.chainConfig.DAOForkBlock != nil && api.chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {`
`509`	`509`	`misc.ApplyDAOHardFork(statedb)`
`510`	`510`	`}`
`511`		`- systemcontractupgrade.UpgradeBuildInSystemContract(header.Number, statedb)`
	`511`	`+ systemcontractupgrade.UpgradeBuildInSystemContract(api.chainConfig, header.Number, statedb)`
`512`	`512`	`gasPool := new(core.GasPool).AddGas(header.GasLimit)`
`513`	`513`	`txCount := 0`
`514`	`514`	`var txs []*types.Transaction`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func GenerateChain(config params.ChainConfig, parent types.Block, engine conse`
`208`	`208`	`if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 {`
`209`	`209`	`misc.ApplyDAOHardFork(statedb)`
`210`	`210`	`}`
`211`		`- systemcontractupgrade.UpgradeBuildInSystemContract(b.header.Number, statedb)`
	`211`	`+ systemcontractupgrade.UpgradeBuildInSystemContract(config, b.header.Number, statedb)`
`212`	`212`	`// Execute any user modifications to the block`
`213`	`213`	`if gen != nil {`
`214`	`214`	`gen(i, b)`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func (p StateProcessor) Process(block types.Block, statedb *state.StateDB, cfg`
`67`	`67`	`misc.ApplyDAOHardFork(statedb)`
`68`	`68`	`}`
`69`	`69`	`// Handle upgrade build-in system contract code`
`70`		`- systemcontractupgrade.UpgradeBuildInSystemContract(block.Number(), statedb)`
	`70`	`+ systemcontractupgrade.UpgradeBuildInSystemContract(p.config, block.Number(), statedb)`
`71`	`71`	`// Iterate over and process the individual transactions`
`72`	`72`	`posa, isPoSA := p.engine.(consensus.PoSA)`
`73`	`73`	`commonTxs := make([]*types.Transaction, 0, len(block.Transactions()))`
Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,7 @@ func (w worker) commitNewWork(interrupt int32, noempty bool, timestamp int64)`
`901`	`901`	`if w.chainConfig.DAOForkSupport && w.chainConfig.DAOForkBlock != nil && w.chainConfig.DAOForkBlock.Cmp(header.Number) == 0 {`
`902`	`902`	`misc.ApplyDAOHardFork(env.state)`
`903`	`903`	`}`
`904`		`- systemcontractupgrade.UpgradeBuildInSystemContract(header.Number, env.state)`
	`904`	`+ systemcontractupgrade.UpgradeBuildInSystemContract(w.chainConfig, header.Number, env.state)`
`905`	`905`	`// Accumulate the uncles for the current block`
`906`	`906`	`uncles := make([]*types.Header, 0, 2)`
`907`	`907`	`commitUncles := func(blocks map[common.Hash]*types.Block) {`