Xgr2.0

.github/workflows/release.yml

@@ -56,7 +56,7 @@ jobs:
   integration:
     name: Integration (unit + e2e + build)
     runs-on: ubuntu-latest
-    timeout-minutes: 90
+    timeout-minutes: 180
     needs: [meta]
     outputs:
       version: ${{ needs.meta.outputs.version }}
@@ -120,11 +120,11 @@ jobs:
           set -euo pipefail
 
           echo "Starting E2E..."
-          ( go test -v -count=1 -timeout 40m ./e2e/... ) &
+          ( go test -v -count=1 -timeout 120m ./e2e/... ) &
           pid=$!
           echo "E2E pid=$pid"
 
-          for i in $(seq 1 2700); do
+          for i in $(seq 1 7200); do
             if ! kill -0 "$pid" 2>/dev/null; then
               echo "E2E finished, waiting..."
               wait "$pid"
@@ -149,14 +149,14 @@ jobs:
             sleep 1
           done
 
-          echo "ERROR: E2E exceeded watchdog (45m) - killing..."
+          echo "ERROR: E2E exceeded watchdog (120m) - killing..."
           kill "$pid" || true
           sleep 2
           kill -9 "$pid" || true
           exit 1
 
 
-          echo "ERROR: E2E exceeded watchdog (45m) - killing..."
+          echo "ERROR: E2E exceeded watchdog (120m) - killing..."
           kill "$pid" || true
           sleep 2
           kill -9 "$pid" || true

blockchain/blockchain.go

@@ -115,13 +115,13 @@ func (b *Blockchain) updateGasPriceAvg(newValues []*big.Int) {
 		sum = sum.Add(sum, val)
 	}
 	if len(newValues) == 0 {
-		// Kein neuer Wert, setze Default falls kein alter Wert existiert
+		// No new value; set a default only when no previous value exists
 		if b.gpAverage.count.Uint64() == 0 {
 			b.gpAverage.price = big.NewInt(int64(chain.MinBaseFee))
 			b.gpAverage.count = big.NewInt(1)
 			return
 		}
-		// Ansonsten nichts ändern
+		// Otherwise keep the current value unchanged
 		return
 	}
 
@@ -1417,12 +1417,12 @@ func mulDivClampU64(a, b, c, d uint64) uint64 {
 
 // CalculateBaseFee calculates the basefee of the header.
 func (b *Blockchain) CalculateBaseFee(parent *types.Header) uint64 {
-	// Minimum BaseFee (statisch oder dynamisch)
+	// Minimum base fee (static or dynamic)
 	minBaseFee := b.resolveMinBaseFee(parent)
 
 	var baseFee uint64
 
-	// Genesis oder erster London-Block?
+	// Genesis or first London block?
 	if parent.BaseFee == 0 {
 		if b.config.Genesis.BaseFee > 0 {
 			baseFee = b.config.Genesis.BaseFee
@@ -1466,7 +1466,7 @@ func (b *Blockchain) CalculateBaseFee(parent *types.Header) uint64 {
 		}
 	}
 
-	// Sicherheitsanker: niemals unter minBaseFee
+	// Safety guard: never go below minBaseFee.
 	if baseFee < minBaseFee {
 		return minBaseFee
 	}

blockchain/blockchain_test.go

@@ -1494,7 +1494,7 @@ func TestBlockchain_WriteFullBlock(t *testing.T) {
 			Transactions: []*types.Transaction{tx},
 		},
 		Receipts: receipts,
-	}, "polybft")
+	}, "ibft")
 
 	require.NoError(t, err)
 	require.Equal(t, 0, len(db))
@@ -1507,7 +1507,7 @@ func TestBlockchain_WriteFullBlock(t *testing.T) {
 			Transactions: []*types.Transaction{tx},
 		},
 		Receipts: receipts,
-	}, "polybft")
+	}, "ibft")
 
 	require.NoError(t, err)
 	require.Equal(t, 8, len(db))

bls/private.go

@@ -33,7 +33,7 @@ func UnmarshalPrivateKey(data []byte) (*PrivateKey, error) {
 	}
 
 	// Otherwise, trying to assume the given data is a hex encoded big int represented as a bytes array.
-	// This is needed in order to be compatible with the currently stored polybft BLS keys.
+	// This is needed in order to be compatible with the currently stored legacy BLS keys.
 	var err error
 	if pk.s, err = hex.DecodeHexToBig(string(data)); err != nil {
 		return nil, err

chain/params.go

@@ -111,6 +111,7 @@ const (
 	EIP2929             = "EIP2929"
 	EIP2930             = "EIP2930"
 	EIP3651             = "EIP3651"
+	FeePoolSplit        = "feePoolSplit"
 )
 
 // Forks is map which contains all forks and their starting blocks from genesis
@@ -153,6 +154,7 @@ func (f *Forks) At(block uint64) ForksInTime {
 		EIP2929:             f.IsActive(EIP2929, block),
 		EIP2930:             f.IsActive(EIP2930, block),
 		EIP3651:             f.IsActive(EIP3651, block),
+		FeePoolSplit:        f.IsActive(FeePoolSplit, block),
 	}
 }
 
@@ -205,7 +207,7 @@ type ForksInTime struct {
 	EIP155,
 	QuorumCalcAlignment,
 	TxHashWithType,
-	LondonFix, EIP3860, EIP2929, EIP2930, EIP3651 bool
+	LondonFix, EIP3860, EIP2929, EIP2930, EIP3651, FeePoolSplit bool
 }
 
 // AllForksEnabled should contain all supported forks by current edge version