From d694697285d4f8def773850ada3622807d0d2f2a Mon Sep 17 00:00:00 2001
From: kindknow <166522338+kindknow@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:06:21 +0800
Subject: [PATCH 1/2] Merge pull request #1397 from kindknow/master

chore: fix some function names in comment
---
 beacon/light/request/scheduler.go      | 2 +-
 consensus/misc/eip1559/eip1559_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/beacon/light/request/scheduler.go b/beacon/light/request/scheduler.go
index e80daf805e..242ed56d28 100644
--- a/beacon/light/request/scheduler.go
+++ b/beacon/light/request/scheduler.go
@@ -269,7 +269,7 @@ func (s *Scheduler) addEvent(event Event) {
 	s.Trigger()
 }
 
-// filterEvent sorts each Event either as a request event or a server event,
+// filterEvents sorts each Event either as a request event or a server event,
 // depending on its type. Request events are also sorted in a map based on the
 // module that originally initiated the request. It also ensures that no events
 // related to a server are returned before EvRegistered or after EvUnregistered.
diff --git a/consensus/misc/eip1559/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go
index 47f3e80edf..b4e1444e33 100644
--- a/consensus/misc/eip1559/eip1559_test.go
+++ b/consensus/misc/eip1559/eip1559_test.go
@@ -137,7 +137,7 @@ func TestCalcBaseFee(t *testing.T) {
 	}
 }
 
-// TestCalcBaseFee assumes all blocks are 1559-blocks post Delhi Hard Fork
+// TestCalcBaseFeeDelhi assumes all blocks are 1559-blocks post Delhi Hard Fork
 func TestCalcBaseFeeDelhi(t *testing.T) {
 	t.Parallel()
 

From 732478ce5f4ca160d2ce79deb5804c8790f054b8 Mon Sep 17 00:00:00 2001
From: Daniel Jones <105369507+djpolygon@users.noreply.github.com>
Date: Fri, 21 Feb 2025 04:08:44 -0600
Subject: [PATCH 2/2] As 20.04 is being EOL for github runner support, moving
 to 22.04 (#1445)

---
 .github/workflows/amoy_deb_profiles.yml    | 2 +-
 .github/workflows/mainnet_deb_profiles.yml | 2 +-
 .github/workflows/packager_deb.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/amoy_deb_profiles.yml b/.github/workflows/amoy_deb_profiles.yml
index 4258967ec3..6f4d16fb7e 100644
--- a/.github/workflows/amoy_deb_profiles.yml
+++ b/.github/workflows/amoy_deb_profiles.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
       contents: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/mainnet_deb_profiles.yml b/.github/workflows/mainnet_deb_profiles.yml
index 46833e16e9..e8ee619c6f 100644
--- a/.github/workflows/mainnet_deb_profiles.yml
+++ b/.github/workflows/mainnet_deb_profiles.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
       contents: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/packager_deb.yml b/.github/workflows/packager_deb.yml
index f8efd7d4c2..f16013d55a 100644
--- a/.github/workflows/packager_deb.yml
+++ b/.github/workflows/packager_deb.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
       contents: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4