refactor: rename module to multi_coin_rewards

app/app.go

@@ -75,14 +75,14 @@ import (
 	// Kyve modules
 	_ "github.com/KYVENetwork/chain/x/bundles"
 	bundleskeeper "github.com/KYVENetwork/chain/x/bundles/keeper"
-	_ "github.com/KYVENetwork/chain/x/compliance" // import for side-effects
-	compliancekeeper "github.com/KYVENetwork/chain/x/compliance/keeper"
 	_ "github.com/KYVENetwork/chain/x/delegation" // import for side-effects
 	delegationkeeper "github.com/KYVENetwork/chain/x/delegation/keeper"
 	_ "github.com/KYVENetwork/chain/x/funders" // import for side-effects
 	funderskeeper "github.com/KYVENetwork/chain/x/funders/keeper"
 	_ "github.com/KYVENetwork/chain/x/global" // import for side-effects
 	globalkeeper "github.com/KYVENetwork/chain/x/global/keeper"
+	_ "github.com/KYVENetwork/chain/x/multi_coin_rewards" // import for side-effects
+	multicoinrewardskeeper "github.com/KYVENetwork/chain/x/multi_coin_rewards/keeper"
 	_ "github.com/KYVENetwork/chain/x/pool" // import for side-effects
 	poolkeeper "github.com/KYVENetwork/chain/x/pool/keeper"
 	_ "github.com/KYVENetwork/chain/x/query" // import for side-effects
@@ -145,15 +145,15 @@ type App struct {
 	ScopedIBCTransferKeeper capabilitykeeper.ScopedKeeper
 
 	// KYVE
-	BundlesKeeper    bundleskeeper.Keeper
-	DelegationKeeper delegationkeeper.Keeper
-	GlobalKeeper     globalkeeper.Keeper
-	PoolKeeper       *poolkeeper.Keeper
-	QueryKeeper      querykeeper.Keeper
-	StakersKeeper    *stakerskeeper.Keeper
-	TeamKeeper       teamkeeper.Keeper
-	FundersKeeper    funderskeeper.Keeper
-	ComplianceKeeper compliancekeeper.Keeper
+	BundlesKeeper          bundleskeeper.Keeper
+	DelegationKeeper       delegationkeeper.Keeper
+	GlobalKeeper           globalkeeper.Keeper
+	PoolKeeper             *poolkeeper.Keeper
+	QueryKeeper            querykeeper.Keeper
+	StakersKeeper          *stakerskeeper.Keeper
+	TeamKeeper             teamkeeper.Keeper
+	FundersKeeper          funderskeeper.Keeper
+	MultiCoinRewardsKeeper multicoinrewardskeeper.Keeper
 
 	// simulation manager
 	// sm *module.SimulationManager
@@ -299,7 +299,7 @@ func New(
 		&app.StakersKeeper,
 		&app.TeamKeeper,
 		&app.FundersKeeper,
-		&app.ComplianceKeeper,
+		&app.MultiCoinRewardsKeeper,
 		// this line is used by starport scaffolding # stargate/app/keeperDefinition
 	); err != nil {
 		panic(err)

app/app_config.go

@@ -28,10 +28,10 @@ import (
 	"cosmossdk.io/x/feegrant"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	bundlesmodulev1 "github.com/KYVENetwork/chain/api/kyve/bundles/module"
-	compliancemodulev1 "github.com/KYVENetwork/chain/api/kyve/compliance/module"
 	delegationmodulev1 "github.com/KYVENetwork/chain/api/kyve/delegation/module"
 	fundersmodulev1 "github.com/KYVENetwork/chain/api/kyve/funders/module"
 	globalmodulev1 "github.com/KYVENetwork/chain/api/kyve/global/module"
+	multicoinrewardsmodulev1 "github.com/KYVENetwork/chain/api/kyve/multi_coin_rewards/module"
 	poolmodulev1 "github.com/KYVENetwork/chain/api/kyve/pool/module"
 	querymodulev1 "github.com/KYVENetwork/chain/api/kyve/query/module"
 	stakersmodulev1 "github.com/KYVENetwork/chain/api/kyve/stakers/module"
@@ -57,10 +57,10 @@ import (
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	bundlestypes "github.com/KYVENetwork/chain/x/bundles/types"
-	compliancetypes "github.com/KYVENetwork/chain/x/compliance/types"
 	delegationtypes "github.com/KYVENetwork/chain/x/delegation/types"
 	funderstypes "github.com/KYVENetwork/chain/x/funders/types"
 	globaltypes "github.com/KYVENetwork/chain/x/global/types"
+	multicoinrewardstypes "github.com/KYVENetwork/chain/x/multi_coin_rewards/types"
 	pooltypes "github.com/KYVENetwork/chain/x/pool/types"
 	querytypes "github.com/KYVENetwork/chain/x/query/types"
 	stakerstypes "github.com/KYVENetwork/chain/x/stakers/types"
@@ -107,7 +107,7 @@ var (
 		globaltypes.ModuleName,
 		teamtypes.ModuleName,
 		funderstypes.ModuleName,
-		compliancetypes.ModuleName,
+		multicoinrewardstypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/initGenesis
 	}
 
@@ -138,7 +138,7 @@ var (
 		// KYVE modules
 		delegationtypes.ModuleName,
 		stakerstypes.ModuleName,
-		compliancetypes.ModuleName,
+		multicoinrewardstypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/beginBlockers
 	}
 
@@ -185,8 +185,8 @@ var (
 		{Account: delegationtypes.ModuleName},
 		{Account: pooltypes.ModuleName},
 		{Account: stakerstypes.ModuleName},
-		{Account: compliancetypes.ModuleName},
-		{Account: compliancetypes.MultiCoinRewardsRedistributionAccountName},
+		{Account: multicoinrewardstypes.ModuleName},
+		{Account: multicoinrewardstypes.MultiCoinRewardsRedistributionAccountName},
 		{Account: teamtypes.ModuleName},
 		{Account: funderstypes.ModuleName},
 		// this line is used by starport scaffolding # stargate/app/maccPerms
@@ -362,8 +362,8 @@ var (
 				Config: appconfig.WrapAny(&fundersmodulev1.Module{}),
 			},
 			{
-				Name:   compliancetypes.ModuleName,
-				Config: appconfig.WrapAny(&compliancemodulev1.Module{}),
+				Name:   multicoinrewardstypes.ModuleName,
+				Config: appconfig.WrapAny(&multicoinrewardsmodulev1.Module{}),
 			},
 			// this line is used by starport scaffolding # stargate/app/moduleConfig
 		},

app/upgrades/v2_0/store.go

@@ -3,13 +3,13 @@ package v2_0
 import (
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	compliancetypes "github.com/KYVENetwork/chain/x/compliance/types"
+	multicoinrewardstypes "github.com/KYVENetwork/chain/x/multi_coin_rewards/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
 	storeUpgrades := storetypes.StoreUpgrades{
-		Added:   []string{compliancetypes.ModuleName},
+		Added:   []string{multicoinrewardstypes.ModuleName},
 		Deleted: []string{},
 	}
 

app/upgrades/v2_0/upgrade.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	compliancetypes "github.com/KYVENetwork/chain/x/compliance/types"
+	multicoinrewardstypes "github.com/KYVENetwork/chain/x/multi_coin_rewards/types"
 
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authTypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -50,26 +50,26 @@ func CreateUpgradeHandler(
 
 		// Run KYVE migrations
 		migrateProtocolStakers(sdkCtx, delegationKeeper, stakersKeeper, stakingKeeper, bankKeeper)
-		EnsureComplianceAccount(sdkCtx, accountKeeper)
+		EnsureMultiCoinDistributionAccount(sdkCtx, accountKeeper)
 
 		logger.Info(fmt.Sprintf("finished upgrade %v", UpgradeName))
 
 		return migratedVersionMap, err
 	}
 }
 
-func EnsureComplianceAccount(ctx sdk.Context, ak authkeeper.AccountKeeper) {
-	address := authTypes.NewModuleAddress(compliancetypes.MultiCoinRewardsRedistributionAccountName)
+func EnsureMultiCoinDistributionAccount(ctx sdk.Context, ak authkeeper.AccountKeeper) {
+	address := authTypes.NewModuleAddress(multicoinrewardstypes.MultiCoinRewardsRedistributionAccountName)
 	account := ak.GetAccount(ctx, address)
 
 	if account == nil {
 		// account doesn't exist, initialise a new module account.
-		newAcc := authTypes.NewEmptyModuleAccount(compliancetypes.MultiCoinRewardsRedistributionAccountName)
+		newAcc := authTypes.NewEmptyModuleAccount(multicoinrewardstypes.MultiCoinRewardsRedistributionAccountName)
 		account = ak.NewAccountWithAddress(ctx, newAcc.GetAddress())
 	} else {
 		// account exists, adjust it to a module account.
 		baseAccount := authTypes.NewBaseAccount(address, nil, account.GetAccountNumber(), 0)
-		account = authTypes.NewModuleAccount(baseAccount, compliancetypes.MultiCoinRewardsRedistributionAccountName)
+		account = authTypes.NewModuleAccount(baseAccount, multicoinrewardstypes.MultiCoinRewardsRedistributionAccountName)
 	}
 
 	ak.SetAccount(ctx, account)

config.yml

@@ -69,10 +69,10 @@ genesis:
       supply:
         - denom: "tkyve"
           amount: "165000000000000000"
-    compliance:
+    multi_coin_rewards:
       params:
-        multi_coin_refund_pending_time: 10
-        multi_coin_refund_policy_admin_address: "kyve1jq304cthpx0lwhpqzrdjrcza559ukyy3zsl2vd"
+        multi_coin_distribution_pending_time: 10
+        multi_coin_distribution_policy_admin_address: "kyve1jq304cthpx0lwhpqzrdjrcza559ukyy3zsl2vd"
     delegation:
       params:
         unbonding_delegation_time: 10

proto/kyve/compliance/module/module.proto → proto/kyve/multi_coin_rewards/module/module.proto

@@ -1,11 +1,11 @@
 syntax = "proto3";
-package kyve.compliance.module;
+package kyve.multi_coin_rewards.module;
 
 import "cosmos/app/v1alpha1/module.proto";
 
 // Module is the config object for the module.
 message Module {
-  option (cosmos.app.v1alpha1.module) = {go_import: "kyve/x/compliance"};
+  option (cosmos.app.v1alpha1.module) = {go_import: "kyve/x/multi_coin_rewards"};
 
   // authority defines the custom module authority. If not set, defaults to the governance module.
   string authority = 1;

proto/kyve/compliance/v1beta1/events.proto → proto/kyve/multi_coin_rewards/v1beta1/events.proto

@@ -1,19 +1,19 @@
 syntax = "proto3";
 
-package kyve.compliance.v1beta1;
+package kyve.multi_coin_rewards.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "kyve/compliance/v1beta1/params.proto";
+import "kyve/multi_coin_rewards/v1beta1/params.proto";
 
-option go_package = "github.com/KYVENetwork/chain/x/compliance/types";
+option go_package = "github.com/KYVENetwork/chain/x/multi_coin_rewards/types";
 
 // EventUpdateParams is an event emitted when the module parameters are updated.
 // emitted_by: MsgUpdateParams
 message EventUpdateParams {
   // old_params is the module's old parameters.
-  kyve.compliance.v1beta1.Params old_params = 1 [(gogoproto.nullable) = false];
+  kyve.multi_coin_rewards.v1beta1.Params old_params = 1 [(gogoproto.nullable) = false];
   // new_params is the module's new parameters.
-  kyve.compliance.v1beta1.Params new_params = 2 [(gogoproto.nullable) = false];
+  kyve.multi_coin_rewards.v1beta1.Params new_params = 2 [(gogoproto.nullable) = false];
   // payload is the parameter updates that were performed.
   string payload = 3;
 }

proto/kyve/compliance/v1beta1/genesis.proto → proto/kyve/multi_coin_rewards/v1beta1/genesis.proto

@@ -1,14 +1,14 @@
 syntax = "proto3";
 
-package kyve.compliance.v1beta1;
+package kyve.multi_coin_rewards.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "kyve/compliance/v1beta1/params.proto";
-import "kyve/compliance/v1beta1/types.proto";
+import "kyve/multi_coin_rewards/v1beta1/params.proto";
+import "kyve/multi_coin_rewards/v1beta1/types.proto";
 
-option go_package = "github.com/KYVENetwork/chain/x/compliance/types";
+option go_package = "github.com/KYVENetwork/chain/x/multi_coin_rewards/types";
 
-// GenesisState defines the compliance module's genesis state.
+// GenesisState defines the multi_coin_rewards module's genesis state.
 message GenesisState {
   // params defines all the parameters of the module.
   Params params = 1 [(gogoproto.nullable) = false];
@@ -21,6 +21,6 @@ message GenesisState {
   // multi_coin_enabled ...
   repeated string multi_coin_enabled = 4;
 
-  // multi_coin_refund_policy ...
-  MultiCoinRefundPolicy multi_coin_refund_policy = 5;
+  // multi_coin_distribution_policy ...
+  MultiCoinDistributionPolicy multi_coin_distribution_policy = 5;
 }

proto/kyve/multi_coin_rewards/v1beta1/params.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package kyve.multi_coin_rewards.v1beta1;
+
+option go_package = "github.com/KYVENetwork/chain/x/multi_coin_rewards/types";
+
+// Params defines the multi_coin_rewards module parameters.
+message Params {
+  // multi_coin_distribution_policy_admin_address specifies an address which is allowed to adjust the weights for
+  // the coin redistribution. This address can now drain coins, but only
+  string multi_coin_distribution_policy_admin_address = 7;
+
+  // multi_coin_distribution_pending_time ...
+  uint64 multi_coin_distribution_pending_time = 8;
+}

proto/kyve/compliance/v1beta1/query.proto → proto/kyve/multi_coin_rewards/v1beta1/query.proto

@@ -1,31 +1,31 @@
 syntax = "proto3";
 
-package kyve.compliance.v1beta1;
+package kyve.multi_coin_rewards.v1beta1;
 
 import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "kyve/compliance/v1beta1/params.proto";
-import "kyve/compliance/v1beta1/types.proto";
+import "kyve/multi_coin_rewards/v1beta1/params.proto";
+import "kyve/multi_coin_rewards/v1beta1/types.proto";
 
-option go_package = "github.com/KYVENetwork/chain/x/compliance/types";
+option go_package = "github.com/KYVENetwork/chain/x/multi_coin_rewards/types";
 
 // Query defines the gRPC querier service.
 service Query {
   // Parameters queries the parameters of the module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/kyve/compliance/v1/params";
+    option (google.api.http).get = "/kyve/multi_coin_rewards/v1/params";
   }
 
   // policy, multi-coin-enabled, multi-coin-status/address: {enabled true false, pending rewards}
-  rpc MultiCoinRefundPolicyQuery(QueryMultiCoinRefundPolicyRequest) returns (QueryMultiCoinRefundPolicyResponse) {
-    option (google.api.http).get = "/kyve/compliance/v1/multi_coin_refund_policy";
+  rpc MultiCoinDistributionPolicyQuery(QueryMultiCoinDistributionPolicyRequest) returns (QueryMultiCoinDistributionPolicyResponse) {
+    option (google.api.http).get = "/kyve/multi_coin_rewards/v1/multi_coin_distribution_policy";
   }
 
   // MultiCoinStatus ...
   rpc MultiCoinStatus(QueryMultiCoinStatusRequest) returns (QueryMultiCoinStatusResponse) {
-    option (google.api.http).get = "/kyve/compliance/v1/multi_coin_status/{address}";
+    option (google.api.http).get = "/kyve/multi_coin_rewards/v1/multi_coin_status/{address}";
   }
 }
 
@@ -38,22 +38,22 @@ message QueryParamsResponse {
   Params params = 1 [(gogoproto.nullable) = false];
 }
 
-// QueryMultiCoinRefundPolicyRequest ...
-message QueryMultiCoinRefundPolicyRequest {}
+// QueryMultiCoinDistributionPolicyRequest ...
+message QueryMultiCoinDistributionPolicyRequest {}
 
-// QueryMultiCoinRefundPolicyResponse ...
-message QueryMultiCoinRefundPolicyResponse {
+// QueryMultiCoinDistributionPolicyResponse ...
+message QueryMultiCoinDistributionPolicyResponse {
   // params holds all the parameters of this module.
-  MultiCoinRefundPolicy policy = 1 [(gogoproto.nullable) = false];
+  MultiCoinDistributionPolicy policy = 1 [(gogoproto.nullable) = false];
 }
 
-// QueryMultiCoinRefundPolicyRequest ...
+// QueryMultiCoinDistributionPolicyRequest ...
 message QueryMultiCoinStatusRequest {
   // address ...
   string address = 1;
 }
 
-// QueryMultiCoinRefundPolicyResponse ...
+// QueryMultiCoinDistributionPolicyResponse ...
 message QueryMultiCoinStatusResponse {
   // enabled ...
   bool enabled = 1;