Skip to content

Commit

Permalink
multi: switch import paths back to upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@Roasbeef
Roasbeef committed May 24, 2018
1 parent 4c6b905 commit 7770cac
Show file tree
Hide file tree
Showing 96 changed files with 530 additions and 863 deletions.
20 changes: 10 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -96,16 +96,16 @@ 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
```

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
```
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions btcwallet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
18 changes: 9 additions & 9 deletions chain/bitcoind.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions chain/block_filterer.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions chain/block_filterer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
10 changes: 5 additions & 5 deletions chain/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 10 additions & 10 deletions chain/neutrino.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions chain/rpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cmd/dropwtxmgr/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 10 additions & 10 deletions cmd/sweepaccount/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion docs/force_rescans.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
Loading

0 comments on commit 7770cac

Please sign in to comment.