From 2ff1ec3bca671c2ae17904a9eabfbf8d8a335bec Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:15:44 +0700
Subject: [PATCH 1/9] docs: Update format flag usage with valid placeholders
 for ChainListCmd

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cli/chain.go b/cli/chain.go
index e04a715ac1e..8f6c4024568 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -585,7 +585,12 @@ var ChainListCmd = &cli.Command{
 		&cli.IntFlag{Name: "count", Value: 30},
 		&cli.StringFlag{
 			Name:  "format",
-			Usage: "specify the format to print out tipsets",
+			Usage: `specify the format to print out tipsets. Valid placeholders:
+  <height>: The height of the tipset
+  <time>: The timestamp of the tipset
+  <blocks>: A list of blocks in the tipset
+  <tipset>: A comma-separated list of CIDs for the tipset
+  <weight>: The parent weight of the first block in the tipset`,
 			Value: "<height>: (<time>) <blocks>",
 		},
 		&cli.BoolFlag{

From e7f7c7073d08a7dc8e3433c9441a1e9201388111 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:20:49 +0700
Subject: [PATCH 2/9] feat: Add <json_tipset> placeholder for JSON encoding of
 the tipset

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cli/chain.go b/cli/chain.go
index 8f6c4024568..37387403aa2 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -590,7 +590,8 @@ var ChainListCmd = &cli.Command{
   <time>: The timestamp of the tipset
   <blocks>: A list of blocks in the tipset
   <tipset>: A comma-separated list of CIDs for the tipset
-  <weight>: The parent weight of the first block in the tipset`,
+  <weight>: The parent weight of the first block in the tipset
+  <json_tipset>: JSON encoding of the tipset`,
 			Value: "<height>: (<time>) <blocks>",
 		},
 		&cli.BoolFlag{
@@ -953,6 +954,15 @@ func printTipSet(format string, ts *types.TipSet, afmt *AppFmt) {
 
 	format = strings.ReplaceAll(format, "<tipset>", strings.Join(sCids, ","))
 	format = strings.ReplaceAll(format, "<blocks>", blks)
+	if strings.Contains(format, "<json_tipset>") {
+		jsonTipset, err := json.MarshalIndent(ts, "", "  ")
+		if err != nil {
+			afmt.Println("Error encoding tipset to JSON:", err)
+			return
+		}
+		format = strings.ReplaceAll(format, "<json_tipset>", string(jsonTipset))
+	}
+
 	format = strings.ReplaceAll(format, "<weight>", fmt.Sprint(ts.Blocks()[0].ParentWeight))
 
 	afmt.Println(format)

From d53baa92512f79b2d724fe20805c467f35be1750 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:21:44 +0700
Subject: [PATCH 3/9] style: Fix formatting in chain.go for consistency and
 readability

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cli/chain.go b/cli/chain.go
index 37387403aa2..dab5d9c0326 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -584,7 +584,7 @@ var ChainListCmd = &cli.Command{
 		&cli.Uint64Flag{Name: "height", DefaultText: "current head"},
 		&cli.IntFlag{Name: "count", Value: 30},
 		&cli.StringFlag{
-			Name:  "format",
+			Name: "format",
 			Usage: `specify the format to print out tipsets. Valid placeholders:
   <height>: The height of the tipset
   <time>: The timestamp of the tipset
@@ -957,6 +957,7 @@ func printTipSet(format string, ts *types.TipSet, afmt *AppFmt) {
 	if strings.Contains(format, "<json_tipset>") {
 		jsonTipset, err := json.MarshalIndent(ts, "", "  ")
 		if err != nil {
+			// should not happen
 			afmt.Println("Error encoding tipset to JSON:", err)
 			return
 		}

From 0cf9f8c711196326fc30ecd5799f9bd9f83edde4 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:22:06 +0700
Subject: [PATCH 4/9] fix: Change JSON encoding to single line without
 indentation

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/chain.go b/cli/chain.go
index dab5d9c0326..195cf6e89a7 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -955,7 +955,7 @@ func printTipSet(format string, ts *types.TipSet, afmt *AppFmt) {
 	format = strings.ReplaceAll(format, "<tipset>", strings.Join(sCids, ","))
 	format = strings.ReplaceAll(format, "<blocks>", blks)
 	if strings.Contains(format, "<json_tipset>") {
-		jsonTipset, err := json.MarshalIndent(ts, "", "  ")
+		jsonTipset, err := json.Marshal(ts)
 		if err != nil {
 			// should not happen
 			afmt.Println("Error encoding tipset to JSON:", err)

From 58d77af456914c58f11ecf0df5ed856982824b03 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:23:02 +0700
Subject: [PATCH 5/9] docs: Update Usage for format flag to remove placeholder
 explanations

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/cli/chain.go b/cli/chain.go
index 195cf6e89a7..712d452b534 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -585,13 +585,7 @@ var ChainListCmd = &cli.Command{
 		&cli.IntFlag{Name: "count", Value: 30},
 		&cli.StringFlag{
 			Name: "format",
-			Usage: `specify the format to print out tipsets. Valid placeholders:
-  <height>: The height of the tipset
-  <time>: The timestamp of the tipset
-  <blocks>: A list of blocks in the tipset
-  <tipset>: A comma-separated list of CIDs for the tipset
-  <weight>: The parent weight of the first block in the tipset
-  <json_tipset>: JSON encoding of the tipset`,
+			Usage: "specify the format to print out tipsets using placeholders like <height>, <time>, <blocks>, <tipset>, <weight>, <json_tipset>",
 			Value: "<height>: (<time>) <blocks>",
 		},
 		&cli.BoolFlag{

From 4465f0a421a298264d18586e0d51fbee68690680 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:30:48 +0700
Subject: [PATCH 6/9] feat: Rename 'height' flag to 'epoch' in ChainListCmd and
 update usage

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 cli/chain.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cli/chain.go b/cli/chain.go
index 712d452b534..078f5542788 100644
--- a/cli/chain.go
+++ b/cli/chain.go
@@ -581,12 +581,12 @@ var ChainListCmd = &cli.Command{
 	Aliases: []string{"love"},
 	Usage:   "View a segment of the chain",
 	Flags: []cli.Flag{
-		&cli.Uint64Flag{Name: "height", DefaultText: "current head"},
+		&cli.Uint64Flag{Name: "epoch", Aliases: []string{"height"}, DefaultText: "current head"},
 		&cli.IntFlag{Name: "count", Value: 30},
 		&cli.StringFlag{
-			Name: "format",
-			Usage: "specify the format to print out tipsets using placeholders like <height>, <time>, <blocks>, <tipset>, <weight>, <json_tipset>",
-			Value: "<height>: (<time>) <blocks>",
+			Name:  "format",
+			Usage: "specify the format to print out tipsets using placeholders: <epoch>, <time>, <blocks>, <weight>, <tipset>, <json_tipset>\n",
+			Value: "<epoch>: (<time>) <blocks>",
 		},
 		&cli.BoolFlag{
 			Name:  "gas-stats",
@@ -932,7 +932,9 @@ func handleHamtAddress(ctx context.Context, api v0api.FullNode, r cid.Cid) error
 }
 
 func printTipSet(format string, ts *types.TipSet, afmt *AppFmt) {
-	format = strings.ReplaceAll(format, "<height>", fmt.Sprint(ts.Height()))
+	format = strings.ReplaceAll(format, "<epoch>", fmt.Sprint(ts.Height()))
+	format = strings.ReplaceAll(format, "<height>", fmt.Sprint(ts.Height())) // backwards compatibility
+
 	format = strings.ReplaceAll(format, "<time>", time.Unix(int64(ts.MinTimestamp()), 0).Format(time.Stamp))
 	blks := "[ "
 	for _, b := range ts.Blocks() {

From abbb75bc7384e97827ad1f057e6e5804171a3fa0 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 17:43:42 +0700
Subject: [PATCH 7/9] add changelog

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef512d3f33f..f4c8d45b4f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Return a `"data"` field on the `"error"` returned from RPC when `eth_call` and `eth_estimateGas` APIs encounter `execution reverted` errors. ([filecoin-project/lotus#12553](https://github.com/filecoin-project/lotus/pull/12553))
 - Implement `EthGetTransactionByBlockNumberAndIndex` (`eth_getTransactionByBlockNumberAndIndex`) and `EthGetTransactionByBlockHashAndIndex` (`eth_getTransactionByBlockHashAndIndex`) methods. ([filecoin-project/lotus#12618](https://github.com/filecoin-project/lotus/pull/12618))
 - Add a set of `lotus-shed datastore` commands for importing, exporting, and clearing parts of the datastore ([filecoin-project/lotus#12685](https://github.com/filecoin-project/lotus/pull/12685)):
+- Add json output of tipsets to `louts chain list`. ([filecoin-project/lotus#12691](https://github.com/filecoin-project/lotus/pull/12691))
 
 ## Bug Fixes
 - Fix a bug in the `lotus-shed indexes backfill-events` command that may result in either duplicate events being backfilled where there are existing events (such an operation *should* be idempotent) or events erroneously having duplicate `logIndex` values when queried via ETH APIs. ([filecoin-project/lotus#12567](https://github.com/filecoin-project/lotus/pull/12567))

From c01f8dbf86b692d293f71cf4153e53479ab0e19f Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Tue, 12 Nov 2024 18:36:05 +0700
Subject: [PATCH 8/9] docs: Update CLI options in lotus documentation for
 clarity and detail

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 documentation/en/cli-lotus.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md
index 9dc5c6c944d..237b58c0aa9 100644
--- a/documentation/en/cli-lotus.md
+++ b/documentation/en/cli-lotus.md
@@ -1718,11 +1718,12 @@ USAGE:
    lotus chain list [command options] [arguments...]
 
 OPTIONS:
-   --height value  (default: current head)
-   --count value   (default: 30)
-   --format value  specify the format to print out tipsets (default: "<height>: (<time>) <blocks>")
-   --gas-stats     view gas statistics for the chain (default: false)
-   --help, -h      show help
+   --epoch value, --height value  (default: current head)
+   --count value                  (default: 30)
+   --format value                 specify the format to print out tipsets using placeholders: <epoch>, <time>, <blocks>, <weight>, <tipset>, <json_tipset>
+       (default: "<epoch>: (<time>) <blocks>")
+   --gas-stats  view gas statistics for the chain (default: false)
+   --help, -h   show help
 ```
 
 ### lotus chain get

From eb63f5d7aba8223226463631b62bedd7a666b2ee Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <oss@kubuxu.com>
Date: Fri, 6 Dec 2024 15:52:48 +0100
Subject: [PATCH 9/9] fix changelog

Signed-off-by: Jakub Sztandera <oss@kubuxu.com>
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cfe6260a0b..d9ccac8798a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Add json output of tipsets to `louts chain list`. ([filecoin-project/lotus#12691](https://github.com/filecoin-project/lotus/pull/12691))
 
+# UNRELEASED v.1.32.0
+
 
 See https://github.com/filecoin-project/lotus/blob/release/v1.32.0/CHANGELOG.md