Merge pull request #3345 from Roasbeef/tower-fixes

watchtower: minor client side tower fixes
This commit is contained in:
Johan T. Halseth 2019-07-25 08:58:33 +02:00 committed by GitHub
commit 5c4ac9f965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

@ -1104,8 +1104,8 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB,
Dial: cfg.net.Dial, Dial: cfg.net.Dial,
AuthDial: wtclient.AuthDial, AuthDial: wtclient.AuthDial,
DB: towerClientDB, DB: towerClientDB,
Policy: wtpolicy.DefaultPolicy(),
PrivateTower: cfg.WtClient.PrivateTowers[0], PrivateTower: cfg.WtClient.PrivateTowers[0],
Policy: policy,
ChainHash: *activeNetParams.GenesisHash, ChainHash: *activeNetParams.GenesisHash,
MinBackoff: 10 * time.Second, MinBackoff: 10 * time.Second,
MaxBackoff: 5 * time.Minute, MaxBackoff: 5 * time.Minute,

@ -27,11 +27,11 @@ const (
// DefaultSweepFeeRate specifies the fee rate used to construct justice // DefaultSweepFeeRate specifies the fee rate used to construct justice
// transactions. The value is expressed in satoshis per kilo-weight. // transactions. The value is expressed in satoshis per kilo-weight.
DefaultSweepFeeRate = lnwallet.SatPerKWeight(40000) DefaultSweepFeeRate = lnwallet.SatPerKWeight(2500)
// MinSweepFeeRate is the minimum sweep fee rate a client may use in its // MinSweepFeeRate is the minimum sweep fee rate a client may use in its
// policy, the current value is 4 sat/kw. // policy, the current value is 4 sat/vbyte.
MinSweepFeeRate = lnwallet.SatPerKWeight(4000) MinSweepFeeRate = lnwallet.SatPerKWeight(1000)
) )
var ( var (