goethereum dependency to v1.14~ (#14351)

* updating the goethereum dependency

* fixing dependencies

* reverting workspace

* more fixes, work in progress

* trying with upgraded geth version

* fixing deprecated functions except for the time related ones on eth1 distance due to time issues

* fixing time issues

* gaz

* fixing test and upgrading some dependencies and reverting others

* Disable cgo in hid, delete old vendored usb library

* changelog

* rolling back dependencies

* fixing go mod tidy

* Geth v1.13.6

* fix tests

* Add ping interval, set to 500ms for tests. This didnt work

* Update to v1.14.8

* Spread it out to different bootnodes

* Fix it

* Remove Memsize

* Update all out of date dependencies

* Fix geth body change

* Fix Test

* Fix Build

* Fix Tests

* Fix Tests Again

* Fix Tests Again

* Fix Tests

* Fix Test

* Copy USB Package for HID

* Push it up

* Finally fix all tests with felix's changes

* updating geth dependency

* Update go-ethereum to v1.14.11

* fixing import

* reverting blob change

* fixing Implicit memory aliasing in for loop.

* WIP changes

* wip getting a little further on e2e runs

* getting a little further

* getting a little further

* setting everything to capella

* more partial fixes

* more fixes but still WIP

* fixing access list transactions"

* some cleanup

* making configs dynamic

* reverting time

* skip lower bound in builder

* updating to geth v1.14.12

* fixing verify blob to pointer

* go mod tidy

* fixing linting

* missed removing another terminal difficulty item

* another missed update

* updating more dependencies to fix cicd

* fixing holiman dependency update

* downgrading geth to 1.14.11 due to p2p loop issue

* reverting builder middleware caused by downgrade

* fixing more rollback issues

* upgrading back to 1.14.12 after discussing with preston

* mod tidy

* gofmt

* partial review feedback

* trying to start e2e from bellatrix instead

* reverting some changes

---------

Co-authored-by: Preston Van Loon <preston@pvl.dev>
Co-authored-by: nisdas <nishdas93@gmail.com>
This commit is contained in:
james-prysm
2025-01-14 02:35:49 -06:00
committed by GitHub
parent e5784d09f0
commit e36564c4d3
57 changed files with 614 additions and 388 deletions

View File

@@ -0,0 +1,77 @@
diff --git a/BUILD.bazel b/BUILD.bazel
index 9be80a1..0e78457 100755
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -8,58 +8,7 @@ go_library(
srcs = [
"hid.go",
"hid_disabled.go",
- "hid_enabled.go",
- "wchar.go",
],
- cgo = True,
- clinkopts = select({
- "@io_bazel_rules_go//go/platform:darwin": [
- "-framework CoreFoundation -framework IOKit -lobjc",
- ],
- "@io_bazel_rules_go//go/platform:freebsd": [
- "-lusb",
- ],
- "@io_bazel_rules_go//go/platform:linux": [
- "-lrt",
- ],
- "@io_bazel_rules_go//go/platform:windows": [
- "-lsetupapi",
- ],
- "//conditions:default": [],
- }),
- copts = select({
- "@io_bazel_rules_go//go/platform:android": [
- "-DDEFAULT_VISIBILITY=",
- "-DPOLL_NFDS_TYPE=int",
- "-Ihidapi/hidapi",
- "-Ilibusb/libusb -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H -DHAVE_CLOCK_GETTIME",
- ],
- "@io_bazel_rules_go//go/platform:darwin": [
- "-DDEFAULT_VISIBILITY=",
- "-DOS_DARWIN -DHAVE_SYS_TIME_H",
- "-DPOLL_NFDS_TYPE=int",
- "-Ihidapi/hidapi",
- ],
- "@io_bazel_rules_go//go/platform:freebsd": [
- "-DDEFAULT_VISIBILITY=",
- "-DOS_FREEBSD",
- "-DPOLL_NFDS_TYPE=int",
- "-Ihidapi/hidapi",
- ],
- "@io_bazel_rules_go//go/platform:linux": [
- "-DDEFAULT_VISIBILITY=",
- "-DPOLL_NFDS_TYPE=int",
- "-Ihidapi/hidapi",
- "-Ilibusb/libusb -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H -DHAVE_CLOCK_GETTIME",
- ],
- "@io_bazel_rules_go//go/platform:windows": [
- "-DDEFAULT_VISIBILITY=",
- "-DOS_WINDOWS",
- "-DPOLL_NFDS_TYPE=int",
- "-Ihidapi/hidapi",
- ],
- "//conditions:default": [],
- }),
importpath = "github.com/karalabe/hid",
visibility = ["//visibility:public"],
)
diff --git a/hid_disabled.go b/hid_disabled.go
index fa2c504..0091853 100644
--- a/hid_disabled.go
+++ b/hid_disabled.go
@@ -4,9 +4,6 @@
// This file is released under the 3-clause BSD license. Note however that Linux
// support depends on libusb, released under GNU LGPL 2.1 or later.
-//go:build (!freebsd && !linux && !darwin && !windows) || ios || !cgo
-// +build !freebsd,!linux,!darwin,!windows ios !cgo
-
package hid
// Supported returns whether this platform is supported by the HID library or not.

View File

@@ -1,6 +1,6 @@
load("@prysm//tools/go:def.bzl", "go_library", "go_test")
# gazelle:prefix github.com/karalabe/usb
# gazelle:prefix github.com/karalabe/hid
go_library(
name = "go_default_library",
@@ -10,7 +10,7 @@ go_library(
"usb.go",
"usb_disabled.go",
],
importpath = "github.com/karalabe/usb",
importpath = "github.com/karalabe/hid",
visibility = ["@com_github_ethereum_go_ethereum//:__subpackages__"],
)

View File

@@ -13,7 +13,7 @@
// You should have received a copy of the GNU Lesser General Public License along
// with the library. If not, see <http://www.gnu.org/licenses/>.
package usb
package hid
// HidDevice is a live HID USB connected device handle. On platforms that this file
// implements, the type lacks the actual HID device and all methods are noop.

View File

@@ -13,7 +13,7 @@
// You should have received a copy of the GNU Lesser General Public License along
// with the library. If not, see <http://www.gnu.org/licenses/>.
package usb
package hid
// RawDevice is a live raw USB connected device handle. On platforms that this file
// implements, the type lacks the actual USB device and all methods are noop.

View File

@@ -13,8 +13,8 @@
// You should have received a copy of the GNU Lesser General Public License along
// with the library. If not, see <http://www.gnu.org/licenses/>.
// Package usb provide interfaces for generic USB devices.
package usb
// Package hid provide interfaces for generic USB devices.
package hid
import "errors"

View File

@@ -13,7 +13,7 @@
// You should have received a copy of the GNU Lesser General Public License along
// with the library. If not, see <http://www.gnu.org/licenses/>.
package usb
package hid
// Supported returns whether this platform is supported by the USB library or not.
// The goal of this method is to allow programmatically handling platforms that do

View File

@@ -13,7 +13,7 @@
// You should have received a copy of the GNU Lesser General Public License along
// with the library. If not, see <http://www.gnu.org/licenses/>.
package usb
package hid
import (
"os"