akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnwallet: add active Bitcoin network to config

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-02-02 19:09:54 -08:00
parent 80ce49a883
commit 98bbd314a7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lnwallet/config.go
View File

@ -3,6 +3,7 @@ package lnwallet
import ( import (
"path/filepath" "path/filepath"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
) )
@ -48,6 +49,9 @@ type Config struct {
PrivatePass []byte PrivatePass []byte
PublicPass []byte PublicPass []byte
HdSeed []byte HdSeed []byte
// Which bitcoin network are we using?
NetParams *chaincfg.Params
} }
// setDefaults... // setDefaults...

10
lnwallet/wallet.go
View File

@ -18,7 +18,6 @@ import (
"github.com/lightningnetwork/lnd/shachain" "github.com/lightningnetwork/lnd/shachain"
"github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
@ -41,9 +40,6 @@ var (
ErrInsufficientFunds = errors.New("not enough available outputs to " + ErrInsufficientFunds = errors.New("not enough available outputs to " +
"create funding transaction") "create funding transaction")
// Which bitcoin network are we using?
// TODO(roasbeef): config
ActiveNetParams = &chaincfg.TestNet3Params
// Namespace bucket keys. // Namespace bucket keys.
lightningNamespaceKey = []byte("ln-wallet") lightningNamespaceKey = []byte("ln-wallet")
waddrmgrNamespaceKey = []byte("waddrmgr") waddrmgrNamespaceKey = []byte("waddrmgr")
@ -253,7 +249,7 @@ type LightningWallet struct {
// TODO(roasbeef): fin...add config // TODO(roasbeef): fin...add config
func NewLightningWallet(config *Config) (*LightningWallet, walletdb.DB, error) { func NewLightningWallet(config *Config) (*LightningWallet, walletdb.DB, error) {
// Ensure the wallet exists or create it when the create flag is set. // Ensure the wallet exists or create it when the create flag is set.
netDir := networkDir(config.DataDir, ActiveNetParams) netDir := networkDir(config.DataDir, config.NetParams)
dbPath := filepath.Join(netDir, walletDbName) dbPath := filepath.Join(netDir, walletDbName)
var pubPass []byte var pubPass []byte
@ -348,7 +344,7 @@ func (l *LightningWallet) Startup() error {
} }
// TODO(roasbeef): config... // TODO(roasbeef): config...
rpcc, err := chain.NewRPCClient(ActiveNetParams, l.cfg.RpcHost, rpcc, err := chain.NewRPCClient(l.cfg.NetParams, l.cfg.RpcHost,
l.cfg.RpcUser, l.cfg.RpcPass, l.cfg.CACert, false, 20) l.cfg.RpcUser, l.cfg.RpcPass, l.cfg.CACert, false, 20)
if err != nil { if err != nil {
return err return err
@ -750,7 +746,7 @@ func (l *LightningWallet) handleContributionMsg(req *addContributionMsg) {
// Is this our txin? TODO(roasbeef): assumes all inputs are P2PKH... // Is this our txin? TODO(roasbeef): assumes all inputs are P2PKH...
prevIndex := txIn.PreviousOutPoint.Index prevIndex := txIn.PreviousOutPoint.Index
prevOut := txDetail.TxRecord.MsgTx.TxOut[prevIndex] prevOut := txDetail.TxRecord.MsgTx.TxOut[prevIndex]
_, addrs, _, _ := txscript.ExtractPkScriptAddrs(prevOut.PkScript, ActiveNetParams) _, addrs, _, _ := txscript.ExtractPkScriptAddrs(prevOut.PkScript, l.cfg.NetParams)
apkh, ok := addrs[0].(*btcutil.AddressPubKeyHash) apkh, ok := addrs[0].(*btcutil.AddressPubKeyHash)
if !ok { if !ok {
req.err <- btcwallet.ErrUnsupportedTransactionType req.err <- btcwallet.ErrUnsupportedTransactionType