Remove claim module (#1301)

* Remove claim module * Add logic for deleting the claims store Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: Dev Ojha <[email protected]>
osmosis-labs · Apr 22, 2022 · fe1b5d2 · fe1b5d2
1 parent 15f131e
commit fe1b5d2
Show file tree

Hide file tree

Showing 48 changed files with 17 additions and 94,232 deletions.
diff --git a/app/app.go b/app/app.go
@@ -435,8 +435,9 @@ func (app *OsmosisApp) setupUpgradeStoreLoaders() {
 	}
 
 	if upgradeInfo.Name == v8.UpgradeName {
-		// TODO: Add claims module as deleted here
-		storeUpgrades = store.StoreUpgrades{}
+		storeUpgrades = store.StoreUpgrades{
+			Deleted: []string{v8.ClaimsModuleName},
+		}
 	}
 
 	// configure store loader that checks if version == upgradeHeight and applies store upgrades

diff --git a/app/keepers.go b/app/keepers.go
@@ -47,8 +47,6 @@ import (
 
 	owasm "github.com/osmosis-labs/osmosis/v7/app/wasm"
 	_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"
-	claimkeeper "github.com/osmosis-labs/osmosis/v7/x/claim/keeper"
-	claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
 	epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper"
 	epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
 	gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
@@ -95,7 +93,6 @@ type appKeepers struct {
 	Bech32IBCKeeper      *bech32ibckeeper.Keeper
 	Bech32ICS20Keeper    *bech32ics20keeper.Keeper
 	EvidenceKeeper       *evidencekeeper.Keeper
-	ClaimKeeper          *claimkeeper.Keeper
 	GAMMKeeper           *gammkeeper.Keeper
 	LockupKeeper         *lockupkeeper.Keeper
 	EpochsKeeper         *epochskeeper.Keeper
@@ -267,12 +264,6 @@ func (app *OsmosisApp) InitNormalKeepers(
 		app.SlashingKeeper,
 	)
 
-	app.ClaimKeeper = claimkeeper.NewKeeper(
-		appCodec,
-		keys[claimtypes.StoreKey],
-		app.AccountKeeper,
-		app.BankKeeper, app.StakingKeeper, app.DistrKeeper)
-
 	gammKeeper := gammkeeper.NewKeeper(
 		appCodec, keys[gammtypes.StoreKey],
 		app.GetSubspace(gammtypes.ModuleName),
@@ -412,7 +403,6 @@ func (app *OsmosisApp) SetupHooks() {
 		stakingtypes.NewMultiStakingHooks(
 			app.DistrKeeper.Hooks(),
 			app.SlashingKeeper.Hooks(),
-			app.ClaimKeeper.Hooks(),
 			app.SuperfluidKeeper.Hooks(),
 		),
 	)
@@ -421,7 +411,6 @@ func (app *OsmosisApp) SetupHooks() {
 		gammtypes.NewMultiGammHooks(
 			// insert gamm hooks receivers here
 			app.PoolIncentivesKeeper.Hooks(),
-			app.ClaimKeeper.Hooks(),
 		),
 	)
 
@@ -456,8 +445,7 @@ func (app *OsmosisApp) SetupHooks() {
 
 	app.GovKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(
-			// insert governance hooks receivers here
-			app.ClaimKeeper.Hooks(),
+		// insert governance hooks receivers here
 		),
 	)
 }
@@ -502,7 +490,6 @@ func KVStoreKeys() []string {
 		capabilitytypes.StoreKey,
 		gammtypes.StoreKey,
 		lockuptypes.StoreKey,
-		claimtypes.StoreKey,
 		incentivestypes.StoreKey,
 		epochstypes.StoreKey,
 		poolincentivestypes.StoreKey,

diff --git a/app/modules.go b/app/modules.go
@@ -48,8 +48,6 @@ import (
 
 	appparams "github.com/osmosis-labs/osmosis/v7/app/params"
 	_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"
-	"github.com/osmosis-labs/osmosis/v7/x/claim"
-	claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
 	"github.com/osmosis-labs/osmosis/v7/x/epochs"
 	epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
 	"github.com/osmosis-labs/osmosis/v7/x/gamm"
@@ -108,7 +106,6 @@ var appModuleBasics = []module.AppModuleBasic{
 	lockup.AppModuleBasic{},
 	poolincentives.AppModuleBasic{},
 	epochs.AppModuleBasic{},
-	claim.AppModuleBasic{},
 	superfluid.AppModuleBasic{},
 	bech32ibc.AppModuleBasic{},
 	wasm.AppModuleBasic{},
@@ -124,7 +121,6 @@ var moduleAccountPermissions = map[string][]string{
 	stakingtypes.NotBondedPoolName:           {authtypes.Burner, authtypes.Staking},
 	govtypes.ModuleName:                      {authtypes.Burner},
 	ibctransfertypes.ModuleName:              {authtypes.Minter, authtypes.Burner},
-	claimtypes.ModuleName:                    {authtypes.Minter, authtypes.Burner},
 	gammtypes.ModuleName:                     {authtypes.Minter, authtypes.Burner},
 	incentivestypes.ModuleName:               {authtypes.Minter, authtypes.Burner},
 	lockuptypes.ModuleName:                   {authtypes.Minter, authtypes.Burner},
@@ -166,7 +162,6 @@ func appModules(
 		ibc.NewAppModule(app.IBCKeeper),
 		params.NewAppModule(*app.ParamsKeeper),
 		app.transferModule,
-		claim.NewAppModule(appCodec, *app.ClaimKeeper),
 		gamm.NewAppModule(appCodec, *app.GAMMKeeper, app.AccountKeeper, app.BankKeeper),
 		txfees.NewAppModule(appCodec, *app.TxFeesKeeper),
 		incentives.NewAppModule(appCodec, *app.IncentivesKeeper, app.AccountKeeper, app.BankKeeper, app.EpochsKeeper),
@@ -215,7 +210,6 @@ func orderBeginBlockers() []string {
 		gammtypes.ModuleName,
 		incentivestypes.ModuleName,
 		lockuptypes.ModuleName,
-		claimtypes.ModuleName,
 		poolincentivestypes.ModuleName,
 		// superfluid must come after distribution and epochs
 		superfluidtypes.ModuleName,
@@ -232,7 +226,6 @@ var orderEndBlockers = []string{
 	crisistypes.ModuleName,
 	govtypes.ModuleName,
 	stakingtypes.ModuleName,
-	claimtypes.ModuleName,
 	capabilitytypes.ModuleName,
 	authtypes.ModuleName,
 	banktypes.ModuleName,
@@ -282,7 +275,6 @@ var modulesOrderInitGenesis = []string{
 	bech32ibctypes.ModuleName, // comes after ibctransfertypes
 	poolincentivestypes.ModuleName,
 	superfluidtypes.ModuleName,
-	claimtypes.ModuleName,
 	incentivestypes.ModuleName,
 	epochstypes.ModuleName,
 	lockuptypes.ModuleName,

diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go
@@ -2,3 +2,7 @@ package v8
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v7 upgrade.
 const UpgradeName = "v8"
+
+// The historic name of the claims module, which is removed in this release.
+// Cross-check against https://github.com/osmosis-labs/osmosis/blob/v7.2.0/x/claim/types/keys.go#L5
+const ClaimsModuleName = "claim"
diff --git a/...smosisd/cmd/balances_from_state_export.go → ...cmd/balances_from_state_export.go.history b/...smosisd/cmd/balances_from_state_export.go → ...cmd/balances_from_state_export.go.history
@@ -6,14 +6,14 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/spf13/cobra"
+	tmjson "github.com/tendermint/tendermint/libs/json"
+	tmtypes "github.com/tendermint/tendermint/types"
+
 	appparams "github.com/osmosis-labs/osmosis/v7/app/params"
 	"github.com/osmosis-labs/osmosis/v7/osmoutils"
-	claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
 	gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
 	lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
-	"github.com/spf13/cobra"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -40,18 +40,16 @@ type DerivedAccount struct {
 	UnbondingStake      sdk.Int              `json:"unbonding_stake"`
 	Bonded              sdk.Coins            `json:"bonded"`
 	BondedBySelectPools map[uint64]sdk.Coins `json:"bonded_by_select_pools"`
-	UnclaimedAirdrop    sdk.Coins            `json:"unclaimed_airdrop"`
 	TotalBalances       sdk.Coins            `json:"total_balances"`
 }
 
 func newDerivedAccount(address string) DerivedAccount {
 	return DerivedAccount{
-		Address:          address,
-		LiquidBalances:   sdk.Coins{},
-		Staked:           sdk.ZeroInt(),
-		UnbondingStake:   sdk.ZeroInt(),
-		Bonded:           sdk.Coins{},
-		UnclaimedAirdrop: sdk.Coins{},
+		Address:        address,
+		LiquidBalances: sdk.Coins{},
+		Staked:         sdk.ZeroInt(),
+		UnbondingStake: sdk.ZeroInt(),
+		Bonded:         sdk.Coins{},
 	}
 }
 
@@ -257,34 +255,6 @@ Example:
 				snapshotAccs[address] = acc
 			}
 
-			claimGenesis := claimtypes.GenesisState{}
-			clientCtx.Codec.MustUnmarshalJSON(genState["claim"], &claimGenesis)
-			for _, record := range claimGenesis.ClaimRecords {
-				address := record.Address
-
-				acc, ok := snapshotAccs[address]
-				if !ok {
-					acc = newDerivedAccount(address)
-				}
-
-				claimablePerAction := sdk.Coins{}
-				for _, coin := range record.InitialClaimableAmount {
-					claimablePerAction = claimablePerAction.Add(
-						sdk.NewCoin(coin.Denom,
-							coin.Amount.QuoRaw(int64(len(claimtypes.Action_name))),
-						),
-					)
-				}
-
-				for action := range claimtypes.Action_name {
-					if record.ActionCompleted[action] == false {
-						acc.UnclaimedAirdrop = acc.UnclaimedAirdrop.Add(claimablePerAction...)
-					}
-				}
-
-				snapshotAccs[address] = acc
-			}
-
 			gammGenesis := gammtypes.GenesisState{}
 			clientCtx.Codec.MustUnmarshalJSON(genState["gamm"], &gammGenesis)
 
@@ -313,8 +283,6 @@ Example:
 					Add(sdk.NewCoin(appparams.BaseCoinUnit, account.Staked)).
 					Add(sdk.NewCoin(appparams.BaseCoinUnit, account.UnbondingStake)).
 					Add(account.Bonded...).
-					Add(account.UnclaimedAirdrop...)
-				snapshotAccs[addr] = account
 			}
 
 			snapshot := DeriveSnapshot{

diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go
@@ -27,7 +27,6 @@ import (
 
 	appParams "github.com/osmosis-labs/osmosis/v7/app/params"
 
-	claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types"
 	epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
 	incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"
 	minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"
@@ -193,15 +192,6 @@ func PrepareGenesis(clientCtx client.Context, appState map[string]json.RawMessag
 	}
 	appState[epochstypes.ModuleName] = epochsGenStateBz
 
-	// claim module genesis
-	claimGenState := claimtypes.GetGenesisStateFromAppState(depCdc, appState)
-	claimGenState.Params = genesisParams.ClaimParams
-	claimGenStateBz, err := cdc.MarshalJSON(claimGenState)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to marshal claim genesis state: %w", err)
-	}
-	appState[claimtypes.ModuleName] = claimGenStateBz
-
 	// poolincentives module genesis
 	poolincentivesGenState := &genesisParams.PoolIncentivesGenesis
 	poolincentivesGenStateBz, err := cdc.MarshalJSON(poolincentivesGenState)
@@ -237,8 +227,6 @@ type GenesisParams struct {
 	PoolIncentivesGenesis poolincentivestypes.GenesisState
 
 	Epochs []epochstypes.EpochInfo
-
-	ClaimParams claimtypes.Params
 }
 
 func MainnetGenesisParams() GenesisParams {
@@ -496,13 +484,6 @@ func MainnetGenesisParams() GenesisParams {
 		time.Hour * 24 * 14, // 14 days
 	}
 
-	genParams.ClaimParams = claimtypes.Params{
-		AirdropStartTime:   genParams.GenesisTime,
-		DurationUntilDecay: time.Hour * 24 * 60,  // 60 days = ~2 months
-		DurationOfDecay:    time.Hour * 24 * 120, // 120 days = ~4 months
-		ClaimDenom:         genParams.NativeCoinMetadatas[0].Base,
-	}
-
 	genParams.ConsensusParams = tmtypes.DefaultConsensusParams()
 	genParams.ConsensusParams.Block.MaxBytes = 5 * 1024 * 1024
 	genParams.ConsensusParams.Block.MaxGas = 6_000_000
@@ -564,10 +545,6 @@ func TestnetGenesisParams() GenesisParams {
 		time.Hour * 2,    // 2 hours
 	}
 
-	genParams.ClaimParams.AirdropStartTime = genParams.GenesisTime
-	genParams.ClaimParams.DurationUntilDecay = time.Hour * 48 // 2 days
-	genParams.ClaimParams.DurationOfDecay = time.Hour * 48    // 2 days
-
 	genParams.PoolIncentivesGenesis.LockableDurations = genParams.IncentivesGenesis.LockableDurations
 
 	return genParams

diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
@@ -151,7 +151,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		AddGenesisWasmMsgCmd(osmosis.DefaultNodeHome),
 		genutilcli.GenTxCmd(osmosis.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, osmosis.DefaultNodeHome),
 		genutilcli.ValidateGenesisCmd(osmosis.ModuleBasics),
-		ExportDeriveBalancesCmd(),
 		PrepareGenesisCmd(osmosis.DefaultNodeHome, osmosis.ModuleBasics),
 		tmcli.NewCompletionCmd(rootCmd, true),
 		testnetCmd(osmosis.ModuleBasics, banktypes.GenesisBalancesIterator{}),

diff --git a/proto/osmosis/claim/v1beta1/claim.proto b/proto/osmosis/claim/v1beta1/claim.proto
diff --git a/proto/osmosis/claim/v1beta1/genesis.proto b/proto/osmosis/claim/v1beta1/genesis.proto
diff --git a/proto/osmosis/claim/v1beta1/params.proto b/proto/osmosis/claim/v1beta1/params.proto