feat(callback): cherrypick callback module

app/app.go

@@ -129,6 +129,14 @@
 
 	distr "github.com/dymensionxyz/dymension-rdk/x/dist"
 	distrkeeper "github.com/dymensionxyz/dymension-rdk/x/dist/keeper"
+
+	"github.com/dymensionxyz/rollapp-wasm/x/callback"
+	callbackKeeper "github.com/dymensionxyz/rollapp-wasm/x/callback/keeper"
+	callbackTypes "github.com/dymensionxyz/rollapp-wasm/x/callback/types"
+
+	"github.com/dymensionxyz/rollapp-wasm/x/cwerrors"
+	cwerrorsKeeper "github.com/dymensionxyz/rollapp-wasm/x/cwerrors/keeper"
+	cwerrorsTypes "github.com/dymensionxyz/rollapp-wasm/x/cwerrors/types"
 )
 
 const (
@@ -148,7 +156,8 @@
 		ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		wasmtypes.StoreKey, gaslesstypes.StoreKey,
 		denommetadatamoduletypes.StoreKey,
-		hubgentypes.StoreKey,
+		callbackTypes.StoreKey,
+		cwerrorsTypes.StoreKey,
 	}
 )
 
@@ -195,6 +204,8 @@
 		hubgenesis.AppModuleBasic{},
 		wasm.AppModuleBasic{},
 		denommetadata.AppModuleBasic{},
+		callback.AppModuleBasic{},
+		cwerrors.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -211,10 +222,11 @@
 		hubgentypes.ModuleName:              {authtypes.Minter},
 		denommetadatamoduletypes.ModuleName: nil,
 		gaslesstypes.ModuleName:             nil,
+		callbackTypes.ModuleName:       nil,
 	}
 
 	// module accounts that are allowed to receive tokens
 	maccCanReceiveTokens = []string{
 		distrtypes.ModuleName,
 		hubgentypes.ModuleName,
 	}
@@ -270,6 +282,8 @@
 	WasmKeeper       wasmkeeper.Keeper
 	FeeGrantKeeper   feegrantkeeper.Keeper
 	GaslessKeeper    gaslesskeeper.Keeper
+	CallbackKeeper   callbackKeeper.Keeper
+	CWErrorsKeeper   cwerrorsKeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -322,7 +336,7 @@
 	keys := sdk.NewKVStoreKeys(
 		kvstorekeys...,
 	)
-	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
+	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey, cwerrorsTypes.TStoreKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
 
 	// load state streaming if enabled
@@ -506,6 +520,21 @@
 		app.AccountKeeper,
 	)
 
+	app.CallbackKeeper = callbackKeeper.NewKeeper(
+		appCodec,
+		keys[callbackTypes.StoreKey],
+		&app.WasmKeeper,
+		app.BankKeeper,
+	)
+
+	app.CWErrorsKeeper = cwerrorsKeeper.NewKeeper(
+		appCodec,
+		keys[cwerrorsTypes.StoreKey],
+		tkeys[cwerrorsTypes.TStoreKey],
+		&app.WasmKeeper,
+		app.BankKeeper,
+	)
+
 	wasmDir := filepath.Join(homePath, "wasm")
 	wasmConfig, err := wasm.ReadWasmConfig(appOpts)
 	if err != nil {
@@ -517,6 +546,11 @@
 		govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, enabledProposals))
 	}
 
+	// Include the x/cwerrors query to stargate queries
+	wasmOpts = append(wasmOpts, wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{
+		Stargate: wasmkeeper.AcceptListStargateQuerier(getAcceptedStargateQueries(), app.GRPCQueryRouter(), appCodec),
+	}))
+
 	// The last arguments can contain custom message handlers, and custom query handlers,
 	// if we want to allow any custom callbacks
 	availableCapabilities := strings.Join(AllCapabilities(), ",")
