From 6b6804cf38ada91e48692279ca0cb5d6148a8d1e Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@monax.io>
Date: Wed, 22 Aug 2018 12:08:46 +0100
Subject: [PATCH] Update dump to use amino codec
Signed-off-by: Silas Davis <silas@monax.io>
---
cmd/burrow/commands/dump.go | 9 ++++++++-
forensics/block_explorer.go | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cmd/burrow/commands/dump.go b/cmd/burrow/commands/dump.go
index 46a4aaf8..0e53bd39 100644
--- a/cmd/burrow/commands/dump.go
+++ b/cmd/burrow/commands/dump.go
@@ -61,7 +61,14 @@ func Dump(output Output) func(cmd *cli.Cmd) {
_, err = explorer.Blocks(start, end,
func(block *forensics.Block) (stop bool) {
stopped, err := block.Transactions(func(txEnv *txs.Envelope) (stop bool) {
- bs, err := json.Marshal(txEnv)
+ wrapper := struct{
+ Height int64
+ Tx *txs.Envelope
+ }{
+ Height: block.Height,
+ Tx: txEnv,
+ }
+ bs, err := json.Marshal(wrapper)
if err != nil {
output.Fatalf("Could not deserialise transaction: %v", err)
}
diff --git a/forensics/block_explorer.go b/forensics/block_explorer.go
index ce2f492e..fdec4bf8 100644
--- a/forensics/block_explorer.go
+++ b/forensics/block_explorer.go
@@ -16,7 +16,7 @@ type BlockExplorer struct {
func NewBlockExplorer(dbBackendType db.DBBackendType, dbDir string) *BlockExplorer {
return &BlockExplorer{
- txDecoder: txs.NewJSONCodec(),
+ txDecoder: txs.NewAminoCodec(),
BlockStore: blockchain.NewBlockStore(tendermint.DBProvider("blockstore", dbBackendType, dbDir)),
}
}
--
GitLab