vendor: use new org name bitboxswiss

Changed org ti github.com/BitBoxSwiss Added latest bitbox02-api-go and block-client-go and ran 'go mod tidy && go mod vendor'
thisconnect · May 16, 2024 · 36ccd2b · 36ccd2b
1 parent bfd31ad
commit 36ccd2b
Show file tree

Hide file tree

Showing 58 changed files with 89 additions and 46 deletions.
diff --git a/go.mod b/go.mod
@@ -1,14 +1,14 @@
-module github.com/digitalbitbox/bitbox-wallet-app
+module github.com/BitBoxSwiss/bitbox-wallet-app
 
 go 1.20
 
 require (
+	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240516070751-b22740e514bc
+	github.com/BitBoxSwiss/block-client-go v0.0.0-20240516081043-0d604acd6519
 	github.com/btcsuite/btcd v0.24.0
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
-	github.com/digitalbitbox/bitbox02-api-go v0.0.0-20240326091417-c9753acb0d16
-	github.com/digitalbitbox/block-client-go v0.0.0-20240228201430-dd85a15ace33
 	github.com/ethereum/go-ethereum v1.13.4
 	github.com/flynn/noise v1.1.0
 	github.com/gorilla/mux v1.8.1
@@ -27,8 +27,6 @@ require (
 replace github.com/karalabe/hid => github.com/benma/hid v0.0.0-20240312170000-f050ee197113
 
 require (
-	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240516070751-b22740e514bc // indirect
-	github.com/BitBoxSwiss/block-client-go v0.0.0-20240516081043-0d604acd6519 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/aead/siphash v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -72,10 +72,6 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2U
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
-github.com/digitalbitbox/bitbox02-api-go v0.0.0-20240326091417-c9753acb0d16 h1:xdtqrFcibMBWiAYRjL55KvVWuczEtvRMq89mRRoNrpg=
-github.com/digitalbitbox/bitbox02-api-go v0.0.0-20240326091417-c9753acb0d16/go.mod h1:vCNZkkOcxHd92woSH0Hp5oMjMAIe9tMEGq4QOvj+0cY=
-github.com/digitalbitbox/block-client-go v0.0.0-20240228201430-dd85a15ace33 h1:W4aeOII3U0zuzvcRejcCoa+1yGFrgJa082VRxwvVGhY=
-github.com/digitalbitbox/block-client-go v0.0.0-20240228201430-dd85a15ace33/go.mod h1:zbeSf0Y9eGKQBx4ZE3lMJF1Wt2cjpM8m3VFiZC3Nv9w=
 github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
 github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-ethereum v1.13.4 h1:25HJnaWVg3q1O7Z62LaaI6S9wVq8QCw3K88g8wEzrcM=

diff --git a/...com/digitalbitbox/bitbox02-api-go/LICENSE → ...b.com/BitBoxSwiss/bitbox02-api-go/LICENSE b/...com/digitalbitbox/bitbox02-api-go/LICENSE → ...b.com/BitBoxSwiss/bitbox02-api-go/LICENSE
diff --git a/.../bitbox02-api-go/api/bootloader/device.go → .../bitbox02-api-go/api/bootloader/device.go b/.../bitbox02-api-go/api/bootloader/device.go → .../bitbox02-api-go/api/bootloader/device.go
diff --git a/vendor/github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader/util.go b/vendor/github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader/util.go
diff --git a/...tbox/bitbox02-api-go/api/common/common.go → ...wiss/bitbox02-api-go/api/common/common.go b/...tbox/bitbox02-api-go/api/common/common.go → ...wiss/bitbox02-api-go/api/common/common.go
diff --git a/...tbox02-api-go/api/firmware/attestation.go → ...tbox02-api-go/api/firmware/attestation.go b/...tbox02-api-go/api/firmware/attestation.go → ...tbox02-api-go/api/firmware/attestation.go
diff --git a/...ox/bitbox02-api-go/api/firmware/backup.go → ...ss/bitbox02-api-go/api/firmware/backup.go b/...ox/bitbox02-api-go/api/firmware/backup.go → ...ss/bitbox02-api-go/api/firmware/backup.go
diff --git a/...box/bitbox02-api-go/api/firmware/bip85.go → ...iss/bitbox02-api-go/api/firmware/bip85.go b/...box/bitbox02-api-go/api/firmware/bip85.go → ...iss/bitbox02-api-go/api/firmware/bip85.go
diff --git a/...itbox/bitbox02-api-go/api/firmware/btc.go → ...Swiss/bitbox02-api-go/api/firmware/btc.go b/...itbox/bitbox02-api-go/api/firmware/btc.go → ...Swiss/bitbox02-api-go/api/firmware/btc.go
diff --git a/...x/bitbox02-api-go/api/firmware/cardano.go → ...s/bitbox02-api-go/api/firmware/cardano.go b/...x/bitbox02-api-go/api/firmware/cardano.go → ...s/bitbox02-api-go/api/firmware/cardano.go
diff --git a/...ox/bitbox02-api-go/api/firmware/device.go → ...ss/bitbox02-api-go/api/firmware/device.go b/...ox/bitbox02-api-go/api/firmware/device.go → ...ss/bitbox02-api-go/api/firmware/device.go
diff --git a/...box/bitbox02-api-go/api/firmware/error.go → ...iss/bitbox02-api-go/api/firmware/error.go b/...box/bitbox02-api-go/api/firmware/error.go → ...iss/bitbox02-api-go/api/firmware/error.go
diff --git a/...itbox/bitbox02-api-go/api/firmware/eth.go → ...Swiss/bitbox02-api-go/api/firmware/eth.go b/...itbox/bitbox02-api-go/api/firmware/eth.go → ...Swiss/bitbox02-api-go/api/firmware/eth.go
diff --git a/...box/bitbox02-api-go/api/firmware/event.go → ...iss/bitbox02-api-go/api/firmware/event.go b/...box/bitbox02-api-go/api/firmware/event.go → ...iss/bitbox02-api-go/api/firmware/event.go
diff --git a/...go/api/firmware/messages/antiklepto.pb.go → ...go/api/firmware/messages/antiklepto.pb.go b/...go/api/firmware/messages/antiklepto.pb.go → ...go/api/firmware/messages/antiklepto.pb.go
diff --git a/...go/api/firmware/messages/antiklepto.proto → ...go/api/firmware/messages/antiklepto.proto b/...go/api/firmware/messages/antiklepto.proto → ...go/api/firmware/messages/antiklepto.proto
diff --git a/...i/firmware/messages/backup_commands.pb.go → ...i/firmware/messages/backup_commands.pb.go b/...i/firmware/messages/backup_commands.pb.go → ...i/firmware/messages/backup_commands.pb.go
diff --git a/...i/firmware/messages/backup_commands.proto → ...i/firmware/messages/backup_commands.proto b/...i/firmware/messages/backup_commands.proto → ...i/firmware/messages/backup_commands.proto
diff --git a/...i/firmware/messages/bitbox02_system.pb.go → ...i/firmware/messages/bitbox02_system.pb.go b/...i/firmware/messages/bitbox02_system.pb.go → ...i/firmware/messages/bitbox02_system.pb.go
diff --git a/...i/firmware/messages/bitbox02_system.proto → ...i/firmware/messages/bitbox02_system.proto b/...i/firmware/messages/bitbox02_system.proto → ...i/firmware/messages/bitbox02_system.proto
diff --git a/...02-api-go/api/firmware/messages/btc.pb.go → ...02-api-go/api/firmware/messages/btc.pb.go b/...02-api-go/api/firmware/messages/btc.pb.go → ...02-api-go/api/firmware/messages/btc.pb.go
diff --git a/...02-api-go/api/firmware/messages/btc.proto → ...02-api-go/api/firmware/messages/btc.proto b/...02-api-go/api/firmware/messages/btc.proto → ...02-api-go/api/firmware/messages/btc.proto
diff --git a/...pi-go/api/firmware/messages/cardano.pb.go → ...pi-go/api/firmware/messages/cardano.pb.go b/...pi-go/api/firmware/messages/cardano.pb.go → ...pi-go/api/firmware/messages/cardano.pb.go
diff --git a/...pi-go/api/firmware/messages/cardano.proto → ...pi-go/api/firmware/messages/cardano.proto b/...pi-go/api/firmware/messages/cardano.proto → ...pi-go/api/firmware/messages/cardano.proto
diff --git a/...api-go/api/firmware/messages/common.pb.go → ...api-go/api/firmware/messages/common.pb.go b/...api-go/api/firmware/messages/common.pb.go → ...api-go/api/firmware/messages/common.pb.go
diff --git a/...api-go/api/firmware/messages/common.proto → ...api-go/api/firmware/messages/common.proto b/...api-go/api/firmware/messages/common.proto → ...api-go/api/firmware/messages/common.proto
diff --git a/...02-api-go/api/firmware/messages/eth.pb.go → ...02-api-go/api/firmware/messages/eth.pb.go b/...02-api-go/api/firmware/messages/eth.pb.go → ...02-api-go/api/firmware/messages/eth.pb.go
diff --git a/...02-api-go/api/firmware/messages/eth.proto → ...02-api-go/api/firmware/messages/eth.proto b/...02-api-go/api/firmware/messages/eth.proto → ...02-api-go/api/firmware/messages/eth.proto
diff --git a/...-api-go/api/firmware/messages/generate.sh → ...-api-go/api/firmware/messages/generate.sh b/...-api-go/api/firmware/messages/generate.sh → ...-api-go/api/firmware/messages/generate.sh
diff --git a/...02-api-go/api/firmware/messages/hww.pb.go → ...02-api-go/api/firmware/messages/hww.pb.go b/...02-api-go/api/firmware/messages/hww.pb.go → ...02-api-go/api/firmware/messages/hww.pb.go
diff --git a/...02-api-go/api/firmware/messages/hww.proto → ...02-api-go/api/firmware/messages/hww.proto b/...02-api-go/api/firmware/messages/hww.proto → ...02-api-go/api/firmware/messages/hww.proto
diff --git a/...i-go/api/firmware/messages/keystore.pb.go → ...i-go/api/firmware/messages/keystore.pb.go b/...i-go/api/firmware/messages/keystore.pb.go → ...i-go/api/firmware/messages/keystore.pb.go
diff --git a/...i-go/api/firmware/messages/keystore.proto → ...i-go/api/firmware/messages/keystore.proto b/...i-go/api/firmware/messages/keystore.proto → ...i-go/api/firmware/messages/keystore.proto
diff --git a/...i-go/api/firmware/messages/mnemonic.pb.go → ...i-go/api/firmware/messages/mnemonic.pb.go b/...i-go/api/firmware/messages/mnemonic.pb.go → ...i-go/api/firmware/messages/mnemonic.pb.go
diff --git a/...i-go/api/firmware/messages/mnemonic.proto → ...i-go/api/firmware/messages/mnemonic.proto b/...i-go/api/firmware/messages/mnemonic.proto → ...i-go/api/firmware/messages/mnemonic.proto
diff --git a/...rmware/messages/perform_attestation.pb.go → ...rmware/messages/perform_attestation.pb.go b/...rmware/messages/perform_attestation.pb.go → ...rmware/messages/perform_attestation.pb.go
diff --git a/...rmware/messages/perform_attestation.proto → ...rmware/messages/perform_attestation.proto b/...rmware/messages/perform_attestation.proto → ...rmware/messages/perform_attestation.proto
diff --git a/...api-go/api/firmware/messages/system.pb.go → ...api-go/api/firmware/messages/system.pb.go b/...api-go/api/firmware/messages/system.pb.go → ...api-go/api/firmware/messages/system.pb.go
diff --git a/...api-go/api/firmware/messages/system.proto → ...api-go/api/firmware/messages/system.proto b/...api-go/api/firmware/messages/system.proto → ...api-go/api/firmware/messages/system.proto
diff --git a/.../bitbox02-api-go/api/firmware/mnemonic.go → .../bitbox02-api-go/api/firmware/mnemonic.go b/.../bitbox02-api-go/api/firmware/mnemonic.go → .../bitbox02-api-go/api/firmware/mnemonic.go
diff --git a/...x/bitbox02-api-go/api/firmware/pairing.go → ...s/bitbox02-api-go/api/firmware/pairing.go b/...x/bitbox02-api-go/api/firmware/pairing.go → ...s/bitbox02-api-go/api/firmware/pairing.go
diff --git a/...box/bitbox02-api-go/api/firmware/query.go → ...iss/bitbox02-api-go/api/firmware/query.go b/...box/bitbox02-api-go/api/firmware/query.go → ...iss/bitbox02-api-go/api/firmware/query.go
diff --git a/...ox/bitbox02-api-go/api/firmware/random.go → ...ss/bitbox02-api-go/api/firmware/random.go b/...ox/bitbox02-api-go/api/firmware/random.go → ...ss/bitbox02-api-go/api/firmware/random.go
diff --git a/...ox/bitbox02-api-go/api/firmware/sdcard.go → ...ss/bitbox02-api-go/api/firmware/sdcard.go b/...ox/bitbox02-api-go/api/firmware/sdcard.go → ...ss/bitbox02-api-go/api/firmware/sdcard.go
diff --git a/...bitbox02-api-go/api/firmware/secp256k1.go → ...bitbox02-api-go/api/firmware/secp256k1.go b/...bitbox02-api-go/api/firmware/secp256k1.go → ...bitbox02-api-go/api/firmware/secp256k1.go
diff --git a/...ox/bitbox02-api-go/api/firmware/status.go → ...ss/bitbox02-api-go/api/firmware/status.go b/...ox/bitbox02-api-go/api/firmware/status.go → ...ss/bitbox02-api-go/api/firmware/status.go
diff --git a/...ox/bitbox02-api-go/api/firmware/system.go → ...ss/bitbox02-api-go/api/firmware/system.go b/...ox/bitbox02-api-go/api/firmware/system.go → ...ss/bitbox02-api-go/api/firmware/system.go
diff --git a/...x02-api-go/communication/u2fhid/u2fhid.go → ...x02-api-go/communication/u2fhid/u2fhid.go b/...x02-api-go/communication/u2fhid/u2fhid.go → ...x02-api-go/communication/u2fhid/u2fhid.go
diff --git a/...lbitbox/bitbox02-api-go/util/errp/errp.go → ...oxSwiss/bitbox02-api-go/util/errp/errp.go b/...lbitbox/bitbox02-api-go/util/errp/errp.go → ...oxSwiss/bitbox02-api-go/util/errp/errp.go
diff --git a/...box/bitbox02-api-go/util/semver/semver.go → ...iss/bitbox02-api-go/util/semver/semver.go b/...box/bitbox02-api-go/util/semver/semver.go → ...iss/bitbox02-api-go/util/semver/semver.go
diff --git a/...com/digitalbitbox/block-client-go/LICENSE → ...b.com/BitBoxSwiss/block-client-go/LICENSE b/...com/digitalbitbox/block-client-go/LICENSE → ...b.com/BitBoxSwiss/block-client-go/LICENSE
diff --git a/...bitbox/block-client-go/electrum/client.go → ...xSwiss/block-client-go/electrum/client.go b/...bitbox/block-client-go/electrum/client.go → ...xSwiss/block-client-go/electrum/client.go
diff --git a/...x/block-client-go/electrum/types/types.go → ...s/block-client-go/electrum/types/types.go b/...x/block-client-go/electrum/types/types.go → ...s/block-client-go/electrum/types/types.go
diff --git a/...tbox/block-client-go/failover/failover.go → ...wiss/block-client-go/failover/failover.go b/...tbox/block-client-go/failover/failover.go → ...wiss/block-client-go/failover/failover.go
diff --git a/...lbitbox/block-client-go/jsonrpc/client.go → ...oxSwiss/block-client-go/jsonrpc/client.go b/...lbitbox/block-client-go/jsonrpc/client.go → ...oxSwiss/block-client-go/jsonrpc/client.go
diff --git a/...ox/block-client-go/jsonrpc/types/types.go → ...ss/block-client-go/jsonrpc/types/types.go b/...ox/block-client-go/jsonrpc/types/types.go → ...ss/block-client-go/jsonrpc/types/types.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,3 +1,19 @@
+# github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240516070751-b22740e514bc
+## explicit; go 1.13
+github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader
+github.com/BitBoxSwiss/bitbox02-api-go/api/common
+github.com/BitBoxSwiss/bitbox02-api-go/api/firmware
+github.com/BitBoxSwiss/bitbox02-api-go/api/firmware/messages
+github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid
+github.com/BitBoxSwiss/bitbox02-api-go/util/errp
+github.com/BitBoxSwiss/bitbox02-api-go/util/semver
+# github.com/BitBoxSwiss/block-client-go v0.0.0-20240516081043-0d604acd6519
+## explicit; go 1.19
+github.com/BitBoxSwiss/block-client-go/electrum
+github.com/BitBoxSwiss/block-client-go/electrum/types
+github.com/BitBoxSwiss/block-client-go/failover
+github.com/BitBoxSwiss/block-client-go/jsonrpc
+github.com/BitBoxSwiss/block-client-go/jsonrpc/types
 # github.com/Microsoft/go-winio v0.6.1
 ## explicit; go 1.17
 github.com/Microsoft/go-winio
@@ -82,22 +98,6 @@ github.com/decred/dcrd/crypto/blake256
 github.com/decred/dcrd/dcrec/secp256k1/v4
 github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa
 github.com/decred/dcrd/dcrec/secp256k1/v4/schnorr
-# github.com/digitalbitbox/bitbox02-api-go v0.0.0-20240326091417-c9753acb0d16
-## explicit; go 1.13
-github.com/digitalbitbox/bitbox02-api-go/api/bootloader
-github.com/digitalbitbox/bitbox02-api-go/api/common
-github.com/digitalbitbox/bitbox02-api-go/api/firmware
-github.com/digitalbitbox/bitbox02-api-go/api/firmware/messages
-github.com/digitalbitbox/bitbox02-api-go/communication/u2fhid
-github.com/digitalbitbox/bitbox02-api-go/util/errp
-github.com/digitalbitbox/bitbox02-api-go/util/semver
-# github.com/digitalbitbox/block-client-go v0.0.0-20240228201430-dd85a15ace33
-## explicit; go 1.19
-github.com/digitalbitbox/block-client-go/electrum
-github.com/digitalbitbox/block-client-go/electrum/types
-github.com/digitalbitbox/block-client-go/failover
-github.com/digitalbitbox/block-client-go/jsonrpc
-github.com/digitalbitbox/block-client-go/jsonrpc/types
 # github.com/ethereum/c-kzg-4844 v0.4.0
 ## explicit; go 1.19
 github.com/ethereum/c-kzg-4844/bindings/go