@@ -587,6 +621,8 @@
 		upgrade.NewAppModule(app.UpgradeKeeper),
 		hubgenesis.NewAppModule(appCodec, app.HubGenesisKeeper, app.AccountKeeper),
 		denommetadata.NewAppModule(app.DenomMetadataKeeper, app.BankKeeper),
+		callback.NewAppModule(app.appCodec, app.CallbackKeeper, app.WasmKeeper, app.CWErrorsKeeper),
+		cwerrors.NewAppModule(app.appCodec, app.CWErrorsKeeper, app.WasmKeeper),
 	}
 
 	app.mm = module.NewManager(modules...)
@@ -618,6 +654,8 @@
 		hubgentypes.ModuleName,
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
+		callbackTypes.ModuleName,
+		cwerrorsTypes.ModuleName, // does not have begin blocker
 	}
 	app.mm.SetOrderBeginBlockers(beginBlockersList...)
 
@@ -643,6 +681,8 @@
 		hubgentypes.ModuleName,
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
+		callbackTypes.ModuleName,
+		cwerrorsTypes.ModuleName,
 	}
 	app.mm.SetOrderEndBlockers(endBlockersList...)
 
@@ -674,6 +714,8 @@
 		hubgentypes.ModuleName,
 		denommetadatamoduletypes.ModuleName,
 		wasm.ModuleName,
+		callbackTypes.ModuleName,
+		cwerrorsTypes.ModuleName,
 	}
 	app.mm.SetOrderInitGenesis(initGenesisList...)
 
@@ -1008,5 +1050,13 @@
 	paramsKeeper.Subspace(gaslesstypes.ModuleName)
 
 	paramsKeeper.Subspace(wasmtypes.ModuleName)
+	paramsKeeper.Subspace(callbackTypes.ModuleName)
+	paramsKeeper.Subspace(cwerrorsTypes.ModuleName)
 	return paramsKeeper
 }
+
+func getAcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries {
+	return wasmkeeper.AcceptedStargateQueries{
+		"/rollapp.cwerrors.v1.Query/Errors": &cwerrorsTypes.QueryErrorsRequest{},
+	}
+}

app/test_app.go

@@ -0,0 +1,36 @@
+package app
+
+import (
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmtypes "github.com/tendermint/tendermint/types"
+	"time"
+
+	// unnamed import of statik for swagger UI support
+	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
+)
+
+var DefaultConsensusParams = &abci.ConsensusParams{
+	Block: &abci.BlockParams{
+		MaxBytes: 200000,
+		MaxGas:   -1,
+	},
+	Evidence: &tmproto.EvidenceParams{
+		MaxAgeNumBlocks: 302400,
+		MaxAgeDuration:  504 * time.Hour, // 3 weeks is the max duration
+		MaxBytes:        10000,
+	},
+	Validator: &tmproto.ValidatorParams{
+		PubKeyTypes: []string{
+			tmtypes.ABCIPubKeyTypeEd25519,
+		},
+	},
+}
+
+// EmptyAppOptions is a stub implementing AppOptions
+type EmptyAppOptions struct{}
+
+// Get implements AppOptions
+func (ao EmptyAppOptions) Get(o string) interface{} {
+	return nil
+}

app/wasm.go

@@ -43,5 +43,6 @@ func AllCapabilities() []string {
 		"stargate",
 		"cosmwasm_1_1",
 		"cosmwasm_1_2",
+		"cosmwasm_1_3",
 	}
 }

contracts/callback-test/.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.rs]
+indent_size = 4

contracts/callback-test/.gitignore

@@ -0,0 +1,16 @@
+# Build results
+/target
+/schema
+
+# Cargo+Git helper file (https://github.com/rust-lang/cargo/blob/0.44.1/src/cargo/sources/git/utils.rs#L320-L327)
+.cargo-ok
+
+# Text file backups
+**/*.rs.bk
+
+# macOS
+.DS_Store
+
+# IDEs
+*.iml
+.idea