Merge pull request #458 from irisnet/feature/issues_439

bump up mods.irisnet.org/modules/htlc to cosmos-sdk v0.50.10
irisnet · Nov 21, 2024 · 903540d · 903540d
2 parents 2406be9 + 4c530a4
commit 903540d
Show file tree

Hide file tree

Showing 24 changed files with 733 additions and 659 deletions.
diff --git a/api/irismod/htlc/htlc.pulsar.go b/api/irismod/htlc/htlc.pulsar.go
diff --git a/modules/htlc/abci.go b/modules/htlc/abci.go
@@ -1,6 +1,7 @@
 package htlc
 
 import (
+	"context"
 	"fmt"
 
 	tmbytes "github.com/cometbft/cometbft/libs/bytes"
@@ -11,7 +12,8 @@ import (
 )
 
 // BeginBlocker handles block beginning logic for HTLC
-func BeginBlocker(ctx sdk.Context, k keeper.Keeper) {
+func BeginBlocker(c context.Context, k keeper.Keeper) {
+	ctx := sdk.UnwrapSDKContext(c)
 	ctx = ctx.WithLogger(ctx.Logger().With("handler", "beginBlock").With("module", "irismod/htlc"))
 
 	currentBlockHeight := uint64(ctx.BlockHeight())

diff --git a/modules/htlc/depinject.go b/modules/htlc/depinject.go
@@ -3,8 +3,8 @@ package htlc
 import (
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/depinject"
+	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	store "github.com/cosmos/cosmos-sdk/store/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
@@ -42,7 +42,7 @@ type Inputs struct {
 
 	Config *modulev1.Module
 	Cdc    codec.Codec
-	Key    *store.KVStoreKey
+	Key    *storetypes.KVStoreKey
 
 	AccountKeeper types.AccountKeeper
 	BankKeeper    types.BankKeeper