Merge cce7ae8 into 4afc5cd

regen-network · Jan 29, 2021 · 933d055 · 933d055
2 parents 4afc5cd + cce7ae8
commit 933d055
Show file tree

Hide file tree

Showing 75 changed files with 24,021 additions and 355 deletions.
diff --git a/.gitignore b/.gitignore
@@ -181,6 +181,10 @@ tags
 .idea
 
 build/
+
+# OS
+.DS_Store
+
 /protoc-gen-go-cosmos2/protoc-gen-go-cosmos2
 /proto-tools-stamp
 /tools-stamp
diff --git a/Makefile b/Makefile
@@ -321,15 +321,20 @@ proto-check-breaking-docker:
 	@$(DOCKER_BUF) breaking --against-input $(HTTPS_GIT)#branch=master
 
 GOGO_PROTO_URL   = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
+REGEN_COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
 COSMOS_PROTO_URL   = https://raw.githubusercontent.com/cosmos/cosmos-sdk/master/proto/cosmos
 
 GOGO_PROTO_TYPES    = third_party/proto/gogoproto
+REGEN_COSMOS_PROTO_TYPES  = third_party/proto/cosmos_proto
 COSMOS_PROTO_TYPES    = third_party/proto/cosmos
 
 proto-update-deps:
 	@mkdir -p $(GOGO_PROTO_TYPES)
 	@curl -sSL $(GOGO_PROTO_URL)/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
 
+	@mkdir -p $(REGEN_COSMOS_PROTO_TYPES)
+	@curl -sSL $(REGEN_COSMOS_PROTO_URL)/cosmos.proto > $(REGEN_COSMOS_PROTO_TYPES)/cosmos.proto
+
 	@mkdir -p $(COSMOS_PROTO_TYPES)/base/query/v1beta1/
 	@curl -sSL $(COSMOS_PROTO_URL)/base/query/v1beta1/pagination.proto > $(COSMOS_PROTO_TYPES)/base/query/v1beta1/pagination.proto
 

diff --git a/app/app.go b/app/app.go
@@ -89,10 +89,11 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
 
-	newmodule "github.com/regen-network/regen-ledger/types/module"
+	moduletypes "github.com/regen-network/regen-ledger/types/module"
 	servermodule "github.com/regen-network/regen-ledger/types/module/server"
 	data "github.com/regen-network/regen-ledger/x/data/module"
 	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/module"
+	group "github.com/regen-network/regen-ledger/x/group/module"
 )
 
 const (
@@ -130,11 +131,13 @@ var (
 		wasm.AppModuleBasic{},
 		ecocredit.Module{},
 		data.Module{},
+		group.Module{},
 	)
 
-	NewModules = []newmodule.Module{
+	NewModules = []moduletypes.Module{
 		ecocredit.Module{},
 		data.Module{},
+		group.Module{},
 	}
 
 	// module account permissions

diff --git a/buf.yaml b/buf.yaml
@@ -12,9 +12,11 @@ lint:
   ignore:
     - cosmos
     - gogoproto
+    - cosmos_proto
 breaking:
   use:
     - FILE
   ignore:
     - cosmos
     - gogoproto
+    - cosmos_proto