The new economic system and support required by the gas fee are added to the contract

eric · eric · commit d7ac313facfb · 2022-12-26T20:21:30.000+08:00
diff --git a/consensus/parlia/abi.go b/consensus/parlia/abi.go
@@ -2,84 +2,6 @@ package parlia
 
 const validatorSetABI = `
 [
-  {
-    "inputs": [
-      {
-        "internalType": "contract IStaking",
-        "name": "stakingContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract ISlashingIndicator",
-        "name": "slashingIndicatorContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract ISystemReward",
-        "name": "systemRewardContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IStakingPool",
-        "name": "stakingPoolContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IGovernance",
-        "name": "governanceContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IChainConfig",
-        "name": "chainConfigContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IRuntimeUpgrade",
-        "name": "runtimeUpgradeContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IDeployerProxy",
-        "name": "deployerProxyContract",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "blockNumber",
-        "type": "uint64"
-      }
-    ],
-    "name": "OnlyBlock",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "coinbase",
-        "type": "address"
-      }
-    ],
-    "name": "OnlyCoinbase",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "OnlyGovernance",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "OnlySlashingIndicator",
-    "type": "error"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go
@@ -1054,7 +1054,7 @@ func (p *Parlia) getCurrentValidators(blockHash common.Hash) ([]common.Address,
 }
 func (p *Parlia) BlockRewards(blockNumber *big.Int) *big.Int {
 	if rules := p.chainConfig.Rules(blockNumber); rules.HasBlockRewards {
-		if p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) >= 0 {
+		if p.chainConfig.Parlia.StopMintBlock != nil && p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) >= 0 {
 			return big.NewInt(0)
 		}
 		blockRewards := p.chainConfig.Parlia.BlockRewards
diff --git a/eth/abi.go b/eth/abi.go
@@ -2,84 +2,6 @@ package eth
 
 const chainConfigABI = `
 [
-  {
-    "inputs": [
-      {
-        "internalType": "contract IStaking",
-        "name": "stakingContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract ISlashingIndicator",
-        "name": "slashingIndicatorContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract ISystemReward",
-        "name": "systemRewardContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IStakingPool",
-        "name": "stakingPoolContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IGovernance",
-        "name": "governanceContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IChainConfig",
-        "name": "chainConfigContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IRuntimeUpgrade",
-        "name": "runtimeUpgradeContract",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IDeployerProxy",
-        "name": "deployerProxyContract",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "blockNumber",
-        "type": "uint64"
-      }
-    ],
-    "name": "OnlyBlock",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "coinbase",
-        "type": "address"
-      }
-    ],
-    "name": "OnlyCoinbase",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "OnlyGovernance",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "OnlySlashingIndicator",
-    "type": "error"
-  },
   {
     "anonymous": false,
     "inputs": [

Original file line number	Diff line number	Diff line change
`@@ -1054,7 +1054,7 @@ func (p *Parlia) getCurrentValidators(blockHash common.Hash) ([]common.Address,`
`1054`	`1054`	`}`
`1055`	`1055`	`func (p Parlia) BlockRewards(blockNumber big.Int) *big.Int {`
`1056`	`1056`	`if rules := p.chainConfig.Rules(blockNumber); rules.HasBlockRewards {`
`1057`		`- if p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) >= 0 {`
	`1057`	`+ if p.chainConfig.Parlia.StopMintBlock != nil && p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) >= 0 {`
`1058`	`1058`	`return big.NewInt(0)`
`1059`	`1059`	`}`
`1060`	`1060`	`blockRewards := p.chainConfig.Parlia.BlockRewards`