chore: added config var block-rpc-addr which when available will be used to fetch tx blocks to sync faster else fallbacks to normal slow one

Author: bcsainju

relayer/chains/wasm/provider.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"path"
-	"strings"
 	"sync"
 	"time"
 
@@ -54,6 +53,7 @@ type WasmProviderConfig struct {
 	ChainName            string                  `json:"-" yaml:"-"`
 	ChainID              string                  `json:"chain-id" yaml:"chain-id"`
 	RPCAddr              string                  `json:"rpc-addr" yaml:"rpc-addr"`
+	BlockRPCAddr         string                  `json:"block-rpc-addr" yaml:"block-rpc-addr"`
 	AccountPrefix        string                  `json:"account-prefix" yaml:"account-prefix"`
 	KeyringBackend       string                  `json:"keyring-backend" yaml:"keyring-backend"`
 	GasAdjustment        float64                 `json:"gas-adjustment" yaml:"gas-adjustment"`
@@ -278,6 +278,7 @@ type WasmProvider struct {
 	Keybase        keyring.Keyring
 	KeyringOptions []keyring.Option
 	RPCClient      rpcclient.Client
+	BlockRPCClient rpcclient.Client
 	QueryClient    wasmtypes.QueryClient
 	LightProvider  provtypes.Provider
 	Cdc            Codec
@@ -351,15 +352,16 @@ func (ap *WasmProvider) Init(ctx context.Context) error {
 		return err
 	}
 	ap.RPCClient = rpcClient
-	page := 1
+
 	ap.rangeSupport = false
-	_, err = rpcClient.TxSearch(ctx, "execute._contract_address='invalid' AND tx.height>=38769995", true, &page, &page, "asc")
-	if err != nil && strings.Contains(err.Error(), "strict equality") {
-		ap.log.Info("given RPC doesn't Supports range queries")
-	} else {
+	if ap.PCfg.BlockRPCAddr != "" {
+		blockRpcClient, err := NewRPCClient(ap.PCfg.BlockRPCAddr, timeout)
+		if err != nil {
+			return err
+		}
+		ap.BlockRPCClient = blockRpcClient
 		ap.rangeSupport = true
 	}
-
 	lightprovider, err := prov.New(ap.PCfg.ChainID, ap.PCfg.RPCAddr)
 	if err != nil {
 		return err

relayer/chains/wasm/wasm_chain_processor.go

@@ -82,6 +82,7 @@ func NewWasmChainProcessor(log *zap.Logger, provider *WasmProvider, metrics *pro
 
 var (
 	inSyncNumBlocksThreshold = int64(2)
+	numOffsetBlocks          = int64(2)
 )
 
 const (
@@ -286,7 +287,7 @@ func (ccp *WasmChainProcessor) Run(ctx context.Context, initialBlockHistory uint
 
 	ccp.log.Debug("Entering Wasm main query loop")
 	if ccp.chainProvider.rangeSupport {
-		inSyncNumBlocksThreshold = 5
+		inSyncNumBlocksThreshold = 10
 	}
 	ticker := time.NewTicker(persistence.minQueryLoopDuration)
 	defer ticker.Stop()
@@ -372,7 +373,7 @@ func (ccp *WasmChainProcessor) getBlocksToProcess(ctx context.Context, blockToRe
 	defer cancelQueryCtx()
 	page := int(1)
 	perPage := int(50)
-	txsResult, err := ccp.chainProvider.RPCClient.TxSearch(queryCtx, queryFilter, true, &page, &perPage, "asc")
+	txsResult, err := ccp.chainProvider.BlockRPCClient.TxSearch(queryCtx, queryFilter, true, &page, &perPage, "asc")
 	var resultArr []int64
 	if err != nil {
 		return []int64{}, err
@@ -454,7 +455,7 @@ func (ccp *WasmChainProcessor) queryCycle(ctx context.Context, persistence *quer
 
 	syncUpHeight := func() int64 {
 		if ccp.chainProvider.rangeSupport {
-			return persistence.latestHeight - inSyncNumBlocksThreshold + 2
+			return persistence.latestHeight - numOffsetBlocks
 		}
 		if persistence.latestHeight-persistence.latestQueriedBlock > MaxBlockFetch {
 			return persistence.latestQueriedBlock + MaxBlockFetch
@@ -463,7 +464,8 @@ func (ccp *WasmChainProcessor) queryCycle(ctx context.Context, persistence *quer
 	}
 	var blocks []int64
 	heighttoSync := syncUpHeight()
-	if ccp.chainProvider.rangeSupport {
+	delta := persistence.latestHeight - persistence.latestQueriedBlock
+	if ccp.chainProvider.rangeSupport && delta > 20 {
 		if (persistence.latestQueriedBlock + 1) >= persistence.latestHeight {
 			return nil
 		}
@@ -578,7 +580,6 @@ func (ccp *WasmChainProcessor) queryCycle(ctx context.Context, persistence *quer
 			)
 			continue
 		}
-
 		pp.HandleNewData(chainID, processor.ChainProcessorCacheData{
 			LatestBlock:          ccp.latestBlock,
 			LatestHeader:         latestHeader,