diff --git a/app/app.go b/app/app.go index 440f6b2c..8a4d4bc4 100644 --- a/app/app.go +++ b/app/app.go @@ -417,6 +417,7 @@ func New( app.BundlesKeeper, app.GlobalKeeper, app.MultiCoinRewardsKeeper, + app.PoolKeeper, ), ) diff --git a/app/upgrades/v2_0/upgrade.go b/app/upgrades/v2_0/upgrade.go index 46649a38..953e5a78 100644 --- a/app/upgrades/v2_0/upgrade.go +++ b/app/upgrades/v2_0/upgrade.go @@ -3,6 +3,7 @@ package v2_0 import ( "context" "fmt" + poolkeeper "github.com/KYVENetwork/chain/x/pool/keeper" multicoinrewardskeeper "github.com/KYVENetwork/chain/x/multi_coin_rewards/keeper" multicoinrewardstypes "github.com/KYVENetwork/chain/x/multi_coin_rewards/types" @@ -49,6 +50,7 @@ func CreateUpgradeHandler( bundlesKeeper bundleskeeper.Keeper, globalKeeper globalkeeper.Keeper, multiCoinRewardsKeeper multicoinrewardskeeper.Keeper, + poolKeeper *poolkeeper.Keeper, ) upgradetypes.UpgradeHandler { return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) @@ -65,6 +67,7 @@ func CreateUpgradeHandler( AdjustGasConfig(sdkCtx, globalKeeper) SetMultiCoinRewardsParams(sdkCtx, multiCoinRewardsKeeper) + SetPoolParams(sdkCtx, poolKeeper) // TODO set withdraw address @@ -85,6 +88,14 @@ func SetMultiCoinRewardsParams(ctx sdk.Context, multiCoinRewardsKeeper multicoin multiCoinRewardsKeeper.SetParams(ctx, params) } +func SetPoolParams(ctx sdk.Context, poolKeeper *poolkeeper.Keeper) { + params := poolKeeper.GetParams(ctx) + + // TODO: set new mainnet inflation split + + poolKeeper.SetParams(ctx, params) +} + func AdjustGasConfig(ctx sdk.Context, globalKeeper globalkeeper.Keeper) { params := globalKeeper.GetParams(ctx) params.MinGasPrice = math.LegacyMustNewDecFromStr("2") @@ -100,15 +111,19 @@ func AdjustGasConfig(ctx sdk.Context, globalKeeper globalkeeper.Keeper) { } params.GasRefunds = []globalTypes.GasRefund{ { - Type: "kyve.bundles.v1beta1.SubmitBundleProposal", + Type: "kyve.bundles.v1beta1.MsgSubmitBundleProposal", + Fraction: math.LegacyMustNewDecFromStr("0.95"), + }, + { + Type: "kyve.bundles.v1beta1.MsgVoteBundleProposal", Fraction: math.LegacyMustNewDecFromStr("0.95"), }, { - Type: "kyve.bundles.v1beta1.VoteBundleProposal", + Type: "kyve.bundles.v1beta1.MsgSkipUploaderRole", Fraction: math.LegacyMustNewDecFromStr("0.95"), }, { - Type: "kyve.bundles.v1beta1.SkipUploaderRole", + Type: "kyve.bundles.v1beta1.MsgClaimUploaderRole", Fraction: math.LegacyMustNewDecFromStr("0.95"), }, } @@ -144,6 +159,8 @@ func migrateProtocolStakers(ctx sdk.Context, delegationKeeper delegationkeeper.K validatorMapping = ValidatorMappingsMainnet } else if ctx.ChainID() == "kaon-1" { validatorMapping = ValidatorMappingsKaon + } else if ctx.ChainID() == "korellia-2" { + validatorMapping = ValidatorMappingsKorellia } totalMigratedStake := uint64(0) diff --git a/app/upgrades/v2_0/validator-proofs/korellia/Validator-EU.json b/app/upgrades/v2_0/validator-proofs/korellia/Validator-EU.json new file mode 100644 index 00000000..2925604c --- /dev/null +++ b/app/upgrades/v2_0/validator-proofs/korellia/Validator-EU.json @@ -0,0 +1,7 @@ +{ + "name": "Validator-EU", + "consensus_address": "kyvevaloper1ghpmzfuggm7vcruyhfzrczl4aczy8gas8guslh", + "protocol_address": "kyve1zxlk3x50re5rhz985gcx8pm73whqnutg8ptnkz", + "proof_1": "A7A27728A03B1052B4B32D802920BBDB1E7B8FB549000A8ECE571F554513B59E", + "proof_2": "11B9EFAA0F3BF895F5E6D0FB4EAD66422552A31BADC1AE51C850AA1B8F59F518" +} diff --git a/app/upgrades/v2_0/validator-proofs/korellia/Validator-OVH.json b/app/upgrades/v2_0/validator-proofs/korellia/Validator-OVH.json new file mode 100644 index 00000000..0b6a9844 --- /dev/null +++ b/app/upgrades/v2_0/validator-proofs/korellia/Validator-OVH.json @@ -0,0 +1,7 @@ +{ + "name": "Validator-OVH", + "consensus_address": "kyvevaloper1af699xwpa6z6hek648p2c08hupd4j2knz22atl", + "protocol_address": "kyve1zuzyh0c0zvxry42dpqc79gu3ssukpfzg47uzrc", + "proof_1": "3131A86723482046AEA2034D23D4E125BDC749D72C00F16D47E99AD78CF6971A", + "proof_2": "54B6CC415720BD3FF573ACCC412043EF40399D5E1954ADA948F5044729B5436F" +} diff --git a/app/upgrades/v2_0/validator-proofs/korellia/Validator-US.json b/app/upgrades/v2_0/validator-proofs/korellia/Validator-US.json new file mode 100644 index 00000000..bcbb674a --- /dev/null +++ b/app/upgrades/v2_0/validator-proofs/korellia/Validator-US.json @@ -0,0 +1,7 @@ +{ + "name": "Validator-US", + "consensus_address": "kyvevaloper1p6ctexlukvllyruwnyfhh2cvdwqggz95yzqxe9", + "protocol_address": "kyve1tg9rc2rwzu3ytvkdjh4mpe4k46n2eykpdv46nw", + "proof_1": "C05CBE4E1FB1006C9FCF12713889D69012532C436C5CD3B96715143F8C5191B0", + "proof_2": "56C4CCDA3953388FCB26B7C8841B9F4D1718DA571B833E54FF6523B959A15C55" +} diff --git a/app/upgrades/v2_0/validator_mapping.go b/app/upgrades/v2_0/validator_mapping.go index 9691ddd3..39fdec70 100644 --- a/app/upgrades/v2_0/validator_mapping.go +++ b/app/upgrades/v2_0/validator_mapping.go @@ -34,6 +34,7 @@ func init() { ValidatorMappingsMainnet = parseDirectory("validator-proofs/mainnet") ValidatorMappingsKaon = parseDirectory("validator-proofs/kaon") + ValidatorMappingsKorellia = parseDirectory("validator-proofs/korellia") } type ValidatorMapping struct { @@ -47,3 +48,5 @@ type ValidatorMapping struct { var ValidatorMappingsMainnet []ValidatorMapping var ValidatorMappingsKaon []ValidatorMapping + +var ValidatorMappingsKorellia []ValidatorMapping