core/chain_makers.go — Version Comparison

	v1.17.3	v1.17.4
Branch	etc/v1.17.3-full-node	etc/v1.17.4-full-node
Delta	+4 -4	+4 -4

ETC delta on v1.17.3 (+4 -4)

diff --git a/core/chain_makers.go b/core/chain_makers.go
index 46cd98de6..025f5ba68 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -239,9 +239,9 @@ func (b *BlockGen) AddUncle(h *types.Header) {

    // The gas limit and price should be derived from the parent
    h.GasLimit = parent.GasLimit
-   if b.cm.config.IsLondon(h.Number) {
+   if b.cm.config.IsEIP1559(h.Number) {
        h.BaseFee = eip1559.CalcBaseFee(b.cm.config, parent)
-       if !b.cm.config.IsLondon(parent.Number) {
+       if !b.cm.config.IsEIP1559(parent.Number) {
            parentGasLimit := parent.GasLimit * b.cm.config.ElasticityMultiplier()
            h.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
        }
@@ -516,9 +516,9 @@ func (cm *chainMaker) makeHeader(parent *types.Block, state *state.StateDB, engi
        Time:       time,
    }

-   if cm.config.IsLondon(header.Number) {
+   if cm.config.IsEIP1559(header.Number) {
        header.BaseFee = eip1559.CalcBaseFee(cm.config, parentHeader)
-       if !cm.config.IsLondon(parent.Number()) {
+       if !cm.config.IsEIP1559(parent.Number()) {
            parentGasLimit := parent.GasLimit() * cm.config.ElasticityMultiplier()
            header.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
        }

ETC delta on v1.17.4 (+4 -4)

diff --git a/core/chain_makers.go b/core/chain_makers.go
index d93ce80dc..28d517994 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -243,9 +243,9 @@ func (b *BlockGen) AddUncle(h *types.Header) {

    // The gas limit and price should be derived from the parent
    h.GasLimit = parent.GasLimit
-   if b.cm.config.IsLondon(h.Number) {
+   if b.cm.config.IsEIP1559(h.Number) {
        h.BaseFee = eip1559.CalcBaseFee(b.cm.config, parent)
-       if !b.cm.config.IsLondon(parent.Number) {
+       if !b.cm.config.IsEIP1559(parent.Number) {
            parentGasLimit := parent.GasLimit * b.cm.config.ElasticityMultiplier()
            h.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
        }
@@ -515,9 +515,9 @@ func (cm *chainMaker) makeHeader(parent *types.Block, state *state.StateDB, engi
        Time:       time,
    }

-   if cm.config.IsLondon(header.Number) {
+   if cm.config.IsEIP1559(header.Number) {
        header.BaseFee = eip1559.CalcBaseFee(cm.config, parentHeader)
-       if !cm.config.IsLondon(parent.Number()) {
+       if !cm.config.IsEIP1559(parent.Number()) {
            parentGasLimit := parent.GasLimit() * cm.config.ElasticityMultiplier()
            header.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
        }

← Back to Version Comparison