b9fd527d33
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.
145 lines
4.1 KiB
Go
145 lines
4.1 KiB
Go
/*
|
|
* Copyright (c) 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 txstore
|
|
|
|
import (
|
|
"errors"
|
|
)
|
|
|
|
// 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")
|
|
|
|
type noopLocker struct{}
|
|
|
|
func (noopLocker) Lock() {}
|
|
func (noopLocker) Unlock() {}
|
|
|
|
func (s *Store) updateNotificationLock() {
|
|
switch {
|
|
case s.newCredit == nil:
|
|
fallthrough
|
|
case s.newDebits == nil:
|
|
fallthrough
|
|
case s.minedCredit == nil:
|
|
fallthrough
|
|
case s.minedDebits == nil:
|
|
return
|
|
}
|
|
s.notificationLock = noopLocker{}
|
|
}
|
|
|
|
// ListenNewCredits returns a channel that passes all Credits that are newly
|
|
// added to the transaction store. The channel must be read, or other
|
|
// transaction store methods will block.
|
|
//
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
func (s *Store) ListenNewCredits() (<-chan Credit, error) {
|
|
s.notificationLock.Lock()
|
|
defer s.notificationLock.Unlock()
|
|
|
|
if s.newCredit != nil {
|
|
return nil, ErrDuplicateListen
|
|
}
|
|
s.newCredit = make(chan Credit)
|
|
s.updateNotificationLock()
|
|
return s.newCredit, nil
|
|
}
|
|
|
|
// ListenNewDebits returns a channel that passes all Debits that are newly
|
|
// added to the transaction store. The channel must be read, or other
|
|
// transaction store methods will block.
|
|
//
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
func (s *Store) ListenNewDebits() (<-chan Debits, error) {
|
|
s.notificationLock.Lock()
|
|
defer s.notificationLock.Unlock()
|
|
|
|
if s.newDebits != nil {
|
|
return nil, ErrDuplicateListen
|
|
}
|
|
s.newDebits = make(chan Debits)
|
|
s.updateNotificationLock()
|
|
return s.newDebits, nil
|
|
}
|
|
|
|
// ListenMinedCredits returns a channel that passes all that are moved
|
|
// from unconfirmed to a newly attached block. The channel must be read, or
|
|
// other transaction store methods will block.
|
|
//
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
func (s *Store) ListenMinedCredits() (<-chan Credit, error) {
|
|
s.notificationLock.Lock()
|
|
defer s.notificationLock.Unlock()
|
|
|
|
if s.minedCredit != nil {
|
|
return nil, ErrDuplicateListen
|
|
}
|
|
s.minedCredit = make(chan Credit)
|
|
s.updateNotificationLock()
|
|
return s.minedCredit, nil
|
|
}
|
|
|
|
// ListenMinedDebits returns a channel that passes all Debits that are moved
|
|
// from unconfirmed to a newly attached block. The channel must be read, or
|
|
// other transaction store methods will block.
|
|
//
|
|
// If this is called twice, ErrDuplicateListen is returned.
|
|
func (s *Store) ListenMinedDebits() (<-chan Debits, error) {
|
|
s.notificationLock.Lock()
|
|
defer s.notificationLock.Unlock()
|
|
|
|
if s.minedDebits != nil {
|
|
return nil, ErrDuplicateListen
|
|
}
|
|
s.minedDebits = make(chan Debits)
|
|
s.updateNotificationLock()
|
|
return s.minedDebits, nil
|
|
}
|
|
|
|
func (s *Store) notifyNewCredit(c Credit) {
|
|
s.notificationLock.Lock()
|
|
if s.newCredit != nil {
|
|
s.newCredit <- c
|
|
}
|
|
s.notificationLock.Unlock()
|
|
}
|
|
|
|
func (s *Store) notifyNewDebits(d Debits) {
|
|
s.notificationLock.Lock()
|
|
if s.newDebits != nil {
|
|
s.newDebits <- d
|
|
}
|
|
s.notificationLock.Unlock()
|
|
}
|
|
|
|
func (s *Store) notifyMinedCredit(c Credit) {
|
|
s.notificationLock.Lock()
|
|
if s.minedCredit != nil {
|
|
s.minedCredit <- c
|
|
}
|
|
s.notificationLock.Unlock()
|
|
}
|
|
|
|
func (s *Store) notifyMinedDebits(d Debits) {
|
|
s.notificationLock.Lock()
|
|
if s.minedDebits != nil {
|
|
s.minedDebits <- d
|
|
}
|
|
s.notificationLock.Unlock()
|
|
}
|