Merge branch 'main' into adarsh/fixes

.github/workflows/delete-branch-snapshot.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Retrieve post upgrade snapshot generator binary
         run: |
-          POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.6.1
+          POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.6.2
           DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64
           POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}
           curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH

.github/workflows/software-upgrade-test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   create-new-snapshot:
-    runs-on: elys-runner-x2
+    runs-on: elys-runner-x2-2
 
     steps:
       - name: Check if secrets are set
@@ -56,7 +56,7 @@ jobs:
 
       - name: Retrieve post upgrade snapshot generator binary
         run: |
-          POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.6.1
+          POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION=v0.6.2
           DOWNLOAD_URL=https://github.com/elys-network/post-upgrade-snapshot-generator/releases/download/${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}-linux-amd64
           POST_UPGRADE_SNAPSHOT_GENERATOR_PATH=/tmp/post-upgrade-snapshot-generator-${POST_UPGRADE_SNAPSHOT_GENERATOR_VERSION}
           curl -L $DOWNLOAD_URL -o $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH && chmod +x $POST_UPGRADE_SNAPSHOT_GENERATOR_PATH

proto/elys/estaking/dex_rewards_tracker.proto

@@ -20,19 +20,3 @@ message DexRewardsTracker {
     (gogoproto.nullable) = false
   ];
 }
-
-message LegacyDexRewardsTracker {
-  // Number of blocks since start of epoch (distribution epoch)
-  string num_blocks = 1 [
-    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
-    (gogoproto.nullable) = false
-  ];
-  // Accumulated amount at distribution epoch - recalculated at every
-  // distribution epoch
-  string amount = 2 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-}

proto/elys/estaking/incentive.proto

@@ -6,34 +6,6 @@ import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/elys-network/elys/x/estaking/types";
 
-// Incentive Info
-message LegacyIncentiveInfo {
-  // reward amount in eden for 1 year
-  string eden_amount_per_year = 1 [
-    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
-    (gogoproto.nullable) = false
-  ];
-  // starting block height of the distribution
-  string distribution_start_block = 2 [
-    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
-    (gogoproto.nullable) = false
-  ];
-  // distribution duration - block number per year
-  string total_blocks_per_year = 3 [
-    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
-    (gogoproto.nullable) = false
-  ];
-  // blocks distributed
-  string blocks_distributed = 4 [
-    (cosmos_proto.scalar) = "cosmos.Int",
-    (gogoproto.customtype) = "cosmossdk.io/math.Int",
-    (gogoproto.nullable) = false
-  ];
-}
-
 message IncentiveInfo {
   // reward amount in eden for 1 year
   string eden_amount_per_year = 1 [

proto/elys/estaking/params.proto

@@ -8,28 +8,6 @@ import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/elys-network/elys/x/estaking/types";
 
-message LegacyParams {
-  option (gogoproto.goproto_stringer) = false;
-
-  LegacyIncentiveInfo stake_incentives = 1;
-  string eden_commit_val = 2;
-  string edenb_commit_val = 3;
-  // Maximum eden reward apr for stakers - [0 - 0.3]
-  string max_eden_reward_apr_stakers = 5 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-  string eden_boost_apr = 6 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-  // Tracking dex rewards given to stakers
-  LegacyDexRewardsTracker dex_rewards_stakers = 7
-      [ (gogoproto.nullable) = false ];
-}
-
 // Params defines the parameters for the module.
 message Params {
   IncentiveInfo stake_incentives = 1;

proto/elys/tier/query.proto

@@ -68,6 +68,12 @@ service Query {
         "/elys-network/elys/tier/liquid_total/{user}";
   }
 
+  // Queries a list of LockedOrder items.
+  rpc LockedOrder(QueryLockedOrderRequest) returns (QueryLockedOrderResponse) {
+    option (google.api.http).get =
+        "/elys-network/elys/tier/locked_order/{user}";
+  }
+
   // Queries a list of GetAmmPrice items.
   rpc GetAmmPrice(QueryGetAmmPriceRequest) returns (QueryGetAmmPriceResponse) {
     option (google.api.http).get =
@@ -183,6 +189,16 @@ message QueryLiquidTotalResponse {
   ];
 }
 
+message QueryLockedOrderRequest { string user = 1; }
+
+message QueryLockedOrderResponse {
+  string total = 1 [
+    (cosmos_proto.scalar) = "cosmos.Dec",
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable) = false
+  ];
+}
+
 message QueryGetAmmPriceRequest {
   string denom = 1;
   int32 decimal = 2;

x/estaking/keeper/elys_stake_change.go

@@ -26,17 +26,6 @@ func (k Keeper) RemoveElysStakeChange(ctx sdk.Context, address sdk.AccAddress) {
 	store.Delete(key)
 }
 
-func (k Keeper) SetLegacyElysStakeChange(ctx sdk.Context, addr sdk.AccAddress) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakeChangeKeyPrefix))
-	key := types.GetElysStakeChangeKey(addr)
-	store.Set(key, addr)
-}
-
-func (k Keeper) DeleteLegacyElysStakeChange(ctx sdk.Context, address sdk.AccAddress) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakeChangeKeyPrefix))
-	store.Delete([]byte(address))
-}
-
 func (k Keeper) GetAllElysStakeChange(ctx sdk.Context) (list []sdk.AccAddress) {
 	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.ElysStakeChangeKeyPrefix)
 	iterator := storetypes.KVStorePrefixIterator(store, []byte{})
