fix: merge master back to develop

app/upgrade.go

@@ -38,6 +38,7 @@ func (app *App) RegisterUpgradeHandlers(chainID string, serverCfg *serverconfig.
 	app.registerMongolianUpgradeHandler()
 	app.registerAltaiUpgradeHandler()
 	app.registerSavannaUpgradeHandler()
+	app.registerTundraUpgradeHandler()
 	// app.register...()
 	// ...
 	return nil
@@ -330,3 +331,19 @@ func (app *App) registerSavannaUpgradeHandler() {
 			return nil
 		})
 }
+
+func (app *App) registerTundraUpgradeHandler() {
+	// Register the upgrade handler
+	app.UpgradeKeeper.SetUpgradeHandler(upgradetypes.Tundra,
+		func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+			app.Logger().Info("upgrade to ", plan.Name)
+			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		})
+
+	// Register the upgrade initializer
+	app.UpgradeKeeper.SetUpgradeInitializer(upgradetypes.Tundra,
+		func() error {
+			app.Logger().Info("Init Tundra upgrade")
+			return nil
+		})
+}

deployment/localup/localup.sh

@@ -183,6 +183,7 @@ function generate_genesis() {
         echo -e '[[upgrade]]\nname = "Veld"\nheight = 26\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml
         echo -e '[[upgrade]]\nname = "Mongolian"\nheight = 27\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml
         echo -e '[[upgrade]]\nname = "Savanna"\nheight = 28\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml
+        echo -e '[[upgrade]]\nname = "Tundra"\nheight = 29\ninfo = ""' >> ${workspace}/.local/validator${i}/config/app.toml
     done
 
     # enable swagger API for validator0

go.mod

@@ -183,7 +183,7 @@ replace (
 	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf
 	github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.9.3-0.20250424012533-3644b91a4a5c
+	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6
 	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/wercker/journalhook => github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117

go.sum

@@ -76,12 +76,12 @@ github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf h1
 github.com/bnb-chain/greenfield-cometbft v1.3.2-0.20250421115205-d0c58e3042cf/go.mod h1:KHJjaV8GR/HLVUNpA8l+ro8clFSlwEbyNZIujf8c27w=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI=
-github.com/bnb-chain/greenfield-cosmos-sdk v1.9.3-0.20250424012533-3644b91a4a5c h1:m/ojnDcxC+93NTWluXxFbnQFt0eLJaTchCGeKCHxC3s=
-github.com/bnb-chain/greenfield-cosmos-sdk v1.9.3-0.20250424012533-3644b91a4a5c/go.mod h1:3yqFQxEw05CP1uCyKZtUJjP5N5E+OYALrfJnSWLTE6c=
-github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20250424012533-3644b91a4a5c h1:+kWAQ4r5KXkReB7IE9Z91mtOUNeIKG0KRjC/v7kuxP0=
-github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20250424012533-3644b91a4a5c/go.mod h1:YzvJKV9ZaLfB0Bt5NiTId53lhMUFDmeBJpFddWNoDeQ=
-github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20250424012533-3644b91a4a5c h1:0LTfgCXv6gk3PubhFMQwRHgo510hxeyacOHuv9ADebA=
-github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20250424012533-3644b91a4a5c/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM=
+github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6 h1:lntekn2IqPDKfVxBNWAy4IHXeOyTpEVkD3ZCkSzL4wY=
+github.com/bnb-chain/greenfield-cosmos-sdk v1.10.1-0.20251014054900-003354fe83f6/go.mod h1:2bwmwdXYBISnQoMwgAcZTVGt21lMsHZSeeeMByTvDlQ=
+github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8=
+github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM=
+github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s=
+github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM=
 github.com/bnb-chain/greenfield-iavl v0.20.1 h1:y3L64GU99otNp27/xLVBTDbv4eroR6CzoYz0rbaVotM=
 github.com/bnb-chain/greenfield-iavl v0.20.1/go.mod h1:oLksTs8dfh7DYIKBro7hbRQ+ewls7ghJ27pIXlbEXyI=
 github.com/btcsuite/btcd v0.23.0 h1:V2/ZgjfDFIygAX3ZapeigkVBoVUtOJKSwrhZdlpSvaA=

x/virtualgroup/keeper/msg_server.go

@@ -294,6 +294,11 @@ func (k msgServer) Withdraw(goCtx context.Context, req *types.MsgWithdraw) (*typ
 		return nil, err
 	}
 
+	if ctx.IsUpgraded(upgradetypes.Tundra) {
+		gvg.TotalDeposit = gvg.TotalDeposit.Sub(withdrawTokens)
+		k.SetGVG(ctx, gvg)
+	}
+
 	if err := ctx.EventManager().EmitTypedEvents(&types.EventUpdateGlobalVirtualGroup{
 		Id:           req.GlobalVirtualGroupId,
 		StoreSize:    gvg.StoredSize,