feat: clean bindings #ntrn-410

proto/neutron/contractmanager/tx.proto

@@ -16,6 +16,8 @@ service Msg {
   option (cosmos.msg.v1.service) = true;
 
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+  rpc ResubmitFailure(MsgResubmitFailure) returns (MsgResubmitFailureResponse);
+
   // this line is used by starport scaffolding # proto/tx/rpc
 }
 
@@ -43,3 +45,19 @@ message MsgUpdateParams {
 //
 // Since: 0.47
 message MsgUpdateParamsResponse {}
+
+// MsgResubmitFailure - contract that has failed acknowledgement can resubmit its failure
+message MsgResubmitFailure {
+  option (amino.name) = "contractmanager/MsgResubmitFailure";
+  option (cosmos.msg.v1.signer) = "sender";
+
+  // sender is the contract which failure to acknowledge is resubmitted.
+  string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+
+  // failure_id is id of failure to resubmit
+  //
+  // NOTE: All parameters must be supplied.
+  uint64 failure_id = 2;
+}
+
+message MsgResubmitFailureResponse {}

proto/osmosis/tokenfactory/v1beta1/query.proto

@@ -37,6 +37,12 @@ service Query {
       "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/"
       "before_send_hook";
   }
+
+  // FullDenom defines a gRPC query method for getting full denom name
+  // from the creator and subdenom strings.
+  rpc FullDenom(QueryFullDenomRequest) returns (QueryFullDenomResponse) {
+    option (google.api.http).get = "/osmosis/tokenfactory/v1beta1/denoms/factory/{creator}/{subdenom}/full_denom";
+  }
 }
 
 // QueryParamsRequest is the request type for the Query/Params RPC method.
@@ -86,3 +92,14 @@ message QueryBeforeSendHookAddressRequest {
 message QueryBeforeSendHookAddressResponse {
   string contract_addr = 1 [(gogoproto.moretags) = "yaml:\"contract_addr\""];
 }
+
+message QueryFullDenomRequest {
+  string creator = 1 [(gogoproto.moretags) = "yaml:\"creator\""];
+  string subdenom = 2 [(gogoproto.moretags) = "yaml:\"subdenom\""];
+}
+
+// QueryBeforeSendHookAddressResponse defines the response structure for the
+// DenomBeforeSendHook gRPC query.
+message QueryFullDenomResponse {
+  string full_denom = 1 [(gogoproto.moretags) = "yaml:\"full_denom\""];
+}

wasmbinding/message_plugin.go

@@ -1065,7 +1065,7 @@ func (m *CustomMessenger) resubmitFailure(ctx sdk.Context, contractAddr sdk.AccA
 		return nil, nil, nil, errors.Wrap(sdkerrors.ErrNotFound, "no failure found to resubmit")
 	}
 
-	err = m.ContractmanagerKeeper.ResubmitFailure(ctx, contractAddr, failure)
+	err = m.ContractmanagerKeeper.DoResubmitFailure(ctx, contractAddr, failure)
 	if err != nil {
 		ctx.Logger().Error("failed to resubmitFailure",
 			"from_address", contractAddr.String(),

wasmbinding/stargate_allowlist.go

@@ -36,6 +36,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries {
 		"/osmosis.tokenfactory.v1beta1.Query/DenomAuthorityMetadata": &tokenfactorytypes.QueryDenomAuthorityMetadataResponse{},
 		"/osmosis.tokenfactory.v1beta1.Query/DenomsFromCreator":      &tokenfactorytypes.QueryDenomsFromCreatorResponse{},
 		"/osmosis.tokenfactory.v1beta1.Query/BeforeSendHookAddress":  &tokenfactorytypes.QueryBeforeSendHookAddressResponse{},
+		"/osmosis.tokenfactory.v1beta1.Query/FullDenom":              &tokenfactorytypes.QueryFullDenomResponse{},
 
 		// interchain accounts
 		"/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount": &icacontrollertypes.QueryInterchainAccountResponse{},

x/contractmanager/keeper/failure.go

@@ -88,8 +88,8 @@ func (k Keeper) GetFailure(ctx sdk.Context, contractAddr sdk.AccAddress, id uint
 	return &res, nil
 }
 
-// ResubmitFailure tries to call sudo handler for contract with same parameters as initially.
-func (k Keeper) ResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error {
+// DoResubmitFailure tries to call sudo handler for contract with same parameters as initially.
+func (k Keeper) DoResubmitFailure(ctx sdk.Context, contractAddr sdk.AccAddress, failure *types.Failure) error {
 	if failure.SudoPayload == nil {
 		return errorsmod.Wrapf(types.ErrIncorrectFailureToResubmit, "cannot resubmit failure without sudo payload; failureId = %d", failure.Id)
 	}

x/contractmanager/keeper/failure_test.go

@@ -153,7 +153,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure, err := k.GetFailure(ctx, contractAddr, failureID)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure)
 	require.NoError(t, err)
 	// failure should be deleted
 	_, err = k.GetFailure(ctx, contractAddr, failureID)
@@ -169,7 +169,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure2, err := k.GetFailure(ctx, contractAddr, failureID2)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure2)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure2)
 	require.ErrorContains(t, err, "cannot resubmit failure")
 	// failure is still there
 	failureAfter2, err := k.GetFailure(ctx, contractAddr, failureID2)
@@ -187,7 +187,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure3, err := k.GetFailure(ctx, contractAddr, failureID3)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure3)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure3)
 	require.NoError(t, err)
 	// failure should be deleted
 	_, err = k.GetFailure(ctx, contractAddr, failureID3)
@@ -203,7 +203,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure4, err := k.GetFailure(ctx, contractAddr, failureID4)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure4)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure4)
 	require.ErrorContains(t, err, "cannot resubmit failure")
 	// failure is still there
 	failureAfter4, err := k.GetFailure(ctx, contractAddr, failureID4)
