From d5df88ea5d76484d94e7c95b192e433c94cedad6 Mon Sep 17 00:00:00 2001
From: elvin <dumanxiang@wancloud.io>
Date: Mon, 21 May 2018 15:53:59 +0800
Subject: [PATCH] fix relay bug

---
 Gopkg.lock                | 47 ++++++++++++++++++++++++++++++++++++++-
 x/ibc/client/cli/relay.go | 17 +++++++++-----
 2 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 37a32820c2..dcc57cab33 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -13,6 +13,51 @@
   packages = ["btcec"]
   revision = "1432d294a5b055c297457c25434efbf13384cc46"
 
+[[projects]]
+  name = "github.com/cosmos/cosmos-sdk"
+  packages = [
+    "baseapp",
+    "client",
+    "client/context",
+    "client/keys",
+    "client/lcd",
+    "client/rpc",
+    "client/tx",
+    "cmd/gaia/app",
+    "examples/basecoin/app",
+    "examples/basecoin/types",
+    "examples/democoin/app",
+    "examples/democoin/types",
+    "examples/democoin/x/cool",
+    "examples/democoin/x/cool/client/cli",
+    "examples/democoin/x/pow",
+    "examples/democoin/x/pow/client/cli",
+    "examples/democoin/x/simplestake",
+    "examples/democoin/x/simplestake/client/cli",
+    "examples/democoin/x/sketchy",
+    "mock",
+    "server",
+    "store",
+    "tests",
+    "types",
+    "version",
+    "wire",
+    "x/auth",
+    "x/auth/client/cli",
+    "x/auth/client/rest",
+    "x/bank",
+    "x/bank/client",
+    "x/bank/client/cli",
+    "x/bank/client/rest",
+    "x/ibc",
+    "x/ibc/client/cli",
+    "x/ibc/client/rest",
+    "x/stake",
+    "x/stake/client/cli"
+  ]
+  revision = "187be1a5df81de1fd71da9053102d3a4868ec979"
+  version = "v0.17.2"
+
 [[projects]]
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
@@ -457,6 +502,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "7540d2ecdb5d7d5084ab4e6132e929bbd501bd6add3006d8f08a6b2c127e0c7d"
+  inputs-digest = "9b6ee069da61cf1815c332c5624e8af99b51ea72e2e9b91d780db92299598dcc"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/x/ibc/client/cli/relay.go b/x/ibc/client/cli/relay.go
index 86e8b1dbf8..3a1e63a84a 100644
--- a/x/ibc/client/cli/relay.go
+++ b/x/ibc/client/cli/relay.go
@@ -30,6 +30,7 @@ type relayCommander struct {
 	decoder   sdk.AccountDecoder
 	mainStore string
 	ibcStore  string
+	accStore  string
 
 	logger log.Logger
 }
@@ -41,6 +42,7 @@ func IBCRelayCmd(cdc *wire.Codec) *cobra.Command {
 		decoder:   authcmd.GetAccountDecoder(cdc),
 		ibcStore:  "ibc",
 		mainStore: "main",
+		accStore:  "acc",
 
 		logger: log.NewTMLogger(log.NewSyncWriter(os.Stdout)),
 	}
@@ -157,17 +159,20 @@ func (c relayCommander) broadcastTx(seq int64, node string, tx []byte) error {
 }
 
 func (c relayCommander) getSequence(node string) int64 {
-	res, err := query(node, c.address, c.mainStore)
+	res, err := query(node, c.address, c.accStore)
 	if err != nil {
 		panic(err)
 	}
+	if nil != res {
+		account, err := c.decoder(res)
+		if err != nil {
+			panic(err)
+		}
 
-	account, err := c.decoder(res)
-	if err != nil {
-		panic(err)
+		return account.GetSequence()
 	}
 
-	return account.GetSequence()
+	return 0
 }
 
 func (c relayCommander) refine(bz []byte, sequence int64, passphrase string) []byte {
@@ -182,7 +187,7 @@ func (c relayCommander) refine(bz []byte, sequence int64, passphrase string) []b
 		Sequence:  sequence,
 	}
 
-	ctx := context.NewCoreContextFromViper()
+	ctx := context.NewCoreContextFromViper().WithSequence(sequence)
 	res, err := ctx.SignAndBuild(ctx.FromAddressName, passphrase, msg, c.cdc)
 	if err != nil {
 		panic(err)