From a11dc65dcb6d6f0918532b4b2053198d6ce9bb08 Mon Sep 17 00:00:00 2001 From: unknown unknown Date: Tue, 14 Nov 2023 16:26:46 +0100 Subject: [PATCH] adjust upgrade and rely on the fork --- app/upgrades/v3/consts.go | 10 ---------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/upgrades/v3/consts.go b/app/upgrades/v3/consts.go index e2134b10..6430c5e8 100644 --- a/app/upgrades/v3/consts.go +++ b/app/upgrades/v3/consts.go @@ -1,9 +1,6 @@ package v3 import ( - store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/cosmos-sdk/x/group" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" "github.com/sge-network/sge/app/upgrades" ) @@ -13,11 +10,4 @@ const UpgradeName = "v1.1.2" var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: store.StoreUpgrades{ - Added: []string{ - group.ModuleName, - ibcfeetypes.StoreKey, - }, - Deleted: []string{}, - }, } diff --git a/go.mod b/go.mod index 22155958..e61bbca9 100644 --- a/go.mod +++ b/go.mod @@ -304,7 +304,7 @@ replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/cosmos/cosmos-sdk => ../cosmos-sdk-faulty + github.com/cosmos/cosmos-sdk => github.com/faultytolly/cosmos-sdk v0.0.0-20231113122743-330e571713e8 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // use cosmos-compatible protobufs diff --git a/go.sum b/go.sum index d9330fee..e1ed2e65 100644 --- a/go.sum +++ b/go.sum @@ -514,6 +514,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/faultytolly/cosmos-sdk v0.0.0-20231113122743-330e571713e8 h1:EzSXqwZyZUiGYF9lXRweLsNZ23oO75G8uC1gKaFueII= +github.com/faultytolly/cosmos-sdk v0.0.0-20231113122743-330e571713e8/go.mod h1:9MRixWsgoJ2UmVsCRRePtENFPP3cM+gTC5azEpxgllo= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y=