mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 09:53:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1326 from Roasbeef/btcsuite-switch

Browse Source 
multi: switch over all imports to depend on btcsuite proper, no longer the roasbeef forks
This commit is contained in:
Olaoluwa Osuntokun 2018-07-13 18:49:17 -07:00 committed by GitHub
commit b0288d4677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
171 changed files with 592 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Gopkg.lock generated
View File

@ -43,7 +43,7 @@
".",
"chacha"
]
revision = "c8d29375923a8e1d2a0f0dc0fc1d8a0aba5b97ba"
revision = "e2538746bfea853aaa589feb8ec46bd46ee78f86"
[[projects]]
branch = "master"
@ -62,11 +62,64 @@
]
revision = "761fd5fbb34e4c2c138c280395b65b48e4ff5a53"
[[projects]]
name = "github.com/btcsuite/btcd"
packages = [
"addrmgr",
"blockchain",
"btcec",
"btcjson",
"chaincfg",
"chaincfg/chainhash",
"connmgr",
"database",
"integration/rpctest",
"peer",
"rpcclient",
"txscript",
"wire"
]
revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
[[projects]]
name = "github.com/btcsuite/btclog"
packages = ["."]
revision = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"
[[projects]]
name = "github.com/btcsuite/btcutil"
packages = [
".",
"base58",
"bech32",
"gcs",
"gcs/builder",
"hdkeychain",
"txsort"
]
revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
[[projects]]
name = "github.com/btcsuite/btcwallet"
packages = [
"chain",
"internal/helpers",
"internal/legacy/keystore",
"internal/legacy/rename",
"internal/prompt",
"internal/zero",
"snacl",
"waddrmgr",
"wallet",
"wallet/internal/txsizes",
"wallet/txauthor",
"wallet/txrules",
"walletdb",
"walletdb/bdb",
"wtxmgr"
]
revision = "64b5b448f5e6853a2d870f388504a7807bc951f1"
[[projects]]
branch = "master"
name = "github.com/btcsuite/fastsha256"
@ -86,7 +139,6 @@
"nacl/secretbox",
"pbkdf2",
"poly1305",
"ripemd160",
"salsa20/salsa",
"scrypt",
"ssh/terminal"
@ -159,7 +211,7 @@
branch = "master"
name = "github.com/juju/loggo"
packages = ["."]
revision = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"
revision = "584905176618da46b895b176c721b02c476b6993"
[[projects]]
name = "github.com/kkdai/bstream"
@ -179,12 +231,12 @@
"filterdb",
"headerfs"
]
revision = "36d9a509ff4ea1e916a73c6f1c2b784c1faf11ed"
revision = "03f4c660ea0d1586331f32561185d45eab1ba4c9"
[[projects]]
name = "github.com/lightningnetwork/lightning-onion"
packages = ["."]
revision = "e5ab5d7396020384f864452ec3c69b56264f1092"
revision = "ac4d9da8f1d67c95f1fafdc65e1a4902d6f5a940"
[[projects]]
name = "github.com/ltcsuite/ltcd"
@ -204,59 +256,6 @@
]
revision = "79bfde677fa81ff8d27c4330c35bda075d360641"
[[projects]]
name = "github.com/roasbeef/btcd"
packages = [
"addrmgr",
"blockchain",
"btcec",
"btcjson",
"chaincfg",
"chaincfg/chainhash",
"connmgr",
"database",
"integration/rpctest",
"peer",
"rpcclient",
"txscript",
"wire"
]
revision = "a03db407e40d3b66ea29984263bbc8bf4d2f04c4"
[[projects]]
name = "github.com/roasbeef/btcutil"
packages = [
".",
"base58",
"bech32",
"gcs",
"gcs/builder",
"hdkeychain",
"txsort"
]
revision = "dfb640c57141f1c2113b92b4b16d2a89c30dd258"
[[projects]]
name = "github.com/roasbeef/btcwallet"
packages = [
"chain",
"internal/helpers",
"internal/legacy/keystore",
"internal/legacy/rename",
"internal/prompt",
"internal/zero",
"snacl",
"waddrmgr",
"wallet",
"wallet/internal/txsizes",
"wallet/txauthor",
"wallet/txrules",
"walletdb",
"walletdb/bdb",
"wtxmgr"
]
revision = "ccd48bb4720f2baeaa795cac81264f6ced2da4c7"
[[projects]]
branch = "master"
name = "github.com/rogpeppe/fastuuid"
@ -314,10 +313,11 @@
branch = "master"
name = "golang.org/x/sys"
packages = [
"cpu",
"unix",
"windows"
]
revision = "c28acc882ebcbfbe8ce9f0f14b9ac26ee138dd51"
revision = "56ede360ec1c541828fb88741b3f1049406d28f5"
[[projects]]
name = "golang.org/x/text"
@ -385,7 +385,7 @@
branch = "v1"
name = "gopkg.in/errgo.v1"
packages = ["."]
revision = "442357a80af5c6bf9b6d51ae791a39c3421004f3"
revision = "c17903c6b19d5dedb9cfba9fa314c7fae63e554f"
[[projects]]
name = "gopkg.in/macaroon-bakery.v2"
@ -404,6 +404,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "dc40dd185a90b723e4b3df4a077b4ad4f99648260661cac9d58121e8bd3474ef"
inputs-digest = "7ac5bd06ab8aa8f6a01f191092ac37d1e33200f366fa3b52fb4152369d76c5be"
solver-name = "gps-cdcl"
solver-version = 1

