fix: refetch missing packet

cmd/flags.go

@@ -11,50 +11,52 @@ import (
 )
 
 const (
-	flagHome                    = "home"
-	flagURL                     = "url"
-	flagSkip                    = "skip"
-	flagTimeout                 = "timeout"
-	flagJSON                    = "json"
-	flagYAML                    = "yaml"
-	flagFile                    = "file"
-	flagPath                    = "path"
-	flagMaxTxSize               = "max-tx-size"
-	flagMaxMsgLength            = "max-msgs"
-	flagIBCDenoms               = "ibc-denoms"
-	flagTimeoutHeightOffset     = "timeout-height-offset"
-	flagTimeoutTimeOffset       = "timeout-time-offset"
-	flagMaxRetries              = "max-retries"
-	flagThresholdTime           = "time-threshold"
-	flagUpdateAfterExpiry       = "update-after-expiry"
-	flagUpdateAfterMisbehaviour = "update-after-misbehaviour"
-	flagClientTrustingPeriod    = "client-tp"
-	flagOverride                = "override"
-	flagSrcPort                 = "src-port"
-	flagDstPort                 = "dst-port"
-	flagOrder                   = "order"
-	flagVersion                 = "version"
-	flagDebugAddr               = "debug-addr"
-	flagOverwriteConfig         = "overwrite"
-	flagLimit                   = "limit"
-	flagHeight                  = "height"
-	flagPage                    = "page"
-	flagPageKey                 = "page-key"
-	flagCountTotal              = "count-total"
-	flagReverse                 = "reverse"
-	flagProcessor               = "processor"
-	flagInitialBlockHistory     = "block-history"
-	flagFlushInterval           = "flush-interval"
-	flagMemo                    = "memo"
-	flagFilterRule              = "filter-rule"
-	flagFilterChannels          = "filter-channels"
-	flagSrcChainID              = "src-chain-id"
-	flagDstChainID              = "dst-chain-id"
-	flagSrcClientID             = "src-client-id"
-	flagDstClientID             = "dst-client-id"
-	flagSrcConnID               = "src-connection-id"
-	flagDstConnID               = "dst-connection-id"
-	flagBtpBlockHeight          = "btp-block-height"
+	flagHome                            = "home"
+	flagURL                             = "url"
+	flagSkip                            = "skip"
+	flagTimeout                         = "timeout"
+	flagJSON                            = "json"
+	flagYAML                            = "yaml"
+	flagFile                            = "file"
+	flagPath                            = "path"
+	flagMaxTxSize                       = "max-tx-size"
+	flagMaxMsgLength                    = "max-msgs"
+	flagIBCDenoms                       = "ibc-denoms"
+	flagTimeoutHeightOffset             = "timeout-height-offset"
+	flagTimeoutTimeOffset               = "timeout-time-offset"
+	flagMaxRetries                      = "max-retries"
+	flagThresholdTime                   = "time-threshold"
+	flagUpdateAfterExpiry               = "update-after-expiry"
+	flagUpdateAfterMisbehaviour         = "update-after-misbehaviour"
+	flagClientTrustingPeriod            = "client-tp"
+	flagOverride                        = "override"
+	flagSrcPort                         = "src-port"
+	flagDstPort                         = "dst-port"
+	flagOrder                           = "order"
+	flagVersion                         = "version"
+	flagDebugAddr                       = "debug-addr"
+	flagOverwriteConfig                 = "overwrite"
+	flagLimit                           = "limit"
+	flagHeight                          = "height"
+	flagPage                            = "page"
+	flagPageKey                         = "page-key"
+	flagCountTotal                      = "count-total"
+	flagReverse                         = "reverse"
+	flagProcessor                       = "processor"
+	flagInitialBlockHistory             = "block-history"
+	flagFlushInterval                   = "flush-interval"
+	flagMemo                            = "memo"
+	flagFilterRule                      = "filter-rule"
+	flagFilterChannels                  = "filter-channels"
+	flagSrcChainID                      = "src-chain-id"
+	flagDstChainID                      = "dst-chain-id"
+	flagSrcClientID                     = "src-client-id"
+	flagDstClientID                     = "dst-client-id"
+	flagSrcConnID                       = "src-connection-id"
+	flagDstConnID                       = "dst-connection-id"
+	flagBtpBlockHeight                  = "btp-block-height"
+	flagBtpUpdateProofContext           = "btp-update-proof-context"
+	flagBTPUpdateProofContextFromHeight = "btp-update-proof-context-from-height"
 )
 
 const (
@@ -390,3 +392,19 @@ func OverwriteConfigFlag(v *viper.Viper, cmd *cobra.Command) *cobra.Command {
 	}
 	return cmd
 }
