refactor: replace broadcast mode block with sync and remove fungible params

changelog.md

@@ -59,6 +59,7 @@
 * [1941](https://github.com/zeta-chain/node/pull/1941) - add unit tests for zetabridge package
 * [1985](https://github.com/zeta-chain/node/pull/1985) - improve fungible module coverage
 * [1992](https://github.com/zeta-chain/node/pull/1992) - remove setupKeeper from crosschain module
+* [2001](https://github.com/zeta-chain/node/pull/2001) - replace broadcast mode block with sync
 
 ### Fixes
 

cmd/zetacored/root.go

@@ -64,7 +64,7 @@ func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {
 		WithLegacyAmino(encodingConfig.Amino).
 		WithInput(os.Stdin).
 		WithAccountRetriever(authtypes.AccountRetriever{}).
-		WithBroadcastMode(flags.BroadcastBlock).
+		WithBroadcastMode(flags.BroadcastSync).
 		WithHomeDir(app.DefaultNodeHome).
 		WithKeyringOptions(hd.EthSecp256k1Option()).
 		WithViper(EnvPrefix)

e2e/txserver/zeta_tx_server.go

@@ -2,12 +2,14 @@
 
 import (
 	"context"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"math/big"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -33,6 +35,7 @@
 	etherminttypes "github.com/evmos/ethermint/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
+	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/zeta-chain/zetacore/cmd/zetacored/config"
 	"github.com/zeta-chain/zetacore/pkg/chains"
 	"github.com/zeta-chain/zetacore/pkg/coin"
@@ -188,8 +191,60 @@
 		return nil, err
 	}
 
-	// Broadcast tx
-	return zts.clientCtx.BroadcastTx(txBytes)
+	// Broadcast tx and wait 10 mins to be included in block
+	res, err := zts.clientCtx.BroadcastTx(txBytes)
+	if err != nil {
+		if res == nil {
+			return nil, err
+		}
+		return &sdktypes.TxResponse{
+			Code:      res.Code,
+			Codespace: res.Codespace,
+			TxHash:    res.TxHash,
+		}, err
+	}
+
+	var blockTimeout time.Duration = 10 * time.Minute
+	exitAfter := time.After(blockTimeout)
+	hash, err := hex.DecodeString(res.TxHash)
+	if err != nil {
+		return nil, err
+	}
+	for {
+		select {
+		case <-exitAfter:
+			return nil, fmt.Errorf("timed out after waiting for tx to get included in the block: %d", blockTimeout)
+		case <-time.After(time.Millisecond * 100):
+			resTx, err := zts.clientCtx.Client.Tx(context.TODO(), hash, false)
+			if err == nil {
+				txRes, err := mkTxResult(zts.clientCtx, resTx)
+				if err == nil {
+					return txRes, nil
+				}
+			}
+		}
+	}
+}
+
+func mkTxResult(clientCtx client.Context, resTx *coretypes.ResultTx) (*sdktypes.TxResponse, error) {
+	txb, err := clientCtx.TxConfig.TxDecoder()(resTx.Tx)
+	if err != nil {
+		return nil, err
+	}
+	p, ok := txb.(intoAny)
+	if !ok {
+		return nil, fmt.Errorf("expecting a type implementing intoAny, got: %T", txb)
+	}
+	any := p.AsAny()
+	resBlock, err := clientCtx.Client.Block(context.TODO(), &resTx.Height)
+	if err != nil {
+		return nil, err
+	}
+	return sdktypes.NewResponseResultTx(resTx, any, resBlock.Block.Time.Format(time.RFC3339)), nil
+}
+
+type intoAny interface {
+	AsAny() *codectypes.Any
 }
 
 // DeploySystemContractsAndZRC20 deploys the system contracts and ZRC20 contracts
@@ -373,7 +428,7 @@
 		WithLegacyAmino(codec.NewLegacyAmino()).
 		WithInput(os.Stdin).
 		WithOutput(os.Stdout).
-		WithBroadcastMode(flags.BroadcastBlock).
+		WithBroadcastMode(flags.BroadcastSync).
 		WithClient(rpc).
 		WithSkipConfirmation(true).
 		WithFromName("creator").