16
Gopkg.toml
View File

@ -44,11 +44,11 @@
[[constraint]]
name = "github.com/lightninglabs/neutrino"
revision = "36d9a509ff4ea1e916a73c6f1c2b784c1faf11ed"
revision = "03f4c660ea0d1586331f32561185d45eab1ba4c9"
[[constraint]]
name = "github.com/lightningnetwork/lightning-onion"
revision = "e5ab5d7396020384f864452ec3c69b56264f1092"
revision = "ac4d9da8f1d67c95f1fafdc65e1a4902d6f5a940"
[[constraint]]
name = "github.com/ltcsuite/ltcd"
@ -63,16 +63,16 @@
revision = "29b680b06c82d044ebea91bf3069038eb562df2a"
[[constraint]]
name = "github.com/roasbeef/btcutil"
revision = "dfb640c57141f1c2113b92b4b16d2a89c30dd258"
name = "github.com/btcsuite/btcutil"
revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
[[constraint]]
name = "github.com/roasbeef/btcd"
revision = "a03db407e40d3b66ea29984263bbc8bf4d2f04c4"
name = "github.com/btcsuite/btcd"
revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64"
[[constraint]]
name = "github.com/roasbeef/btcwallet"
revision = "ccd48bb4720f2baeaa795cac81264f6ced2da4c7"
name = "github.com/btcsuite/btcwallet"
revision = "64b5b448f5e6853a2d870f388504a7807bc951f1"
[[constraint]]
name = "github.com/tv42/zbase32"

4
Makefile
View File

@ -2,7 +2,7 @@ PKG := github.com/lightningnetwork/lnd
ESCPKG := github.com\/lightningnetwork\/lnd
DEP_PKG := github.com/golang/dep/cmd/dep
BTCD_PKG := github.com/roasbeef/btcd
BTCD_PKG := github.com/btcsuite/btcd
GLIDE_PKG := github.com/Masterminds/glide
GOVERALLS_PKG := github.com/mattn/goveralls
LINT_PKG := gopkg.in/alecthomas/gometalinter.v1
@ -110,7 +110,7 @@ dep: $(DEP_BIN)
$(BTCD_DIR):
@$(call print, "Fetching btcd.")
go get -d github.com/roasbeef/btcd
go get -d github.com/btcsuite/btcd
btcd: $(GLIDE_BIN) $(BTCD_DIR)
@$(call print, "Compiling btcd dependencies.")

