From d86fe393cd709419451e35c5de523705cb85f0e1 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 12 Mar 2019 21:37:15 -0700 Subject: [PATCH] multi: update build to latest version of neutrino+btcwallet In this commit, we update the build to point to the latest version of neutrino and btcwallet. The latest version of neutrino includes a number of bug fixes, and new features like reliably transaction broadcast. The latest version of btcwallet contains a number of bug fixes related to properly remove invalid transactions from its database. --- chainntnfs/neutrinonotify/neutrino.go | 7 ++++++- chainntnfs/neutrinonotify/neutrino_dev.go | 7 ++++++- go.mod | 7 +++---- go.sum | 15 +++++++-------- routing/chainview/neutrino.go | 7 ++++++- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go index 2a5474ae..76a6b71e 100644 --- a/chainntnfs/neutrinonotify/neutrino.go +++ b/chainntnfs/neutrinonotify/neutrino.go @@ -154,7 +154,12 @@ func (n *NeutrinoNotifier) Start() error { // Finally, we'll create our rescan struct, start it, and launch all // the goroutines we need to operate this ChainNotifier instance. - n.chainView = n.p2pNode.NewRescan(rescanOptions...) + n.chainView = neutrino.NewRescan( + &neutrino.RescanChainSource{ + ChainService: n.p2pNode, + }, + rescanOptions..., + ) n.rescanErr = n.chainView.Start() n.chainUpdates.Start() diff --git a/chainntnfs/neutrinonotify/neutrino_dev.go b/chainntnfs/neutrinonotify/neutrino_dev.go index 61c24942..728514aa 100644 --- a/chainntnfs/neutrinonotify/neutrino_dev.go +++ b/chainntnfs/neutrinonotify/neutrino_dev.go @@ -55,7 +55,12 @@ func (n *NeutrinoNotifier) UnsafeStart(bestHeight int32, // Finally, we'll create our rescan struct, start it, and launch all // the goroutines we need to operate this ChainNotifier instance. - n.chainView = n.p2pNode.NewRescan(rescanOptions...) + n.chainView = neutrino.NewRescan( + &neutrino.RescanChainSource{ + ChainService: n.p2pNode, + }, + rescanOptions..., + ) n.rescanErr = n.chainView.Start() n.chainUpdates.Start() diff --git a/go.mod b/go.mod index 87305738..2f898fb3 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,8 @@ require ( github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803 - github.com/btcsuite/btcwallet v0.0.0-20190213034619-b51c1adeee55 + github.com/btcsuite/btcwallet v0.0.0-20190313041134-68fc7c82e131 github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941 - github.com/btcsuite/goleveldb v1.0.0 // indirect github.com/coreos/bbolt v1.3.2 github.com/davecgh/go-spew v1.1.1 github.com/go-errors/errors v1.0.1 @@ -29,9 +28,9 @@ require ( github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect github.com/juju/version v0.0.0-20180108022336-b64dbd566305 // indirect github.com/kkdai/bstream v0.0.0-20181106074824-b3251f7901ec - github.com/lightninglabs/neutrino v0.0.0-20190219013218-1a80fd3d0e92 + github.com/lightninglabs/neutrino v0.0.0-20190313220016-a6cc2a8361d5 github.com/lightningnetwork/lightning-onion v0.0.0-20180605012408-ac4d9da8f1d6 - github.com/lightningnetwork/lnd/queue v1.0.0 + github.com/lightningnetwork/lnd/queue v1.0.1 github.com/lightningnetwork/lnd/ticker v1.0.0 github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 github.com/miekg/dns v0.0.0-20171125082028-79bfde677fa8 diff --git a/go.sum b/go.sum index 29eda9ae..c0c863e2 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,9 @@ github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+q github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803 h1:j3AgPKKZtZStM2nyhrDSLSYgT7YHrZKdSkq1OYeLjvM= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcwallet v0.0.0-20180904010540-284e2e0e696e33d5be388f7f3d9a26db703e0c06/go.mod h1:/d7QHZsfUAruXuBhyPITqoYOmJ+nq35qPsJjz/aSpCg= -github.com/btcsuite/btcwallet v0.0.0-20190213034619-b51c1adeee55 h1:uqSp3UVNrKl01OSHOAk1JtKcaPNAAW6wpWk3eKm18Yk= -github.com/btcsuite/btcwallet v0.0.0-20190213034619-b51c1adeee55/go.mod h1:mkOYY8/psBiL5E+Wb0V7M0o+N7NXi2SZJz6+RKkncIc= +github.com/btcsuite/btcwallet v0.0.0-20190313032608-acf3b04b0273/go.mod h1:mkOYY8/psBiL5E+Wb0V7M0o+N7NXi2SZJz6+RKkncIc= +github.com/btcsuite/btcwallet v0.0.0-20190313041134-68fc7c82e131 h1:BhBlN90EcFIWGSduKOGckSwBQC1kBeavQ16DqzFj+gw= +github.com/btcsuite/btcwallet v0.0.0-20190313041134-68fc7c82e131/go.mod h1:qMi4jGpAO6YRsd81RYDG7o5pBIGqN9faCioJdagLu64= github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941 h1:kij1x2aL7VE6gtx8KMIt8PGPgI5GV9LgtHFG5KaEMPY= github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941/go.mod h1:QcFA8DZHtuIAdYKCq/BzELOaznRsCvwf4zTPmaYwaig= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= @@ -99,14 +100,12 @@ github.com/lightninglabs/gozmq v0.0.0-20180324010646-462a8a753885/go.mod h1:KUh1 github.com/lightninglabs/neutrino v0.0.0-20181017011010-4d6069299130/go.mod h1:KJq43Fu9ceitbJsSXMILcT4mGDNI/crKmPIkDOZXFyM= github.com/lightninglabs/neutrino v0.0.0-20190213031021-ae4583a89cfb h1:Bwqgn9JXHo7I19lb4zTH2Xb0bfHgNuAJugQE7s00xqA= github.com/lightninglabs/neutrino v0.0.0-20190213031021-ae4583a89cfb/go.mod h1:g6cMQd+hfAU8pQTJAdjm6/EQREhupyd22f+CL0qYFOE= -github.com/lightninglabs/neutrino v0.0.0-20190219013218-1a80fd3d0e92 h1:sr+gYlO4n6NriBvCIxdCfc3iW5iG1WAz5k9cIWHdaRE= -github.com/lightninglabs/neutrino v0.0.0-20190219013218-1a80fd3d0e92/go.mod h1:g6cMQd+hfAU8pQTJAdjm6/EQREhupyd22f+CL0qYFOE= +github.com/lightninglabs/neutrino v0.0.0-20190313035638-e1ad4c33fb18 h1:lxD7RgKYrjRRht6Cn1AiBPn4Rjgr5pkKSRxTs++EgaI= +github.com/lightninglabs/neutrino v0.0.0-20190313035638-e1ad4c33fb18/go.mod h1:v6tz6jbuAubTrRpX8ke2KH9sJxml8KlPQTKgo9mAp1Q= +github.com/lightninglabs/neutrino v0.0.0-20190313220016-a6cc2a8361d5 h1:ThN7nfjIuWm+FernrTGfIUkqbIHrZTKGFS0144jVjbY= +github.com/lightninglabs/neutrino v0.0.0-20190313220016-a6cc2a8361d5/go.mod h1:NXpKUhcszEdn7v7ze5vsnSHI1KX6HqFdNRu0eqhkJzk= github.com/lightningnetwork/lightning-onion v0.0.0-20180605012408-ac4d9da8f1d6 h1:ONLGrYJVQdbtP6CE/ff1KNWZtygRGEh12RzonTiCzPs= github.com/lightningnetwork/lightning-onion v0.0.0-20180605012408-ac4d9da8f1d6/go.mod h1:8EgEt4a/NUOVQd+3kk6n9aZCJ1Ssj96Pb6lCrci+6oc= -github.com/lightningnetwork/lnd/queue v1.0.0 h1:eVUxXIzLm1IdLC5eGzs2z3NzgLYRapy44KCvsDZQ/HI= -github.com/lightningnetwork/lnd/queue v1.0.0/go.mod h1:vaQwexir73flPW43Mrm7JOgJHmcEFBWWSl9HlyASoms= -github.com/lightningnetwork/lnd/ticker v1.0.0 h1:S1b60TEGoTtCe2A0yeB+ecoj/kkS4qpwh6l+AkQEZwU= -github.com/lightningnetwork/lnd/ticker v1.0.0/go.mod h1:iaLXJiVgI1sPANIF2qYYUJXjoksPNvGNYowB8aRbpX0= github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 h1:sjOGyegMIhvgfq5oaue6Td+hxZuf3tDC8lAPrFldqFw= github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796/go.mod h1:3p7ZTf9V1sNPI5H8P3NkTFF4LuwMdPl2DodF60qAKqY= github.com/ltcsuite/ltcutil v0.0.0-20181217130922-17f3b04680b6/go.mod h1:8Vg/LTOO0KYa/vlHWJ6XZAevPQThGH5sufO0Hrou/lA= diff --git a/routing/chainview/neutrino.go b/routing/chainview/neutrino.go index c681d0f8..19933736 100644 --- a/routing/chainview/neutrino.go +++ b/routing/chainview/neutrino.go @@ -107,7 +107,12 @@ func (c *CfFilteredChainView) Start() error { // Finally, we'll create our rescan struct, start it, and launch all // the goroutines we need to operate this FilteredChainView instance. - c.chainView = c.p2pNode.NewRescan(rescanOptions...) + c.chainView = neutrino.NewRescan( + &neutrino.RescanChainSource{ + ChainService: c.p2pNode, + }, + rescanOptions..., + ) c.rescanErrChan = c.chainView.Start() c.blockQueue.Start()