Merge remote-tracking branch 'upstream/master'

Groestlcoin · Jul 4, 2024 · c7ca130 · c7ca130
2 parents d1cf976 + 295ea97
commit c7ca130
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/electrum_grs/plugins/digitalbitbox/digitalbitbox.py b/electrum_grs/plugins/digitalbitbox/digitalbitbox.py
@@ -18,12 +18,11 @@
 from typing import TYPE_CHECKING, Optional
 
 from electrum_grs.crypto import sha256d, EncodeAES_bytes, DecodeAES_bytes, hmac_oneshot
-from electrum_grs.bitcoin import public_key_to_p2pkh
+from electrum_grs.bitcoin import public_key_to_p2pkh, usermessage_magic
 from electrum_grs.bip32 import BIP32Node, convert_bip32_intpath_to_strpath, is_all_public_derivation
 from electrum_grs.bip32 import normalize_bip32_derivation
 from electrum_grs import descriptor
 from electrum_grs import ecc
-from electrum_grs.ecc import usermessage_magic
 from electrum_grs.wallet import Standard_Wallet
 from electrum_grs import constants
 from electrum_grs.transaction import Transaction, PartialTransaction, PartialTxInput, Sighash