feat: add tx confirm

base/gfspapp/sign_server.go

@@ -154,7 +154,7 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ
 			metrics.ReqTime.WithLabelValues(SignerSuccessReplicateApproval).Observe(time.Since(startTime).Seconds())
 		}
 	case *gfspserver.GfSpSignRequest_CreateGlobalVirtualGroup:
-		err = g.signer.CreateGlobalVirtualGroup(ctx, &virtualgrouptypes.MsgCreateGlobalVirtualGroup{
+		txHash, err = g.signer.CreateGlobalVirtualGroup(ctx, &virtualgrouptypes.MsgCreateGlobalVirtualGroup{
 			StorageProvider: g.operatorAddress,
 			FamilyId:        t.CreateGlobalVirtualGroup.GetVirtualGroupFamilyId(),
 			SecondarySpIds:  t.CreateGlobalVirtualGroup.GetSecondarySpIds(),

base/gnfd/gnfd_service.go

@@ -2,12 +2,16 @@ package gnfd
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"strconv"
 	"strings"
 	"time"
 
 	sdkmath "cosmossdk.io/math"
+	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/tx"
 
 	"github.com/bnb-chain/greenfield-storage-provider/pkg/metrics"
 	"github.com/cosmos/cosmos-sdk/types/query"
@@ -783,3 +787,70 @@ func (g *Gnfd) VerifyPutObjectPermission(ctx context.Context, account, bucket, o
 	}
 	return false, err
 }
+
+// ConfirmTransaction is used to confirm whether the transaction is on the chain.
+func (g *Gnfd) ConfirmTransaction(ctx context.Context, txHash string) (*sdk.TxResponse, error) {
+	startTime := time.Now()
+	defer metrics.GnfdChainTime.WithLabelValues("confirm_transaction").Observe(time.Since(startTime).Seconds())
+	client := g.getCurrentClient().GnfdClient()
+	completeRetry := false
+	for {
+		txResponse, err := client.GetTx(ctx, &tx.GetTxRequest{Hash: txHash})
+		if err != nil {
+			if strings.Contains(err.Error(), "not found") && !completeRetry {
+				// Tx not found, wait for next block and try again
+				if err = g.WaitForNextBlock(ctx); err != nil {
+					return nil, err
+				}
+				completeRetry = true
+				continue
+			}
+			return nil, err
+		}
+		// Tx found
+		return txResponse.TxResponse, nil
+	}
+}
+
+// WaitForNextBlock is used to chain generate a new block.
+func (g *Gnfd) WaitForNextBlock(ctx context.Context) error {
+	startTime := time.Now()
+	defer metrics.GnfdChainTime.WithLabelValues("wait_for_next_block").Observe(time.Since(startTime).Seconds())
+	var (
+		err               error
+		height            int64
+		latestBlockHeight int64
+	)
+	height, err = g.getLatestBlockHeight(ctx)
+	if err != nil {
+		return err
+	}
+	ctxTimeout, cancel := context.WithTimeout(ctx, time.Second*30)
+	defer cancel()
+
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+
+	for {
+		if latestBlockHeight, err = g.getLatestBlockHeight(ctx); err != nil {
+			return err
+		}
+		if latestBlockHeight >= height+1 {
+			return nil
+		}
+		select {
+		case <-ctxTimeout.Done():
+			return fmt.Errorf("timeout exceeded waiting for block")
+		case <-ticker.C:
+		}
+	}
+}
+
+func (g *Gnfd) getLatestBlockHeight(ctx context.Context) (int64, error) {
+	client := g.getCurrentClient().GnfdClient()
+	block, err := client.GetLatestBlock(ctx, &tmservice.GetLatestBlockRequest{})
+	if err != nil {
+		return 0, err
+	}
+	return block.SdkBlock.Header.Height, nil
+}

core/consensus/consensus.go

@@ -3,6 +3,7 @@ package consensus
 import (
 	"context"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	paymenttypes "github.com/bnb-chain/greenfield/x/payment/types"
@@ -66,6 +67,10 @@ type Consensus interface {
 	ListenObjectSeal(ctx context.Context, objectID uint64, timeOutHeight int) (bool, error)
 	// ListenRejectUnSealObject returns an indication of the object is rejected.
 	ListenRejectUnSealObject(ctx context.Context, objectID uint64, timeoutHeight int) (bool, error)
+	// ConfirmTransaction is used to confirm whether the transaction is on the chain.
+	ConfirmTransaction(ctx context.Context, txHash string) (*sdk.TxResponse, error)
+	// WaitForNextBlock is used to chain generate a new block.
+	WaitForNextBlock(ctx context.Context) error
 	// Close the Consensus interface.
 	Close() error
 }
@@ -90,7 +95,7 @@ func (*NullConsensus) QuerySPFreeQuota(context.Context, string) (uint64, error)
 	return 0, nil
 }
 
-func (*NullConsensus) QuerySPPrice(ctx context.Context, operatorAddress string) (sptypes.SpStoragePrice, error) {
+func (*NullConsensus) QuerySPPrice(context.Context, string) (sptypes.SpStoragePrice, error) {
 	return sptypes.SpStoragePrice{}, nil
 }
 
@@ -110,15 +115,15 @@ func (*NullConsensus) ListGlobalVirtualGroupsByFamilyID(context.Context, uint32)
 	return nil, nil
 }
 
-func (*NullConsensus) QueryVirtualGroupFamily(ctx context.Context, vgfID uint32) (*virtualgrouptypes.GlobalVirtualGroupFamily, error) {
+func (*NullConsensus) QueryVirtualGroupFamily(context.Context, uint32) (*virtualgrouptypes.GlobalVirtualGroupFamily, error) {
 	return nil, nil
 }
 
-func (*NullConsensus) QueryGlobalVirtualGroup(ctx context.Context, gvgID uint32) (*virtualgrouptypes.GlobalVirtualGroup, error) {
+func (*NullConsensus) QueryGlobalVirtualGroup(context.Context, uint32) (*virtualgrouptypes.GlobalVirtualGroup, error) {
 	return nil, nil
 }
 
-func (*NullConsensus) QueryVirtualGroupParams(ctx context.Context) (*virtualgrouptypes.Params, error) {
+func (*NullConsensus) QueryVirtualGroupParams(context.Context) (*virtualgrouptypes.Params, error) {
 	return nil, nil
 }
 
@@ -158,4 +163,12 @@ func (*NullConsensus) ListenObjectSeal(context.Context, uint64, int) (bool, erro
 func (*NullConsensus) ListenRejectUnSealObject(context.Context, uint64, int) (bool, error) {
 	return false, nil
 }
+func (*NullConsensus) ConfirmTransaction(context.Context, string) (*sdk.TxResponse, error) {
+	return nil, nil
+}
+
+func (*NullConsensus) WaitForNextBlock(context.Context) error {
+	return nil
+}
+
 func (*NullConsensus) Close() error { return nil }

core/module/modular.go

@@ -276,7 +276,7 @@ type Signer interface {
 	// DiscontinueBucket signs the MsgDiscontinueBucket and broadcast the tx to greenfield.
 	DiscontinueBucket(ctx context.Context, bucket *storagetypes.MsgDiscontinueBucket) (string, error)
 	// CreateGlobalVirtualGroup signs the MsgCreateGlobalVirtualGroup and broadcast the tx to greenfield.
-	CreateGlobalVirtualGroup(ctx context.Context, gvg *virtualgrouptypes.MsgCreateGlobalVirtualGroup) error
+	CreateGlobalVirtualGroup(ctx context.Context, gvg *virtualgrouptypes.MsgCreateGlobalVirtualGroup) (string, error)
 	// SignMigratePiece signs the GfSpMigratePieceTask for migrating piece
 	SignMigratePiece(ctx context.Context, task *gfsptask.GfSpMigratePieceTask) ([]byte, error)
 	// CompleteMigrateBucket signs the MsgCompleteMigrateBucket and broadcast the tx to greenfield.

core/module/null_modular.go

@@ -250,8 +250,8 @@ func (*NilModular) RejectUnSealObject(context.Context, *storagetypes.MsgRejectSe
 func (*NilModular) DiscontinueBucket(context.Context, *storagetypes.MsgDiscontinueBucket) (string, error) {
 	return "", nil
 }
-func (*NilModular) CreateGlobalVirtualGroup(context.Context, *virtualgrouptypes.MsgCreateGlobalVirtualGroup) error {
-	return ErrNilModular
+func (*NilModular) CreateGlobalVirtualGroup(context.Context, *virtualgrouptypes.MsgCreateGlobalVirtualGroup) (string, error) {
+	return "", ErrNilModular
 }
 func (*NilModular) SignMigratePiece(ctx context.Context, task *gfsptask.GfSpMigratePieceTask) ([]byte, error) {
 	return nil, ErrNilModular