2019-12-12 01:40:41 +01:00
|
|
|
This patch will not be necessary once https://github.com/karalabe/usb/pull/14 has been merged.
|
|
|
|
|
|
2021-05-04 16:54:27 +02:00
|
|
|
diff -uNr go-ethereum-1.10.2/accounts/usbwallet/hub.go go-ethereum-1.10.2.mod/accounts/usbwallet/hub.go
|
|
|
|
|
--- go-ethereum-1.10.2/accounts/usbwallet/hub.go 2021-04-08 11:02:25.000000000 +0000
|
|
|
|
|
+++ go-ethereum-1.10.2.mod/accounts/usbwallet/hub.go 2021-05-04 14:37:49.283368163 +0000
|
2019-12-12 01:40:41 +01:00
|
|
|
@@ -26,7 +26,7 @@
|
|
|
|
|
"github.com/ethereum/go-ethereum/accounts"
|
|
|
|
|
"github.com/ethereum/go-ethereum/event"
|
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
|
|
- "github.com/karalabe/usb"
|
|
|
|
|
+ "github.com/fornwall/usb"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// LedgerScheme is the protocol scheme prefixing account and wallet URLs.
|
2021-05-04 16:54:27 +02:00
|
|
|
diff -uNr go-ethereum-1.10.2/accounts/usbwallet/wallet.go go-ethereum-1.10.2.mod/accounts/usbwallet/wallet.go
|
|
|
|
|
--- go-ethereum-1.10.2/accounts/usbwallet/wallet.go 2021-04-08 11:02:25.000000000 +0000
|
|
|
|
|
+++ go-ethereum-1.10.2.mod/accounts/usbwallet/wallet.go 2021-05-04 14:37:55.783368221 +0000
|
2019-12-12 01:40:41 +01:00
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
|
|
- "github.com/karalabe/usb"
|
|
|
|
|
+ "github.com/fornwall/usb"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Maximum time between wallet health checks to detect USB unplugs.
|
2021-05-04 16:54:27 +02:00
|
|
|
diff -uNr go-ethereum-1.10.2/go.mod go-ethereum-1.10.2.mod/go.mod
|
|
|
|
|
--- go-ethereum-1.10.2/go.mod 2021-04-08 11:02:25.000000000 +0000
|
|
|
|
|
+++ go-ethereum-1.10.2.mod/go.mod 2021-05-04 14:39:41.515369240 +0000
|
|
|
|
|
@@ -36,7 +36,7 @@
|
2019-12-12 01:40:41 +01:00
|
|
|
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458
|
2021-05-04 16:54:27 +02:00
|
|
|
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e
|
|
|
|
|
github.com/julienschmidt/httprouter v1.2.0
|
2019-12-12 01:40:41 +01:00
|
|
|
- github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356
|
|
|
|
|
+ github.com/fornwall/usb v0.0.0-20191212001557-3a1f5af8866c
|
|
|
|
|
github.com/mattn/go-colorable v0.1.0
|
2021-05-04 16:54:27 +02:00
|
|
|
github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035
|
|
|
|
|
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
|
|
|
|
|
diff -uNr go-ethereum-1.10.2/go.sum go-ethereum-1.10.2.mod/go.sum
|
|
|
|
|
--- go-ethereum-1.10.2/go.sum 2021-04-08 11:02:25.000000000 +0000
|
|
|
|
|
+++ go-ethereum-1.10.2.mod/go.sum 2021-05-04 14:40:35.155369756 +0000
|
|
|
|
|
@@ -153,6 +153,8 @@
|
|
|
|
|
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
|
|
|
|
|
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
|
|
|
|
|
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
|
|
|
|
|
+github.com/fornwall/usb v0.0.0-20191212001557-3a1f5af8866c h1:UEdVa8x3R4rIeAqtLrm5Vhy65uWGrOEPTLCk+M5tfIo=
|
|
|
|
|
+github.com/fornwall/usb v0.0.0-20191212001557-3a1f5af8866c/go.mod h1:V2RANuPizn/vsKfOeHqQpxT2CfBd2TowKNE3owVHHoM=
|
|
|
|
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
|
|
|
|
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
|
|
|
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
