2013-11-14 18:15:16 +01:00
|
|
|
/*
|
2014-01-03 19:34:37 +01:00
|
|
|
* Copyright (c) 2013, 2014 Conformal Systems LLC <info@conformal.com>
|
2013-11-14 18:15:16 +01:00
|
|
|
*
|
|
|
|
* 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"
|
Implement exporting a watching-only wallet.
This change allows for the use of watching-only wallets. Unlike
normal, "hot" wallets, watching-only wallets do not contain any
private keys, and can be used in situations where you want to keep one
wallet online to create new receiving addresses and watch for received
transactions, while keeping the hot wallet offline (possibly on an
air-gapped computer).
Two (websocket) extension RPC calls have been added:
First, exportwatchingwallet, which will export the current hot wallet
to a watching-only wallet, saving either to disk or returning the
base64-encoded wallet files to the caller.
Second, recoveraddresses, which is used to recover the next n
addresses from the address chain. This is used to "sync" a watching
wallet with the hot wallet, or vice versa.
2014-01-21 20:45:28 +01:00
|
|
|
"encoding/base64"
|
2013-11-20 02:18:11 +01:00
|
|
|
"errors"
|
2013-11-14 18:15:16 +01:00
|
|
|
"fmt"
|
|
|
|
"github.com/conformal/btcutil"
|
|
|
|
"github.com/conformal/btcwallet/tx"
|
|
|
|
"github.com/conformal/btcwallet/wallet"
|
|
|
|
"github.com/conformal/btcwire"
|
2013-12-02 20:56:06 +01:00
|
|
|
"path/filepath"
|
2013-11-14 18:15:16 +01:00
|
|
|
"sync"
|
|
|
|
)
|
|
|
|
|
2013-12-10 22:15:25 +01:00
|
|
|
// ErrNotFound describes an error where a map lookup failed due to a
|
|
|
|
// key not being in the map.
|
|
|
|
var ErrNotFound = errors.New("not found")
|
|
|
|
|
|
|
|
// addressAccountMap holds a map of addresses to names of the
|
|
|
|
// accounts that hold each address.
|
|
|
|
var addressAccountMap = struct {
|
|
|
|
sync.RWMutex
|
|
|
|
m map[string]string
|
|
|
|
}{
|
|
|
|
m: make(map[string]string),
|
|
|
|
}
|
|
|
|
|
|
|
|
// MarkAddressForAccount marks an address as belonging to an account.
|
|
|
|
func MarkAddressForAccount(address, account string) {
|
|
|
|
addressAccountMap.Lock()
|
|
|
|
addressAccountMap.m[address] = account
|
|
|
|
addressAccountMap.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
// LookupAccountByAddress returns the account name for address. error
|
|
|
|
// will be set to ErrNotFound if the address has not been marked as
|
|
|
|
// associated with any account.
|
|
|
|
func LookupAccountByAddress(address string) (string, error) {
|
|
|
|
addressAccountMap.RLock()
|
|
|
|
defer addressAccountMap.RUnlock()
|
|
|
|
account, ok := addressAccountMap.m[address]
|
|
|
|
if !ok {
|
|
|
|
return "", ErrNotFound
|
|
|
|
}
|
|
|
|
return account, nil
|
|
|
|
}
|
|
|
|
|
2013-11-14 18:15:16 +01:00
|
|
|
// Account is a structure containing all the components for a
|
|
|
|
// complete wallet. It contains the Armory-style wallet (to store
|
|
|
|
// addresses and keys), and tx and utxo data stores, along with locks
|
|
|
|
// to prevent against incorrect multiple access.
|
|
|
|
type Account struct {
|
|
|
|
*wallet.Wallet
|
2014-01-03 19:34:37 +01:00
|
|
|
mtx sync.RWMutex
|
|
|
|
name string
|
|
|
|
dirty bool
|
|
|
|
fullRescan bool
|
|
|
|
UtxoStore struct {
|
2013-11-14 18:15:16 +01:00
|
|
|
sync.RWMutex
|
|
|
|
dirty bool
|
|
|
|
s tx.UtxoStore
|
|
|
|
}
|
|
|
|
TxStore struct {
|
|
|
|
sync.RWMutex
|
|
|
|
dirty bool
|
|
|
|
s tx.TxStore
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-23 18:34:41 +01:00
|
|
|
// MarkDirtyWallet marks an account's wallet as dirty, and adds the
|
|
|
|
// account to the list of dirty accounts to be schedule to be synced to
|
|
|
|
// disk. It is a runtime error to call this without holding the wallet
|
|
|
|
// writer lock.
|
|
|
|
func (a *Account) MarkDirtyWallet() {
|
|
|
|
a.dirty = true
|
|
|
|
dirtyAccounts.Lock()
|
|
|
|
dirtyAccounts.m[a] = true
|
|
|
|
dirtyAccounts.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
// MarkDirtyUtxoStore marks an account's utxo store as dirty, and adds
|
|
|
|
// the account to the list of dirty accounts to be schedule to be synced to
|
|
|
|
// disk. It is a runtime error to call this without holding the utxo store
|
|
|
|
// writer lock.
|
|
|
|
func (a *Account) MarkDirtyUtxoStore() {
|
|
|
|
a.UtxoStore.dirty = true
|
|
|
|
dirtyAccounts.Lock()
|
|
|
|
dirtyAccounts.m[a] = true
|
|
|
|
dirtyAccounts.Unlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
// MarkDirtyTxStore marks an account's tx store as dirty, and adds the
|
|
|
|
// account to the list of dirty accounts to be schedule to be synced to
|
|
|
|
// disk. It is a runtime error to call this without holding the tx store
|
|
|
|
// writer lock.
|
|
|
|
func (a *Account) MarkDirtyTxStore() {
|
|
|
|
a.TxStore.dirty = true
|
|
|
|
dirtyAccounts.Lock()
|
|
|
|
dirtyAccounts.m[a] = true
|
|
|
|
dirtyAccounts.Unlock()
|
|
|
|
}
|
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// Lock locks the underlying wallet for an account.
|
|
|
|
func (a *Account) Lock() error {
|
|
|
|
a.mtx.Lock()
|
|
|
|
defer a.mtx.Unlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-12-13 17:00:31 +01:00
|
|
|
err := a.Wallet.Lock()
|
|
|
|
if err == nil {
|
|
|
|
NotifyWalletLockStateChange(a.Name(), true)
|
|
|
|
}
|
|
|
|
return err
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// Unlock unlocks the underlying wallet for an account.
|
|
|
|
func (a *Account) Unlock(passphrase []byte, timeout int64) error {
|
|
|
|
a.mtx.Lock()
|
|
|
|
defer a.mtx.Unlock()
|
|
|
|
|
2013-12-13 17:00:31 +01:00
|
|
|
err := a.Wallet.Unlock(passphrase)
|
|
|
|
if err == nil {
|
|
|
|
NotifyWalletLockStateChange(a.Name(), false)
|
|
|
|
}
|
2013-12-02 20:56:06 +01:00
|
|
|
return a.Wallet.Unlock(passphrase)
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Rollback reverts each stored Account to a state before the block
|
|
|
|
// with the passed chainheight and block hash was connected to the main
|
|
|
|
// chain. This is used to remove transactions and utxos for each wallet
|
|
|
|
// that occured on a chain no longer considered to be the main chain.
|
2013-11-15 17:44:24 +01:00
|
|
|
func (a *Account) Rollback(height int32, hash *btcwire.ShaHash) {
|
|
|
|
a.UtxoStore.Lock()
|
|
|
|
a.UtxoStore.dirty = a.UtxoStore.dirty || a.UtxoStore.s.Rollback(height, hash)
|
|
|
|
a.UtxoStore.Unlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-11-15 17:44:24 +01:00
|
|
|
a.TxStore.Lock()
|
|
|
|
a.TxStore.dirty = a.TxStore.dirty || a.TxStore.s.Rollback(height, hash)
|
|
|
|
a.TxStore.Unlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-11-15 17:44:24 +01:00
|
|
|
if err := a.writeDirtyToDisk(); err != nil {
|
2013-11-14 18:15:16 +01:00
|
|
|
log.Errorf("cannot sync dirty wallet: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-31 19:11:47 +01:00
|
|
|
// 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.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) AddressUsed(addr btcutil.Address) bool {
|
2013-12-31 19:11:47 +01:00
|
|
|
// This can be optimized by recording this data as it is read when
|
|
|
|
// opening an account, and keeping it up to date each time a new
|
|
|
|
// received tx arrives.
|
|
|
|
|
|
|
|
a.TxStore.RLock()
|
|
|
|
defer a.TxStore.RUnlock()
|
|
|
|
|
2014-01-06 18:24:29 +01:00
|
|
|
pkHash := addr.ScriptAddress()
|
|
|
|
|
2013-12-31 19:11:47 +01:00
|
|
|
for i := range a.TxStore.s {
|
|
|
|
rtx, ok := a.TxStore.s[i].(*tx.RecvTx)
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if bytes.Equal(rtx.ReceiverHash, pkHash) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2013-11-14 18:15:16 +01:00
|
|
|
// CalculateBalance sums the amounts of all unspent transaction
|
|
|
|
// outputs to addresses of a wallet and returns the balance as a
|
|
|
|
// float64.
|
|
|
|
//
|
|
|
|
// 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.
|
2013-11-15 17:44:24 +01:00
|
|
|
func (a *Account) CalculateBalance(confirms int) float64 {
|
2013-11-14 18:15:16 +01:00
|
|
|
var bal uint64 // Measured in satoshi
|
|
|
|
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if bs.Height == int32(btcutil.BlockHeightUnknown) || err != nil {
|
|
|
|
return 0.
|
|
|
|
}
|
|
|
|
|
2013-11-15 17:44:24 +01:00
|
|
|
a.UtxoStore.RLock()
|
|
|
|
for _, u := range a.UtxoStore.s {
|
2013-11-14 18:15:16 +01:00
|
|
|
// Utxos not yet in blocks (height -1) should only be
|
|
|
|
// added if confirmations is 0.
|
|
|
|
if confirms == 0 || (u.Height != -1 && int(bs.Height-u.Height+1) >= confirms) {
|
|
|
|
bal += u.Amt
|
|
|
|
}
|
|
|
|
}
|
2013-11-15 17:44:24 +01:00
|
|
|
a.UtxoStore.RUnlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
return float64(bal) / float64(btcutil.SatoshiPerBitcoin)
|
|
|
|
}
|
|
|
|
|
2013-12-10 22:15:25 +01:00
|
|
|
// CalculateAddressBalance sums the amounts of all unspent transaction
|
|
|
|
// outputs to a single address's pubkey hash and returns the balance
|
|
|
|
// as a float64.
|
|
|
|
//
|
|
|
|
// 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.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) CalculateAddressBalance(addr *btcutil.AddressPubKeyHash, confirms int) float64 {
|
2013-12-10 22:15:25 +01:00
|
|
|
var bal uint64 // Measured in satoshi
|
|
|
|
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if bs.Height == int32(btcutil.BlockHeightUnknown) || err != nil {
|
|
|
|
return 0.
|
|
|
|
}
|
|
|
|
|
|
|
|
a.UtxoStore.RLock()
|
|
|
|
for _, u := range a.UtxoStore.s {
|
|
|
|
// Utxos not yet in blocks (height -1) should only be
|
|
|
|
// added if confirmations is 0.
|
|
|
|
if confirms == 0 || (u.Height != -1 && int(bs.Height-u.Height+1) >= confirms) {
|
2014-01-06 18:24:29 +01:00
|
|
|
if bytes.Equal(addr.ScriptAddress(), u.AddrHash[:]) {
|
2013-12-10 22:15:25 +01:00
|
|
|
bal += u.Amt
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
a.UtxoStore.RUnlock()
|
|
|
|
return float64(bal) / float64(btcutil.SatoshiPerBitcoin)
|
|
|
|
}
|
|
|
|
|
2013-12-31 19:11:47 +01:00
|
|
|
// CurrentAddress gets the most recently requested Bitcoin payment address
|
|
|
|
// from an account. 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.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) CurrentAddress() (btcutil.Address, error) {
|
2013-12-31 19:11:47 +01:00
|
|
|
a.mtx.RLock()
|
2014-01-06 18:24:29 +01:00
|
|
|
addr := a.Wallet.LastChainedAddress()
|
2013-12-31 19:11:47 +01:00
|
|
|
a.mtx.RUnlock()
|
|
|
|
|
|
|
|
// Get next chained address if the last one has already been used.
|
2014-01-06 18:24:29 +01:00
|
|
|
if a.AddressUsed(addr) {
|
|
|
|
return a.NewAddress()
|
2013-12-31 19:11:47 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 18:24:29 +01:00
|
|
|
return addr, nil
|
2013-12-31 19:11:47 +01:00
|
|
|
}
|
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// ListTransactions returns a slice of maps with details about a recorded
|
|
|
|
// transaction. This is intended to be used for listtransactions RPC
|
|
|
|
// replies.
|
|
|
|
func (a *Account) ListTransactions(from, count int) ([]map[string]interface{}, error) {
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var txInfoList []map[string]interface{}
|
|
|
|
a.mtx.RLock()
|
|
|
|
a.TxStore.RLock()
|
|
|
|
|
|
|
|
lastLookupIdx := len(a.TxStore.s) - count
|
|
|
|
// Search in reverse order: lookup most recently-added first.
|
|
|
|
for i := len(a.TxStore.s) - 1; i >= from && i >= lastLookupIdx; i-- {
|
2014-01-23 01:00:10 +01:00
|
|
|
txInfoList = append(txInfoList,
|
|
|
|
a.TxStore.s[i].TxInfo(a.name, bs.Height, a.Net())...)
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|
|
|
|
a.mtx.RUnlock()
|
|
|
|
a.TxStore.RUnlock()
|
|
|
|
|
|
|
|
return txInfoList, nil
|
|
|
|
}
|
|
|
|
|
2013-12-30 17:10:06 +01:00
|
|
|
// ListAddressTransactions returns a slice of maps with details about a
|
|
|
|
// recorded transactions to or from any address belonging to a set. This is
|
|
|
|
// intended to be used for listaddresstransactions RPC replies.
|
|
|
|
func (a *Account) ListAddressTransactions(pkHashes map[string]struct{}) (
|
|
|
|
[]map[string]interface{}, error) {
|
|
|
|
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var txInfoList []map[string]interface{}
|
|
|
|
a.mtx.RLock()
|
|
|
|
a.TxStore.RLock()
|
|
|
|
|
|
|
|
for i := range a.TxStore.s {
|
|
|
|
rtx, ok := a.TxStore.s[i].(*tx.RecvTx)
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if _, ok := pkHashes[string(rtx.ReceiverHash[:])]; ok {
|
|
|
|
info := rtx.TxInfo(a.name, bs.Height, a.Net())
|
2014-01-23 01:00:10 +01:00
|
|
|
txInfoList = append(txInfoList, info...)
|
2013-12-30 17:10:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
a.mtx.RUnlock()
|
|
|
|
a.TxStore.RUnlock()
|
|
|
|
|
|
|
|
return txInfoList, nil
|
|
|
|
}
|
|
|
|
|
2013-12-02 23:34:36 +01:00
|
|
|
// ListAllTransactions returns a slice of maps with details about a recorded
|
|
|
|
// transaction. This is intended to be used for listalltransactions RPC
|
|
|
|
// replies.
|
|
|
|
func (a *Account) ListAllTransactions() ([]map[string]interface{}, error) {
|
|
|
|
// Get current block. The block height used for calculating
|
|
|
|
// the number of tx confirmations.
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var txInfoList []map[string]interface{}
|
|
|
|
a.mtx.RLock()
|
|
|
|
a.TxStore.RLock()
|
|
|
|
|
|
|
|
// Search in reverse order: lookup most recently-added first.
|
|
|
|
for i := len(a.TxStore.s) - 1; i >= 0; i-- {
|
2014-01-23 01:00:10 +01:00
|
|
|
txInfoList = append(txInfoList,
|
|
|
|
a.TxStore.s[i].TxInfo(a.name, bs.Height, a.Net())...)
|
2013-12-02 23:34:36 +01:00
|
|
|
}
|
|
|
|
a.mtx.RUnlock()
|
|
|
|
a.TxStore.RUnlock()
|
|
|
|
|
|
|
|
return txInfoList, nil
|
|
|
|
}
|
|
|
|
|
2014-01-06 18:24:29 +01:00
|
|
|
// DumpPrivKeys returns the WIF-encoded private keys for all addresses with
|
|
|
|
// private keys in a wallet.
|
2013-11-20 02:18:11 +01:00
|
|
|
func (a *Account) DumpPrivKeys() ([]string, error) {
|
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
|
|
|
|
|
|
|
// Iterate over each active address, appending the private
|
|
|
|
// key to privkeys.
|
|
|
|
var privkeys []string
|
2014-01-06 18:24:29 +01:00
|
|
|
for addr, info := range a.ActiveAddresses() {
|
|
|
|
key, err := a.AddressKey(addr)
|
2013-11-20 02:18:11 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
encKey, err := btcutil.EncodePrivateKey(key.D.Bytes(),
|
2014-01-06 18:24:29 +01:00
|
|
|
a.Net(), info.Compressed)
|
2013-11-20 02:18:11 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
privkeys = append(privkeys, encKey)
|
|
|
|
}
|
|
|
|
|
|
|
|
return privkeys, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// DumpWIFPrivateKey returns the WIF encoded private key for a
|
|
|
|
// single wallet address.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) DumpWIFPrivateKey(addr btcutil.Address) (string, error) {
|
2013-11-20 02:18:11 +01:00
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
|
|
|
|
|
|
|
// Get private key from wallet if it exists.
|
2014-01-06 18:24:29 +01:00
|
|
|
key, err := a.AddressKey(addr)
|
2013-11-20 02:18:11 +01:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get address info. This is needed to determine whether
|
|
|
|
// the pubkey is compressed or not.
|
2014-01-06 18:24:29 +01:00
|
|
|
info, err := a.AddressInfo(addr)
|
2013-11-20 02:18:11 +01:00
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return WIF-encoding of the private key.
|
|
|
|
return btcutil.EncodePrivateKey(key.D.Bytes(), a.Net(), info.Compressed)
|
|
|
|
}
|
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// ImportPrivKey imports a WIF-encoded private key into an account's wallet.
|
|
|
|
// This function is not recommended, as it gives no hints as to when the
|
|
|
|
// address first appeared (not just in the blockchain, but since the address
|
|
|
|
// was first generated, or made public), and will cause all future rescans to
|
|
|
|
// start from the genesis block.
|
|
|
|
func (a *Account) ImportPrivKey(wif string, rescan bool) error {
|
|
|
|
bs := &wallet.BlockStamp{}
|
|
|
|
addr, err := a.ImportWIFPrivateKey(wif, bs)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if rescan {
|
2014-01-15 18:26:55 +01:00
|
|
|
// Do not wait for rescan to finish before returning to the
|
|
|
|
// caller.
|
|
|
|
go func() {
|
|
|
|
addrs := map[string]struct{}{
|
|
|
|
addr: struct{}{},
|
|
|
|
}
|
2013-12-02 20:56:06 +01:00
|
|
|
|
2014-01-15 18:26:55 +01:00
|
|
|
Rescan(CurrentRPCConn(), bs.Height, addrs)
|
|
|
|
a.writeDirtyToDisk()
|
|
|
|
}()
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ImportWIFPrivateKey takes a WIF-encoded private key and adds it to the
|
2013-11-20 02:18:11 +01:00
|
|
|
// wallet. If the import is successful, the payment address string is
|
|
|
|
// returned.
|
2013-12-02 20:56:06 +01:00
|
|
|
func (a *Account) ImportWIFPrivateKey(wif string, bs *wallet.BlockStamp) (string, error) {
|
2013-11-20 02:18:11 +01:00
|
|
|
// Decode WIF private key and perform sanity checking.
|
|
|
|
privkey, net, compressed, err := btcutil.DecodePrivateKey(wif)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
if net != a.Net() {
|
|
|
|
return "", errors.New("wrong network")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attempt to import private key into wallet.
|
|
|
|
a.mtx.Lock()
|
2014-01-15 18:33:32 +01:00
|
|
|
addr, err := a.Wallet.ImportPrivateKey(privkey, compressed, bs)
|
2013-11-20 02:18:11 +01:00
|
|
|
if err != nil {
|
|
|
|
a.mtx.Unlock()
|
|
|
|
return "", err
|
|
|
|
}
|
2014-01-20 18:56:27 +01:00
|
|
|
addrStr := addr.String()
|
2013-11-20 02:18:11 +01:00
|
|
|
|
|
|
|
// Immediately write dirty wallet to disk.
|
|
|
|
//
|
|
|
|
// TODO(jrick): change writeDirtyToDisk to not grab the writer lock.
|
|
|
|
// Don't want to let another goroutine waiting on the mutex to grab
|
|
|
|
// the mutex before it is written to disk.
|
|
|
|
a.dirty = true
|
|
|
|
a.mtx.Unlock()
|
|
|
|
if err := a.writeDirtyToDisk(); err != nil {
|
|
|
|
log.Errorf("cannot write dirty wallet: %v", err)
|
2013-12-16 15:12:25 +01:00
|
|
|
return "", fmt.Errorf("import failed: cannot write wallet: %v", err)
|
2013-11-20 02:18:11 +01:00
|
|
|
}
|
|
|
|
|
2013-12-10 22:15:25 +01:00
|
|
|
// Associate the imported address with this account.
|
2014-01-20 18:56:27 +01:00
|
|
|
MarkAddressForAccount(addrStr, a.Name())
|
2013-12-10 22:15:25 +01:00
|
|
|
|
2014-01-20 18:56:27 +01:00
|
|
|
log.Infof("Imported payment address %v", addrStr)
|
2013-11-20 02:18:11 +01:00
|
|
|
|
|
|
|
// Return the payment address string of the imported private key.
|
2014-01-20 18:56:27 +01:00
|
|
|
return addrStr, nil
|
2013-11-20 02:18:11 +01:00
|
|
|
}
|
|
|
|
|
Implement exporting a watching-only wallet.
This change allows for the use of watching-only wallets. Unlike
normal, "hot" wallets, watching-only wallets do not contain any
private keys, and can be used in situations where you want to keep one
wallet online to create new receiving addresses and watch for received
transactions, while keeping the hot wallet offline (possibly on an
air-gapped computer).
Two (websocket) extension RPC calls have been added:
First, exportwatchingwallet, which will export the current hot wallet
to a watching-only wallet, saving either to disk or returning the
base64-encoded wallet files to the caller.
Second, recoveraddresses, which is used to recover the next n
addresses from the address chain. This is used to "sync" a watching
wallet with the hot wallet, or vice versa.
2014-01-21 20:45:28 +01:00
|
|
|
// ExportWatchingWallet returns a new account with a watching wallet
|
|
|
|
// exported by this a's wallet. Both wallets share the same tx and utxo
|
|
|
|
// stores, so locking one will lock the other as well. The returned account
|
|
|
|
// should be exported quickly, either to file or to an rpc caller, and then
|
|
|
|
// dropped from scope.
|
|
|
|
func (a *Account) ExportWatchingWallet() (*Account, error) {
|
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
|
|
|
|
|
|
|
ww, err := a.Wallet.ExportWatchingWallet()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
wa := *a
|
|
|
|
wa.Wallet = ww
|
|
|
|
return &wa, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// exportBase64 exports an account's serialized wallet, tx, and utxo
|
|
|
|
// stores as base64-encoded values in a map.
|
|
|
|
func (a *Account) exportBase64() (map[string]string, error) {
|
|
|
|
buf := &bytes.Buffer{}
|
|
|
|
m := make(map[string]string)
|
|
|
|
|
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
|
|
|
if _, err := a.Wallet.WriteTo(buf); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
m["wallet"] = base64.StdEncoding.EncodeToString(buf.Bytes())
|
|
|
|
buf.Reset()
|
|
|
|
|
|
|
|
a.TxStore.RLock()
|
|
|
|
defer a.TxStore.RUnlock()
|
|
|
|
if _, err := a.TxStore.s.WriteTo(buf); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
m["tx"] = base64.StdEncoding.EncodeToString(buf.Bytes())
|
|
|
|
buf.Reset()
|
|
|
|
|
|
|
|
a.UtxoStore.RLock()
|
|
|
|
defer a.UtxoStore.RUnlock()
|
|
|
|
if _, err := a.UtxoStore.s.WriteTo(buf); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
m["utxo"] = base64.StdEncoding.EncodeToString(buf.Bytes())
|
|
|
|
buf.Reset()
|
|
|
|
|
|
|
|
return m, nil
|
|
|
|
}
|
|
|
|
|
2013-11-14 18:15:16 +01:00
|
|
|
// Track requests btcd to send notifications of new transactions for
|
2014-01-03 19:34:37 +01:00
|
|
|
// each address stored in a wallet.
|
2013-11-15 17:44:24 +01:00
|
|
|
func (a *Account) Track() {
|
2014-01-03 19:34:37 +01:00
|
|
|
// Request notifications for transactions sending to all wallet
|
|
|
|
// addresses.
|
|
|
|
addrs := a.ActiveAddresses()
|
|
|
|
addrstrs := make([]string, len(addrs))
|
|
|
|
i := 0
|
|
|
|
for addr := range addrs {
|
|
|
|
addrstrs[i] = addr.EncodeAddress()
|
|
|
|
i++
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
2014-01-03 19:34:37 +01:00
|
|
|
err := NotifyNewTXs(CurrentRPCConn(), addrstrs)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("Unable to request transaction updates for address.")
|
|
|
|
}
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-11-15 17:44:24 +01:00
|
|
|
a.UtxoStore.RLock()
|
|
|
|
for _, utxo := range a.UtxoStore.s {
|
2014-01-03 19:34:37 +01:00
|
|
|
ReqSpentUtxoNtfn(utxo)
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
2013-11-15 17:44:24 +01:00
|
|
|
a.UtxoStore.RUnlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
2013-11-20 02:46:16 +01:00
|
|
|
// RescanActiveAddresses requests btcd to rescan the blockchain for new
|
2013-11-20 02:18:11 +01:00
|
|
|
// transactions to all active wallet addresses. This is needed for
|
|
|
|
// catching btcwallet up to a long-running btcd process, as otherwise
|
2013-11-14 18:15:16 +01:00
|
|
|
// it would have missed notifications as blocks are attached to the
|
|
|
|
// main chain.
|
2013-11-20 02:18:11 +01:00
|
|
|
func (a *Account) RescanActiveAddresses() {
|
|
|
|
// Determine the block to begin the rescan from.
|
2013-11-14 18:15:16 +01:00
|
|
|
beginBlock := int32(0)
|
2014-01-15 15:50:14 +01:00
|
|
|
a.mtx.RLock()
|
2013-11-15 17:44:24 +01:00
|
|
|
if a.fullRescan {
|
2013-11-14 18:15:16 +01:00
|
|
|
// Need to perform a complete rescan since the wallet creation
|
|
|
|
// block.
|
2013-11-20 02:18:11 +01:00
|
|
|
beginBlock = a.EarliestBlockHeight()
|
2013-11-14 18:15:16 +01:00
|
|
|
log.Debugf("Rescanning account '%v' for new transactions since block height %v",
|
2013-11-15 17:44:24 +01:00
|
|
|
a.name, beginBlock)
|
2013-11-14 18:15:16 +01:00
|
|
|
} else {
|
|
|
|
// The last synced block height should be used the starting
|
|
|
|
// point for block rescanning. Grab the block stamp here.
|
2013-11-15 17:44:24 +01:00
|
|
|
bs := a.SyncedWith()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-12-06 21:37:07 +01:00
|
|
|
log.Debugf("Rescanning account '%v' for new transactions after block height %v hash %v",
|
2013-11-15 17:44:24 +01:00
|
|
|
a.name, bs.Height, bs.Hash)
|
2013-11-14 18:15:16 +01:00
|
|
|
|
|
|
|
// If we're synced with block x, must scan the blocks x+1 to best block.
|
|
|
|
beginBlock = bs.Height + 1
|
|
|
|
}
|
2014-01-15 15:50:14 +01:00
|
|
|
a.mtx.RUnlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-11-20 02:18:11 +01:00
|
|
|
// Rescan active addresses starting at the determined block height.
|
2014-01-03 19:34:37 +01:00
|
|
|
Rescan(CurrentRPCConn(), beginBlock, a.ActivePaymentAddresses())
|
2014-01-10 20:53:32 +01:00
|
|
|
a.writeDirtyToDisk()
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// SortedActivePaymentAddresses returns a slice of all active payment
|
|
|
|
// addresses in an account.
|
2013-11-15 17:44:24 +01:00
|
|
|
func (a *Account) SortedActivePaymentAddresses() []string {
|
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
infos := a.SortedActiveAddresses()
|
2013-11-14 18:15:16 +01:00
|
|
|
addrs := make([]string, len(infos))
|
|
|
|
|
2014-01-06 18:24:29 +01:00
|
|
|
for i, info := range infos {
|
|
|
|
addrs[i] = info.Address.EncodeAddress()
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return addrs
|
|
|
|
}
|
|
|
|
|
|
|
|
// ActivePaymentAddresses returns a set of all active pubkey hashes
|
|
|
|
// in an account.
|
2013-11-15 17:44:24 +01:00
|
|
|
func (a *Account) ActivePaymentAddresses() map[string]struct{} {
|
|
|
|
a.mtx.RLock()
|
|
|
|
defer a.mtx.RUnlock()
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
infos := a.ActiveAddresses()
|
2013-11-14 18:15:16 +01:00
|
|
|
addrs := make(map[string]struct{}, len(infos))
|
|
|
|
|
|
|
|
for _, info := range infos {
|
2014-01-06 18:24:29 +01:00
|
|
|
addrs[info.Address.EncodeAddress()] = struct{}{}
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return addrs
|
|
|
|
}
|
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// NewAddress returns a new payment address for an account.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) NewAddress() (btcutil.Address, error) {
|
2013-12-02 20:56:06 +01:00
|
|
|
a.mtx.Lock()
|
|
|
|
|
|
|
|
// Get current block's height and hash.
|
|
|
|
bs, err := GetCurBlock()
|
|
|
|
if err != nil {
|
2014-01-06 18:24:29 +01:00
|
|
|
a.mtx.Unlock()
|
|
|
|
return nil, err
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get next address from wallet.
|
2014-01-15 23:29:01 +01:00
|
|
|
addr, err := a.NextChainedAddress(&bs, cfg.KeypoolSize)
|
2013-12-02 20:56:06 +01:00
|
|
|
if err != nil {
|
2014-01-06 18:24:29 +01:00
|
|
|
a.mtx.Unlock()
|
|
|
|
return nil, err
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|
|
|
|
|
2014-01-06 18:24:29 +01:00
|
|
|
// Immediately write updated wallet to disk.
|
2013-12-02 20:56:06 +01:00
|
|
|
a.dirty = true
|
2013-12-03 18:33:37 +01:00
|
|
|
a.mtx.Unlock()
|
2013-12-02 20:56:06 +01:00
|
|
|
if err = a.writeDirtyToDisk(); err != nil {
|
|
|
|
log.Errorf("cannot sync dirty wallet: %v", err)
|
|
|
|
}
|
|
|
|
|
2013-12-10 22:15:25 +01:00
|
|
|
// Mark this new address as belonging to this account.
|
2014-01-06 18:24:29 +01:00
|
|
|
MarkAddressForAccount(addr.EncodeAddress(), a.Name())
|
2013-12-10 22:15:25 +01:00
|
|
|
|
2013-12-02 20:56:06 +01:00
|
|
|
// Request updates from btcd for new transactions sent to this address.
|
|
|
|
a.ReqNewTxsForAddress(addr)
|
|
|
|
|
|
|
|
return addr, nil
|
|
|
|
}
|
|
|
|
|
Implement exporting a watching-only wallet.
This change allows for the use of watching-only wallets. Unlike
normal, "hot" wallets, watching-only wallets do not contain any
private keys, and can be used in situations where you want to keep one
wallet online to create new receiving addresses and watch for received
transactions, while keeping the hot wallet offline (possibly on an
air-gapped computer).
Two (websocket) extension RPC calls have been added:
First, exportwatchingwallet, which will export the current hot wallet
to a watching-only wallet, saving either to disk or returning the
base64-encoded wallet files to the caller.
Second, recoveraddresses, which is used to recover the next n
addresses from the address chain. This is used to "sync" a watching
wallet with the hot wallet, or vice versa.
2014-01-21 20:45:28 +01:00
|
|
|
// RecoverAddresses recovers the next n chained addresses of a wallet.
|
|
|
|
func (a *Account) RecoverAddresses(n int) error {
|
|
|
|
a.mtx.Lock()
|
|
|
|
|
|
|
|
// Get info on the last chained address. The rescan starts at the
|
|
|
|
// earliest block height the last chained address might appear at.
|
|
|
|
last := a.Wallet.LastChainedAddress()
|
|
|
|
lastInfo, err := a.Wallet.AddressInfo(last)
|
|
|
|
if err != nil {
|
|
|
|
a.mtx.Unlock()
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
addrs, err := a.Wallet.ExtendActiveAddresses(n, cfg.KeypoolSize)
|
|
|
|
a.mtx.Unlock()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Run a goroutine to rescan blockchain for recovered addresses.
|
|
|
|
m := make(map[string]struct{})
|
|
|
|
for i := range addrs {
|
|
|
|
m[addrs[i].EncodeAddress()] = struct{}{}
|
|
|
|
}
|
|
|
|
go func(addrs map[string]struct{}) {
|
|
|
|
jsonErr := Rescan(CurrentRPCConn(), lastInfo.FirstBlock, addrs)
|
|
|
|
if jsonErr != nil {
|
|
|
|
log.Errorf("Rescanning for recovered addresses failed: %v",
|
|
|
|
jsonErr.Message)
|
|
|
|
}
|
|
|
|
}(m)
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2013-11-14 18:15:16 +01:00
|
|
|
// ReqNewTxsForAddress sends a message to btcd to request tx updates
|
|
|
|
// for addr for each new block that is added to the blockchain.
|
2014-01-06 18:24:29 +01:00
|
|
|
func (a *Account) ReqNewTxsForAddress(addr btcutil.Address) {
|
|
|
|
// Only support P2PKH addresses currently.
|
|
|
|
apkh, ok := addr.(*btcutil.AddressPubKeyHash)
|
|
|
|
if !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Debugf("Requesting notifications of TXs sending to address %v", apkh)
|
2013-11-14 18:15:16 +01:00
|
|
|
|
2014-01-03 19:34:37 +01:00
|
|
|
err := NotifyNewTXs(CurrentRPCConn(), []string{apkh.EncodeAddress()})
|
2013-11-14 18:15:16 +01:00
|
|
|
if err != nil {
|
2014-01-03 19:34:37 +01:00
|
|
|
log.Error("Unable to request transaction updates for address.")
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReqSpentUtxoNtfn sends a message to btcd to request updates for when
|
|
|
|
// a stored UTXO has been spent.
|
2014-01-03 19:34:37 +01:00
|
|
|
func ReqSpentUtxoNtfn(u *tx.Utxo) {
|
2013-11-14 18:15:16 +01:00
|
|
|
log.Debugf("Requesting spent UTXO notifications for Outpoint hash %s index %d",
|
|
|
|
u.Out.Hash, u.Out.Index)
|
|
|
|
|
2014-01-03 19:34:37 +01:00
|
|
|
NotifySpent(CurrentRPCConn(), (*btcwire.OutPoint)(&u.Out))
|
2013-11-14 18:15:16 +01:00
|
|
|
}
|
2013-12-02 20:56:06 +01:00
|
|
|
|
Introduce new account file structure.
This changes the locations that account files (wallet.bin, utxo.bin,
and tx.bin) are searched for when opening or disk syncing accounts.
Previously, files were saved in the following layout:
~/.btcwallet/
- btcwallet/
- wallet.bin
- tx.bin
- utxo.bin
- btcwallet-AccountA/
- wallet.bin
- tx.bin
- utxo.bin
This format had two issues. First, each account would require its own
directory, causing a scalability issue on unix (and perhaps other)
platforms. Second, there was no distinction between testnet and
mainnet wallets, and if mainnet support was enabled, btcwallet would
attempt to open accounts with testnet wallets.
Instead, the following file structure is now used:
~/.btcwallet/
- testnet/
- wallet.bin
- tx.bin
- utxo.bin
- AccountA-wallet.bin
- AccountA-tx.bin
- AccountA-utxo.bin
This solves both of the previously-mentioned issues by requiring only
two subdirectories (one each for the testnet and mainnet bitcoin
networks), and by separating the locations to open and save testnet
and mainnet account files.
At startup, a check for the old account file structure is performed.
If found, files are moved to the new locations, and the old account
directories are removed. Account files are moved to the testnet
directory, as only testnet support is currently enabled.
The version has been bumped to 0.1.1 to reflect this change.
Fixes #16.
2013-12-05 02:16:50 +01:00
|
|
|
// accountdir returns the directory containing an account's wallet, utxo,
|
2013-12-02 20:56:06 +01:00
|
|
|
// and tx files.
|
Introduce new account file structure.
This changes the locations that account files (wallet.bin, utxo.bin,
and tx.bin) are searched for when opening or disk syncing accounts.
Previously, files were saved in the following layout:
~/.btcwallet/
- btcwallet/
- wallet.bin
- tx.bin
- utxo.bin
- btcwallet-AccountA/
- wallet.bin
- tx.bin
- utxo.bin
This format had two issues. First, each account would require its own
directory, causing a scalability issue on unix (and perhaps other)
platforms. Second, there was no distinction between testnet and
mainnet wallets, and if mainnet support was enabled, btcwallet would
attempt to open accounts with testnet wallets.
Instead, the following file structure is now used:
~/.btcwallet/
- testnet/
- wallet.bin
- tx.bin
- utxo.bin
- AccountA-wallet.bin
- AccountA-tx.bin
- AccountA-utxo.bin
This solves both of the previously-mentioned issues by requiring only
two subdirectories (one each for the testnet and mainnet bitcoin
networks), and by separating the locations to open and save testnet
and mainnet account files.
At startup, a check for the old account file structure is performed.
If found, files are moved to the new locations, and the old account
directories are removed. Account files are moved to the testnet
directory, as only testnet support is currently enabled.
The version has been bumped to 0.1.1 to reflect this change.
Fixes #16.
2013-12-05 02:16:50 +01:00
|
|
|
//
|
|
|
|
// This function is deprecated and should only be used when looking up
|
|
|
|
// old (before version 0.1.1) account directories so they may be updated
|
|
|
|
// to the new directory structure.
|
|
|
|
func accountdir(name string, cfg *config) string {
|
|
|
|
var adir string
|
|
|
|
if name == "" { // default account
|
|
|
|
adir = "btcwallet"
|
2013-12-02 20:56:06 +01:00
|
|
|
} else {
|
Introduce new account file structure.
This changes the locations that account files (wallet.bin, utxo.bin,
and tx.bin) are searched for when opening or disk syncing accounts.
Previously, files were saved in the following layout:
~/.btcwallet/
- btcwallet/
- wallet.bin
- tx.bin
- utxo.bin
- btcwallet-AccountA/
- wallet.bin
- tx.bin
- utxo.bin
This format had two issues. First, each account would require its own
directory, causing a scalability issue on unix (and perhaps other)
platforms. Second, there was no distinction between testnet and
mainnet wallets, and if mainnet support was enabled, btcwallet would
attempt to open accounts with testnet wallets.
Instead, the following file structure is now used:
~/.btcwallet/
- testnet/
- wallet.bin
- tx.bin
- utxo.bin
- AccountA-wallet.bin
- AccountA-tx.bin
- AccountA-utxo.bin
This solves both of the previously-mentioned issues by requiring only
two subdirectories (one each for the testnet and mainnet bitcoin
networks), and by separating the locations to open and save testnet
and mainnet account files.
At startup, a check for the old account file structure is performed.
If found, files are moved to the new locations, and the old account
directories are removed. Account files are moved to the testnet
directory, as only testnet support is currently enabled.
The version has been bumped to 0.1.1 to reflect this change.
Fixes #16.
2013-12-05 02:16:50 +01:00
|
|
|
adir = fmt.Sprintf("btcwallet-%s", name)
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|
|
|
|
|
Introduce new account file structure.
This changes the locations that account files (wallet.bin, utxo.bin,
and tx.bin) are searched for when opening or disk syncing accounts.
Previously, files were saved in the following layout:
~/.btcwallet/
- btcwallet/
- wallet.bin
- tx.bin
- utxo.bin
- btcwallet-AccountA/
- wallet.bin
- tx.bin
- utxo.bin
This format had two issues. First, each account would require its own
directory, causing a scalability issue on unix (and perhaps other)
platforms. Second, there was no distinction between testnet and
mainnet wallets, and if mainnet support was enabled, btcwallet would
attempt to open accounts with testnet wallets.
Instead, the following file structure is now used:
~/.btcwallet/
- testnet/
- wallet.bin
- tx.bin
- utxo.bin
- AccountA-wallet.bin
- AccountA-tx.bin
- AccountA-utxo.bin
This solves both of the previously-mentioned issues by requiring only
two subdirectories (one each for the testnet and mainnet bitcoin
networks), and by separating the locations to open and save testnet
and mainnet account files.
At startup, a check for the old account file structure is performed.
If found, files are moved to the new locations, and the old account
directories are removed. Account files are moved to the testnet
directory, as only testnet support is currently enabled.
The version has been bumped to 0.1.1 to reflect this change.
Fixes #16.
2013-12-05 02:16:50 +01:00
|
|
|
return filepath.Join(cfg.DataDir, adir)
|
2013-12-02 20:56:06 +01:00
|
|
|
}
|