diff --git a/api/opinit/opchild/v1/genesis.pulsar.go b/api/opinit/opchild/v1/genesis.pulsar.go
index 145f50c..2e403b0 100644
--- a/api/opinit/opchild/v1/genesis.pulsar.go
+++ b/api/opinit/opchild/v1/genesis.pulsar.go
@@ -601,7 +601,7 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 				dAtA[i] = 0
 			}
 			i--
-			dAtA[i] = 0x48
+			dAtA[i] = 0x38
 		}
 		if x.BridgeInfo != nil {
 			encoded, err := options.Marshal(x.BridgeInfo)
@@ -615,17 +615,17 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 			copy(dAtA[i:], encoded)
 			i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded)))
 			i--
-			dAtA[i] = 0x42
+			dAtA[i] = 0x32
 		}
 		if x.NextL1Sequence != 0 {
 			i = runtime.EncodeVarint(dAtA, i, uint64(x.NextL1Sequence))
 			i--
-			dAtA[i] = 0x38
+			dAtA[i] = 0x28
 		}
 		if x.NextL2Sequence != 0 {
 			i = runtime.EncodeVarint(dAtA, i, uint64(x.NextL2Sequence))
 			i--
-			dAtA[i] = 0x30
+			dAtA[i] = 0x20
 		}
 		if len(x.Validators) > 0 {
 			for iNdEx := len(x.Validators) - 1; iNdEx >= 0; iNdEx-- {
@@ -826,7 +826,7 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
 				}
 				iNdEx = postIndex
-			case 6:
+			case 4:
 				if wireType != 0 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NextL2Sequence", wireType)
 				}
@@ -845,7 +845,7 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 						break
 					}
 				}
-			case 7:
+			case 5:
 				if wireType != 0 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NextL1Sequence", wireType)
 				}
@@ -864,7 +864,7 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 						break
 					}
 				}
-			case 8:
+			case 6:
 				if wireType != 2 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field BridgeInfo", wireType)
 				}
@@ -900,7 +900,7 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
 				}
 				iNdEx = postIndex
-			case 9:
+			case 7:
 				if wireType != 0 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Exported", wireType)
 				}
