From 7770cac383e81db700e9844eaf79b0e0dd2f9eda Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 14 May 2018 22:11:11 -0700 Subject: [PATCH] multi: switch import paths back to upstream --- README.md | 20 +- btcwallet.go | 8 +- chain/bitcoind.go | 18 +- chain/block_filterer.go | 10 +- chain/block_filterer_test.go | 8 +- chain/interface.go | 10 +- chain/neutrino.go | 20 +- chain/rpc.go | 6 +- cmd/dropwtxmgr/main.go | 8 +- cmd/sweepaccount/main.go | 20 +- config.go | 10 +- docs/README.md | 2 +- docs/force_rescans.md | 2 +- glide.lock | 331 -------------------------- glide.yaml | 8 +- 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/documentation/clientusage.md | 4 +- rpc/legacyrpc/errors.go | 2 +- rpc/legacyrpc/methods.go | 26 +- rpc/legacyrpc/rpchelp_test.go | 4 +- rpc/legacyrpc/server.go | 6 +- rpc/rpcserver/server.go | 4 +- rpcserver.go | 8 +- snacl/snacl.go | 2 +- votingpool/README.md | 12 +- votingpool/common_test.go | 4 +- votingpool/db.go | 10 +- votingpool/db_wb_test.go | 2 +- votingpool/error_test.go | 2 +- votingpool/example_test.go | 16 +- votingpool/factory_test.go | 18 +- votingpool/input_selection.go | 10 +- votingpool/input_selection_wb_test.go | 10 +- votingpool/internal_test.go | 8 +- votingpool/pool.go | 12 +- votingpool/pool_test.go | 10 +- votingpool/pool_wb_test.go | 4 +- votingpool/test_coverage.txt | 280 +++++++++++----------- votingpool/withdrawal.go | 12 +- votingpool/withdrawal_test.go | 6 +- votingpool/withdrawal_wb_test.go | 16 +- waddrmgr/README.md | 14 +- waddrmgr/address.go | 12 +- waddrmgr/common_test.go | 8 +- waddrmgr/db.go | 6 +- waddrmgr/error.go | 2 +- waddrmgr/error_test.go | 2 +- waddrmgr/internal_test.go | 2 +- waddrmgr/manager.go | 12 +- waddrmgr/manager_test.go | 10 +- waddrmgr/scoped_manager.go | 12 +- waddrmgr/sync.go | 4 +- wallet/README.md | 14 +- wallet/chainntfns.go | 10 +- wallet/common.go | 6 +- wallet/createtx.go | 16 +- wallet/internal/txsizes/size.go | 6 +- wallet/internal/txsizes/size_test.go | 4 +- wallet/loader.go | 8 +- wallet/multisig.go | 8 +- wallet/notifications.go | 14 +- wallet/recovery.go | 14 +- wallet/recovery_test.go | 2 +- wallet/rescan.go | 10 +- wallet/txauthor/author.go | 14 +- wallet/txauthor/author_test.go | 10 +- wallet/txrules/rules.go | 6 +- wallet/unstable.go | 6 +- wallet/utxos.go | 6 +- walletdb/README.md | 16 +- walletdb/bdb/README.md | 12 +- walletdb/bdb/db.go | 2 +- walletdb/bdb/driver.go | 2 +- walletdb/bdb/driver_test.go | 4 +- walletdb/bdb/interface_test.go | 2 +- walletdb/db_test.go | 4 +- walletdb/example_test.go | 12 +- walletdb/walletdbtest/interface.go | 2 +- walletsetup.go | 20 +- wtxmgr/README.md | 14 +- wtxmgr/db.go | 8 +- wtxmgr/example_test.go | 10 +- wtxmgr/kahnsort.go | 2 +- wtxmgr/query.go | 6 +- wtxmgr/query_test.go | 10 +- wtxmgr/tx.go | 12 +- wtxmgr/tx_test.go | 16 +- wtxmgr/unconfirmed.go | 6 +- 96 files changed, 529 insertions(+), 862 deletions(-) delete mode 100644 glide.lock diff --git a/README.md b/README.md index 83f5c33..8a68448 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ btcwallet ========= -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)](https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)](https://travis-ci.org/btcsuite/btcwallet) [![Build status](https://ci.appveyor.com/api/projects/status/88nxvckdj8upqr36/branch/master?svg=true)](https://ci.appveyor.com/project/jrick/btcwallet/branch/master) btcwallet is a daemon handling bitcoin wallet functionality for a @@ -30,7 +30,7 @@ encryption will extend to transactions as well. btcwallet is not an SPV client and requires connecting to a local or remote btcd instance for asynchronous blockchain queries and notifications over websockets. Full btcd installation instructions -can be found [here](https://github.com/roasbeef/btcd). An alternative +can be found [here](https://github.com/btcsuite/btcd). An alternative SPV mode that is compatible with btcd and Bitcoin Core is planned for a future release. @@ -60,9 +60,9 @@ Wallet clients can use one of two RPC servers: Install the latest MSIs available here: -https://github.com/roasbeef/btcd/releases +https://github.com/btcsuite/btcd/releases -https://github.com/roasbeef/btcwallet/releases +https://github.com/btcsuite/btcwallet/releases ### Windows/Linux/BSD/POSIX - Build from source @@ -96,8 +96,8 @@ For a first time installation, the project and dependency sources can be obtained manually with `git` and `glide` (create directories as needed): ``` -git clone https://github.com/roasbeef/btcwallet $GOPATH/src/github.com/roasbeef/btcwallet -cd $GOPATH/src/github.com/roasbeef/btcwallet +git clone https://github.com/btcsuite/btcwallet $GOPATH/src/github.com/btcsuite/btcwallet +cd $GOPATH/src/github.com/btcsuite/btcwallet glide install ``` @@ -105,7 +105,7 @@ To update an existing source tree, pull the latest changes and install the matching dependencies: ``` -cd $GOPATH/src/github.com/roasbeef/btcwallet +cd $GOPATH/src/github.com/btcsuite/btcwallet git pull glide install ``` @@ -182,15 +182,15 @@ PS> $editor $env:LOCALAPPDATA\Btcwallet\btcwallet.conf Linux/BSD/POSIX (Installed from source): ```bash -$ cp $GOPATH/src/github.com/roasbeef/btcd/sample-btcd.conf ~/.btcd/btcd.conf -$ cp $GOPATH/src/github.com/roasbeef/btcwallet/sample-btcwallet.conf ~/.btcwallet/btcwallet.conf +$ cp $GOPATH/src/github.com/btcsuite/btcd/sample-btcd.conf ~/.btcd/btcd.conf +$ cp $GOPATH/src/github.com/btcsuite/btcwallet/sample-btcwallet.conf ~/.btcwallet/btcwallet.conf $ $EDITOR ~/.btcd/btcd.conf $ $EDITOR ~/.btcwallet/btcwallet.conf ``` ## Issue Tracker -The [integrated github issue tracker](https://github.com/roasbeef/btcwallet/issues) +The [integrated github issue tracker](https://github.com/btcsuite/btcwallet/issues) is used for this project. ## GPG Verification Key diff --git a/btcwallet.go b/btcwallet.go index 7e753d4..403488d 100644 --- a/btcwallet.go +++ b/btcwallet.go @@ -15,10 +15,10 @@ import ( "sync" "github.com/lightninglabs/neutrino" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/rpc/legacyrpc" - "github.com/roasbeef/btcwallet/wallet" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/rpc/legacyrpc" + "github.com/btcsuite/btcwallet/wallet" + "github.com/btcsuite/btcwallet/walletdb" ) var ( diff --git a/chain/bitcoind.go b/chain/bitcoind.go index 39c0b5a..9f2d64f 100644 --- a/chain/bitcoind.go +++ b/chain/bitcoind.go @@ -11,15 +11,15 @@ import ( "time" "github.com/lightninglabs/gozmq" - "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/txscript" - "github.com/roasbeef/btcd/wire" - "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/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wtxmgr" ) // BitcoindClient represents a persistent client connection to a bitcoind server diff --git a/chain/block_filterer.go b/chain/block_filterer.go index ee99237..08abda7 100644 --- a/chain/block_filterer.go +++ b/chain/block_filterer.go @@ -1,11 +1,11 @@ package chain import ( - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" ) // BlockFilterer is used to iteratively scan blocks for a set of addresses of diff --git a/chain/block_filterer_test.go b/chain/block_filterer_test.go index 6b2d7a8..4a56a79 100644 --- a/chain/block_filterer_test.go +++ b/chain/block_filterer_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcwallet/chain" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcwallet/chain" ) var Block100000 = wire.MsgBlock{ diff --git a/chain/interface.go b/chain/interface.go index 11baff1..8f26a5c 100644 --- a/chain/interface.go +++ b/chain/interface.go @@ -3,11 +3,11 @@ package chain import ( "time" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wtxmgr" ) // BackEnds returns a list of the available back ends. diff --git a/chain/neutrino.go b/chain/neutrino.go index f82b256..e7b2f77 100644 --- a/chain/neutrino.go +++ b/chain/neutrino.go @@ -7,16 +7,16 @@ import ( "time" "github.com/lightninglabs/neutrino" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcutil/gcs" - "github.com/roasbeef/btcutil/gcs/builder" - "github.com/roasbeef/btcwallet/waddrmgr" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/gcs" + "github.com/btcsuite/btcutil/gcs/builder" + "github.com/btcsuite/btcwallet/waddrmgr" + "github.com/btcsuite/btcwallet/wtxmgr" ) // NeutrinoClient is an implementation of the btcwalet chain.Interface interface. diff --git a/chain/rpc.go b/chain/rpc.go index 36c0f3e..ca2bb16 100644 --- a/chain/rpc.go +++ b/chain/rpc.go @@ -15,10 +15,10 @@ import ( "github.com/btcsuite/btcd/rpcclient" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/gcs" + "github.com/btcsuite/btcutil/gcs/builder" "github.com/btcsuite/btcwallet/waddrmgr" "github.com/btcsuite/btcwallet/wtxmgr" - "github.com/ltcsuite/ltcutil/gcs" - "github.com/ltcsuite/ltcutil/gcs/builder" ) // RPCClient represents a persistent client connection to a bitcoin RPC server @@ -425,7 +425,7 @@ out: // TODO: A minute timeout is used to prevent the handler loop from // blocking here forever, but this is much larger than it needs to // be due to dcrd processing websocket requests synchronously (see - // https://github.com/roasbeef/btcd/issues/504). Decrease this to + // https://github.com/btcsuite/btcd/issues/504). Decrease this to // something saner like 3s when the above issue is fixed. type sessionResult struct { err error diff --git a/cmd/dropwtxmgr/main.go b/cmd/dropwtxmgr/main.go index ac99377..464fdd2 100644 --- a/cmd/dropwtxmgr/main.go +++ b/cmd/dropwtxmgr/main.go @@ -12,10 +12,10 @@ import ( "path/filepath" "github.com/jessevdk/go-flags" - "github.com/roasbeef/btcutil" - "github.com/roasbeef/btcwallet/walletdb" - _ "github.com/roasbeef/btcwallet/walletdb/bdb" - "github.com/roasbeef/btcwallet/wtxmgr" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/walletdb" + _ "github.com/btcsuite/btcwallet/walletdb/bdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) const defaultNet = "mainnet" diff --git a/cmd/sweepaccount/main.go b/cmd/sweepaccount/main.go index 5b573e3..bce9016 100644 --- a/cmd/sweepaccount/main.go +++ b/cmd/sweepaccount/main.go @@ -13,16 +13,16 @@ import ( "golang.org/x/crypto/ssh/terminal" "github.com/jessevdk/go-flags" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "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" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "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" ) var ( diff --git a/config.go b/config.go index 64c4e58..e9c0a42 100644 --- a/config.go +++ b/config.go @@ -17,11 +17,11 @@ import ( flags "github.com/jessevdk/go-flags" "github.com/lightninglabs/neutrino" - "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" + "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" ) const ( diff --git a/docs/README.md b/docs/README.md index 9243163..eb89217 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,3 +1,3 @@ ### Guides -[Rebuilding all transaction history with forced rescans](https://github.com/roasbeef/btcwallet/tree/master/docs/force_rescans.md) +[Rebuilding all transaction history with forced rescans](https://github.com/btcsuite/btcwallet/tree/master/docs/force_rescans.md) diff --git a/docs/force_rescans.md b/docs/force_rescans.md index 02bbc2b..a218ff7 100644 --- a/docs/force_rescans.md +++ b/docs/force_rescans.md @@ -40,7 +40,7 @@ drop the wallet transaction manager (wtxmgr) history from a wallet database. The tool may already be installed in your PATH, but if not, installing it is easy: ``` -$ cd $GOPATH/src/github.com/roasbeef/btcwallet/cmd/dropwtxmgr +$ cd $GOPATH/src/github.com/btcsuite/btcwallet/cmd/dropwtxmgr $ go get ``` diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 37f4ec6..0000000 --- a/glide.lock +++ /dev/null @@ -1,331 +0,0 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b -updated: 2017-07-19T11:33:58.0769452-04:00 -======= -hash: a567152c861b11d05c72b812d894a657b95ae39d08f85c0b7cbf1a235dd8a1a7 -updated: 2017-05-18T20:28:25.480256291-06:00 ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet -======= -hash: 59de122918c56a47f9987706a303d54c95929728a1dd74e2f17f38b03274366e -updated: 2017-06-05T18:12:20.300008456-07:00 ->>>>>>> afb1cbf... build: update glide files to point to roasbeef+neutrino proper -======= -hash: 8f57e2b090be9737f3c4d3157b3675ff5df4a9182928089f48c68593fdc80776 -updated: 2017-06-29T21:02:00.000000000-07:00 ->>>>>>> 249dae0... log: update to new logging API -======= -hash: ec2fde7c4ec4cd438d8c53646a41743440355e53bdd417192a9e9f1db49f19a2 -updated: 2017-08-24T17:24:41.5846735-07:00 ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -======= -hash: cfe436dab405e09a50d3611edb83f5a238f71fd61c12ba7e47c2b02882a75cdf -======= -hash: a7b6593b62ad571ed749736405aa456bf2b6163f5d54e61241be56a7baaad6bd ->>>>>>> a9231df... build: use neutrino with StartTime rescan option -updated: 2017-08-29T15:22:10.322166424-07:00 ->>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino -======= -hash: c781beec4754f9e6c48a9521115015d060430c78dae18d419089ef1dff0f3bde -updated: 2017-09-21T18:16:37.809204283-06:00 ->>>>>>> 24684c8... build: update glide for new neutrino version -======= -hash: 63c716f4c97cabee9b5a1c8cecd5c026550da120b23cfdcb3611492fde5b31bf -updated: 2017-10-01T14:31:37.016793293-07:00 ->>>>>>> 30ed6c8... build: update glide files to point to latest neutrino+btcutil -======= -hash: e472a40c67ce1626e80d8d89631dde8e214903214a72d3a0e8d96e04bcaabd06 -updated: 2017-11-02T19:08:54.780005689-07:00 ->>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino -======= -hash: 9c53c13264c73f55b38f70bc6075962334438be3877fa92e51f6d35f90fe1f1a -updated: 2017-11-03T12:30:39.76652975-07:00 ->>>>>>> 80e2080... build: update to latest btcd+btcutil+neutrino -======= -hash: 8217b51c2a5fc4df53200de6315f4c1f4a084a516f38c77b815e0a02ac71e332 -updated: 2017-11-18T15:17:20.95646706-08:00 ->>>>>>> dc5f652... build: update to latest btcd and neutrino -======= -hash: 83bb1c0a0f5c6396d2387746544592662898af52596d5cdca898b6fbfaa60841 -updated: 2017-11-29T14:42:36.82153259-06:00 ->>>>>>> 7a32017... multi: add bitcoind back-end (only for API use for now) -======= -hash: 8fdbf966a888ff626d377d985e34c32518f81e96dc661433184ce011bad062b2 -updated: 2018-01-12T18:42:39.220877425-07:00 ->>>>>>> 6c1491e... build+chain: replace pebbe/zmq4 with lightninglabs/gozmq (native Go) -======= -hash: 7ff104fae6ac78353955c2ef70405dce8a8c0f071111beaf0fc6ea392c5d9bbd -updated: 2018-01-17T18:11:30.867494300-07:00 ->>>>>>> de6548c... build: update glide to latest btcd, neutrino, and gozmq -imports: -- name: github.com/aead/siphash - version: e404fcfc888570cadd1610538e2dbc89f66af814 -- name: github.com/boltdb/bolt -<<<<<<< HEAD - version: 583e8937c61f1af6513608ccc75c97b6abdf4ff9 -<<<<<<< HEAD -- name: github.com/btcsuite/btcd -<<<<<<< HEAD - version: 47885ab8702485be6b6f87a03d4f3be0bc5c982c -======= - version: 58668c182103a00c5038c7130d7a23fad3a3bd34 - repo: git@github.com:companyzero/btcdln ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet - subpackages: - - addrmgr - - blockchain - - btcec - - btcjson - - chaincfg - - chaincfg/chainhash - - connmgr - - database - - peer - - txscript - - wire -- name: github.com/btcsuite/btclog - version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a -- name: github.com/btcsuite/btcrpcclient -<<<<<<< HEAD - version: c72658166ae09457e6beb14e9112241e352ebd35 -- name: github.com/btcsuite/btcutil - version: 5ffa719c3882fd2ec1e8b9f4978066701c31a343 -======= - version: e15bd09b466511d8836c4017bc4cbc2e0ff05f82 - repo: git@github.com:companyzero/btcrpcclientln -- name: github.com/btcsuite/btcutil - version: f814b35f15362b1122f55bd9034b6275552cc2f7 - repo: git@github.com:companyzero/btcutilln ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet - subpackages: - - base58 - - gcs - - gcs/builder - - hdkeychain -======= -- name: github.com/btcsuite/btclog -<<<<<<< HEAD - version: 73889fb79bd687870312b6e40effcecffbd57d30 ->>>>>>> afb1cbf... build: update glide files to point to roasbeef+neutrino proper -======= - version: 266a29b6e5ad061d4c055cec1c0049e4aae47092 ->>>>>>> 249dae0... log: update to new logging API -- name: github.com/btcsuite/fastsha256 - version: 637e656429416087660c84436a2a035d69d54e2e -======= - version: 2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8 -======= -hash: 7513f0ab812dca7cbcb30de742d99b5d1f51b246a7ed9f83ccc7e705dd2d4665 -updated: 2018-03-10T18:35:25.074565861-08:00 -imports: -- name: github.com/aead/siphash - version: e404fcfc888570cadd1610538e2dbc89f66af814 ->>>>>>> 46f7390... build: switch from bolt to bbolt -- name: github.com/btcsuite/btclog - version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -- name: github.com/btcsuite/go-socks - version: 4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f - subpackages: - - socks -- name: github.com/btcsuite/golangcrypto - version: 53f62d9b43e87a6c56975cf862af7edf33a8d0df - subpackages: - - nacl/secretbox - - pbkdf2 - - poly1305 - - ripemd160 - - salsa20/salsa - - scrypt - - ssh/terminal -<<<<<<< HEAD -<<<<<<< HEAD -======= -- name: github.com/btcsuite/seelog - version: ae8891d029dd3c269dcfd6f261ad23e761acd99f ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet -======= ->>>>>>> 249dae0... log: update to new logging API -- name: github.com/btcsuite/websocket - version: 31079b6807923eb23992c421b114992b95131b55 -- name: github.com/coreos/bbolt - version: 4f5275f4ebbf6fe7cb772de987fa96ee674460a7 -- name: github.com/davecgh/go-spew - version: 346938d642f2ec3594ed81d874461961cd0faa76 - subpackages: - - spew -- name: github.com/golang/protobuf - version: ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e - subpackages: - - proto - - ptypes/any -- name: github.com/jessevdk/go-flags - version: 1679536dcc895411a9f5848d9a0250be7856448c -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -- name: github.com/jrick/logrotate - version: a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a - subpackages: - - rotator -<<<<<<< HEAD -- name: golang.org/x/crypto - version: 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 - subpackages: - - ripemd160 -- name: golang.org/x/net - version: 8663ed5da4fd087c3cfb99a996e628b72e2f0948 -======= -======= ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -- name: github.com/kkdai/bstream - version: f391b8402d23024e7c0f624b31267a89998fca95 -- name: github.com/lightninglabs/gozmq - version: 0d266ba6d55ea65c18c7a02d8992c89355149e80 -- name: github.com/lightninglabs/neutrino - version: 2241200df496ac8fbbe3ffac5be0f1866ad4330c - subpackages: - - filterdb - - headerfs -- name: github.com/roasbeef/btcd - version: 9978b939c33973be19b932fa7b936079bb7ba38d - subpackages: - - addrmgr - - blockchain - - btcec - - btcjson - - chaincfg - - chaincfg/chainhash - - connmgr - - database - - peer - - rpcclient - - txscript - - wire -- name: github.com/roasbeef/btcutil - version: c3ff179366044979fb9856c2feb79bd4c2184c7a - subpackages: - - base58 - - bech32 - - gcs - - gcs/builder - - hdkeychain -- name: golang.org/x/crypto - version: 49796115aa4b964c318aad4f3084fdb41e9aa067 - subpackages: - - ripemd160 - - ssh/terminal -- name: golang.org/x/net -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 513929065c19401a1c7b76ecd942f9f86a0c061b ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet -======= - version: 57efc9c3d9f91fb3277f8da1cff370539c4d3dc5 ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -======= - version: 66aacef3dd8a676686c7ae3716979581e8b03c47 ->>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino -======= - version: 1087133bc4af3073e18add999345c6ae75918503 ->>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino -======= - version: 66aacef3dd8a676686c7ae3716979581e8b03c47 ->>>>>>> dc5f652... build: update to latest btcd and neutrino - subpackages: - - context - - http2 - - http2/hpack - - idna - - internal/timeseries - - lex/httplex - - trace -- name: golang.org/x/sys -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: cd2c276457edda6df7fb04895d3fd6a6add42926 - subpackages: - - unix -- name: golang.org/x/text - version: 6353ef0f924300eea566d3438817aa4d3374817e -======= - version: e62c3de784db939836898e5c19ffd41bece347da -======= - version: 07c182904dbd53199946ba614a412c61d3c548f5 ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -======= - version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb ->>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino -======= - version: 686000749eaec0b8855b8eef5336cf63899fe51d ->>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino -======= - version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb ->>>>>>> dc5f652... build: update to latest btcd and neutrino - subpackages: - - unix - - windows -- name: golang.org/x/text -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 19e51611da83d6be54ddafce4a4af510cb3e9ea4 ->>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet -======= - version: cc24f0397b10b6321b1a1322b6bd592984fdabf2 ->>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits -======= - version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6 ->>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino -======= - version: c01e4764d870b77f8abe5096ee19ad20d80e8075 ->>>>>>> ba1ef88... build: update glide files for latest btcutil, btcd, and neutrino -======= - version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6 ->>>>>>> dc5f652... build: update to latest btcd and neutrino - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: google.golang.org/genproto - version: 411e09b969b1170a9f0c467558eb4c4c110d9c77 - subpackages: - - googleapis/rpc/status -- name: google.golang.org/grpc - version: b15215fb911b24a5d61d57feec4233d610530464 - subpackages: - - codes - - credentials - - grpclb/grpc_lb_v1 - - grpclog - - internal - - keepalive - - metadata - - naming - - peer - - stats - - status - - tap - - transport -testImports: [] diff --git a/glide.yaml b/glide.yaml index 6d5e4fd..da9a385 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,9 +1,8 @@ -package: github.com/roasbeef/btcwallet +package: github.com/btcsuite/btcwallet import: - package: github.com/coreos/bbolt version: 4f5275f4ebbf6fe7cb772de987fa96ee674460a7 -- package: github.com/roasbeef/btcd - version: 9978b939c33973be19b932fa7b936079bb7ba38d +- package: github.com/btcsuite/btcd subpackages: - blockchain - btcec @@ -13,8 +12,7 @@ import: - txscript - wire - package: github.com/btcsuite/btclog -- package: github.com/roasbeef/btcutil - version: c3ff179366044979fb9856c2feb79bd4c2184c7a +- package: github.com/btcsuite/btcutil subpackages: - hdkeychain - package: github.com/lightninglabs/neutrino 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/documentation/clientusage.md b/rpc/documentation/clientusage.md index 1ff4d49..3632311 100644 --- a/rpc/documentation/clientusage.md +++ b/rpc/documentation/clientusage.md @@ -52,7 +52,7 @@ import ( "fmt" "path/filepath" - pb "github.com/roasbeef/btcwallet/rpc/walletrpc" + pb "github.com/btcsuite/btcwallet/rpc/walletrpc" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -394,7 +394,7 @@ Full instructions for this procedure can be found Generate Python stubs from the `.proto`: ```bash -$ protoc -I /path/to/roasbeef/btcwallet/rpc --python_out=. --grpc_out=. \ +$ protoc -I /path/to/btcsuite/btcwallet/rpc --python_out=. --grpc_out=. \ --plugin=protoc-gen-grpc=$(which grpc_python_plugin) \ /path/to/btcwallet/rpc/api.proto ``` 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 4a7e370..4b979c5 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/rpcclient" - "github.com/roasbeef/btcd/txscript" - "github.com/roasbeef/btcd/wire" - "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/rpcclient" + "github.com/btcsuite/btcd/txscript" + "github.com/btcsuite/btcd/wire" + "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 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/legacyrpc/server.go b/rpc/legacyrpc/server.go index c2975df..60ce593 100644 --- a/rpc/legacyrpc/server.go +++ b/rpc/legacyrpc/server.go @@ -19,9 +19,9 @@ import ( "sync/atomic" "time" - "github.com/roasbeef/btcd/btcjson" - "github.com/roasbeef/btcwallet/chain" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcd/btcjson" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/websocket" ) diff --git a/rpc/rpcserver/server.go b/rpc/rpcserver/server.go index 9284131..3eadf29 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/snacl/snacl.go b/snacl/snacl.go index 731bcf0..e893759 100644 --- a/snacl/snacl.go +++ b/snacl/snacl.go @@ -13,7 +13,7 @@ import ( "io" "runtime/debug" - "github.com/roasbeef/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/internal/zero" "github.com/btcsuite/golangcrypto/nacl/secretbox" "github.com/btcsuite/golangcrypto/scrypt" ) diff --git a/votingpool/README.md b/votingpool/README.md index 34903bd..75a51af 100644 --- a/votingpool/README.md +++ b/votingpool/README.md @@ -1,8 +1,8 @@ votingpool ======== -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) Package votingpool provides voting pool functionality for btcwallet as described here: @@ -25,16 +25,16 @@ Note that this is still a work in progress. ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/votingpool?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/votingpool) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/votingpool?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/votingpool) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/votingpool +http://godoc.org/github.com/btcsuite/btcwallet/votingpool You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/votingpool +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/votingpool Package votingpool is licensed under the [copyfree](http://copyfree.org) ISC License. diff --git a/votingpool/common_test.go b/votingpool/common_test.go index 8b6bebd..b4059a9 100644 --- a/votingpool/common_test.go +++ b/votingpool/common_test.go @@ -11,8 +11,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 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/factory_test.go b/votingpool/factory_test.go index d53d19f..ca00df7 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 876371f..39cbe34 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 2d6a9a9..8136968 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 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/test_coverage.txt b/votingpool/test_coverage.txt index 45d906a..0d02016 100644 --- a/votingpool/test_coverage.txt +++ b/votingpool/test_coverage.txt @@ -1,142 +1,142 @@ -github.com/roasbeef/btcwallet/votingpool/db.go serializeSeriesRow 100.00% (31/31) -github.com/roasbeef/btcwallet/votingpool/pool.go branchOrder 100.00% (19/19) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.splitLastOutput 100.00% (16/16) -github.com/roasbeef/btcwallet/votingpool/pool.go convertAndValidatePubKeys 100.00% (16/16) -github.com/roasbeef/btcwallet/votingpool/input_selection.go byAddress.Less 100.00% (12/12) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.maybeDropRequests 100.00% (12/12) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.rollBackLastOutput 100.00% (10/10) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go calculateSize 100.00% (10/10) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.decryptExtendedKey 100.00% (10/10) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go OutputRequest.outBailmentIDHash 100.00% (8/8) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.ReplaceSeries 100.00% (8/8) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.toMsgTx 100.00% (8/8) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.CreateSeries 100.00% (8/8) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.addChange 100.00% (7/7) -github.com/roasbeef/btcwallet/votingpool/db.go putPool 100.00% (5/5) -github.com/roasbeef/btcwallet/votingpool/pool.go Create 100.00% (5/5) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go newWithdrawalTx 100.00% (5/5) -github.com/roasbeef/btcwallet/votingpool/db.go getUsedAddrHash 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/pool.go CanonicalKeyOrder 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/pool.go SeriesData.IsEmpowered 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.DepositScriptAddress 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go getRedeemScript 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go newWithdrawal 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/db.go @102:3 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.removeInput 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.removeOutput 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.GetSeries 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/pool.go @119:3 100.00% (4/4) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.outputTotal 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.inputTotal 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.highestUsedIndexFor 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.popRequest 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/pool.go @458:26 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/db.go uint32ToBytes 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/pool.go @811:3 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.popInput 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.updateStatusFor 100.00% (3/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.addInput 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.addOutput 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/db.go putSeries 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go Ntxid 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.addressFor 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/pool.go zero 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/pool.go @780:3 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/db.go existsPool 100.00% (2/2) -github.com/roasbeef/btcwallet/votingpool/db.go getUsedAddrBucketID 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/db.go bytesToUint32 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/error.go newError 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go newCredit 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go credit.TxSha 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go credit.OutputIndex 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go credit.Address 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go byAddress.Len 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go byAddress.Swap 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go Pool.isCharterOutput 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/log.go init 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/log.go DisableLog 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/log.go UseLogger 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go @105:3 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go newPool 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.Manager 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go @250:27 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go @761:3 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.Addr 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.AddrIdentifier 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.RedeemScript 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.Series 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.SeriesID 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.Branch 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.Index 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byAmount.Len 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byAmount.Less 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byAmount.Swap 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byOutBailmentID.Len 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byOutBailmentID.Swap 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go byOutBailmentID.Less 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalStatus.Outputs 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go OutputRequest.String 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go OutputRequest.outBailmentID 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalOutput.addOutpoint 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Status 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Address 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Outpoints 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go OutBailmentOutpoint.Amount 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTxOut.pkScript 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go @237:20 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go @240:16 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTx.hasChange 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.pushRequest 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.pushInput 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go @246:21 100.00% (1/1) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.EmpowerSeries 96.30% (26/27) -github.com/roasbeef/btcwallet/votingpool/db.go deserializeSeriesRow 94.59% (35/37) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.fulfillNextRequest 94.44% (17/18) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.putSeries 93.75% (15/16) -github.com/roasbeef/btcwallet/votingpool/pool.go validateAndDecryptKeys 92.31% (24/26) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go getRawSigs 91.43% (32/35) -github.com/roasbeef/btcwallet/votingpool/input_selection.go nextAddr 90.48% (19/21) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.fulfillRequests 87.50% (14/16) -github.com/roasbeef/btcwallet/votingpool/db.go getMaxUsedIdx 87.50% (7/8) -github.com/roasbeef/btcwallet/votingpool/input_selection.go Pool.getEligibleInputs 85.71% (30/35) -github.com/roasbeef/btcwallet/votingpool/input_selection.go Pool.isCreditEligible 85.71% (6/7) -github.com/roasbeef/btcwallet/votingpool/pool.go Load 85.71% (6/7) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go signMultiSigUTXO 85.19% (23/27) -github.com/roasbeef/btcwallet/votingpool/input_selection.go groupCreditsByAddr 83.33% (10/12) -github.com/roasbeef/btcwallet/votingpool/db.go loadAllSeries 83.33% (5/6) -github.com/roasbeef/btcwallet/votingpool/input_selection.go Pool.highestUsedSeriesIndex 81.82% (9/11) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.handleOversizeTx 80.00% (12/15) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.LoadAllSeries 80.00% (8/10) -github.com/roasbeef/btcwallet/votingpool/pool.go LoadAndCreateSeries 80.00% (8/10) -github.com/roasbeef/btcwallet/votingpool/pool.go LoadAndEmpowerSeries 80.00% (4/5) -github.com/roasbeef/btcwallet/votingpool/pool.go LoadAndReplaceSeries 80.00% (4/5) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawal.finalizeCurrentTx 79.31% (23/29) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.ChangeAddress 76.92% (10/13) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.WithdrawalAddress 76.92% (10/13) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.getUsedAddr 76.47% (13/17) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go Pool.StartWithdrawal 75.00% (12/16) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.ensureUsedAddr 75.00% (9/12) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go validateSigScript 75.00% (6/8) -github.com/roasbeef/btcwallet/votingpool/pool.go LoadAndGetDepositScript 75.00% (6/8) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go getTxOutIndex 75.00% (3/4) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.poolAddress 75.00% (3/4) -github.com/roasbeef/btcwallet/votingpool/db.go putUsedAddrHash 75.00% (3/4) -github.com/roasbeef/btcwallet/votingpool/pool.go SeriesData.getPrivKeyFor 75.00% (3/4) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.DepositScript 73.08% (19/26) -github.com/roasbeef/btcwallet/votingpool/db.go @132:3 71.43% (5/7) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go nextChangeAddr 71.43% (5/7) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go storeTransactions 70.59% (12/17) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.saveSeriesToDisk 70.00% (14/20) -github.com/roasbeef/btcwallet/votingpool/pool.go Pool.addUsedAddr 69.23% (9/13) -github.com/roasbeef/btcwallet/votingpool/error.go ErrorCode.String 66.67% (2/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go SignTx 62.50% (5/8) -github.com/roasbeef/btcwallet/votingpool/db.go putSeriesRow 53.85% (7/13) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go nBytesToSerialize 40.00% (2/5) -github.com/roasbeef/btcwallet/votingpool/error.go Error.Error 0.00% (0/3) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go WithdrawalOutput.String 0.00% (0/1) -github.com/roasbeef/btcwallet/votingpool/input_selection.go credit.String 0.00% (0/1) -github.com/roasbeef/btcwallet/votingpool/withdrawal.go withdrawalTxOut.String 0.00% (0/1) -github.com/roasbeef/btcwallet/votingpool/pool.go poolAddress.String 0.00% (0/1) -github.com/roasbeef/btcwallet/votingpool ------------------------------- 87.49% (818/935) +github.com/btcsuite/btcwallet/votingpool/db.go serializeSeriesRow 100.00% (31/31) +github.com/btcsuite/btcwallet/votingpool/pool.go branchOrder 100.00% (19/19) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.splitLastOutput 100.00% (16/16) +github.com/btcsuite/btcwallet/votingpool/pool.go convertAndValidatePubKeys 100.00% (16/16) +github.com/btcsuite/btcwallet/votingpool/input_selection.go byAddress.Less 100.00% (12/12) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.maybeDropRequests 100.00% (12/12) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.rollBackLastOutput 100.00% (10/10) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go calculateSize 100.00% (10/10) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.decryptExtendedKey 100.00% (10/10) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go OutputRequest.outBailmentIDHash 100.00% (8/8) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.ReplaceSeries 100.00% (8/8) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.toMsgTx 100.00% (8/8) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.CreateSeries 100.00% (8/8) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.addChange 100.00% (7/7) +github.com/btcsuite/btcwallet/votingpool/db.go putPool 100.00% (5/5) +github.com/btcsuite/btcwallet/votingpool/pool.go Create 100.00% (5/5) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go newWithdrawalTx 100.00% (5/5) +github.com/btcsuite/btcwallet/votingpool/db.go getUsedAddrHash 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/pool.go CanonicalKeyOrder 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/pool.go SeriesData.IsEmpowered 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.DepositScriptAddress 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go getRedeemScript 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go newWithdrawal 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/db.go @102:3 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.removeInput 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.removeOutput 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.GetSeries 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/pool.go @119:3 100.00% (4/4) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.outputTotal 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.inputTotal 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.highestUsedIndexFor 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.popRequest 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/pool.go @458:26 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/db.go uint32ToBytes 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/pool.go @811:3 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.popInput 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.updateStatusFor 100.00% (3/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.addInput 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.addOutput 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/db.go putSeries 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go Ntxid 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.addressFor 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/pool.go zero 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/pool.go @780:3 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/db.go existsPool 100.00% (2/2) +github.com/btcsuite/btcwallet/votingpool/db.go getUsedAddrBucketID 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/db.go bytesToUint32 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/error.go newError 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go newCredit 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go credit.TxSha 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go credit.OutputIndex 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go credit.Address 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go byAddress.Len 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go byAddress.Swap 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go Pool.isCharterOutput 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/log.go init 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/log.go DisableLog 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/log.go UseLogger 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go @105:3 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go newPool 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.Manager 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go @250:27 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go @761:3 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.Addr 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.AddrIdentifier 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.RedeemScript 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.Series 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.SeriesID 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.Branch 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.Index 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byAmount.Len 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byAmount.Less 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byAmount.Swap 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byOutBailmentID.Len 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byOutBailmentID.Swap 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go byOutBailmentID.Less 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalStatus.Outputs 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go OutputRequest.String 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go OutputRequest.outBailmentID 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalOutput.addOutpoint 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Status 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Address 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalOutput.Outpoints 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go OutBailmentOutpoint.Amount 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTxOut.pkScript 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go @237:20 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go @240:16 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTx.hasChange 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.pushRequest 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.pushInput 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go @246:21 100.00% (1/1) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.EmpowerSeries 96.30% (26/27) +github.com/btcsuite/btcwallet/votingpool/db.go deserializeSeriesRow 94.59% (35/37) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.fulfillNextRequest 94.44% (17/18) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.putSeries 93.75% (15/16) +github.com/btcsuite/btcwallet/votingpool/pool.go validateAndDecryptKeys 92.31% (24/26) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go getRawSigs 91.43% (32/35) +github.com/btcsuite/btcwallet/votingpool/input_selection.go nextAddr 90.48% (19/21) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.fulfillRequests 87.50% (14/16) +github.com/btcsuite/btcwallet/votingpool/db.go getMaxUsedIdx 87.50% (7/8) +github.com/btcsuite/btcwallet/votingpool/input_selection.go Pool.getEligibleInputs 85.71% (30/35) +github.com/btcsuite/btcwallet/votingpool/input_selection.go Pool.isCreditEligible 85.71% (6/7) +github.com/btcsuite/btcwallet/votingpool/pool.go Load 85.71% (6/7) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go signMultiSigUTXO 85.19% (23/27) +github.com/btcsuite/btcwallet/votingpool/input_selection.go groupCreditsByAddr 83.33% (10/12) +github.com/btcsuite/btcwallet/votingpool/db.go loadAllSeries 83.33% (5/6) +github.com/btcsuite/btcwallet/votingpool/input_selection.go Pool.highestUsedSeriesIndex 81.82% (9/11) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.handleOversizeTx 80.00% (12/15) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.LoadAllSeries 80.00% (8/10) +github.com/btcsuite/btcwallet/votingpool/pool.go LoadAndCreateSeries 80.00% (8/10) +github.com/btcsuite/btcwallet/votingpool/pool.go LoadAndEmpowerSeries 80.00% (4/5) +github.com/btcsuite/btcwallet/votingpool/pool.go LoadAndReplaceSeries 80.00% (4/5) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawal.finalizeCurrentTx 79.31% (23/29) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.ChangeAddress 76.92% (10/13) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.WithdrawalAddress 76.92% (10/13) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.getUsedAddr 76.47% (13/17) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go Pool.StartWithdrawal 75.00% (12/16) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.ensureUsedAddr 75.00% (9/12) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go validateSigScript 75.00% (6/8) +github.com/btcsuite/btcwallet/votingpool/pool.go LoadAndGetDepositScript 75.00% (6/8) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go getTxOutIndex 75.00% (3/4) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.poolAddress 75.00% (3/4) +github.com/btcsuite/btcwallet/votingpool/db.go putUsedAddrHash 75.00% (3/4) +github.com/btcsuite/btcwallet/votingpool/pool.go SeriesData.getPrivKeyFor 75.00% (3/4) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.DepositScript 73.08% (19/26) +github.com/btcsuite/btcwallet/votingpool/db.go @132:3 71.43% (5/7) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go nextChangeAddr 71.43% (5/7) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go storeTransactions 70.59% (12/17) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.saveSeriesToDisk 70.00% (14/20) +github.com/btcsuite/btcwallet/votingpool/pool.go Pool.addUsedAddr 69.23% (9/13) +github.com/btcsuite/btcwallet/votingpool/error.go ErrorCode.String 66.67% (2/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go SignTx 62.50% (5/8) +github.com/btcsuite/btcwallet/votingpool/db.go putSeriesRow 53.85% (7/13) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go nBytesToSerialize 40.00% (2/5) +github.com/btcsuite/btcwallet/votingpool/error.go Error.Error 0.00% (0/3) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go WithdrawalOutput.String 0.00% (0/1) +github.com/btcsuite/btcwallet/votingpool/input_selection.go credit.String 0.00% (0/1) +github.com/btcsuite/btcwallet/votingpool/withdrawal.go withdrawalTxOut.String 0.00% (0/1) +github.com/btcsuite/btcwallet/votingpool/pool.go poolAddress.String 0.00% (0/1) +github.com/btcsuite/btcwallet/votingpool ------------------------------- 87.49% (818/935) diff --git a/votingpool/withdrawal.go b/votingpool/withdrawal.go index 68d3f3b..d1700ef 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 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/README.md b/waddrmgr/README.md index 226deb6..6499c6d 100644 --- a/waddrmgr/README.md +++ b/waddrmgr/README.md @@ -1,8 +1,8 @@ waddrmgr ======== -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) Package waddrmgr provides a secure hierarchical deterministic wallet address manager. @@ -41,21 +41,21 @@ report. Package waddrmgr is licensed under the liberal ISC license. ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/waddrmgr?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/waddrmgr) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/waddrmgr?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/waddrmgr) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/waddrmgr +http://godoc.org/github.com/btcsuite/btcwallet/waddrmgr You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/waddrmgr +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/waddrmgr ## Installation ```bash -$ go get github.com/roasbeef/btcwallet/waddrmgr +$ go get github.com/btcsuite/btcwallet/waddrmgr ``` Package waddrmgr is licensed under the [copyfree](http://copyfree.org) ISC diff --git a/waddrmgr/address.go b/waddrmgr/address.go index 5a7a7f1..df7687b 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 c6057eb..14bad47 100644 --- a/waddrmgr/common_test.go +++ b/waddrmgr/common_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "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 dd3eb49..d1da802 100644 --- a/waddrmgr/db.go +++ b/waddrmgr/db.go @@ -11,9 +11,9 @@ import ( "fmt" "time" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" ) const ( diff --git a/waddrmgr/error.go b/waddrmgr/error.go index 6d462c8..5a66882 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 98a9b28..7997a41 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" ) // TstLatestMgrVersion makes the unexported latestMgrVersion variable available diff --git a/waddrmgr/manager.go b/waddrmgr/manager.go index 4ca4125..b537c9d 100644 --- a/waddrmgr/manager.go +++ b/waddrmgr/manager.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/roasbeef/btcd/chaincfg" - "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/chaincfg" + "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 9589601..8d929d0 100644 --- a/waddrmgr/manager_test.go +++ b/waddrmgr/manager_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "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/scoped_manager.go b/waddrmgr/scoped_manager.go index 4f2863e..ab5c8e0 100644 --- a/waddrmgr/scoped_manager.go +++ b/waddrmgr/scoped_manager.go @@ -4,12 +4,12 @@ import ( "fmt" "sync" - "github.com/roasbeef/btcd/btcec" - "github.com/roasbeef/btcd/chaincfg" - "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/chaincfg" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcutil/hdkeychain" + "github.com/btcsuite/btcwallet/internal/zero" + "github.com/btcsuite/btcwallet/walletdb" ) // DerivationPath represents a derivation path from a particular key manager's diff --git a/waddrmgr/sync.go b/waddrmgr/sync.go index 9588a8f..9398258 100644 --- a/waddrmgr/sync.go +++ b/waddrmgr/sync.go @@ -7,8 +7,8 @@ package waddrmgr import ( "time" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcwallet/walletdb" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcwallet/walletdb" ) // BlockStamp defines a block (by height and a unique hash) and is used to mark diff --git a/wallet/README.md b/wallet/README.md index 3d481d9..196920c 100644 --- a/wallet/README.md +++ b/wallet/README.md @@ -1,8 +1,8 @@ wallet ====== -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) ## Feature Overview @@ -10,21 +10,21 @@ TODO: Flesh out this section ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/wallet?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/wallet) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/wallet?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/wallet) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/wallet +http://godoc.org/github.com/btcsuite/btcwallet/wallet You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/wallet +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/wallet ## Installation ```bash -$ go get github.com/roasbeef/btcwallet/wallet +$ go get github.com/btcsuite/btcwallet/wallet ``` Package wallet is licensed under the [copyfree](http://copyfree.org) ISC diff --git a/wallet/chainntfns.go b/wallet/chainntfns.go index af23480..393701b 100644 --- a/wallet/chainntfns.go +++ b/wallet/chainntfns.go @@ -8,11 +8,11 @@ import ( "bytes" "strings" - "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 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/createtx.go b/wallet/createtx.go index 1550a12..dc831f8 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 4e513fb..b69fbab 100644 --- a/wallet/internal/txsizes/size.go +++ b/wallet/internal/txsizes/size.go @@ -5,10 +5,10 @@ package txsizes import ( - "github.com/roasbeef/btcd/blockchain" - "github.com/roasbeef/btcd/wire" + "github.com/btcsuite/btcd/blockchain" + "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 d088e8e..4efdd32 100644 --- a/wallet/internal/txsizes/size_test.go +++ b/wallet/internal/txsizes/size_test.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "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 a3068e4..0d45607 100644 --- a/wallet/loader.go +++ b/wallet/loader.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "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 ba5ca88..a1f9baa 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 edf0add..f76e6d9 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/recovery.go b/wallet/recovery.go index 26d604b..bd45e25 100644 --- a/wallet/recovery.go +++ b/wallet/recovery.go @@ -3,13 +3,13 @@ package wallet import ( "time" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "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/chainhash" + "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" ) // RecoveryManager maintains the state required to recover previously used diff --git a/wallet/recovery_test.go b/wallet/recovery_test.go index 8a66934..d5fc60d 100644 --- a/wallet/recovery_test.go +++ b/wallet/recovery_test.go @@ -4,7 +4,7 @@ import ( "runtime" "testing" - "github.com/roasbeef/btcwallet/wallet" + "github.com/btcsuite/btcwallet/wallet" ) // Harness holds the BranchRecoveryState being tested, the recovery window being diff --git a/wallet/rescan.go b/wallet/rescan.go index f62220c..1a3888c 100644 --- a/wallet/rescan.go +++ b/wallet/rescan.go @@ -5,11 +5,11 @@ 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/wtxmgr" + "github.com/btcsuite/btcd/wire" + "github.com/btcsuite/btcutil" + "github.com/btcsuite/btcwallet/chain" + "github.com/btcsuite/btcwallet/waddrmgr" + "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 0bf8ef8..467153c 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 b707341..a754f99 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/walletdb/README.md b/walletdb/README.md index e70efe3..9ca5361 100644 --- a/walletdb/README.md +++ b/walletdb/README.md @@ -1,8 +1,8 @@ walletdb ======== -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) Package walletdb provides a namespaced database interface for btcwallet. @@ -43,27 +43,27 @@ boltdb project at https://github.com/boltdb/bolt by Ben B. Johnson. ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/walletdb?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/walletdb) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/walletdb?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/walletdb) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/walletdb +http://godoc.org/github.com/btcsuite/btcwallet/walletdb You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/walletdb +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/walletdb ## Installation ```bash -$ go get github.com/roasbeef/btcwallet/walletdb +$ go get github.com/btcsuite/btcwallet/walletdb ``` ## Examples * [Basic Usage Example] - (http://godoc.org/github.com/roasbeef/btcwallet/walletdb#example-package--BasicUsage) + (http://godoc.org/github.com/btcsuite/btcwallet/walletdb#example-package--BasicUsage) Demonstrates creating a new database, getting a namespace from it, and using a managed read-write transaction against the namespace to store and retrieve data. diff --git a/walletdb/bdb/README.md b/walletdb/bdb/README.md index 5e2219f..5a99ae7 100644 --- a/walletdb/bdb/README.md +++ b/walletdb/bdb/README.md @@ -1,8 +1,8 @@ bdb === -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) Package bdb implements an driver for walletdb that uses boltdb for the backing datastore. Package bdb is licensed under the copyfree ISC license. @@ -29,16 +29,16 @@ if err != nil { ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/walletdb/bdb?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/walletdb/bdb) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/walletdb/bdb?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/walletdb/bdb) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/walletdb/bdb +http://godoc.org/github.com/btcsuite/btcwallet/walletdb/bdb You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/walletdb/bdb +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/walletdb/bdb ## License diff --git a/walletdb/bdb/db.go b/walletdb/bdb/db.go index 67b2928..dcf2317 100644 --- a/walletdb/bdb/db.go +++ b/walletdb/bdb/db.go @@ -9,7 +9,7 @@ import ( "os" "github.com/coreos/bbolt" - "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 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/bdb/interface_test.go b/walletdb/bdb/interface_test.go index 81e0318..ec10fec 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 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/walletdb/walletdbtest/interface.go b/walletdb/walletdbtest/interface.go index c374ce9..8a2beb1 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 1ae9469..cc1d0ef 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/README.md b/wtxmgr/README.md index 87ecfef..1cd2676 100644 --- a/wtxmgr/README.md +++ b/wtxmgr/README.md @@ -1,8 +1,8 @@ wtxmgr ====== -[![Build Status](https://travis-ci.org/roasbeef/btcwallet.png?branch=master)] -(https://travis-ci.org/roasbeef/btcwallet) +[![Build Status](https://travis-ci.org/btcsuite/btcwallet.png?branch=master)] +(https://travis-ci.org/btcsuite/btcwallet) Package wtxmgr provides storage and spend tracking of wallet transactions and their relevant input and outputs. @@ -24,21 +24,21 @@ their relevant input and outputs. ## Documentation -[![GoDoc](https://godoc.org/github.com/roasbeef/btcwallet/wtxmgr?status.png)] -(http://godoc.org/github.com/roasbeef/btcwallet/wtxmgr) +[![GoDoc](https://godoc.org/github.com/btcsuite/btcwallet/wtxmgr?status.png)] +(http://godoc.org/github.com/btcsuite/btcwallet/wtxmgr) Full `go doc` style documentation for the project can be viewed online without installing this package by using the GoDoc site here: -http://godoc.org/github.com/roasbeef/btcwallet/wtxmgr +http://godoc.org/github.com/btcsuite/btcwallet/wtxmgr You can also view the documentation locally once the package is installed with the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to -http://localhost:6060/pkg/github.com/roasbeef/btcwallet/wtxmgr +http://localhost:6060/pkg/github.com/btcsuite/btcwallet/wtxmgr ## Installation ```bash -$ go get github.com/roasbeef/btcwallet/wtxmgr +$ go get github.com/btcsuite/btcwallet/wtxmgr ``` Package wtxmgr is licensed under the [copyfree](http://copyfree.org) ISC diff --git a/wtxmgr/db.go b/wtxmgr/db.go index 3b9da30..88dc7a6 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 7594ac9..7f418e5 100644 --- a/wtxmgr/example_test.go +++ b/wtxmgr/example_test.go @@ -7,11 +7,11 @@ package wtxmgr_test import ( "fmt" - "github.com/roasbeef/btcd/chaincfg" - "github.com/roasbeef/btcd/chaincfg/chainhash" - "github.com/roasbeef/btcd/wire" - "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/wire" + "github.com/btcsuite/btcwallet/walletdb" + "github.com/btcsuite/btcwallet/wtxmgr" ) var ( diff --git a/wtxmgr/kahnsort.go b/wtxmgr/kahnsort.go index 261dbc1..f6a85b6 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 b668eee..6e7f40f 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 be5ef94..f5a2f50 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 7b6d772..cba352f 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 93f205a..88e40a7 100644 --- a/wtxmgr/tx_test.go +++ b/wtxmgr/tx_test.go @@ -13,14 +13,14 @@ 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/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" + . "github.com/btcsuite/btcwallet/wtxmgr" ) // Received transaction output for mainnet outpoint diff --git a/wtxmgr/unconfirmed.go b/wtxmgr/unconfirmed.go index 6f7a71b..be68dba 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