From 93a84aa0143f6bc0787891ab2fe9b0beb36f4b22 Mon Sep 17 00:00:00 2001
From: Wilmer Paulino <wilmer.paulino@gmail.com>
Date: Tue, 29 Oct 2019 18:51:12 -0700
Subject: [PATCH] btcjson: use correct json tag for
 Bip9SoftForkDescription.StartTime

---
 btcjson/chainsvrresults.go | 19 ++++++++++++++-----
 rpcserver.go               |  8 ++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/btcjson/chainsvrresults.go b/btcjson/chainsvrresults.go
index 257a6c90..7e6c7107 100644
--- a/btcjson/chainsvrresults.go
+++ b/btcjson/chainsvrresults.go
@@ -90,11 +90,20 @@ type SoftForkDescription struct {
 // Bip9SoftForkDescription describes the current state of a defined BIP0009
 // version bits soft-fork.
 type Bip9SoftForkDescription struct {
-	Status    string `json:"status"`
-	Bit       uint8  `json:"bit"`
-	StartTime int64  `json:"startTime"`
-	Timeout   int64  `json:"timeout"`
-	Since     int32  `json:"since"`
+	Status     string `json:"status"`
+	Bit        uint8  `json:"bit"`
+	StartTime1 int64  `json:"startTime"`
+	StartTime2 int64  `json:"start_time"`
+	Timeout    int64  `json:"timeout"`
+	Since      int32  `json:"since"`
+}
+
+// StartTime returns the starting time of the softfork as a Unix epoch.
+func (d *Bip9SoftForkDescription) StartTime() int64 {
+	if d.StartTime1 != 0 {
+		return d.StartTime1
+	}
+	return d.StartTime2
 }
 
 // SoftForks describes the current softforks enabled by the backend. Softforks
diff --git a/rpcserver.go b/rpcserver.go
index 0a7ab8ed..e762cc1a 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1284,10 +1284,10 @@ func handleGetBlockChainInfo(s *rpcServer, cmd interface{}, closeChan <-chan str
 		// Finally, populate the soft-fork description with all the
 		// information gathered above.
 		chainInfo.SoftForks.Bip9SoftForks[forkName] = &btcjson.Bip9SoftForkDescription{
-			Status:    strings.ToLower(statusString),
-			Bit:       deploymentDetails.BitNumber,
-			StartTime: int64(deploymentDetails.StartTime),
-			Timeout:   int64(deploymentDetails.ExpireTime),
+			Status:     strings.ToLower(statusString),
+			Bit:        deploymentDetails.BitNumber,
+			StartTime2: int64(deploymentDetails.StartTime),
+			Timeout:    int64(deploymentDetails.ExpireTime),
 		}
 	}