diff --git a/btcwallet.go b/btcwallet.go index 3a46d272a7..ec0dedf6ac 100644 --- a/btcwallet.go +++ b/btcwallet.go @@ -13,9 +13,9 @@ import ( "runtime" "sync" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/rpc/legacyrpc" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/rpc/legacyrpc" + "github.com/btcsuite/btcwallet/wallet" ) var ( diff --git a/chain/chain.go b/chain/chain.go index 30a2e0d32d..18a42ce852 100644 --- a/chain/chain.go +++ b/chain/chain.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wtxmgr" ) // RPCClient represents a persistent client connection to a bitcoin RPC server diff --git a/cmd/dropwtxmgr/main.go b/cmd/dropwtxmgr/main.go index 3f88beac29..990b5c59fd 100644 --- a/cmd/dropwtxmgr/main.go +++ b/cmd/dropwtxmgr/main.go @@ -10,10 +10,10 @@ import ( "os" "path/filepath" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" "github.com/jessevdk/go-flags" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" ) const defaultNet = "mainnet" diff --git a/cmd/sweepaccount/main.go b/cmd/sweepaccount/main.go index f333e0e485..4af28192fa 100644 --- a/cmd/sweepaccount/main.go +++ b/cmd/sweepaccount/main.go @@ -12,17 +12,17 @@ import ( "golang.org/x/crypto/ssh/terminal" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/internal/cfgutil" + "github.com/btcsuite/btcwallet/netparams" + "github.com/btcsuite/btcwallet/wallet/txauthor" + "github.com/btcsuite/btcwallet/wallet/txrules" "github.com/jessevdk/go-flags" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/internal/cfgutil" - "github.com/roasbeef/btcwallet/netparams" - "github.com/roasbeef/btcwallet/wallet/txauthor" - "github.com/roasbeef/btcwallet/wallet/txrules" ) var ( @@ -171,7 +171,7 @@ func makeInputSource(outputs []btcjson.ListUnspentResult) txauthor.InputSource { break } - inputs = append(inputs, wire.NewTxIn(&previousOutPoint, nil)) + inputs = append(inputs, wire.NewTxIn(&previousOutPoint, nil, nil)) } if sourceErr == nil && totalInputValue == 0 { diff --git a/config.go b/config.go index 60793a902c..efc757039d 100644 --- a/config.go +++ b/config.go @@ -14,12 +14,12 @@ import ( "sort" "strings" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/internal/cfgutil" + "github.com/btcsuite/btcwallet/internal/legacy/keystore" + "github.com/btcsuite/btcwallet/netparams" + "github.com/btcsuite/btcwallet/wallet" flags "github.com/jessevdk/go-flags" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/internal/cfgutil" - "github.com/roasbeef/btcwallet/internal/legacy/keystore" - "github.com/roasbeef/btcwallet/netparams" - "github.com/roasbeef/btcwallet/wallet" ) const ( diff --git a/glide.lock b/glide.lock index f9a6e79e83..46bf8bd3f1 100644 --- a/glide.lock +++ b/glide.lock @@ -4,7 +4,8 @@ imports: - name: github.com/boltdb/bolt version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 - name: github.com/btcsuite/btcd - version: 7c0fd83c87b2d2be405489cff522e0110328cd1e + version: 40987a252609c9f8bdfa36e3f25f064493a32191 + repo: ssh://git@github.com/companyzero/btcdln subpackages: - blockchain - btcec diff --git a/internal/cfgutil/amount.go b/internal/cfgutil/amount.go index 18b528219f..5fa9c0c18e 100644 --- a/internal/cfgutil/amount.go +++ b/internal/cfgutil/amount.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcutil" ) // AmountFlag embeds a btcutil.Amount and implements the flags.Marshaler and diff --git a/internal/helpers/helpers.go b/internal/helpers/helpers.go index e8a43b3977..9bf3e42e10 100644 --- a/internal/helpers/helpers.go +++ b/internal/helpers/helpers.go @@ -7,8 +7,8 @@ package helpers import ( - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" ) // SumOutputValues sums up the list of TxOuts and returns an Amount. diff --git a/internal/legacy/keystore/keystore.go b/internal/legacy/keystore/keystore.go index 3778c5884d..27ed8ab123 100644 --- a/internal/legacy/keystore/keystore.go +++ b/internal/legacy/keystore/keystore.go @@ -22,14 +22,14 @@ import ( "sync" "time" + "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/internal/legacy/rename" "github.com/btcsuite/golangcrypto/ripemd160" - "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/internal/legacy/rename" ) const ( diff --git a/internal/legacy/keystore/keystore_test.go b/internal/legacy/keystore/keystore_test.go index 2e3b2d80b2..a5550efa5a 100644 --- a/internal/legacy/keystore/keystore_test.go +++ b/internal/legacy/keystore/keystore_test.go @@ -11,11 +11,11 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "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/btcutil" "github.com/davecgh/go-spew/spew" ) diff --git a/internal/prompt/prompt.go b/internal/prompt/prompt.go index 96f160c86a..817f912ef4 100644 --- a/internal/prompt/prompt.go +++ b/internal/prompt/prompt.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/internal/legacy/keystore" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/internal/legacy/keystore" "github.com/btcsuite/golangcrypto/ssh/terminal" ) diff --git a/internal/rpchelp/genrpcserverhelp.go b/internal/rpchelp/genrpcserverhelp.go index 07db1902a7..e1ef856894 100644 --- a/internal/rpchelp/genrpcserverhelp.go +++ b/internal/rpchelp/genrpcserverhelp.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcwallet/internal/rpchelp" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcwallet/internal/rpchelp" ) var outputFile = func() *os.File { diff --git a/internal/rpchelp/methods.go b/internal/rpchelp/methods.go index 04e42bec58..cdc4fad4a8 100644 --- a/internal/rpchelp/methods.go +++ b/internal/rpchelp/methods.go @@ -6,7 +6,7 @@ package rpchelp -import "github.com/roasbeef/btcd/btcjson" +import "github.com/btcsuite/btcd/btcjson" // Common return types. var ( diff --git a/internal/zero/benchmark_test.go b/internal/zero/benchmark_test.go index becfe21cfb..ade0a90435 100644 --- a/internal/zero/benchmark_test.go +++ b/internal/zero/benchmark_test.go @@ -7,7 +7,7 @@ package zero_test import ( "testing" - . "github.com/roasbeef/btcwallet/internal/zero" + . "github.com/btcsuite/btcwallet/internal/zero" ) var ( diff --git a/internal/zero/zero_test.go b/internal/zero/zero_test.go index e8fb0be45b..996e83854a 100644 --- a/internal/zero/zero_test.go +++ b/internal/zero/zero_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - . "github.com/roasbeef/btcwallet/internal/zero" + . "github.com/btcsuite/btcwallet/internal/zero" ) func makeOneBytes(n int) []byte { diff --git a/log.go b/log.go index 6c6392a24d..7a79268362 100644 --- a/log.go +++ b/log.go @@ -9,12 +9,12 @@ import ( "os" "github.com/btcsuite/btclog" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/rpc/legacyrpc" - "github.com/roasbeef/btcwallet/rpc/rpcserver" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/rpc/legacyrpc" + "github.com/btcsuite/btcwallet/rpc/rpcserver" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/wtxmgr" "github.com/btcsuite/seelog" ) diff --git a/netparams/params.go b/netparams/params.go index 77bd717813..c15047e18e 100644 --- a/netparams/params.go +++ b/netparams/params.go @@ -4,7 +4,7 @@ package netparams -import "github.com/roasbeef/btcd/chaincfg" +import "github.com/btcsuite/btcd/chaincfg" // Params is used to group parameters for various networks such as the main // network and test networks. diff --git a/params.go b/params.go index 7cb2da1527..b6687625bb 100644 --- a/params.go +++ b/params.go @@ -4,6 +4,6 @@ package main -import "github.com/roasbeef/btcwallet/netparams" +import "github.com/btcsuite/btcwallet/netparams" var activeNet = &netparams.MainNetParams diff --git a/rpc/legacyrpc/errors.go b/rpc/legacyrpc/errors.go index 4f9b0d3859..2116572d6f 100644 --- a/rpc/legacyrpc/errors.go +++ b/rpc/legacyrpc/errors.go @@ -7,7 +7,7 @@ package legacyrpc import ( "errors" - "github.com/roasbeef/btcd/btcjson" + "github.com/btcsuite/btcd/btcjson" ) // TODO(jrick): There are several error paths which 'replace' various errors diff --git a/rpc/legacyrpc/methods.go b/rpc/legacyrpc/methods.go index 548586066e..3a3e654a9a 100644 --- a/rpc/legacyrpc/methods.go +++ b/rpc/legacyrpc/methods.go @@ -15,19 +15,19 @@ import ( "sync" "time" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/wallet/txrules" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/wallet/txrules" + "github.com/btcsuite/btcwallet/wtxmgr" ) // confirmed checks whether a transaction at height txHeight has met minconf @@ -1690,7 +1690,7 @@ func signRawTransaction(icmd interface{}, w *wallet.Wallet, chainClient *chain.R // `complete' denotes that we successfully signed all outputs and that // all scripts will run to completion. This is returned as part of the // reply. - signErrs, err := w.SignTransaction(&tx, hashType, inputs, keys, scripts) + signErrs, err := w.SignTransaction(tx, hashType, inputs, keys, scripts) if err != nil { return nil, err } diff --git a/rpc/legacyrpc/rpchelp_test.go b/rpc/legacyrpc/rpchelp_test.go index 707d1f0f75..177ccb9700 100644 --- a/rpc/legacyrpc/rpchelp_test.go +++ b/rpc/legacyrpc/rpchelp_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcwallet/internal/rpchelp" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcwallet/internal/rpchelp" ) func serverMethods() map[string]struct{} { diff --git a/rpc/legacyrpc/server.go b/rpc/legacyrpc/server.go index 6ff7c25a7a..7e159eabf9 100644 --- a/rpc/legacyrpc/server.go +++ b/rpc/legacyrpc/server.go @@ -19,10 +19,10 @@ import ( "sync/atomic" "time" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/websocket" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/wallet" ) type websocketClient struct { diff --git a/rpc/rpcserver/server.go b/rpc/rpcserver/server.go index 482904315c..44fc82a479 100644 --- a/rpc/rpcserver/server.go +++ b/rpc/rpcserver/server.go @@ -8,11 +8,11 @@ // Full documentation of the API implemented by this package is maintained in a // language-agnostic document: // -// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/api.md +// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/api.md // // Any API changes must be performed according to the steps listed here: // -// https://github.com/roasbeef/btcwallet/blob/master/rpc/documentation/serverchanges.md +// https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/serverchanges.md package rpcserver import ( @@ -25,20 +25,20 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/internal/cfgutil" - "github.com/roasbeef/btcwallet/internal/zero" - "github.com/roasbeef/btcwallet/netparams" - pb "github.com/roasbeef/btcwallet/rpc/walletrpc" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/internal/cfgutil" + "github.com/btcsuite/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/netparams" + pb "github.com/btcsuite/btcwallet/rpc/walletrpc" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" ) // Public API version constants diff --git a/rpcserver.go b/rpcserver.go index 26b96bd47f..5169b391b9 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -16,10 +16,10 @@ import ( "strings" "time" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/rpc/legacyrpc" - "github.com/roasbeef/btcwallet/rpc/rpcserver" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/rpc/legacyrpc" + "github.com/btcsuite/btcwallet/rpc/rpcserver" + "github.com/btcsuite/btcwallet/wallet" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/snacl/snacl.go b/snacl/snacl.go index e63c70850e..e893759e56 100644 --- a/snacl/snacl.go +++ b/snacl/snacl.go @@ -13,9 +13,9 @@ import ( "io" "runtime/debug" + "github.com/btcsuite/btcwallet/internal/zero" "github.com/btcsuite/golangcrypto/nacl/secretbox" "github.com/btcsuite/golangcrypto/scrypt" - "github.com/roasbeef/btcwallet/internal/zero" ) var ( diff --git a/votingpool/common_test.go b/votingpool/common_test.go index a96ba8801c..3db30180b3 100644 --- a/votingpool/common_test.go +++ b/votingpool/common_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/btcsuite/btclog" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) func init() { diff --git a/votingpool/db.go b/votingpool/db.go index acb332036b..311a5f29e6 100644 --- a/votingpool/db.go +++ b/votingpool/db.go @@ -10,11 +10,11 @@ import ( "encoding/gob" "fmt" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/snacl" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/snacl" + "github.com/btcsuite/btcwallet/walletdb" ) // These constants define the serialized length for a given encrypted extended diff --git a/votingpool/db_wb_test.go b/votingpool/db_wb_test.go index 7521a7bdf1..10d2d224e9 100644 --- a/votingpool/db_wb_test.go +++ b/votingpool/db_wb_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/walletdb" ) func TestPutUsedAddrHash(t *testing.T) { diff --git a/votingpool/error_test.go b/votingpool/error_test.go index 56af70931d..0ada043698 100644 --- a/votingpool/error_test.go +++ b/votingpool/error_test.go @@ -7,7 +7,7 @@ package votingpool_test import ( "testing" - vp "github.com/roasbeef/btcwallet/votingpool" + vp "github.com/btcsuite/btcwallet/votingpool" ) // TestErrorCodeStringer tests that all error codes has a text diff --git a/votingpool/example_test.go b/votingpool/example_test.go index fb778f761d..b1d8ef3b0d 100644 --- a/votingpool/example_test.go +++ b/votingpool/example_test.go @@ -23,14 +23,14 @@ import ( "os" "path/filepath" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/votingpool" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/votingpool" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) var ( diff --git a/votingpool/factory_test.go b/votingpool/factory_test.go index d53d19fffd..ca00df7c23 100644 --- a/votingpool/factory_test.go +++ b/votingpool/factory_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "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/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "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/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) var ( diff --git a/votingpool/input_selection.go b/votingpool/input_selection.go index 876371f3dc..39cbe347c2 100644 --- a/votingpool/input_selection.go +++ b/votingpool/input_selection.go @@ -21,11 +21,11 @@ import ( "fmt" "sort" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) const eligibleInputMinConfirmations = 100 diff --git a/votingpool/input_selection_wb_test.go b/votingpool/input_selection_wb_test.go index 2d6a9a96a3..813696883a 100644 --- a/votingpool/input_selection_wb_test.go +++ b/votingpool/input_selection_wb_test.go @@ -10,11 +10,11 @@ import ( "sort" "testing" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) var ( diff --git a/votingpool/internal_test.go b/votingpool/internal_test.go index ad8b14e213..36054d402d 100644 --- a/votingpool/internal_test.go +++ b/votingpool/internal_test.go @@ -5,10 +5,10 @@ package votingpool import ( - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) var TstLastErr = lastErr diff --git a/votingpool/pool.go b/votingpool/pool.go index d8d2354401..6f2687fd1a 100644 --- a/votingpool/pool.go +++ b/votingpool/pool.go @@ -8,12 +8,12 @@ import ( "fmt" "sort" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/internal/zero" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/votingpool/pool_test.go b/votingpool/pool_test.go index 2c69502cf4..4269ea58f7 100644 --- a/votingpool/pool_test.go +++ b/votingpool/pool_test.go @@ -11,11 +11,11 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcutil/hdkeychain" - vp "github.com/roasbeef/btcwallet/votingpool" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcutil/hdkeychain" + vp "github.com/btcsuite/btcwallet/votingpool" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) func TestLoadPoolAndDepositScript(t *testing.T) { diff --git a/votingpool/pool_wb_test.go b/votingpool/pool_wb_test.go index 9429500c89..1dd64a2e75 100644 --- a/votingpool/pool_wb_test.go +++ b/votingpool/pool_wb_test.go @@ -9,8 +9,8 @@ import ( "fmt" "testing" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/waddrmgr" ) func TestPoolEnsureUsedAddr(t *testing.T) { diff --git a/votingpool/withdrawal.go b/votingpool/withdrawal.go index 68d3f3b5c4..d1700ef906 100644 --- a/votingpool/withdrawal.go +++ b/votingpool/withdrawal.go @@ -14,12 +14,12 @@ import ( "strconv" "time" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) // Maximum tx size (in bytes). This should be the same as bitcoind's diff --git a/votingpool/withdrawal_test.go b/votingpool/withdrawal_test.go index 1e1933efb5..b3a3b490a0 100644 --- a/votingpool/withdrawal_test.go +++ b/votingpool/withdrawal_test.go @@ -8,9 +8,9 @@ import ( "bytes" "testing" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - vp "github.com/roasbeef/btcwallet/votingpool" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + vp "github.com/btcsuite/btcwallet/votingpool" ) func TestStartWithdrawal(t *testing.T) { diff --git a/votingpool/withdrawal_wb_test.go b/votingpool/withdrawal_wb_test.go index 5b24a7caeb..53fb7eb0c8 100644 --- a/votingpool/withdrawal_wb_test.go +++ b/votingpool/withdrawal_wb_test.go @@ -10,14 +10,14 @@ import ( "sort" "testing" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) // TestOutputSplittingNotEnoughInputs checks that an output will get split if we diff --git a/waddrmgr/address.go b/waddrmgr/address.go index 51442b6759..fd879a62a7 100644 --- a/waddrmgr/address.go +++ b/waddrmgr/address.go @@ -9,12 +9,12 @@ import ( "fmt" "sync" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/internal/zero" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/walletdb" ) // AddressType represents the various address types waddrmgr is currently able diff --git a/waddrmgr/common_test.go b/waddrmgr/common_test.go index 22d5c716b0..8955344e39 100644 --- a/waddrmgr/common_test.go +++ b/waddrmgr/common_test.go @@ -11,10 +11,10 @@ import ( "path/filepath" "testing" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) var ( diff --git a/waddrmgr/db.go b/waddrmgr/db.go index 0859e26a81..688338d837 100644 --- a/waddrmgr/db.go +++ b/waddrmgr/db.go @@ -12,10 +12,10 @@ import ( "fmt" "time" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/waddrmgr/error.go b/waddrmgr/error.go index 69a714541e..524a607d1c 100644 --- a/waddrmgr/error.go +++ b/waddrmgr/error.go @@ -8,7 +8,7 @@ import ( "fmt" "strconv" - "github.com/roasbeef/btcutil/hdkeychain" + "github.com/btcsuite/btcutil/hdkeychain" ) var ( diff --git a/waddrmgr/error_test.go b/waddrmgr/error_test.go index 1bee94146d..398308b084 100644 --- a/waddrmgr/error_test.go +++ b/waddrmgr/error_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/waddrmgr" ) // TestErrorCodeStringer tests the stringized output for the ErrorCode type. diff --git a/waddrmgr/internal_test.go b/waddrmgr/internal_test.go index 29425888cf..15a8c82ea2 100644 --- a/waddrmgr/internal_test.go +++ b/waddrmgr/internal_test.go @@ -14,7 +14,7 @@ package waddrmgr import ( "errors" - "github.com/roasbeef/btcwallet/snacl" + "github.com/btcsuite/btcwallet/snacl" ) // TstMaxRecentHashes makes the unexported maxRecentHashes constant available diff --git a/waddrmgr/manager.go b/waddrmgr/manager.go index 15f8fd9279..1de57301c4 100644 --- a/waddrmgr/manager.go +++ b/waddrmgr/manager.go @@ -10,14 +10,14 @@ import ( "fmt" "sync" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/internal/zero" - "github.com/roasbeef/btcwallet/snacl" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/snacl" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/waddrmgr/manager_test.go b/waddrmgr/manager_test.go index 4409234796..c5622f481b 100644 --- a/waddrmgr/manager_test.go +++ b/waddrmgr/manager_test.go @@ -11,11 +11,11 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) // newHash converts the passed big-endian hex string into a chainhash.Hash. diff --git a/waddrmgr/sync.go b/waddrmgr/sync.go index 0bf46de032..60a313cb8b 100644 --- a/waddrmgr/sync.go +++ b/waddrmgr/sync.go @@ -7,8 +7,8 @@ package waddrmgr import ( "sync" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/wallet/chainntfns.go b/wallet/chainntfns.go index 1901ca85a5..2a18eb6478 100644 --- a/wallet/chainntfns.go +++ b/wallet/chainntfns.go @@ -5,11 +5,11 @@ package wallet import ( - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) func (w *Wallet) handleChainNotifications() { diff --git a/wallet/common.go b/wallet/common.go index 5858b503f7..15a029624d 100644 --- a/wallet/common.go +++ b/wallet/common.go @@ -8,9 +8,9 @@ package wallet import ( "time" - "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" ) // Note: The following common types should never reference the Wallet type. diff --git a/wallet/createtx.go b/wallet/createtx.go index 4c2b3a5a34..5f7a38ce81 100644 --- a/wallet/createtx.go +++ b/wallet/createtx.go @@ -9,14 +9,14 @@ import ( "fmt" "sort" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet/txauthor" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet/txauthor" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) // byAmount defines the methods needed to satisify sort.Interface to diff --git a/wallet/internal/txsizes/size.go b/wallet/internal/txsizes/size.go index 87a2435478..cbf602e4e3 100644 --- a/wallet/internal/txsizes/size.go +++ b/wallet/internal/txsizes/size.go @@ -5,9 +5,9 @@ package txsizes import ( - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/wire" - h "github.com/roasbeef/btcwallet/internal/helpers" + h "github.com/btcsuite/btcwallet/internal/helpers" ) // Worst case script and input/output size estimates. diff --git a/wallet/internal/txsizes/size_test.go b/wallet/internal/txsizes/size_test.go index 3891169226..93620be9c6 100644 --- a/wallet/internal/txsizes/size_test.go +++ b/wallet/internal/txsizes/size_test.go @@ -3,8 +3,8 @@ package txsizes_test import ( "testing" - "github.com/roasbeef/btcd/wire" - . "github.com/roasbeef/btcwallet/wallet/internal/txsizes" + "github.com/btcsuite/btcd/wire" + . "github.com/btcsuite/btcwallet/wallet/internal/txsizes" ) const ( diff --git a/wallet/loader.go b/wallet/loader.go index 85015bf93d..dc274c1872 100644 --- a/wallet/loader.go +++ b/wallet/loader.go @@ -10,10 +10,10 @@ import ( "path/filepath" "sync" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcwallet/internal/prompt" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcwallet/internal/prompt" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/wallet/multisig.go b/wallet/multisig.go index da189fcaf1..53378410a7 100644 --- a/wallet/multisig.go +++ b/wallet/multisig.go @@ -8,10 +8,10 @@ package wallet import ( "errors" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" ) // MakeMultiSigScript creates a multi-signature script that can be redeemed with diff --git a/wallet/notifications.go b/wallet/notifications.go index dcbf798a03..dee5ba3771 100644 --- a/wallet/notifications.go +++ b/wallet/notifications.go @@ -8,13 +8,13 @@ import ( "bytes" "sync" - "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/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "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/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) // TODO: It would be good to send errors during notification creation to the rpc diff --git a/wallet/rescan.go b/wallet/rescan.go index c298f06a35..effb28d1f3 100644 --- a/wallet/rescan.go +++ b/wallet/rescan.go @@ -5,12 +5,12 @@ package wallet import ( - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) // RescanProgressMsg reports the current progress made by a rescan for a diff --git a/wallet/txauthor/author.go b/wallet/txauthor/author.go index 43ba97acd5..e77fd4e454 100644 --- a/wallet/txauthor/author.go +++ b/wallet/txauthor/author.go @@ -8,14 +8,14 @@ package txauthor import ( "errors" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/wallet/txrules" - - h "github.com/roasbeef/btcwallet/internal/helpers" - "github.com/roasbeef/btcwallet/wallet/internal/txsizes" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/wallet/txrules" + + h "github.com/btcsuite/btcwallet/internal/helpers" + "github.com/btcsuite/btcwallet/wallet/internal/txsizes" ) // InputSource provides transaction inputs referencing spendable outputs to diff --git a/wallet/txauthor/author_test.go b/wallet/txauthor/author_test.go index 587307195e..fc0216625f 100644 --- a/wallet/txauthor/author_test.go +++ b/wallet/txauthor/author_test.go @@ -7,12 +7,12 @@ package txauthor_test import ( "testing" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - . "github.com/roasbeef/btcwallet/wallet/txauthor" - "github.com/roasbeef/btcwallet/wallet/txrules" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + . "github.com/btcsuite/btcwallet/wallet/txauthor" + "github.com/btcsuite/btcwallet/wallet/txrules" - "github.com/roasbeef/btcwallet/wallet/internal/txsizes" + "github.com/btcsuite/btcwallet/wallet/internal/txsizes" ) func p2pkhOutputs(amounts ...btcutil.Amount) []*wire.TxOut { diff --git a/wallet/txrules/rules.go b/wallet/txrules/rules.go index 97b6d2e5e4..f2df7b905f 100644 --- a/wallet/txrules/rules.go +++ b/wallet/txrules/rules.go @@ -9,9 +9,9 @@ package txrules import ( "errors" - "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" ) // DefaultRelayFeePerKb is the default minimum relay fee policy for a mempool. diff --git a/wallet/unstable.go b/wallet/unstable.go index ee7862d601..c34b6d1eb3 100644 --- a/wallet/unstable.go +++ b/wallet/unstable.go @@ -6,9 +6,9 @@ package wallet import ( - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) type unstableAPI struct { diff --git a/wallet/utxos.go b/wallet/utxos.go index 3d8502e04a..f1f454d521 100644 --- a/wallet/utxos.go +++ b/wallet/utxos.go @@ -6,9 +6,9 @@ package wallet import ( - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcwallet/walletdb" ) // OutputSelectionPolicy describes the rules for selecting an output from the diff --git a/wallet/wallet.go b/wallet/wallet.go index eed2e96cab..93892311f6 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -13,22 +13,22 @@ import ( "sync" "time" - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcrpcclient" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/hdkeychain" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet/txauthor" - "github.com/roasbeef/btcwallet/wallet/txrules" - "github.com/roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/blockchain" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcrpcclient" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet/txauthor" + "github.com/btcsuite/btcwallet/wallet/txrules" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) const ( diff --git a/walletdb/bdb/db.go b/walletdb/bdb/db.go index 1344439cb3..e1e7aee7a0 100644 --- a/walletdb/bdb/db.go +++ b/walletdb/bdb/db.go @@ -9,7 +9,7 @@ import ( "os" "github.com/boltdb/bolt" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/walletdb" ) // convertErr converts some bolt errors to the equivalent walletdb error. diff --git a/walletdb/bdb/driver.go b/walletdb/bdb/driver.go index 2e5ecd9071..2a99cec341 100644 --- a/walletdb/bdb/driver.go +++ b/walletdb/bdb/driver.go @@ -7,7 +7,7 @@ package bdb import ( "fmt" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/walletdb/bdb/driver_test.go b/walletdb/bdb/driver_test.go index bb96c06baa..0b2208cf74 100644 --- a/walletdb/bdb/driver_test.go +++ b/walletdb/bdb/driver_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) // dbType is the database type name for this driver. diff --git a/walletdb/bdb/interface_test.go b/walletdb/bdb/interface_test.go index 81e0318c3a..ec10fec6f3 100644 --- a/walletdb/bdb/interface_test.go +++ b/walletdb/bdb/interface_test.go @@ -16,7 +16,7 @@ import ( "os" "testing" - "github.com/roasbeef/btcwallet/walletdb/walletdbtest" + "github.com/btcsuite/btcwallet/walletdb/walletdbtest" ) // TestInterface performs all interfaces tests for this database driver. diff --git a/walletdb/db_test.go b/walletdb/db_test.go index 143f8a79f6..95ce2dec7e 100644 --- a/walletdb/db_test.go +++ b/walletdb/db_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) var ( diff --git a/walletdb/example_test.go b/walletdb/example_test.go index 97779257bb..73dda1439b 100644 --- a/walletdb/example_test.go +++ b/walletdb/example_test.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) // This example demonstrates creating a new database. @@ -19,8 +19,8 @@ func ExampleCreate() { // This example assumes the bdb (bolt db) driver is imported. // // import ( - // "github.com/roasbeef/btcwallet/walletdb" - // _ "github.com/roasbeef/btcwallet/walletdb/bdb" + // "github.com/btcsuite/btcwallet/walletdb" + // _ "github.com/btcsuite/btcwallet/walletdb/bdb" // ) // Create a database and schedule it to be closed and removed on exit. @@ -102,8 +102,8 @@ func Example_basicUsage() { // This example assumes the bdb (bolt db) driver is imported. // // import ( - // "github.com/roasbeef/btcwallet/walletdb" - // _ "github.com/roasbeef/btcwallet/walletdb/bdb" + // "github.com/btcsuite/btcwallet/walletdb" + // _ "github.com/btcsuite/btcwallet/walletdb/bdb" // ) // Create a database and schedule it to be closed and removed on exit. diff --git a/walletdb/walletdbtest/interface.go b/walletdb/walletdbtest/interface.go index c374ce91e8..8a2beb1bc1 100644 --- a/walletdb/walletdbtest/interface.go +++ b/walletdb/walletdbtest/interface.go @@ -9,7 +9,7 @@ import ( "os" "reflect" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/walletdb" ) // errSubTestFail is used to signal that a sub test returned false. diff --git a/walletsetup.go b/walletsetup.go index 5206b12848..09b29ccc88 100644 --- a/walletsetup.go +++ b/walletsetup.go @@ -11,16 +11,16 @@ import ( "path/filepath" "time" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/internal/legacy/keystore" - "github.com/roasbeef/btcwallet/internal/prompt" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/internal/legacy/keystore" + "github.com/btcsuite/btcwallet/internal/prompt" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" ) // networkDir returns the directory name of a network directory to hold wallet diff --git a/wtxmgr/db.go b/wtxmgr/db.go index 3b9da30505..88dc7a6bf3 100644 --- a/wtxmgr/db.go +++ b/wtxmgr/db.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" ) // Naming diff --git a/wtxmgr/example_test.go b/wtxmgr/example_test.go index b05159eed8..7f418e5d9e 100644 --- a/wtxmgr/example_test.go +++ b/wtxmgr/example_test.go @@ -7,11 +7,11 @@ package wtxmgr_test import ( "fmt" - "github.com/Roasbeef/btcwallet/walletdb" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) var ( diff --git a/wtxmgr/kahnsort.go b/wtxmgr/kahnsort.go index 261dbc1f7e..f6a85b63c7 100644 --- a/wtxmgr/kahnsort.go +++ b/wtxmgr/kahnsort.go @@ -4,7 +4,7 @@ package wtxmgr -import "github.com/roasbeef/btcd/chaincfg/chainhash" +import "github.com/btcsuite/btcd/chaincfg/chainhash" type graphNode struct { value *TxRecord diff --git a/wtxmgr/query.go b/wtxmgr/query.go index b668eee12e..6e7f40ffe2 100644 --- a/wtxmgr/query.go +++ b/wtxmgr/query.go @@ -8,9 +8,9 @@ package wtxmgr import ( "fmt" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" ) // CreditRecord contains metadata regarding a transaction credit for a known diff --git a/wtxmgr/query_test.go b/wtxmgr/query_test.go index be5ef94402..f5a2f503bf 100644 --- a/wtxmgr/query_test.go +++ b/wtxmgr/query_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - . "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" + . "github.com/btcsuite/btcwallet/wtxmgr" ) type queryState struct { diff --git a/wtxmgr/tx.go b/wtxmgr/tx.go index baa0acc4cb..7668c437cb 100644 --- a/wtxmgr/tx.go +++ b/wtxmgr/tx.go @@ -9,12 +9,12 @@ import ( "bytes" "time" - "github.com/roasbeef/btcd/blockchain" - "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" + "github.com/btcsuite/btcd/blockchain" + "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" ) // Block contains the minimum amount of data to uniquely identify any block on diff --git a/wtxmgr/tx_test.go b/wtxmgr/tx_test.go index 69f0351fec..c291211ea4 100644 --- a/wtxmgr/tx_test.go +++ b/wtxmgr/tx_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "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" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" - . "github.com/roasbeef/btcwallet/wtxmgr" + "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" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" + . "github.com/btcsuite/btcwallet/wtxmgr" ) // Received transaction output for mainnet outpoint diff --git a/wtxmgr/unconfirmed.go b/wtxmgr/unconfirmed.go index 6f7a71ba9a..be68dbaf9c 100644 --- a/wtxmgr/unconfirmed.go +++ b/wtxmgr/unconfirmed.go @@ -6,9 +6,9 @@ package wtxmgr import ( - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcwallet/walletdb" ) // insertMemPoolTx inserts the unmined transaction record. It also marks