lnwallet: track their current commitment sig in channel state

lnwallet/channel.go

@@ -45,18 +45,19 @@ type OpenChannelState struct {
 
 	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

lnwallet/reservation.go

@@ -35,7 +35,6 @@ type ChannelReservation struct {
 	theirFundingSigs [][]byte
 
 	ourCommitmentSig []byte
-	theirCommitmentSig []byte
 
 	partialState *OpenChannelState