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

lnwallet: createCommitTx now a revocation key

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2016-06-30 12:12:01 -07:00
parent d85719b5a7
commit 1b490c52ed
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lnwallet/channel.go
View File

@ -705,7 +705,7 @@ func createNewCommitmentTxns(fundingTxIn *wire.TxIn, state *channeldb.OpenChanne
// relative block delay or revocation event, and the other paying the the // relative block delay or revocation event, and the other paying the the
// counter-party within the channel, which can be spent immediately. // counter-party within the channel, which can be spent immediately.
func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey, func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey,
revokeHash []byte, csvTimeout uint32, amountToSelf, revokeKey *btcec.PublicKey, csvTimeout uint32, amountToSelf,
amountToThem btcutil.Amount) (*wire.MsgTx, error) { amountToThem btcutil.Amount) (*wire.MsgTx, error) {
// First, we create the script for the delayed "pay-to-self" output. // First, we create the script for the delayed "pay-to-self" output.
@ -713,7 +713,6 @@ func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey
// output after a relative block delay, or the remote node can claim // output after a relative block delay, or the remote node can claim
// the funds with the revocation key if we broadcast a revoked // the funds with the revocation key if we broadcast a revoked
// commitment transaction. // commitment transaction.
revokeKey := deriveRevocationPubkey(theirKey, revokeHash)
ourRedeemScript, err := commitScriptToSelf(csvTimeout, selfKey, ourRedeemScript, err := commitScriptToSelf(csvTimeout, selfKey,
revokeKey) revokeKey)
if err != nil { if err != nil {

11
lnwallet/script_utils_test.go
View File

@ -40,7 +40,8 @@ func TestCommitmentSpendValidation(t *testing.T) {
bobsPrivKey) bobsPrivKey)
channelBalance := btcutil.Amount(1 * 10e8) channelBalance := btcutil.Amount(1 * 10e8)
csvTimeout := uint32(5) csvTimeout := uint32(5)
revocationHash := testHdSeed[:] revocationPreimage := testHdSeed[:]
revokePubKey := deriveRevocationPubkey(bobKeyPub, revocationPreimage)
// With all the test data set up, we create the commitment transaction. // With all the test data set up, we create the commitment transaction.
// We only focus on a single party's transactions, as the scripts are // We only focus on a single party's transactions, as the scripts are
@ -50,7 +51,7 @@ func TestCommitmentSpendValidation(t *testing.T) {
// of 5 blocks before sweeping the output, while bob can spend // of 5 blocks before sweeping the output, while bob can spend
// immediately with either the revocation key, or his regular key. // immediately with either the revocation key, or his regular key.
commitmentTx, err := createCommitTx(fakeFundingTxIn, aliceKeyPub, commitmentTx, err := createCommitTx(fakeFundingTxIn, aliceKeyPub,
bobKeyPub, revocationHash, csvTimeout, channelBalance, channelBalance) bobKeyPub, revokePubKey, csvTimeout, channelBalance, channelBalance)
if err != nil { if err != nil {
t.Fatalf("unable to create commitment transaction: %v", nil) t.Fatalf("unable to create commitment transaction: %v", nil)
} }
@ -72,7 +73,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
}) })
// First, we'll test spending with Alice's key after the timeout. // First, we'll test spending with Alice's key after the timeout.
revokePubKey := deriveRevocationPubkey(bobKeyPub, revocationHash)
delayScript, err := commitScriptToSelf(csvTimeout, aliceKeyPub, revokePubKey) delayScript, err := commitScriptToSelf(csvTimeout, aliceKeyPub, revokePubKey)
if err != nil { if err != nil {
t.Fatalf("unable to generate alice delay script: %v") t.Fatalf("unable to generate alice delay script: %v")
@ -82,7 +82,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unable to generate delay commit spend witness :%v") t.Fatalf("unable to generate delay commit spend witness :%v")
} }
sweepTx.TxIn[0].Witness = aliceWitnessSpend sweepTx.TxIn[0].Witness = aliceWitnessSpend
vm, err := txscript.NewEngine(delayOutput.PkScript, vm, err := txscript.NewEngine(delayOutput.PkScript,
sweepTx, 0, txscript.StandardVerifyFlags, nil, sweepTx, 0, txscript.StandardVerifyFlags, nil,
@ -97,13 +96,12 @@ func TestCommitmentSpendValidation(t *testing.T) {
// Next, we'll test bob spending with the derived revocation key to // Next, we'll test bob spending with the derived revocation key to
// simulate the scenario when alice broadcasts this commitmen // simulate the scenario when alice broadcasts this commitmen
// transaction after it's been revoked. // transaction after it's been revoked.
revokePrivKey := deriveRevocationPrivKey(bobKeyPriv, revocationHash) revokePrivKey := deriveRevocationPrivKey(bobKeyPriv, revocationPreimage)
bobWitnessSpend, err := commitSpendRevoke(delayScript, channelBalance, bobWitnessSpend, err := commitSpendRevoke(delayScript, channelBalance,
revokePrivKey, sweepTx) revokePrivKey, sweepTx)
if err != nil { if err != nil {
t.Fatalf("unable to generate revocation witness: %v", err) t.Fatalf("unable to generate revocation witness: %v", err)
} }
sweepTx.TxIn[0].Witness = bobWitnessSpend sweepTx.TxIn[0].Witness = bobWitnessSpend
vm, err = txscript.NewEngine(delayOutput.PkScript, vm, err = txscript.NewEngine(delayOutput.PkScript,
sweepTx, 0, txscript.StandardVerifyFlags, nil, sweepTx, 0, txscript.StandardVerifyFlags, nil,
@ -126,7 +124,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unable to create bob regular spend: %v", err) t.Fatalf("unable to create bob regular spend: %v", err)
} }
sweepTx.TxIn[0].Witness = bobRegularSpend sweepTx.TxIn[0].Witness = bobRegularSpend
vm, err = txscript.NewEngine(regularOutput.PkScript, vm, err = txscript.NewEngine(regularOutput.PkScript,
sweepTx, 0, txscript.StandardVerifyFlags, nil, sweepTx, 0, txscript.StandardVerifyFlags, nil,