feegranter config to unsigned tx

cw-relayer/relayer/client/client.go

@@ -49,7 +49,6 @@ type (
 		KeyringPassphrase string
 		ChainHeight       *ChainHeight
 		feeGranter        sdk.AccAddress
-		feeGrantEnabled   bool
 	}
 
 	passReader struct {
@@ -109,19 +108,20 @@ func NewRelayerClient(
 		QueryRpc:          queryEndpoint,
 	}
 
+	clientCtx, err := relayerClient.CreateClientContext()
+	if err != nil {
+		return RelayerClient{}, err
+	}
+
 	if len(granter) > 0 {
 		feeGranterAddr, err := sdk.AccAddressFromBech32(granter)
 		if err != nil {
 			return RelayerClient{}, err
 		}
 
 		relayerClient.feeGranter = feeGranterAddr
-		relayerClient.feeGrantEnabled = true
-	}
-
-	clientCtx, err := relayerClient.CreateClientContext()
-	if err != nil {
-		return RelayerClient{}, err
+	} else {
+		relayerClient.feeGranter = clientCtx.GetFeeGranterAddress()
 	}
 
 	blockHeight, err := rpc.GetChainHeight(clientCtx)
@@ -202,7 +202,7 @@ func (oc RelayerClient) BroadcastTx(timeoutDuration time.Duration, nextBlockHeig
 		// set last check height to latest block height
 		lastCheckHeight = latestBlockHeight
 
-		resp, err := BroadcastTx(clientCtx, factory, msgs...)
+		resp, err := BroadcastTx(oc.feeGranter, clientCtx, factory, msgs...)
 		if resp != nil && resp.Code != 0 {
 			telemetry.IncrCounter(1, "failure", "tx", "code")
 			oc.logger.Error().Msg(resp.String())
@@ -361,11 +361,8 @@ func (oc RelayerClient) CreateTxFactory() (tx.Factory, error) {
 		WithGasPrices(oc.GasPrices).
 		WithKeybase(clientCtx.Keyring).
 		WithSignMode(signing.SignMode_SIGN_MODE_DIRECT).
-		WithSimulateAndExecute(true)
-
-	if oc.feeGrantEnabled {
-		txFactory = txFactory.WithFeeGranter(oc.feeGranter)
-	}
+		WithSimulateAndExecute(true).
+		WithFeeGranter(oc.feeGranter)
 
 	return txFactory, nil
 }

cw-relayer/relayer/client/tx.go

@@ -13,7 +13,7 @@ import (
 // Note, BroadcastTx is copied from the SDK except it removes a few unnecessary
 // things like prompting for confirmation and printing the response. Instead,
 // we return the TxResponse.
-func BroadcastTx(clientCtx client.Context, txf tx.Factory, msgs ...sdk.Msg) (*sdk.TxResponse, error) {
+func BroadcastTx(feeGranter sdk.AccAddress, clientCtx client.Context, txf tx.Factory, msgs ...sdk.Msg) (*sdk.TxResponse, error) {
 	txf, err := prepareFactory(clientCtx, txf)
 	if err != nil {
 		return nil, err
@@ -31,7 +31,7 @@ func BroadcastTx(clientCtx client.Context, txf tx.Factory, msgs ...sdk.Msg) (*sd
 		return nil, err
 	}
 
-	unsignedTx.SetFeeGranter(clientCtx.GetFeeGranterAddress())
+	unsignedTx.SetFeeGranter(feeGranter)
 
 	if err = tx.Sign(txf, clientCtx.GetFromName(), unsignedTx, true); err != nil {
 		return nil, err