Marker ics20 hooks

CHANGELOG.md

@@ -51,6 +51,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
   Holds are also reflected in the `x/bank` module's `SpendableBalances` query.
 * Add new MaxSupply param to marker module and deprecate MaxTotalSupply. [#1292](https://github.com/provenance-io/provenance/issues/1292).
 * Add hidden docgen command to output documentation in different formats. [#1468](https://github.com/provenance-io/provenance/issues/1468).
+* Add ics20 marker creation for receiving marker via ibc sends [#1127](https://github.com/provenance-io/provenance/issues/1127).
 
 ### Improvements
 

app/app.go

@@ -329,6 +329,8 @@ type App struct {
 
 	TransferStack    *ibchooks.IBCMiddleware
 	Ics20WasmHooks   *ibchooks.WasmHooks
+	Ics20MarkerHooks *ibchooks.MarkerHooks
+	IbcHooks         *ibchooks.IbcHooks
 	HooksICS4Wrapper ibchooks.ICS4Middleware
 
 	// the module manager
@@ -509,9 +511,14 @@ func New(
 	addrPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix()        // We use this approach so running tests which use "cosmos" will work while we use "pb"
 	wasmHooks := ibchooks.NewWasmHooks(&hooksKeeper, nil, addrPrefix) // The contract keeper needs to be set later
 	app.Ics20WasmHooks = &wasmHooks
+	markerHooks := ibchooks.NewMarkerHooks(nil)
+	app.Ics20MarkerHooks = &markerHooks
+	ibcHooks := ibchooks.NewIbcHooks(appCodec, &hooksKeeper, app.IBCKeeper, app.Ics20WasmHooks, app.Ics20MarkerHooks, nil)
+	app.IbcHooks = &ibcHooks
+
 	app.HooksICS4Wrapper = ibchooks.NewICS4Middleware(
 		app.IBCKeeper.ChannelKeeper,
-		app.Ics20WasmHooks,
+		app.IbcHooks,
 	)
 
 	// Create Transfer Keepers
@@ -641,6 +648,9 @@ func New(
 	app.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper)
 	app.Ics20WasmHooks.ContractKeeper = app.WasmKeeper // app.ContractKeeper -- this changes in the next version of wasm to a permissioned keeper
 	app.IBCHooksKeeper.ContractKeeper = app.ContractKeeper
+	app.Ics20MarkerHooks.MarkerKeeper = &app.MarkerKeeper
+
+	app.IbcHooks.SendPacketPreProcessors = []ibchookstypes.PreSendPacketDataProcessingFn{app.Ics20MarkerHooks.ProcessMarkerMemoFn, app.Ics20WasmHooks.GetWasmSendPacketPreProcessor}
 
 	app.ScopedOracleKeeper = scopedOracleKeeper
 	app.OracleKeeper = *oraclekeeper.NewKeeper(