From 029c0e9c725b8a3d932b8e8c65be7ddf5ba04232 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Mon, 22 May 2017 13:16:08 +0200
Subject: [PATCH] 90: don't panic on missing pk in tx construction

---
 cmd/basecli/commands/adapters.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/cmd/basecli/commands/adapters.go b/cmd/basecli/commands/adapters.go
index f475456741..a1899019c1 100644
--- a/cmd/basecli/commands/adapters.go
+++ b/cmd/basecli/commands/adapters.go
@@ -107,9 +107,15 @@ func (t SendTxReader) ReadTxFlags(flags interface{}, pk crypto.PubKey) (interfac
 		return nil, err
 	}
 
+	// get addr if available
+	var addr []byte
+	if !pk.Empty() {
+		addr = pk.Address()
+	}
+
 	// craft the tx
 	input := btypes.TxInput{
-		Address:  pk.Address(),
+		Address:  addr,
 		Coins:    amountCoins,
 		Sequence: data.Sequence,
 	}
@@ -174,9 +180,15 @@ func (t AppTxReader) ReadTxFlags(data *AppFlags, app string, appData []byte, pk
 		return nil, err
 	}
 
+	// get addr if available
+	var addr []byte
+	if !pk.Empty() {
+		addr = pk.Address()
+	}
+
 	// craft the tx
 	input := btypes.TxInput{
-		Address:  pk.Address(),
+		Address:  addr,
 		Coins:    amountCoins,
 		Sequence: data.Sequence,
 	}