From d9decfa7a4d49669e12aef5468b38d5fdf667647 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Fri, 22 Jan 2021 04:09:34 -0600
Subject: [PATCH] feat: allow a "raw:" recipient prefix to skip bech32
 validation (#388)

On Agoric, at least, the recipient is not a Cosmos address, it is
the address of an object in the Agoric VM.  So, it should not be
parsed by the transfer CLI.
---
 cmd/xfer.go | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/cmd/xfer.go b/cmd/xfer.go
index 761323e1755..0350cfb9728 100644
--- a/cmd/xfer.go
+++ b/cmd/xfer.go
@@ -10,6 +10,14 @@ import (
 	"github.com/cosmos/relayer/relayer"
 )
 
+type stringStringer struct {
+	str string
+}
+
+func (ss stringStringer) String() string {
+	return ss.str
+}
+
 // NOTE: These commands are registered over in cmd/raw.go
 
 func xfersend() *cobra.Command {
@@ -23,6 +31,7 @@ func xfersend() *cobra.Command {
 		Example: strings.TrimSpace(fmt.Sprintf(`
 $ %s transact transfer ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo-path
 $ %s tx xfer ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo -y 2 -c 10
+$ %s tx xfer ibc-0 ibc-1 100000stake raw:non-bech32-address --path demo
 $ %s tx txf ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo
 $ %s tx raw send ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo -c 5
 `, appName, appName, appName, appName)),
@@ -73,12 +82,21 @@ $ %s tx raw send ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9
 				return err
 			}
 
-			done := c[dst].UseSDKContext()
-			dstAddr, err := sdk.AccAddressFromBech32(args[3])
-			if err != nil {
-				return err
+			// If the argument begins with "raw:" then use the suffix directly.
+			rawDstAddr := strings.TrimPrefix(args[3], "raw:")
+			var dstAddr fmt.Stringer
+			if rawDstAddr == args[3] {
+				// Not "raw:", treat the dstAddr as bech32.
+				done := c[dst].UseSDKContext()
+				dstAddr, err = sdk.AccAddressFromBech32(args[3])
+				if err != nil {
+					return err
+				}
+				done()
+			} else {
+				// Don't parse the rest of the dstAddr... it's raw.
+				dstAddr = stringStringer{str: rawDstAddr}
 			}
-			done()
 
 			return c[src].SendTransferMsg(c[dst], amount, dstAddr, toHeightOffset, toTimeOffset)
 		},