diff --git a/autopilot/agent.go b/autopilot/agent.go index ecfb02cc..732c2d16 100644 --- a/autopilot/agent.go +++ b/autopilot/agent.go @@ -6,8 +6,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" ) // Config couples all the items that an autopilot agent needs to function. diff --git a/autopilot/agent_test.go b/autopilot/agent_test.go index ebc15bf9..e71432e4 100644 --- a/autopilot/agent_test.go +++ b/autopilot/agent_test.go @@ -9,9 +9,9 @@ import ( "errors" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) type moreChansResp struct { diff --git a/autopilot/graph.go b/autopilot/graph.go index 623e6370..70589801 100644 --- a/autopilot/graph.go +++ b/autopilot/graph.go @@ -10,8 +10,8 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" ) var ( diff --git a/autopilot/interface.go b/autopilot/interface.go index 034045e8..00bed01f 100644 --- a/autopilot/interface.go +++ b/autopilot/interface.go @@ -4,9 +4,9 @@ import ( "net" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // Node node is an interface which represents n abstract vertex within the diff --git a/autopilot/prefattach.go b/autopilot/prefattach.go index 7e8da3c4..6dfc82b2 100644 --- a/autopilot/prefattach.go +++ b/autopilot/prefattach.go @@ -5,8 +5,8 @@ import ( prand "math/rand" "time" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" ) // ConstrainedPrefAttachment is an implementation of the AttachmentHeuristic diff --git a/autopilot/prefattach_test.go b/autopilot/prefattach_test.go index e1da5192..1e210be2 100644 --- a/autopilot/prefattach_test.go +++ b/autopilot/prefattach_test.go @@ -10,8 +10,8 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" ) func TestConstrainedPrefAttachmentNeedMoreChan(t *testing.T) { diff --git a/breacharbiter.go b/breacharbiter.go index 5af66415..27a0a81b 100644 --- a/breacharbiter.go +++ b/breacharbiter.go @@ -14,11 +14,11 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/breacharbiter_test.go b/breacharbiter_test.go index ae617dac..6c13d668 100644 --- a/breacharbiter_test.go +++ b/breacharbiter_test.go @@ -27,11 +27,11 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/brontide/conn.go b/brontide/conn.go index d7030a33..4a7c5a66 100644 --- a/brontide/conn.go +++ b/brontide/conn.go @@ -8,7 +8,7 @@ import ( "time" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // Conn is an implementation of net.Conn which enforces an authenticated key diff --git a/brontide/listener.go b/brontide/listener.go index 0387b95d..8fd09a1b 100644 --- a/brontide/listener.go +++ b/brontide/listener.go @@ -7,7 +7,7 @@ import ( "net" "time" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // defaultHandshakes is the maximum number of handshakes that can be done in diff --git a/brontide/noise.go b/brontide/noise.go index 3321d32a..9a87f424 100644 --- a/brontide/noise.go +++ b/brontide/noise.go @@ -13,7 +13,7 @@ import ( "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) const ( diff --git a/brontide/noise_test.go b/brontide/noise_test.go index 415659ca..8259aa58 100644 --- a/brontide/noise_test.go +++ b/brontide/noise_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) type maybeNetConn struct { diff --git a/chainntnfs/bitcoindnotify/bitcoind.go b/chainntnfs/bitcoindnotify/bitcoind.go index d451db78..2ea3deba 100644 --- a/chainntnfs/bitcoindnotify/bitcoind.go +++ b/chainntnfs/bitcoindnotify/bitcoind.go @@ -8,14 +8,14 @@ import ( "time" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wtxmgr" ) const ( diff --git a/chainntnfs/bitcoindnotify/driver.go b/chainntnfs/bitcoindnotify/driver.go index 52dae673..fe1fcf65 100644 --- a/chainntnfs/bitcoindnotify/driver.go +++ b/chainntnfs/bitcoindnotify/driver.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/rpcclient" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/rpcclient" ) // createNewNotifier creates a new instance of the ChainNotifier interface diff --git a/chainntnfs/btcdnotify/btcd.go b/chainntnfs/btcdnotify/btcd.go index 2163fc5d..8e134020 100644 --- a/chainntnfs/btcdnotify/btcd.go +++ b/chainntnfs/btcdnotify/btcd.go @@ -8,11 +8,11 @@ import ( "time" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) const ( diff --git a/chainntnfs/btcdnotify/driver.go b/chainntnfs/btcdnotify/driver.go index 7b159c37..94bde52f 100644 --- a/chainntnfs/btcdnotify/driver.go +++ b/chainntnfs/btcdnotify/driver.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/rpcclient" + "github.com/btcsuite/btcd/rpcclient" ) // createNewNotifier creates a new instance of the ChainNotifier interface diff --git a/chainntnfs/interface.go b/chainntnfs/interface.go index 326a05ba..930980cf 100644 --- a/chainntnfs/interface.go +++ b/chainntnfs/interface.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) // ChainNotifier represents a trusted source to receive notifications concerning diff --git a/chainntnfs/interface_test.go b/chainntnfs/interface_test.go index b747e3f4..350da131 100644 --- a/chainntnfs/interface_test.go +++ b/chainntnfs/interface_test.go @@ -19,19 +19,19 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" "github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify" "github.com/ltcsuite/ltcd/btcjson" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/integration/rpctest" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/integration/rpctest" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" // Required to register the boltdb walletdb implementation. - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) var ( diff --git a/chainntnfs/neutrinonotify/neutrino.go b/chainntnfs/neutrinonotify/neutrino.go index 15ad37ab..e39e1c21 100644 --- a/chainntnfs/neutrinonotify/neutrino.go +++ b/chainntnfs/neutrinonotify/neutrino.go @@ -10,12 +10,12 @@ import ( "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/gcs/builder" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/gcs/builder" + "github.com/btcsuite/btcwallet/waddrmgr" ) const ( diff --git a/chainntnfs/txconfnotifier.go b/chainntnfs/txconfnotifier.go index b955bc76..b10f4272 100644 --- a/chainntnfs/txconfnotifier.go +++ b/chainntnfs/txconfnotifier.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" ) // ConfNtfn represents a notifier client's request to receive a notification diff --git a/chainntnfs/txconfnotifier_test.go b/chainntnfs/txconfnotifier_test.go index f1ef9030..96b7d145 100644 --- a/chainntnfs/txconfnotifier_test.go +++ b/chainntnfs/txconfnotifier_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var zeroHash chainhash.Hash diff --git a/chainparams.go b/chainparams.go index fa726bb3..2751d81e 100644 --- a/chainparams.go +++ b/chainparams.go @@ -4,10 +4,10 @@ import ( "github.com/lightningnetwork/lnd/keychain" litecoinCfg "github.com/ltcsuite/ltcd/chaincfg" litecoinWire "github.com/ltcsuite/ltcd/wire" - "github.com/roasbeef/btcd/chaincfg" - bitcoinCfg "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - bitcoinWire "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg" + bitcoinCfg "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + bitcoinWire "github.com/btcsuite/btcd/wire" ) // activeNetParams is a pointer to the parameters specific to the currently diff --git a/chainregistry.go b/chainregistry.go index 51930d50..815c1e06 100644 --- a/chainregistry.go +++ b/chainregistry.go @@ -12,6 +12,12 @@ import ( "sync" "time" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs/bitcoindnotify" @@ -24,12 +30,6 @@ import ( "github.com/lightningnetwork/lnd/lnwallet/btcwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/chainview" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wallet" ) const ( diff --git a/chan_series.go b/chan_series.go index b13db5da..b5cc3913 100644 --- a/chan_series.go +++ b/chan_series.go @@ -7,7 +7,7 @@ import ( "github.com/lightningnetwork/lnd/discovery" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // chanSeries is an implementation of the discovery.ChannelGraphTimeSeries diff --git a/chancloser.go b/chancloser.go index 257b6db1..1d16c5e4 100644 --- a/chancloser.go +++ b/chancloser.go @@ -7,9 +7,9 @@ import ( "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/channeldb/channel.go b/channeldb/channel.go index 0c6245d2..bc954761 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -12,10 +12,10 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go index efd36abb..3083e725 100644 --- a/channeldb/channel_test.go +++ b/channeldb/channel_test.go @@ -14,12 +14,12 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) var ( diff --git a/channeldb/codec.go b/channeldb/codec.go index 149be180..d0472ff7 100644 --- a/channeldb/codec.go +++ b/channeldb/codec.go @@ -9,10 +9,10 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // outPointSize is the size of a serialized outpoint on disk. diff --git a/channeldb/db.go b/channeldb/db.go index b428baed..fa844a2d 100644 --- a/channeldb/db.go +++ b/channeldb/db.go @@ -10,8 +10,8 @@ import ( "github.com/coreos/bbolt" "github.com/go-errors/errors" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" ) const ( diff --git a/channeldb/forwarding_package_test.go b/channeldb/forwarding_package_test.go index 292d494a..7f351214 100644 --- a/channeldb/forwarding_package_test.go +++ b/channeldb/forwarding_package_test.go @@ -10,7 +10,7 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) // TestPkgFilterBruteForce tests the behavior of a pkg filter up to size 1000, diff --git a/channeldb/graph.go b/channeldb/graph.go index 7c3557a0..886ceee4 100644 --- a/channeldb/graph.go +++ b/channeldb/graph.go @@ -12,10 +12,10 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/channeldb/graph_test.go b/channeldb/graph_test.go index 521d5b66..4f7756fb 100644 --- a/channeldb/graph_test.go +++ b/channeldb/graph_test.go @@ -17,9 +17,9 @@ import ( "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/channeldb/invoices.go b/channeldb/invoices.go index a05f57df..d315c4a0 100644 --- a/channeldb/invoices.go +++ b/channeldb/invoices.go @@ -10,7 +10,7 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/channeldb/nodes.go b/channeldb/nodes.go index 8c3ff79e..3b1e7fee 100644 --- a/channeldb/nodes.go +++ b/channeldb/nodes.go @@ -7,8 +7,8 @@ import ( "time" "github.com/coreos/bbolt" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/channeldb/nodes_test.go b/channeldb/nodes_test.go index a7792714..7f968efe 100644 --- a/channeldb/nodes_test.go +++ b/channeldb/nodes_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" ) func TestLinkNodeEncodeDecode(t *testing.T) { diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go index 93ccd166..92dae940 100644 --- a/cmd/lncli/commands.go +++ b/cmd/lncli/commands.go @@ -21,8 +21,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" "github.com/lightningnetwork/lnd/lnrpc" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" "golang.org/x/net/context" diff --git a/cmd/lncli/main.go b/cmd/lncli/main.go index 9a62f973..1b6c6b64 100644 --- a/cmd/lncli/main.go +++ b/cmd/lncli/main.go @@ -17,7 +17,7 @@ import ( "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/macaroons" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" "github.com/urfave/cli" "google.golang.org/grpc" diff --git a/config.go b/config.go index de692567..50029774 100644 --- a/config.go +++ b/config.go @@ -19,14 +19,14 @@ import ( "strings" "time" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" flags "github.com/jessevdk/go-flags" "github.com/lightningnetwork/lnd/brontide" "github.com/lightningnetwork/lnd/htlcswitch/hodl" "github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tor" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" ) const ( diff --git a/contractcourt/briefcase.go b/contractcourt/briefcase.go index d0b8db97..413ede37 100644 --- a/contractcourt/briefcase.go +++ b/contractcourt/briefcase.go @@ -9,8 +9,8 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) // ContractResolutions is a wrapper struct around the two forms of resolutions diff --git a/contractcourt/briefcase_test.go b/contractcourt/briefcase_test.go index 7850af9d..b5dcf327 100644 --- a/contractcourt/briefcase_test.go +++ b/contractcourt/briefcase_test.go @@ -15,10 +15,10 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go index 9fc3023a..0d8b6b5d 100644 --- a/contractcourt/chain_arbitrator.go +++ b/contractcourt/chain_arbitrator.go @@ -9,9 +9,9 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // ResolutionMsg is a message sent by resolvers to outside sub-systems once an diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go index cf4888a5..8333b52f 100644 --- a/contractcourt/chain_watcher.go +++ b/contractcourt/chain_watcher.go @@ -9,10 +9,10 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // LocalUnilateralCloseInfo encapsulates all the informnation we need to act diff --git a/contractcourt/chain_watcher_test.go b/contractcourt/chain_watcher_test.go index d5d4a487..981fdf2c 100644 --- a/contractcourt/chain_watcher_test.go +++ b/contractcourt/chain_watcher_test.go @@ -9,8 +9,8 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) type mockNotifier struct { diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go index 44e40ce3..b80995b9 100644 --- a/contractcourt/channel_arbitrator.go +++ b/contractcourt/channel_arbitrator.go @@ -10,7 +10,7 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) const ( diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go index ae1ff845..db0f267b 100644 --- a/contractcourt/channel_arbitrator_test.go +++ b/contractcourt/channel_arbitrator_test.go @@ -8,8 +8,8 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) type mockChainIO struct{} diff --git a/contractcourt/contract_resolvers.go b/contractcourt/contract_resolvers.go index dcbdfa3b..0a0ec5e2 100644 --- a/contractcourt/contract_resolvers.go +++ b/contractcourt/contract_resolvers.go @@ -12,8 +12,8 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/discovery/ann_validation.go b/discovery/ann_validation.go index e93559bf..534bc48d 100644 --- a/discovery/ann_validation.go +++ b/discovery/ann_validation.go @@ -6,8 +6,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // ValidateChannelAnn validates the channel announcement message and checks diff --git a/discovery/bootstrapper.go b/discovery/bootstrapper.go index 412dec65..0dd64e43 100644 --- a/discovery/bootstrapper.go +++ b/discovery/bootstrapper.go @@ -17,8 +17,8 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tor" "github.com/miekg/dns" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil/bech32" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil/bech32" ) func init() { diff --git a/discovery/gossiper.go b/discovery/gossiper.go index 9a5318cb..fc0c2313 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -19,9 +19,9 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/multimutex" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/discovery/gossiper_test.go b/discovery/gossiper_test.go index 2360012f..cd10ca90 100644 --- a/discovery/gossiper_test.go +++ b/discovery/gossiper_test.go @@ -25,9 +25,9 @@ import ( "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/discovery/syncer.go b/discovery/syncer.go index a65c90b8..8e81b4ef 100644 --- a/discovery/syncer.go +++ b/discovery/syncer.go @@ -8,7 +8,7 @@ import ( "time" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // syncerState is an enum that represents the current state of the diff --git a/discovery/syncer_test.go b/discovery/syncer_test.go index 8aa6415c..b46f9af1 100644 --- a/discovery/syncer_test.go +++ b/discovery/syncer_test.go @@ -9,8 +9,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) type horizonQuery struct { diff --git a/discovery/utils.go b/discovery/utils.go index 9f38e860..89a81b27 100644 --- a/discovery/utils.go +++ b/discovery/utils.go @@ -5,7 +5,7 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // CreateChanAnnouncement is a helper function which creates all channel diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 3596f3bf..bf959010 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -118,8 +118,8 @@ On FreeBSD, use gmake instead of make. ### Installing btcd -If one wishes to use the `btcd` backend, `lnd` currently requires the -[roasbeef](https://github.com/roasbeef/btcd) fork of `btcd` due to neutrino +When using the `btcd` backend, `lnd` currently requires the +[roasbeef](https://github.com/btcsuite/btcd) fork of `btcd` due to neutrino additions that are not yet available in the master branch. To install, run the following commands: @@ -330,6 +330,6 @@ for Litecoin accordingly. For node configuration, the sections are called which chain and node type you're using. # Accurate as of: -- _roasbeef/btcd commit:_ `f8c02aff4e7a807ba0c1349e2db03695d8e790e8` -- _roasbeef/btcutil commit:_ `a259eaf2ec1b54653cdd67848a41867f280797ee` +- _btcsuite/btcd commit:_ `f8c02aff4e7a807ba0c1349e2db03695d8e790e8` +- _btcsuite/btcutil commit:_ `a259eaf2ec1b54653cdd67848a41867f280797ee` - _lightningnetwork/lnd commit:_ `08de2becf8d77fae192205172c4fb17bb09bd0dbf49e64aa323b2fcbf9fe2a35` diff --git a/docs/MAKEFILE.md b/docs/MAKEFILE.md index 0afc8414..b7111b93 100644 --- a/docs/MAKEFILE.md +++ b/docs/MAKEFILE.md @@ -53,9 +53,9 @@ Compiles, tests, and installs `lnd` and `lncli`. Equivalent to `btcd` ------ Ensures that [`github.com/Masterminds/glide`][glide] is installed, and -that the [`github.com/roasbeef/btcd`][btcd] repository is checked out +that the [`github.com/btcsuite/btcd`][btcd] repository is checked out locally. Lastly, installs the version of -[`github.com/roasbeef/btcd`][btcd] specified in `Gopkg.toml` +[`github.com/btcsuite/btcd`][btcd] specified in `Gopkg.toml` `build` ------- @@ -64,7 +64,7 @@ Compiles the current source and vendor trees, creating `./lnd` and `check` ------- -Installs the version of [`github.com/roasbeef/btcd`][btcd] specified +Installs the version of [`github.com/btcsuite/btcd`][btcd] specified in `Gopkg.toml`, then runs the unit tests followed by the integration tests. @@ -115,7 +115,7 @@ Copies the compiled `lnd` and `lncli` binaries into `$GOPATH/bin`. `itest` ------- -Installs the version of [`github.com/roasbeef/btcd`][btcd] specified in +Installs the version of [`github.com/btcsuite/btcd`][btcd] specified in `Gopkg.toml`, builds the `./lnd` and `./lncli` binaries, then runs the integration test suite. @@ -184,7 +184,7 @@ Arguments: Related: [`unit`](#unit) -[btcd]: https://github.com/roasbeef/btcd (github.com/roasbeef/btcd") +[btcd]: https://github.com/btcsuite/btcd (github.com/btcsuite/btcd") [glide]: https://github.com/Masterminds/glide (github.com/Masterminds/glide) [gometalinter]: https://gopkg.in/alecthomas/gometalinter.v1 (gopkg.in/alecthomas/gometalinter.v1) [dep]: https://github.com/golang/dep/cmd/dep (github.com/golang/dep/cmd/dep) diff --git a/fundingmanager.go b/fundingmanager.go index a07210f8..636ace73 100644 --- a/fundingmanager.go +++ b/fundingmanager.go @@ -23,10 +23,10 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) const ( diff --git a/fundingmanager_test.go b/fundingmanager_test.go index a1f7686c..6baea62c 100644 --- a/fundingmanager_test.go +++ b/fundingmanager_test.go @@ -21,13 +21,13 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) const ( diff --git a/htlcswitch/circuit_test.go b/htlcswitch/circuit_test.go index d908a935..c6f86e76 100644 --- a/htlcswitch/circuit_test.go +++ b/htlcswitch/circuit_test.go @@ -10,9 +10,9 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - bitcoinCfg "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + bitcoinCfg "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcutil" ) var ( diff --git a/htlcswitch/failure.go b/htlcswitch/failure.go index 2f75b102..61caa8a9 100644 --- a/htlcswitch/failure.go +++ b/htlcswitch/failure.go @@ -7,7 +7,7 @@ import ( "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // ForwardingError wraps an lnwire.FailureMessage in a struct that also diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go index 60c400f0..3cb5f35c 100644 --- a/htlcswitch/interfaces.go +++ b/htlcswitch/interfaces.go @@ -1,10 +1,10 @@ package htlcswitch import ( + "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" ) // InvoiceDatabase is an interface which represents the persistent subsystem diff --git a/htlcswitch/iterator.go b/htlcswitch/iterator.go index 09f88cd3..9a873ddc 100644 --- a/htlcswitch/iterator.go +++ b/htlcswitch/iterator.go @@ -6,7 +6,7 @@ import ( "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // NetworkHop indicates the blockchain network that is intended to be the next diff --git a/htlcswitch/link.go b/htlcswitch/link.go index 467a8a73..8c487bfb 100644 --- a/htlcswitch/link.go +++ b/htlcswitch/link.go @@ -17,7 +17,7 @@ import ( "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) func init() { diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go index a97da231..74366850 100644 --- a/htlcswitch/link_test.go +++ b/htlcswitch/link_test.go @@ -23,10 +23,10 @@ import ( "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) const ( diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go index 7f86c049..487b1601 100644 --- a/htlcswitch/mock.go +++ b/htlcswitch/mock.go @@ -21,10 +21,10 @@ import ( "github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) type mockPreimageCache struct { diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go index 30f4e28f..d1473ec7 100644 --- a/htlcswitch/switch.go +++ b/htlcswitch/switch.go @@ -8,8 +8,12 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcd/btcec" "github.com/coreos/bbolt" "github.com/davecgh/go-spew/spew" + + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" @@ -17,9 +21,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" ) var ( diff --git a/htlcswitch/switch_test.go b/htlcswitch/switch_test.go index 955d89ba..f496113d 100644 --- a/htlcswitch/switch_test.go +++ b/htlcswitch/switch_test.go @@ -14,7 +14,7 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) func genPreimage() ([32]byte, error) { diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go index 6cb2740c..3f257a87 100644 --- a/htlcswitch/test_utils.go +++ b/htlcswitch/test_utils.go @@ -24,10 +24,10 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/invoiceregistry.go b/invoiceregistry.go index be63ea26..177bbee1 100644 --- a/invoiceregistry.go +++ b/invoiceregistry.go @@ -8,13 +8,13 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/zpay32" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" ) var ( diff --git a/keychain/btcwallet.go b/keychain/btcwallet.go index 8826e495..e0f52203 100644 --- a/keychain/btcwallet.go +++ b/keychain/btcwallet.go @@ -4,10 +4,10 @@ import ( "crypto/sha256" "fmt" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/keychain/derivation.go b/keychain/derivation.go index cc619892..241e79d6 100644 --- a/keychain/derivation.go +++ b/keychain/derivation.go @@ -1,6 +1,6 @@ package keychain -import "github.com/roasbeef/btcd/btcec" +import "github.com/btcsuite/btcd/btcec" const ( // KeyDerivationVersion is the version of the key derivation schema diff --git a/keychain/interface_test.go b/keychain/interface_test.go index f3b6b1e3..ceae8dd3 100644 --- a/keychain/interface_test.go +++ b/keychain/interface_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" // Required in order to create the default database. + _ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required in order to create the default database. ) // versionZeroKeyFamilies is a slice of all the known key families for first diff --git a/lnd.go b/lnd.go index ffd05fff..33dcc2a4 100644 --- a/lnd.go +++ b/lnd.go @@ -45,10 +45,10 @@ import ( "github.com/lightningnetwork/lnd/macaroons" "github.com/lightningnetwork/lnd/signal" "github.com/lightningnetwork/lnd/walletunlocker" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/wallet" ) const ( diff --git a/lnd_test.go b/lnd_test.go index 2d0b829e..8f2a9beb 100644 --- a/lnd_test.go +++ b/lnd_test.go @@ -28,12 +28,12 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lntest" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/integration/rpctest" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/integration/rpctest" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "golang.org/x/net/context" "google.golang.org/grpc" ) diff --git a/lntest/harness.go b/lntest/harness.go index 1fa1b3b9..c173ac1e 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -12,13 +12,13 @@ import ( "google.golang.org/grpc/grpclog" "github.com/lightningnetwork/lnd/lnrpc" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/integration/rpctest" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/integration/rpctest" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // NetworkHarness is an integration testing harness for the lightning network. diff --git a/lntest/node.go b/lntest/node.go index 809092eb..883a248d 100644 --- a/lntest/node.go +++ b/lntest/node.go @@ -23,10 +23,10 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/macaroons" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/lnwallet/btcwallet/blockchain.go b/lnwallet/btcwallet/blockchain.go index 4bb6856e..22dee5dd 100644 --- a/lnwallet/btcwallet/blockchain.go +++ b/lnwallet/btcwallet/blockchain.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/lightninglabs/neutrino" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" ) var ( diff --git a/lnwallet/btcwallet/btcwallet.go b/lnwallet/btcwallet/btcwallet.go index 3b62078d..3829d296 100644 --- a/lnwallet/btcwallet/btcwallet.go +++ b/lnwallet/btcwallet/btcwallet.go @@ -11,16 +11,16 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" - base "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + base "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/lnwallet/btcwallet/config.go b/lnwallet/btcwallet/config.go index 1580695b..b52b966f 100644 --- a/lnwallet/btcwallet/config.go +++ b/lnwallet/btcwallet/config.go @@ -4,19 +4,19 @@ import ( "path/filepath" "time" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wallet" // This is required to register bdb as a valid walletdb driver. In the // init function of the package, it registers itself. The import is used // to activate the side effects w/o actually binding the package name to // a file-level variable. - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) var ( diff --git a/lnwallet/btcwallet/driver.go b/lnwallet/btcwallet/driver.go index 91f64973..73f94605 100644 --- a/lnwallet/btcwallet/driver.go +++ b/lnwallet/btcwallet/driver.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcwallet/chain" + "github.com/btcsuite/btcwallet/chain" ) const ( diff --git a/lnwallet/btcwallet/signer.go b/lnwallet/btcwallet/signer.go index a85f2472..3b4ebe99 100644 --- a/lnwallet/btcwallet/signer.go +++ b/lnwallet/btcwallet/signer.go @@ -4,14 +4,14 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - base "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + base "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" ) // FetchInputInfo queries for the WalletController's knowledge of the passed diff --git a/lnwallet/channel.go b/lnwallet/channel.go index c80651ee..4f41166e 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -14,14 +14,14 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/txsort" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/txsort" ) var zeroHash chainhash.Hash diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go index bfc23299..7d9af7d6 100644 --- a/lnwallet/channel_test.go +++ b/lnwallet/channel_test.go @@ -13,10 +13,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // forceStateTransition executes the necessary interaction between the two diff --git a/lnwallet/config.go b/lnwallet/config.go index 8570f5fe..7075551d 100644 --- a/lnwallet/config.go +++ b/lnwallet/config.go @@ -4,7 +4,7 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" - "github.com/roasbeef/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg" ) // Config is a struct which houses configuration parameters which modify the diff --git a/lnwallet/errors.go b/lnwallet/errors.go index 403876c3..f4aee380 100644 --- a/lnwallet/errors.go +++ b/lnwallet/errors.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" ) // ReservationError wraps certain errors returned during channel reservation diff --git a/lnwallet/fee_estimator.go b/lnwallet/fee_estimator.go index 3ff94d9e..078e6db7 100644 --- a/lnwallet/fee_estimator.go +++ b/lnwallet/fee_estimator.go @@ -3,9 +3,9 @@ package lnwallet import ( "encoding/json" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcutil" ) // SatPerVByte represents a fee rate in satoshis per vbyte. diff --git a/lnwallet/fee_estimator_test.go b/lnwallet/fee_estimator_test.go index 3b1d9301..40aaa30a 100644 --- a/lnwallet/fee_estimator_test.go +++ b/lnwallet/fee_estimator_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) // TestFeeRateTypes checks that converting fee rates between the diff --git a/lnwallet/interface.go b/lnwallet/interface.go index 0f752d62..416157fc 100644 --- a/lnwallet/interface.go +++ b/lnwallet/interface.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // AddressType is an enum-like type which denotes the possible address types diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go index a549fe86..ce3bca22 100644 --- a/lnwallet/interface_test.go +++ b/lnwallet/interface_test.go @@ -20,9 +20,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/lightninglabs/neutrino" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/chainntnfs/btcdnotify" @@ -31,16 +31,16 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/integration/rpctest" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/integration/rpctest" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/lnwallet/log.go b/lnwallet/log.go index f4508536..f36aa99f 100644 --- a/lnwallet/log.go +++ b/lnwallet/log.go @@ -2,9 +2,9 @@ package lnwallet import ( "github.com/btcsuite/btclog" - "github.com/roasbeef/btcwallet/chain" - btcwallet "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcwallet/chain" + btcwallet "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/wtxmgr" ) // walletLog is a logger that is initialized with no output filters. This diff --git a/lnwallet/parameters.go b/lnwallet/parameters.go index dfab4128..306eedf2 100644 --- a/lnwallet/parameters.go +++ b/lnwallet/parameters.go @@ -1,8 +1,8 @@ package lnwallet import ( - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/wallet/txrules" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/wallet/txrules" ) // DefaultDustLimit is used to calculate the dust HTLC amount which will be diff --git a/lnwallet/reservation.go b/lnwallet/reservation.go index e8a22f47..f89945d6 100644 --- a/lnwallet/reservation.go +++ b/lnwallet/reservation.go @@ -6,10 +6,10 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // ChannelContribution is the primary constituent of the funding workflow diff --git a/lnwallet/script_utils.go b/lnwallet/script_utils.go index 3f68ecbb..acdff3b4 100644 --- a/lnwallet/script_utils.go +++ b/lnwallet/script_utils.go @@ -9,10 +9,10 @@ import ( "golang.org/x/crypto/ripemd160" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/lnwallet/script_utils_test.go b/lnwallet/script_utils_test.go index 1ffc9c33..bc51e4bd 100644 --- a/lnwallet/script_utils_test.go +++ b/lnwallet/script_utils_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/lightningnetwork/lnd/keychain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // TestCommitmentSpendValidation test the spendability of both outputs within diff --git a/lnwallet/signdescriptor.go b/lnwallet/signdescriptor.go index d1ae1834..6df58af7 100644 --- a/lnwallet/signdescriptor.go +++ b/lnwallet/signdescriptor.go @@ -6,9 +6,9 @@ import ( "io" "github.com/lightningnetwork/lnd/keychain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) var ( diff --git a/lnwallet/signdescriptor_test.go b/lnwallet/signdescriptor_test.go index 7a4be0fc..6b8d3713 100644 --- a/lnwallet/signdescriptor_test.go +++ b/lnwallet/signdescriptor_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/lightningnetwork/lnd/keychain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) func TestSignDescriptorSerialization(t *testing.T) { diff --git a/lnwallet/sigpool.go b/lnwallet/sigpool.go index 66ef93cc..780381c7 100644 --- a/lnwallet/sigpool.go +++ b/lnwallet/sigpool.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" ) const ( diff --git a/lnwallet/size.go b/lnwallet/size.go index d6821eac..3ade5571 100644 --- a/lnwallet/size.go +++ b/lnwallet/size.go @@ -1,8 +1,8 @@ package lnwallet import ( - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/wire" ) const ( diff --git a/lnwallet/size_test.go b/lnwallet/size_test.go index 1c5eef98..216fcbe3 100644 --- a/lnwallet/size_test.go +++ b/lnwallet/size_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // TestTxWeightEstimator tests that transaction weight estimates are calculated diff --git a/lnwallet/test_utils.go b/lnwallet/test_utils.go index 34d9baf1..5c79b452 100644 --- a/lnwallet/test_utils.go +++ b/lnwallet/test_utils.go @@ -16,12 +16,12 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/lnwallet/transactions_test.go b/lnwallet/transactions_test.go index ed1c2a67..f125838a 100644 --- a/lnwallet/transactions_test.go +++ b/lnwallet/transactions_test.go @@ -11,11 +11,11 @@ import ( "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) /** diff --git a/lnwallet/txout.go b/lnwallet/txout.go index 22d1b9d7..3cfb0f92 100644 --- a/lnwallet/txout.go +++ b/lnwallet/txout.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) // writeTxOut serializes a wire.TxOut struct into the passed io.Writer stream. diff --git a/lnwallet/txout_test.go b/lnwallet/txout_test.go index d697de78..33e2909b 100644 --- a/lnwallet/txout_test.go +++ b/lnwallet/txout_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) func TestTxOutSerialization(t *testing.T) { diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go index 581457b8..0dcc4cc3 100644 --- a/lnwallet/wallet.go +++ b/lnwallet/wallet.go @@ -12,16 +12,16 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil/hdkeychain" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil/hdkeychain" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/txsort" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/txsort" ) const ( diff --git a/lnwallet/witnessgen.go b/lnwallet/witnessgen.go index 7bcc0850..708df717 100644 --- a/lnwallet/witnessgen.go +++ b/lnwallet/witnessgen.go @@ -3,8 +3,8 @@ package lnwallet import ( "fmt" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" ) // WitnessType determines how an output's witness will be generated. The diff --git a/lnwire/accept_channel.go b/lnwire/accept_channel.go index 88b955bb..2340cece 100644 --- a/lnwire/accept_channel.go +++ b/lnwire/accept_channel.go @@ -3,8 +3,8 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcutil" ) // AcceptChannel is the message Bob sends to Alice after she initiates the diff --git a/lnwire/channel_announcement.go b/lnwire/channel_announcement.go index 93eaa990..f9b86510 100644 --- a/lnwire/channel_announcement.go +++ b/lnwire/channel_announcement.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // ChannelAnnouncement message is used to announce the existence of a channel diff --git a/lnwire/channel_id.go b/lnwire/channel_id.go index b2fe2fd7..8e8ef67c 100644 --- a/lnwire/channel_id.go +++ b/lnwire/channel_id.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "math" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) const ( diff --git a/lnwire/channel_reestablish.go b/lnwire/channel_reestablish.go index 27392298..8e0af730 100644 --- a/lnwire/channel_reestablish.go +++ b/lnwire/channel_reestablish.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // ChannelReestablish is a message sent between peers that have an existing diff --git a/lnwire/channel_update.go b/lnwire/channel_update.go index cf6482a2..971f7bb3 100644 --- a/lnwire/channel_update.go +++ b/lnwire/channel_update.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // ChanUpdateFlag is a bitfield that signals various options concerning a diff --git a/lnwire/closing_signed.go b/lnwire/closing_signed.go index 81a7d1b5..67df9be3 100644 --- a/lnwire/closing_signed.go +++ b/lnwire/closing_signed.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) // ClosingSigned is sent by both parties to a channel once the channel is clear diff --git a/lnwire/funding_created.go b/lnwire/funding_created.go index 66f36fc0..a8ab0d50 100644 --- a/lnwire/funding_created.go +++ b/lnwire/funding_created.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) // FundingCreated is sent from Alice (the initiator) to Bob (the responder), diff --git a/lnwire/funding_locked.go b/lnwire/funding_locked.go index ed22c5ee..2867aae7 100644 --- a/lnwire/funding_locked.go +++ b/lnwire/funding_locked.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // FundingLocked is the message that both parties to a new channel creation diff --git a/lnwire/gossip_timestamp_range.go b/lnwire/gossip_timestamp_range.go index a2180fbc..7aa28532 100644 --- a/lnwire/gossip_timestamp_range.go +++ b/lnwire/gossip_timestamp_range.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // GossipTimestampRange is a message that allows the sender to restrict the set diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go index 815a1d8f..05521d7f 100644 --- a/lnwire/lnwire.go +++ b/lnwire/lnwire.go @@ -10,12 +10,12 @@ import ( "net" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/tor" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" ) // MaxSliceLength is the maximum allowed length for any opaque byte slices in diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go index 8a1e82f6..d67fc9e7 100644 --- a/lnwire/lnwire_test.go +++ b/lnwire/lnwire_test.go @@ -14,12 +14,12 @@ import ( "testing/quick" "time" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/tor" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" ) var ( diff --git a/lnwire/msat.go b/lnwire/msat.go index 9ab0e31d..67ee4972 100644 --- a/lnwire/msat.go +++ b/lnwire/msat.go @@ -3,7 +3,7 @@ package lnwire import ( "fmt" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) // mSatScale is a value that's used to scale satoshis to milli-satoshis, and diff --git a/lnwire/msat_test.go b/lnwire/msat_test.go index 305d4b11..5b543558 100644 --- a/lnwire/msat_test.go +++ b/lnwire/msat_test.go @@ -3,7 +3,7 @@ package lnwire import ( "testing" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) func TestMilliSatoshiConversion(t *testing.T) { diff --git a/lnwire/netaddress.go b/lnwire/netaddress.go index 35011618..f31ac1f9 100644 --- a/lnwire/netaddress.go +++ b/lnwire/netaddress.go @@ -4,8 +4,8 @@ import ( "fmt" "net" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" ) // NetAddress represents information pertaining to the identity and network diff --git a/lnwire/netaddress_test.go b/lnwire/netaddress_test.go index 31a9d092..7988a736 100644 --- a/lnwire/netaddress_test.go +++ b/lnwire/netaddress_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) func TestNetAddressDisplay(t *testing.T) { diff --git a/lnwire/open_channel.go b/lnwire/open_channel.go index 69b1d84a..875425e6 100644 --- a/lnwire/open_channel.go +++ b/lnwire/open_channel.go @@ -3,9 +3,9 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" ) // FundingFlag represents the possible bit mask values for the ChannelFlags diff --git a/lnwire/query_channel_range.go b/lnwire/query_channel_range.go index 49b1b4f0..3321e752 100644 --- a/lnwire/query_channel_range.go +++ b/lnwire/query_channel_range.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // QueryChannelRange is a message sent by a node in order to query the diff --git a/lnwire/query_short_chan_ids.go b/lnwire/query_short_chan_ids.go index 401aa118..66b3c3d6 100644 --- a/lnwire/query_short_chan_ids.go +++ b/lnwire/query_short_chan_ids.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // ShortChanIDEncoding is an enum-like type that represents exactly how a set diff --git a/lnwire/reply_short_chan_ids_end.go b/lnwire/reply_short_chan_ids_end.go index 1fd2f849..f7ad835d 100644 --- a/lnwire/reply_short_chan_ids_end.go +++ b/lnwire/reply_short_chan_ids_end.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // ReplyShortChanIDsEnd is a message that marks the end of a streaming message diff --git a/lnwire/revoke_and_ack.go b/lnwire/revoke_and_ack.go index f9a17007..756be6cb 100644 --- a/lnwire/revoke_and_ack.go +++ b/lnwire/revoke_and_ack.go @@ -3,7 +3,7 @@ package lnwire import ( "io" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // RevokeAndAck is sent by either side once a CommitSig message has been diff --git a/lnwire/signature.go b/lnwire/signature.go index 67bfc3bb..012d5a91 100644 --- a/lnwire/signature.go +++ b/lnwire/signature.go @@ -3,7 +3,7 @@ package lnwire import ( "fmt" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // Sig is a fixed-sized ECDSA signature. Unlike Bitcoin, we use fixed sized diff --git a/lnwire/signature_test.go b/lnwire/signature_test.go index 2e27e135..ae9e43b6 100644 --- a/lnwire/signature_test.go +++ b/lnwire/signature_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) func TestSignatureSerializeDeserialize(t *testing.T) { diff --git a/log.go b/log.go index 150fb296..01ba080f 100644 --- a/log.go +++ b/log.go @@ -8,6 +8,7 @@ import ( "fmt" "path/filepath" + "github.com/btcsuite/btcd/connmgr" "github.com/btcsuite/btclog" "github.com/jrick/logrotate/rotator" "github.com/lightninglabs/neutrino" @@ -21,7 +22,6 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/signal" - "github.com/roasbeef/btcd/connmgr" ) // logWriter implements an io.Writer that outputs to both standard output and diff --git a/macaroons/store.go b/macaroons/store.go index a37b24d2..443162d7 100644 --- a/macaroons/store.go +++ b/macaroons/store.go @@ -9,7 +9,7 @@ import ( "github.com/coreos/bbolt" - "github.com/roasbeef/btcwallet/snacl" + "github.com/btcsuite/btcwallet/snacl" ) const ( diff --git a/macaroons/store_test.go b/macaroons/store_test.go index 961a6dd7..48e9f175 100644 --- a/macaroons/store_test.go +++ b/macaroons/store_test.go @@ -11,7 +11,7 @@ import ( "github.com/lightningnetwork/lnd/macaroons" - "github.com/roasbeef/btcwallet/snacl" + "github.com/btcsuite/btcwallet/snacl" ) func TestStore(t *testing.T) { diff --git a/mock.go b/mock.go index 5caf5136..405eaea0 100644 --- a/mock.go +++ b/mock.go @@ -8,12 +8,12 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/keychain" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // The block height returned by the mock BlockChainIO's GetBestBlock. diff --git a/nodesigner.go b/nodesigner.go index b62e12f2..b40af48c 100644 --- a/nodesigner.go +++ b/nodesigner.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // nodeSigner is an implementation of the MessageSigner interface backed by the diff --git a/nursery_store.go b/nursery_store.go index 0b42a49c..278ecd79 100644 --- a/nursery_store.go +++ b/nursery_store.go @@ -7,8 +7,8 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) // Overview of Nursery Store Storage Hierarchy diff --git a/nursery_store_test.go b/nursery_store_test.go index 33b2d9b6..db7dcf1d 100644 --- a/nursery_store_test.go +++ b/nursery_store_test.go @@ -10,7 +10,7 @@ import ( "github.com/btcsuite/btclog" "github.com/lightningnetwork/lnd/channeldb" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" ) func init() { diff --git a/peer.go b/peer.go index 8c9afc5e..1d01e7bf 100644 --- a/peer.go +++ b/peer.go @@ -9,6 +9,11 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/connmgr" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/brontide" @@ -19,11 +24,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/connmgr" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" ) var ( diff --git a/peer_test.go b/peer_test.go index 47399dbc..160a2784 100644 --- a/peer_test.go +++ b/peer_test.go @@ -14,8 +14,8 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) func init() { diff --git a/pilot.go b/pilot.go index 2acb76a3..e956359e 100644 --- a/pilot.go +++ b/pilot.go @@ -4,13 +4,13 @@ import ( "fmt" "net" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lnd/autopilot" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/tor" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" ) // chanController is an implementation of the autopilot.ChannelController diff --git a/routing/chainview/bitcoind.go b/routing/chainview/bitcoind.go index 5b52384a..c4014dce 100644 --- a/routing/chainview/bitcoind.go +++ b/routing/chainview/bitcoind.go @@ -8,14 +8,14 @@ import ( "sync/atomic" "time" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wtxmgr" ) // BitcoindFilteredChainView is an implementation of the FilteredChainView diff --git a/routing/chainview/btcd.go b/routing/chainview/btcd.go index 6fefcf1c..fc232f61 100644 --- a/routing/chainview/btcd.go +++ b/routing/chainview/btcd.go @@ -7,11 +7,11 @@ import ( "sync" "sync/atomic" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // BtcdFilteredChainView is an implementation of the FilteredChainView diff --git a/routing/chainview/interface.go b/routing/chainview/interface.go index f2eeddde..036d90c0 100644 --- a/routing/chainview/interface.go +++ b/routing/chainview/interface.go @@ -1,8 +1,8 @@ package chainview import ( - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" ) // FilteredChainView represents a subscription to a certain subset of the diff --git a/routing/chainview/interface_test.go b/routing/chainview/interface_test.go index 7dff3e0b..2d88ee0e 100644 --- a/routing/chainview/interface_test.go +++ b/routing/chainview/interface_test.go @@ -14,17 +14,17 @@ import ( "github.com/lightninglabs/neutrino" "github.com/ltcsuite/ltcd/btcjson" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/integration/rpctest" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/integration/rpctest" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" // Required to register the boltdb walletdb implementation. + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" // Required to register the boltdb walletdb implementation. ) var ( diff --git a/routing/chainview/neutrino.go b/routing/chainview/neutrino.go index 4664078f..a792d967 100644 --- a/routing/chainview/neutrino.go +++ b/routing/chainview/neutrino.go @@ -6,12 +6,12 @@ import ( "sync/atomic" "github.com/lightninglabs/neutrino" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/gcs/builder" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/gcs/builder" + "github.com/btcsuite/btcwallet/waddrmgr" ) // CfFilteredChainView is an implementation of the FilteredChainView interface diff --git a/routing/missioncontrol.go b/routing/missioncontrol.go index 89aa753c..5f64b510 100644 --- a/routing/missioncontrol.go +++ b/routing/missioncontrol.go @@ -8,7 +8,7 @@ import ( "github.com/coreos/bbolt" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) const ( diff --git a/routing/notifications.go b/routing/notifications.go index f4bbaec0..3706b733 100644 --- a/routing/notifications.go +++ b/routing/notifications.go @@ -10,9 +10,9 @@ import ( "github.com/go-errors/errors" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // TopologyClient represents an intent to receive notifications from the diff --git a/routing/notifications_test.go b/routing/notifications_test.go index 7e09514a..40d6cab8 100644 --- a/routing/notifications_test.go +++ b/routing/notifications_test.go @@ -15,10 +15,10 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing/chainview" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/routing/pathfind.go b/routing/pathfind.go index ef407dc7..55b6a1ec 100644 --- a/routing/pathfind.go +++ b/routing/pathfind.go @@ -12,9 +12,9 @@ import ( "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" ) const ( diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index 8a0d94dd..6037d406 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -18,10 +18,10 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" prand "math/rand" ) diff --git a/routing/router.go b/routing/router.go index d03f1634..4d62de28 100644 --- a/routing/router.go +++ b/routing/router.go @@ -17,9 +17,9 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/multimutex" "github.com/lightningnetwork/lnd/routing/chainview" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "crypto/sha256" diff --git a/routing/router_test.go b/routing/router_test.go index 97944064..1ceb0a90 100644 --- a/routing/router_test.go +++ b/routing/router_test.go @@ -11,12 +11,12 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/htlcswitch" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" "github.com/davecgh/go-spew/spew" "github.com/lightningnetwork/lightning-onion" "github.com/lightningnetwork/lnd/lnwire" - "github.com/roasbeef/btcd/btcec" + "github.com/btcsuite/btcd/btcec" ) // defaultNumRoutes is the default value for the maximum number of routes to diff --git a/rpcserver.go b/rpcserver.go index be7844ab..28e7423c 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -28,13 +28,13 @@ import ( "github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/signal" "github.com/lightningnetwork/lnd/zpay32" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" "github.com/tv42/zbase32" "golang.org/x/net/context" ) diff --git a/server.go b/server.go index 2163fd1b..d8ed46ca 100644 --- a/server.go +++ b/server.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "context" "crypto/rand" "crypto/sha256" "encoding/hex" @@ -15,6 +16,11 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/connmgr" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" "github.com/coreos/bbolt" "github.com/go-errors/errors" "github.com/lightningnetwork/lightning-onion" @@ -32,12 +38,6 @@ import ( "github.com/lightningnetwork/lnd/nat" "github.com/lightningnetwork/lnd/routing" "github.com/lightningnetwork/lnd/tor" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/connmgr" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "golang.org/x/net/context" ) const ( diff --git a/shachain/element.go b/shachain/element.go index 3099c025..5aa0df29 100644 --- a/shachain/element.go +++ b/shachain/element.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "errors" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // element represents the entity which contains the hash and index diff --git a/shachain/producer.go b/shachain/producer.go index 87f5aff8..c633d899 100644 --- a/shachain/producer.go +++ b/shachain/producer.go @@ -3,7 +3,7 @@ package shachain import ( "io" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // Producer is an interface which serves as an abstraction over the data diff --git a/shachain/producer_test.go b/shachain/producer_test.go index cea8cdb9..1806706e 100644 --- a/shachain/producer_test.go +++ b/shachain/producer_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // TestShaChainProducerRestore checks the ability of shachain producer to be diff --git a/shachain/store.go b/shachain/store.go index 4fd7dac8..8834870a 100644 --- a/shachain/store.go +++ b/shachain/store.go @@ -5,7 +5,7 @@ import ( "io" "github.com/go-errors/errors" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // Store is an interface which serves as an abstraction over data structure diff --git a/shachain/store_test.go b/shachain/store_test.go index 5e2e319a..d76b4949 100644 --- a/shachain/store_test.go +++ b/shachain/store_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) type testInsert struct { diff --git a/shachain/utils.go b/shachain/utils.go index 753d8fb8..2f61f247 100644 --- a/shachain/utils.go +++ b/shachain/utils.go @@ -3,7 +3,7 @@ package shachain import ( "encoding/hex" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // changeBit is a functio that function that flips a bit of the hash at a diff --git a/test_utils.go b/test_utils.go index 98531120..c44b4b43 100644 --- a/test_utils.go +++ b/test_utils.go @@ -18,10 +18,10 @@ import ( "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/utxonursery.go b/utxonursery.go index 59f2d25b..ff190fae 100644 --- a/utxonursery.go +++ b/utxonursery.go @@ -12,10 +12,10 @@ import ( "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // SUMMARY OF OUTPUT STATES diff --git a/utxonursery_test.go b/utxonursery_test.go index e950aed1..d4faa824 100644 --- a/utxonursery_test.go +++ b/utxonursery_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) var ( diff --git a/walletunlocker/service.go b/walletunlocker/service.go index c334e971..35f7acf1 100644 --- a/walletunlocker/service.go +++ b/walletunlocker/service.go @@ -11,8 +11,8 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcwallet/wallet" "golang.org/x/net/context" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/walletunlocker/service_test.go b/walletunlocker/service_test.go index c5ab819a..7c9b5e58 100644 --- a/walletunlocker/service_test.go +++ b/walletunlocker/service_test.go @@ -12,8 +12,8 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" "github.com/lightningnetwork/lnd/walletunlocker" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcwallet/wallet" "golang.org/x/net/context" "github.com/lightningnetwork/lnd/keychain" ) diff --git a/witness_beacon.go b/witness_beacon.go index 842321b7..f1ab90f7 100644 --- a/witness_beacon.go +++ b/witness_beacon.go @@ -6,7 +6,7 @@ import ( "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/contractcourt" "github.com/lightningnetwork/lnd/lnwallet" - "github.com/roasbeef/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/chaincfg/chainhash" ) // preimageSubscriber reprints an active subscription to be notified once the diff --git a/zpay32/invoice.go b/zpay32/invoice.go index ffed10fd..8ad843b8 100644 --- a/zpay32/invoice.go +++ b/zpay32/invoice.go @@ -9,11 +9,11 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/bech32" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/bech32" ) const ( diff --git a/zpay32/invoice_internal_test.go b/zpay32/invoice_internal_test.go index cee1b5e0..3eed2a88 100644 --- a/zpay32/invoice_internal_test.go +++ b/zpay32/invoice_internal_test.go @@ -9,10 +9,10 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/bech32" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/bech32" ) // TestDecodeAmount ensures that the amount string in the hrp of the Invoice diff --git a/zpay32/invoice_test.go b/zpay32/invoice_test.go index e52d6098..51fa72c9 100644 --- a/zpay32/invoice_test.go +++ b/zpay32/invoice_test.go @@ -13,11 +13,11 @@ import ( "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" litecoinCfg "github.com/ltcsuite/ltcd/chaincfg" )