Merge pull request cosmos#1032 from elvin-du/develop

Autosequence IBC relay account nonces

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.18.1
+
+BUG FIXES
+* auto-sequencing transactions correctly
+* query sequence via account store
+
 ## 0.18.0 
 
 *TBD*

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)