diff --git a/chainntfs/btcdnotify/btcd.go b/chainntfs/btcdnotify/btcd.go index 69d8b92d1..f4be57035 100644 --- a/chainntfs/btcdnotify/btcd.go +++ b/chainntfs/btcdnotify/btcd.go @@ -7,11 +7,11 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcrpcclient" - "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/chainntfs" + "github.com/roasbeef/btcd/btcjson" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcrpcclient" + "github.com/roasbeef/btcutil" ) // BtcdNotifier implements the ChainNotifier interface using btcd's websockets diff --git a/chainntfs/btcdnotify/btcdnotify_test.go b/chainntfs/btcdnotify/btcdnotify_test.go index c542e1c5d..b5c33b8f3 100644 --- a/chainntfs/btcdnotify/btcdnotify_test.go +++ b/chainntfs/btcdnotify/btcdnotify_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/Roasbeef/btcd/rpctest" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" "github.com/lightningnetwork/lnd/chainntfs" ) diff --git a/chainntfs/chainntfs.go b/chainntfs/chainntfs.go index 7b8c4195f..5b9380f47 100644 --- a/chainntfs/chainntfs.go +++ b/chainntfs/chainntfs.go @@ -1,6 +1,6 @@ package chainntnfs -import "github.com/btcsuite/btcd/wire" +import "github.com/roasbeef/btcd/wire" // ChainNotifier represents a trusted source to receive notifications concerning // targeted events on the Bitcoin blockchain. The interface specification is diff --git a/channeldb/channel.go b/channeldb/channel.go index e35f9bf24..329d0b1a8 100644 --- a/channeldb/channel.go +++ b/channeldb/channel.go @@ -8,11 +8,11 @@ import ( "time" "github.com/boltdb/bolt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/walletdb" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcwallet/walletdb" "github.com/lightningnetwork/lnd/elkrem" + "github.com/roasbeef/btcutil" ) var ( diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go index 4fc40577b..325f0e4b0 100644 --- a/channeldb/channel_test.go +++ b/channeldb/channel_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" "github.com/lightningnetwork/lnd/elkrem" + "github.com/roasbeef/btcutil" ) var ( diff --git a/channeldb/db.go b/channeldb/db.go index b0d3db73c..a647bd314 100644 --- a/channeldb/db.go +++ b/channeldb/db.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/boltdb/bolt" - "github.com/btcsuite/btcd/chaincfg" + "github.com/roasbeef/btcd/chaincfg" ) const ( diff --git a/channeldb/nodes.go b/channeldb/nodes.go index 686fe7bc0..f9ac288e4 100644 --- a/channeldb/nodes.go +++ b/channeldb/nodes.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/ripemd160" "github.com/boltdb/bolt" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" ) var ( diff --git a/config.go b/config.go index 8c90e41fc..73547794f 100644 --- a/config.go +++ b/config.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcutil" flags "github.com/btcsuite/go-flags" ) diff --git a/elkrem/elkrem.go b/elkrem/elkrem.go index de54ec044..6260b28c6 100644 --- a/elkrem/elkrem.go +++ b/elkrem/elkrem.go @@ -3,7 +3,7 @@ package elkrem import ( "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) /* elkrem is a simpler alternative to the 64 dimensional sha-chain. diff --git a/elkrem/elkrem_test.go b/elkrem/elkrem_test.go index a2af11a80..937e8648d 100644 --- a/elkrem/elkrem_test.go +++ b/elkrem/elkrem_test.go @@ -3,7 +3,7 @@ package elkrem import ( "testing" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) // TestElkremBig makes a height 63 (max size possible) tree and tries 10K hashes diff --git a/elkrem/findpre.go b/elkrem/findpre.go index f964ed5d9..6b5330416 100644 --- a/elkrem/findpre.go +++ b/elkrem/findpre.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" ) /* findpre - find the pre-image for a given hash diff --git a/elkrem/serdes.go b/elkrem/serdes.go index 5212e2eb7..e8b2728d7 100644 --- a/elkrem/serdes.go +++ b/elkrem/serdes.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) /* Serialization and Deserialization methods for the Elkrem structs. diff --git a/lndc/conn.go b/lndc/conn.go index 19134a8b7..8d0147bbb 100644 --- a/lndc/conn.go +++ b/lndc/conn.go @@ -9,11 +9,11 @@ import ( "net" "time" - "github.com/btcsuite/btcutil" "github.com/btcsuite/fastsha256" "github.com/codahale/chacha20poly1305" + "github.com/roasbeef/btcutil" - "github.com/btcsuite/btcd/btcec" + "github.com/roasbeef/btcd/btcec" ) // Conn... diff --git a/lndc/listener.go b/lndc/listener.go index 7883220f6..41186cf47 100644 --- a/lndc/listener.go +++ b/lndc/listener.go @@ -5,10 +5,10 @@ import ( "fmt" "net" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcutil" "github.com/btcsuite/fastsha256" "github.com/codahale/chacha20poly1305" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcutil" ) // Listener... diff --git a/lndc/lnadr.go b/lndc/lnadr.go index c10effac7..984a5e705 100644 --- a/lndc/lnadr.go +++ b/lndc/lnadr.go @@ -8,9 +8,9 @@ import ( "net" "strings" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcutil" ) // lnAddr... diff --git a/lndc/lndc_test.go b/lndc/lndc_test.go index 9066849d7..e5421ea16 100644 --- a/lndc/lndc_test.go +++ b/lndc/lndc_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/btcsuite/btcd/btcec" + "github.com/roasbeef/btcd/btcec" ) func TestConnectionCorrectness(t *testing.T) { diff --git a/lnstate/lnstate.go b/lnstate/lnstate.go index 0110d214b..fba24db8b 100644 --- a/lnstate/lnstate.go +++ b/lnstate/lnstate.go @@ -2,15 +2,15 @@ package lnstate import ( "fmt" - //"github.com/btcsuite/btcd/btcec" + //"github.com/roasbeef/btcd/btcec" //"atomic" "sync" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) //This is a state machine which allows for simultaneous high-volume diff --git a/lnwallet/channel.go b/lnwallet/channel.go index 3bf83ecae..6ee9c2ada 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -8,11 +8,11 @@ import ( "github.com/lightningnetwork/lnd/chainntfs" "github.com/lightningnetwork/lnd/channeldb" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/txsort" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/txsort" ) const ( diff --git a/lnwallet/coin_select.go b/lnwallet/coin_select.go index e8146829c..e1d95491f 100644 --- a/lnwallet/coin_select.go +++ b/lnwallet/coin_select.go @@ -3,10 +3,10 @@ package lnwallet import ( "encoding/hex" - "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/coinset" + "github.com/roasbeef/btcd/btcjson" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/coinset" ) // lnCoin represents a single unspet output. Its purpose is to convert a regular diff --git a/lnwallet/config.go b/lnwallet/config.go index 05f7d0ea7..8547c1c82 100644 --- a/lnwallet/config.go +++ b/lnwallet/config.go @@ -3,8 +3,8 @@ package lnwallet import ( "path/filepath" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcutil" ) var ( @@ -37,9 +37,9 @@ type Config struct { DebugLevel string - RpcHost string // localhost:18334 - RpcUser string - RpcPass string + RpcHost string // localhost:18334 + RpcUser string + RpcPass string RpcNoTLS bool RPCCert string diff --git a/lnwallet/interface.go b/lnwallet/interface.go index 2b3c150c9..b1ab4a94e 100644 --- a/lnwallet/interface.go +++ b/lnwallet/interface.go @@ -1,9 +1,9 @@ package lnwallet import ( - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) // WalletController defines an abstract interface for controlling a local Pure diff --git a/lnwallet/log.go b/lnwallet/log.go index b8f4080f3..9c9203d6f 100644 --- a/lnwallet/log.go +++ b/lnwallet/log.go @@ -5,7 +5,7 @@ import ( "io" "github.com/btcsuite/btclog" - btcwallet "github.com/btcsuite/btcwallet/wallet" + btcwallet "github.com/roasbeef/btcwallet/wallet" ) // log is a logger that is initialized with no output filters. This diff --git a/lnwallet/reservation.go b/lnwallet/reservation.go index b3db23bd3..3a5729d8d 100644 --- a/lnwallet/reservation.go +++ b/lnwallet/reservation.go @@ -5,9 +5,9 @@ import ( "github.com/lightningnetwork/lnd/channeldb" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) // ChannelContribution is the primary constituent of the funding workflow within diff --git a/lnwallet/script_utils.go b/lnwallet/script_utils.go index 3adac3c03..41ccd941c 100644 --- a/lnwallet/script_utils.go +++ b/lnwallet/script_utils.go @@ -4,11 +4,11 @@ import ( "bytes" "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" "github.com/btcsuite/fastsha256" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) var ( diff --git a/lnwallet/setup.go b/lnwallet/setup.go index 9fa84cf33..b11ecb862 100644 --- a/lnwallet/setup.go +++ b/lnwallet/setup.go @@ -1,28 +1,11 @@ -// Based on: https://github.com/btcsuite/btcwallet/blob/master/walletsetup.go -/* -* Copyright (c) 2014-2015 The btcsuite developers -* -* Permission to use, copy, modify, and distribute this software for any -* purpose with or without fee is hereby granted, provided that the above -* copyright notice and this permission notice appear in all copies. -* -* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - package lnwallet import ( "path/filepath" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" - _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/wire" + _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) // networkDir returns the directory name of a network directory to hold wallet diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go index 354a898ff..9ca0425c5 100644 --- a/lnwallet/wallet.go +++ b/lnwallet/wallet.go @@ -8,22 +8,22 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcjson" "github.com/lightningnetwork/lnd/chainntfs" "github.com/lightningnetwork/lnd/chainntfs/btcdnotify" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/elkrem" + "github.com/roasbeef/btcd/btcjson" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcrpcclient" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/coinset" - "github.com/btcsuite/btcutil/txsort" - "github.com/btcsuite/btcwallet/chain" - "github.com/btcsuite/btcwallet/waddrmgr" - btcwallet "github.com/btcsuite/btcwallet/wallet" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcrpcclient" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/coinset" + "github.com/roasbeef/btcutil/txsort" + "github.com/roasbeef/btcwallet/chain" + "github.com/roasbeef/btcwallet/waddrmgr" + btcwallet "github.com/roasbeef/btcwallet/wallet" ) const ( diff --git a/lnwallet/wallet_test.go b/lnwallet/wallet_test.go index ec94ef6bf..f272629c1 100644 --- a/lnwallet/wallet_test.go +++ b/lnwallet/wallet_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" - "github.com/btcsuite/btcd/chaincfg" "github.com/lightningnetwork/lnd/channeldb" + "github.com/roasbeef/btcd/chaincfg" "github.com/Roasbeef/btcd/rpctest" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/coinset" - "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/coinset" + "github.com/roasbeef/btcwallet/waddrmgr" ) var ( diff --git a/lnwire/close_complete.go b/lnwire/close_complete.go index 7345e1da5..a802989c7 100644 --- a/lnwire/close_complete.go +++ b/lnwire/close_complete.go @@ -2,8 +2,8 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" "io" ) diff --git a/lnwire/close_complete_test.go b/lnwire/close_complete_test.go index 06c4b120e..c3708cf98 100644 --- a/lnwire/close_complete_test.go +++ b/lnwire/close_complete_test.go @@ -1,7 +1,7 @@ package lnwire import ( - // "github.com/btcsuite/btcutil" + // "github.com/roasbeef/btcutil" "testing" ) diff --git a/lnwire/close_request.go b/lnwire/close_request.go index 6c0cac2dc..37de2b9af 100644 --- a/lnwire/close_request.go +++ b/lnwire/close_request.go @@ -2,8 +2,8 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcutil" "io" ) diff --git a/lnwire/close_request_test.go b/lnwire/close_request_test.go index 0e557eb8a..3f1c4e24f 100644 --- a/lnwire/close_request_test.go +++ b/lnwire/close_request_test.go @@ -1,7 +1,7 @@ package lnwire import ( - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" "testing" ) diff --git a/lnwire/commit_signature.go b/lnwire/commit_signature.go index 14540c166..2d155a87b 100644 --- a/lnwire/commit_signature.go +++ b/lnwire/commit_signature.go @@ -2,8 +2,8 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcutil" "io" ) diff --git a/lnwire/commit_signature_test.go b/lnwire/commit_signature_test.go index 2979186e5..c90e12aa1 100644 --- a/lnwire/commit_signature_test.go +++ b/lnwire/commit_signature_test.go @@ -1,7 +1,7 @@ package lnwire import ( - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" "testing" ) diff --git a/lnwire/funding_request.go b/lnwire/funding_request.go index 62fe60d21..98b6a9c2a 100644 --- a/lnwire/funding_request.go +++ b/lnwire/funding_request.go @@ -2,9 +2,9 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" "io" ) diff --git a/lnwire/funding_request_test.go b/lnwire/funding_request_test.go index 4b917003f..38f473d07 100644 --- a/lnwire/funding_request_test.go +++ b/lnwire/funding_request_test.go @@ -1,7 +1,7 @@ package lnwire import ( - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" "testing" ) diff --git a/lnwire/funding_response.go b/lnwire/funding_response.go index d188be7f2..b6e37240b 100644 --- a/lnwire/funding_response.go +++ b/lnwire/funding_response.go @@ -2,9 +2,9 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" "io" ) diff --git a/lnwire/funding_response_test.go b/lnwire/funding_response_test.go index 6543c610d..0ba635309 100644 --- a/lnwire/funding_response_test.go +++ b/lnwire/funding_response_test.go @@ -1,7 +1,7 @@ package lnwire import ( - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcutil" "testing" ) diff --git a/lnwire/funding_signaccept.go b/lnwire/funding_signaccept.go index 1cdb4c041..84820ca83 100644 --- a/lnwire/funding_signaccept.go +++ b/lnwire/funding_signaccept.go @@ -2,7 +2,7 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" + "github.com/roasbeef/btcd/btcec" "io" ) diff --git a/lnwire/funding_signcomplete.go b/lnwire/funding_signcomplete.go index 8e13809be..f3a1bba3c 100644 --- a/lnwire/funding_signcomplete.go +++ b/lnwire/funding_signcomplete.go @@ -2,8 +2,8 @@ package lnwire import ( "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" "io" ) diff --git a/lnwire/lnwire.go b/lnwire/lnwire.go index 89a523d10..8b9e192bf 100644 --- a/lnwire/lnwire.go +++ b/lnwire/lnwire.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/binary" "fmt" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" "io" "io/ioutil" ) diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go index 0cf2a82a5..e0b1685dd 100644 --- a/lnwire/lnwire_test.go +++ b/lnwire/lnwire_test.go @@ -3,9 +3,9 @@ package lnwire import ( "bytes" "encoding/hex" - "github.com/btcsuite/btcd/btcec" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/btcec" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" "io/ioutil" "reflect" "testing" diff --git a/lnwire/message.go b/lnwire/message.go index c5be1344f..84d50c83a 100644 --- a/lnwire/message.go +++ b/lnwire/message.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) // 4-byte network + 4-byte message id + payload-length 4-byte diff --git a/peer.go b/peer.go index 012ed1484..142b381a3 100644 --- a/peer.go +++ b/peer.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "time" - "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/lndc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwire" + "github.com/roasbeef/btcd/wire" ) var ( diff --git a/rpcserver.go b/rpcserver.go index 85ba355d4..b6bd66476 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -6,12 +6,12 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcwallet/waddrmgr" "github.com/lightningnetwork/lnd/lndc" "github.com/lightningnetwork/lnd/lnrpc" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcwallet/waddrmgr" "golang.org/x/net/context" ) diff --git a/server.go b/server.go index f187c4959..97aabdda2 100644 --- a/server.go +++ b/server.go @@ -7,12 +7,12 @@ import ( "sync" "sync/atomic" - "github.com/btcsuite/btcd/btcec" "github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/lndc" "github.com/lightningnetwork/lnd/lnwallet" + "github.com/roasbeef/btcd/btcec" - "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/roasbeef/btcwallet/waddrmgr" ) // server... diff --git a/shachain/shachain.go b/shachain/shachain.go index 9169e7cb1..1d775a255 100644 --- a/shachain/shachain.go +++ b/shachain/shachain.go @@ -8,8 +8,8 @@ import ( "io" "sync" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) const ( diff --git a/shell.go b/shell.go index e549b8d37..b42d5d012 100644 --- a/shell.go +++ b/shell.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcutil" "github.com/lightningnetwork/lnd/uspv" ) diff --git a/uspv/eight333.go b/uspv/eight333.go index 4eb525ac2..1259ce2b1 100644 --- a/uspv/eight333.go +++ b/uspv/eight333.go @@ -7,7 +7,7 @@ import ( "os" "sync" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) const ( diff --git a/uspv/hardmode.go b/uspv/hardmode.go index bc40e2c8e..8f6d2465e 100644 --- a/uspv/hardmode.go +++ b/uspv/hardmode.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/bloom" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/bloom" ) var ( diff --git a/uspv/header.go b/uspv/header.go index 40983e36c..9dd9c71bd 100644 --- a/uspv/header.go +++ b/uspv/header.go @@ -12,9 +12,9 @@ import ( "os" "time" - "github.com/btcsuite/btcd/blockchain" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/blockchain" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/wire" ) // blockchain settings. These are kindof bitcoin specific, but not contained in diff --git a/uspv/init.go b/uspv/init.go index 0e723daa2..f7c1c2f25 100644 --- a/uspv/init.go +++ b/uspv/init.go @@ -7,8 +7,8 @@ import ( "net" "os" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcd/wire" ) // OpenPV starts a diff --git a/uspv/keyfileio.go b/uspv/keyfileio.go index 2d1dd8291..56dca151f 100644 --- a/uspv/keyfileio.go +++ b/uspv/keyfileio.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "github.com/btcsuite/btcd/chaincfg" - "github.com/btcsuite/btcutil/hdkeychain" "github.com/howeyc/gopass" + "github.com/roasbeef/btcd/chaincfg" + "github.com/roasbeef/btcutil/hdkeychain" "golang.org/x/crypto/nacl/secretbox" "golang.org/x/crypto/scrypt" ) diff --git a/uspv/mblock.go b/uspv/mblock.go index c67cf81dc..66b06a1c3 100644 --- a/uspv/mblock.go +++ b/uspv/mblock.go @@ -3,7 +3,7 @@ package uspv import ( "fmt" - "github.com/btcsuite/btcd/wire" + "github.com/roasbeef/btcd/wire" ) func MakeMerkleParent(left *wire.ShaHash, right *wire.ShaHash) *wire.ShaHash { diff --git a/uspv/msghandler.go b/uspv/msghandler.go index 2365f993a..922612765 100644 --- a/uspv/msghandler.go +++ b/uspv/msghandler.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" ) func (s *SPVCon) incomingMessageHandler() { diff --git a/uspv/sortsignsend.go b/uspv/sortsignsend.go index bb51218e2..be208a52f 100644 --- a/uspv/sortsignsend.go +++ b/uspv/sortsignsend.go @@ -6,12 +6,12 @@ import ( "log" "sort" - "github.com/btcsuite/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/bloom" - "github.com/btcsuite/btcutil/hdkeychain" - "github.com/btcsuite/btcutil/txsort" + "github.com/roasbeef/btcd/txscript" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/bloom" + "github.com/roasbeef/btcutil/hdkeychain" + "github.com/roasbeef/btcutil/txsort" ) func (s *SPVCon) PongBack(nonce uint64) { diff --git a/uspv/txstore.go b/uspv/txstore.go index acf74f9f5..0fa9dce00 100644 --- a/uspv/txstore.go +++ b/uspv/txstore.go @@ -7,13 +7,13 @@ import ( "log" "sync" - "github.com/btcsuite/btcd/chaincfg" + "github.com/roasbeef/btcd/chaincfg" "github.com/boltdb/bolt" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/bloom" - "github.com/btcsuite/btcutil/hdkeychain" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/bloom" + "github.com/roasbeef/btcutil/hdkeychain" ) type TxStore struct { diff --git a/uspv/utxodb.go b/uspv/utxodb.go index 96f1115a3..d9a037f38 100644 --- a/uspv/utxodb.go +++ b/uspv/utxodb.go @@ -5,13 +5,13 @@ import ( "encoding/binary" "fmt" - "github.com/btcsuite/btcd/blockchain" + "github.com/roasbeef/btcd/blockchain" - "github.com/btcsuite/btcd/txscript" + "github.com/roasbeef/btcd/txscript" - "github.com/btcsuite/btcd/wire" - "github.com/btcsuite/btcutil" - "github.com/btcsuite/btcutil/hdkeychain" + "github.com/roasbeef/btcd/wire" + "github.com/roasbeef/btcutil" + "github.com/roasbeef/btcutil/hdkeychain" "github.com/boltdb/bolt" )