Merge branch 'main' of github.com:berachain/bera-geth into fetch-upstream

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines:
 (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
  * Code must be documented adhering to the official Go 
 [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
- * Pull requests need to be based on and opened against the `master` branch.
+ * Pull requests need to be based on and opened against the `main` branch.
  * Commit messages should be prefixed with the package(s) they modify.
    * E.g. "eth, rpc: make trace configs optional"
 

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: i386 linux tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:

.github/workflows/release.yml

@@ -2,7 +2,7 @@ on:
   # TODO: fix release workflow and enable this.
   # push:
   #   branches:
-  #     - "master"
+  #     - "main"
   #   tags:
   #     - "v*"