4
autopilot/agent.go
View File

@ -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.

6
autopilot/agent_test.go
View File

@ -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 {

4
autopilot/graph.go
View File

@ -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 (

6
autopilot/interface.go
View File

@ -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

4
autopilot/prefattach.go
View File

@ -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

4
autopilot/prefattach_test.go
View File

@ -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) {

10
breacharbiter.go
View File

@ -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 (

10
breacharbiter_test.go
View File

@ -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 (

2
brontide/conn.go
View File

@ -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

2
brontide/listener.go
View File

@ -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

2
brontide/noise.go
View File

@ -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 (

2
brontide/noise_test.go
View File

@ -10,7 +10,7 @@ import (
"testing"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/btcec"
"github.com/btcsuite/btcd/btcec"
)
type maybeNetConn struct {

16
chainntnfs/bitcoindnotify/bitcoind.go
View File

@ -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 (

4
chainntnfs/bitcoindnotify/driver.go
View File

@ -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

10
chainntnfs/btcdnotify/btcd.go
View File

@ -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 (

2
chainntnfs/btcdnotify/driver.go
View File

@ -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

4
chainntnfs/interface.go
View File

@ -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

21
chainntnfs/interface_test.go
View File

@ -13,25 +13,25 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/lightninglabs/neutrino"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chainntnfs/bitcoindnotify"
"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/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 (
@ -1590,7 +1590,6 @@ func TestInterfaces(t *testing.T) {
ChainParams: *netParams,
ConnectPeers: []string{p2pAddr},
}
neutrino.WaitForMoreCFHeaders = 250 * time.Millisecond
spvNode, err := neutrino.NewChainService(spvConfig)
if err != nil {
t.Fatalf("unable to create neutrino: %v", err)

14
chainntnfs/neutrinonotify/neutrino.go
View File

@ -8,14 +8,14 @@ import (
"sync/atomic"
"time"
"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"
"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"
)
const (
@ -58,7 +58,7 @@ type NeutrinoNotifier struct {
bestHeight uint32
p2pNode *neutrino.ChainService
chainView neutrino.Rescan
chainView *neutrino.Rescan
notificationCancels chan interface{}
notificationRegistry chan interface{}

4
chainntnfs/txconfnotifier.go
View File

@ -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

6
chainntnfs/txconfnotifier_test.go
View File

@ -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

8
chainparams.go
View File

@ -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

13
chainregistry.go
View File

@ -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 (
@ -229,7 +229,6 @@ func newChainControlFromConfig(cfg *config, chanDB *channeldb.DB,
return ips, nil
},
}
neutrino.WaitForMoreCFHeaders = time.Second * 1
neutrino.MaxPeers = 8
neutrino.BanDuration = 5 * time.Second
svc, err := neutrino.NewChainService(config)

2
chan_series.go
View File

@ -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

6
chancloser.go
View File

@ -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 (

8
channeldb/channel.go
View File

@ -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 (

12
channeldb/channel_test.go
View File

@ -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 (

8
channeldb/codec.go
View File

@ -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.

4
channeldb/db.go
View File

@ -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 (

2
channeldb/forwarding_package_test.go
View File

@ -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,

8
channeldb/graph.go
View File

@ -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 (

6
channeldb/graph_test.go
View File

@ -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 (

2
channeldb/invoices.go
View File

@ -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 (

4
channeldb/nodes.go
View File

@ -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 (

4
channeldb/nodes_test.go
View File

@ -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) {

4
cmd/lncli/commands.go
View File

@ -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"

2
cmd/lncli/main.go
View File

@ -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"

4
config.go
View File

@ -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 (

4
contractcourt/briefcase.go
View File

@ -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

8
contractcourt/briefcase_test.go
View File

@ -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 (

6
contractcourt/chain_arbitrator.go
View File

@ -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

8
contractcourt/chain_watcher.go
View File

@ -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

4
contractcourt/chain_watcher_test.go
View File

@ -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 {

2
contractcourt/channel_arbitrator.go
View File

@ -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 (

4
contractcourt/channel_arbitrator_test.go
View File

@ -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{}

4
contractcourt/contract_resolvers.go
View File

@ -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 (

4
discovery/ann_validation.go
View File

@ -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

4
discovery/bootstrapper.go
View File

@ -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() {

6
discovery/gossiper.go
View File

@ -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 (

6
discovery/gossiper_test.go
View File

@ -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 (

2
discovery/syncer.go
View File

@ -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

4
discovery/syncer_test.go
View File

@ -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 {

2
discovery/utils.go
View File

@ -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

7
docker/btcd/Dockerfile
View File

@ -7,11 +7,10 @@ RUN apk add --no-cache \
git \
&& go get -u github.com/Masterminds/glide
WORKDIR $GOPATH/src/github.com/roasbeef/btcd
WORKDIR $GOPATH/src/github.com/btcsuite/btcd
# Grab and install the latest version of roasbeef's fork of btcd and all
# related dependencies.
RUN git clone https://github.com/roasbeef/btcd . \
# Grab and install the latest version of of btcd and all related dependencies.
RUN git clone https://github.com/btcsuite/btcd . \
&& glide install \
&& go install . ./cmd/...

25
docs/INSTALL.md
View File

@ -118,16 +118,16 @@ 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
additions that are not yet available in the master branch. To install, run the
following commands:
To install btcd, run the following commands:
Install **btcd**: (must be from roasbeef fork, not from btcsuite)
Install **btcd**:
```
make btcd
```
Alternatively, you can install [`btcd` directly from its
repo](https://github.com/btcsuite/btcd).
### Starting btcd
Running the following command will create `rpc.cert` and default `btcd.conf`.
@ -195,11 +195,11 @@ light client powered by [neutrino](https://github.com/lightninglabs/neutrino).
#### Running lnd in Light Client Mode
In order to run `lnd` in its light client mode, you'll need to locate a
full-node which is capable of serving this new light client mode. A [BIP
draft](https://github.com/Roasbeef/bips/blob/master/gcs_light_client.mediawiki)
exists, and will be finalized in the near future, but for now you'll need to be
running `roasbeef`'s fork of btcd. A public instance of such a node can be
found at `faucet.lightning.community`.
full-node which is capable of serving this new light client mode. `lnd` uses
[BIP 157](https://github.com/bitcoin/bips/tree/master/bip-0157) and [BIP
158](https://github.com/bitcoin/bips/tree/master/bip-0158) for its light client
mode. A public instance of such a node can be found at
`faucet.lightning.community`.
To run lnd in neutrino mode, run `lnd` with the following arguments, (swapping
in `--bitcoin.simnet` if needed), and also your own `btcd` node if available:
@ -328,8 +328,3 @@ at the same time), so when working with Litecoin be sure to set to parameters
for Litecoin accordingly. For node configuration, the sections are called
`[Btcd]`, `[Bitcoind]`, `[Neutrino]`, `[Ltcd]`, and `[Litecoind]` depending on
which chain and node type you're using.
# Accurate as of:
- _roasbeef/btcd commit:_ `f8c02aff4e7a807ba0c1349e2db03695d8e790e8`
- _roasbeef/btcutil commit:_ `a259eaf2ec1b54653cdd67848a41867f280797ee`
- _lightningnetwork/lnd commit:_ `08de2becf8d77fae192205172c4fb17bb09bd0dbf49e64aa323b2fcbf9fe2a35`

10
docs/MAKEFILE.md
View File

@ -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)

8
fundingmanager.go
View File

@ -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 (

12
fundingmanager_test.go
View File

@ -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 (

6
htlcswitch/circuit_test.go
View File

@ -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 (

2
htlcswitch/failure.go
View File

@ -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

2
htlcswitch/interfaces.go
View File

@ -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

2
htlcswitch/iterator.go
View File

@ -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

2
htlcswitch/link.go
View File

@ -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() {

8
htlcswitch/link_test.go
View File

@ -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 (

8
htlcswitch/mock.go
View File

@ -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 {

7
htlcswitch/switch.go
View File

@ -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 (

2
htlcswitch/switch_test.go
View File

@ -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) {

8
htlcswitch/test_utils.go
View File

@ -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 (

4
invoiceregistry.go
View File

@ -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 (

8
keychain/btcwallet.go
View File

@ -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 (

2
keychain/derivation.go
View File

@ -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

12
keychain/interface_test.go
View File

@ -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

8
lnd.go
View File

@ -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 (

12
lnd_test.go
View File

@ -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"
)

4
lnpeer/peer.go
View File

@ -1,9 +1,9 @@
package lnpeer
import (
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/wire"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/roasbeef/btcd/btcec"
"github.com/roasbeef/btcd/wire"
)
// Peer is an interface which represents the remote lightning node inside our

14
lntest/harness.go
View File

@ -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.

8
lntest/node.go
View File

@ -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 (

10
lnwallet/btcwallet/blockchain.go
View File

@ -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 (

20
lnwallet/btcwallet/btcwallet.go
View File

@ -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 (

12
lnwallet/btcwallet/config.go
View File

@ -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 (

2
lnwallet/btcwallet/driver.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/roasbeef/btcwallet/chain"
"github.com/btcsuite/btcwallet/chain"
)
const (

16
lnwallet/btcwallet/signer.go
View File

@ -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

14
lnwallet/channel.go
View File

@ -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

8
lnwallet/channel_test.go
View File

@ -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

2
lnwallet/config.go
View File

@ -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

4
lnwallet/errors.go
View File

@ -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

6
lnwallet/fee_estimator.go
View File

@ -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.

2
lnwallet/fee_estimator_test.go
View File

@ -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

8
lnwallet/interface.go
View File

@ -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

28
lnwallet/interface_test.go
View File

@ -19,11 +19,15 @@ import (
"github.com/coreos/bbolt"
"github.com/davecgh/go-spew/spew"
"github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/lightninglabs/neutrino"
"github.com/roasbeef/btcwallet/chain"
"github.com/roasbeef/btcwallet/walletdb"
_ "github.com/roasbeef/btcwallet/walletdb/bdb"
"github.com/btcsuite/btcd/btcjson"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/rpcclient"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chainntnfs/btcdnotify"
"github.com/lightningnetwork/lnd/channeldb"
@ -31,16 +35,12 @@ 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/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 (
@ -2079,10 +2079,9 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
// Set some package-level variable to speed up
// operation for tests.
neutrino.WaitForMoreCFHeaders = time.Millisecond * 100
neutrino.BanDuration = time.Millisecond * 100
neutrino.QueryTimeout = time.Millisecond * 500
neutrino.QueryNumRetries = 2
neutrino.QueryNumRetries = 1
// Start Alice - open a database, start a neutrino
// instance, and initialize a btcwallet driver for it.
@ -2190,6 +2189,7 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
t.Fatalf("couldn't start bob client: %v", err)
}
default:
return
t.Fatalf("unknown chain driver: %v", backEnd)
}

6
lnwallet/log.go
View File

@ -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

4
lnwallet/parameters.go
View File

@ -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

8
lnwallet/reservation.go
View File

@ -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

8
lnwallet/script_utils.go
View File

@ -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 (

10
lnwallet/script_utils_test.go
View File

@ -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

6
lnwallet/signdescriptor.go
View File

@ -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 (

6
lnwallet/signdescriptor_test.go
View File

@ -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) {

Some files were not shown because too many files have changed in this diff Show More