Merge branch 'main' into fix/btp-block-miss-fix

icon-project · Sep 4, 2023 · 151dd15 · 151dd15
2 parents 87a9477 + cf3dc3e
commit 151dd15
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/relayer/chains/icon/icon_chain_processor.go b/relayer/chains/icon/icon_chain_processor.go
@@ -378,6 +378,9 @@ loop:
 					break
 				}
 				time.Sleep(10 * time.Millisecond)
+				if icp.firstTime {
+					time.Sleep(4000 * time.Millisecond)
+				}
 				icp.firstTime = false
 				if br = nil; len(btpBlockRespCh) > 0 {
 					br = <-btpBlockRespCh

diff --git a/relayer/chains/wasm/query.go b/relayer/chains/wasm/query.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+	"github.com/avast/retry-go/v4"
 	abci "github.com/cometbft/cometbft/abci/types"
 	rpcclient "github.com/cometbft/cometbft/rpc/client"
 	tmtypes "github.com/cometbft/cometbft/types"
@@ -19,6 +20,7 @@ import (
 	"github.com/cosmos/gogoproto/proto"
 	tmclient "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 	"github.com/icon-project/IBC-Integration/libraries/go/common/icon"
+	"go.uber.org/zap"
 
 	querytypes "github.com/cosmos/cosmos-sdk/types/query"
 	bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -335,25 +337,23 @@ func (ap *WasmProvider) QueryClientConsensusState(ctx context.Context, chainHeig
 }
 
 func (ap *WasmProvider) QueryIBCHandlerContract(ctx context.Context, param wasmtypes.RawContractMessage) (op *wasmtypes.QuerySmartContractStateResponse, err error) {
-	done := ap.SetSDKContext()
-	defer done()
-	return ap.QueryClient.SmartContractState(ctx, &wasmtypes.QuerySmartContractStateRequest{
-		Address:   ap.PCfg.IbcHandlerAddress,
-		QueryData: param,
-	})
-	// return op, retry.Do(func() error {
-	// 	op, err =
-	// 	return err
-	// }, retry.Context(ctx), retry.Attempts(latestHeightQueryRetries), retry.Delay(50*time.Millisecond), retry.LastErrorOnly(true), retry.OnRetry(func(n uint, err error) {
-	// 	ap.log.Error(
-	// 		"Failed to query",
-	// 		zap.Uint("attempt", n+1),
-	// 		zap.Uint("max_attempts", latestHeightQueryRetries),
-	// 		zap.Any("Param", param),
-	// 		zap.Error(err),
-	// 	)
-	// }))
-
+	return op, retry.Do(func() error {
+		done := ap.SetSDKContext()
+		defer done()
+		op, err = ap.QueryClient.SmartContractState(ctx, &wasmtypes.QuerySmartContractStateRequest{
+			Address:   ap.PCfg.IbcHandlerAddress,
+			QueryData: param,
+		})
+		return err
+	}, retry.Context(ctx), retry.Attempts(latestHeightQueryRetries), retry.Delay(50*time.Millisecond), retry.LastErrorOnly(true), retry.OnRetry(func(n uint, err error) {
+		ap.log.Error(
+			"Failed to query",
+			zap.Uint("attempt", n+1),
+			zap.Uint("max_attempts", latestHeightQueryRetries),
+			zap.Any("Param", param),
+			zap.Error(err),
+		)
+	}))
 }
 
 func (ap *WasmProvider) QueryIBCHandlerContractProcessed(ctx context.Context, param wasmtypes.RawContractMessage) ([]byte, error) {

diff --git a/relayer/chains/wasm/wasm_chain_processor.go b/relayer/chains/wasm/wasm_chain_processor.go
@@ -469,7 +469,7 @@ func (ccp *WasmChainProcessor) queryCycle(ctx context.Context, persistence *quer
 			messages := ibcMessagesFromEvents(ccp.log, tx.Events, chainID, heightUint64, ccp.chainProvider.PCfg.IbcHandlerAddress, base64Encoded)
 
 			for _, m := range messages {
-				ccp.log.Info("Detected eventlog", zap.String("eventlog", m.eventType))
+				ccp.log.Info("Detected eventlog", zap.String("eventlog", m.eventType), zap.Uint64("height", heightUint64))
 				ccp.handleMessage(ctx, m, ibcMessagesCache)
 			}
 		}