Fixed multisig list to show even when no approval given yet

eosc/cmd/msigList.go

@@ -21,6 +21,38 @@ var msigListCmd = &cobra.Command{
 		proposer := toAccount(args[0], "proposer")
 
 		response, err := api.GetTableRows(
+			eos.GetTableRowsRequest{
+				Code:  "eosio.msig",
+				Scope: string(proposer),
+				Table: "proposal",
+				JSON:  true,
+			},
+		)
+		errorCheck("get table row", err)
+
+		var proposals []proposalRow
+		err = response.JSONToStructs(&proposals)
+		errorCheck("reading proposal list", err)
+
+		if printJSON, _ := cmd.Flags().GetBool("json"); printJSON == true {
+			data, err := json.MarshalIndent(proposals, "", "  ")
+			errorCheck("json marshal", err)
+			fmt.Println(string(data))
+			return
+		}
+
+		if len(proposals) == 0 {
+			errorCheck("No multisig proposal found", fmt.Errorf("not found"))
+		} else {
+			fmt.Println("All active proposals")
+			fmt.Println("---------------------")
+			for _, proposal := range proposals {
+				fmt.Println("Proposal name:", proposal.ProposalName)
+			}
+			fmt.Println("---------------------")
+		}
+
+		response, err = api.GetTableRows(
 			eos.GetTableRowsRequest{
 				Code:  "eosio.msig",
 				Scope: string(proposer),
@@ -32,7 +64,7 @@ var msigListCmd = &cobra.Command{
 
 		var approvals []approvalRow
 		err = response.JSONToStructs(&approvals)
-		errorCheck("reading approvals_info list", err)
+		errorCheck("reading approval_info list", err)
 
 		if printJSON, _ := cmd.Flags().GetBool("json"); printJSON == true {
 			data, err := json.MarshalIndent(approvals, "", "  ")
@@ -45,12 +77,13 @@ var msigListCmd = &cobra.Command{
 			info.Show()
 			fmt.Println()
 		}
-		if len(approvals) == 0 {
-			errorCheck("No multisig proposal found", fmt.Errorf("not found"))
-		}
 	},
 }
 
+type proposalRow struct {
+	ProposalName eos.Name     `json:"proposal_name"`
+	Transaction  eos.HexBytes `json:"packed_transaction"`
+}
 type approvalRow struct {
 	ProposalName       eos.Name              `json:"proposal_name"`
 	RequestedApprovals []eos.PermissionLevel `json:"requested_approvals"`
@@ -63,6 +96,7 @@ func (a approvalRow) Show() {
 	fmt.Print(formatAuths(a.RequestedApprovals))
 	fmt.Println("Provided approvals:")
 	fmt.Print(formatAuths(a.ProvidedApprovals))
+	fmt.Println("---------------------")
 }
 
 func formatAuths(perms []eos.PermissionLevel) string {

eosc/cmd/msigReview.go

@@ -34,17 +34,17 @@ var msigReviewCmd = &cobra.Command{
 		)
 		errorCheck("get table row", err)
 
-		var transactions []struct {
+		var proposals []struct {
 			ProposalName eos.Name     `json:"proposal_name"`
 			Transaction  eos.HexBytes `json:"packed_transaction"`
 		}
-		err = response.JSONToStructs(&transactions)
-		errorCheck("reading proposed transactions", err)
+		err = response.JSONToStructs(&proposals)
+		errorCheck("reading proposed proposals", err)
 
 		var tx *eos.Transaction
-		for _, txData := range transactions {
-			if txData.ProposalName == proposalName {
-				err := eos.UnmarshalBinary(txData.Transaction, &tx)
+		for _, proposalRow := range proposals {
+			if proposalRow.ProposalName == proposalName {
+				err := eos.UnmarshalBinary(proposalRow.Transaction, &tx)
 				errorCheck("unmarshalling packed transaction", err)
 
 				ana := analysis.NewAnalyzer(viper.GetBool("multisig-review-cmd-dump"))