mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-23 06:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Use default seed for electrum if none is provided (#482)

Browse source
This commit is contained in:
Pierre-Marie Padiou 2018-03-15 11:29:08 +01:00 • committed by Dominique
parent 454535dd68
commit 49cbad1590
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala
View file

@ -31,7 +31,7 @@ import scala.concurrent.{Await, ExecutionContext, Future, Promise}
/**
* Setup eclair from a datadir.
*
*
* Created by PM on 25/01/2016.
*
* @param datadir directory where eclair-core will write/read its data
@ -139,11 +139,9 @@ class Setup(datadir: File, overrideDefaults: Config = ConfigFactory.empty(), act
val wallet = bitcoin match {
case Bitcoind(bitcoinClient) => new BitcoinCoreWallet(bitcoinClient)
case Electrum(electrumClient) => seed_opt match {
case Some(seed) => val electrumWallet = system.actorOf(ElectrumWallet.props(seed, electrumClient, ElectrumWallet.WalletParameters(Block.TestnetGenesisBlock.hash)), "electrum-wallet")
new ElectrumEclairWallet(electrumWallet)
case _ => throw new RuntimeException("electrum wallet requires a seed to set up")
}
case Electrum(electrumClient) =>
val electrumWallet = system.actorOf(ElectrumWallet.props(seed, electrumClient, ElectrumWallet.WalletParameters(Block.TestnetGenesisBlock.hash)), "electrum-wallet")
new ElectrumEclairWallet(electrumWallet)
}
wallet.getFinalAddress.map {
case address => logger.info(s"initial wallet address=$address")