Skip to content

Commit 6cb70a3

Browse files
committed
fix: incorrect protocol version in upgrade module
1 parent c7d5265 commit 6cb70a3

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

app/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (a *App) SetUpgradeStoreLoader() {
220220
func (a *App) SetUpgradeHandler(configurator sdkmodule.Configurator) {
221221
a.UpgradeKeeper.SetUpgradeHandler(
222222
UpgradeName,
223-
UpgradeHandler(a.Codec, a.mm, configurator, a.Keepers),
223+
UpgradeHandler(a.Codec, a.mm, configurator, a.Keepers, a.KV(upgradetypes.StoreKey)),
224224
)
225225
}
226226

app/upgrade.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package app
22

33
import (
4+
"encoding/binary"
45
"fmt"
56
"math"
67
"time"
@@ -60,8 +61,13 @@ var (
6061

6162
func UpgradeHandler(
6263
cdc codec.Codec, mm *sdkmodule.Manager, configurator sdkmodule.Configurator, keepers Keepers,
64+
upgradeKVStoreKey *storetypes.KVStoreKey,
6365
) upgradetypes.UpgradeHandler {
6466
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM sdkmodule.VersionMap) (sdkmodule.VersionMap, error) {
67+
upgradeStore := ctx.KVStore(upgradeKVStoreKey)
68+
versionBytes := binary.BigEndian.AppendUint64([]byte{}, preUpgradeProtocolVersion)
69+
upgradeStore.Set([]byte{upgradetypes.ProtocolVersionByte}, versionBytes)
70+
6571
versionSetter := keepers.UpgradeKeeper.GetVersionSetter()
6672
versionSetter.SetProtocolVersion(preUpgradeProtocolVersion)
6773

@@ -331,7 +337,7 @@ func migrateFoundationAccount(
331337
ak.SetAccount(ctx, vestingAccount)
332338

333339
// Transfer spendable coins to new address
334-
toAddr, err := sdk.AccAddressFromBech32("") // TODO: set addr
340+
toAddr, err := sdk.AccAddressFromBech32("sent1rk7a363h86da9eka5rx2pas4q7evnpk5h076lu")
335341
if err != nil {
336342
return err
337343
}
@@ -357,7 +363,7 @@ func setDenomMetadata(ctx sdk.Context, k bankkeeper.Keeper) error {
357363
{Denom: "dvpn", Exponent: 6},
358364
},
359365
Base: "udvpn",
360-
Display: "P2P",
366+
Display: "udvpn",
361367
Name: "Sentinel",
362368
Symbol: "P2P",
363369
},
@@ -370,7 +376,7 @@ func setDenomMetadata(ctx sdk.Context, k bankkeeper.Keeper) error {
370376
},
371377
},
372378
Base: "ibc/A8C2D23A1E6F95DA4E48BA349667E322BD7A6C996D8A4AAE8BA72E190F3D1477",
373-
Display: "ATOM",
379+
Display: "ibc/A8C2D23A1E6F95DA4E48BA349667E322BD7A6C996D8A4AAE8BA72E190F3D1477",
374380
Name: "Cosmos",
375381
Symbol: "ATOM",
376382
},
@@ -383,7 +389,7 @@ func setDenomMetadata(ctx sdk.Context, k bankkeeper.Keeper) error {
383389
},
384390
},
385391
Base: "ibc/B1C0DDB14F25279A2026BC8794E12B259F8BDA546A3C5132CCAEE4431CE36783",
386-
Display: "DEC",
392+
Display: "ibc/B1C0DDB14F25279A2026BC8794E12B259F8BDA546A3C5132CCAEE4431CE36783",
387393
Name: "Decentr",
388394
Symbol: "DEC",
389395
},
@@ -396,7 +402,7 @@ func setDenomMetadata(ctx sdk.Context, k bankkeeper.Keeper) error {
396402
},
397403
},
398404
Base: "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518",
399-
Display: "OSMO",
405+
Display: "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518",
400406
Name: "Osmosis",
401407
Symbol: "OSMO",
402408
},
@@ -409,7 +415,7 @@ func setDenomMetadata(ctx sdk.Context, k bankkeeper.Keeper) error {
409415
},
410416
},
411417
Base: "ibc/31FEE1A2A9F9C01113F90BD0BBCCE8FD6BBB8585FAF109A2101827DD1D5B95B8",
412-
Display: "SCRT",
418+
Display: "ibc/31FEE1A2A9F9C01113F90BD0BBCCE8FD6BBB8585FAF109A2101827DD1D5B95B8",
413419
Name: "Secret",
414420
Symbol: "SCRT",
415421
},

0 commit comments

Comments
 (0)