From 5ecde6d552e122f9e0dcb79c3fb015dcea9d0984 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 9 Sep 2019 03:22:18 -0700 Subject: [PATCH] lnwallet+chainntnfs: update to use latest neutrino APIs --- chainntnfs/neutrinonotify/neutrino.go | 6 +++--- lnwallet/btcwallet/blockchain.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go index ab9c51e9d..c7d2e1ad6 100644 --- a/chainntnfs/neutrinonotify/neutrino.go +++ b/chainntnfs/neutrinonotify/neutrino.go @@ -15,8 +15,8 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/gcs/builder" - "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightninglabs/neutrino" + "github.com/lightninglabs/neutrino/headerfs" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/queue" ) @@ -753,10 +753,10 @@ func (n *NeutrinoNotifier) RegisterSpendNtfn(outpoint *wire.OutPoint, spendReport, err := n.p2pNode.GetUtxo( neutrino.WatchInputs(inputToWatch), - neutrino.StartBlock(&waddrmgr.BlockStamp{ + neutrino.StartBlock(&headerfs.BlockStamp{ Height: int32(ntfn.HistoricalDispatch.StartHeight), }), - neutrino.EndBlock(&waddrmgr.BlockStamp{ + neutrino.EndBlock(&headerfs.BlockStamp{ Height: int32(ntfn.HistoricalDispatch.EndHeight), }), neutrino.QuitChan(n.quit), diff --git a/lnwallet/btcwallet/blockchain.go b/lnwallet/btcwallet/blockchain.go index 8aeb3338b..f59c462e0 100644 --- a/lnwallet/btcwallet/blockchain.go +++ b/lnwallet/btcwallet/blockchain.go @@ -10,8 +10,8 @@ import ( "github.com/btcsuite/btcutil" "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightninglabs/neutrino" + "github.com/lightninglabs/neutrino/headerfs" "github.com/lightningnetwork/lnd/lnwallet" ) @@ -48,7 +48,7 @@ func (b *BtcWallet) GetUtxo(op *wire.OutPoint, pkScript []byte, OutPoint: *op, PkScript: pkScript, }), - neutrino.StartBlock(&waddrmgr.BlockStamp{ + neutrino.StartBlock(&headerfs.BlockStamp{ Height: int32(heightHint), }), neutrino.QuitChan(cancel),