From bc58c67f0cb219ce5a1bddf2ee57c47ec77f9a15 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 18 Oct 2023 16:54:50 -0600 Subject: [PATCH 1/2] Fix use the StoreKey (instead of ModuleName) for the Added entry for ibchooks in the saffron upgrade handlers. --- app/upgrades.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 38d4e0abae..74db97d190 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -118,7 +118,7 @@ var upgrades = map[string]appUpgrade{ return vm, nil }, - Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.ModuleName, hold.ModuleName, exchange.ModuleName}, + Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.StoreKey, hold.ModuleName, exchange.ModuleName}, }, "saffron": { // upgrade for v1.17.0, Handler: func(ctx sdk.Context, app *App, vm module.VersionMap) (module.VersionMap, error) { @@ -138,7 +138,7 @@ var upgrades = map[string]appUpgrade{ return vm, nil }, - Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.ModuleName, hold.ModuleName, exchange.ModuleName}, + Added: []string{icqtypes.ModuleName, oracletypes.ModuleName, ibchookstypes.StoreKey, hold.ModuleName, exchange.ModuleName}, }, // TODO - Add new upgrade definitions here. } From 6de22df894bf9ae686496a33067c3c9dcbfc8198 Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Wed, 18 Oct 2023 16:57:56 -0600 Subject: [PATCH 2/2] Add changelog entry. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b6ff2157..74be39a30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,7 +71,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * Add genesis/init for Marker module send deny list addresses. [#1660](https://github.com/provenance-io/provenance/issues/1660) * Add automatic changelog entries for dependabot. [#1674](https://github.com/provenance-io/provenance/issues/1674) * Ensure IBC marker has matching supply [#1706](https://github.com/provenance-io/provenance/issues/1706). - + ### Bug Fixes * Fix ibcnet relayer creating multiple connections on restart [#1620](https://github.com/provenance-io/provenance/issues/1620). @@ -79,6 +79,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * Allow restricted coins to be quarantined [#1626](https://github.com/provenance-io/provenance/issues/1626). * Prevent marker forced transfers from module accounts [#1626](https://github.com/provenance-io/provenance/issues/1626). * Change config load order so custom.toml can override other config. [#1262](https://github.com/provenance-io/provenance/issues/1262) +* Fix the saffron and saffron-rc1 upgrade handlers to add correct ibchooks store key [PR 1715](https://github.com/provenance-io/provenance/pull/1715). ### Client Breaking