Merge branch 'dev' into sufay/add-submit-signed-tx-cli

sideprotocol · Jun 19, 2024 · f664af5 · f664af5
2 parents 5a077b1 + 11705cf
commit f664af5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -73,8 +73,8 @@ import (
 	yieldmodulekeeper "github.com/sideprotocol/side/x/yield/keeper"
 	yieldmoduletypes "github.com/sideprotocol/side/x/yield/types"
 
-	btclightclientkeeper "github.com/sideprotocol/side/x/btcbridge/keeper"
-	btclightclienttypes "github.com/sideprotocol/side/x/btcbridge/types"
+	btcbridgekeeper "github.com/sideprotocol/side/x/btcbridge/keeper"
+	btcbridgetypes "github.com/sideprotocol/side/x/btcbridge/types"
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
@@ -129,10 +129,9 @@ type AppKeepers struct {
 	ScopedICAHostKeeper  capabilitykeeper.ScopedKeeper
 	scopedWasmKeeper     capabilitykeeper.ScopedKeeper
 
-	GmmKeeper gmmmodulekeeper.Keeper
-
-	YieldKeeper          yieldmodulekeeper.Keeper
-	BtcLightClientKeeper btclightclientkeeper.Keeper
+	GmmKeeper       gmmmodulekeeper.Keeper
+	YieldKeeper     yieldmodulekeeper.Keeper
+	BtcBridgeKeeper btcbridgekeeper.Keeper
 
 	// keys to access the substores
 	keys    map[string]*storetypes.KVStoreKey
@@ -393,10 +392,10 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		appKeepers.IcacallbacksKeeper,
 	)
 
-	appKeepers.BtcLightClientKeeper = *btclightclientkeeper.NewKeeper(
+	appKeepers.BtcBridgeKeeper = *btcbridgekeeper.NewKeeper(
 		appCodec,
-		appKeepers.keys[btclightclienttypes.StoreKey],
-		appKeepers.keys[btclightclienttypes.StoreKey],
+		appKeepers.keys[btcbridgetypes.StoreKey],
+		appKeepers.keys[btcbridgetypes.StoreKey],
 		appKeepers.BankKeeper,
 	)
 
@@ -504,7 +503,7 @@ func KVStoreKeys() []string {
 		ibcfeetypes.StoreKey,
 		gmmmoduletypes.StoreKey,
 		yieldmoduletypes.StoreKey,
-		btclightclienttypes.StoreKey,
+		btcbridgetypes.StoreKey,
 	}
 }
 

diff --git a/app/modules.go b/app/modules.go
@@ -67,8 +67,8 @@ import (
 	yieldmodule "github.com/sideprotocol/side/x/yield"
 	yieldmoduletypes "github.com/sideprotocol/side/x/yield/types"
 
-	btclightclient "github.com/sideprotocol/side/x/btcbridge"
-	btclightclienttypes "github.com/sideprotocol/side/x/btcbridge/types"
+	btcbridge "github.com/sideprotocol/side/x/btcbridge"
+	btcbridgetypes "github.com/sideprotocol/side/x/btcbridge/types"
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
@@ -95,7 +95,7 @@ var moduleAccountPermissions = map[string][]string{
 	wasmTypes.ModuleName:           {authtypes.Burner},
 	gmmmoduletypes.ModuleName:      {authtypes.Minter, authtypes.Burner, authtypes.Staking},
 	yieldmoduletypes.ModuleName:    {authtypes.Minter, authtypes.Burner, authtypes.Staking},
-	btclightclienttypes.ModuleName: {authtypes.Minter, authtypes.Burner},
+	btcbridgetypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
 }
 
 // appModules return modules to initialize module manager.
@@ -142,7 +142,7 @@ func appModules(
 		icaModule,
 		gmmModule,
 		yieldModule,
-		btclightclient.NewAppModule(appCodec, app.BtcLightClientKeeper),
+		btcbridge.NewAppModule(appCodec, app.BtcBridgeKeeper),
 		// this line is used by starport scaffolding # stargate/app/appModule
 
 		crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them
@@ -178,7 +178,7 @@ func orderBeginBlockers() []string {
 		wasmTypes.ModuleName,
 		gmmmoduletypes.ModuleName,
 		yieldmoduletypes.ModuleName,
-		btclightclienttypes.ModuleName,
+		btcbridgetypes.ModuleName,
 	}
 	return ord
 }
@@ -211,7 +211,7 @@ func OrderEndBlockers() []string {
 		wasmTypes.ModuleName,
 		gmmmoduletypes.ModuleName,
 		yieldmoduletypes.ModuleName,
-		btclightclienttypes.ModuleName,
+		btcbridgetypes.ModuleName,
 	}
 	return ord
 }
@@ -249,7 +249,7 @@ func OrderInitGenesis() []string {
 		wasmTypes.ModuleName,
 		gmmmoduletypes.ModuleName,
 		yieldmoduletypes.ModuleName,
-		btclightclienttypes.ModuleName,
+		btcbridgetypes.ModuleName,
 	}
 }
 

diff --git a/x/btcbridge/client/cli/query.go b/x/btcbridge/client/cli/query.go
@@ -30,6 +30,8 @@ func GetQueryCmd(_ string) *cobra.Command {
 	cmd.AddCommand(CmdBestBlock())
 	cmd.AddCommand(CmdQueryBlock())
 	cmd.AddCommand(CmdQueryUTXOs())
+	cmd.AddCommand(CmdQuerySigningRequest())
+
 	// this line is used by starport scaffolding # 1
 
 	return cmd