Merge branch 'release/v0.49.x' into mergify/bp/release/v0.49.x/pr-1378

* release/v0.49.x: fix: add missing router registration (backport #1379) (#1381) # Conflicts: # CHANGELOG.md
Finschia · May 13, 2024 · 033051d · 033051d
2 parents e5aa94e + 1da1023
commit 033051d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,7 +73,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/server) [\#1337](https://github.com/Finschia/finschia-sdk/pull/1337) fix panic when defining minimum gas config as `100stake;100uatom`. Use a `,` delimiter instead of `;`. Fixes the server config getter to use the correct delimiter (backport cosmos/cosmos-sdk#18537)
 * (x/fbridge) [\#1361](https://github.com/Finschia/finschia-sdk/pull/1361) Fixes fbridge auth checking bug
 * (x/fswap) [\#1365](https://github.com/Finschia/finschia-sdk/pull/1365) fix update swap keys for possibly overlapped keys(`(hello,world) should be different to (hel,loworld)`)
-* (x/fswap, x/fbridge) [\#1378](https://github.com/Finschia/finschia-sdk/pull/1378) Fix bug where amino is not supported in fswap and fbridge
+* (x/fswap) [\#1379](https://github.com/Finschia/finschia-sdk/pull/1379) add missing router registration
+* (x/fswap, x/fbridge) [\#1380](https://github.com/Finschia/finschia-sdk/pull/1380) Fix bug where amino is not supported in fswap and fbridge (backport #1378)
 
 ### Removed
 

diff --git a/x/fswap/keeper/keeper.go b/x/fswap/keeper/keeper.go
@@ -319,7 +319,7 @@ func (k Keeper) increaseSwapCount(ctx sdk.Context) error {
 	}
 
 	prev := stats.SwapCount
-	stats.SwapCount += 1
+	stats.SwapCount++
 	if stats.SwapCount < prev {
 		return types.ErrInvalidState.Wrap("overflow detected")
 	}

diff --git a/x/fswap/module.go b/x/fswap/module.go
@@ -1,6 +1,7 @@
 package fswap
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 
@@ -65,7 +66,9 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
 
 // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the module.
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
-	// this line is used by starport scaffolding # 2
+	if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil {
+		panic(err)
+	}
 }
 
 // GetTxCmd returns the fswap module's root tx command.