fix the upgrade and iservice cli

irisnet · Nov 9, 2018 · 8a3d7e2 · 8a3d7e2
1 parent 39e368b
commit 8a3d7e2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/client/iservice/cli/query.go b/client/iservice/cli/query.go
@@ -92,7 +92,7 @@ func GetCmdQueryScvBind(storeName string, cdc *codec.Codec) *cobra.Command {
 			}
 
 			var svcBinding iservice.SvcBinding
-			cdc.MustUnmarshalBinary(res, &svcBinding)
+			cdc.MustUnmarshalBinaryLengthPrefixed(res, &svcBinding)
 			output, err := codec.MarshalJSONIndent(cdc, svcBinding)
 			fmt.Println(string(output))
 			return nil
@@ -126,7 +126,7 @@ func GetCmdQueryScvBinds(storeName string, cdc *codec.Codec) *cobra.Command {
 			var bindings []iservice.SvcBinding
 			for i := 0; i < len(res); i++ {
 				var binding iservice.SvcBinding
-				cdc.MustUnmarshalBinary(res[i].Value, &binding)
+				cdc.MustUnmarshalBinaryLengthPrefixed(res[i].Value, &binding)
 				bindings = append(bindings, binding)
 			}
 

diff --git a/client/tendermint/tx/querytx.go b/client/tendermint/tx/querytx.go
@@ -115,7 +115,7 @@ type Info struct {
 func parseTx(cdc *codec.Codec, txBytes []byte) (sdk.Tx, error) {
 	var tx auth.StdTx
 
-	err := cdc.UnMarshalBinaryLengthPrefixed(txBytes, &tx)
+	err := cdc.UnmarshalBinaryLengthPrefixed(txBytes, &tx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/client/upgrade/cli/query.go b/client/upgrade/cli/query.go
@@ -64,7 +64,7 @@ func GetCmdQuerySwitch(storeName string, cdc *codec.Codec) *cobra.Command {
 		Short: "query switch details",
 		Example: "iriscli upgrade query-switch --proposalID 1 --voter <voter address>",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			proposalID := viper.GetInt64(flagProposalID)
+			proposalID := uint64(viper.GetInt64(flagProposalID))
 			voterStr := viper.GetString(flagVoter)
 
 			voter, err := sdk.AccAddressFromBech32(voterStr)

diff --git a/client/upgrade/cli/sendtx.go b/client/upgrade/cli/sendtx.go
@@ -26,7 +26,7 @@ func GetCmdSubmitSwitch(cdc *codec.Codec) *cobra.Command {
 		Example: "iriscli upgrade submit-switch --chain-id=<chain-id> --from=<key name> --fee=0.004iris --proposalID 1 --title <title>",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			title := viper.GetString(flagTitle)
-			proposalID := viper.GetInt64(flagProposalID)
+			proposalID := uint64(viper.GetInt64(flagProposalID))
 
 			cliCtx := context.NewCLIContext().
 				WithCodec(cdc).

diff --git a/cmd/iriscli/main.go b/cmd/iriscli/main.go
@@ -143,6 +143,8 @@ func main() {
 			stakecmd.GetCmdQueryDelegations("stake", cdc),
 			stakecmd.GetCmdQueryUnbondingDelegation("stake", cdc),
 			stakecmd.GetCmdQueryUnbondingDelegations("stake", cdc),
+			stakecmd.GetCmdQueryValidatorUnbondingDelegations("stake", cdc),
+			stakecmd.GetCmdQueryValidatorRedelegations("stake", cdc),
 			stakecmd.GetCmdQueryRedelegation("stake", cdc),
 			stakecmd.GetCmdQueryRedelegations("stake", cdc),
 			stakecmd.GetCmdQueryPool("stake", cdc),