From e273e178ddf6dd8e3379000a02d815280082c8cf Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 27 Apr 2017 17:31:27 -0600 Subject: [PATCH] Repoint repo to btcsuite on btcwalletln, and a few rebase fixes. --- btcwallet.go | 6 +++--- cmd/sweepaccount/main.go | 6 +++--- internal/cfgutil/amount.go | 2 +- internal/helpers/helpers.go | 4 ++-- internal/prompt/prompt.go | 4 ++-- internal/rpchelp/genrpcserverhelp.go | 4 ++-- internal/rpchelp/methods.go | 2 +- internal/zero/benchmark_test.go | 2 +- internal/zero/zero_test.go | 2 +- netparams/params.go | 2 +- params.go | 2 +- rpc/legacyrpc/errors.go | 2 +- rpc/legacyrpc/methods.go | 2 +- rpc/legacyrpc/rpchelp_test.go | 4 ++-- rpc/rpcserver/server.go | 4 ++-- rpcserver.go | 8 ++++---- votingpool/db.go | 10 +++++----- votingpool/db_wb_test.go | 2 +- votingpool/error_test.go | 2 +- votingpool/example_test.go | 16 ++++++++-------- votingpool/internal_test.go | 8 ++++---- votingpool/pool.go | 12 ++++++------ votingpool/pool_test.go | 10 +++++----- votingpool/pool_wb_test.go | 4 ++-- votingpool/withdrawal_test.go | 6 +++--- votingpool/withdrawal_wb_test.go | 16 ++++++++-------- waddrmgr/common_test.go | 8 ++++---- waddrmgr/error.go | 2 +- waddrmgr/error_test.go | 2 +- waddrmgr/internal_test.go | 2 +- wallet/common.go | 6 +++--- wallet/internal/txsizes/size.go | 4 ++-- wallet/internal/txsizes/size_test.go | 4 ++-- wallet/loader.go | 8 ++++---- wallet/multisig.go | 8 ++++---- wallet/txauthor/author.go | 14 +++++++------- wallet/txauthor/author_test.go | 10 +++++----- wallet/txrules/rules.go | 6 +++--- wallet/unstable.go | 6 +++--- wallet/utxos.go | 6 +++--- wallet/wallet.go | 1 + walletdb/bdb/driver.go | 2 +- walletdb/bdb/driver_test.go | 4 ++-- walletdb/db_test.go | 4 ++-- walletdb/example_test.go | 12 ++++++------ walletsetup.go | 20 ++++++++++---------- 46 files changed, 136 insertions(+), 135 deletions(-) diff --git a/btcwallet.go b/btcwallet.go index 41aa290..b3be088 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/cmd/sweepaccount/main.go b/cmd/sweepaccount/main.go index 712b718..0dcea48 100644 --- a/cmd/sweepaccount/main.go +++ b/cmd/sweepaccount/main.go @@ -10,6 +10,8 @@ import ( "os" "path/filepath" + "golang.org/x/crypto/ssh/terminal" + "github.com/btcsuite/btcd/btcjson" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/txscript" @@ -21,8 +23,6 @@ import ( "github.com/btcsuite/golangcrypto/ssh/terminal" "github.com/jessevdk/go-flags" "github.com/roasbeef/btcwallet/internal/cfgutil" - - "golang.org/x/crypto/ssh/terminal" ) 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/internal/cfgutil/amount.go b/internal/cfgutil/amount.go index 18b5282..5fa9c0c 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 e8a43b3..9bf3e42 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/prompt/prompt.go b/internal/prompt/prompt.go index 96f160c..817f912 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 07db190..e1ef856 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 04e42be..cdc4fad 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 becfe21..ade0a90 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 e8fb0be..996e838 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/netparams/params.go b/netparams/params.go index 77bd717..c15047e 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 7cb2da1..b668762 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 4f9b0d3..2116572 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 c2ed7d3..bc24a35 100644 --- a/rpc/legacyrpc/methods.go +++ b/rpc/legacyrpc/methods.go @@ -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 707d1f0..177ccb9 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/rpcserver/server.go b/rpc/rpcserver/server.go index 0836328..e8ad762 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 ( diff --git a/rpcserver.go b/rpcserver.go index 26b96bd..5169b39 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/votingpool/db.go b/votingpool/db.go index acb3320..311a5f2 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 7521a7b..10d2d22 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 56af709..0ada043 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 fb778f7..b1d8ef3 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/internal_test.go b/votingpool/internal_test.go index ad8b14e..36054d4 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 d8d2354..6f2687f 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 2c69502..4269ea5 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 9429500..1dd64a2 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_test.go b/votingpool/withdrawal_test.go index 1e1933e..b3a3b49 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 5b24a7c..53fb7eb 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/common_test.go b/waddrmgr/common_test.go index 22d5c71..8955344 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/error.go b/waddrmgr/error.go index 69a7145..524a607 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 1bee941..398308b 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 2942588..15a8c82 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/wallet/common.go b/wallet/common.go index 5858b50..15a0296 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/internal/txsizes/size.go b/wallet/internal/txsizes/size.go index 87a2435..cbf602e 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 3891169..93620be 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 85015bf..dc274c1 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 da189fc..5337841 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/txauthor/author.go b/wallet/txauthor/author.go index 43ba97a..e77fd4e 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" + "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/roasbeef/btcwallet/internal/helpers" - "github.com/roasbeef/btcwallet/wallet/internal/txsizes" + 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 5873071..fc02166 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 97b6d2e..f2df7b9 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 ee7862d..c34b6d1 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 3d8502e..f1f454d 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 2d46aa9..61ffc50 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -20,6 +20,7 @@ import ( "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/chain" diff --git a/walletdb/bdb/driver.go b/walletdb/bdb/driver.go index 2e5ecd9..2a99cec 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 bb96c06..0b2208c 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/db_test.go b/walletdb/db_test.go index 143f8a7..95ce2de 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 9777925..73dda14 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/walletsetup.go b/walletsetup.go index 5206b12..09b29cc 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