fix: btp block missing issue fix

relayer/chains/cosmos/query.go

@@ -28,6 +28,7 @@ import (
 	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 	"github.com/cosmos/relayer/v2/relayer/provider"
@@ -1169,3 +1170,8 @@ func (cc *CosmosProvider) QueryConsensusStateABCI(ctx context.Context, clientID
 		ProofHeight:    proofHeight,
 	}, nil
 }
+
+func (ap *CosmosProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
+	panic("QueryClientPrevConsensusStateHeight not implemented")
+
+}

relayer/chains/icon/icon_chain_processor.go

@@ -657,7 +657,6 @@ func (icp *IconChainProcessor) handleBTPBlockRequest(
 	}
 	request.response.Header = NewIconIBCHeader(btpHeader, validators, int64(btpHeader.MainHeight))
 	request.response.IsProcessed = processed
-
 }
 
 func (icp *IconChainProcessor) handlePathProcessorUpdate(ctx context.Context,

relayer/chains/icon/provider_test.go

@@ -475,5 +475,5 @@ func TestHash(t *testing.T) {
 // 	isValid, err := VerifyBtpProof(decision, signedHeader.Signatures, proofContext)
 // 	assert.NoError(t, err)
 
-// 	assert.True(t, isValid)
-// }
+//		assert.True(t, isValid)
+//	}

relayer/chains/icon/query.go

@@ -12,6 +12,7 @@ import (
 	"github.com/avast/retry-go/v4"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/gogoproto/proto"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
@@ -837,6 +838,10 @@ func (icp *IconProvider) QueryIconProof(ctx context.Context, height int64, keyHa
 	return nil, nil
 }
 
+func (ip *IconProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
+	panic("QueryClientPrevConsensusStateHeight not implemented")
+}
+
 func (icp *IconProvider) HexStringToProtoUnmarshal(encoded string, v proto.Message) ([]byte, error) {
 	if encoded == "" {
 		return nil, fmt.Errorf("Encoded string is empty ")

relayer/chains/penumbra/query.go

@@ -25,6 +25,7 @@ import (
 	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 	"github.com/cosmos/relayer/v2/relayer/provider"
@@ -983,3 +984,7 @@ func (cc *PenumbraProvider) QueryICQWithProof(ctx context.Context, msgType strin
 	//TODO implement me
 	panic("implement me")
 }
+
+func (cc *PenumbraProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
+	panic("QueryClientPrevConsensusStateHeight not implemented")
+}

relayer/chains/wasm/query.go

@@ -29,6 +29,7 @@ import (
 	conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
 	chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	"github.com/cosmos/relayer/v2/relayer/chains/wasm/types"
@@ -353,7 +354,6 @@ func (ap *WasmProvider) QueryIBCHandlerContract(ctx context.Context, param wasmt
 			zap.Error(err),
 		)
 	}))
-
 }
 
 func (ap *WasmProvider) QueryIBCHandlerContractProcessed(ctx context.Context, param wasmtypes.RawContractMessage) ([]byte, error) {
@@ -859,3 +859,23 @@ func (ap *WasmProvider) QueryDenomTraces(ctx context.Context, offset, limit uint
 	}
 	return transfers, nil
 }
+
+func (ap *WasmProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
+	param, err := types.NewPrevConsensusStateHeight(clientId, uint64(clientHeight)).Bytes()
+	res, err := ap.QueryIBCHandlerContract(ctx, param)
+	if err != nil {
+		return nil, err
+	}
+
+	var heights []int64
+	err = json.Unmarshal(res.Data.Bytes(), &heights)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(heights) == 0 {
+		return nil, fmt.Errorf("consensus state of client %s before %d", clientId, clientHeight)
+	}
+	return clienttypes.Height{RevisionNumber: 0, RevisionHeight: uint64(heights[0])}, nil
+}

relayer/chains/wasm/tx.go

@@ -744,20 +744,20 @@ func (ap *WasmProvider) SendMessagesToMempool(
 			return err
 		}
 
-		if msg.Type() == MethodUpdateClient {
-			if err := retry.Do(func() error {
-				if err := ap.BroadcastTx(cliCtx, txBytes, []provider.RelayerMessage{msg}, asyncCtx, defaultBroadcastWaitTimeout, asyncCallback, true); err != nil {
-					if strings.Contains(err.Error(), sdkerrors.ErrWrongSequence.Error()) {
-						ap.handleAccountSequenceMismatchError(err)
-					}
-				}
-				return err
-			}, retry.Context(ctx), rtyAtt, retry.Delay(time.Millisecond*time.Duration(ap.PCfg.BlockInterval)), rtyErr); err != nil {
-				ap.log.Error("Failed to update client", zap.Any("Message", msg))
-				return err
-			}
-			continue
-		}
+		// if msg.Type() == MethodUpdateClient {
+		// 	if err := retry.Do(func() error {
+		// 		if err := ap.BroadcastTx(cliCtx, txBytes, []provider.RelayerMessage{msg}, asyncCtx, defaultBroadcastWaitTimeout, asyncCallback, true); err != nil {
+		// 			if strings.Contains(err.Error(), sdkerrors.ErrWrongSequence.Error()) {
+		// 				ap.handleAccountSequenceMismatchError(err)
+		// 			}
+		// 		}
+		// 		return err
+		// 	}, retry.Context(ctx), rtyAtt, retry.Delay(time.Millisecond*time.Duration(ap.PCfg.BlockInterval)), rtyErr); err != nil {
+		// 		ap.log.Error("Failed to update client", zap.Any("Message", msg))
+		// 		return err
+		// 	}
+		// 	continue
+		// }
 		if err := ap.BroadcastTx(cliCtx, txBytes, []provider.RelayerMessage{msg}, asyncCtx, defaultBroadcastWaitTimeout, asyncCallback, false); err != nil {
 			if strings.Contains(err.Error(), sdkerrors.ErrWrongSequence.Error()) {
 				ap.handleAccountSequenceMismatchError(err)
@@ -1262,8 +1262,6 @@ func (cc *WasmProvider) QueryABCI(ctx context.Context, req abci.RequestQuery) (a
 func (cc *WasmProvider) handleAccountSequenceMismatchError(err error) {
 
 	clientCtx := cc.ClientContext()
-	fmt.Println("client context is ", clientCtx.GetFromAddress())
-
 	_, seq, err := cc.ClientCtx.AccountRetriever.GetAccountNumberSequence(clientCtx, clientCtx.GetFromAddress())
 
 	// sequences := numRegex.FindAllString(err.Error(), -1)

relayer/chains/wasm/types/types.go

@@ -71,11 +71,13 @@ func NewClientState(clientId string) *GetClientState {
 	}
 }
 
+type ConsensusStateByHeight struct {
+	ClientId string "json:\"client_id\""
+	Height   uint64 "json:\"height\""
+}
+
 type GetConsensusStateByHeight struct {
-	ConsensusStateByHeight struct {
-		ClientId string "json:\"client_id\""
-		Height   uint64 "json:\"height\""
-	} `json:"get_consensus_state_by_height"`
+	ConsensusStateByHeight ConsensusStateByHeight `json:"get_consensus_state_by_height"`
 }
 
 func (x *GetConsensusStateByHeight) Bytes() ([]byte, error) {
@@ -84,10 +86,7 @@ func (x *GetConsensusStateByHeight) Bytes() ([]byte, error) {
 
 func NewConsensusStateByHeight(clientId string, height uint64) *GetConsensusStateByHeight {
 	return &GetConsensusStateByHeight{
-		ConsensusStateByHeight: struct {
-			ClientId string "json:\"client_id\""
-			Height   uint64 "json:\"height\""
-		}{
+		ConsensusStateByHeight: ConsensusStateByHeight{
 			ClientId: clientId,
 			Height:   height,
 		},
@@ -353,3 +352,20 @@ func NewCommitmentPrefix() *GetCommitmentPrefix {
 		GetCommitment: struct{}{},
 	}
 }
+
+type GetPrevConsensusStateHeight struct {
+	ConsensusStateByHeight ConsensusStateByHeight `json:"get_previous_consensus_state_height"`
+}
+
+func (x *GetPrevConsensusStateHeight) Bytes() ([]byte, error) {
+	return json.Marshal(x)
+}
+
+func NewPrevConsensusStateHeight(clientId string, height uint64) *GetPrevConsensusStateHeight {
+	return &GetPrevConsensusStateHeight{
+		ConsensusStateByHeight: ConsensusStateByHeight{
+			ClientId: clientId,
+			Height:   height,
+		},
+	}
+}

relayer/chains/wasm/wasm_chain_processor.go

@@ -123,6 +123,7 @@ func (l latestClientState) update(ctx context.Context, clientInfo clientInfo, cc
 
 	// update latest if no existing state or provided consensus height is newer
 	l[clientInfo.clientID] = clientState
+
 }
 
 // Provider returns the ChainProvider, which provides the methods for querying, assembling IBC messages, and sending transactions.