@@ -1449,10 +1449,10 @@ type GenesisState struct {
 	LastValidatorPowers []*LastValidatorPower `protobuf:"bytes,2,rep,name=last_validator_powers,json=lastValidatorPowers,proto3" json:"last_validator_powers,omitempty"`
 	// delegations defines the validator set at genesis.
 	Validators     []*Validator `protobuf:"bytes,3,rep,name=validators,proto3" json:"validators,omitempty"`
-	NextL2Sequence uint64       `protobuf:"varint,6,opt,name=next_l2_sequence,json=nextL2Sequence,proto3" json:"next_l2_sequence,omitempty"`
-	NextL1Sequence uint64       `protobuf:"varint,7,opt,name=next_l1_sequence,json=nextL1Sequence,proto3" json:"next_l1_sequence,omitempty"`
-	BridgeInfo     *BridgeInfo  `protobuf:"bytes,8,opt,name=bridge_info,json=bridgeInfo,proto3" json:"bridge_info,omitempty"`
-	Exported       bool         `protobuf:"varint,9,opt,name=exported,proto3" json:"exported,omitempty"`
+	NextL2Sequence uint64       `protobuf:"varint,4,opt,name=next_l2_sequence,json=nextL2Sequence,proto3" json:"next_l2_sequence,omitempty"`
+	NextL1Sequence uint64       `protobuf:"varint,5,opt,name=next_l1_sequence,json=nextL1Sequence,proto3" json:"next_l1_sequence,omitempty"`
+	BridgeInfo     *BridgeInfo  `protobuf:"bytes,6,opt,name=bridge_info,json=bridgeInfo,proto3" json:"bridge_info,omitempty"`
+	Exported       bool         `protobuf:"varint,7,opt,name=exported,proto3" json:"exported,omitempty"`
 }
 
 func (x *GenesisState) Reset() {
@@ -1599,16 +1599,16 @@ var file_opinit_opchild_v1_genesis_proto_rawDesc = []byte{
 	0x64, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x09,
 	0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64,
 	0x61, 0x74, 0x6f, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x6c, 0x32,
-	0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52,
 	0x0e, 0x6e, 0x65, 0x78, 0x74, 0x4c, 0x32, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12,
 	0x28, 0x0a, 0x10, 0x6e, 0x65, 0x78, 0x74, 0x5f, 0x6c, 0x31, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65,
-	0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x6e, 0x65, 0x78, 0x74, 0x4c,
+	0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x6e, 0x65, 0x78, 0x74, 0x4c,
 	0x31, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x0b, 0x62, 0x72, 0x69,
-	0x64, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x64, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
 	0x2e, 0x6f, 0x70, 0x69, 0x6e, 0x69, 0x74, 0x2e, 0x6f, 0x70, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x2e,
 	0x76, 0x31, 0x2e, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x62,
 	0x72, 0x69, 0x64, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x70,
-	0x6f, 0x72, 0x74, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x70,
 	0x6f, 0x72, 0x74, 0x65, 0x64, 0x22, 0x68, 0x0a, 0x12, 0x4c, 0x61, 0x73, 0x74, 0x56, 0x61, 0x6c,
 	0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x07, 0x61,
 	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4,
diff --git a/api/opinit/opchild/v1/query.pulsar.go b/api/opinit/opchild/v1/query.pulsar.go
index a27d9f7..7839cbc 100644
--- a/api/opinit/opchild/v1/query.pulsar.go
+++ b/api/opinit/opchild/v1/query.pulsar.go
@@ -4,7 +4,6 @@ package opchildv1
 import (
 	_ "cosmossdk.io/api/amino"
 	v1beta1 "cosmossdk.io/api/cosmos/base/query/v1beta1"
-	_ "cosmossdk.io/api/cosmos/base/v1beta1"
 	_ "cosmossdk.io/api/cosmos/query/v1"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
@@ -6332,8 +6331,6 @@ var file_opinit_opchild_v1_query_proto_rawDesc = []byte{
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61,
 	0x73, 0x65, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31,
 	0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x76,
-	0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2f,
 	0x76, 0x31, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19,
 	0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73,
diff --git a/api/opinit/opchild/v1/tx.pulsar.go b/api/opinit/opchild/v1/tx.pulsar.go
index 666f91f..e3b3f52 100644
--- a/api/opinit/opchild/v1/tx.pulsar.go
+++ b/api/opinit/opchild/v1/tx.pulsar.go
@@ -8727,7 +8727,7 @@ type MsgFinalizeTokenDeposit struct {
 	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
 	// from is l1 sender address
 	From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"`
-	// to is l2 recipient address or "hook"
+	// to is l2 recipient address
 	To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"`
 	// amount is the coin amount to deposit.
 	Amount *v1beta1.Coin `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"`
diff --git a/proto/buf.gen.pulsar.yaml b/proto/buf.gen.pulsar.yaml
index e671b94..ecd944e 100644
--- a/proto/buf.gen.pulsar.yaml
+++ b/proto/buf.gen.pulsar.yaml
@@ -17,6 +17,3 @@ plugins:
   - name: go-grpc
     out: ../api
     opt: paths=source_relative
-  - name: go-cosmos-orm
-    out: ../api
-    opt: paths=source_relative
diff --git a/proto/buf.lock b/proto/buf.lock
index fe4ad97..33ee1fb 100644
--- a/proto/buf.lock
+++ b/proto/buf.lock
@@ -1,11 +1,6 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
-  - remote: buf.build
-    owner: cometbft
-    repository: cometbft
-    commit: fedbb9acfd2f494b9755949cbb41dfca
-    digest: shake256:c1881013cf98a4833923d74638c3623ac32890fa066eef961986b40e5e86d646fee02f05a5c7fabe596cc81f01108ffb1ae28db39db73a797e7f72e26c289628
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto
diff --git a/proto/buf.yaml b/proto/buf.yaml
index 8faf63e..b8579c8 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -2,7 +2,6 @@
 version: v1
 name: buf.build/initia-labs/OPinit
 deps:
-  - buf.build/cometbft/cometbft:fedbb9acfd2f494b9755949cbb41dfca 
   - buf.build/cosmos/cosmos-sdk:v0.50.0
   - buf.build/cosmos/cosmos-proto:1935555c206d4afb9e94615dfd0fad31
   - buf.build/cosmos/gogo-proto:5e5b9fdd01804356895f8f79a6f1ddc1
diff --git a/proto/opinit/opchild/v1/genesis.proto b/proto/opinit/opchild/v1/genesis.proto
index 432d126..1b816ef 100644
--- a/proto/opinit/opchild/v1/genesis.proto
+++ b/proto/opinit/opchild/v1/genesis.proto
@@ -20,10 +20,10 @@ message GenesisState {
   // delegations defines the validator set at genesis.
   repeated Validator validators = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
 
-  uint64     next_l2_sequence = 6;
-  uint64     next_l1_sequence = 7;
-  BridgeInfo bridge_info      = 8;
-  bool       exported         = 9;
+  uint64     next_l2_sequence = 4;
+  uint64     next_l1_sequence = 5;
+  BridgeInfo bridge_info      = 6;
+  bool       exported         = 7;
 }
 
 // LastValidatorPower required for validator set update logic.
diff --git a/proto/opinit/opchild/v1/query.proto b/proto/opinit/opchild/v1/query.proto
index 8013285..a8af664 100644
--- a/proto/opinit/opchild/v1/query.proto
+++ b/proto/opinit/opchild/v1/query.proto
@@ -3,7 +3,6 @@ package opinit.opchild.v1;
 
 import "amino/amino.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "cosmos/base/v1beta1/coin.proto";
 import "cosmos/query/v1/query.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
diff --git a/proto/opinit/opchild/v1/tx.proto b/proto/opinit/opchild/v1/tx.proto
index 17c5761..62955e1 100644
--- a/proto/opinit/opchild/v1/tx.proto
+++ b/proto/opinit/opchild/v1/tx.proto
@@ -105,7 +105,7 @@ message MsgFinalizeTokenDeposit {
   // from is l1 sender address
   string from = 2;
 
-  // to is l2 recipient address or "hook"
+  // to is l2 recipient address
   string to = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"];
 
   // amount is the coin amount to deposit.
diff --git a/x/opchild/keeper/keeper.go b/x/opchild/keeper/keeper.go
index 95c6b0c..124c6d1 100644
--- a/x/opchild/keeper/keeper.go
+++ b/x/opchild/keeper/keeper.go
@@ -4,10 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"time"
 
 	"cosmossdk.io/collections"
-	collcodec "cosmossdk.io/collections/codec"
 	"cosmossdk.io/core/address"
 	corestoretypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
@@ -54,8 +52,6 @@ type Keeper struct {
 	ValidatorsByConsAddr collections.Map[[]byte, []byte]
 	HistoricalInfos      collections.Map[int64, cosmostypes.HistoricalInfo]
 	DenomPairs           collections.Map[string, string]
-	Commitments          collections.Map[uint64, []byte]
-	CommitmentTimes      collections.Map[uint64, time.Time]
 
 	ExecutorChangePlans map[uint64]types.ExecutorChangePlan
 
@@ -126,8 +122,6 @@ func NewKeeper(
 		ValidatorsByConsAddr:  collections.NewMap(sb, types.ValidatorsByConsAddrPrefix, "validators_by_cons_addr", collections.BytesKey, collections.BytesValue),
 		DenomPairs:            collections.NewMap(sb, types.DenomPairPrefix, "denom_pairs", collections.StringKey, collections.StringValue),
 		HistoricalInfos:       collections.NewMap(sb, types.HistoricalInfoPrefix, "historical_infos", collections.Int64Key, codec.CollValue[cosmostypes.HistoricalInfo](cdc)),
-		Commitments:           collections.NewMap(sb, types.CommitmentPrefix, "commitments", collections.Uint64Key, collections.BytesValue),
-		CommitmentTimes:       collections.NewMap(sb, types.CommitmentTimePrefix, "commitment_times", collections.Uint64Key, collcodec.KeyToValueCodec(sdk.TimeKey)),
 
 		ExecutorChangePlans: make(map[uint64]types.ExecutorChangePlan),
 		HostValidatorStore:  hostValidatorStore,
@@ -159,11 +153,6 @@ func (k Keeper) Router() *baseapp.MsgServiceRouter {
 	return k.router
 }
 
-// StoreService returns the KVStoreService
-func (k Keeper) StoreService() corestoretypes.KVStoreService {
-	return k.storeService
-}
-
 // setDenomMetadata sets an OPinit token's denomination metadata
 func (k Keeper) setDenomMetadata(ctx context.Context, baseDenom, denom string) {
 	metadata := banktypes.Metadata{
diff --git a/x/opchild/types/genesis.pb.go b/x/opchild/types/genesis.pb.go
index e8ec6f8..6577471 100644
--- a/x/opchild/types/genesis.pb.go
+++ b/x/opchild/types/genesis.pb.go
@@ -34,10 +34,10 @@ type GenesisState struct {
 	LastValidatorPowers []LastValidatorPower `protobuf:"bytes,2,rep,name=last_validator_powers,json=lastValidatorPowers,proto3" json:"last_validator_powers"`
 	// delegations defines the validator set at genesis.
 	Validators     []Validator `protobuf:"bytes,3,rep,name=validators,proto3" json:"validators"`
-	NextL2Sequence uint64      `protobuf:"varint,6,opt,name=next_l2_sequence,json=nextL2Sequence,proto3" json:"next_l2_sequence,omitempty"`
-	NextL1Sequence uint64      `protobuf:"varint,7,opt,name=next_l1_sequence,json=nextL1Sequence,proto3" json:"next_l1_sequence,omitempty"`
-	BridgeInfo     *BridgeInfo `protobuf:"bytes,8,opt,name=bridge_info,json=bridgeInfo,proto3" json:"bridge_info,omitempty"`
-	Exported       bool        `protobuf:"varint,9,opt,name=exported,proto3" json:"exported,omitempty"`
+	NextL2Sequence uint64      `protobuf:"varint,4,opt,name=next_l2_sequence,json=nextL2Sequence,proto3" json:"next_l2_sequence,omitempty"`
+	NextL1Sequence uint64      `protobuf:"varint,5,opt,name=next_l1_sequence,json=nextL1Sequence,proto3" json:"next_l1_sequence,omitempty"`
+	BridgeInfo     *BridgeInfo `protobuf:"bytes,6,opt,name=bridge_info,json=bridgeInfo,proto3" json:"bridge_info,omitempty"`
+	Exported       bool        `protobuf:"varint,7,opt,name=exported,proto3" json:"exported,omitempty"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -171,36 +171,37 @@ func init() {
 func init() { proto.RegisterFile("opinit/opchild/v1/genesis.proto", fileDescriptor_08c29689c0e7bd55) }
 
 var fileDescriptor_08c29689c0e7bd55 = []byte{
-	// 464 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x33, 0x5b, 0xed, 0xb6, 0x53, 0x11, 0x77, 0xac, 0x90, 0x2d, 0x6e, 0x1a, 0x16, 0x84,
-	0x20, 0x34, 0xa1, 0xf1, 0x26, 0x22, 0xd8, 0x4b, 0x11, 0x16, 0x2c, 0x29, 0x78, 0xf0, 0x12, 0x26,
-	0xcd, 0x6c, 0x3a, 0x90, 0xce, 0xc4, 0x99, 0xd9, 0x5a, 0xbf, 0x81, 0x47, 0x3f, 0xc2, 0x1e, 0x05,
-	0x2f, 0x1e, 0xfc, 0x10, 0x7b, 0x5c, 0x3c, 0x79, 0x12, 0x69, 0x0f, 0xfa, 0x31, 0x96, 0xce, 0x64,
-	0xb3, 0x85, 0xf4, 0x12, 0xe6, 0xbd, 0xf7, 0x7b, 0xff, 0x79, 0x99, 0xf7, 0x87, 0x7d, 0x5e, 0x50,
-	0x46, 0x55, 0xc0, 0x8b, 0xd9, 0x9c, 0xe6, 0x69, 0xb0, 0x1c, 0x06, 0x19, 0x61, 0x44, 0x52, 0xe9,
-	0x17, 0x82, 0x2b, 0x8e, 0x8e, 0x0c, 0xe0, 0x97, 0x80, 0xbf, 0x1c, 0xf6, 0x8e, 0xf0, 0x82, 0x32,
-	0x1e, 0xe8, 0xaf, 0xa1, 0x7a, 0xc7, 0x33, 0x2e, 0x17, 0x5c, 0xc6, 0x3a, 0x0a, 0x4c, 0x50, 0x96,
-	0xba, 0x19, 0xcf, 0xb8, 0xc9, 0x6f, 0x4f, 0x65, 0xf6, 0xa4, 0x7e, 0xaf, 0xfa, 0x5c, 0x90, 0xb2,
-	0xe9, 0xf4, 0x7b, 0x03, 0x3e, 0x18, 0x9b, 0x39, 0xa6, 0x0a, 0x2b, 0x82, 0x5e, 0xc1, 0x66, 0x81,
-	0x05, 0x5e, 0x48, 0x1b, 0xb8, 0xc0, 0xeb, 0x84, 0xc7, 0x7e, 0x6d, 0x2e, 0x7f, 0xa2, 0x81, 0x51,
-	0xfb, 0xea, 0x4f, 0xdf, 0xfa, 0xf6, 0xef, 0xc7, 0x73, 0x10, 0x95, 0x3d, 0x28, 0x85, 0x4f, 0x72,
-	0x2c, 0x55, 0xbc, 0xc4, 0x39, 0x4d, 0xb1, 0xe2, 0x22, 0x2e, 0xf8, 0x27, 0x22, 0xa4, 0x7d, 0xe0,
-	0x36, 0xbc, 0x4e, 0xf8, 0x6c, 0x8f, 0xd8, 0x19, 0x96, 0xea, 0xfd, 0x2d, 0x3e, 0xd9, 0xd2, 0xbb,
-	0xc2, 0x8f, 0xf3, 0x5a, 0x59, 0xa2, 0x31, 0x84, 0xd5, 0x05, 0xd2, 0x6e, 0x68, 0xe9, 0xa7, 0x7b,
-	0xa4, 0xab, 0xbe, 0x5d, 0xc5, 0x9d, 0x56, 0xe4, 0xc1, 0x47, 0x8c, 0xac, 0x54, 0x9c, 0x87, 0xb1,
-	0x24, 0x1f, 0x2f, 0x08, 0x9b, 0x11, 0xbb, 0xe9, 0x02, 0xef, 0x5e, 0xf4, 0x70, 0x9b, 0x3f, 0x0b,
-	0xa7, 0x65, 0xf6, 0x8e, 0x1c, 0xde, 0x91, 0x87, 0x3b, 0xe4, 0xb0, 0x22, 0x5f, 0xc3, 0x4e, 0x22,
-	0x68, 0x9a, 0x91, 0x98, 0xb2, 0x73, 0x6e, 0xb7, 0xf4, 0x2b, 0x9e, 0xec, 0x99, 0x6e, 0xa4, 0xa9,
-	0xb7, 0xec, 0x9c, 0x47, 0x30, 0xa9, 0xce, 0xa8, 0x07, 0x5b, 0x64, 0x55, 0x70, 0xa1, 0x48, 0x6a,
-	0xb7, 0x5d, 0xe0, 0xb5, 0xa2, 0x2a, 0x3e, 0x9d, 0x43, 0x54, 0x7f, 0x2e, 0x14, 0xc2, 0x43, 0x9c,
-	0xa6, 0x82, 0x48, 0xb3, 0xb3, 0xf6, 0xc8, 0xfe, 0xf5, 0x73, 0xd0, 0x2d, 0xbd, 0xf1, 0xc6, 0x54,
-	0xa6, 0x4a, 0x50, 0x96, 0x45, 0xb7, 0x20, 0xea, 0xc2, 0xfb, 0x7a, 0x33, 0xf6, 0x81, 0x0b, 0xbc,
-	0x46, 0x64, 0x82, 0x97, 0xad, 0x2f, 0x97, 0x7d, 0xeb, 0xff, 0x65, 0xdf, 0x1a, 0x8d, 0xaf, 0xd6,
-	0x0e, 0xb8, 0x5e, 0x3b, 0xe0, 0xef, 0xda, 0x01, 0x5f, 0x37, 0x8e, 0x75, 0xbd, 0x71, 0xac, 0xdf,
-	0x1b, 0xc7, 0xfa, 0x30, 0xc8, 0xa8, 0x9a, 0x5f, 0x24, 0xfe, 0x8c, 0x2f, 0x82, 0xed, 0x2f, 0x51,
-	0x3c, 0xc8, 0x71, 0x22, 0x83, 0x77, 0x13, 0xed, 0xb3, 0x55, 0xe5, 0x34, 0x6d, 0xb3, 0xa4, 0xa9,
-	0x7d, 0xf6, 0xe2, 0x26, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x6d, 0xcc, 0x7e, 0x00, 0x03, 0x00, 0x00,
+	// 465 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x41, 0x6b, 0xdb, 0x30,
+	0x14, 0xc7, 0xad, 0xa6, 0x4d, 0x53, 0x65, 0x8c, 0x55, 0xcb, 0xc0, 0x0d, 0xab, 0x63, 0x0a, 0x03,
+	0x33, 0x88, 0x4d, 0xbc, 0xdb, 0x18, 0x83, 0xe5, 0x12, 0x06, 0x85, 0x05, 0x07, 0x76, 0xd8, 0xc5,
+	0xc8, 0xb1, 0xea, 0x08, 0x1c, 0xc9, 0x93, 0xd4, 0x2c, 0xfb, 0x06, 0x3b, 0xee, 0x23, 0xf4, 0x38,
+	0xd8, 0x65, 0x87, 0x7d, 0x88, 0x1e, 0xcb, 0x4e, 0x3b, 0x8d, 0x91, 0x1c, 0xb6, 0x8f, 0x51, 0x22,
+	0xb9, 0x6e, 0xc0, 0xb9, 0x18, 0xbd, 0xf7, 0x7e, 0xef, 0xaf, 0x67, 0xbd, 0x3f, 0xec, 0xf1, 0x82,
+	0x32, 0xaa, 0x02, 0x5e, 0x4c, 0x67, 0x34, 0x4f, 0x83, 0xc5, 0x20, 0xc8, 0x08, 0x23, 0x92, 0x4a,
+	0xbf, 0x10, 0x5c, 0x71, 0x74, 0x6c, 0x00, 0xbf, 0x04, 0xfc, 0xc5, 0xa0, 0x7b, 0x8c, 0xe7, 0x94,
+	0xf1, 0x40, 0x7f, 0x0d, 0xd5, 0x3d, 0x99, 0x72, 0x39, 0xe7, 0x32, 0xd6, 0x51, 0x60, 0x82, 0xb2,
+	0xd4, 0xc9, 0x78, 0xc6, 0x4d, 0x7e, 0x73, 0x2a, 0xb3, 0xa7, 0xf5, 0x7b, 0xd5, 0xe7, 0x82, 0x94,
+	0x4d, 0x67, 0xdf, 0x1b, 0xf0, 0xc1, 0xc8, 0xcc, 0x31, 0x51, 0x58, 0x11, 0xf4, 0x0a, 0x36, 0x0b,
+	0x2c, 0xf0, 0x5c, 0xda, 0xc0, 0x05, 0x5e, 0x3b, 0x3c, 0xf1, 0x6b, 0x73, 0xf9, 0x63, 0x0d, 0x0c,
+	0x8f, 0xae, 0xff, 0xf4, 0xac, 0x6f, 0xff, 0x7e, 0x3c, 0x07, 0x51, 0xd9, 0x83, 0x52, 0xf8, 0x24,
+	0xc7, 0x52, 0xc5, 0x0b, 0x9c, 0xd3, 0x14, 0x2b, 0x2e, 0xe2, 0x82, 0x7f, 0x22, 0x42, 0xda, 0x7b,
+	0x6e, 0xc3, 0x6b, 0x87, 0xcf, 0x76, 0x88, 0x9d, 0x63, 0xa9, 0xde, 0xdf, 0xe1, 0xe3, 0x0d, 0xbd,
+	0x2d, 0xfc, 0x38, 0xaf, 0x95, 0x25, 0x1a, 0x41, 0x58, 0x5d, 0x20, 0xed, 0x86, 0x96, 0x7e, 0xba,
+	0x43, 0xba, 0xea, 0xdb, 0x56, 0xdc, 0x6a, 0x45, 0x1e, 0x7c, 0xc4, 0xc8, 0x52, 0xc5, 0x79, 0x18,
+	0x4b, 0xf2, 0xf1, 0x92, 0xb0, 0x29, 0xb1, 0xf7, 0x5d, 0xe0, 0xed, 0x47, 0x0f, 0x37, 0xf9, 0xf3,
+	0x70, 0x52, 0x66, 0xef, 0xc9, 0xc1, 0x3d, 0x79, 0xb0, 0x45, 0x0e, 0x2a, 0xf2, 0x35, 0x6c, 0x27,
+	0x82, 0xa6, 0x19, 0x89, 0x29, 0xbb, 0xe0, 0x76, 0x53, 0xbf, 0xe2, 0xe9, 0x8e, 0xe9, 0x86, 0x9a,
+	0x7a, 0xcb, 0x2e, 0x78, 0x04, 0x93, 0xea, 0x8c, 0xba, 0xb0, 0x45, 0x96, 0x05, 0x17, 0x8a, 0xa4,
+	0xf6, 0xa1, 0x0b, 0xbc, 0x56, 0x54, 0xc5, 0x67, 0x33, 0x88, 0xea, 0xcf, 0x85, 0x42, 0x78, 0x88,
+	0xd3, 0x54, 0x10, 0x69, 0x76, 0x76, 0x34, 0xb4, 0x7f, 0xfd, 0xec, 0x77, 0x4a, 0x6f, 0xbc, 0x31,
+	0x95, 0x89, 0x12, 0x94, 0x65, 0xd1, 0x1d, 0x88, 0x3a, 0xf0, 0x40, 0x6f, 0xc6, 0xde, 0x73, 0x81,
+	0xd7, 0x88, 0x4c, 0xf0, 0xb2, 0xf5, 0xe5, 0xaa, 0x67, 0xfd, 0xbf, 0xea, 0x59, 0xc3, 0xd1, 0xf5,
+	0xca, 0x01, 0x37, 0x2b, 0x07, 0xfc, 0x5d, 0x39, 0xe0, 0xeb, 0xda, 0xb1, 0x6e, 0xd6, 0x8e, 0xf5,
+	0x7b, 0xed, 0x58, 0x1f, 0xfa, 0x19, 0x55, 0xb3, 0xcb, 0xc4, 0x9f, 0xf2, 0x79, 0xb0, 0xf9, 0x25,
+	0x8a, 0xfb, 0x39, 0x4e, 0x64, 0xf0, 0x6e, 0xac, 0x7d, 0xb6, 0xac, 0x9c, 0xa6, 0x6d, 0x96, 0x34,
+	0xb5, 0xcf, 0x5e, 0xdc, 0x06, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x97, 0x80, 0x16, 0x00, 0x03, 0x00,
+	0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -231,7 +232,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			dAtA[i] = 0
 		}
 		i--
-		dAtA[i] = 0x48
+		dAtA[i] = 0x38
 	}
 	if m.BridgeInfo != nil {
 		{
@@ -243,17 +244,17 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 			i = encodeVarintGenesis(dAtA, i, uint64(size))
 		}
 		i--
-		dAtA[i] = 0x42
+		dAtA[i] = 0x32
 	}
 	if m.NextL1Sequence != 0 {
 		i = encodeVarintGenesis(dAtA, i, uint64(m.NextL1Sequence))
 		i--
-		dAtA[i] = 0x38
+		dAtA[i] = 0x28
 	}
 	if m.NextL2Sequence != 0 {
 		i = encodeVarintGenesis(dAtA, i, uint64(m.NextL2Sequence))
 		i--
-		dAtA[i] = 0x30
+		dAtA[i] = 0x20
 	}
 	if len(m.Validators) > 0 {
 		for iNdEx := len(m.Validators) - 1; iNdEx >= 0; iNdEx-- {
@@ -530,7 +531,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 6:
+		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field NextL2Sequence", wireType)
 			}
@@ -549,7 +550,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 7:
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field NextL1Sequence", wireType)
 			}
@@ -568,7 +569,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 8:
+		case 6:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field BridgeInfo", wireType)
 			}
@@ -604,7 +605,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 9:
+		case 7:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Exported", wireType)
 			}
diff --git a/x/opchild/types/keys.go b/x/opchild/types/keys.go
index 7309f37..18bfb47 100644
--- a/x/opchild/types/keys.go
+++ b/x/opchild/types/keys.go
@@ -20,8 +20,6 @@ var (
 	NextL1SequenceKey = []byte{0x14} // prefix for inbound deposit sequence number
 
 	HistoricalInfoPrefix = []byte{0x21} // prefix for the historical info
-	CommitmentTimePrefix = []byte{0x22} // prefix for withdrawal commitments creation time
-	CommitmentPrefix     = []byte{0x23} // prefix for withdrawal commitments
 
 	LastValidatorPowerPrefix   = []byte{0x31} // prefix for each key to a validator index, for bonded validators
 	ValidatorsPrefix           = []byte{0x32} // prefix for each key to a validator
diff --git a/x/opchild/types/query.pb.go b/x/opchild/types/query.pb.go
index 12a58d9..08dc677 100644
--- a/x/opchild/types/query.pb.go
+++ b/x/opchild/types/query.pb.go
@@ -7,7 +7,6 @@ import (
 	context "context"
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	_ "github.com/cosmos/cosmos-sdk/types"
 	query "github.com/cosmos/cosmos-sdk/types/query"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
@@ -668,59 +667,59 @@ func init() {
 func init() { proto.RegisterFile("opinit/opchild/v1/query.proto", fileDescriptor_15cfbb5d02a763ec) }
 
 var fileDescriptor_15cfbb5d02a763ec = []byte{
-	// 826 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xcf, 0x6b, 0x13, 0x4d,
-	0x18, 0xc7, 0xb3, 0x7d, 0xdf, 0x96, 0x37, 0x4f, 0x79, 0x8b, 0x1d, 0xa3, 0xa6, 0x69, 0xb3, 0x2d,
-	0x2b, 0x6d, 0xd3, 0x48, 0x76, 0xcc, 0x7a, 0x10, 0x44, 0x10, 0x83, 0x5a, 0x0a, 0xa2, 0x35, 0x05,
-	0x11, 0x2f, 0x71, 0x36, 0xbb, 0xdd, 0x2e, 0x24, 0x3b, 0xdb, 0xdd, 0x6d, 0x68, 0x29, 0x45, 0xf0,
-	0xe4, 0xcd, 0x82, 0x1e, 0xbd, 0x78, 0x13, 0x7a, 0xf1, 0xe0, 0x1f, 0xd1, 0x63, 0xd1, 0x8b, 0x27,
-	0x91, 0x56, 0xf0, 0xdf, 0x90, 0x9d, 0x9d, 0xfd, 0xd5, 0x6c, 0xda, 0xe8, 0xa5, 0xcd, 0x3c, 0x3f,
-	0xe6, 0xfb, 0x99, 0x67, 0x9e, 0x67, 0x58, 0x28, 0x53, 0xdb, 0xb4, 0x4c, 0x0f, 0x53, 0xbb, 0xbd,
-	0x61, 0x76, 0x34, 0xdc, 0xab, 0xe3, 0xcd, 0x2d, 0xdd, 0xd9, 0x91, 0x6d, 0x87, 0x7a, 0x14, 0x4d,
-	0x06, 0x6e, 0x99, 0xbb, 0xe5, 0x5e, 0xbd, 0x34, 0x49, 0xba, 0xa6, 0x45, 0x31, 0xfb, 0x1b, 0x44,
-	0x95, 0xaa, 0x6d, 0xea, 0x76, 0xa9, 0x8b, 0x55, 0xe2, 0xea, 0x41, 0x3a, 0xee, 0xd5, 0x55, 0xdd,
-	0x23, 0x75, 0x6c, 0x13, 0xc3, 0xb4, 0x88, 0x67, 0x52, 0x8b, 0xc7, 0x8a, 0xc9, 0xd8, 0x30, 0xaa,
-	0x4d, 0xcd, 0xd0, 0x3f, 0xcd, 0xfd, 0xe1, 0x36, 0x49, 0x9c, 0xd2, 0x54, 0xe0, 0x6c, 0xb1, 0x15,
-	0x0e, 0x16, 0xdc, 0x55, 0x30, 0xa8, 0x41, 0x03, 0xbb, 0xff, 0x8b, 0x5b, 0x67, 0x0c, 0x4a, 0x8d,
-	0x8e, 0x8e, 0x89, 0x6d, 0x62, 0x62, 0x59, 0xd4, 0x63, 0x28, 0x61, 0x4e, 0xc6, 0xe1, 0xbd, 0x1d,
-	0x5b, 0xe7, 0x6e, 0xe9, 0x05, 0x5c, 0x7e, 0xe2, 0x8b, 0x3f, 0x25, 0x1d, 0x53, 0x23, 0x1e, 0x75,
-	0xdc, 0xa6, 0xbe, 0xb9, 0xa5, 0xbb, 0x1e, 0x7a, 0x00, 0x10, 0x1f, 0xac, 0x28, 0xcc, 0x09, 0x95,
-	0x71, 0x65, 0x41, 0xe6, 0x3c, 0xfe, 0xc9, 0xe4, 0x80, 0x9a, 0x9f, 0x4f, 0x5e, 0x25, 0x86, 0xce,
-	0x73, 0x9b, 0x89, 0x4c, 0xe9, 0x40, 0x80, 0x2b, 0x7d, 0x12, 0xae, 0x4d, 0x2d, 0x57, 0x47, 0xcb,
-	0x00, 0xbd, 0xc8, 0x5a, 0x14, 0xe6, 0xfe, 0xa9, 0x8c, 0x2b, 0x33, 0x72, 0xdf, 0x7d, 0xc8, 0x51,
-	0x6a, 0x23, 0x7f, 0xf8, 0x7d, 0x36, 0xf7, 0xf1, 0xd7, 0xa7, 0xaa, 0xd0, 0x4c, 0xa4, 0xfa, 0x1b,
-	0x25, 0x60, 0x47, 0x18, 0xec, 0xe2, 0xb9, 0xb0, 0x01, 0x45, 0x8a, 0xf6, 0x19, 0x5c, 0x4a, 0xc3,
-	0x86, 0xe5, 0xb8, 0x03, 0x13, 0x91, 0x5e, 0x8b, 0x68, 0x9a, 0xc3, 0x4a, 0x92, 0x6f, 0x14, 0xbf,
-	0x7c, 0xae, 0x15, 0xb8, 0xd0, 0x5d, 0x4d, 0x73, 0x74, 0xd7, 0x5d, 0xf3, 0x1c, 0xd3, 0x32, 0x9a,
-	0xff, 0x47, 0xf1, 0xbe, 0x5d, 0x6a, 0x9d, 0xae, 0x74, 0x54, 0x85, 0xfb, 0x90, 0x8f, 0x42, 0x79,
-	0xa1, 0x87, 0x2e, 0x42, 0x9c, 0x29, 0x15, 0xb9, 0x40, 0xc3, 0x31, 0x35, 0x43, 0x5f, 0xb1, 0xd6,
-	0x29, 0x67, 0x97, 0x34, 0x7e, 0x03, 0x49, 0x0f, 0xd7, 0x5e, 0x81, 0x71, 0x95, 0x59, 0x5b, 0xa6,
-	0xb5, 0x4e, 0xb9, 0x7a, 0x39, 0x43, 0x3d, 0xce, 0x4d, 0xdd, 0x81, 0x1a, 0x99, 0xa5, 0x02, 0x20,
-	0xa6, 0xb2, 0x4a, 0x1c, 0xd2, 0x0d, 0xdb, 0x48, 0x5a, 0x83, 0x8b, 0x29, 0x2b, 0xd7, 0xbd, 0x0d,
-	0x63, 0x36, 0xb3, 0x70, 0xc9, 0xa9, 0x0c, 0xc9, 0x20, 0x25, 0x29, 0xc7, 0x73, 0xa4, 0x19, 0x28,
-	0xb1, 0x4d, 0x1f, 0xe9, 0xdb, 0xde, 0xc3, 0xfa, 0x9a, 0x2f, 0x65, 0xb5, 0xc3, 0xee, 0x93, 0x96,
-	0x61, 0x3a, 0xd3, 0xcb, 0xa5, 0x2b, 0x70, 0xc1, 0xd2, 0xb7, 0xbd, 0x56, 0xa7, 0xde, 0x72, 0xb9,
-	0x8f, 0x41, 0xfc, 0xdb, 0x9c, 0xb0, 0x52, 0x19, 0x69, 0x19, 0xe5, 0x4c, 0x19, 0x65, 0xb0, 0x8c,
-	0x92, 0x2d, 0x13, 0x65, 0x48, 0x35, 0xde, 0x73, 0x0d, 0xe2, 0xea, 0xf7, 0x74, 0x8b, 0x76, 0xc3,
-	0x9e, 0x2b, 0xc0, 0xa8, 0xe6, 0xaf, 0x83, 0x56, 0x6b, 0x06, 0x0b, 0xe9, 0x66, 0x78, 0xcf, 0x71,
-	0x38, 0x97, 0x2c, 0x03, 0xf8, 0xbd, 0xde, 0x4a, 0x26, 0xe5, 0xd5, 0x30, 0x4c, 0x39, 0xf8, 0x0f,
-	0x46, 0x59, 0x26, 0x7a, 0x23, 0x00, 0xc4, 0xe3, 0x88, 0x96, 0x32, 0x8a, 0x9f, 0xfd, 0x2a, 0x94,
-	0xaa, 0xc3, 0x84, 0x06, 0x38, 0x52, 0xf5, 0xb5, 0x7f, 0x69, 0xaf, 0xbe, 0xfe, 0x7c, 0x3b, 0x32,
-	0x8b, 0xca, 0xb8, 0xff, 0x21, 0x4a, 0x0c, 0xf0, 0x7b, 0x01, 0xf2, 0xd1, 0x16, 0xa8, 0x72, 0xae,
-	0x4a, 0xc8, 0xb3, 0x34, 0x44, 0x24, 0xc7, 0xb9, 0x15, 0xe3, 0x60, 0x54, 0x3b, 0x0b, 0x07, 0xef,
-	0xa6, 0x47, 0x7d, 0x0f, 0xed, 0x0b, 0x00, 0xf1, 0x04, 0x0c, 0x2e, 0x58, 0xdf, 0xec, 0x0d, 0x2e,
-	0x58, 0xff, 0x30, 0x4a, 0xd7, 0x62, 0xc2, 0x39, 0x24, 0x66, 0x10, 0x26, 0x46, 0x15, 0xbd, 0x84,
-	0xb1, 0x60, 0x40, 0xd0, 0xfc, 0x20, 0x89, 0xd4, 0x24, 0x96, 0x16, 0xce, 0x0b, 0xe3, 0x14, 0x0b,
-	0x31, 0xc5, 0x34, 0x9a, 0xca, 0xa0, 0x08, 0x86, 0x10, 0x7d, 0x10, 0x60, 0x22, 0x3d, 0x62, 0xa8,
-	0x36, 0x48, 0x22, 0x73, 0x50, 0x4b, 0xf2, 0xb0, 0xe1, 0x9c, 0xec, 0x7a, 0x4c, 0x36, 0x8f, 0xae,
-	0x66, 0x90, 0x9d, 0x9e, 0xeb, 0x98, 0x51, 0x19, 0x92, 0x51, 0xf9, 0x33, 0x46, 0xe5, 0x6f, 0x19,
-	0xe3, 0x47, 0x01, 0xbd, 0x13, 0x20, 0x1f, 0xcd, 0xf2, 0xe0, 0xd6, 0x3f, 0xfd, 0x3a, 0x0c, 0x6e,
-	0xfd, 0xbe, 0x87, 0x41, 0x52, 0x62, 0xa8, 0x45, 0x34, 0x9f, 0xd5, 0x58, 0xd1, 0xb3, 0x81, 0x77,
-	0xd9, 0xbf, 0xbd, 0xc6, 0xf2, 0xe1, 0xb1, 0x28, 0x1c, 0x1d, 0x8b, 0xc2, 0x8f, 0x63, 0x51, 0xd8,
-	0x3f, 0x11, 0x73, 0x47, 0x27, 0x62, 0xee, 0xdb, 0x89, 0x98, 0x7b, 0x5e, 0x33, 0x4c, 0x6f, 0x63,
-	0x4b, 0x95, 0xdb, 0xb4, 0x8b, 0xfd, 0x8d, 0x4c, 0x52, 0xeb, 0x10, 0xd5, 0xc5, 0x8f, 0x57, 0xd9,
-	0xb6, 0xdb, 0xd1, 0xc6, 0xec, 0x43, 0x43, 0x1d, 0x63, 0x5f, 0x1a, 0x37, 0x7e, 0x07, 0x00, 0x00,
-	0xff, 0xff, 0xf0, 0x63, 0xf9, 0xf4, 0x87, 0x09, 0x00, 0x00,
+	// 820 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xcf, 0x6b, 0xdb, 0x48,
+	0x14, 0xc7, 0xad, 0xec, 0x26, 0xac, 0x5f, 0xd8, 0xb0, 0x99, 0xf5, 0xee, 0x3a, 0x4e, 0xec, 0x04,
+	0x2d, 0x49, 0x1c, 0x2f, 0xd6, 0xac, 0xd5, 0x43, 0xa1, 0x14, 0x4a, 0x4d, 0xdb, 0x10, 0x28, 0x6d,
+	0xea, 0x40, 0x29, 0xbd, 0xb8, 0x23, 0x6b, 0xa2, 0x08, 0x6c, 0x8d, 0x22, 0x29, 0x26, 0x21, 0x84,
+	0x42, 0x4f, 0xbd, 0x35, 0xd0, 0x1e, 0x7b, 0xe9, 0xad, 0x90, 0x4b, 0x0f, 0xfd, 0x23, 0x72, 0x0c,
+	0xed, 0xa5, 0xa7, 0x52, 0x92, 0x42, 0xff, 0x8d, 0xa2, 0xd1, 0xe8, 0x57, 0x2c, 0x27, 0x6e, 0x2f,
+	0x89, 0xe7, 0xfd, 0x98, 0xef, 0x67, 0xde, 0xbc, 0x37, 0x08, 0xca, 0xcc, 0x36, 0x2d, 0xd3, 0xc3,
+	0xcc, 0xee, 0x6c, 0x99, 0x5d, 0x1d, 0xf7, 0x1b, 0x78, 0x7b, 0x87, 0x3a, 0x7b, 0x8a, 0xed, 0x30,
+	0x8f, 0xa1, 0xe9, 0xc0, 0xad, 0x08, 0xb7, 0xd2, 0x6f, 0x94, 0xa6, 0x49, 0xcf, 0xb4, 0x18, 0xe6,
+	0x7f, 0x83, 0xa8, 0x52, 0xad, 0xc3, 0xdc, 0x1e, 0x73, 0xb1, 0x46, 0x5c, 0x1a, 0xa4, 0xe3, 0x7e,
+	0x43, 0xa3, 0x1e, 0x69, 0x60, 0x9b, 0x18, 0xa6, 0x45, 0x3c, 0x93, 0x59, 0x22, 0x76, 0x56, 0xc4,
+	0x86, 0x61, 0x49, 0xb9, 0xd2, 0x4c, 0xe0, 0x6c, 0xf3, 0x15, 0x0e, 0x16, 0xc2, 0x55, 0x30, 0x98,
+	0xc1, 0x02, 0xbb, 0xff, 0x4b, 0x58, 0xe7, 0x0c, 0xc6, 0x8c, 0x2e, 0xc5, 0xc4, 0x36, 0x31, 0xb1,
+	0x2c, 0xe6, 0x71, 0xa9, 0x30, 0x27, 0xe3, 0x70, 0xde, 0x9e, 0x4d, 0x85, 0x5b, 0x7e, 0x02, 0x7f,
+	0x3f, 0xf0, 0xc5, 0x1f, 0x92, 0xae, 0xa9, 0x13, 0x8f, 0x39, 0x6e, 0x8b, 0x6e, 0xef, 0x50, 0xd7,
+	0x43, 0x77, 0x00, 0x62, 0xf0, 0xa2, 0xb4, 0x20, 0x55, 0x27, 0xd5, 0x25, 0x45, 0xf0, 0xf8, 0xa7,
+	0x54, 0x02, 0x6a, 0x71, 0x4a, 0x65, 0x9d, 0x18, 0x54, 0xe4, 0xb6, 0x12, 0x99, 0xf2, 0x91, 0x04,
+	0xff, 0x0c, 0x48, 0xb8, 0x36, 0xb3, 0x5c, 0x8a, 0x56, 0x01, 0xfa, 0x91, 0xb5, 0x28, 0x2d, 0xfc,
+	0x52, 0x9d, 0x54, 0xe7, 0x94, 0x81, 0x7a, 0x2b, 0x51, 0x6a, 0x33, 0x7f, 0xfc, 0x79, 0x3e, 0xf7,
+	0xf6, 0xdb, 0xbb, 0x9a, 0xd4, 0x4a, 0xa4, 0xfa, 0x1b, 0x25, 0x60, 0xc7, 0x38, 0xec, 0xf2, 0xa5,
+	0xb0, 0x01, 0x45, 0x8a, 0xf6, 0x11, 0xfc, 0x95, 0x86, 0x0d, 0xcb, 0x71, 0x03, 0xa6, 0x22, 0xbd,
+	0x36, 0xd1, 0x75, 0x87, 0x97, 0x24, 0xdf, 0x2c, 0x7e, 0x78, 0x5f, 0x2f, 0x08, 0xa1, 0x9b, 0xba,
+	0xee, 0x50, 0xd7, 0xdd, 0xf0, 0x1c, 0xd3, 0x32, 0x5a, 0xbf, 0x47, 0xf1, 0xbe, 0x5d, 0x6e, 0x9f,
+	0xaf, 0x74, 0x54, 0x85, 0xdb, 0x90, 0x8f, 0x42, 0x45, 0xa1, 0x47, 0x2e, 0x42, 0x9c, 0x29, 0x17,
+	0x85, 0x40, 0xd3, 0x31, 0x75, 0x83, 0xae, 0x59, 0x9b, 0x4c, 0xb0, 0xcb, 0xba, 0xb8, 0x81, 0xa4,
+	0x47, 0x68, 0xaf, 0xc1, 0xa4, 0xc6, 0xad, 0x6d, 0xd3, 0xda, 0x64, 0x42, 0xbd, 0x9c, 0xa1, 0x1e,
+	0xe7, 0xa6, 0xee, 0x40, 0x8b, 0xcc, 0x72, 0x01, 0x10, 0x57, 0x59, 0x27, 0x0e, 0xe9, 0x85, 0x6d,
+	0x24, 0x6f, 0xc0, 0x9f, 0x29, 0xab, 0xd0, 0xbd, 0x0e, 0x13, 0x36, 0xb7, 0x08, 0xc9, 0x99, 0x0c,
+	0xc9, 0x20, 0x25, 0x29, 0x27, 0x72, 0xe4, 0x39, 0x28, 0xf1, 0x4d, 0xef, 0xd1, 0x5d, 0xef, 0x6e,
+	0x63, 0xc3, 0x97, 0xb2, 0x3a, 0x61, 0xf7, 0xc9, 0xab, 0x30, 0x9b, 0xe9, 0x15, 0xd2, 0x55, 0xf8,
+	0xc3, 0xa2, 0xbb, 0x5e, 0xbb, 0xdb, 0x68, 0xbb, 0xc2, 0xc7, 0x21, 0x7e, 0x6d, 0x4d, 0x59, 0xa9,
+	0x8c, 0xb4, 0x8c, 0x7a, 0xa1, 0x8c, 0x3a, 0x5c, 0x46, 0xcd, 0x96, 0x89, 0x32, 0xe4, 0xba, 0xe8,
+	0xb9, 0x26, 0x71, 0xe9, 0x2d, 0x6a, 0xb1, 0x5e, 0xd8, 0x73, 0x05, 0x18, 0xd7, 0xfd, 0x75, 0xd0,
+	0x6a, 0xad, 0x60, 0x21, 0x5f, 0x0d, 0xef, 0x39, 0x0e, 0x17, 0x92, 0x65, 0x00, 0xbf, 0xd7, 0xdb,
+	0xc9, 0xa4, 0xbc, 0x16, 0x86, 0xa9, 0x47, 0xbf, 0xc1, 0x38, 0xcf, 0x44, 0x2f, 0x24, 0x80, 0x78,
+	0x1c, 0xd1, 0x4a, 0x46, 0xf1, 0xb3, 0x5f, 0x85, 0x52, 0x6d, 0x94, 0xd0, 0x00, 0x47, 0xae, 0x3d,
+	0xf7, 0x2f, 0xed, 0xd9, 0xc7, 0xaf, 0x2f, 0xc7, 0xe6, 0x51, 0x19, 0x0f, 0x3e, 0x44, 0x89, 0x01,
+	0x7e, 0x2d, 0x41, 0x3e, 0xda, 0x02, 0x55, 0x2f, 0x55, 0x09, 0x79, 0x56, 0x46, 0x88, 0x14, 0x38,
+	0xd7, 0x62, 0x1c, 0x8c, 0xea, 0x17, 0xe1, 0xe0, 0xfd, 0xf4, 0xa8, 0x1f, 0xa0, 0x43, 0x09, 0x20,
+	0x9e, 0x80, 0xe1, 0x05, 0x1b, 0x98, 0xbd, 0xe1, 0x05, 0x1b, 0x1c, 0x46, 0xf9, 0xbf, 0x98, 0x70,
+	0x01, 0x55, 0x32, 0x08, 0x13, 0xa3, 0x8a, 0x9e, 0xc2, 0x44, 0x30, 0x20, 0x68, 0x71, 0x98, 0x44,
+	0x6a, 0x12, 0x4b, 0x4b, 0x97, 0x85, 0x09, 0x8a, 0xa5, 0x98, 0x62, 0x16, 0xcd, 0x64, 0x50, 0x04,
+	0x43, 0x88, 0xde, 0x48, 0x30, 0x95, 0x1e, 0x31, 0x54, 0x1f, 0x26, 0x91, 0x39, 0xa8, 0x25, 0x65,
+	0xd4, 0x70, 0x41, 0xf6, 0x7f, 0x4c, 0xb6, 0x88, 0xfe, 0xcd, 0x20, 0x3b, 0x3f, 0xd7, 0x31, 0xa3,
+	0x3a, 0x22, 0xa3, 0xfa, 0x63, 0x8c, 0xea, 0xcf, 0x32, 0xc6, 0x8f, 0x02, 0x7a, 0x25, 0x41, 0x3e,
+	0x9a, 0xe5, 0xe1, 0xad, 0x7f, 0xfe, 0x75, 0x18, 0xde, 0xfa, 0x03, 0x0f, 0x83, 0xac, 0xc6, 0x50,
+	0xcb, 0x68, 0x31, 0xab, 0xb1, 0xa2, 0x67, 0x03, 0xef, 0xf3, 0x7f, 0x07, 0xcd, 0xd5, 0xe3, 0xd3,
+	0x8a, 0x74, 0x72, 0x5a, 0x91, 0xbe, 0x9c, 0x56, 0xa4, 0xc3, 0xb3, 0x4a, 0xee, 0xe4, 0xac, 0x92,
+	0xfb, 0x74, 0x56, 0xc9, 0x3d, 0xae, 0x1b, 0xa6, 0xb7, 0xb5, 0xa3, 0x29, 0x1d, 0xd6, 0xc3, 0xfe,
+	0x46, 0x26, 0xa9, 0x77, 0x89, 0xe6, 0xe2, 0xfb, 0xeb, 0x7c, 0xdb, 0xdd, 0x68, 0x63, 0xfe, 0xa1,
+	0xa1, 0x4d, 0xf0, 0x2f, 0x8d, 0x2b, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x5e, 0xc4, 0x7b,
+	0x67, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/opchild/types/tx.go b/x/opchild/types/tx.go
index 4ec8e41..9639c1a 100644
--- a/x/opchild/types/tx.go
+++ b/x/opchild/types/tx.go
@@ -258,6 +258,7 @@ func (msg MsgFinalizeTokenDeposit) Validate(ac address.Codec) error {
 		}
 	}
 
+	// allow zero amount
 	if !msg.Amount.IsValid() {
 		return ErrInvalidAmount
 	}
diff --git a/x/opchild/types/tx.pb.go b/x/opchild/types/tx.pb.go
index eb82717..b4e7dd6 100644
--- a/x/opchild/types/tx.pb.go
+++ b/x/opchild/types/tx.pb.go
@@ -197,7 +197,7 @@ type MsgFinalizeTokenDeposit struct {
 	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"`
 	// from is l1 sender address
 	From string `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"`
-	// to is l2 recipient address or "hook"
+	// to is l2 recipient address
 	To string `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"`
 	// amount is the coin amount to deposit.
 	Amount types1.Coin `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount" yaml:"amount"`
@@ -788,83 +788,83 @@ func init() {
 func init() { proto.RegisterFile("opinit/opchild/v1/tx.proto", fileDescriptor_1ee96a503651b6e4) }
 
 var fileDescriptor_1ee96a503651b6e4 = []byte{
-	// 1205 bytes of a gzipped FileDescriptorProto
+	// 1204 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x41, 0x6f, 0xe3, 0x44,
-	0x14, 0x8e, 0xd3, 0x36, 0x6d, 0xa6, 0xbb, 0xdb, 0xd6, 0xaa, 0xa8, 0x6b, 0xd1, 0xa4, 0x32, 0x42,
-	0x84, 0x40, 0xec, 0x6d, 0x10, 0x1c, 0x22, 0x21, 0xd1, 0xb0, 0x5b, 0xa9, 0xac, 0xa2, 0xad, 0xd2,
-	0x05, 0x24, 0x0e, 0x94, 0x49, 0x3c, 0x75, 0x46, 0x8d, 0x3d, 0xc6, 0x33, 0x09, 0x0d, 0x17, 0x10,
-	0x27, 0xc4, 0x89, 0x9f, 0xb0, 0x07, 0x0e, 0x88, 0x53, 0x0f, 0x9c, 0x16, 0x7e, 0x40, 0xb5, 0xa7,
-	0x15, 0x07, 0xc4, 0xa9, 0x40, 0x7b, 0x28, 0xe7, 0x5e, 0xb9, 0x20, 0x8f, 0x27, 0x8e, 0xe3, 0xd8,
-	0x6d, 0x17, 0x75, 0x2f, 0x6d, 0xe6, 0xbd, 0x6f, 0xde, 0xbc, 0xf7, 0xbd, 0x37, 0xef, 0x8d, 0x81,
-	0x4a, 0x5c, 0xec, 0x60, 0x66, 0x10, 0xb7, 0xdd, 0xc1, 0x5d, 0xd3, 0xe8, 0x6f, 0x18, 0xec, 0x50,
-	0x77, 0x3d, 0xc2, 0x88, 0xbc, 0x14, 0xe8, 0x74, 0xa1, 0xd3, 0xfb, 0x1b, 0xea, 0x12, 0xb4, 0xb1,
-	0x43, 0x0c, 0xfe, 0x37, 0x40, 0xa9, 0x85, 0x36, 0xa1, 0x36, 0xa1, 0x46, 0x0b, 0x52, 0x64, 0xf4,
-	0x37, 0x5a, 0x88, 0xc1, 0x0d, 0xa3, 0x4d, 0xb0, 0x23, 0xf4, 0x2b, 0x42, 0x6f, 0x53, 0xcb, 0xb7,
-	0x6e, 0x53, 0x4b, 0x28, 0x56, 0x03, 0xc5, 0x1e, 0x5f, 0x19, 0xc1, 0x42, 0xa8, 0x96, 0x2d, 0x62,
-	0x91, 0x40, 0xee, 0xff, 0x1a, 0x6e, 0xb0, 0x08, 0xb1, 0xba, 0xc8, 0xe0, 0xab, 0x56, 0x6f, 0xdf,
-	0x80, 0xce, 0x40, 0xa8, 0xd6, 0x12, 0xc2, 0x18, 0xb8, 0x48, 0xd8, 0xd3, 0x7e, 0x90, 0x80, 0xdc,
-	0xa0, 0xd6, 0xfd, 0x43, 0xd4, 0xee, 0x31, 0xd4, 0x40, 0x94, 0x42, 0x0b, 0x51, 0xf9, 0x2e, 0xc8,
-	0x51, 0xe4, 0x98, 0xc8, 0x53, 0xa4, 0x75, 0xa9, 0x94, 0xaf, 0x2b, 0xbf, 0xfd, 0x5c, 0x59, 0x16,
-	0x8e, 0x6c, 0x9a, 0xa6, 0x87, 0x28, 0xdd, 0x65, 0x1e, 0x76, 0xac, 0xa6, 0xc0, 0xc9, 0x77, 0xc1,
-	0x9c, 0x2d, 0x76, 0x2b, 0xd9, 0xf5, 0xa9, 0xd2, 0x7c, 0x75, 0x59, 0x0f, 0xbc, 0xd2, 0x87, 0x5e,
-	0xe9, 0x9b, 0xce, 0xa0, 0x19, 0xa2, 0x6a, 0xe5, 0x6f, 0xce, 0x8f, 0xca, 0x62, 0xfb, 0x77, 0xe7,
-	0x47, 0x65, 0x75, 0xe8, 0xe2, 0xa4, 0x3f, 0xda, 0xcb, 0x40, 0x9d, 0x94, 0x36, 0x11, 0x75, 0x89,
-	0x43, 0x91, 0xf6, 0x54, 0x02, 0x8b, 0x0d, 0x6a, 0xed, 0x22, 0x56, 0xf7, 0xb0, 0x69, 0xa1, 0x6d,
-	0x67, 0x9f, 0xc8, 0x9b, 0xb1, 0x10, 0x5e, 0xbf, 0x38, 0x29, 0xde, 0x1e, 0x40, 0xbb, 0x5b, 0xd3,
-	0x02, 0xb9, 0x76, 0x65, 0x4c, 0xdb, 0x60, 0xbe, 0xc5, 0x0d, 0xee, 0x61, 0x67, 0x9f, 0x28, 0xd9,
-	0x75, 0xa9, 0x34, 0x5f, 0x5d, 0xd3, 0x27, 0x92, 0xaf, 0x8f, 0x8e, 0xad, 0xe7, 0x8f, 0x4f, 0x8a,
-	0x99, 0x1f, 0xcf, 0x8f, 0xca, 0x52, 0x13, 0xb4, 0x42, 0x71, 0xad, 0x14, 0x0b, 0x56, 0x89, 0x04,
-	0x3b, 0xe6, 0xb7, 0xa6, 0x02, 0x25, 0x2e, 0x0b, 0x03, 0xbd, 0xc8, 0x82, 0x95, 0x06, 0xb5, 0xb6,
-	0xb0, 0x03, 0xbb, 0xf8, 0x4b, 0xf4, 0x88, 0x1c, 0x20, 0xe7, 0x1e, 0x72, 0x09, 0xc5, 0xec, 0x26,
-	0xe2, 0x95, 0xc1, 0xf4, 0xbe, 0x47, 0x6c, 0x1e, 0x68, 0xbe, 0xc9, 0x7f, 0xcb, 0x77, 0x40, 0x96,
-	0x11, 0x65, 0x8a, 0x4b, 0xb2, 0x8c, 0xc8, 0x0d, 0x90, 0x83, 0x36, 0xe9, 0x39, 0x4c, 0x99, 0xe6,
-	0x74, 0xac, 0xea, 0xc2, 0xa4, 0x5f, 0xe5, 0xba, 0xa8, 0x72, 0xfd, 0x7d, 0x82, 0x9d, 0xba, 0xea,
-	0x53, 0x31, 0xf2, 0x22, 0xd8, 0xa6, 0x05, 0xdc, 0x08, 0x23, 0xb2, 0x0a, 0xe6, 0x28, 0xfa, 0xbc,
-	0x87, 0x9c, 0x36, 0x52, 0x66, 0xd6, 0xa5, 0xd2, 0x74, 0x33, 0x5c, 0xcb, 0x2f, 0x81, 0x5c, 0x07,
-	0x61, 0xab, 0xc3, 0x94, 0x1c, 0xd7, 0x88, 0x95, 0xbc, 0x06, 0x80, 0x7f, 0xd8, 0x9e, 0x89, 0x1c,
-	0x62, 0x2b, 0xb3, 0xdc, 0xb5, 0xbc, 0x2f, 0xb9, 0xe7, 0x0b, 0xe4, 0x35, 0x30, 0x6d, 0x42, 0x06,
-	0x95, 0xb9, 0x75, 0xa9, 0x74, 0x8b, 0xe7, 0x43, 0x0a, 0xce, 0xe4, 0xe2, 0x9a, 0x11, 0xcb, 0x44,
-	0x31, 0x92, 0x89, 0x24, 0x62, 0xb5, 0xcf, 0x40, 0x31, 0x45, 0x35, 0xcc, 0x8b, 0xfc, 0x2e, 0xc8,
-	0x79, 0x88, 0xf6, 0xba, 0x8c, 0x73, 0x7f, 0xa7, 0xfa, 0x6a, 0x42, 0x8d, 0x0c, 0xc1, 0x4d, 0x0e,
-	0x7c, 0x34, 0x70, 0x51, 0x53, 0x6c, 0xd2, 0xfe, 0x95, 0x78, 0x79, 0x6f, 0x3b, 0x98, 0x61, 0xc8,
-	0x82, 0x23, 0x3e, 0xc6, 0xac, 0x63, 0x7a, 0xf0, 0x0b, 0xd8, 0xfd, 0x1f, 0x97, 0xb1, 0xc4, 0x93,
-	0x96, 0xbd, 0x02, 0x7d, 0xf3, 0xe9, 0xac, 0x55, 0x63, 0xe4, 0x6a, 0x11, 0x72, 0x53, 0xc2, 0xd3,
-	0xde, 0x03, 0x5a, 0xba, 0x36, 0xa4, 0x38, 0x5a, 0x28, 0xd2, 0x78, 0xa1, 0x68, 0x4f, 0xb2, 0x60,
-	0xa1, 0x41, 0xad, 0x4d, 0xd3, 0xfc, 0x08, 0x76, 0xb1, 0x09, 0x19, 0xf1, 0xe4, 0x0f, 0x40, 0x1e,
-	0xf6, 0x58, 0x87, 0x78, 0x98, 0x0d, 0x04, 0x6f, 0x6f, 0x5e, 0x9c, 0x14, 0x17, 0x85, 0xf3, 0x43,
-	0x55, 0xfa, 0xa5, 0x18, 0x6d, 0x97, 0x15, 0x30, 0x6b, 0x13, 0x07, 0x1f, 0x20, 0x4f, 0x5c, 0x8d,
-	0xe1, 0x52, 0xbe, 0x0f, 0x96, 0xfa, 0xc3, 0x23, 0xf7, 0x60, 0xb0, 0x3f, 0xb8, 0x2c, 0x97, 0xf0,
-	0xbe, 0x18, 0x6e, 0x11, 0x72, 0x79, 0x0b, 0xe4, 0xdc, 0x5e, 0xeb, 0x00, 0x0d, 0x44, 0x16, 0x12,
-	0x5b, 0x67, 0x5d, 0x79, 0x3a, 0xb2, 0xd8, 0xf6, 0x06, 0x2e, 0x23, 0xfa, 0x4e, 0xaf, 0xf5, 0x00,
-	0x0d, 0x9a, 0x62, 0x77, 0xad, 0xfa, 0xed, 0xe3, 0x62, 0xe6, 0x9f, 0xc7, 0xc5, 0x8c, 0x9f, 0x86,
-	0x51, 0x00, 0x7e, 0x26, 0x56, 0x22, 0x99, 0x88, 0x12, 0xa5, 0xad, 0xf2, 0x96, 0x12, 0x15, 0x85,
-	0xed, 0xe6, 0xf7, 0x60, 0x38, 0x34, 0x91, 0x4d, 0xfa, 0xe8, 0xc5, 0x50, 0x9b, 0x48, 0x60, 0xf6,
-	0x79, 0x09, 0xac, 0x55, 0x26, 0x03, 0x8e, 0x8e, 0x93, 0x58, 0x04, 0x62, 0x9c, 0xc4, 0xa4, 0x61,
-	0xd8, 0xbf, 0x4a, 0xbc, 0x9c, 0x3e, 0x74, 0x4d, 0xc8, 0xd0, 0x0e, 0xf4, 0xa0, 0x4d, 0x6f, 0x34,
-	0xe6, 0x0d, 0x90, 0x73, 0xb9, 0x55, 0x31, 0x51, 0x56, 0x13, 0xba, 0x45, 0x70, 0x6c, 0x53, 0x00,
-	0x83, 0x59, 0x99, 0x9e, 0xd0, 0xa8, 0xab, 0x22, 0xa1, 0x51, 0xd1, 0x28, 0xb2, 0xe0, 0xa2, 0xec,
-	0xba, 0xc8, 0x31, 0xb7, 0x10, 0xda, 0x21, 0xa4, 0x7b, 0xa3, 0x91, 0xbd, 0x03, 0xf2, 0x1e, 0x6a,
-	0x63, 0x17, 0x23, 0x87, 0x5d, 0x99, 0xc5, 0x11, 0x54, 0x1e, 0x84, 0x5d, 0x68, 0x8a, 0x3f, 0x1d,
-	0x2e, 0xe9, 0x42, 0x5b, 0x89, 0x5d, 0xe8, 0xa7, 0x3f, 0x8b, 0x25, 0x0b, 0xb3, 0x4e, 0xaf, 0xa5,
-	0xb7, 0x89, 0x2d, 0x9e, 0x4c, 0xe2, 0x5f, 0x85, 0x9a, 0x07, 0xe2, 0xcd, 0xe3, 0x5b, 0xa0, 0xe3,
-	0x1d, 0xeb, 0x0a, 0x66, 0xa3, 0x54, 0x09, 0x66, 0xa3, 0xa2, 0x90, 0xd9, 0x5f, 0xa2, 0x35, 0xf3,
-	0xd0, 0x83, 0xed, 0x2e, 0xba, 0x89, 0x89, 0xbc, 0x16, 0x8e, 0x40, 0x9f, 0xcd, 0xe9, 0xfa, 0x8c,
-	0x70, 0x3e, 0x9c, 0x84, 0xc1, 0xa8, 0x9b, 0x4a, 0x1e, 0x75, 0xaf, 0xc5, 0xba, 0xf1, 0x64, 0xc9,
-	0x04, 0x9e, 0x8e, 0x95, 0x4c, 0x20, 0x1a, 0x06, 0x56, 0x7d, 0x32, 0x0b, 0xa6, 0x1a, 0xd4, 0x92,
-	0x2d, 0xb0, 0x10, 0x7f, 0x24, 0x26, 0x4d, 0xb9, 0xc9, 0x57, 0x9a, 0x5a, 0xb9, 0x16, 0x2c, 0x6c,
-	0xf4, 0x10, 0xdc, 0x1e, 0x7f, 0xc8, 0xbd, 0x92, 0xbc, 0x7f, 0x0c, 0xa4, 0xbe, 0x71, 0x0d, 0x50,
-	0x78, 0x44, 0x1f, 0x2c, 0x27, 0x3e, 0xa1, 0xca, 0xc9, 0x46, 0x92, 0xb0, 0x6a, 0xf5, 0xfa, 0xd8,
-	0xf0, 0xdc, 0xaf, 0xc0, 0x4a, 0xda, 0x8c, 0x4f, 0x21, 0x29, 0x05, 0xae, 0xbe, 0xfd, 0x5c, 0xf0,
-	0xd0, 0x81, 0x4f, 0xc1, 0xad, 0xb1, 0x21, 0xa9, 0x25, 0x9b, 0x89, 0x62, 0xd4, 0xf2, 0xd5, 0x98,
-	0xd0, 0xbe, 0x05, 0x16, 0xe2, 0xc3, 0x22, 0xa5, 0x48, 0x62, 0xb0, 0xb4, 0x22, 0x49, 0x69, 0xd1,
-	0x7e, 0x20, 0x63, 0xed, 0x39, 0x25, 0x90, 0x28, 0x26, 0x2d, 0x90, 0xa4, 0x46, 0xe9, 0xdb, 0x1f,
-	0x6b, 0x92, 0x29, 0xf6, 0xa3, 0x98, 0x34, 0xfb, 0x49, 0xed, 0x62, 0xe4, 0xbf, 0x68, 0x15, 0x97,
-	0xfa, 0x1f, 0x60, 0x2e, 0xf7, 0x7f, 0xfc, 0xd6, 0xaa, 0x33, 0x5f, 0xfb, 0x6d, 0xa0, 0xfe, 0xe0,
-	0xf8, 0xef, 0x42, 0xe6, 0xf8, 0xb4, 0x20, 0x3d, 0x3b, 0x2d, 0x48, 0x7f, 0x9d, 0x16, 0xa4, 0xef,
-	0xcf, 0x0a, 0x99, 0x67, 0x67, 0x85, 0xcc, 0x1f, 0x67, 0x85, 0xcc, 0x27, 0x95, 0x48, 0xc7, 0xc4,
-	0xbc, 0x72, 0x2a, 0x5d, 0xd8, 0xa2, 0xc6, 0xc3, 0x1d, 0xfe, 0xc5, 0x78, 0x18, 0x7e, 0x33, 0xf2,
-	0xe6, 0xd9, 0xca, 0xf1, 0xc7, 0xc8, 0x5b, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x99, 0xc9, 0x6a,
-	0x7b, 0x19, 0x0f, 0x00, 0x00,
+	0x14, 0x8e, 0x93, 0x6e, 0x76, 0x33, 0xdd, 0xdd, 0xb6, 0x56, 0x45, 0x5d, 0x8b, 0x26, 0x95, 0x11,
+	0x22, 0x04, 0x62, 0x6f, 0x83, 0xe0, 0x10, 0x09, 0x89, 0x86, 0xdd, 0x4a, 0x65, 0x15, 0x6d, 0x95,
+	0x2e, 0x20, 0x71, 0xa0, 0x4c, 0xe2, 0xa9, 0x33, 0x6a, 0xec, 0x31, 0x9e, 0x49, 0x68, 0xb8, 0x80,
+	0x38, 0x21, 0xc4, 0x81, 0x9f, 0xb0, 0x07, 0x0e, 0x88, 0x53, 0x0f, 0x9c, 0x16, 0x7e, 0x40, 0xb5,
+	0xa7, 0x15, 0x07, 0xc4, 0xa9, 0xb0, 0xed, 0xa1, 0x9c, 0xf7, 0x17, 0x20, 0x8f, 0x27, 0x8e, 0xe3,
+	0xd8, 0x4d, 0x17, 0x95, 0x4b, 0x9b, 0x79, 0xef, 0x9b, 0x37, 0xef, 0x7b, 0xef, 0xcd, 0x7b, 0x63,
+	0xa0, 0x12, 0x17, 0x3b, 0x98, 0x19, 0xc4, 0xed, 0x74, 0x71, 0xcf, 0x34, 0x06, 0x1b, 0x06, 0x3b,
+	0xd4, 0x5d, 0x8f, 0x30, 0x22, 0x2f, 0x05, 0x3a, 0x5d, 0xe8, 0xf4, 0xc1, 0x86, 0xba, 0x04, 0x6d,
+	0xec, 0x10, 0x83, 0xff, 0x0d, 0x50, 0x6a, 0xb1, 0x43, 0xa8, 0x4d, 0xa8, 0xd1, 0x86, 0x14, 0x19,
+	0x83, 0x8d, 0x36, 0x62, 0x70, 0xc3, 0xe8, 0x10, 0xec, 0x08, 0xfd, 0x8a, 0xd0, 0xdb, 0xd4, 0xf2,
+	0xad, 0xdb, 0xd4, 0x12, 0x8a, 0xd5, 0x40, 0xb1, 0xc7, 0x57, 0x46, 0xb0, 0x10, 0xaa, 0x65, 0x8b,
+	0x58, 0x24, 0x90, 0xfb, 0xbf, 0x46, 0x1b, 0x2c, 0x42, 0xac, 0x1e, 0x32, 0xf8, 0xaa, 0xdd, 0xdf,
+	0x37, 0xa0, 0x33, 0x14, 0xaa, 0xb5, 0x04, 0x1a, 0x43, 0x17, 0x09, 0x7b, 0xda, 0x8f, 0x12, 0x90,
+	0x9b, 0xd4, 0xba, 0x77, 0x88, 0x3a, 0x7d, 0x86, 0x9a, 0x88, 0x52, 0x68, 0x21, 0x2a, 0xdf, 0x01,
+	0x79, 0x8a, 0x1c, 0x13, 0x79, 0x8a, 0xb4, 0x2e, 0x95, 0x0b, 0x0d, 0xe5, 0xf7, 0x5f, 0xaa, 0xcb,
+	0xc2, 0x91, 0x4d, 0xd3, 0xf4, 0x10, 0xa5, 0xbb, 0xcc, 0xc3, 0x8e, 0xd5, 0x12, 0x38, 0xf9, 0x0e,
+	0xb8, 0x61, 0x8b, 0xdd, 0x4a, 0x76, 0x3d, 0x57, 0x9e, 0xaf, 0x2d, 0xeb, 0x81, 0x57, 0xfa, 0xc8,
+	0x2b, 0x7d, 0xd3, 0x19, 0xb6, 0x42, 0x54, 0xbd, 0xf2, 0xcd, 0xf9, 0x51, 0x45, 0x6c, 0xff, 0xee,
+	0xfc, 0xa8, 0xa2, 0x8e, 0x5c, 0x9c, 0xf6, 0x47, 0x7b, 0x19, 0xa8, 0xd3, 0xd2, 0x16, 0xa2, 0x2e,
+	0x71, 0x28, 0xd2, 0x9e, 0x48, 0x60, 0xb1, 0x49, 0xad, 0x5d, 0xc4, 0x1a, 0x1e, 0x36, 0x2d, 0xb4,
+	0xed, 0xec, 0x13, 0x79, 0x33, 0x46, 0xe1, 0xf5, 0xe7, 0x27, 0xa5, 0x5b, 0x43, 0x68, 0xf7, 0xea,
+	0x5a, 0x20, 0xd7, 0x66, 0x72, 0xda, 0x06, 0xf3, 0x6d, 0x6e, 0x70, 0x0f, 0x3b, 0xfb, 0x44, 0xc9,
+	0xae, 0x4b, 0xe5, 0xf9, 0xda, 0x9a, 0x3e, 0x95, 0x7c, 0x7d, 0x7c, 0x6c, 0xa3, 0x70, 0x7c, 0x52,
+	0xca, 0xfc, 0x74, 0x7e, 0x54, 0x91, 0x5a, 0xa0, 0x1d, 0x8a, 0xeb, 0xe5, 0x18, 0x59, 0x25, 0x42,
+	0x76, 0xc2, 0x6f, 0x4d, 0x05, 0x4a, 0x5c, 0x16, 0x12, 0xfd, 0x3e, 0x07, 0x56, 0x9a, 0xd4, 0xda,
+	0xc2, 0x0e, 0xec, 0xe1, 0x2f, 0xd1, 0x43, 0x72, 0x80, 0x9c, 0xbb, 0xc8, 0x25, 0x14, 0xb3, 0xab,
+	0xe0, 0x2b, 0x83, 0xb9, 0x7d, 0x8f, 0xd8, 0x9c, 0x68, 0xa1, 0xc5, 0x7f, 0xcb, 0x65, 0x90, 0x65,
+	0x44, 0xc9, 0xcd, 0xa8, 0x82, 0x2c, 0x23, 0x72, 0x13, 0xe4, 0xa1, 0x4d, 0xfa, 0x0e, 0x53, 0xe6,
+	0x78, 0xa0, 0x56, 0x75, 0x01, 0xf5, 0xeb, 0x5f, 0x17, 0xf5, 0xaf, 0xbf, 0x4f, 0xb0, 0xd3, 0x50,
+	0xfd, 0x20, 0x8d, 0xfd, 0x0b, 0xb6, 0x69, 0x41, 0xd4, 0x84, 0x11, 0x59, 0x05, 0x37, 0x28, 0xfa,
+	0xbc, 0x8f, 0x9c, 0x0e, 0x52, 0xae, 0xad, 0x4b, 0xe5, 0xb9, 0x56, 0xb8, 0x96, 0x5f, 0x02, 0xf9,
+	0x2e, 0xc2, 0x56, 0x97, 0x29, 0x79, 0xae, 0x11, 0x2b, 0x79, 0x0d, 0x00, 0xff, 0xb0, 0x3d, 0x13,
+	0x39, 0xc4, 0x56, 0xae, 0x73, 0x1a, 0x05, 0x5f, 0x72, 0xd7, 0x17, 0xc8, 0x6b, 0x60, 0xce, 0x84,
+	0x0c, 0x2a, 0x37, 0xd6, 0xa5, 0xf2, 0x4d, 0x9e, 0x29, 0x29, 0x38, 0x93, 0x8b, 0xeb, 0x46, 0x2c,
+	0x47, 0xa5, 0x48, 0x8e, 0x92, 0x42, 0xae, 0x7d, 0x06, 0x4a, 0x29, 0xaa, 0x51, 0xc6, 0xe4, 0x77,
+	0x41, 0xde, 0x43, 0xb4, 0xdf, 0x63, 0x3c, 0x2b, 0xb7, 0x6b, 0xaf, 0x26, 0x54, 0xcf, 0x08, 0xdc,
+	0xe2, 0xc0, 0x87, 0x43, 0x17, 0xb5, 0xc4, 0x26, 0xed, 0x99, 0xc4, 0x0b, 0x7f, 0xdb, 0xc1, 0x0c,
+	0x43, 0x16, 0x1c, 0xf1, 0x31, 0x66, 0x5d, 0xd3, 0x83, 0x5f, 0xc0, 0xde, 0x7f, 0xb8, 0xa6, 0xb7,
+	0x79, 0x3a, 0x83, 0x04, 0x5f, 0x7d, 0xd2, 0xea, 0xb5, 0x58, 0x08, 0xb5, 0x48, 0x08, 0x53, 0x48,
+	0x68, 0xef, 0x01, 0x2d, 0x5d, 0x1b, 0x06, 0x32, 0x5a, 0x0e, 0xd2, 0x64, 0x39, 0x68, 0x8f, 0xb3,
+	0x60, 0xa1, 0x49, 0xad, 0x4d, 0xd3, 0xfc, 0x08, 0xf6, 0xb0, 0x09, 0x19, 0xf1, 0xe4, 0x0f, 0x40,
+	0x01, 0xf6, 0x59, 0x97, 0x78, 0x98, 0x0d, 0x45, 0x74, 0xde, 0x7c, 0x7e, 0x52, 0x5a, 0x14, 0xce,
+	0x8f, 0x54, 0xe9, 0x97, 0x62, 0xbc, 0x5d, 0x56, 0xc0, 0x75, 0x9b, 0x38, 0xf8, 0x00, 0x79, 0x22,
+	0x72, 0xa3, 0xa5, 0x7c, 0x0f, 0x2c, 0x0d, 0x46, 0x47, 0xee, 0xc1, 0x60, 0xff, 0xcc, 0xcb, 0xb2,
+	0x18, 0x6e, 0x11, 0x72, 0x79, 0x0b, 0xe4, 0xdd, 0x7e, 0xfb, 0x00, 0x0d, 0x45, 0x16, 0x12, 0x5b,
+	0x67, 0x43, 0x79, 0x32, 0xb6, 0xd8, 0xf1, 0x86, 0x2e, 0x23, 0xfa, 0x4e, 0xbf, 0x7d, 0x1f, 0x0d,
+	0x5b, 0x62, 0x77, 0xbd, 0xf6, 0xed, 0xa3, 0x52, 0xe6, 0x9f, 0x47, 0xa5, 0x8c, 0x9f, 0x86, 0x31,
+	0x01, 0x3f, 0x13, 0x2b, 0x91, 0x4c, 0x44, 0x03, 0xa5, 0xad, 0xf2, 0x96, 0x12, 0x15, 0x85, 0xed,
+	0xe6, 0x8f, 0x60, 0x38, 0xb4, 0x90, 0x4d, 0x06, 0xe8, 0xff, 0x09, 0x6d, 0x62, 0x00, 0xb3, 0x2f,
+	0x1a, 0xc0, 0x7a, 0x75, 0x9a, 0x70, 0x74, 0x9c, 0xc4, 0x18, 0x88, 0x71, 0x12, 0x93, 0x86, 0xb4,
+	0x7f, 0x93, 0x78, 0x39, 0x7d, 0xe8, 0x9a, 0x90, 0xa1, 0x1d, 0xe8, 0x41, 0x9b, 0x5e, 0x29, 0xe7,
+	0x0d, 0x90, 0x77, 0xb9, 0x55, 0x31, 0x51, 0x56, 0x13, 0x7a, 0x42, 0x70, 0x6c, 0x4b, 0x00, 0x83,
+	0x59, 0x99, 0x9e, 0xd0, 0xa8, 0xab, 0x22, 0xa1, 0x51, 0xd1, 0x98, 0x59, 0x70, 0x51, 0x76, 0x5d,
+	0xe4, 0x98, 0x5b, 0x08, 0xed, 0x10, 0xd2, 0xbb, 0x52, 0x66, 0xef, 0x80, 0x82, 0x87, 0x3a, 0xd8,
+	0xc5, 0xc8, 0x61, 0x33, 0xb3, 0x38, 0x86, 0xca, 0xc3, 0xb0, 0x0b, 0xe5, 0xf8, 0xd3, 0xe1, 0x82,
+	0x2e, 0xb4, 0x95, 0xd8, 0x85, 0x7e, 0xfe, 0xab, 0x54, 0xb6, 0x30, 0xeb, 0xf6, 0xdb, 0x7a, 0x87,
+	0xd8, 0xe2, 0xc9, 0x24, 0xfe, 0x55, 0xa9, 0x79, 0x20, 0xde, 0x3c, 0xbe, 0x05, 0x3a, 0xd9, 0xb1,
+	0x66, 0x44, 0x36, 0x1a, 0x2a, 0x11, 0xd9, 0xa8, 0x28, 0x8c, 0xec, 0xaf, 0xd1, 0x9a, 0x79, 0xe0,
+	0xc1, 0x4e, 0x0f, 0x5d, 0xc5, 0x44, 0x5e, 0x0b, 0x07, 0x9d, 0x1f, 0xcd, 0xb9, 0xc6, 0x35, 0xe1,
+	0x7c, 0x38, 0xef, 0x82, 0x81, 0x96, 0x4b, 0x1e, 0x68, 0xaf, 0xc5, 0xba, 0xf1, 0x74, 0xc9, 0x04,
+	0x9e, 0x4e, 0x94, 0x4c, 0x20, 0x1a, 0x11, 0xab, 0x3d, 0xbe, 0x0e, 0x72, 0x4d, 0x6a, 0xc9, 0x16,
+	0x58, 0x88, 0x3f, 0x12, 0x93, 0x66, 0xd9, 0xf4, 0x2b, 0x4d, 0xad, 0x5e, 0x0a, 0x16, 0x36, 0x7a,
+	0x08, 0x6e, 0x4d, 0x3e, 0xe4, 0x5e, 0x49, 0xde, 0x3f, 0x01, 0x52, 0xdf, 0xb8, 0x04, 0x28, 0x3c,
+	0x62, 0x00, 0x96, 0x13, 0x9f, 0x50, 0x95, 0x64, 0x23, 0x49, 0x58, 0xb5, 0x76, 0x79, 0x6c, 0x78,
+	0xee, 0x57, 0x60, 0x25, 0x6d, 0x92, 0xa7, 0x04, 0x29, 0x05, 0xae, 0xbe, 0xfd, 0x42, 0xf0, 0xd0,
+	0x81, 0x4f, 0xc1, 0xcd, 0x89, 0x21, 0xa9, 0x25, 0x9b, 0x89, 0x62, 0xd4, 0xca, 0x6c, 0x4c, 0x68,
+	0xdf, 0x02, 0x0b, 0xf1, 0x61, 0x91, 0x52, 0x24, 0x31, 0x58, 0x5a, 0x91, 0xa4, 0xb4, 0x68, 0x9f,
+	0xc8, 0x44, 0x7b, 0x4e, 0x21, 0x12, 0xc5, 0xa4, 0x11, 0x49, 0x6a, 0x94, 0xbe, 0xfd, 0x89, 0x26,
+	0x99, 0x62, 0x3f, 0x8a, 0x49, 0xb3, 0x9f, 0xd4, 0x2e, 0xc6, 0xfe, 0x8b, 0x56, 0x71, 0xa1, 0xff,
+	0x01, 0xe6, 0x62, 0xff, 0x27, 0x6f, 0xad, 0x7a, 0xed, 0x6b, 0xbf, 0x0d, 0x34, 0xee, 0x1f, 0x3f,
+	0x2b, 0x66, 0x8e, 0x4f, 0x8b, 0xd2, 0xd3, 0xd3, 0xa2, 0xf4, 0xf7, 0x69, 0x51, 0xfa, 0xe1, 0xac,
+	0x98, 0x79, 0x7a, 0x56, 0xcc, 0xfc, 0x79, 0x56, 0xcc, 0x7c, 0x52, 0x8d, 0x74, 0x4c, 0xcc, 0x2b,
+	0xa7, 0xda, 0x83, 0x6d, 0x6a, 0x3c, 0xd8, 0xe1, 0x5f, 0x8c, 0x87, 0xe1, 0x37, 0x23, 0x6f, 0x9e,
+	0xed, 0x3c, 0x7f, 0x8c, 0xbc, 0xf5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x2b, 0x3f, 0x3c,
+	0x19, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/ophost/types/error.go b/x/ophost/types/error.go
index b9eb1fb..ba0aca7 100644
--- a/x/ophost/types/error.go
+++ b/x/ophost/types/error.go
@@ -20,6 +20,5 @@ var (
 	ErrInvalidBridgeMetadata      = errorsmod.Register(ModuleName, 13, "invalid bridge metadata")
 	ErrInvalidBatchInfo           = errorsmod.Register(ModuleName, 14, "invalid batch info")
 	ErrInvalidChallengerUpdate    = errorsmod.Register(ModuleName, 15, "invalid challenger update")
-	ErrEmptyCommitmentProof       = errorsmod.Register(ModuleName, 16, "empty commitment proof")
-	ErrEmptyBatchBytes            = errorsmod.Register(ModuleName, 17, "empty batch bytes")
+	ErrEmptyBatchBytes            = errorsmod.Register(ModuleName, 16, "empty batch bytes")
 )