Merge pull request #483 from neutron-org/fix/sdk50-enable-wasmd

sdk 50 NTRN-230

.golangci.yml

@@ -37,7 +37,7 @@ linters-settings:
     # Default: false
     extra-rules: true
   nolintlint:
-    allow-unused: false
+    allow-unused: true
     allow-leading-space: true
     require-explanation: false
     require-specific: false

app/app.go

@@ -848,7 +848,7 @@ func New(
 		ibcHooksModule,
 		tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper),
 		cronModule,
-		// globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)),
+		globalfee.NewAppModule(app.GlobalFeeKeeper, app.GetSubspace(globalfee.ModuleName), app.AppCodec(), app.keys[globalfee.ModuleName]),
 		swapModule,
 		dexModule,
 		auction.NewAppModule(appCodec, app.AuctionKeeper),
@@ -961,7 +961,7 @@ func New(
 		ibchookstypes.ModuleName, // after auth keeper
 		pfmtypes.ModuleName,
 		crontypes.ModuleName,
-		// globalfee.ModuleName,
+		globalfee.ModuleName,
 		ibcswaptypes.ModuleName,
 		dextypes.ModuleName,
 	)

app/proposals_allowlisting.go

@@ -14,6 +14,8 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
 	auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
 
+	globalfeetypes "github.com/neutron-org/neutron/v3/x/globalfee/types"
+
 	contractmanagertypes "github.com/neutron-org/neutron/v3/x/contractmanager/types"
 	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
 	dextypes "github.com/neutron-org/neutron/v3/x/dex/types"
@@ -71,7 +73,8 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
 		*minttypes.MsgUpdateParams,
 		*pfmtypes.MsgUpdateParams,
 		*auctiontypes.MsgUpdateParams,
-		*authtypes.MsgUpdateParams:
+		*authtypes.MsgUpdateParams,
+		*globalfeetypes.MsgUpdateParams:
 		return true
 	}
 	return false

proto/neutron/interchainqueries/tx.proto

@@ -25,6 +25,8 @@ service Msg {
 }
 
 message MsgRegisterInterchainQuery {
+  option (cosmos.msg.v1.signer) = "sender";
+
   // defines a query type: `kv` or `tx` now
   string query_type = 1;
 
@@ -50,6 +52,8 @@ message MsgRegisterInterchainQueryResponse {
 }
 
 message MsgSubmitQueryResult {
+  option (cosmos.msg.v1.signer) = "sender";
+
   uint64 query_id = 1;
   string sender = 2;
 
@@ -112,12 +116,14 @@ message TxValue {
 message MsgSubmitQueryResultResponse {}
 
 message MsgRemoveInterchainQueryRequest {
+  option (cosmos.msg.v1.signer) = "sender";
   uint64 query_id = 1;
   string sender = 2; // is the signer of the message
 }
 message MsgRemoveInterchainQueryResponse {}
 
 message MsgUpdateInterchainQueryRequest {
+  option (cosmos.msg.v1.signer) = "sender";
   uint64 query_id = 1;
   repeated KVKey new_keys = 2;
   uint64 new_update_period = 3;

proto/neutron/interchaintxs/v1/tx.proto

@@ -27,6 +27,7 @@ service Msg {
 message MsgRegisterInterchainAccount {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_getters) = false;
+  option (cosmos.msg.v1.signer) = "from_address";
 
   string from_address = 1;
   string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
@@ -45,6 +46,7 @@ message MsgRegisterInterchainAccountResponse {}
 message MsgSubmitTx {
   option (gogoproto.equal) = false;
   option (gogoproto.goproto_getters) = false;
+  option (cosmos.msg.v1.signer) = "from_address";
 
   string from_address = 1;
   // interchain_account_id is supposed to be the unique identifier, e.g.,

proto/osmosis/tokenfactory/v1beta1/tx.proto

@@ -36,6 +36,7 @@ service Msg {
 // denom does not indicate the current admin.
 message MsgCreateDenom {
   option (amino.name) = "osmosis/tokenfactory/create-denom";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   // subdenom can be up to 44 "alphanumeric" characters long.
@@ -52,6 +53,7 @@ message MsgCreateDenomResponse {
 // more of a token.  For now, we only support minting to the sender account
 message MsgMint {
   option (amino.name) = "osmosis/tokenfactory/mint";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   cosmos.base.v1beta1.Coin amount = 2 [
@@ -67,6 +69,7 @@ message MsgMintResponse {}
 // a token.  For now, we only support burning from the sender account.
 message MsgBurn {
   option (amino.name) = "osmosis/tokenfactory/burn";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   cosmos.base.v1beta1.Coin amount = 2 [
@@ -82,6 +85,7 @@ message MsgBurnResponse {}
 // adminship of a denom to a new account
 message MsgChangeAdmin {
   option (amino.name) = "osmosis/tokenfactory/change-admin";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
@@ -96,6 +100,7 @@ message MsgChangeAdminResponse {}
 // assign a CosmWasm contract to call with a BeforeSend hook
 message MsgSetBeforeSendHook {
   option (amino.name) = "osmosis/tokenfactory/set-beforesend-hook";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
@@ -109,6 +114,8 @@ message MsgSetBeforeSendHookResponse {}
 // MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set
 // the denom's bank metadata
 message MsgSetDenomMetadata {
+  option (cosmos.msg.v1.signer) = "sender";
+
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   cosmos.bank.v1beta1.Metadata metadata = 2 [
     (gogoproto.moretags) = "yaml:\"metadata\"",
@@ -122,6 +129,7 @@ message MsgSetDenomMetadataResponse {}
 
 message MsgForceTransfer {
   option (amino.name) = "osmosis/tokenfactory/force-transfer";
+  option (cosmos.msg.v1.signer) = "sender";
 
   string sender = 1 [(gogoproto.moretags) = "yaml:\"sender\""];
   cosmos.base.v1beta1.Coin amount = 2 [