fix(cosmosclient): call the faucet prior to create the tx (ignite#2781)

Fix ignite#2775

This change restores the behavior we used to have in 0.23, and which has
changed with the refac of cosmosclient with the `node` command feat.

Calling the faucet (when it is specifically enabled) will ensure the
account that broadcasts the tx exists in the target chain.

Because the `node` command has a `--generate-only` flag, and because we
don't want to create a new account when it's set, this flag is now
propagated to the cosmosclient struct. Therefore, the faucet isn't
called when the flag is set. This doesn't affect the `network` command
because it doesn't use that flag.

* test link issue in CL

* gh doesn't autolink issues in repo's file

* Update changelog.md

Co-authored-by: Lucas Btd <lucas.bertrand.22@gmail.com>

* Solve TODO: validate tx msgs

Co-authored-by: Lucas Btd <lucas.bertrand.22@gmail.com>

Author: tbruyelle

changelog.md

@@ -15,6 +15,9 @@
 
 - Add `--skip-proto` flag to `build`, `init` and `serve` commands to build the chain without building proto files
 
+### Fixes
+
+- Fix `pkg/cosmosclient` to call the faucet prior to creating the tx.
 
 ## [`v0.23.0`](https://github.com/ignite/cli/releases/tag/v0.23.0)
 

ignite/cmd/node.go

@@ -38,6 +38,7 @@ func newNodeCosmosClient(cmd *cobra.Command) (cosmosclient.Client, error) {
 		gasPrices      = getGasPrices(cmd)
 		fees           = getFees(cmd)
 		broadcastMode  = getBroadcastMode(cmd)
+		generateOnly   = getGenerateOnly(cmd)
 	)
 
 	options := []cosmosclient.Option{
@@ -47,6 +48,7 @@ func newNodeCosmosClient(cmd *cobra.Command) (cosmosclient.Client, error) {
 		cosmosclient.WithKeyringDir(keyringDir),
 		cosmosclient.WithNodeAddress(xurl.HTTPEnsurePort(node)),
 		cosmosclient.WithBroadcastMode(broadcastMode),
+		cosmosclient.WithGenerateOnly(generateOnly),
 	}
 
 	if gas != "" {

ignite/pkg/cosmosclient/cosmosclient.go

@@ -88,6 +88,7 @@ type Client struct {
 	gasPrices     string
 	fees          string
 	broadcastMode string
+	generateOnly  bool
 }
 
 // Option configures your client.
@@ -180,6 +181,12 @@ func WithBroadcastMode(broadcastMode string) Option {
 	}
 }
 
+func WithGenerateOnly(generateOnly bool) Option {
+	return func(c *Client) {
+		c.generateOnly = generateOnly
+	}
+}
+
 // New creates a new client with given options.
 func New(ctx context.Context, options ...Option) (Client, error) {
 	c := Client{
@@ -412,6 +419,16 @@ func (c Client) BroadcastTx(account cosmosaccount.Account, msgs ...sdktypes.Msg)
 func (c Client) CreateTx(account cosmosaccount.Account, msgs ...sdktypes.Msg) (TxService, error) {
 	defer c.lockBech32Prefix()()
 
+	if c.useFaucet && !c.generateOnly {
+		addr, err := account.Address(c.addressPrefix)
+		if err != nil {
+			return TxService{}, err
+		}
+		if err := c.makeSureAccountHasTokens(context.Background(), addr); err != nil {
+			return TxService{}, err
+		}
+	}
+
 	sdkaddr, err := account.Record.GetAddress()
 	if err != nil {
 		return TxService{}, err
@@ -463,35 +480,6 @@ func (c Client) CreateTx(account cosmosaccount.Account, msgs ...sdktypes.Msg) (T
 	}, nil
 }
 
-// prepareBroadcast performs checks and operations before broadcasting messages
-func (c *Client) prepareBroadcast(ctx context.Context, accountName string, _ []sdktypes.Msg) error {
-	// TODO uncomment after https://github.com/tendermint/spn/issues/363
-	// validate msgs.
-	//  for _, msg := range msgs {
-	//  if err := msg.ValidateBasic(); err != nil {
-	//  return err
-	//  }
-	//  }
-
-	account, err := c.account(accountName)
-	if err != nil {
-		return err
-	}
-
-	// make sure that account has enough balances before broadcasting.
-	if c.useFaucet {
-		addr, err := account.Address(c.addressPrefix)
-		if err != nil {
-			return err
-		}
-		if err := c.makeSureAccountHasTokens(ctx, addr); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // makeSureAccountHasTokens makes sure the address has a positive balance
 // it requests funds from the faucet if the address has an empty balance
 func (c *Client) makeSureAccountHasTokens(ctx context.Context, address string) error {
@@ -604,7 +592,8 @@ func (c Client) newContext() client.Context {
 		WithHomeDir(c.homePath).
 		WithClient(c.RPC).
 		WithSkipConfirmation(true).
-		WithKeyring(c.AccountRegistry.Keyring)
+		WithKeyring(c.AccountRegistry.Keyring).
+		WithGenerateOnly(c.generateOnly)
 }
 
 func newFactory(clientCtx client.Context) tx.Factory {

ignite/pkg/cosmosclient/txservice.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
@@ -29,8 +28,11 @@ func (s TxService) Broadcast() (Response, error) {
 	accountName := s.clientContext.GetFromName()
 	accountAddress := s.clientContext.GetFromAddress()
 
-	if err := s.client.prepareBroadcast(context.Background(), accountName, []sdktypes.Msg{}); err != nil {
-		return Response{}, err
+	// validate msgs.
+	for _, msg := range s.txBuilder.GetTx().GetMsgs() {
+		if err := msg.ValidateBasic(); err != nil {
+			return Response{}, err
+		}
 	}
 
 	if err := tx.Sign(s.txFactory, accountName, s.txBuilder, true); err != nil {