@@ -49,16 +38,3 @@ func (k Keeper) GetAllElysStakeChange(ctx sdk.Context) (list []sdk.AccAddress) {
 
 	return
 }
-
-func (k Keeper) GetAllLegacyElysStakeChange(ctx sdk.Context) (list []sdk.AccAddress) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakeChangeKeyPrefix))
-	iterator := storetypes.KVStorePrefixIterator(store, []byte{})
-
-	defer iterator.Close()
-
-	for ; iterator.Valid(); iterator.Next() {
-		list = append(list, sdk.AccAddress(iterator.Value()))
-	}
-
-	return
-}

x/estaking/keeper/elys_stake_change_test.go

@@ -27,48 +27,6 @@ func (suite *EstakingKeeperTestSuite) TestElysStakeChange() {
 				suite.Require().True(found)
 			},
 		},
-		{
-			"delete legacy elys stake change",
-			func() (addr sdk.AccAddress) {
-				suite.ResetSuite()
-
-				addr = suite.AddAccounts(1, nil)[0]
-
-				return addr
-			},
-			func(addr sdk.AccAddress) {
-				suite.app.EstakingKeeper.DeleteLegacyElysStakeChange(suite.ctx, addr)
-			},
-		},
-		{
-			"get all legacy elys stake change with no data",
-			func() (addr sdk.AccAddress) {
-				suite.ResetSuite()
-
-				return sdk.AccAddress{}
-			},
-			func(addr sdk.AccAddress) {
-				list := suite.app.EstakingKeeper.GetAllLegacyElysStakeChange(suite.ctx)
-				suite.Require().Equal(0, len(list))
-			},
-		},
-		{
-			"get all legacy elys stake change with data",
-			func() (addr sdk.AccAddress) {
-				suite.ResetSuite()
-
-				addr = suite.AddAccounts(1, nil)[0]
-
-				// set legacy elys stake change
-				suite.app.EstakingKeeper.SetLegacyElysStakeChange(suite.ctx, addr)
-
-				return sdk.AccAddress{}
-			},
-			func(addr sdk.AccAddress) {
-				list := suite.app.EstakingKeeper.GetAllLegacyElysStakeChange(suite.ctx)
-				suite.Require().Equal(1, len(list))
-			},
-		},
 	}
 
 	for _, tc := range testCases {

x/estaking/keeper/elys_staked.go

@@ -54,33 +54,3 @@ func (k Keeper) GetAllElysStaked(ctx sdk.Context) (list []types.ElysStaked) {
 
 	return
 }
-
-// SetLegacyElysStaked set a specific elysStaked in the store from its index
-func (k Keeper) SetLegacyElysStaked(ctx sdk.Context, elysStaked types.ElysStaked) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakedKeyPrefix))
-	b := k.cdc.MustMarshal(&elysStaked)
-	key := types.GetElysStakedKey(elysStaked.GetAccountAddress())
-	store.Set(key, b)
-}
-
-// remove after migration
-func (k Keeper) GetAllLegacyElysStaked(ctx sdk.Context) (list []types.ElysStaked) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakedKeyPrefix))
-	iterator := storetypes.KVStorePrefixIterator(store, []byte{})
-
-	defer iterator.Close()
-
-	for ; iterator.Valid(); iterator.Next() {
-		var val types.ElysStaked
-		k.cdc.MustUnmarshal(iterator.Value(), &val)
-		list = append(list, val)
-	}
-
-	return
-}
-
-// TODO: remove all legacy prefixes and functions after migration
-func (k Keeper) DeleteLegacyElysStaked(ctx sdk.Context, address string) {
-	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.LegacyKeyPrefix(types.LegacyElysStakedKeyPrefix))
-	store.Delete(types.LegacyElysStakedKey(address))
-}

x/estaking/keeper/elys_staked_test.go

@@ -59,40 +59,6 @@ func (suite *EstakingKeeperTestSuite) TestElysStaked() {
 				suite.Require().Equal(2, len(list))
 			},
 		},
