refactor(network): remove MainnetVestingAccount from mainnet account

go.mod

@@ -46,7 +46,7 @@ require (
 	github.com/stretchr/testify v1.7.1
 	github.com/takuoki/gocase v1.0.0
 	github.com/tendermint/flutter/v2 v2.0.4
-	github.com/tendermint/spn v0.2.1-0.20220609194312-7833ecf4454a
+	github.com/tendermint/spn v0.2.1-0.20220610090138-44b136f042c4
 	github.com/tendermint/tendermint v0.34.19
 	github.com/tendermint/tm-db v0.6.7
 	github.com/tendermint/vue v0.3.5

go.sum

@@ -1473,8 +1473,10 @@ github.com/tendermint/fundraising v0.3.0 h1:VtHfmVlAS93MUDlt6Em21l3taw6s9kLY/w8C
 github.com/tendermint/fundraising v0.3.0/go.mod h1:oJFZUZ/GsACtkYeWScKpHLdqMUThNWpMAi/G47LJUi4=
 github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E=
 github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME=
-github.com/tendermint/spn v0.2.1-0.20220609194312-7833ecf4454a h1:+xo1H4r/dLkUcx89/jP88TbVQiA40Rcn7yQyPozIj5k=
-github.com/tendermint/spn v0.2.1-0.20220609194312-7833ecf4454a/go.mod h1:5w8qNkgtJM24CcMjqTsVOKnSbz+U2fke7bEGzRlcdHA=
+github.com/tendermint/spn v0.2.1-0.20220609221013-cb474d30a2ee h1:HHpap3m/opfxZtOWTvEINcOiKv7y2InDchqMY9/bg+k=
+github.com/tendermint/spn v0.2.1-0.20220609221013-cb474d30a2ee/go.mod h1:tvqzSApJhs4LUpnpypK8P0rb+53ni11vTyYS9Dmz5Xs=
+github.com/tendermint/spn v0.2.1-0.20220610090138-44b136f042c4 h1:ZHWBTbU6zpnw3Xf4zSv2ZqEPuT16SrE2se3A2Lomupw=
+github.com/tendermint/spn v0.2.1-0.20220610090138-44b136f042c4/go.mod h1:5Cq9m5DnF3UKtXltEagHom4bNMBByKSLhw5YcFN8cls=
 github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0=
 github.com/tendermint/tendermint v0.34.19 h1:y0P1qI5wSa9IRuhKnTDA6IUcOrLi1hXJuALR+R7HFEk=
 github.com/tendermint/tendermint v0.34.19/go.mod h1:R5+wgIwSxMdKQcmOaeudL0Cjkr3HDkhpcdum6VeU3R4=

ignite/cmd/network_campaign_account.go

@@ -2,7 +2,6 @@ package ignitecmd
 
 import (
 	"context"
-	"strconv"
 
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -15,7 +14,6 @@ import (
 
 var (
 	campaignMainnetsAccSummaryHeader = []string{"Mainnet Account", "Shares"}
-	campaignVestingAccSummaryHeader  = []string{"Vesting Account", "Total Shares", "Vesting", "End Time"}
 )
 
 // NewNetworkCampaignAccount creates a new campaign account command that holds some other
@@ -55,12 +53,12 @@ func newNetworkCampaignAccountListHandler(cmd *cobra.Command, args []string) err
 	}
 
 	// get all campaign accounts
-	mainnetAccs, vestingAccs, err := getAccounts(cmd.Context(), n, campaignID)
+	mainnetAccs, err := getAccounts(cmd.Context(), n, campaignID)
 	if err != nil {
 		return err
 	}
 
-	if len(mainnetAccs)+len(vestingAccs) == 0 {
+	if len(mainnetAccs) == 0 {
 		session.StopSpinner()
 		return session.Printf("%s %s\n", icons.Info, "no campaign account found")
 	}
@@ -69,46 +67,30 @@ func newNetworkCampaignAccountListHandler(cmd *cobra.Command, args []string) err
 	for _, acc := range mainnetAccs {
 		mainnetAccEntries = append(mainnetAccEntries, []string{acc.Address, acc.Shares.String()})
 	}
-	mainnetVestingAccEntries := make([][]string, 0)
-	for _, acc := range vestingAccs {
-		mainnetVestingAccEntries = append(mainnetVestingAccEntries, []string{
-			acc.Address,
-			acc.TotalShares.String(),
-			acc.Vesting.String(),
-			strconv.FormatInt(acc.EndTime, 10),
-		})
-	}
 
 	session.StopSpinner()
 	if len(mainnetAccEntries) > 0 {
 		if err = session.PrintTable(campaignMainnetsAccSummaryHeader, mainnetAccEntries...); err != nil {
 			return err
 		}
 	}
-	if len(mainnetVestingAccEntries) > 0 {
-		if err = session.PrintTable(campaignVestingAccSummaryHeader, mainnetVestingAccEntries...); err != nil {
-			return err
-		}
-	}
 
 	return nil
 }
 
-// getAccounts get all campaign mainnet and vesting accounts.
+// getAccounts get all campaign mainnet accounts.
 func getAccounts(
 	ctx context.Context,
 	n network.Network,
 	campaignID uint64,
 ) (
 	[]networktypes.MainnetAccount,
-	[]networktypes.MainnetVestingAccount,
 	error,
 ) {
 	// start serving components.
 	g, ctx := errgroup.WithContext(ctx)
 	var (
 		mainnetAccs []networktypes.MainnetAccount
-		vestingAccs []networktypes.MainnetVestingAccount
 		err         error
 	)
 	// get all campaign mainnet accounts
@@ -117,10 +99,5 @@ func getAccounts(
 		return err
 	})
 
-	// get all campaign vesting accounts
-	g.Go(func() error {
-		vestingAccs, err = n.MainnetVestingAccounts(ctx, campaignID)
-		return err
-	})
-	return mainnetAccs, vestingAccs, g.Wait()
+	return mainnetAccs, g.Wait()
 }

ignite/services/network/networktypes/campaign.go

@@ -44,22 +44,3 @@ func ToMainnetAccount(acc campaigntypes.MainnetAccount) MainnetAccount {
 		Shares:  acc.Shares,
 	}
 }
