From f70027fe764e711d02baaa0c7e7c5717df1b151d Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 16 Dec 2015 13:04:51 -0600 Subject: [PATCH] add SegWit to support channel types --- wallet/wallet.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wallet/wallet.go b/wallet/wallet.go index 2bb7ffbd..24330105 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -51,10 +51,13 @@ var ( type FundingType uint16 const ( - //Use SIGHASH_NOINPUT, assumes CSV - SIGHASH FundingType = iota + // Use SegWit, assumes CSV+CLTV + SEGWIT FundingType = iota - //Use CSV without reserve + // Use SIGHASH_NOINPUT, assumes CSV+CLTV + SIGHASH + + // Use CSV without reserve CSV // Use CSV with reserve @@ -419,6 +422,7 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg // handleFundingReserveCancel... func (l *LightningWallet) handleFundingCancelRequest(req *fundingReserveCancelMsg) { // TODO(roasbeef): holding lock too long + // RLOCK? l.limboMtx.Lock() defer l.limboMtx.Unlock()