@@ -221,7 +221,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure5, err := k.GetFailure(ctx, contractAddr, failureID5)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure5)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure5)
 	require.NoError(t, err)
 	// failure should be deleted
 	_, err = k.GetFailure(ctx, contractAddr, failureID5)
@@ -237,7 +237,7 @@ func TestResubmitFailure(t *testing.T) {
 
 	failure6, err := k.GetFailure(ctx, contractAddr, failureID6)
 	require.NoError(t, err)
-	err = k.ResubmitFailure(ctx, contractAddr, failure6)
+	err = k.DoResubmitFailure(ctx, contractAddr, failure6)
 	require.ErrorContains(t, err, "cannot resubmit failure")
 	// failure is still there
 	failureAfter6, err := k.GetFailure(ctx, contractAddr, failureID6)

x/contractmanager/keeper/msg_server.go

@@ -40,3 +40,28 @@ func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams)
 
 	return &types.MsgUpdateParamsResponse{}, nil
 }
+
+// ResubmitFailure resubmits the failure after contract acknowledgement failed
+func (k Keeper) ResubmitFailure(goCtx context.Context, req *types.MsgResubmitFailure) (*types.MsgResubmitFailureResponse, error) {
+	if err := req.Validate(); err != nil {
+		return nil, errors.Wrap(err, "failed to validate MsgUpdateParams")
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	sender, _ := sdk.AccAddressFromBech32(req.Sender)
+	if !k.wasmKeeper.HasContractInfo(ctx, sender) {
+		return nil, errors.Wrap(sdkerrors.ErrNotFound, "not a contract address tried to resubmit")
+	}
+
+	failure, err := k.GetFailure(ctx, sender, req.FailureId)
+	if err != nil {
+		return nil, errors.Wrap(sdkerrors.ErrNotFound, "no failure found to resubmit")
+	}
+
+	if err := k.DoResubmitFailure(ctx, sender, failure); err != nil {
+		return nil, err
+	}
+
+	return &types.MsgResubmitFailureResponse{}, nil
+}

x/contractmanager/types/codec.go

@@ -9,12 +9,14 @@ import (
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron.contractmanager.v1.MsgUpdateParams", nil)
+	cdc.RegisterConcrete(&MsgResubmitFailure{}, "neutron.contractmanager.v1.MsgResubmitFailure", nil)
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
 		&MsgUpdateParams{},
+		&MsgResubmitFailure{},
 	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }

x/contractmanager/types/tx.go

@@ -33,3 +33,32 @@ func (msg *MsgUpdateParams) Validate() error {
 	}
 	return nil
 }
+
+var _ sdk.Msg = &MsgResubmitFailure{}
+
+func (msg *MsgResubmitFailure) Route() string {
+	return RouterKey
+}
+
+func (msg *MsgResubmitFailure) Type() string {
+	return "resubmit-failure"
+}
+
+func (msg *MsgResubmitFailure) GetSigners() []sdk.AccAddress {
+	sender, err := sdk.AccAddressFromBech32(msg.Sender)
+	if err != nil { // should never happen as valid basic rejects invalid addresses
+		panic(err.Error())
+	}
+	return []sdk.AccAddress{sender}
+}
+
+func (msg *MsgResubmitFailure) GetSignBytes() []byte {
+	return ModuleCdc.MustMarshalJSON(msg)
+}
+
+func (msg *MsgResubmitFailure) Validate() error {
+	if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil {
+		return errorsmod.Wrap(err, "sender is invalid")
+	}
+	return nil
+}