mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 18:10:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1469 from cfromknecht/expose-lnwallet-commit-scripts

Browse Source 
lnwallet: export commit script helper methods
This commit is contained in:
Olaoluwa Osuntokun 2018-07-03 21:53:17 -05:00 committed by GitHub
commit 184f1e41fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lnwallet/channel.go
View File

@ -1412,7 +1412,7 @@ func (lc *LightningChannel) createSignDesc() error {
return err
}
fundingPkScript, err := witnessScriptHash(multiSigScript)
fundingPkScript, err := WitnessScriptHash(multiSigScript)
if err != nil {
return err
}
@ -1943,13 +1943,13 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
// number so we can have the proper witness script to sign and include
// within the final witness.
remoteDelay := uint32(chanState.RemoteChanCfg.CsvDelay)
remotePkScript, err := commitScriptToSelf(
remotePkScript, err := CommitScriptToSelf(
remoteDelay, keyRing.DelayKey, keyRing.RevocationKey,
)
if err != nil {
return nil, err
}
remoteWitnessHash, err := witnessScriptHash(remotePkScript)
remoteWitnessHash, err := WitnessScriptHash(remotePkScript)
if err != nil {
return nil, err
}
@ -4716,7 +4716,7 @@ func genHtlcScript(isIncoming, ourCommit bool, timeout uint32, rHash [32]byte,
// Now that we have the redeem scripts, create the P2WSH public key
// script for the output itself.
htlcP2WSH, err := witnessScriptHash(witnessScript)
htlcP2WSH, err := WitnessScriptHash(witnessScript)
if err != nil {
return nil, nil, err
}
@ -5071,7 +5071,7 @@ func newOutgoingHtlcResolution(signer Signer, localChanCfg *channeldb.ChannelCon
if err != nil {
return nil, err
}
htlcScriptHash, err := witnessScriptHash(htlcReceiverScript)
htlcScriptHash, err := WitnessScriptHash(htlcReceiverScript)
if err != nil {
return nil, err
}
@ -5151,7 +5151,7 @@ func newOutgoingHtlcResolution(signer Signer, localChanCfg *channeldb.ChannelCon
if err != nil {
return nil, err
}
htlcScriptHash, err := witnessScriptHash(htlcSweepScript)
htlcScriptHash, err := WitnessScriptHash(htlcSweepScript)
if err != nil {
return nil, err
}
@ -5209,7 +5209,7 @@ func newIncomingHtlcResolution(signer Signer, localChanCfg *channeldb.ChannelCon
if err != nil {
return nil, err
}
htlcScriptHash, err := witnessScriptHash(htlcSenderScript)
htlcScriptHash, err := WitnessScriptHash(htlcSenderScript)
if err != nil {
return nil, err
}
@ -5287,7 +5287,7 @@ func newIncomingHtlcResolution(signer Signer, localChanCfg *channeldb.ChannelCon
if err != nil {
return nil, err
}
htlcScriptHash, err := witnessScriptHash(htlcSweepScript)
htlcScriptHash, err := WitnessScriptHash(htlcSweepScript)
if err != nil {
return nil, err
}
@ -5473,12 +5473,12 @@ func NewLocalForceCloseSummary(chanState *channeldb.OpenChannel, signer Signer,
commitPoint := ComputeCommitmentPoint(revocation[:])
keyRing := deriveCommitmentKeys(commitPoint, true, &chanState.LocalChanCfg,
&chanState.RemoteChanCfg)
selfScript, err := commitScriptToSelf(csvTimeout, keyRing.DelayKey,
selfScript, err := CommitScriptToSelf(csvTimeout, keyRing.DelayKey,
keyRing.RevocationKey)
if err != nil {
return nil, err
}
payToUsScriptHash, err := witnessScriptHash(selfScript)
payToUsScriptHash, err := WitnessScriptHash(selfScript)
if err != nil {
return nil, err
}
@ -5894,12 +5894,12 @@ func CreateCommitTx(fundingOutput wire.TxIn,
// output after a relative block delay, or the remote node can claim
// the funds with the revocation key if we broadcast a revoked
// commitment transaction.
ourRedeemScript, err := commitScriptToSelf(csvTimeout, keyRing.DelayKey,
ourRedeemScript, err := CommitScriptToSelf(csvTimeout, keyRing.DelayKey,
keyRing.RevocationKey)
if err != nil {
return nil, err
}
payToUsScriptHash, err := witnessScriptHash(ourRedeemScript)
payToUsScriptHash, err := WitnessScriptHash(ourRedeemScript)
if err != nil {
return nil, err
}

14
lnwallet/script_utils.go
View File

@ -46,9 +46,9 @@ const (
maxStateHint uint64 = (1 << 48) - 1
)
// witnessScriptHash generates a pay-to-witness-script-hash public key script
// WitnessScriptHash generates a pay-to-witness-script-hash public key script
// paying to a version 0 witness program paying to the passed redeem script.
func witnessScriptHash(witnessScript []byte) ([]byte, error) {
func WitnessScriptHash(witnessScript []byte) ([]byte, error) {
bldr := txscript.NewScriptBuilder()
bldr.AddOp(txscript.OP_0)
@ -98,7 +98,7 @@ func GenFundingPkScript(aPub, bPub []byte, amt int64) ([]byte, *wire.TxOut, erro
// With the 2-of-2 script in had, generate a p2wsh script which pays
// to the funding script.
pkScript, err := witnessScriptHash(witnessScript)
pkScript, err := WitnessScriptHash(witnessScript)
if err != nil {
return nil, nil, err
}
@ -662,7 +662,7 @@ func createHtlcTimeoutTx(htlcOutput wire.OutPoint, htlcAmt btcutil.Amount,
if err != nil {
return nil, err
}
pkScript, err := witnessScriptHash(witnessScript)
pkScript, err := WitnessScriptHash(witnessScript)
if err != nil {
return nil, err
}
@ -709,7 +709,7 @@ func createHtlcSuccessTx(htlcOutput wire.OutPoint, htlcAmt btcutil.Amount,
if err != nil {
return nil, err
}
pkScript, err := witnessScriptHash(witnessScript)
pkScript, err := WitnessScriptHash(witnessScript)
if err != nil {
return nil, err
}
@ -902,7 +902,7 @@ func lockTimeToSequence(isSeconds bool, locktime uint32) uint32 {
return SequenceLockTimeSeconds | (locktime >> 9)
}
// commitScriptToSelf constructs the public key script for the output on the
// CommitScriptToSelf constructs the public key script for the output on the
// commitment transaction paying to the "owner" of said commitment transaction.
// If the other party learns of the preimage to the revocation hash, then they
// can claim all the settled funds in the channel, plus the unsettled funds.
@ -919,7 +919,7 @@ func lockTimeToSequence(isSeconds bool, locktime uint32) uint32 {
// <timeKey>
// OP_ENDIF
// OP_CHECKSIG
func commitScriptToSelf(csvTimeout uint32, selfKey, revokeKey *btcec.PublicKey) ([]byte, error) {
func CommitScriptToSelf(csvTimeout uint32, selfKey, revokeKey *btcec.PublicKey) ([]byte, error) {
// This script is spendable under two conditions: either the
// 'csvTimeout' has passed and we can redeem our funds, or they can
// produce a valid signature with the revocation public key. The

8
lnwallet/script_utils_test.go
View File

@ -105,7 +105,7 @@ func TestCommitmentSpendValidation(t *testing.T) {
})
// First, we'll test spending with Alice's key after the timeout.
delayScript, err := commitScriptToSelf(csvTimeout, aliceDelayKey,
delayScript, err := CommitScriptToSelf(csvTimeout, aliceDelayKey,
revokePubKey)
if err != nil {
t.Fatalf("unable to generate alice delay script: %v", err)
@ -357,7 +357,7 @@ func TestHTLCSenderSpendValidation(t *testing.T) {
if err != nil {
t.Fatalf("unable to create htlc sender script: %v", err)
}
htlcPkScript, err := witnessScriptHash(htlcWitnessScript)
htlcPkScript, err := WitnessScriptHash(htlcWitnessScript)
if err != nil {
t.Fatalf("unable to create p2wsh htlc script: %v", err)
}
@ -612,7 +612,7 @@ func TestHTLCReceiverSpendValidation(t *testing.T) {
if err != nil {
t.Fatalf("unable to create htlc sender script: %v", err)
}
htlcPkScript, err := witnessScriptHash(htlcWitnessScript)
htlcPkScript, err := WitnessScriptHash(htlcWitnessScript)
if err != nil {
t.Fatalf("unable to create p2wsh htlc script: %v", err)
}
@ -885,7 +885,7 @@ func TestSecondLevelHtlcSpends(t *testing.T) {
if err != nil {
t.Fatalf("unable to create htlc script: %v", err)
}
htlcPkScript, err := witnessScriptHash(htlcWitnessScript)
htlcPkScript, err := WitnessScriptHash(htlcWitnessScript)
if err != nil {
t.Fatalf("unable to create htlc output: %v", err)
}

2
lnwallet/wallet.go
View File

@ -1209,7 +1209,7 @@ func (l *LightningWallet) handleSingleFunderSigs(req *addSingleFunderSigsMsg) {
// With their signature for our version of the commitment transactions
// verified, we can now generate a signature for their version,
// allowing the funding transaction to be safely broadcast.
p2wsh, err := witnessScriptHash(witnessScript)
p2wsh, err := WitnessScriptHash(witnessScript)
if err != nil {
req.err <- err
req.completeChan <- nil