-		{
-			"get all legacy elys staked",
-			func() (addr sdk.AccAddress) {
-				suite.ResetSuite()
-
-				addr = suite.AddAccounts(1, nil)[0]
-
-				// set elys staked
-				suite.app.EstakingKeeper.SetLegacyElysStaked(suite.ctx, types.ElysStaked{
-					Address: addr.String(),
-					Amount:  math.NewInt(1000),
-				})
-
-				return addr
-			},
-			func(addr sdk.AccAddress) {
-				list := suite.app.EstakingKeeper.GetAllLegacyElysStaked(suite.ctx)
-				suite.Require().Equal(1, len(list))
-				suite.Require().Equal(math.NewInt(1000), list[0].Amount)
-			},
-		},
-		{
-			"delete legacy elys staked",
-			func() (addr sdk.AccAddress) {
-				suite.ResetSuite()
-
-				addr = suite.AddAccounts(1, nil)[0]
-
-				return addr
-			},
-			func(addr sdk.AccAddress) {
-				suite.app.EstakingKeeper.DeleteLegacyElysStaked(suite.ctx, addr.String())
-			},
-		},
 	}
 
 	for _, tc := range testCases {

x/estaking/keeper/keeper_test.go

@@ -8,7 +8,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	stypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	simapp "github.com/elys-network/elys/app"
 	aptypes "github.com/elys-network/elys/x/assetprofile/types"
 	ckeeper "github.com/elys-network/elys/x/commitment/keeper"
@@ -169,6 +168,7 @@ func (suite *EstakingKeeperTestSuite) TestEstakingExtendedFunctions() {
 	suite.Require().Nil(err)
 
 	delegations, err := suite.app.StakingKeeper.GetValidatorDelegations(suite.ctx, operatorAddr)
+	suite.Require().Nil(err)
 
 	suite.Require().True(len(delegations) > 0)
 	addr := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress)
@@ -212,6 +212,7 @@ func (suite *EstakingKeeperTestSuite) TestEstakingExtendedFunctions() {
 	suite.Require().Nil(err)
 	suite.Require().Equal(validator, edenVal)
 	validator, err = suite.app.EstakingKeeper.Validator(suite.ctx, operatorBValAddr)
+	suite.Require().Nil(err)
 	suite.Require().Equal(validator, edenBVal)
 
 	edenDel, err := suite.app.EstakingKeeper.Delegation(suite.ctx, addr, operatorValAddr)
@@ -223,22 +224,22 @@ func (suite *EstakingKeeperTestSuite) TestEstakingExtendedFunctions() {
 	suite.Require().Nil(edenBDel)
 
 	numDelegations := int64(0)
-	suite.app.EstakingKeeper.IterateDelegations(suite.ctx, addr, func(index int64, delegation stypes.DelegationI) (stop bool) {
+	suite.app.EstakingKeeper.IterateDelegations(suite.ctx, addr, func(index int64, delegation stakingtypes.DelegationI) (stop bool) {
 		numDelegations++
 		return false
 	})
 	suite.Require().Equal(numDelegations, int64(2))
 
 	numBondedValidators := int64(0)
-	suite.app.EstakingKeeper.IterateBondedValidatorsByPower(suite.ctx, func(index int64, delegation stypes.ValidatorI) (stop bool) {
+	suite.app.EstakingKeeper.IterateBondedValidatorsByPower(suite.ctx, func(index int64, delegation stakingtypes.ValidatorI) (stop bool) {
 		numBondedValidators++
 		return false
 	})
 	suite.Require().Equal(numBondedValidators, int64(2))
 
 	// test IterateValidators
 	numValidators := int64(0)
-	suite.app.EstakingKeeper.IterateValidators(suite.ctx, func(index int64, validator stypes.ValidatorI) (stop bool) {
+	suite.app.EstakingKeeper.IterateValidators(suite.ctx, func(index int64, validator stakingtypes.ValidatorI) (stop bool) {
 		numValidators++
 		return false
 	})

x/estaking/keeper/msg_server_test.go

@@ -136,6 +136,7 @@ func (suite *EstakingKeeperTestSuite) TestMsgServer() {
 				suite.Require().Nil(err)
 
 				delegations, err := suite.app.StakingKeeper.GetValidatorDelegations(suite.ctx, valAddr)
+				suite.Require().Nil(err)
 				suite.Require().True(len(delegations) > 0)
 				addr := sdk.MustAccAddressFromBech32(delegations[0].DelegatorAddress)
 

x/estaking/keeper/params.go

@@ -19,28 +19,9 @@ func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
 	return
 }
 
-func (k Keeper) GetLegacyParams(ctx sdk.Context) (params types.LegacyParams) {
-	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
-
-	b := store.Get(types.ParamsKeyPrefix)
-	if b == nil {
-		return
-	}
-
-	k.cdc.MustUnmarshal(b, &params)
-	return
-}
-
 // SetParams set the params
 func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
 	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
 	b := k.cdc.MustMarshal(&params)
 	store.Set(types.ParamsKeyPrefix, b)
 }
-
-// SetLegacyParams set the params
-func (k Keeper) SetLegacyParams(ctx sdk.Context, params types.LegacyParams) {
-	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
-	b := k.cdc.MustMarshal(&params)
-	store.Set(types.ParamsKeyPrefix, b)
-}