Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2013, 2014 Conformal Systems LLC <info@conformal.com>
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"encoding/base64"
|
|
|
|
"encoding/hex"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"path/filepath"
|
|
|
|
"sync"
|
|
|
|
"time"
|
|
|
|
|
2015-01-30 23:30:16 +01:00
|
|
|
"github.com/btcsuite/btcd/blockchain"
|
2015-02-19 19:01:41 +01:00
|
|
|
"github.com/btcsuite/btcd/btcjson"
|
2015-02-06 06:51:37 +01:00
|
|
|
"github.com/btcsuite/btcd/chaincfg"
|
2015-02-05 22:41:38 +01:00
|
|
|
"github.com/btcsuite/btcd/wire"
|
2015-01-15 17:48:58 +01:00
|
|
|
"github.com/btcsuite/btcutil"
|
2015-01-17 07:25:53 +01:00
|
|
|
"github.com/btcsuite/btcwallet/chain"
|
|
|
|
"github.com/btcsuite/btcwallet/keystore"
|
|
|
|
"github.com/btcsuite/btcwallet/txstore"
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
)
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// ErrNotSynced describes an error where an operation cannot complete
|
|
|
|
// due wallet being out of sync (and perhaps currently syncing with)
|
|
|
|
// the remote chain server.
|
|
|
|
var ErrNotSynced = errors.New("wallet is not synchronized with the chain server")
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
|
|
|
|
// networkDir returns the directory name of a network directory to hold wallet
|
|
|
|
// files.
|
2015-02-06 06:51:37 +01:00
|
|
|
func networkDir(chainParams *chaincfg.Params) string {
|
|
|
|
netname := chainParams.Name
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
|
|
|
|
// For now, we must always name the testnet data directory as "testnet"
|
2015-02-06 06:51:37 +01:00
|
|
|
// and not "testnet3" or any other version, as the chaincfg testnet3
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
// paramaters will likely be switched to being named "testnet3" in the
|
|
|
|
// future. This is done to future proof that change, and an upgrade
|
|
|
|
// plan to move the testnet3 data directory can be worked out later.
|
2015-02-06 06:51:37 +01:00
|
|
|
if chainParams.Net == wire.TestNet3 {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
netname = "testnet"
|
|
|
|
}
|
|
|
|
|
|
|
|
return filepath.Join(cfg.DataDir, netname)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wallet is a structure containing all the components for a
|
|
|
|
// complete wallet. It contains the Armory-style key store
|
|
|
|
// addresses and keys),
|
|
|
|
type Wallet struct {
|
|
|
|
// Data stores
|
|
|
|
KeyStore *keystore.Store
|
|
|
|
TxStore *txstore.Store
|
|
|
|
|
|
|
|
chainSvr *chain.Client
|
|
|
|
chainSvrLock sync.Locker
|
|
|
|
chainSynced chan struct{} // closed when synced
|
|
|
|
|
2015-02-05 22:41:38 +01:00
|
|
|
lockedOutpoints map[wire.OutPoint]struct{}
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
FeeIncrement btcutil.Amount
|
|
|
|
|
|
|
|
// Channels for rescan processing. Requests are added and merged with
|
|
|
|
// any waiting requests, before being sent to another goroutine to
|
|
|
|
// call the rescan RPC.
|
|
|
|
rescanAddJob chan *RescanJob
|
|
|
|
rescanBatch chan *rescanBatch
|
|
|
|
rescanNotifications chan interface{} // From chain server
|
|
|
|
rescanProgress chan *RescanProgressMsg
|
|
|
|
rescanFinished chan *RescanFinishedMsg
|
|
|
|
|
2014-08-12 04:43:59 +02:00
|
|
|
// Channel for transaction creation requests.
|
|
|
|
createTxRequests chan createTxRequest
|
|
|
|
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
// Channels for the keystore locker.
|
|
|
|
unlockRequests chan unlockRequest
|
|
|
|
lockRequests chan struct{}
|
|
|
|
holdUnlockRequests chan chan HeldUnlock
|
|
|
|
lockState chan bool
|
|
|
|
changePassphrase chan changePassphraseRequest
|
|
|
|
|
|
|
|
// Notification channels so other components can listen in on wallet
|
|
|
|
// activity. These are initialized as nil, and must be created by
|
|
|
|
// calling one of the Listen* methods.
|
2014-07-30 16:47:50 +02:00
|
|
|
connectedBlocks chan keystore.BlockStamp
|
|
|
|
disconnectedBlocks chan keystore.BlockStamp
|
|
|
|
lockStateChanges chan bool // true when locked
|
|
|
|
confirmedBalance chan btcutil.Amount
|
|
|
|
unconfirmedBalance chan btcutil.Amount
|
|
|
|
notificationLock sync.Locker
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
|
|
|
|
wg sync.WaitGroup
|
|
|
|
quit chan struct{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// newWallet creates a new Wallet structure with the provided key and
|
|
|
|
// transaction stores.
|
|
|
|
func newWallet(keys *keystore.Store, txs *txstore.Store) *Wallet {
|
|
|
|
return &Wallet{
|
|
|
|
KeyStore: keys,
|
|
|
|
TxStore: txs,
|
|
|
|
chainSvrLock: new(sync.Mutex),
|
|
|
|
chainSynced: make(chan struct{}),
|
2015-02-05 22:41:38 +01:00
|
|
|
lockedOutpoints: map[wire.OutPoint]struct{}{},
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
FeeIncrement: defaultFeeIncrement,
|
|
|
|
rescanAddJob: make(chan *RescanJob),
|
|
|
|
rescanBatch: make(chan *rescanBatch),
|
|
|
|
rescanNotifications: make(chan interface{}),
|
|
|
|
rescanProgress: make(chan *RescanProgressMsg),
|
|
|
|
rescanFinished: make(chan *RescanFinishedMsg),
|
2014-08-12 04:43:59 +02:00
|
|
|
createTxRequests: make(chan createTxRequest),
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
unlockRequests: make(chan unlockRequest),
|
|
|
|
lockRequests: make(chan struct{}),
|
|
|
|
holdUnlockRequests: make(chan chan HeldUnlock),
|
|
|
|
lockState: make(chan bool),
|
|
|
|
changePassphrase: make(chan changePassphraseRequest),
|
|
|
|
notificationLock: new(sync.Mutex),
|
|
|
|
quit: make(chan struct{}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ErrDuplicateListen is returned for any attempts to listen for the same
|
|
|
|
// notification more than once. If callers must pass along a notifiation to
|
|
|
|
// multiple places, they must broadcast it themself.
|
|
|
|
var ErrDuplicateListen = errors.New("duplicate listen")
|
|
|
|
|
|
|
|
func (w *Wallet) updateNotificationLock() {
|
|
|
|
switch {
|
|
|
|
case w.connectedBlocks == nil:
|
|
|
|
fallthrough
|
|
|
|
case w.disconnectedBlocks == nil:
|
|
|
|
fallthrough
|
|
|
|
case w.lockStateChanges == nil:
|
|
|
|
fallthrough
|
|
|
|
case w.confirmedBalance == nil:
|
|
|
|
fallthrough
|
|
|
|
case w.unconfirmedBalance == nil:
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.notificationLock = noopLocker{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListenConnectedBlocks returns a channel that passes all blocks that a wallet
|
|
|
|
// has been marked in sync with. The channel must be read, or other wallet
|
|
|
|
// methods will block.
|
|
|
|
//
|
|
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
|
|
func (w *Wallet) ListenConnectedBlocks() (<-chan keystore.BlockStamp, error) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
defer w.notificationLock.Unlock()
|
|
|
|
|
|
|
|
if w.connectedBlocks != nil {
|
|
|
|
return nil, ErrDuplicateListen
|
|
|
|
}
|
|
|
|
w.connectedBlocks = make(chan keystore.BlockStamp)
|
|
|
|
w.updateNotificationLock()
|
|
|
|
return w.connectedBlocks, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListenDisconnectedBlocks returns a channel that passes all blocks that a
|
|
|
|
// wallet has detached. The channel must be read, or other wallet methods will
|
|
|
|
// block.
|
|
|
|
//
|
|
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
|
|
func (w *Wallet) ListenDisconnectedBlocks() (<-chan keystore.BlockStamp, error) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
defer w.notificationLock.Unlock()
|
|
|
|
|
|
|
|
if w.disconnectedBlocks != nil {
|
|
|
|
return nil, ErrDuplicateListen
|
|
|
|
}
|
|
|
|
w.disconnectedBlocks = make(chan keystore.BlockStamp)
|
|
|
|
w.updateNotificationLock()
|
|
|
|
return w.disconnectedBlocks, nil
|
|
|
|
}
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// ListenKeystoreLockStatus returns a channel that passes the current lock state
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
// of the wallet keystore anytime the keystore is locked or unlocked. The value
|
|
|
|
// is true for locked, and false for unlocked. The channel must be read, or
|
|
|
|
// other wallet methods will block.
|
|
|
|
//
|
|
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
|
|
func (w *Wallet) ListenKeystoreLockStatus() (<-chan bool, error) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
defer w.notificationLock.Unlock()
|
|
|
|
|
|
|
|
if w.lockStateChanges != nil {
|
|
|
|
return nil, ErrDuplicateListen
|
|
|
|
}
|
|
|
|
w.lockStateChanges = make(chan bool)
|
|
|
|
w.updateNotificationLock()
|
|
|
|
return w.lockStateChanges, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListenConfirmedBalance returns a channel that passes the confirmed balance
|
|
|
|
// when any changes to the balance are made. This channel must be read, or
|
|
|
|
// other wallet methods will block.
|
|
|
|
//
|
|
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
|
|
func (w *Wallet) ListenConfirmedBalance() (<-chan btcutil.Amount, error) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
defer w.notificationLock.Unlock()
|
|
|
|
|
|
|
|
if w.confirmedBalance != nil {
|
|
|
|
return nil, ErrDuplicateListen
|
|
|
|
}
|
|
|
|
w.confirmedBalance = make(chan btcutil.Amount)
|
|
|
|
w.updateNotificationLock()
|
|
|
|
return w.confirmedBalance, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListenUnconfirmedBalance returns a channel that passes the unconfirmed
|
|
|
|
// balance when any changes to the balance are made. This channel must be
|
|
|
|
// read, or other wallet methods will block.
|
|
|
|
//
|
|
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
|
|
func (w *Wallet) ListenUnconfirmedBalance() (<-chan btcutil.Amount, error) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
defer w.notificationLock.Unlock()
|
|
|
|
|
|
|
|
if w.unconfirmedBalance != nil {
|
|
|
|
return nil, ErrDuplicateListen
|
|
|
|
}
|
|
|
|
w.unconfirmedBalance = make(chan btcutil.Amount)
|
|
|
|
w.updateNotificationLock()
|
|
|
|
return w.unconfirmedBalance, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyConnectedBlock(block keystore.BlockStamp) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
if w.connectedBlocks != nil {
|
|
|
|
w.connectedBlocks <- block
|
|
|
|
}
|
|
|
|
w.notificationLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyDisconnectedBlock(block keystore.BlockStamp) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
if w.disconnectedBlocks != nil {
|
|
|
|
w.disconnectedBlocks <- block
|
|
|
|
}
|
|
|
|
w.notificationLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyLockStateChange(locked bool) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
if w.lockStateChanges != nil {
|
|
|
|
w.lockStateChanges <- locked
|
|
|
|
}
|
|
|
|
w.notificationLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyConfirmedBalance(bal btcutil.Amount) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
if w.confirmedBalance != nil {
|
|
|
|
w.confirmedBalance <- bal
|
|
|
|
}
|
|
|
|
w.notificationLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyUnconfirmedBalance(bal btcutil.Amount) {
|
|
|
|
w.notificationLock.Lock()
|
|
|
|
if w.unconfirmedBalance != nil {
|
|
|
|
w.unconfirmedBalance <- bal
|
|
|
|
}
|
|
|
|
w.notificationLock.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
// openWallet opens a new wallet from disk.
|
|
|
|
func openWallet() (*Wallet, error) {
|
|
|
|
netdir := networkDir(activeNet.Params)
|
|
|
|
|
|
|
|
// Ensure that the network directory exists.
|
|
|
|
// TODO: move this?
|
|
|
|
if err := checkCreateDir(netdir); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Read key and transaction stores.
|
|
|
|
keys, err := keystore.OpenDir(netdir)
|
|
|
|
var txs *txstore.Store
|
|
|
|
if err == nil {
|
|
|
|
txs, err = txstore.OpenDir(netdir)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
// Special case: if the keystore was successfully read
|
|
|
|
// (keys != nil) but the transaction store was not, create a
|
|
|
|
// new txstore and write it out to disk. Write an unsynced
|
|
|
|
// wallet back to disk so on future opens, the empty txstore
|
|
|
|
// is not considered fully synced.
|
|
|
|
if keys == nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
txs = txstore.New(netdir)
|
|
|
|
txs.MarkDirty()
|
|
|
|
err = txs.WriteIfDirty()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
keys.SetSyncedWith(nil)
|
|
|
|
keys.MarkDirty()
|
|
|
|
err = keys.WriteIfDirty()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Infof("Opened wallet files") // TODO: log balance? last sync height?
|
|
|
|
return newWallet(keys, txs), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// newEncryptedWallet creates a new wallet encrypted with the provided
|
|
|
|
// passphrase.
|
|
|
|
func newEncryptedWallet(passphrase []byte, chainSvr *chain.Client) (*Wallet, error) {
|
|
|
|
// Get current block's height and hash.
|
|
|
|
bs, err := chainSvr.BlockStamp()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create new wallet in memory.
|
|
|
|
keys, err := keystore.New(networkDir(activeNet.Params), "Default acccount",
|
|
|
|
passphrase, activeNet.Params, bs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
w := newWallet(keys, txstore.New(networkDir(activeNet.Params)))
|
|
|
|
return w, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start starts the goroutines necessary to manage a wallet.
|
|
|
|
func (w *Wallet) Start(chainServer *chain.Client) {
|
|
|
|
select {
|
|
|
|
case <-w.quit:
|
|
|
|
return
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
|
|
|
|
w.chainSvrLock.Lock()
|
|
|
|
defer w.chainSvrLock.Unlock()
|
|
|
|
|
|
|
|
w.chainSvr = chainServer
|
|
|
|
w.chainSvrLock = noopLocker{}
|
|
|
|
|
2014-08-12 04:43:59 +02:00
|
|
|
w.wg.Add(7)
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
go w.diskWriter()
|
|
|
|
go w.handleChainNotifications()
|
2014-08-12 04:43:59 +02:00
|
|
|
go w.txCreator()
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
go w.keystoreLocker()
|
|
|
|
go w.rescanBatchHandler()
|
|
|
|
go w.rescanProgressHandler()
|
|
|
|
go w.rescanRPCHandler()
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
err := w.syncWithChain()
|
|
|
|
if err != nil && !w.ShuttingDown() {
|
|
|
|
log.Warnf("Unable to synchronize wallet to chain: %v", err)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stop signals all wallet goroutines to shutdown.
|
|
|
|
func (w *Wallet) Stop() {
|
|
|
|
select {
|
|
|
|
case <-w.quit:
|
|
|
|
default:
|
|
|
|
close(w.quit)
|
|
|
|
w.chainSvrLock.Lock()
|
|
|
|
if w.chainSvr != nil {
|
|
|
|
w.chainSvr.Stop()
|
|
|
|
}
|
|
|
|
w.chainSvrLock.Unlock()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ShuttingDown returns whether the wallet is currently in the process of
|
|
|
|
// shutting down or not.
|
|
|
|
func (w *Wallet) ShuttingDown() bool {
|
|
|
|
select {
|
|
|
|
case <-w.quit:
|
|
|
|
return true
|
|
|
|
default:
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// WaitForShutdown blocks until all wallet goroutines have finished executing.
|
|
|
|
func (w *Wallet) WaitForShutdown() {
|
|
|
|
w.chainSvrLock.Lock()
|
|
|
|
if w.chainSvr != nil {
|
|
|
|
w.chainSvr.WaitForShutdown()
|
|
|
|
}
|
|
|
|
w.chainSvrLock.Unlock()
|
|
|
|
w.wg.Wait()
|
|
|
|
}
|
|
|
|
|
|
|
|
// ChainSynced returns whether the wallet has been attached to a chain server
|
|
|
|
// and synced up to the best block on the main chain.
|
|
|
|
func (w *Wallet) ChainSynced() bool {
|
|
|
|
select {
|
|
|
|
case <-w.chainSynced:
|
|
|
|
return true
|
|
|
|
default:
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// WaitForChainSync blocks until a wallet has been synced with the main chain
|
|
|
|
// of an attached chain server.
|
|
|
|
func (w *Wallet) WaitForChainSync() {
|
|
|
|
<-w.chainSynced
|
|
|
|
}
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// SyncedChainTip returns the hash and height of the block of the most
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
// recently seen block in the main chain. It returns errors if the
|
|
|
|
// wallet has not yet been marked as synched with the chain.
|
|
|
|
func (w *Wallet) SyncedChainTip() (*keystore.BlockStamp, error) {
|
|
|
|
select {
|
|
|
|
case <-w.chainSynced:
|
|
|
|
return w.chainSvr.BlockStamp()
|
|
|
|
default:
|
|
|
|
return nil, ErrNotSynced
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) syncWithChain() (err error) {
|
|
|
|
defer func() {
|
|
|
|
if err == nil {
|
|
|
|
// Request notifications for connected and disconnected
|
|
|
|
// blocks.
|
|
|
|
err = w.chainSvr.NotifyBlocks()
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
// TODO(jrick): How should this handle a synced height earlier than
|
|
|
|
// the chain server best block?
|
|
|
|
|
|
|
|
// Check that there was not any reorgs done since last connection.
|
|
|
|
// If so, rollback and rescan to catch up.
|
|
|
|
iter := w.KeyStore.NewIterateRecentBlocks()
|
|
|
|
for cont := iter != nil; cont; cont = iter.Prev() {
|
|
|
|
bs := iter.BlockStamp()
|
|
|
|
log.Debugf("Checking for previous saved block with height %v hash %v",
|
|
|
|
bs.Height, bs.Hash)
|
|
|
|
|
|
|
|
if _, err := w.chainSvr.GetBlock(bs.Hash); err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Debug("Found matching block.")
|
|
|
|
|
|
|
|
// If we had to go back to any previous blocks (iter.Next
|
|
|
|
// returns true), then rollback the next and all child blocks.
|
|
|
|
if iter.Next() {
|
|
|
|
bs := iter.BlockStamp()
|
|
|
|
w.KeyStore.SetSyncedWith(&bs)
|
|
|
|
err = w.TxStore.Rollback(bs.Height)
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.TxStore.MarkDirty()
|
|
|
|
}
|
|
|
|
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
return w.RescanActiveAddresses()
|
|
|
|
}
|
|
|
|
|
2014-08-12 04:43:59 +02:00
|
|
|
type (
|
|
|
|
createTxRequest struct {
|
|
|
|
pairs map[string]btcutil.Amount
|
|
|
|
minconf int
|
|
|
|
resp chan createTxResponse
|
|
|
|
}
|
|
|
|
createTxResponse struct {
|
|
|
|
tx *CreatedTx
|
|
|
|
err error
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
// txCreator is responsible for the input selection and creation of
|
|
|
|
// transactions. These functions are the responsibility of this method
|
|
|
|
// (designed to be run as its own goroutine) since input selection must be
|
|
|
|
// serialized, or else it is possible to create double spends by choosing the
|
|
|
|
// same inputs for multiple transactions. Along with input selection, this
|
|
|
|
// method is also responsible for the signing of transactions, since we don't
|
|
|
|
// want to end up in a situation where we run out of inputs as multiple
|
|
|
|
// transactions are being created. In this situation, it would then be possible
|
|
|
|
// for both requests, rather than just one, to fail due to not enough available
|
|
|
|
// inputs.
|
|
|
|
func (w *Wallet) txCreator() {
|
|
|
|
out:
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case txr := <-w.createTxRequests:
|
|
|
|
tx, err := w.txToPairs(txr.pairs, txr.minconf)
|
|
|
|
txr.resp <- createTxResponse{tx, err}
|
|
|
|
|
|
|
|
case <-w.quit:
|
|
|
|
break out
|
|
|
|
}
|
|
|
|
}
|
|
|
|
w.wg.Done()
|
|
|
|
}
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// CreateSimpleTx creates a new signed transaction spending unspent P2PKH
|
|
|
|
// outputs with at laest minconf confirmations spending to any number of
|
|
|
|
// address/amount pairs. Change and an appropiate transaction fee are
|
|
|
|
// automatically included, if necessary. All transaction creation through
|
|
|
|
// this function is serialized to prevent the creation of many transactions
|
|
|
|
// which spend the same outputs.
|
|
|
|
func (w *Wallet) CreateSimpleTx(pairs map[string]btcutil.Amount, minconf int) (*CreatedTx, error) {
|
2014-08-12 04:43:59 +02:00
|
|
|
req := createTxRequest{
|
|
|
|
pairs: pairs,
|
|
|
|
minconf: minconf,
|
|
|
|
resp: make(chan createTxResponse),
|
|
|
|
}
|
|
|
|
w.createTxRequests <- req
|
|
|
|
resp := <-req.resp
|
|
|
|
return resp.tx, resp.err
|
|
|
|
}
|
|
|
|
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
type (
|
|
|
|
unlockRequest struct {
|
|
|
|
passphrase []byte
|
|
|
|
timeout time.Duration // Zero value prevents the timeout.
|
|
|
|
err chan error
|
|
|
|
}
|
|
|
|
|
|
|
|
changePassphraseRequest struct {
|
|
|
|
old, new []byte
|
|
|
|
err chan error
|
|
|
|
}
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// HeldUnlock is a tool to prevent the wallet from automatically
|
|
|
|
// locking after some timeout before an operation which needed
|
|
|
|
// the unlocked wallet has finished. Any aquired HeldUnlock
|
|
|
|
// *must* be released (preferably with a defer) or the wallet
|
|
|
|
// will forever remain unlocked.
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
HeldUnlock chan struct{}
|
|
|
|
)
|
|
|
|
|
|
|
|
// keystoreLocker manages the locked/unlocked state of a wallet.
|
|
|
|
func (w *Wallet) keystoreLocker() {
|
|
|
|
var timeout <-chan time.Time
|
|
|
|
holdChan := make(HeldUnlock)
|
|
|
|
out:
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case req := <-w.unlockRequests:
|
|
|
|
err := w.KeyStore.Unlock(req.passphrase)
|
|
|
|
if err != nil {
|
|
|
|
req.err <- err
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
w.notifyLockStateChange(false)
|
|
|
|
if req.timeout == 0 {
|
|
|
|
timeout = nil
|
|
|
|
} else {
|
|
|
|
timeout = time.After(req.timeout)
|
|
|
|
}
|
|
|
|
req.err <- nil
|
|
|
|
continue
|
|
|
|
|
|
|
|
case req := <-w.changePassphrase:
|
|
|
|
// Changing the passphrase requires an unlocked
|
|
|
|
// keystore, and for the old passphrase to be correct.
|
|
|
|
// Lock the keystore and unlock with the old passphase
|
|
|
|
// check its validity.
|
|
|
|
_ = w.KeyStore.Lock()
|
|
|
|
w.notifyLockStateChange(true)
|
|
|
|
timeout = nil
|
|
|
|
err := w.KeyStore.Unlock(req.old)
|
|
|
|
if err == nil {
|
|
|
|
w.notifyLockStateChange(false)
|
|
|
|
err = w.KeyStore.ChangePassphrase(req.new)
|
|
|
|
}
|
|
|
|
req.err <- err
|
|
|
|
continue
|
|
|
|
|
|
|
|
case req := <-w.holdUnlockRequests:
|
|
|
|
if w.KeyStore.IsLocked() {
|
|
|
|
close(req)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
req <- holdChan
|
|
|
|
<-holdChan // Block until the lock is released.
|
|
|
|
|
|
|
|
// If, after holding onto the unlocked wallet for some
|
|
|
|
// time, the timeout has expired, lock it now instead
|
|
|
|
// of hoping it gets unlocked next time the top level
|
|
|
|
// select runs.
|
|
|
|
select {
|
|
|
|
case <-timeout:
|
|
|
|
// Let the top level select fallthrough so the
|
|
|
|
// wallet is locked.
|
|
|
|
default:
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
case w.lockState <- w.KeyStore.IsLocked():
|
|
|
|
continue
|
|
|
|
|
|
|
|
case <-w.quit:
|
|
|
|
break out
|
|
|
|
|
|
|
|
case <-w.lockRequests:
|
|
|
|
case <-timeout:
|
|
|
|
}
|
|
|
|
|
|
|
|
// Select statement fell through by an explicit lock or the
|
|
|
|
// timer expiring. Lock the keystores here.
|
|
|
|
timeout = nil
|
|
|
|
if err := w.KeyStore.Lock(); err != nil {
|
|
|
|
log.Errorf("Could not lock wallet: %v", err)
|
|
|
|
}
|
|
|
|
w.notifyLockStateChange(true)
|
|
|
|
}
|
|
|
|
w.wg.Done()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Unlock unlocks the wallet's keystore and locks the wallet again after
|
|
|
|
// timeout has expired. If the wallet is already unlocked and the new
|
|
|
|
// passphrase is correct, the current timeout is replaced with the new one.
|
|
|
|
func (w *Wallet) Unlock(passphrase []byte, timeout time.Duration) error {
|
|
|
|
err := make(chan error, 1)
|
|
|
|
w.unlockRequests <- unlockRequest{
|
|
|
|
passphrase: passphrase,
|
|
|
|
timeout: timeout,
|
|
|
|
err: err,
|
|
|
|
}
|
|
|
|
return <-err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Lock locks the wallet's keystore.
|
|
|
|
func (w *Wallet) Lock() {
|
|
|
|
w.lockRequests <- struct{}{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Locked returns whether the keystore for a wallet is locked.
|
|
|
|
func (w *Wallet) Locked() bool {
|
|
|
|
return <-w.lockState
|
|
|
|
}
|
|
|
|
|
2015-02-06 06:12:48 +01:00
|
|
|
// HoldUnlock prevents the wallet from being locked. The HeldUnlock object
|
|
|
|
// *must* be released, or the wallet will forever remain unlocked.
|
|
|
|
//
|
|
|
|
// TODO: To prevent the above scenario, perhaps closures should be passed
|
|
|
|
// to the walletLocker goroutine and disallow callers from explicitly
|
|
|
|
// handling the locking mechanism.
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
func (w *Wallet) HoldUnlock() (HeldUnlock, error) {
|
|
|
|
req := make(chan HeldUnlock)
|
|
|
|
w.holdUnlockRequests <- req
|
|
|
|
hl, ok := <-req
|
|
|
|
if !ok {
|
|
|
|
return nil, keystore.ErrLocked
|
|
|
|
}
|
|
|
|
return hl, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Release releases the hold on the unlocked-state of the wallet and allows the
|
|
|
|
// wallet to be locked again. If a lock timeout has already expired, the
|
|
|
|
// wallet is locked again as soon as Release is called.
|
|
|
|
func (c HeldUnlock) Release() {
|
|
|
|
c <- struct{}{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ChangePassphrase attempts to change the passphrase for a wallet from old
|
|
|
|
// to new. Changing the passphrase is synchronized with all other keystore
|
|
|
|
// locking and unlocking, and will result in a locked wallet on success.
|
|
|
|
func (w *Wallet) ChangePassphrase(old, new []byte) error {
|
|
|
|
err := make(chan error, 1)
|
|
|
|
w.changePassphrase <- changePassphraseRequest{
|
|
|
|
old: old,
|
|
|
|
new: new,
|
|
|
|
err: err,
|
|
|
|
}
|
|
|
|
return <-err
|
|
|
|
}
|
|
|
|
|
|
|
|
// diskWriter periodically (every 10 seconds) writes out the key and transaction
|
|
|
|
// stores to disk if they are marked dirty. On shutdown,
|
|
|
|
func (w *Wallet) diskWriter() {
|
|
|
|
ticker := time.NewTicker(10 * time.Second)
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
var done bool
|
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-ticker.C:
|
|
|
|
case <-w.quit:
|
|
|
|
done = true
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Trace("Writing wallet files")
|
|
|
|
|
|
|
|
wg.Add(2)
|
|
|
|
go func() {
|
|
|
|
err := w.KeyStore.WriteIfDirty()
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf("Cannot write keystore: %v",
|
|
|
|
err)
|
|
|
|
}
|
|
|
|
wg.Done()
|
|
|
|
}()
|
|
|
|
go func() {
|
|
|
|
err := w.TxStore.WriteIfDirty()
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf("Cannot write txstore: %v",
|
|
|
|
err)
|
|
|
|
}
|
|
|
|
wg.Done()
|
|
|
|
}()
|
|
|
|
wg.Wait()
|
|
|
|
|
|
|
|
if done {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
w.wg.Done()
|
|
|
|
}
|
|
|
|
|
|
|
|
// AddressUsed returns whether there are any recorded transactions spending to
|
|
|
|
// a given address. Assumming correct TxStore usage, this will return true iff
|
|
|
|
// there are any transactions with outputs to this address in the blockchain or
|
|
|
|
// the btcd mempool.
|
|
|
|
func (w *Wallet) AddressUsed(addr btcutil.Address) bool {
|
|
|
|
// This not only can be optimized by recording this data as it is
|
|
|
|
// read when opening a wallet, and keeping it up to date each time a
|
|
|
|
// new received tx arrives, but it probably should in case an address is
|
|
|
|
// used in a tx (made public) but the tx is eventually removed from the
|
|
|
|
// store (consider a chain reorg).
|
|
|
|
|
|
|
|
for _, r := range w.TxStore.Records() {
|
|
|
|
for _, c := range r.Credits() {
|
|
|
|
// Errors don't matter here. If addrs is nil, the
|
|
|
|
// range below does nothing.
|
|
|
|
_, addrs, _, _ := c.Addresses(activeNet.Params)
|
|
|
|
for _, a := range addrs {
|
|
|
|
if addr.String() == a.String() {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// CalculateBalance sums the amounts of all unspent transaction
|
|
|
|
// outputs to addresses of a wallet and returns the balance.
|
|
|
|
//
|
|
|
|
// If confirmations is 0, all UTXOs, even those not present in a
|
|
|
|
// block (height -1), will be used to get the balance. Otherwise,
|
|
|
|
// a UTXO must be in a block. If confirmations is 1 or greater,
|
|
|
|
// the balance will be calculated based on how many how many blocks
|
|
|
|
// include a UTXO.
|
|
|
|
func (w *Wallet) CalculateBalance(confirms int) (btcutil.Amount, error) {
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return w.TxStore.Balance(confirms, bs.Height)
|
|
|
|
}
|
|
|
|
|
|
|
|
// CurrentAddress gets the most recently requested Bitcoin payment address
|
|
|
|
// from a wallet. If the address has already been used (there is at least
|
|
|
|
// one transaction spending to it in the blockchain or btcd mempool), the next
|
|
|
|
// chained address is returned.
|
|
|
|
func (w *Wallet) CurrentAddress() (btcutil.Address, error) {
|
|
|
|
addr := w.KeyStore.LastChainedAddress()
|
|
|
|
|
|
|
|
// Get next chained address if the last one has already been used.
|
|
|
|
if w.AddressUsed(addr) {
|
|
|
|
return w.NewAddress()
|
|
|
|
}
|
|
|
|
|
|
|
|
return addr, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListSinceBlock returns a slice of objects with details about transactions
|
|
|
|
// since the given block. If the block is -1 then all transactions are included.
|
|
|
|
// This is intended to be used for listsinceblock RPC replies.
|
|
|
|
func (w *Wallet) ListSinceBlock(since, curBlockHeight int32,
|
|
|
|
minconf int) ([]btcjson.ListTransactionsResult, error) {
|
|
|
|
|
|
|
|
txList := []btcjson.ListTransactionsResult{}
|
|
|
|
for _, txRecord := range w.TxStore.Records() {
|
|
|
|
// Transaction records must only be considered if they occur
|
|
|
|
// after the block height since.
|
|
|
|
if since != -1 && txRecord.BlockHeight <= since {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Transactions that have not met minconf confirmations are to
|
|
|
|
// be ignored.
|
|
|
|
if !txRecord.Confirmed(minconf, curBlockHeight) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
jsonResults, err := txRecord.ToJSON("", curBlockHeight,
|
|
|
|
w.KeyStore.Net())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
txList = append(txList, jsonResults...)
|
|
|
|
}
|
|
|
|
|
|
|
|
return txList, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListTransactions returns a slice of objects with details about a recorded
|
|
|
|
// transaction. This is intended to be used for listtransactions RPC
|
|
|
|
// replies.
|
|
|
|
func (w *Wallet) ListTransactions(from, count int) ([]btcjson.ListTransactionsResult, error) {
|
|
|
|
txList := []btcjson.ListTransactionsResult{}
|
|
|
|
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return txList, err
|
|
|
|
}
|
|
|
|
|
|
|
|
records := w.TxStore.Records()
|
|
|
|
lastLookupIdx := len(records) - count
|
|
|
|
// Search in reverse order: lookup most recently-added first.
|
|
|
|
for i := len(records) - 1; i >= from && i >= lastLookupIdx; i-- {
|
|
|
|
jsonResults, err := records[i].ToJSON("", bs.Height,
|
|
|
|
w.KeyStore.Net())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
txList = append(txList, jsonResults...)
|
|
|
|
}
|
|
|
|
|
|
|
|
return txList, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListAddressTransactions returns a slice of objects with details about
|
|
|
|
// recorded transactions to or from any address belonging to a set. This is
|
|
|
|
// intended to be used for listaddresstransactions RPC replies.
|
|
|
|
func (w *Wallet) ListAddressTransactions(pkHashes map[string]struct{}) (
|
|
|
|
[]btcjson.ListTransactionsResult, error) {
|
|
|
|
|
|
|
|
txList := []btcjson.ListTransactionsResult{}
|
|
|
|
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return txList, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, r := range w.TxStore.Records() {
|
|
|
|
for _, c := range r.Credits() {
|
|
|
|
// We only care about the case where len(addrs) == 1,
|
|
|
|
// and err will never be non-nil in that case.
|
|
|
|
_, addrs, _, _ := c.Addresses(activeNet.Params)
|
|
|
|
if len(addrs) != 1 {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
apkh, ok := addrs[0].(*btcutil.AddressPubKeyHash)
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, ok := pkHashes[string(apkh.ScriptAddress())]; !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
jsonResult, err := c.ToJSON("", bs.Height,
|
|
|
|
w.KeyStore.Net())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
txList = append(txList, jsonResult)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return txList, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListAllTransactions returns a slice of objects with details about a recorded
|
|
|
|
// transaction. This is intended to be used for listalltransactions RPC
|
|
|
|
// replies.
|
|
|
|
func (w *Wallet) ListAllTransactions() ([]btcjson.ListTransactionsResult, error) {
|
|
|
|
txList := []btcjson.ListTransactionsResult{}
|
|
|
|
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return txList, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Search in reverse order: lookup most recently-added first.
|
|
|
|
records := w.TxStore.Records()
|
|
|
|
for i := len(records) - 1; i >= 0; i-- {
|
|
|
|
jsonResults, err := records[i].ToJSON("", bs.Height,
|
|
|
|
w.KeyStore.Net())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
txList = append(txList, jsonResults...)
|
|
|
|
}
|
|
|
|
|
|
|
|
return txList, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ListUnspent returns a slice of objects representing the unspent wallet
|
|
|
|
// transactions fitting the given criteria. The confirmations will be more than
|
|
|
|
// minconf, less than maxconf and if addresses is populated only the addresses
|
|
|
|
// contained within it will be considered. If we know nothing about a
|
|
|
|
// transaction an empty array will be returned.
|
|
|
|
func (w *Wallet) ListUnspent(minconf, maxconf int,
|
|
|
|
addresses map[string]bool) ([]*btcjson.ListUnspentResult, error) {
|
|
|
|
|
|
|
|
results := []*btcjson.ListUnspentResult{}
|
|
|
|
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return results, err
|
|
|
|
}
|
|
|
|
|
|
|
|
filter := len(addresses) != 0
|
|
|
|
|
|
|
|
unspent, err := w.TxStore.SortedUnspentOutputs()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, credit := range unspent {
|
|
|
|
confs := credit.Confirmations(bs.Height)
|
|
|
|
if int(confs) < minconf || int(confs) > maxconf {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if credit.IsCoinbase() {
|
2015-01-30 23:30:16 +01:00
|
|
|
if !credit.Confirmed(blockchain.CoinbaseMaturity, bs.Height) {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if w.LockedOutpoint(*credit.OutPoint()) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
_, addrs, _, _ := credit.Addresses(activeNet.Params)
|
|
|
|
if filter {
|
|
|
|
for _, addr := range addrs {
|
|
|
|
_, ok := addresses[addr.EncodeAddress()]
|
|
|
|
if ok {
|
|
|
|
goto include
|
|
|
|
}
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
include:
|
|
|
|
result := &btcjson.ListUnspentResult{
|
|
|
|
TxId: credit.Tx().Sha().String(),
|
|
|
|
Vout: credit.OutputIndex,
|
|
|
|
Account: "",
|
|
|
|
ScriptPubKey: hex.EncodeToString(credit.TxOut().PkScript),
|
|
|
|
Amount: credit.Amount().ToUnit(btcutil.AmountBTC),
|
|
|
|
Confirmations: int64(confs),
|
|
|
|
}
|
|
|
|
|
|
|
|
// BUG: this should be a JSON array so that all
|
|
|
|
// addresses can be included, or removed (and the
|
|
|
|
// caller extracts addresses from the pkScript).
|
|
|
|
if len(addrs) > 0 {
|
|
|
|
result.Address = addrs[0].EncodeAddress()
|
|
|
|
}
|
|
|
|
|
|
|
|
results = append(results, result)
|
|
|
|
}
|
|
|
|
|
|
|
|
return results, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// DumpPrivKeys returns the WIF-encoded private keys for all addresses with
|
|
|
|
// private keys in a wallet.
|
|
|
|
func (w *Wallet) DumpPrivKeys() ([]string, error) {
|
|
|
|
// Iterate over each active address, appending the private
|
|
|
|
// key to privkeys.
|
|
|
|
privkeys := []string{}
|
|
|
|
for _, info := range w.KeyStore.ActiveAddresses() {
|
|
|
|
// Only those addresses with keys needed.
|
|
|
|
pka, ok := info.(keystore.PubKeyAddress)
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
wif, err := pka.ExportPrivKey()
|
|
|
|
if err != nil {
|
|
|
|
// It would be nice to zero out the array here. However,
|
|
|
|
// since strings in go are immutable, and we have no
|
|
|
|
// control over the caller I don't think we can. :(
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
privkeys = append(privkeys, wif.String())
|
|
|
|
}
|
|
|
|
|
|
|
|
return privkeys, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// DumpWIFPrivateKey returns the WIF encoded private key for a
|
|
|
|
// single wallet address.
|
|
|
|
func (w *Wallet) DumpWIFPrivateKey(addr btcutil.Address) (string, error) {
|
|
|
|
// Get private key from wallet if it exists.
|
|
|
|
address, err := w.KeyStore.Address(addr)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
pka, ok := address.(keystore.PubKeyAddress)
|
|
|
|
if !ok {
|
|
|
|
return "", fmt.Errorf("address %s is not a key type", addr)
|
|
|
|
}
|
|
|
|
|
|
|
|
wif, err := pka.ExportPrivKey()
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return wif.String(), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ImportPrivateKey imports a private key to the wallet and writes the new
|
|
|
|
// wallet to disk.
|
|
|
|
func (w *Wallet) ImportPrivateKey(wif *btcutil.WIF, bs *keystore.BlockStamp,
|
|
|
|
rescan bool) (string, error) {
|
|
|
|
|
|
|
|
// Attempt to import private key into wallet.
|
|
|
|
addr, err := w.KeyStore.ImportPrivateKey(wif, bs)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Immediately write wallet to disk.
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
if err := w.KeyStore.WriteIfDirty(); err != nil {
|
|
|
|
return "", fmt.Errorf("cannot write key: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rescan blockchain for transactions with txout scripts paying to the
|
|
|
|
// imported address.
|
|
|
|
if rescan {
|
|
|
|
job := &RescanJob{
|
|
|
|
Addrs: []btcutil.Address{addr},
|
|
|
|
OutPoints: nil,
|
|
|
|
BlockStamp: keystore.BlockStamp{
|
|
|
|
Hash: activeNet.Params.GenesisHash,
|
|
|
|
Height: 0,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// Submit rescan job and log when the import has completed.
|
|
|
|
// Do not block on finishing the rescan. The rescan success
|
|
|
|
// or failure is logged elsewhere, and the channel is not
|
|
|
|
// required to be read, so discard the return value.
|
|
|
|
_ = w.SubmitRescan(job)
|
|
|
|
}
|
|
|
|
|
|
|
|
addrStr := addr.EncodeAddress()
|
|
|
|
log.Infof("Imported payment address %s", addrStr)
|
|
|
|
|
|
|
|
// Return the payment address string of the imported private key.
|
|
|
|
return addrStr, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ExportWatchingWallet returns the watching-only copy of a wallet. Both wallets
|
|
|
|
// share the same tx store, so locking one will lock the other as well. The
|
|
|
|
// returned wallet should be serialized and exported quickly, and then dropped
|
|
|
|
// from scope.
|
|
|
|
func (w *Wallet) ExportWatchingWallet() (*Wallet, error) {
|
|
|
|
ww, err := w.KeyStore.ExportWatchingWallet()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
wa := *w
|
|
|
|
wa.KeyStore = ww
|
|
|
|
return &wa, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// exportBase64 exports a wallet's serialized key, and tx stores as
|
|
|
|
// base64-encoded values in a map.
|
|
|
|
func (w *Wallet) exportBase64() (map[string]string, error) {
|
|
|
|
buf := bytes.Buffer{}
|
|
|
|
m := make(map[string]string)
|
|
|
|
|
|
|
|
_, err := w.KeyStore.WriteTo(&buf)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
m["wallet"] = base64.StdEncoding.EncodeToString(buf.Bytes())
|
|
|
|
buf.Reset()
|
|
|
|
|
|
|
|
if _, err = w.TxStore.WriteTo(&buf); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
m["tx"] = base64.StdEncoding.EncodeToString(buf.Bytes())
|
|
|
|
buf.Reset()
|
|
|
|
|
|
|
|
return m, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// LockedOutpoint returns whether an outpoint has been marked as locked and
|
|
|
|
// should not be used as an input for created transactions.
|
2015-02-05 22:41:38 +01:00
|
|
|
func (w *Wallet) LockedOutpoint(op wire.OutPoint) bool {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
_, locked := w.lockedOutpoints[op]
|
|
|
|
return locked
|
|
|
|
}
|
|
|
|
|
|
|
|
// LockOutpoint marks an outpoint as locked, that is, it should not be used as
|
|
|
|
// an input for newly created transactions.
|
2015-02-05 22:41:38 +01:00
|
|
|
func (w *Wallet) LockOutpoint(op wire.OutPoint) {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
w.lockedOutpoints[op] = struct{}{}
|
|
|
|
}
|
|
|
|
|
|
|
|
// UnlockOutpoint marks an outpoint as unlocked, that is, it may be used as an
|
|
|
|
// input for newly created transactions.
|
2015-02-05 22:41:38 +01:00
|
|
|
func (w *Wallet) UnlockOutpoint(op wire.OutPoint) {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
delete(w.lockedOutpoints, op)
|
|
|
|
}
|
|
|
|
|
|
|
|
// ResetLockedOutpoints resets the set of locked outpoints so all may be used
|
|
|
|
// as inputs for new transactions.
|
|
|
|
func (w *Wallet) ResetLockedOutpoints() {
|
2015-02-05 22:41:38 +01:00
|
|
|
w.lockedOutpoints = map[wire.OutPoint]struct{}{}
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// LockedOutpoints returns a slice of currently locked outpoints. This is
|
|
|
|
// intended to be used by marshaling the result as a JSON array for
|
|
|
|
// listlockunspent RPC results.
|
|
|
|
func (w *Wallet) LockedOutpoints() []btcjson.TransactionInput {
|
|
|
|
locked := make([]btcjson.TransactionInput, len(w.lockedOutpoints))
|
|
|
|
i := 0
|
|
|
|
for op := range w.lockedOutpoints {
|
|
|
|
locked[i] = btcjson.TransactionInput{
|
|
|
|
Txid: op.Hash.String(),
|
|
|
|
Vout: op.Index,
|
|
|
|
}
|
|
|
|
i++
|
|
|
|
}
|
|
|
|
return locked
|
|
|
|
}
|
|
|
|
|
|
|
|
// ResendUnminedTxs iterates through all transactions that spend from wallet
|
|
|
|
// credits that are not known to have been mined into a block, and attempts
|
|
|
|
// to send each to the chain server for relay.
|
|
|
|
func (w *Wallet) ResendUnminedTxs() {
|
|
|
|
txs := w.TxStore.UnminedDebitTxs()
|
|
|
|
for _, tx := range txs {
|
|
|
|
_, err := w.chainSvr.SendRawTransaction(tx.MsgTx(), false)
|
|
|
|
if err != nil {
|
|
|
|
// TODO(jrick): Check error for if this tx is a double spend,
|
|
|
|
// remove it if so.
|
|
|
|
log.Debugf("Could not resend transaction %v: %v",
|
|
|
|
tx.Sha(), err)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
log.Debugf("Resent unmined transaction %v", tx.Sha())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// SortedActivePaymentAddresses returns a slice of all active payment
|
|
|
|
// addresses in a wallet.
|
|
|
|
func (w *Wallet) SortedActivePaymentAddresses() []string {
|
|
|
|
infos := w.KeyStore.SortedActiveAddresses()
|
|
|
|
|
|
|
|
addrs := make([]string, len(infos))
|
|
|
|
for i, info := range infos {
|
|
|
|
addrs[i] = info.Address().EncodeAddress()
|
|
|
|
}
|
|
|
|
|
|
|
|
return addrs
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewAddress returns the next chained address for a wallet.
|
|
|
|
func (w *Wallet) NewAddress() (btcutil.Address, error) {
|
|
|
|
// Get current block's height and hash.
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get next address from wallet.
|
|
|
|
addr, err := w.KeyStore.NextChainedAddress(bs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Immediately write updated wallet to disk.
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
if err := w.KeyStore.WriteIfDirty(); err != nil {
|
|
|
|
return nil, fmt.Errorf("key write failed: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Request updates from btcd for new transactions sent to this address.
|
|
|
|
if err := w.chainSvr.NotifyReceived([]btcutil.Address{addr}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return addr, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewChangeAddress returns a new change address for a wallet.
|
|
|
|
func (w *Wallet) NewChangeAddress() (btcutil.Address, error) {
|
|
|
|
// Get current block's height and hash.
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get next chained change address from wallet.
|
|
|
|
addr, err := w.KeyStore.ChangeAddress(bs)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Immediately write updated wallet to disk.
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
if err := w.KeyStore.WriteIfDirty(); err != nil {
|
|
|
|
return nil, fmt.Errorf("key write failed: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Request updates from btcd for new transactions sent to this address.
|
|
|
|
if err := w.chainSvr.NotifyReceived([]btcutil.Address{addr}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return addr, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// RecoverAddresses recovers the next n chained addresses of a wallet.
|
|
|
|
func (w *Wallet) RecoverAddresses(n int) error {
|
|
|
|
// Get info on the last chained address. The rescan starts at the
|
|
|
|
// earliest block height the last chained address might appear at.
|
|
|
|
last := w.KeyStore.LastChainedAddress()
|
|
|
|
lastInfo, err := w.KeyStore.Address(last)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
addrs, err := w.KeyStore.ExtendActiveAddresses(n)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine the block necesary to start the rescan.
|
|
|
|
height := lastInfo.FirstBlock()
|
|
|
|
// TODO: fix our "synced to block" handling (either in
|
|
|
|
// keystore or txstore, or elsewhere) so this *always*
|
|
|
|
// returns the block hash. Looking it up by height is
|
|
|
|
// asking for problems.
|
|
|
|
hash, err := w.chainSvr.GetBlockHash(int64(height))
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run a goroutine to rescan blockchain for recovered addresses.
|
|
|
|
job := &RescanJob{
|
|
|
|
Addrs: addrs,
|
|
|
|
OutPoints: nil,
|
|
|
|
BlockStamp: keystore.BlockStamp{
|
|
|
|
Hash: hash,
|
|
|
|
Height: height,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
// Begin rescan and do not wait for it to finish. Because the success
|
|
|
|
// or failure of the rescan is logged elsewhere and the returned channel
|
|
|
|
// does not need to be read, ignore the return value.
|
|
|
|
_ = w.SubmitRescan(job)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// TotalReceived iterates through a wallet's transaction history, returning the
|
|
|
|
// total amount of bitcoins received for any wallet address. Amounts received
|
|
|
|
// through multisig transactions are ignored.
|
|
|
|
func (w *Wallet) TotalReceived(confirms int) (btcutil.Amount, error) {
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var amount btcutil.Amount
|
|
|
|
for _, r := range w.TxStore.Records() {
|
|
|
|
for _, c := range r.Credits() {
|
|
|
|
// Ignore change.
|
|
|
|
if c.Change() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tally if the appropiate number of block confirmations have passed.
|
|
|
|
if c.Confirmed(confirms, bs.Height) {
|
|
|
|
amount += c.Amount()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return amount, nil
|
|
|
|
}
|
|
|
|
|
2014-09-02 20:54:56 +02:00
|
|
|
// TotalReceivedForAddr iterates through a wallet's transaction history,
|
|
|
|
// returning the total amount of bitcoins received for a single wallet
|
|
|
|
// address.
|
|
|
|
func (w *Wallet) TotalReceivedForAddr(addr btcutil.Address, confirms int) (btcutil.Amount, error) {
|
|
|
|
bs, err := w.SyncedChainTip()
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
addrStr := addr.EncodeAddress()
|
|
|
|
var amount btcutil.Amount
|
|
|
|
for _, r := range w.TxStore.Records() {
|
|
|
|
for _, c := range r.Credits() {
|
|
|
|
if !c.Confirmed(confirms, bs.Height) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
_, addrs, _, err := c.Addresses(activeNet.Params)
|
|
|
|
// An error creating addresses from the output script only
|
|
|
|
// indicates a non-standard script, so ignore this credit.
|
|
|
|
if err != nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
for _, a := range addrs {
|
|
|
|
if addrStr == a.EncodeAddress() {
|
|
|
|
amount += c.Amount()
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return amount, nil
|
|
|
|
}
|
|
|
|
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
// TxRecord iterates through all transaction records saved in the store,
|
|
|
|
// returning the first with an equivalent transaction hash.
|
2015-02-05 22:41:38 +01:00
|
|
|
func (w *Wallet) TxRecord(txSha *wire.ShaHash) (r *txstore.TxRecord, ok bool) {
|
Remove account support, fix races on btcd connect.
This commit is the result of several big changes being made to the
wallet. In particular, the "handshake" (initial sync to the chain
server) was quite racy and required proper synchronization. To make
fixing this race easier, several other changes were made to the
internal wallet data structures and much of the RPC server ended up
being rewritten.
First, all account support has been removed. The previous Account
struct has been replaced with a Wallet structure, which includes a
keystore for saving keys, and a txstore for storing relevant
transactions. This decision has been made since it is the opinion of
myself and other developers that bitcoind accounts are fundamentally
broken (as accounts implemented by bitcoind support both arbitrary
address groupings as well as moving balances between accounts -- these
are fundamentally incompatible features), and since a BIP0032 keystore
is soon planned to be implemented (at which point, "accounts" can
return as HD extended keys). With the keystore handling the grouping
of related keys, there is no reason have many different Account
structs, and the AccountManager has been removed as well. All RPC
handlers that take an account option will only work with "" (the
default account) or "*" if the RPC allows specifying all accounts.
Second, much of the RPC server has been cleaned up. The global
variables for the RPC server and chain server client have been moved
to part of the rpcServer struct, and the handlers for each RPC method
that are looked up change depending on which components have been set.
Passthrough requests are also no longer handled specially, but when
the chain server is set, a handler to perform the passthrough will be
returned if the method is not otherwise a wallet RPC. The
notification system for websocket clients has also been rewritten so
wallet components can send notifications through channels, rather than
requiring direct access to the RPC server itself, or worse still,
sending directly to a websocket client's send channel. In the future,
this will enable proper registration of notifications, rather than
unsolicited broadcasts to every connected websocket client (see
issue #84).
Finally, and the main reason why much of this cleanup was necessary,
the races during intial sync with the chain server have been fixed.
Previously, when the 'Handshake' was run, a rescan would occur which
would perform modifications to Account data structures as
notifications were received. Synchronization was provided with a
single binary semaphore which serialized all access to wallet and
account data. However, the Handshake itself was not able to run with
this lock (or else notifications would block), and many data races
would occur as both notifications were being handled. If GOMAXPROCS
was ever increased beyond 1, btcwallet would always immediately crash
due to invalid addresses caused by the data races on startup. To fix
this, the single lock for all wallet access has been replaced with
mutexes for both the keystore and txstore. Handling of btcd
notifications and client requests may now occur simultaneously.
GOMAXPROCS has also been set to the number of logical CPUs at the
beginning of main, since with the data races fixed, there's no reason
to prevent the extra parallelism gained by increasing it.
Closes #78.
Closes #101.
Closes #110.
2014-07-09 05:17:38 +02:00
|
|
|
for _, r = range w.TxStore.Records() {
|
|
|
|
if *r.Tx().Sha() == *txSha {
|
|
|
|
return r, true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil, false
|
|
|
|
}
|