+
+func BtpUpdateProofContextFlag(v *viper.Viper, cmd *cobra.Command) *cobra.Command {
+	cmd.Flags().BoolP(flagBtpUpdateProofContext, "u", false, "update all proof context change")
+	if err := v.BindPFlag(flagFlushInterval, cmd.Flags().Lookup(flagFlushInterval)); err != nil {
+		panic(err)
+	}
+	return cmd
+}
+
+func BtpUpdateProofContextFromHeightFlag(v *viper.Viper, cmd *cobra.Command) *cobra.Command {
+	cmd.Flags().Int64(flagBTPUpdateProofContextFromHeight, 0, "btp update proof context from height")
+	if err := v.BindPFlag(flagFlushInterval, cmd.Flags().Lookup(flagFlushInterval)); err != nil {
+		panic(err)
+	}
+	return cmd
+}

cmd/start.go

@@ -26,6 +26,7 @@ import (
 	"github.com/cosmos/relayer/v2/internal/relaydebug"
 	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/cosmos/relayer/v2/relayer/chains/cosmos"
+	"github.com/cosmos/relayer/v2/relayer/common"
 	"github.com/cosmos/relayer/v2/relayer/processor"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
@@ -143,8 +144,24 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)),
 				return err
 			}
 
+			btpProofContextUpdateFrom, err := cmd.Flags().GetInt64(flagBTPUpdateProofContextFromHeight)
+			if err != nil {
+				return err
+			}
+
+			ctx := cmd.Context()
+			shouldUpdateProofContext, err := cmd.Flags().GetBool(flagBtpUpdateProofContext)
+			// runUsing the flag
+			if shouldUpdateProofContext {
+				iconStartHeight, err := relayer.RunProofContextUpdate(cmd.Context(), a.log, chains, paths, btpProofContextUpdateFrom)
+				if err != nil {
+					return fmt.Errorf("unable to complete proofContextUpdate error: %v", err)
+				}
+				ctx = context.WithValue(ctx, common.IconStartHeightFromPreRunContext, iconStartHeight)
+			}
+
 			rlyErrCh := relayer.StartRelayer(
-				cmd.Context(),
+				ctx,
 				a.log,
 				chains,
 				paths,
@@ -179,5 +196,7 @@ $ %s start demo-path2 --max-tx-size 10`, appName, appName, appName, appName)),
 	cmd = initBlockFlag(a.viper, cmd)
 	cmd = flushIntervalFlag(a.viper, cmd)
 	cmd = memoFlag(a.viper, cmd)
+	cmd = BtpUpdateProofContextFlag(a.viper, cmd)
+	cmd = BtpUpdateProofContextFromHeightFlag(a.viper, cmd)
 	return cmd
 }

examples/config_IBC_ICON.yaml

@@ -1,59 +1,57 @@
 global:
-    api-listen-addr: :5183
-    timeout: 10s
-    memo: ""
-    light-cache-size: 20
+  api-listen-addr: :5183
+  timeout: 10s
+  memo: ""
+  light-cache-size: 20
 chains:
-    archway:
-        type: wasm
-        value:
-            key-directory: /home/user/.relayer/keys
-            key: relayWallet
-            chain-id: localnet
-            rpc-addr: http://localhost:26657
-            account-prefix: archway
-            keyring-backend: test
-            gas-adjustment: 1.5
-            gas-prices: 0.025stake
-            min-gas-amount: 1000000
-            debug: true
-            timeout: 20s
-            block-timeout: ""
-            output-format: json
-            sign-mode: direct
-            extra-codecs: []
-            coin-type: 0
-            broadcast-mode: batch
-            ibc-handler-address: archway1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucszwhc7n
-            first-retry-block-after: 0
-            start-height: 0
-            block-interval: 3000
-    icon:
-        type: icon
-        value:
-            key-directory: /home/user/.relayer/keys
-            chain-id: ibc-icon
-            rpc-addr: http://localhost:9082/api/v3/
-            timeout: 30s
-            keystore: godWallet
-            password: gochain
-            icon-network-id: 3
-            btp-network-id: 1
-            btp-network-type-id: 1
-            start-height: 0
-            ibc-handler-address: cxbeb5929616e0dbd2fec1e6e950ab09e45e6fb25a
-            first-retry-block-after: 0
-            block-interval: 2000
+  archway:
+    type: wasm
+    value:
+      key-directory: /home/user/.relayer/keys
+      key: relayWallet
+      chain-id: localnet
+      rpc-addr: http://localhost:26657
+      account-prefix: archway
+      keyring-backend: test
+      gas-adjustment: 1.5
+      gas-prices: 0.025stake
+      min-gas-amount: 1000000
+      debug: true
+      timeout: 20s
+      block-timeout: ""
+      output-format: json
+      sign-mode: direct
+      extra-codecs: []
+      coin-type: 0
+      broadcast-mode: batch
+      ibc-handler-address: archway1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucszwhc7n
+      first-retry-block-after: 0
+      block-interval: 3000
+  icon:
+    type: icon
+    value:
+      key-directory: /home/user/.relayer/keys
+      chain-id: ibc-icon
+      rpc-addr: http://localhost:9082/api/v3/
+      timeout: 30s
+      keystore: godWallet
+      password: gochain
+      icon-network-id: 3
+      btp-network-id: 1
+      btp-network-type-id: 1
+      ibc-handler-address: cxbeb5929616e0dbd2fec1e6e950ab09e45e6fb25a
+      first-retry-block-after: 0
+      block-interval: 2000
 paths:
-    icon-archway:
-        src:
-            chain-id: ibc-icon
-            client-id: 07-tendermint-0
-            connection-id: connection-0
-        dst:
-            chain-id: localnet
-            client-id: iconclient-0
-            connection-id: connection-0
-        src-channel-filter:
-            rule: ""
-            channel-list: []
+  icon-archway:
+    src:
+      chain-id: ibc-icon
+      client-id: 07-tendermint-0
+      connection-id: connection-0
+    dst:
+      chain-id: localnet
+      client-id: iconclient-0
+      connection-id: connection-0
+    src-channel-filter:
+      rule: ""
+      channel-list: []

examples/demo/configs/chains/ibc-icon.json

@@ -10,7 +10,6 @@
     "icon-network-id": 3,
     "btp-network-id": 2,
     "btp-network-type-id": 1,
-    "start-height": 0,
     "ibc-handler-address": "cxbeb5929616e0dbd2fec1e6e950ab09e45e6fb25a",
     "first-retry-block-after": 0,
     "block-interval": 2000

examples/demo/configs/chains/ibc-wasm.json

@@ -20,7 +20,7 @@
     "broadcast-mode": "batch",
     "ibc-handler-address": "archway1pvrwmjuusn9wh34j7y520g8gumuy9xtl3gvprlljfdpwju3x7ucszwhc7n",
     "first-retry-block-after": 0,
-    "start-height": 0,
-    "block-interval": 3000
+    "block-interval": 3000,
+    "concurrency": 100
   }
 }

relayer/chains/cosmos/query.go

@@ -1173,5 +1173,21 @@ func (cc *CosmosProvider) QueryConsensusStateABCI(ctx context.Context, clientID
 
 func (ap *CosmosProvider) QueryClientPrevConsensusStateHeight(ctx context.Context, chainHeight int64, clientId string, clientHeight int64) (exported.Height, error) {
 	panic("QueryClientPrevConsensusStateHeight not implemented")
+}
+
+func (ap *CosmosProvider) QueryPacketMessageByEventHeight(ctx context.Context, eventType, srcChanID, srcPortID string, sequence uint64, seqHeight uint64) (provider.PacketInfo, error) {
+	panic("QuerySendPacketByHeight not implemented")
+}
 
+func (ap *CosmosProvider) QueryPacketHeights(ctx context.Context, latestHeight int64, channelId, portId string, startSeq, endSeq uint64) (packetHeights provider.MessageHeights, err error) {
+	panic("QueryPacketHeights not implemented")
+}
+func (ap *CosmosProvider) QueryAckHeights(ctx context.Context, latestHeight int64, channelId, portId string, startSeq, endSeq uint64) (packetHeights provider.MessageHeights, err error) {
+	panic("QueryAckHeights not implemented")
+}
+func (ap *CosmosProvider) QueryMissingPacketReceipts(ctx context.Context, latestHeight int64, channelId, portId string, startSeq, endSeq uint64) (missingReceipts []uint64, err error) {
+	panic("QueryMissingPacketReceipts not implemented")
+}
+func (ap *CosmosProvider) QueryNextSeqSend(ctx context.Context, height int64, channelid, portid string) (seq uint64, err error) {
+	panic("QueryNextSeqSend not implemented")
 }

relayer/chains/icon/client.go

@@ -64,6 +64,7 @@ type IClient interface {
 	GetLastBlock() (*types.Block, error)
 	GetBlockHeaderByHeight(height int64) (*types.BlockHeader, error)
 	GetValidatorsByHash(hash common.HexHash) ([]common.Address, error)
+	GetPrepTerm() (*types.PrepTerm, error)
 }
 
 type Client struct {
@@ -622,6 +623,25 @@ func (c *Client) EstimateStep(param *types.TransactionParamForEstimate) (*types.
 	return &result, nil
 }
 
+func (c *Client) GetPrepTerm() (*types.PrepTerm, error) {
+
+	param := types.CallParam{
+		FromAddress: types.Address(fmt.Sprintf("hx%s", strings.Repeat("0", 40))),
+		ToAddress:   types.Address(genesisContract),
+		DataType:    "call",
+		Data: &types.CallData{
+			Method: MethodGetPrepTerm,
+			Params: map[string]string{},
+		},
+	}
+
+	var op types.PrepTerm
+	if err := c.Call(&param, &op); err != nil {
+		return nil, err
+	}
+	return &op, nil
+}
+
 func NewClient(uri string, l *zap.Logger) *Client {
 	//TODO options {MaxRetrySendTx, MaxRetryGetResult, MaxIdleConnsPerHost, Debug, Dump}
 	tr := &http.Transport{MaxIdleConnsPerHost: 1000}