From 821ec9e550da9fb881d9eb6c611b4283c289bfdc Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Wed, 14 Mar 2018 14:54:27 -0700 Subject: [PATCH] lnd: compute funding params for ltc if active --- lnd.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lnd.go b/lnd.go index 9b2f50885..f12b6010f 100644 --- a/lnd.go +++ b/lnd.go @@ -238,6 +238,17 @@ func lndMain() error { primaryChain := registeredChains.PrimaryChain() registeredChains.RegisterChain(primaryChain, activeChainControl) + // Select the configuration and furnding parameters for Bitcoin or + // Litecoin, depending on the primary registered chain. + chainCfg := cfg.Bitcoin + minRemoteDelay := minBtcRemoteDelay + maxRemoteDelay := maxBtcRemoteDelay + if primaryChain == litecoinChain { + chainCfg = cfg.Litecoin + minRemoteDelay = minLtcRemoteDelay + maxRemoteDelay = maxLtcRemoteDelay + } + // TODO(roasbeef): add rotation idPrivKey, err := activeChainControl.wallet.DerivePrivKey(keychain.KeyDescriptor{ KeyLocator: keychain.KeyLocator{ @@ -340,7 +351,7 @@ func lndMain() error { // In case the user has explicitly specified // a default value for the number of // confirmations, we use it. - defaultConf := uint16(cfg.Bitcoin.DefaultNumChanConfs) + defaultConf := uint16(chainCfg.DefaultNumChanConfs) if defaultConf != 0 { return defaultConf } @@ -373,13 +384,13 @@ func lndMain() error { // In case the user has explicitly specified // a default value for the remote delay, we // use it. - defaultDelay := uint16(cfg.Bitcoin.DefaultRemoteDelay) + defaultDelay := uint16(chainCfg.DefaultRemoteDelay) if defaultDelay > 0 { return defaultDelay } // If not we scale according to channel size. - delay := uint16(maxRemoteDelay * + delay := uint16(btcutil.Amount(maxRemoteDelay) * chanAmt / maxFundingAmount) if delay < minRemoteDelay { delay = minRemoteDelay