add comments

proto/opinit/opchild/v1/query.proto

@@ -61,7 +61,7 @@ service Query {
 
   rpc ForceWithdrawalProofs(QueryForceWithdrawalProofsRequest) returns (QueryForceWithdrawalProofsResponse) {
     option (cosmos.query.v1.module_query_safe) = true;
-    option (google.api.http).get               = "/opinit/opchild/v1/withdrawals/{l2_sequence}/proofs";
+    option (google.api.http).get               = "/opinit/opchild/v1/withdrawals/{sequence}/proofs";
   }
 }
 
@@ -140,8 +140,8 @@ message QueryBaseDenomResponse {
 
 // QueryForceWithdrawalProofsRequest is request type for the Query/ForceWithdrawalProofs RPC method.
 message QueryForceWithdrawalProofsRequest {
-  // l2_sequence is the sequence number of the l2 block.
-  uint64 l2_sequence = 1;
+  // sequence is the sequence number of the withdrawal.
+  uint64 sequence = 1;
 }
 
 // QueryForceWithdrawalProofsResponse is response type for the Query/ForceWithdrawalProofs RPC method.

x/opchild/client/cli/tx.go

@@ -299,7 +299,7 @@ func NewSetBridgeInfoCmd(ac address.Codec) *cobra.Command {
 				return err
 			}
 
-			origConfig := ophostcli.BridgeCliConfig{}
+			var origConfig ophostcli.BridgeCliConfig
 			err = json.Unmarshal(configBytes, &origConfig)
 			if err != nil {
 				return err
@@ -328,6 +328,7 @@ func NewSetBridgeInfoCmd(ac address.Codec) *cobra.Command {
 				SubmissionStartHeight: submissionStartHeight,
 				Metadata:              []byte(origConfig.Metadata),
 				BatchInfo:             origConfig.BatchInfo,
+				OracleEnabled:         origConfig.OracleEnabled,
 			}
 
 			if err = bridgeConfig.ValidateWithNoAddrValidation(); err != nil {

x/opchild/client/cli/tx_test.go

@@ -439,7 +439,8 @@ func (s *CLITestSuite) TestNewSetBridgeInfo() {
 		"batch_info": {
 			"submitter": "init1q6jhwnarkw2j5qqgx3qlu20k8nrdglft5ksr0g",
 			"chain_type": "INITIA"
-		}
+		},
+		"oracle_enabled": true
     }`)
 	s.NoError(err)
 

x/opchild/keeper/querier.go

@@ -105,9 +105,11 @@ func (q Querier) BaseDenom(ctx context.Context, req *types.QueryBaseDenomRequest
 	return &types.QueryBaseDenomResponse{BaseDenom: baseDenom}, nil
 }
 
-// ForceWithdrawalProofs returns the force withdrawal proofs
+// ForceWithdrawalProofs returns the force withdrawal proofs.
 //
 // @dev: This query is not deterministic and should only be used for off-chain.
+// @dev: The caller must use the height query to get the app hash and commitment proof at the specific height.
+// The height should be the L2 block number contained in the output submitted to L1, and this height should be higher than the block where the withdrawal occurred.
 func (q Querier) ForceWithdrawalProofs(ctx context.Context, req *types.QueryForceWithdrawalProofsRequest) (*types.QueryForceWithdrawalProofsResponse, error) {
 	if q.clientCtx == nil {
 		return nil, status.Error(codes.Internal, "client context is not set")
@@ -120,8 +122,20 @@ func (q Querier) ForceWithdrawalProofs(ctx context.Context, req *types.QueryForc
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	sequence := req.L2Sequence
-	commitmentProof, err := types.QueryCommitmentProof(q.baseAppQuerier, height-1, types.WithdrawalCommitmentKey(sequence))
+	sequence := req.Sequence
+	if ok, err := q.Commitments.Has(ctx, sequence); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	} else if !ok {
+		return nil, status.Errorf(codes.NotFound, "withdrawal commitment %d not found at height %d", sequence, height)
+	}
+
+	commitmentProof, err := types.QueryCommitmentProof(
+		q.baseAppQuerier,
+		// we should compute the `height-1` here because the app hash of a block is
+		// the one that is committed in the previous block.
+		height-1,
+		types.WithdrawalCommitmentKey(sequence),
+	)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}