From d7d569b267c4c834cdcffb4596af3e1db52066a8 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 21 Dec 2015 15:49:34 -0600 Subject: [PATCH] lnwallet: track their current commitment sig in channel state --- lnwallet/channel.go | 9 +++++---- lnwallet/reservation.go | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lnwallet/channel.go b/lnwallet/channel.go index a71233af..d5775f19 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -43,20 +43,21 @@ type OpenChannelState struct { ourBalance btcutil.Amount theirBalance btcutil.Amount - theirCommitTx *wire.MsgTx - ourCommitTx *wire.MsgTx + theirCommitTx *wire.MsgTx + ourCommitTx *wire.MsgTx + theirCommitSig []byte fundingTx *wire.MsgTx multiSigKey *btcec.PrivateKey fundingRedeemScript []byte - ourShaChain *revocation.HyperShaChain - theirShaChain *revocation.HyperShaChain // Current revocation for their commitment transaction. However, since // this is the hash, and not the pre-image, we can't yet verify that // it's actually in the chain. theirCurrentRevocation [wire.HashSize]byte + theirShaChain *revocation.HyperShaChain + ourShaChain *revocation.HyperShaChain // Final delivery address ourDeliveryAddress btcutil.Address diff --git a/lnwallet/reservation.go b/lnwallet/reservation.go index 5fc97ea4..014b339f 100644 --- a/lnwallet/reservation.go +++ b/lnwallet/reservation.go @@ -34,8 +34,7 @@ type ChannelReservation struct { ourFundingSigs [][]byte theirFundingSigs [][]byte - ourCommitmentSig []byte - theirCommitmentSig []byte + ourCommitmentSig []byte partialState *OpenChannelState