-
-// MainnetVestingAccount represents the campaign mainnet vesting account of a chain on SPN
-type MainnetVestingAccount struct {
-	Address     string               `json:"Address"`
-	TotalShares campaigntypes.Shares `json:"TotalShares"`
-	Vesting     campaigntypes.Shares `json:"Vesting"`
-	EndTime     int64                `json:"EndTime"`
-}
-
-// ToMainnetVestingAccount converts a mainnet vesting account data from SPN and returns a MainnetVestingAccount object
-func ToMainnetVestingAccount(acc campaigntypes.MainnetVestingAccount) MainnetVestingAccount {
-	delaydVesting := acc.VestingOptions.GetDelayedVesting()
-	return MainnetVestingAccount{
-		Address:     acc.Address,
-		TotalShares: delaydVesting.TotalShares,
-		Vesting:     delaydVesting.Vesting,
-		EndTime:     delaydVesting.EndTime,
-	}
-}

ignite/services/network/queries.go

@@ -185,26 +185,6 @@ func (n Network) MainnetAccounts(ctx context.Context, campaignID uint64) (genAcc
 	return genAccs, nil
 }
 
-// MainnetVestingAccounts returns the list of campaign mainnet vesting accounts for a launch from SPN
-func (n Network) MainnetVestingAccounts(ctx context.Context, campaignID uint64) (genAccs []networktypes.MainnetVestingAccount, err error) {
-	n.ev.Send(events.New(events.StatusOngoing, "Fetching campaign mainnet vesting accounts"))
-	res, err := n.campaignQuery.
-		MainnetVestingAccountAll(ctx,
-			&campaigntypes.QueryAllMainnetVestingAccountRequest{
-				CampaignID: campaignID,
-			},
-		)
-	if err != nil {
-		return genAccs, err
-	}
-
-	for _, acc := range res.MainnetVestingAccount {
-		genAccs = append(genAccs, networktypes.ToMainnetVestingAccount(acc))
-	}
-
-	return genAccs, nil
-}
-
 // ChainReward fetches the chain reward from SPN by launch id
 func (n Network) ChainReward(ctx context.Context, launchID uint64) (rewardtypes.RewardPool, error) {
 	res, err := n.rewardQuery.