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 (
|
2015-01-30 19:31:29 +01:00
|
|
|
"github.com/btcsuite/btcd/txscript"
|
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
|
|
|
)
|
|
|
|
|
|
|
|
func (w *Wallet) handleChainNotifications() {
|
|
|
|
for n := range w.chainSvr.Notifications() {
|
|
|
|
var err error
|
|
|
|
switch n := n.(type) {
|
|
|
|
case chain.BlockConnected:
|
|
|
|
w.connectBlock(keystore.BlockStamp(n))
|
|
|
|
case chain.BlockDisconnected:
|
|
|
|
w.disconnectBlock(keystore.BlockStamp(n))
|
|
|
|
case chain.RecvTx:
|
|
|
|
err = w.addReceivedTx(n.Tx, n.Block)
|
|
|
|
case chain.RedeemingTx:
|
|
|
|
err = w.addRedeemingTx(n.Tx, n.Block)
|
|
|
|
|
|
|
|
// The following are handled by the wallet's rescan
|
|
|
|
// goroutines, so just pass them there.
|
|
|
|
case *chain.RescanProgress, *chain.RescanFinished:
|
|
|
|
w.rescanNotifications <- n
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf("Cannot handle chain server "+
|
|
|
|
"notification: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
w.wg.Done()
|
|
|
|
}
|
|
|
|
|
|
|
|
// connectBlock handles a chain server notification by marking a wallet
|
|
|
|
// that's currently in-sync with the chain server as being synced up to
|
|
|
|
// the passed block.
|
|
|
|
func (w *Wallet) connectBlock(bs keystore.BlockStamp) {
|
|
|
|
if !w.ChainSynced() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
w.KeyStore.SetSyncedWith(&bs)
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
w.notifyConnectedBlock(bs)
|
|
|
|
|
|
|
|
w.notifyBalances(bs.Height)
|
|
|
|
}
|
|
|
|
|
|
|
|
// disconnectBlock handles a chain server reorganize by rolling back all
|
|
|
|
// block history from the reorged block for a wallet in-sync with the chain
|
|
|
|
// server.
|
|
|
|
func (w *Wallet) disconnectBlock(bs keystore.BlockStamp) {
|
|
|
|
if !w.ChainSynced() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Disconnect the last seen block from the keystore if it
|
|
|
|
// matches the removed block.
|
|
|
|
iter := w.KeyStore.NewIterateRecentBlocks()
|
|
|
|
if iter != nil && *iter.BlockStamp().Hash == *bs.Hash {
|
|
|
|
if iter.Prev() {
|
|
|
|
prev := iter.BlockStamp()
|
|
|
|
w.KeyStore.SetSyncedWith(&prev)
|
|
|
|
} else {
|
|
|
|
w.KeyStore.SetSyncedWith(nil)
|
|
|
|
}
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
}
|
|
|
|
w.notifyDisconnectedBlock(bs)
|
|
|
|
|
|
|
|
w.notifyBalances(bs.Height - 1)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) addReceivedTx(tx *btcutil.Tx, block *txstore.Block) error {
|
|
|
|
// For every output, if it pays to a wallet address, insert the
|
|
|
|
// transaction into the store (possibly moving it from unconfirmed to
|
|
|
|
// confirmed), and add a credit record if one does not already exist.
|
|
|
|
var txr *txstore.TxRecord
|
|
|
|
txInserted := false
|
|
|
|
for txOutIdx, txOut := range tx.MsgTx().TxOut {
|
|
|
|
// Errors don't matter here. If addrs is nil, the range below
|
|
|
|
// does nothing.
|
2015-01-30 19:31:29 +01:00
|
|
|
_, addrs, _, _ := txscript.ExtractPkScriptAddrs(txOut.PkScript,
|
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
|
|
|
activeNet.Params)
|
|
|
|
insert := false
|
|
|
|
for _, addr := range addrs {
|
|
|
|
_, err := w.KeyStore.Address(addr)
|
|
|
|
if err == nil {
|
|
|
|
insert = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if insert {
|
|
|
|
if !txInserted {
|
|
|
|
var err error
|
|
|
|
txr, err = w.TxStore.InsertTx(tx, block)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
// InsertTx may have moved a previous unmined
|
|
|
|
// tx, so mark the entire store as dirty.
|
|
|
|
w.TxStore.MarkDirty()
|
|
|
|
txInserted = true
|
|
|
|
}
|
|
|
|
if txr.HasCredit(txOutIdx) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
_, err := txr.AddCredit(uint32(txOutIdx), false)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
w.TxStore.MarkDirty()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bs, err := w.chainSvr.BlockStamp()
|
|
|
|
if err == nil {
|
|
|
|
w.notifyBalances(bs.Height)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// addRedeemingTx inserts the notified spending transaction as a debit and
|
|
|
|
// schedules the transaction store for a future file write.
|
|
|
|
func (w *Wallet) addRedeemingTx(tx *btcutil.Tx, block *txstore.Block) error {
|
|
|
|
txr, err := w.TxStore.InsertTx(tx, block)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if _, err := txr.AddDebits(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
w.KeyStore.MarkDirty()
|
|
|
|
|
|
|
|
bs, err := w.chainSvr.BlockStamp()
|
|
|
|
if err == nil {
|
|
|
|
w.notifyBalances(bs.Height)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *Wallet) notifyBalances(curHeight int32) {
|
|
|
|
// Don't notify unless wallet is synced to the chain server.
|
|
|
|
if !w.ChainSynced() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Notify any potential changes to the balance.
|
|
|
|
confirmed, err := w.TxStore.Balance(1, curHeight)
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf("Cannot determine 1-conf balance: %v", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.notifyConfirmedBalance(confirmed)
|
|
|
|
unconfirmed, err := w.TxStore.Balance(0, curHeight)
|
|
|
|
if err != nil {
|
|
|
|
log.Errorf("Cannot determine 0-conf balance: %v", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.notifyUnconfirmedBalance(unconfirmed - confirmed)
|
|
|
|
}
|