From b4c3b59a85f740a021bd81ec3dee79f174b2b5b8 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Mon, 25 Sep 2023 14:44:21 +0200
Subject: [PATCH] add pre-pbss rebase branches to CI (#270)

* add post-pbss rebase branches to CI

* fix go version in CI

* fix linter issues

* upgrade go version to 1.21.1 to avoid github deploy error
---
 .github/workflows/go.yml | 8 ++++----
 core/state_processor.go  | 2 +-
 trie/utils/verkle.go     | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 5ae526f1ee..61542140b0 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master, verkle-trie-proof-in-block-rebased, verkle-trie-post-merge, beverly-hills-head, 'verkle/replay-change-with-tree-group-tryupdate' ]
+    branches: [ master, verkle-trie-proof-in-block-rebased, verkle-trie-post-merge, beverly-hills-head, 'verkle/replay-change-with-tree-group-tryupdate', beverly-hills-just-before-pbss, kaustinen-with-shapella ]
   workflow_dispatch:
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21.1
       - name: Build
         run: go build -v ./...
 
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21.1
       - name: Download golangci-lint
         run: wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s latest
       - name: Lint
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21.1
       - name: Download precomputed points
         run: wget -nv https://github.com/gballet/go-verkle/releases/download/banderwagonv3/precomp -Otrie/utils/precomp
       - name: Test
diff --git a/core/state_processor.go b/core/state_processor.go
index 6c08bc03f3..5d10bceb18 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -332,7 +332,7 @@ func (kvm *keyValueMigrator) prepare() {
 		}
 		wg.Wait()
 
-		// Step 2: Now that we have all stems (i.e: tree keys) calcualted, we can create the new leaves.
+		// Step 2: Now that we have all stems (i.e: tree keys) calculated, we can create the new leaves.
 		nodeValues := make([]verkle.BatchNewLeafNodeData, len(kvm.leafData))
 		for i := range kvm.leafData {
 			nodeValues[i] = kvm.leafData[i].leafNodeData
diff --git a/trie/utils/verkle.go b/trie/utils/verkle.go
index 07949ec65e..17fdf1ade3 100644
--- a/trie/utils/verkle.go
+++ b/trie/utils/verkle.go
@@ -286,7 +286,6 @@ func GetTreeKeyStorageSlotTreeIndexes(storageKey []byte) (*uint256.Int, byte) {
 		// In this branch, the tree-index is zero since we're in the account header,
 		// and the sub-index is the LSB of the modified storage key.
 		return zero, byte(pos[0] & 0xFF)
-
 	}
 	// If the storage slot is in the main storage, we need to add the main storage offset.