Skip to content

Commit 6d35a5f

Browse files
cgdusekcgdusek
authored
Merge pull request #44 from onomyprotocol/release/v1.1.7
Release/v1.1.7
2 parents 1cbb9de + 39d27a7 commit 6d35a5f

File tree

4 files changed

+134
-24
lines changed

4 files changed

+134
-24
lines changed

‎app/app.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ import (
120120

121121
"github.com/onomyprotocol/onex/app/upgrades"
122122
v1_1_6 "github.com/onomyprotocol/onex/app/upgrades/v1.1.6"
123+
v1_1_7 "github.com/onomyprotocol/onex/app/upgrades/v1.1.7"
123124
)
124125

125126
const (
@@ -128,7 +129,7 @@ const (
128129
)
129130

130131
var (
131-
Upgrades = []upgrades.Upgrade{}
132+
Upgrades = []upgrades.Upgrade{v1_1_7.Upgrade}
132133
Forks = []upgrades.Fork{v1_1_6.Fork}
133134

134135
// DefaultNodeHome default home directories for the application daemon

‎app/upgrades/v1.1.7/constants.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package v1_1_7
2+
3+
import (
4+
"github.com/onomyprotocol/onex/app/upgrades"
5+
)
6+
7+
const (
8+
// UpgradeName defines the on-chain upgrades name.
9+
UpgradeName = "v1.1.7"
10+
)
11+
12+
var Upgrade = upgrades.Upgrade{
13+
UpgradeName: UpgradeName,
14+
CreateUpgradeHandler: CreateUpgradeHandler,
15+
}

‎app/upgrades/v1.1.7/upgrade.go

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Package v1_1_7 is contains chain upgrade of the corresponding version.
2+
package v1_1_7 //nolint:revive,stylecheck // app version
3+
4+
import (
5+
"github.com/onomyprotocol/onex/app/upgrades"
6+
7+
sdk "github.com/cosmos/cosmos-sdk/types"
8+
"github.com/cosmos/cosmos-sdk/types/module"
9+
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
10+
markettypes "github.com/pendulum-labs/market/x/market/types"
11+
)
12+
13+
func CreateUpgradeHandler(
14+
mm *module.Manager,
15+
configurator module.Configurator,
16+
keepers *upgrades.UpgradeKeepers,
17+
) upgradetypes.UpgradeHandler {
18+
return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
19+
ctx.Logger().Info("Starting module migrations...")
20+
21+
onexAmount, _ := sdk.NewIntFromString("65975935131986921086784")
22+
ibc1Amount, _ := sdk.NewIntFromString("17216827458309103931141")
23+
ibc2Amount, _ := sdk.NewIntFromString("20100000")
24+
25+
onexCoin := sdk.NewCoin("aonex", onexAmount)
26+
ibc1 := sdk.NewCoin("ibc/5BDD8875CC2AF7BC842BE44236ACD576EA4F53C36347F74903B852060D6BF29A", ibc1Amount)
27+
ibc2 := sdk.NewCoin("ibc/CCCBD7307FEB70B0CF7ADF8503F711F6741F41623D25BAD8CB736E03BE384264", ibc2Amount)
28+
29+
returnCoins := sdk.NewCoins(onexCoin, ibc1, ibc2)
30+
returner, _ := sdk.AccAddressFromBech32("onomy1yc0lg97cy5e80jyajtkz0zke2rr4734anugf9g")
31+
32+
keepers.BankKeeper.SendCoinsFromAccountToModule(ctx, returner, markettypes.ModuleName, returnCoins)
33+
34+
vm, err := mm.RunMigrations(ctx, configurator, vm)
35+
if err != nil {
36+
return vm, err
37+
}
38+
39+
ctx.Logger().Info("Upgrade complete")
40+
return vm, err
41+
}
42+
}

‎chain/onex-mainnet-1/genesis.json renamed to ‎chain/onex-mainnet-1/genesis-with-ccv.json

Lines changed: 75 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -296698,8 +296698,12 @@
296698296698
"historical_entries": "10000",
296699296699
"unbonding_period": "1728000s",
296700296700
"soft_opt_out_threshold": "0.0",
296701-
"reward_denoms": [],
296702-
"provider_reward_denoms": []
296701+
"reward_denoms": [
296702+
"aonex"
296703+
],
296704+
"provider_reward_denoms": [
296705+
"anom"
296706+
]
296703296707
},
296704296708
"provider_client_id": "",
296705296709
"provider_channel_id": "",
@@ -296719,7 +296723,7 @@
296719296723
},
296720296724
"latest_height": {
296721296725
"revision_number": "1",
296722-
"revision_height": "7163380"
296726+
"revision_height": "7521388"
296723296727
},
296724296728
"proof_specs": [
296725296729
{
@@ -296775,61 +296779,109 @@
296775296779
"allow_update_after_misbehaviour": true
296776296780
},
296777296781
"provider_consensus_state": {
296778-
"timestamp": "2024-03-16T17:00:01.554275435Z",
296782+
"timestamp": "2024-04-28T17:00:05.727604714Z",
296779296783
"root": {
296780-
"hash": "Qm3scK/xkzZCVKvwZSl8tO0q0kpxWsCryqGhnnCYdME="
296784+
"hash": "qzI4Xz9tvkoO5OVvCsM86PqAysXbNr7sEgqZxt/zOZc="
296781296785
},
296782-
"next_validators_hash": "2099AD56C603AF33205698A6A6767CC5E632784EE3B1CCC1CC156C2F0C47D7B8"
296786+
"next_validators_hash": "9B81F7ADAB3FD1AD152ED6EC45ACAC3FC15536275E0A1B4C9F896173CF769227"
296783296787
},
296784296788
"maturing_packets": [],
296785296789
"initial_val_set": [
296786296790
{
296787296791
"pub_key": {
296788-
"ed25519": "48JXsFC0RQgJvP4NzvjFE8puP/tve0sZoH4iE8wb6TU="
296792+
"ed25519": "OJQ0oPDfSTWHEiplKTGQm0sjHtsmxkeAuFdGKb55UCQ="
296793+
},
296794+
"power": "936430"
296795+
},
296796+
{
296797+
"pub_key": {
296798+
"ed25519": "ruW1GeY8fy9vEls7WWoZq1kUIsYe9Z/ihK/fZ+I6iKA="
296799+
},
296800+
"power": "4067080"
296801+
},
296802+
{
296803+
"pub_key": {
296804+
"ed25519": "9kkkgSnKrbVNDjE1mBCKT13waXum2aYGX2IzsZl6bec="
296805+
},
296806+
"power": "3025795"
296807+
},
296808+
{
296809+
"pub_key": {
296810+
"ed25519": "T2EJjGcnHmR4HwJe8q16D1REuXtzzHRp9iaDwqYQPeQ="
296811+
},
296812+
"power": "7217495"
296813+
},
296814+
{
296815+
"pub_key": {
296816+
"ed25519": "I2fWbYC5Rq2dFKhw139gNuxLUzukRqhgkvE9WgE2oP0="
296817+
},
296818+
"power": "3155793"
296819+
},
296820+
{
296821+
"pub_key": {
296822+
"ed25519": "HkUDqNrZGrRGgGwOsszEmD9iwIsZCY6UwJIxKI6ycns="
296823+
},
296824+
"power": "5708292"
296825+
},
296826+
{
296827+
"pub_key": {
296828+
"ed25519": "i2WvfyngSCLMtr4vesVo/9s4lAKMAfv8hSmOHBIMRY8="
296829+
},
296830+
"power": "7219284"
296831+
},
296832+
{
296833+
"pub_key": {
296834+
"ed25519": "pfCvKs6uy+5BRC9gP2/Yjk8Altg+MsjZVt/4axNPkHk="
296835+
},
296836+
"power": "4710540"
296837+
},
296838+
{
296839+
"pub_key": {
296840+
"ed25519": "5X/Z7V5a2SOp3ntPlsd9On5MO/FgPBoFIg8cG2BV9XM="
296789296841
},
296790-
"power": "527942"
296842+
"power": "1786483"
296791296843
},
296792296844
{
296793296845
"pub_key": {
296794-
"ed25519": "LKwKvQPVTwxwW4UDpyIvGW8Sa9sUdaxhhhVdOigrEyA="
296846+
"ed25519": "OiLUo1dx20YIY+Gg14ObrA8bQo+JO+8qD+x5owdxXJc="
296795296847
},
296796-
"power": "466262"
296848+
"power": "6335088"
296797296849
},
296798296850
{
296799296851
"pub_key": {
296800-
"ed25519": "E/iqQSF00fEWivlvbYEcVRSBL0XzqQ7q7HC+nH9UUo8="
296852+
"ed25519": "3pmIWEJyXjVcprSaQsIY5pVrUMbpFSPpedu0SxrVFoY="
296801296853
},
296802-
"power": "653925"
296854+
"power": "379964"
296803296855
},
296804296856
{
296805296857
"pub_key": {
296806-
"ed25519": "Gyqukm/oZ3Vx3O/OcU/QZoUNtgKjxXO+tqy5ZzvhY10="
296858+
"ed25519": "4fcxzdv8gADS7pzeZTGCH7ikQbGxqsJVMsNBR8oaCac="
296807296859
},
296808-
"power": "796155"
296860+
"power": "4533842"
296809296861
},
296810296862
{
296811296863
"pub_key": {
296812-
"ed25519": "iLKoAUu0/woUEAFUAlZ6t5/Eyg4nj2w0LBErUlpj9gI="
296864+
"ed25519": "82TrqvWuxMI/CJlYS503LYOhSnDYxLBSW1x3KbZ2cn8="
296813296865
},
296814-
"power": "260493"
296866+
"power": "6558620"
296815296867
},
296816296868
{
296817296869
"pub_key": {
296818-
"ed25519": "lZjOSHvpbIvv1tfakopelLFTop8avnEb0V15ywXAD7k="
296870+
"ed25519": "YaIOqk7+3KMAuYEqVDnYedtZuv1/Y+7gjWRSjTR5mbc="
296819296871
},
296820-
"power": "483534"
296872+
"power": "5935290"
296821296873
},
296822296874
{
296823296875
"pub_key": {
296824-
"ed25519": "oAgD36Wrf669dsNfjYKHskr0xRYxoI3/8jDJujrz4gs="
296876+
"ed25519": "FMH8Yeyxg2U9hfVBa1JP0GtrOnZES/ZCtT8OU86kAM0="
296825296877
},
296826-
"power": "711346"
296878+
"power": "4064104"
296827296879
},
296828296880
{
296829296881
"pub_key": {
296830-
"ed25519": "QM+/TMatIUzOduIsFAS6vglsMy5TEm7v5Zji0MJFRzE="
296882+
"ed25519": "FZBAofv/DhiVYE7fh+XGwL3mKq5Excsce27qaK0HesA="
296831296883
},
296832-
"power": "543559"
296884+
"power": "7675607"
296833296885
}
296834296886
],
296835296887
"height_to_valset_update_id": [],
@@ -296994,4 +297046,4 @@
296994297046
"upgrade": {},
296995297047
"vesting": {}
296996297048
}
296997-
}
297049+
}

0 commit comments

Comments
 (0)