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

lnwallet/btcwallet/btcwallet: use coin type in key scope

Browse Source
This commit is contained in:
Conner Fromknecht 2018-03-12 17:33:11 -07:00
parent e99243d86b
commit e760963ead
No known key found for this signature in database
GPG Key ID: 39DE78FBE6ACB0EF
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lnwallet/btcwallet/btcwallet.go
View File

@ -32,14 +32,6 @@ var (
// stored within the top-level waleltdb buckets of btcwallet. // stored within the top-level waleltdb buckets of btcwallet.
waddrmgrNamespaceKey = []byte("waddrmgr") waddrmgrNamespaceKey = []byte("waddrmgr")
// lightningKeyScope is the key scope that will be used within the
// waddrmgr to create an HD chain for deriving all of our required
// keys. We'll ensure this this scope is created upon start.
lightningKeyScope = waddrmgr.KeyScope{
Purpose: keychain.BIP0043Purpose,
Coin: 0,
}
// lightningAddrSchema is the scope addr schema for all keys that we // lightningAddrSchema is the scope addr schema for all keys that we
// derive. We'll treat them all as p2wkh addresses, as atm we must // derive. We'll treat them all as p2wkh addresses, as atm we must
// specify a particular type. // specify a particular type.
@ -65,6 +57,8 @@ type BtcWallet struct {
netParams *chaincfg.Params netParams *chaincfg.Params
chainKeyScope waddrmgr.KeyScope
// utxoCache is a cache used to speed up repeated calls to // utxoCache is a cache used to speed up repeated calls to
// FetchInputInfo. // FetchInputInfo.
utxoCache map[wire.OutPoint]*wire.TxOut utxoCache map[wire.OutPoint]*wire.TxOut
@ -81,6 +75,12 @@ func New(cfg Config) (*BtcWallet, 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(cfg.DataDir, cfg.NetParams) netDir := NetworkDir(cfg.DataDir, cfg.NetParams)
// Create the key scope for the coin type being managed by this wallet.
chainKeyScope := waddrmgr.KeyScope{
Purpose: keychain.BIP0043Purpose,
Coin: cfg.CoinType,
}
var pubPass []byte var pubPass []byte
if cfg.PublicPass == nil { if cfg.PublicPass == nil {
pubPass = defaultPubPassphrase pubPass = defaultPubPassphrase
@ -114,12 +114,13 @@ func New(cfg Config) (*BtcWallet, error) {
} }
return &BtcWallet{ return &BtcWallet{
cfg: &cfg, cfg: &cfg,
wallet: wallet, wallet: wallet,
db: wallet.Database(), db: wallet.Database(),
chain: cfg.ChainSource, chain: cfg.ChainSource,
netParams: cfg.NetParams, netParams: cfg.NetParams,
utxoCache: make(map[wire.OutPoint]*wire.TxOut), chainKeyScope: chainKeyScope,
utxoCache: make(map[wire.OutPoint]*wire.TxOut),
}, nil }, nil
} }
@ -165,7 +166,7 @@ func (b *BtcWallet) Start() error {
// We'll now ensure that the KeyScope: (1017, 1) exists within the // We'll now ensure that the KeyScope: (1017, 1) exists within the
// internal waddrmgr. We'll need this in order to properly generate the // internal waddrmgr. We'll need this in order to properly generate the
// keys required for signing various contracts. // keys required for signing various contracts.
_, err := b.wallet.Manager.FetchScopedKeyManager(lightningKeyScope) _, err := b.wallet.Manager.FetchScopedKeyManager(b.chainKeyScope)
if err != nil { if err != nil {
// If the scope hasn't yet been created (it wouldn't been // If the scope hasn't yet been created (it wouldn't been
// loaded by default if it was), then we'll manually create the // loaded by default if it was), then we'll manually create the
@ -174,7 +175,7 @@ func (b *BtcWallet) Start() error {
addrmgrNs := tx.ReadWriteBucket(waddrmgrNamespaceKey) addrmgrNs := tx.ReadWriteBucket(waddrmgrNamespaceKey)
_, err := b.wallet.Manager.NewScopedKeyManager( _, err := b.wallet.Manager.NewScopedKeyManager(
addrmgrNs, lightningKeyScope, lightningAddrSchema, addrmgrNs, b.chainKeyScope, lightningAddrSchema,
) )
return err return err
}) })