akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnwallet+chainntnfs: update to use latest neutrino APIs

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2019-09-09 03:22:18 -07:00
parent 5fc003d6a1
commit 5ecde6d552
No known key found for this signature in database
GPG Key ID: CE58F7F8E20FD9A2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chainntnfs/neutrinonotify/neutrino.go
View File

@ -15,8 +15,8 @@ import (
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcutil/gcs/builder"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/queue" "github.com/lightningnetwork/lnd/queue"
) )
@ -753,10 +753,10 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint,
spendReport, err := n.p2pNode.GetUtxo( spendReport, err := n.p2pNode.GetUtxo(
neutrino.WatchInputs(inputToWatch), neutrino.WatchInputs(inputToWatch),
neutrino.StartBlock(&waddrmgr.BlockStamp{ neutrino.StartBlock(&headerfs.BlockStamp{
Height: int32(ntfn.HistoricalDispatch.StartHeight), Height: int32(ntfn.HistoricalDispatch.StartHeight),
}), }),
neutrino.EndBlock(&waddrmgr.BlockStamp{ neutrino.EndBlock(&headerfs.BlockStamp{
Height: int32(ntfn.HistoricalDispatch.EndHeight), Height: int32(ntfn.HistoricalDispatch.EndHeight),
}), }),
neutrino.QuitChan(n.quit), neutrino.QuitChan(n.quit),

4
lnwallet/btcwallet/blockchain.go
View File

@ -10,8 +10,8 @@ import (
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/waddrmgr"
"github.com/lightninglabs/neutrino" "github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
) )
@ -48,7 +48,7 @@ func (b *BtcWallet) GetUtxo(op *wire.OutPoint, pkScript []byte,
OutPoint: *op, OutPoint: *op,
PkScript: pkScript, PkScript: pkScript,
}), }),
neutrino.StartBlock(&waddrmgr.BlockStamp{ neutrino.StartBlock(&headerfs.BlockStamp{
Height: int32(heightHint), Height: int32(heightHint),
}), }),
neutrino.QuitChan(cancel), neutrino.QuitChan(cancel),