From db8c6d4cf4b761e911f57931fefbede89097cb16 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Thu, 16 Feb 2017 21:03:24 +0800
Subject: [PATCH] channeldb: modify the NumUpdates field in ChannelDelta to be
 a uint64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit modifies the running update count within all ChannelDelta’s
to track the number of updates using a uint64 rather than a uint32.
This change reflects the fact that the obsfucated commitment hints are
to be encoded using a 48-bit integer, rather than a 32-bit integer.
---
 channeldb/channel.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/channeldb/channel.go b/channeldb/channel.go
index 1b5fdecd9..890a8788e 100644
--- a/channeldb/channel.go
+++ b/channeldb/channel.go
@@ -455,7 +455,7 @@ func (h *HTLC) Copy() HTLC {
 type ChannelDelta struct {
 	LocalBalance  btcutil.Amount
 	RemoteBalance btcutil.Amount
-	UpdateNum     uint32
+	UpdateNum     uint64
 
 	// TODO(roasbeef): add blockhash or timestamp?
 
@@ -554,7 +554,7 @@ func (c *OpenChannel) FindPreviousState(updateNum uint64) (*ChannelDelta, error)
 
 		var err error
 		delta, err = fetchChannelLogEntry(logBucket, c.ChanID,
-			uint32(updateNum))
+			updateNum)
 
 		return err
 	})
@@ -1760,8 +1760,8 @@ func serializeChannelDelta(w io.Writer, delta *ChannelDelta) error {
 		return err
 	}
 
-	byteOrder.PutUint32(scratch[:4], delta.UpdateNum)
-	if _, err := w.Write(scratch[:4]); err != nil {
+	byteOrder.PutUint64(scratch[:], delta.UpdateNum)
+	if _, err := w.Write(scratch[:]); err != nil {
 		return err
 	}
 
@@ -1795,10 +1795,10 @@ func deserializeChannelDelta(r io.Reader) (*ChannelDelta, error) {
 	}
 	delta.RemoteBalance = btcutil.Amount(byteOrder.Uint64(scratch[:]))
 
-	if _, err := r.Read(scratch[:4]); err != nil {
+	if _, err := r.Read(scratch[:]); err != nil {
 		return nil, err
 	}
-	delta.UpdateNum = byteOrder.Uint32(scratch[:4])
+	delta.UpdateNum = byteOrder.Uint64(scratch[:])
 
 	numHtlcs, err := wire.ReadVarInt(r, 0)
 	if err != nil {
@@ -1817,20 +1817,20 @@ func deserializeChannelDelta(r io.Reader) (*ChannelDelta, error) {
 	return delta, nil
 }
 
-func makeLogKey(o *wire.OutPoint, updateNum uint32) [40]byte {
+func makeLogKey(o *wire.OutPoint, updateNum uint64) [40]byte {
 	var (
-		scratch [4]byte
+		scratch [8]byte
 		n       int
 		k       [40]byte
 	)
 
 	n += copy(k[:], o.Hash[:])
 
-	byteOrder.PutUint32(scratch[:], o.Index)
-	copy(k[n:], scratch[:])
+	byteOrder.PutUint32(scratch[:4], o.Index)
+	copy(k[n:], scratch[:4])
 	n += 4
 
-	byteOrder.PutUint32(scratch[:], updateNum)
+	byteOrder.PutUint64(scratch[:], updateNum)
 	copy(k[n:], scratch[:])
 
 	return k
@@ -1849,7 +1849,7 @@ func appendChannelLogEntry(log *bolt.Bucket, delta *ChannelDelta,
 }
 
 func fetchChannelLogEntry(log *bolt.Bucket, chanPoint *wire.OutPoint,
-	updateNum uint32) (*ChannelDelta, error) {
+	updateNum uint64) (*ChannelDelta, error) {
 
 	logEntrykey := makeLogKey(chanPoint, updateNum)
 	deltaBytes := log.Get(logEntrykey[:])