Merge branch 'ethereum:master' into portal

optimism-java · Jul 5, 2024 · 5b40276 · 5b40276
2 parents 9624e6f + 2d9d423
commit 5b40276
Show file tree

Hide file tree

Showing 18 changed files with 5,097 additions and 3,055 deletions.
diff --git a/accounts/abi/bind/source.go.tpl b/accounts/abi/bind/source.go.tpl
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
diff --git a/accounts/usbwallet/trezor/messages-common.pb.go b/accounts/usbwallet/trezor/messages-common.pb.go
diff --git a/accounts/usbwallet/trezor/messages-common.proto b/accounts/usbwallet/trezor/messages-common.proto
@@ -5,6 +5,8 @@
 syntax = "proto2";
 package hw.trezor.messages.common;
 
+option go_package  = "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor";
+
 /**
  * Response: Success of the previous request
  * @end