Skip to content

Commit

Permalink
Merge branch 'tuan/add-query-cli' of github.com:quicksilver-zone/quic…
Browse files Browse the repository at this point in the history 
…ksilver into tuan/add-query-cli
  • Loading branch information
@tuantran1702
tuantran1702 committed Mar 7, 2024
2 parents 69f5bf8 + 47caf05 commit 17e6edb
Show file tree
Hide file tree
Showing 20 changed files with 1,026 additions and 451 deletions.
9 changes: 0 additions & 9 deletions app/upgrades/account_migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ import (

type ProcessMigrateAccountStrategy func(ctx sdk.Context, appKeepers *keepers.AppKeepers, from sdk.AccAddress, to sdk.AccAddress) error

// Migrate the Ingenuity genesis allocation to Notional.
func migrateIngenuityMultisigToNotional(ctx sdk.Context, appKeepers *keepers.AppKeepers) error {
// migrate ingenuity multisig to notional multisig.
migrations := map[string]string{
"quick1e22za5qrqqp488h5p7vw2pfx8v0y4u444ufeuw": "quick1gxrks2rcj9gthzfgrkjk5lnk0g00cg0cpyntlm",
}
return migrateVestingAccounts(ctx, appKeepers, migrations, migratePeriodicVestingAccount)
}

// Migrate a map of address pairs and migrate from key -> value
func migrateVestingAccounts(ctx sdk.Context, appKeepers *keepers.AppKeepers, migrations map[string]string, strategy ProcessMigrateAccountStrategy) error {
for _, fromBech32 := range utils.Keys(migrations) {
Expand Down
2 changes: 2 additions & 0 deletions app/upgrades/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ const (
V010407rc1UpgradeName = "v1.4.7-rc1"
V010407rc2UpgradeName = "v1.4.7-rc2"
V010500rc0UpgradeName = "v1.5.0-rc0"
V010500rc1UpgradeName = "v1.5.0-rc1"

// mainnet upgrades
V010217UpgradeName = "v1.2.17"
V010405UpgradeName = "v1.4.5"
V010406UpgradeName = "v1.4.6"
V010407UpgradeName = "v1.4.7"
V010500UpgradeName = "v1.5.0"
V010600UpgradeName = "v1.6.0"
)

Expand Down
256 changes: 2 additions & 254 deletions app/upgrades/upgrades.go
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
package upgrades

import (
"fmt"

"cosmossdk.io/math"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/types/query"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/quicksilver-zone/quicksilver/app/keepers"
icstypes "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types"
)

func Upgrades() []Upgrade {
Expand All @@ -25,12 +17,14 @@ func Upgrades() []Upgrade {
{UpgradeName: V010407rc1UpgradeName, CreateUpgradeHandler: V010407rc1UpgradeHandler},
{UpgradeName: V010407rc2UpgradeName, CreateUpgradeHandler: V010407rc2UpgradeHandler},
{UpgradeName: V010500rc0UpgradeName, CreateUpgradeHandler: NoOpHandler},
{UpgradeName: V010500rc1UpgradeName, CreateUpgradeHandler: V010500rc1UpgradeHandler},

// v1.2: this needs to be present to support upgrade on mainnet
{UpgradeName: V010217UpgradeName, CreateUpgradeHandler: NoOpHandler},
{UpgradeName: V010405UpgradeName, CreateUpgradeHandler: NoOpHandler},
{UpgradeName: V010406UpgradeName, CreateUpgradeHandler: V010406UpgradeHandler},
{UpgradeName: V010407UpgradeName, CreateUpgradeHandler: V010407UpgradeHandler},
{UpgradeName: V010500UpgradeName, CreateUpgradeHandler: V010500UpgradeHandler},
{UpgradeName: V010600UpgradeName, CreateUpgradeHandler: V010600UpgradeHandler},
}
}
Expand All @@ -45,249 +39,3 @@ func NoOpHandler(
return mm.RunMigrations(ctx, configurator, fromVM)
}
}

func V010406UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
appKeepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
appKeepers.InterchainstakingKeeper.IterateZones(ctx, func(index int64, zone *icstypes.Zone) (stop bool) {
// add new fields
zone.DepositsEnabled = true
zone.ReturnToSender = false
zone.UnbondingEnabled = true
zone.Decimals = 6
zone.Is_118 = true
if zone.ChainId == "cosmoshub-4" {
zone.LiquidityModule = true
}

// migrate all validators from within the zone struct, to own KV store.
for _, val := range zone.Validators {
newVal := icstypes.Validator{
ValoperAddress: val.ValoperAddress,
CommissionRate: val.CommissionRate,
DelegatorShares: val.DelegatorShares,
VotingPower: val.VotingPower,
Score: val.Score,
Status: val.Status,
Jailed: val.Jailed,
Tombstoned: val.Tombstoned,
JailedSince: val.JailedSince,
ValidatorBondShares: val.ValidatorBondShares,
LiquidShares: val.LiquidShares,
}
err := appKeepers.InterchainstakingKeeper.SetValidator(ctx, zone.ChainId, newVal)
if err != nil {
panic(err)
}

// trigger a valset refresh to update all vals.
query := stakingtypes.QueryValidatorsRequest{}
_ = appKeepers.InterchainstakingKeeper.EmitValSetQuery(ctx, zone.ConnectionId, zone.ChainId, query, math.NewInt(-1))
}

appKeepers.InterchainstakingKeeper.SetAddressZoneMapping(ctx, zone.DepositAddress.Address, zone.ChainId)
appKeepers.InterchainstakingKeeper.SetAddressZoneMapping(ctx, zone.DelegationAddress.Address, zone.ChainId)
appKeepers.InterchainstakingKeeper.SetAddressZoneMapping(ctx, zone.PerformanceAddress.Address, zone.ChainId)
appKeepers.InterchainstakingKeeper.SetAddressZoneMapping(ctx, zone.WithdrawalAddress.Address, zone.ChainId)

zone.Validators = nil
appKeepers.InterchainstakingKeeper.SetZone(ctx, zone)
return false
})

// set lsm caps
appKeepers.InterchainstakingKeeper.SetLsmCaps(ctx, "cosmoshub-4",
icstypes.LsmCaps{
ValidatorCap: sdk.NewDecWithPrec(100, 2),
ValidatorBondCap: sdk.NewDec(250),
GlobalCap: sdk.NewDecWithPrec(25, 2),
},
)

// migrate vesting accounts for misplaced testnet wallets
if err := migrateTestnetIncentives(ctx, appKeepers); err != nil {
panic(fmt.Sprintf("unable to migrate testnet incentives: %v", err))
}

// migrate vesting account from ingenuity to notional
if err := migrateIngenuityMultisigToNotional(ctx, appKeepers); err != nil {
panic(fmt.Sprintf("unable to migrate ingenuity multisig: %v", err))
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}

// Migrate the outstanding testnet incentives with misplaced wallets.
// N.B. these assets are only returning to their original testnet addresses.
func migrateTestnetIncentives(ctx sdk.Context, appKeepers *keepers.AppKeepers) error {
migrations := map[string]string{
"quick1qlckz3nplj3sf323n4ma7n75fmv60lpclq5ccc": "quick15dhqkz3mxxg4tt3m8uz5yy3mzfckgzzh5hpaqp",
"quick1edavtxhdfs8luyvedgkjcxjc9dtvks3ve7etku": "quick1dz3y9k9harjal8nyqg3vl570aj7slaemmxgn86",
"quick1pajjuywnj6w3y6pclp4tj55a7ngz9tp2z4pgep": "quick15sr0uhelt0hw4x7l9zsy4a7hqkaw6jepq4ald9",
"quick1vhd4n5u8rsmsdgs4h7zsn4h4klsej6n8spvsl3": "quick12fyxjyxt64c2q5y0sdts6m4uxcy4cmff7l0ffx",
"quick1rufya429ss9nlhdram0xkcu0jejsz5atap0xan": "quick124pvdf300p2wmq6cl8wwy2z0637du6ec0nhxen",
"quick1f8jp5tr86gn5yvwecr7a4a9zypqf2mg85p96rw": "quick1f708swcmeej2ddfksyvtpaxe07fz0r03f79dlq",
}
return migrateVestingAccounts(ctx, appKeepers, migrations, migratePeriodicVestingAccount)
}

func V010407rc1UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
appKeepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
if isTestnet(ctx) {
// remove osmo-test-5 so we can reinstate
appKeepers.InterchainstakingKeeper.RemoveZoneAndAssociatedRecords(ctx, "osmo-test-5")
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}

func V010407rc2UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
appKeepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
if isTestnet(ctx) || isDevnet(ctx) {
appKeepers.InterchainstakingKeeper.IterateZones(ctx, func(index int64, zone *icstypes.Zone) (stop bool) {
vals := appKeepers.InterchainstakingKeeper.GetValidators(ctx, zone.ChainId)
delegationQuery := stakingtypes.QueryDelegatorDelegationsRequest{DelegatorAddr: zone.DelegationAddress.Address, Pagination: &query.PageRequest{Limit: uint64(len(vals))}}
bz := appKeepers.InterchainstakingKeeper.GetCodec().MustMarshal(&delegationQuery)

appKeepers.InterchainQueryKeeper.MakeRequest(
ctx,
zone.ConnectionId,
zone.ChainId,
"cosmos.staking.v1beta1.Query/DelegatorDelegations",
bz,
sdk.NewInt(-1),
icstypes.ModuleName,
"delegations",
0,
)

balancesQuery := banktypes.QueryAllBalancesRequest{Address: zone.DelegationAddress.Address}
bz = appKeepers.InterchainstakingKeeper.GetCodec().MustMarshal(&balancesQuery)
appKeepers.InterchainQueryKeeper.MakeRequest(
ctx,
zone.ConnectionId,
zone.ChainId,
"cosmos.bank.v1beta1.Query/AllBalances",
bz,
sdk.NewInt(-1),
icstypes.ModuleName,
"delegationaccountbalances",
0,
)
// increment waitgroup; decremented in delegationaccountbalance callback
zone.WithdrawalWaitgroup++

appKeepers.InterchainstakingKeeper.SetZone(ctx, zone)

return false
})
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}

func V010407UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
appKeepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// set redemption rate to value correct as of 2024-02-01T20:00UTC.
rates := map[string]sdk.Dec{
"cosmoshub-4": sdk.NewDecFromInt(math.NewInt(219_280_116_789)).QuoInt64(186_283_929_157),
"stargaze-1": sdk.NewDecFromInt(math.NewInt(7_883_310_380_922)).QuoInt64(6_142_958_768_078),
"osmosis-1": sdk.NewDecFromInt(math.NewInt(363_909_524_952)).QuoInt64(322_912_055_083),
"sommelier-3": sdk.NewDecFromInt(math.NewInt(657_103_764_225)).QuoInt64(637_871_903_193),
"regen-1": sdk.NewDecFromInt(math.NewInt(5_606_819_529_428)).QuoInt64(4_543_207_966_192),
"juno-1": sdk.NewDecFromInt(math.NewInt(7_439_000_263)).QuoInt64(7_018_171_980),
}

// trigger redemption rate update immediately after upgrade.
appKeepers.InterchainstakingKeeper.IterateZones(ctx, func(index int64, zone *icstypes.Zone) (stop bool) {
vals := appKeepers.InterchainstakingKeeper.GetValidators(ctx, zone.ChainId)
delegationQuery := stakingtypes.QueryDelegatorDelegationsRequest{DelegatorAddr: zone.DelegationAddress.Address, Pagination: &query.PageRequest{Limit: uint64(len(vals))}}
bz := appKeepers.InterchainstakingKeeper.GetCodec().MustMarshal(&delegationQuery)

appKeepers.InterchainQueryKeeper.MakeRequest(
ctx,
zone.ConnectionId,
zone.ChainId,
"cosmos.staking.v1beta1.Query/DelegatorDelegations",
bz,
sdk.NewInt(-1),
icstypes.ModuleName,
"delegations",
0,
)

balancesQuery := banktypes.QueryAllBalancesRequest{Address: zone.DelegationAddress.Address}
bz = appKeepers.InterchainstakingKeeper.GetCodec().MustMarshal(&balancesQuery)
appKeepers.InterchainQueryKeeper.MakeRequest(
ctx,
zone.ConnectionId,
zone.ChainId,
"cosmos.bank.v1beta1.Query/AllBalances",
bz,
sdk.NewInt(-1),
icstypes.ModuleName,
"delegationaccountbalances",
0,
)
// increment waitgroup; decremented in delegationaccountbalance callback
zone.WithdrawalWaitgroup++
zone.RedemptionRate = rates[zone.ChainId]
zone.LastRedemptionRate = rates[zone.ChainId]
appKeepers.InterchainstakingKeeper.SetZone(ctx, zone)

return false
})

// migrate testnet user account.
migrations := map[string]string{
"quick1k67rz3vn73tzp2tatlka2kn2ngtjdw8gpw8zq2": "quick1plq2mrsn0uw2dkksptr9dsyyk62dkk6t7w79j2",
}

if err := migrateVestingAccounts(ctx, appKeepers, migrations, migratePeriodicVestingAccount); err != nil {
panic(err)
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}

func V010600UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
appKeepers *keepers.AppKeepers,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
appKeepers.InterchainstakingKeeper.IterateZones(ctx, func(index int64, zone *icstypes.Zone) (stop bool) {
appKeepers.InterchainstakingKeeper.SetLocalDenomZoneMapping(ctx, zone)
return false
})
migrations := map[string]string{
"quick1a7n7z45gs0dut2syvkszffgwmgps6scqen3e5l": "quick1h0sqndv2y4xty6uk0sv4vckgyc5aa7n5at7fll",
"quick1m0anwr4kcz0y9s65czusun2ahw35g3humv4j7f": "quick1n4g6037cjm0e0v2nvwj2ngau7pk758wtwk6lwq",
}

if err := migrateVestingAccounts(ctx, appKeepers, migrations, migrateVestingAccountWithActions); err != nil {
panic(err)
}

return mm.RunMigrations(ctx, configurator, fromVM)
}
}
Loading

0 comments on commit 17e6edb

Please sign in to comment.