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

lnwallet: use new ChainNotifier API, typo fixes

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-05-10 17:43:11 -07:00
parent 5fe3a5631d
commit 1b4862d815
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chainntnfs/interface.go
View File

@ -89,7 +89,7 @@ type TxConfirmation struct {
// disconnected from the blockchain as a result of a re-org. // disconnected from the blockchain as a result of a re-org.
// //
// Once the txid reaches the specified number of confirmations, the 'Confirmed' // Once the txid reaches the specified number of confirmations, the 'Confirmed'
// channel will be sent upon fufulling the notification. // channel will be sent upon fulfilling the notification.
// //
// If the event that the original transaction becomes re-org'd out of the main // If the event that the original transaction becomes re-org'd out of the main
// chain, the 'NegativeConf' will be sent upon with a value representing the // chain, the 'NegativeConf' will be sent upon with a value representing the
@ -133,7 +133,7 @@ type SpendEvent struct {
Spend <-chan *SpendDetail // MUST be buffered. Spend <-chan *SpendDetail // MUST be buffered.
// Cancel is a closure that should be executed by the caller in the // Cancel is a closure that should be executed by the caller in the
// case that they wish to prematurely abandon their regsitered spend // case that they wish to prematurely abandon their registered spend
// notification. // notification.
Cancel func() Cancel func()
} }
@ -141,7 +141,7 @@ type SpendEvent struct {
// BlockEpoch represents metadata concerning each new block connected to the // BlockEpoch represents metadata concerning each new block connected to the
// main chain. // main chain.
type BlockEpoch struct { type BlockEpoch struct {
// Hash is the block hash of the latest blcok to be added to the tip of // Hash is the block hash of the latest block to be added to the tip of
// the main chain. // the main chain.
Hash *chainhash.Hash Hash *chainhash.Hash

3
lnwallet/channel.go
View File

@ -775,7 +775,8 @@ func NewLightningChannel(signer Signer, events chainntnfs.ChainNotifier,
// the remote party has broadcasted a commitment transaction // the remote party has broadcasted a commitment transaction
// on-chain. // on-chain.
fundingOut := &lc.fundingTxIn.PreviousOutPoint fundingOut := &lc.fundingTxIn.PreviousOutPoint
channelCloseNtfn, err := lc.channelEvents.RegisterSpendNtfn(fundingOut) openHeight := lc.channelState.OpeningHeight
channelCloseNtfn, err := lc.channelEvents.RegisterSpendNtfn(fundingOut, openHeight)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
lnwallet/script_utils.go
View File

@ -69,8 +69,8 @@ func genMultiSigScript(aPub, bPub []byte) ([]byte, error) {
// Swap to sort pubkeys if needed. Keys are sorted in lexicographical // Swap to sort pubkeys if needed. Keys are sorted in lexicographical
// order. The signatures within the scriptSig must also adhere to the // order. The signatures within the scriptSig must also adhere to the
// order, ensuring that the signatures for each public key appears // order, ensuring that the signatures for each public key appears in
// in the proper order on the stack. // the proper order on the stack.
if bytes.Compare(aPub, bPub) == -1 { if bytes.Compare(aPub, bPub) == -1 {
aPub, bPub = bPub, aPub aPub, bPub = bPub, aPub
} }