Implement ADR 033

app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	servermodule "github.com/regen-network/regen-ledger/types/module/server"
 	"io"
 	"math/big"
 	"net/http"
@@ -87,6 +88,7 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
+
 	data "github.com/regen-network/regen-ledger/x/data/module"
 	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/module"
 )
@@ -123,9 +125,9 @@ var (
 		evidence.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		vesting.AppModuleBasic{},
-		data.AppModuleBasic{},
 		wasm.AppModuleBasic{},
-		ecocredit.AppModuleBasic{},
+		ecocredit.Module{},
+		data.Module{},
 	)
 
 	// module account permissions
@@ -213,7 +215,7 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
-		data.StoreKey, ecocredit.StoreKey, wasm.StoreKey,
+		wasm.StoreKey,
 	)
 
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -345,6 +347,20 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		&stakingKeeper, govRouter,
 	)
 
+	/* New Module Wiring START */
+	newModuleManager := servermodule.NewManager(app.BaseApp, codec.NewProtoCodec(interfaceRegistry))
+
+	err := newModuleManager.RegisterModules(ModuleBasics)
+	if err != nil {
+		panic(err)
+	}
+
+	err = newModuleManager.CompleteInitialization()
+	if err != nil {
+		panic(err)
+	}
+	/* New Module Wiring END */
+
 	app.mm = module.NewManager(
 		genutil.NewAppModule(
 			app.AccountKeeper, app.StakingKeeper, app.BaseApp.DeliverTx,
@@ -365,9 +381,7 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		ibc.NewAppModule(app.IBCKeeper),
 		params.NewAppModule(app.ParamsKeeper),
 		transferModule,
-		data.NewAppModule(keys[data.StoreKey]),
 		wasm.NewAppModule(app.wasmKeeper),
-		ecocredit.NewAppModule(keys[ecocredit.StoreKey]),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that

go.mod

@@ -4,17 +4,20 @@ go 1.15
 
 require (
 	github.com/CosmWasm/wasmd v0.12.0-alpha1.0.20201105090402-41cf73dae976
+	github.com/armon/go-metrics v0.3.4
 	github.com/btcsuite/btcutil v1.0.2
 	github.com/cockroachdb/apd/v2 v2.0.2
 	github.com/cosmos/cosmos-sdk v0.40.0-rc2
 	github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25
 	github.com/gogo/protobuf v1.3.1
+	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.15.2
 	github.com/ipfs/go-cid v0.0.7
 	github.com/lib/pq v1.8.0 // indirect
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/rakyll/statik v0.1.7
+	github.com/regen-network/cosmos-proto v0.3.0
 	github.com/spf13/afero v1.3.4 // indirect
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.1
@@ -23,8 +26,9 @@ require (
 	github.com/tendermint/tendermint v0.34.0-rc5
 	github.com/tendermint/tm-db v0.6.2
 	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect
-	google.golang.org/genproto v0.0.0-20201112120144-2985b7af83de // indirect
+	google.golang.org/genproto v0.0.0-20201112120144-2985b7af83de
 	google.golang.org/grpc v1.33.0
+	gopkg.in/yaml.v2 v2.3.0
 )
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4

testutil/server/fixture.go

@@ -27,7 +27,7 @@ type FixtureFactory interface {
 // independent of the backend.
 type Fixture interface {
 
-	// Context is the context.Context to be used with gRPC generated cient code.
+	// Context is the context.Context to be used with gRPC generated client code.
 	Context() context.Context
 
 	// TxConn is the grpc.ClientConnInterface to be used when constructing Msg service clients.

types/address.go

@@ -0,0 +1,13 @@
+package types
+
+import "crypto/sha256"
+
+func AddressHash(prefix string, contents []byte) []byte {
+	preImage := []byte(prefix)
+	if len(contents) != 0 {
+		preImage = append(preImage, 0)
+		preImage = append(preImage, contents...)
+	}
+	sum := sha256.Sum256(preImage)
+	return sum[:20]
+}

types/module/base.go

@@ -0,0 +1,10 @@
+package module
+
+import (
+	"github.com/cosmos/cosmos-sdk/codec/types"
+)
+
+type ModuleBase interface {
+	Name() string
+	RegisterInterfaces(types.InterfaceRegistry)
+}

types/module/client/cli/module.go

@@ -0,0 +1,18 @@
+package cli
+
+import (
+	"encoding/json"
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/regen-network/regen-ledger/types/module"
+	"github.com/spf13/cobra"
+)
+
+type Module interface {
+	module.ModuleBase
+
+	DefaultGenesis(codec.JSONMarshaler) json.RawMessage
+	ValidateGenesis(codec.JSONMarshaler, client.TxEncodingConfig, json.RawMessage) error
+	GetTxCmd() *cobra.Command
+	GetQueryCmd() *cobra.Command
+}

types/module/client/grpc_gateway/module.go

@@ -0,0 +1,13 @@
+package grpc_gateway
+
+import (
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/regen-network/regen-ledger/types/module"
+)
+
+type Module interface {
+	module.ModuleBase
+
+	RegisterGRPCGatewayRoutes(client.Context, *runtime.ServeMux)
+}

types/module/id.go

@@ -0,0 +1,12 @@
+package module
+
+import "github.com/regen-network/regen-ledger/types"
+
+type ModuleID struct {
+	ModuleName string
+	Path       []byte
+}
+
+func (m ModuleID) Address() []byte {
+	return types.AddressHash(m.ModuleName, m.Path)
+}