Include mnemonic dependency directly.

This commit is contained in:
tecnovert
2024-05-29 09:39:13 +02:00
parent d3e3c3c95b
commit ae1df0b556
24 changed files with 24894 additions and 12 deletions

View File

@@ -8,7 +8,7 @@
from .btc import BTCInterface
from basicswap.chainparams import Coins
from basicswap.util.address import decodeAddress
from mnemonic import Mnemonic
from basicswap.contrib.mnemonic import Mnemonic
from basicswap.contrib.test_framework.script import (
CScript,
OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG
@@ -25,11 +25,11 @@ class DASHInterface(BTCInterface):
self._wallet_passphrase = ''
self._have_checked_seed = False
def seedToMnemonic(self, key: bytes) -> str:
def entropyToMnemonic(self, key: bytes) -> str:
return Mnemonic('english').to_mnemonic(key)
def initialiseWallet(self, key: bytes):
words = self.seedToMnemonic(key)
words = self.entropyToMnemonic(key)
mnemonic_passphrase = ''
self.rpc_wallet('upgradetohd', [words, mnemonic_passphrase, self._wallet_passphrase])

View File

@@ -21,6 +21,7 @@ from basicswap.interface.btc import (
)
from basicswap.rpc import make_rpc_func
from basicswap.chainparams import Coins
from basicswap.contrib.mnemonic import Mnemonic
from basicswap.interface.contrib.nav_test_framework.mininode import (
CTxIn,
CTxOut,
@@ -52,7 +53,6 @@ from basicswap.interface.contrib.nav_test_framework.script import (
SIGHASH_ALL,
SegwitVersion1SignatureHash,
)
from mnemonic import Mnemonic
class NAVInterface(BTCInterface):
@@ -77,7 +77,7 @@ class NAVInterface(BTCInterface):
# p2sh-p2wsh
return True
def seedToMnemonic(self, key: bytes) -> None:
def entropyToMnemonic(self, key: bytes) -> None:
return Mnemonic('english').to_mnemonic(key)
def initialiseWallet(self, key):