feat: optimize batch data size by emptying IBC update client msg data

challenger/types/config.go

@@ -113,6 +113,7 @@ func (cfg Config) Validate() error {
 
 func (cfg Config) L1NodeConfig() nodetypes.NodeConfig {
 	nc := nodetypes.NodeConfig{
+		ChainID:      cfg.L1Node.ChainID,
 		RPC:          cfg.L1Node.RPCAddress,
 		ProcessType:  nodetypes.PROCESS_TYPE_DEFAULT,
 		Bech32Prefix: cfg.L1Node.Bech32Prefix,
@@ -122,6 +123,7 @@ func (cfg Config) L1NodeConfig() nodetypes.NodeConfig {
 
 func (cfg Config) L2NodeConfig() nodetypes.NodeConfig {
 	nc := nodetypes.NodeConfig{
+		ChainID:      cfg.L2Node.ChainID,
 		RPC:          cfg.L2Node.RPCAddress,
 		ProcessType:  nodetypes.PROCESS_TYPE_DEFAULT,
 		Bech32Prefix: cfg.L2Node.Bech32Prefix,

e2e/batch_reconstruction_test.go

@@ -16,6 +16,8 @@ import (
 	cmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-proto/anyutil"
 	gogoproto "github.com/cosmos/gogoproto/proto"
+	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibctmlightclients "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 	opchildv1 "github.com/initia-labs/OPinit/api/opinit/opchild/v1"
 	ophosttypes "github.com/initia-labs/OPinit/x/ophost/types"
 	executortypes "github.com/initia-labs/opinit-bots/executor/types"
@@ -35,7 +37,7 @@ func TestBatchReconstructionTest(t *testing.T) {
 		Gas:            "auto",
 		GasPrices:      "0.025uinit",
 		GasAdjustment:  1.2,
-		TrustingPeriod: "168h",
+		TrustingPeriod: "1h",
 		NumValidators:  1,
 		NumFullNodes:   0,
 	}
@@ -49,7 +51,7 @@ func TestBatchReconstructionTest(t *testing.T) {
 		Gas:            "auto",
 		GasPrices:      "0.025umin",
 		GasAdjustment:  1.2,
-		TrustingPeriod: "168h",
+		TrustingPeriod: "1h",
 		NumValidators:  1,
 		NumFullNodes:   0,
 	}
@@ -65,7 +67,24 @@ func TestBatchReconstructionTest(t *testing.T) {
 	cases := []struct {
 		name          string
 		daChainConfig DAChainConfig
+		relayerImpl   ibc.RelayerImplementation
 	}{
+		{
+			name: "initia with go relayer",
+			daChainConfig: DAChainConfig{
+				ChainConfig: *l1ChainConfig,
+				ChainType:   ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+			},
+			relayerImpl: ibc.CosmosRly,
+		},
+		{
+			name: "initia with hermes relayer",
+			daChainConfig: DAChainConfig{
+				ChainConfig: *l1ChainConfig,
+				ChainType:   ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
+			},
+			relayerImpl: ibc.Hermes,
+		},
 		{
 			name: "celestia",
 			daChainConfig: DAChainConfig{
@@ -78,27 +97,21 @@ func TestBatchReconstructionTest(t *testing.T) {
 					Gas:            "auto",
 					GasPrices:      "0.25utia",
 					GasAdjustment:  1.5,
-					TrustingPeriod: "168h",
+					TrustingPeriod: "1h",
 					NumValidators:  1,
 					NumFullNodes:   0,
 				},
 				ChainType: ophosttypes.BatchInfo_CHAIN_TYPE_CELESTIA,
 			},
-		},
-		{
-			name: "initia",
-			daChainConfig: DAChainConfig{
-				ChainConfig: *l1ChainConfig,
-				ChainType:   ophosttypes.BatchInfo_CHAIN_TYPE_INITIA,
-			},
+			relayerImpl: ibc.CosmosRly,
 		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()
 
-			op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, &tc.daChainConfig, bridgeConfig)
+			op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, &tc.daChainConfig, bridgeConfig, tc.relayerImpl)
 
 			err := testutil.WaitForBlocks(ctx, 20, op.Initia, op.Minitia)
 			require.NoError(t, err)
@@ -142,7 +155,7 @@ func TestBatchReconstructionTest(t *testing.T) {
 						require.NoError(t, err)
 						require.NotNil(t, block)
 
-						err = fillOracleData(ctx, block, op.Initia)
+						err = fillData(ctx, block, op.Initia)
 						require.NoError(t, err)
 
 						pbb, err := block.ToProto()
@@ -243,7 +256,7 @@ func BlockFromProtoWithNoValidation(bp *cmtproto.Block) (*cmtypes.Block, error)
 	return b, nil
 }
 
-func fillOracleData(ctx context.Context, block *cmtypes.Block, chain *L1Chain) error {
+func fillData(ctx context.Context, block *cmtypes.Block, chain *L1Chain) error {
 	for i, txBytes := range block.Txs {
 		var raw txv1beta1.TxRaw
 		if err := proto.Unmarshal(txBytes, &raw); err != nil {
@@ -305,6 +318,91 @@ func fillOracleData(ctx context.Context, block *cmtypes.Block, chain *L1Chain) e
 				if err != nil {
 					return errors.Join(errors.New("failed to marshal oracle msg"), err)
 				}
+			case "/ibc.core.client.v1.MsgUpdateClient":
+				updateClientMsg := new(ibcclienttypes.MsgUpdateClient)
+				err := updateClientMsg.Unmarshal(anyMsg.Value)
+				if err != nil {
+					return err
+				}
+
+				if updateClientMsg.ClientMessage.TypeUrl != "/ibc.lightclients.tendermint.v1.Header" {
+					continue
+				}
+
+				tmHeader := new(ibctmlightclients.Header)
+				err = tmHeader.Unmarshal(updateClientMsg.ClientMessage.Value)
+				if err != nil {
+					return err
+				}
+
+				// fill ValidatorSet
+				height := tmHeader.SignedHeader.Commit.Height
+				validators, err := getAllValidators(ctx, chain, height)
+				if err != nil {
+					return err
+				}
+				cmtValidators, _, err := toCmtProtoValidators(validators)
+				if err != nil {
+					return err
+				}
+				if tmHeader.ValidatorSet == nil {
+					tmHeader.ValidatorSet = new(cmtproto.ValidatorSet)
+				}
+				tmHeader.ValidatorSet.Validators = cmtValidators
+				for _, val := range cmtValidators {
+					if bytes.Equal(val.Address, tmHeader.SignedHeader.Header.ProposerAddress) {
+						tmHeader.ValidatorSet.Proposer = val
+					}
+				}
+
+				// fill TrustedValidators
+				height = int64(tmHeader.TrustedHeight.RevisionHeight)
+				validators, err = getAllValidators(ctx, chain, height)
+				if err != nil {
+					return err
+				}
+				cmtValidators, _, err = toCmtProtoValidators(validators)
+				if err != nil {
+					return err
+				}
+				blockHeader, err := chain.GetFullNode().Client.Header(ctx, &height)
+				if err != nil {
+					return err
+				}
+				if tmHeader.TrustedValidators == nil {
+					tmHeader.TrustedValidators = new(cmtproto.ValidatorSet)
+				}
+				tmHeader.TrustedValidators.Validators = cmtValidators
+				for _, val := range cmtValidators {
+					if bytes.Equal(val.Address, blockHeader.Header.ProposerAddress.Bytes()) {
+						tmHeader.TrustedValidators.Proposer = val
+					}
+				}
+
+				// fill commit signatures
+				height = tmHeader.SignedHeader.Commit.Height + 1
+				block, err := chain.GetFullNode().Client.Block(ctx, &height)
+				if err != nil {
+					return err
+				}
+
+				for sigIndex, signature := range tmHeader.SignedHeader.Commit.Signatures {
+					if len(signature.Signature) == 2 {
+						// fill signature
+						blockSigIndex := int(signature.Signature[0]) + int(signature.Signature[1])<<8
+						tmHeader.SignedHeader.Commit.Signatures[sigIndex] = *block.Block.LastCommit.Signatures[blockSigIndex].ToProto()
+					}
+				}
+
+				updateClientMsg.ClientMessage.Value, err = tmHeader.Marshal()
+				if err != nil {
+					return errors.Join(errors.New("failed to marshal tm header"), err)
+				}
+
+				anyMsg.Value, err = updateClientMsg.Marshal()
+				if err != nil {
+					return errors.Join(errors.New("failed to marshal update client msg"), err)
+				}
 			default:
 				continue
 			}
@@ -323,3 +421,39 @@ func fillOracleData(ctx context.Context, block *cmtypes.Block, chain *L1Chain) e
 	}
 	return nil
 }
+
+func getAllValidators(ctx context.Context, chain *L1Chain, height int64) ([]*cmtypes.Validator, error) {
+	page := 1
+	perPage := 100
+
+	validators := make([]*cmtypes.Validator, 0)
+	for {
+		result, err := chain.GetFullNode().Client.Validators(ctx, &height, &page, &perPage)
+		if err != nil {
+			return nil, err
+		}
+		validators = append(validators, result.Validators...)
+		page++
+		if len(validators) >= result.Total {
+			break
+		}
+	}
+	return validators, nil
+}
+
+func toCmtProtoValidators(validators []*cmtypes.Validator) ([]*cmtproto.Validator, int64, error) {
+	protoValidators := make([]*cmtproto.Validator, 0, len(validators))
+	totalVotingPower := int64(0)
+
+	for i := range validators {
+		protoValidator, err := validators[i].ToProto()
+		if err != nil {
+			return nil, 0, err
+		}
+		protoValidator.ProposerPriority = 0
+		totalVotingPower += protoValidator.VotingPower
+
+		protoValidators = append(protoValidators, protoValidator)
+	}
+	return protoValidators, totalVotingPower, nil
+}

e2e/docker.go

@@ -494,7 +494,7 @@ func (op *DockerOPBot) pullContainerImageIfNecessary(containerImage ibc.DockerIm
 }
 
 func (op *DockerOPBot) Name() string {
-	return op.c.Name() + "-" + op.botName + "-" + dockerutil.SanitizeContainerName(op.testName)
+	return dockerutil.CondenseHostName(dockerutil.SanitizeContainerName(op.c.Name() + "-" + op.botName + "-" + op.testName))
 }
 
 func (op *DockerOPBot) Bind() []string {

e2e/go.mod

@@ -101,7 +101,7 @@ require (
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/cosmos/iavl v1.2.0 // indirect
 	github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
-	github.com/cosmos/ibc-go/v8 v8.5.0 // indirect
+	github.com/cosmos/ibc-go/v8 v8.5.0
 	github.com/cosmos/ics23/go v0.11.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect

e2e/helper.go

@@ -13,6 +13,8 @@ import (
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/feegrant"
 	"github.com/avast/retry-go/v4"
+	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibctmlightclients "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 	"github.com/icza/dyno"
 	oracleconfig "github.com/skip-mev/connect/v2/oracle/config"
 	"github.com/skip-mev/connect/v2/providers/apis/marketmap"
@@ -118,6 +120,8 @@ func MinitiaEncoding() *cosmostestutil.TestEncodingConfig {
 	cfg := cosmos.DefaultEncoding()
 	authz.RegisterInterfaces(cfg.InterfaceRegistry)
 	feegrant.RegisterInterfaces(cfg.InterfaceRegistry)
+	ibcclienttypes.RegisterInterfaces(cfg.InterfaceRegistry)
+	ibctmlightclients.RegisterInterfaces(cfg.InterfaceRegistry)
 	opchildtypes.RegisterInterfaces(cfg.InterfaceRegistry)
 	return &cfg
 }
@@ -130,6 +134,7 @@ func SetupTest(
 	l2ChainConfig *ChainConfig,
 	daChainConfig *DAChainConfig,
 	bridgeConfig *BridgeConfig,
+	relayerImpl ibc.RelayerImplementation,
 ) OPTestHelper {
 	require.NotNil(t, l1ChainConfig)
 	require.NotNil(t, l2ChainConfig)
@@ -383,7 +388,7 @@ func SetupTest(
 
 	// relayer setup
 
-	relayer := interchaintest.NewBuiltinRelayerFactory(ibc.CosmosRly, zaptest.NewLogger(t)).Build(t, client, network)
+	relayer := interchaintest.NewBuiltinRelayerFactory(relayerImpl, zaptest.NewLogger(t)).Build(t, client, network)
 
 	ic := interchaintest.NewInterchain().
 		AddChain(initia).
@@ -394,6 +399,9 @@ func SetupTest(
 			Chain2:  minitia,
 			Relayer: relayer,
 			Path:    ibcPath,
+			CreateClientOpts: ibc.CreateClientOptions{
+				TrustingPeriod: initia.Config().TrustingPeriod,
+			},
 		})
 
 	da := initia
@@ -496,7 +504,6 @@ func SetupTest(
 	})
 	err = op.WaitForSync(ctx)
 	require.NoError(t, err)
-
 	return helper
 }
 
@@ -558,7 +565,7 @@ func (op OPTestHelper) ExecutorConfig() *executortypes.Config {
 		L1Node: executortypes.NodeConfig{
 			ChainID:       op.Initia.Config().ChainID,
 			Bech32Prefix:  op.Initia.Config().Bech32Prefix,
-			RPCAddress:    fmt.Sprintf("http://%s:26657", op.Initia.GetFullNode().Name()),
+			RPCAddress:    fmt.Sprintf("http://%s:26657", op.Initia.GetFullNode().HostName()),
 			GasPrice:      op.Initia.Config().GasPrices,
 			GasAdjustment: op.Initia.Config().GasAdjustment,
 			TxTimeout:     10,
@@ -567,7 +574,7 @@ func (op OPTestHelper) ExecutorConfig() *executortypes.Config {
 		L2Node: executortypes.NodeConfig{
 			ChainID:       op.Minitia.Config().ChainID,
 			Bech32Prefix:  op.Minitia.Config().Bech32Prefix,
-			RPCAddress:    fmt.Sprintf("http://%s:26657", op.Minitia.GetFullNode().Name()),
+			RPCAddress:    fmt.Sprintf("http://%s:26657", op.Minitia.GetFullNode().HostName()),
 			GasPrice:      "",
 			GasAdjustment: op.Minitia.Config().GasAdjustment,
 			TxTimeout:     10,
@@ -576,7 +583,7 @@ func (op OPTestHelper) ExecutorConfig() *executortypes.Config {
 		DANode: executortypes.NodeConfig{
 			ChainID:       op.DA.Config().ChainID,
 			Bech32Prefix:  op.DA.Config().Bech32Prefix,
-			RPCAddress:    fmt.Sprintf("http://%s:26657", op.DA.GetFullNode().Name()),
+			RPCAddress:    fmt.Sprintf("http://%s:26657", op.DA.GetFullNode().HostName()),
 			GasPrice:      op.DA.Config().GasPrices,
 			GasAdjustment: op.DA.Config().GasAdjustment,
 			TxTimeout:     10,

e2e/multiple_txs_test.go

@@ -59,7 +59,7 @@ func TestMultipleDepositsAndWithdrawals(t *testing.T) {
 
 	ctx := context.Background()
 
-	op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, daChainConfig, bridgeConfig)
+	op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, daChainConfig, bridgeConfig, ibc.CosmosRly)
 
 	user0 := interchaintest.GetAndFundTestUsers(t, ctx, "user", math.NewInt(100_000), op.Initia, op.Minitia)
 	user1 := interchaintest.GetAndFundTestUsers(t, ctx, "user", math.NewInt(100_000), op.Initia, op.Minitia)

e2e/reconnect_node_test.go

@@ -54,7 +54,7 @@ func TestReconnectNodes(t *testing.T) {
 
 	ctx := context.Background()
 
-	op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, daChainConfig, bridgeConfig)
+	op := SetupTest(t, ctx, BotExecutor, l1ChainConfig, l2ChainConfig, daChainConfig, bridgeConfig, ibc.CosmosRly)
 	err := op.Relayer.PauseRelayer(ctx)
 	require.NoError(t, err)
 

executor/batchsubmitter/batch_submitter.go

@@ -10,6 +10,7 @@ import (
 
 	ophosttypes "github.com/initia-labs/OPinit/x/ophost/types"
 
+	coretypes "github.com/cometbft/cometbft/rpc/core/types"
 	executortypes "github.com/initia-labs/opinit-bots/executor/types"
 	"github.com/initia-labs/opinit-bots/node"
 	btypes "github.com/initia-labs/opinit-bots/node/broadcaster/types"
@@ -20,7 +21,9 @@ import (
 )
 
 type hostNode interface {
+	ChainId() string
 	QueryBatchInfos(context.Context, uint64) (*ophosttypes.QueryBatchInfosResponse, error)
+	QueryBlock(ctx context.Context, height int64) (*coretypes.ResultBlock, error)
 }
 
 type BatchSubmitter struct {