feat: allow contracts to query estimate fees endpoint, add IBC Hooks module

CHANGELOG.md

@@ -32,6 +32,7 @@ Contains all the PRs that improved the code without changing the behaviors.
 
 ### Added
 - [#577](https://github.com/archway-network/archway/pull/577) - Adding a cute ascii art of Archway for the cli
+- [#588](https://github.com/archway-network/archway/pull/588) - Add IBC hooks, bump IBC, allows contracts to query callback fee estimations. 
 
 ### Changed
 - [#573](https://github.com/archway-network/archway/pull/573) - Bump cosmos-sdk to v0.50.6 and ibc to v8.2.1

app/app.go

@@ -98,6 +98,9 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/cosmos/gogoproto/proto"
+	ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8"
+	ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/keeper"
+	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/types"
 	"github.com/cosmos/ibc-go/modules/capability"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
@@ -211,6 +214,7 @@ var (
 		ibc.AppModuleBasic{},
 		ibccm.AppModuleBasic{},
 		ibcfee.AppModuleBasic{},
+		ibchooks.AppModuleBasic{},
 		upgrade.AppModuleBasic{},
 		evidence.AppModuleBasic{},
 		transfer.AppModuleBasic{},
@@ -327,6 +331,7 @@ func NewArchwayApp(
 		govtypes.StoreKey, paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		feegrant.StoreKey, authzkeeper.StoreKey, wasmdTypes.StoreKey, consensusparamtypes.StoreKey,
+		ibchookstypes.StoreKey,
 		icacontrollertypes.StoreKey, icahosttypes.StoreKey, ibcfeetypes.StoreKey, crisistypes.StoreKey, group.StoreKey, nftkeeper.StoreKey, cwicatypes.StoreKey,
 
 		trackingTypes.StoreKey, rewardsTypes.StoreKey, callbackTypes.StoreKey, cwfees.ModuleName, cwerrorsTypes.StoreKey,
@@ -667,16 +672,21 @@ func NewArchwayApp(
 		logger,
 	)
 
+	app.Keepers.IBCHooksKeeper = ibchookskeeper.NewKeeper(keys[ibchookstypes.StoreKey])
+	ics20WasmHooks := ibchooks.NewWasmHooks(&app.Keepers.IBCHooksKeeper, nil, Bech32Prefix)
+	hooksIcs4Wrapper := ibchooks.NewICS4Middleware(app.Keepers.IBCKeeper.ChannelKeeper, ics20WasmHooks)
+
 	var transferStack porttypes.IBCModule
 	transferStack = transfer.NewIBCModule(app.Keepers.TransferKeeper)
 	transferStack = ibcfee.NewIBCMiddleware(transferStack, app.Keepers.IBCFeeKeeper)
+	transferStack = ibchooks.NewIBCMiddleware(transferStack, &hooksIcs4Wrapper)
 
 	// Create Interchain Accounts Stack
 
 	var icaControllerStack porttypes.IBCModule
 	icaControllerStack = cwica.NewIBCModule(app.Keepers.CWICAKeeper)
 	icaControllerStack = icacontroller.NewIBCMiddleware(icaControllerStack, app.Keepers.ICAControllerKeeper)
-	//icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, app.Keepers.IBCFeeKeeper)
+	// icaControllerStack = ibcfee.NewIBCMiddleware(icaControllerStack, app.Keepers.IBCFeeKeeper)
 
 	// RecvPacket, message that originates from core IBC and goes down to app, the flow is:
 	// channel.RecvPacket -> fee.OnRecvPacket -> icaHost.OnRecvPacket
@@ -797,6 +807,7 @@ func NewArchwayApp(
 		ibcfeetypes.ModuleName,
 		icatypes.ModuleName,
 		// wasm
+		ibchookstypes.ModuleName,
 		wasmdTypes.ModuleName,
 	)
 
@@ -826,6 +837,7 @@ func NewArchwayApp(
 		vestingtypes.ModuleName,
 		consensusparamtypes.ModuleName,
 		// wasm
+		ibchookstypes.ModuleName,
 		wasmdTypes.ModuleName,
 		// wasm gas tracking
 		trackingTypes.ModuleName,
@@ -870,6 +882,7 @@ func NewArchwayApp(
 		ibcfeetypes.ModuleName,
 		icatypes.ModuleName,
 		// wasm after ibc transfer
+		ibchookstypes.ModuleName,
 		wasmdTypes.ModuleName,
 		// wasm gas tracking
 		cwfees.ModuleName, // depends on wasmd.
@@ -1203,6 +1216,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 
 func getAcceptedStargateQueries() wasmdKeeper.AcceptedStargateQueries {
 	return wasmdKeeper.AcceptedStargateQueries{
-		"/archway.cwerrors.v1.Query/Errors": &cwerrorsTypes.QueryErrorsRequest{},
+		"/archway.cwerrors.v1.Query/Errors":               &cwerrorsTypes.QueryErrorsRequest{},
+		"/archway.callback.v1.Query/EstimateCallbackFees": &callbackTypes.QueryEstimateCallbackFeesRequest{},
 	}
 }

app/app_upgrades.go

@@ -14,7 +14,7 @@ import (
 	upgrade4_0_2 "github.com/archway-network/archway/app/upgrades/4_0_2"
 	upgrade6_0_0 "github.com/archway-network/archway/app/upgrades/6_0_0"
 	upgrade7_0_0 "github.com/archway-network/archway/app/upgrades/7_0_0"
-	upgrade8_0_0 "github.com/archway-network/archway/app/upgrades/8_0_0"
+	upgrade9_0_0 "github.com/archway-network/archway/app/upgrades/9_0_0"
 )
 
 // UPGRADES
@@ -28,7 +28,8 @@ var Upgrades = []upgrades.Upgrade{
 	upgrade4_0_2.Upgrade,      // v4.0.2
 	upgrade6_0_0.Upgrade,      // v6.0.0
 	upgrade7_0_0.Upgrade,      // v7.0.0
-	upgrade8_0_0.Upgrade,      // v8.0.0
+	// upgrade8_0_0.Upgrade,  // v8.0.0: was reserved for a consensus breaking wasmd upgrade
+	upgrade9_0_0.Upgrade, // v9.0.0
 }
 
 func (app *ArchwayApp) RegisterUpgradeHandlers() {

app/keepers/keepers.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/archway-network/archway/x/cwfees"
 
+	ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/keeper"
 	icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper"
 	icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper"
 	ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper"
@@ -52,6 +53,7 @@ type ArchwayKeepers struct {
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
 	IBCKeeper             *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	IBCFeeKeeper          ibcfeekeeper.Keeper
+	IBCHooksKeeper        ibchookskeeper.Keeper
 	ICAControllerKeeper   icacontrollerkeeper.Keeper
 	ICAHostKeeper         icahostkeeper.Keeper
 	EvidenceKeeper        evidencekeeper.Keeper

app/upgrades/8_0_0/upgrades.go → app/upgrades/9_0_0/upgrades.go

@@ -7,18 +7,19 @@ import (
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v8/types"
 
 	"github.com/archway-network/archway/app/keepers"
 	"github.com/archway-network/archway/app/upgrades"
 )
 
-const Name = "v8.0.0"
-const NameAsciiArt = `                          
-             ###     ###     ### 
-     # #     # #     # #     # #    
-     # #     ###     # #     # #   
-      #      # #     # #     # # 
-             ###  #  ###  #  ### 
+const Name = "v9.0.0"
+const NameAsciiArt = `
+             ###     ###     ###
+     # #     # #     # #     # #
+     # #      ##     # #     # #
+      #        #     # #     # #
+             ###  #  ###  #  ###
 
 `
 
@@ -35,5 +36,7 @@ var Upgrade = upgrades.Upgrade{
 			return migrations, nil
 		}
 	},
-	StoreUpgrades: storetypes.StoreUpgrades{},
+	StoreUpgrades: storetypes.StoreUpgrades{
+		Added: []string{ibchookstypes.StoreKey},
+	},
 }

cmd/archwayd/main.go

@@ -14,14 +14,14 @@ import (
 )
 
 const ArchwayASCII = `
- #####   #####     #####   ##   ##  ##   ##   #####    ##  ##  
-#######  #######  #######  ##   ##  ##   ##  #######   ##  ##  
-##   ##       ##  ##   ##  ##   ##  ## # ##  ##   ##   ##  ##  
-##   ##  ######   ##       #### ##  #######  ##   ##    ####   
-#######  ##   ##  ##   ##  ##   ##  #######  #######     ##    
-##   ##  ##   ##  #######  ##   ##  ### ###  ##   ##     ##    
-##   ##  ##   ##   #####   ##   ##  ##   ##  ##   ##     ##    
-                                                               
+ #####   #####     #####   ##   ##  ##   ##   #####    ##  ##
+#######  #######  #######  ##   ##  ##   ##  #######   ##  ##
+##   ##       ##  ##   ##  ##   ##  ## # ##  ##   ##   ##  ##
+##   ##  ######   ##       #### ##  #######  ##   ##    ####
+#######  ##   ##  ##   ##  ##   ##  #######  #######     ##
+##   ##  ##   ##  #######  ##   ##  ### ###  ##   ##     ##
+##   ##  ##   ##   #####   ##   ##  ##   ##  ##   ##     ##
+
 `
 
 func main() {
@@ -30,7 +30,7 @@ func main() {
 	rootCmd.AddCommand(ensureLibWasmVM())
 
 	if err := svrcmd.Execute(rootCmd, "ARCHWAY", app.DefaultNodeHome); err != nil {
-		fmt.Fprintln(rootCmd.OutOrStderr(), err)
+		_, _ = fmt.Fprintln(rootCmd.OutOrStderr(), err)
 		os.Exit(1)
 	}
 }