feat: sdk-47

refs akash-network/support#212

Signed-off-by: Artur Troian <troian.ap@gmail.com>

.env

@@ -12,6 +12,7 @@ AKASH_TS_ROOT=${AKASH_ROOT}/ts
 AKASH_TS_PACKAGE_FILE=${AKASH_TS_ROOT}/package.json
 AKASH_TS_NODE_MODULES=${AKASH_TS_ROOT}/node_modules
 AKASH_TS_NODE_BIN=${AKASH_TS_NODE_MODULES}/.bin
-AKASH_DEVCACHE_TS_TMP=${AKASH_DEVCACHE_BASE}/tmp/ts
-AKASH_DEVCACHE_TS_TMP_GRPC_JS=${AKASH_DEVCACHE_TS_TMP}/generated-grpc-js
-AKASH_DEVCACHE_TS_TMP_PATCHES=${AKASH_DEVCACHE_TS_TMP}/patches
+AKASH_DEVCACHE_TMP=${AKASH_DEVCACHE_BASE}/tmp
+AKASH_DEVCACHE_TMP_TS=${AKASH_DEVCACHE_TMP}/ts
+AKASH_DEVCACHE_TMP_TS_GRPC_JS=${AKASH_DEVCACHE_TMP_TS}/generated-grpc-js
+AKASH_DEVCACHE_TMP_TS_PATCHES=${AKASH_DEVCACHE_TMP_TS}/patches

.golangci.yaml

@@ -6,11 +6,11 @@ issues:
 
 # Skip generated k8s code
 run:
-  skip-dirs:
+  exclude-dirs:
     - "^go/node/types/v1beta1"
     - "^go/node/types/v1beta2"
     - "^go/node/market/v1beta3"
-  skip-files:
+  exclude-files:
     - "\\.pb\\.go$"
     - "\\.pb\\.gw\\.go$"
   # Skip vendor/ etc

Makefile

@@ -1,6 +1,5 @@
 UNAME_OS              := $(shell uname -s)
 UNAME_ARCH            := $(shell uname -m)
-PROTO_LEGACY          ?= true
 
 ifeq (0, $(shell id -u))
 $(warning "make was started with superuser privileges. it may cause issues with direnv")
@@ -24,23 +23,25 @@ ifeq (, $(GOTOOLCHAIN))
 $(error "GOTOOLCHAIN is not set")
 endif
 
+GO_PKG                       := sdk
+TS_PKG                       := ts
+
 GO                           := GO111MODULE=$(GO111MODULE) go
-GO_MOD_NAME                  := $(shell go list -m 2>/dev/null)
+GO_MOD_NAME                  := $(shell cd $(GO_PKG); go list -m 2>/dev/null)
 
 BUF_VERSION                     ?= 1.28.1
-PROTOC_VERSION                  ?= 21.12
-GOGOPROTO_VERSION               ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/cosmos/gogoproto)
-# TODO https://github.com/akash-network/support/issues/77
-PROTOC_GEN_GOCOSMOS_VERSION     ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/regen-network/cosmos-proto)
-PROTOC_GEN_GO_PULSAR_VERSION    ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/cosmos/cosmos-proto)
-PROTOC_GEN_GO_VERSION           ?= $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' google.golang.org/protobuf)
-PROTOC_GEN_GRPC_GATEWAY_VERSION := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/grpc-ecosystem/grpc-gateway)
-PROTOC_GEN_DOC_VERSION          := $(shell $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/pseudomuto/protoc-gen-doc)
+PROTOC_VERSION                  ?= 26.1
+GOGOPROTO_VERSION               ?= $(shell cd $(GO_PKG); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/cosmos/gogoproto)
+PROTOC_GEN_GOCOSMOS_VERSION     ?= $(GOGOPROTO_VERSION)
+PROTOC_GEN_GO_PULSAR_VERSION    ?= $(shell cd $(GO_PKG); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/cosmos/cosmos-proto)
+PROTOC_GEN_GO_VERSION           ?= $(shell cd $(GO_PKG); $(GO) list -mod=readonly -m -f '{{ .Version }}' google.golang.org/protobuf)
+PROTOC_GEN_GRPC_GATEWAY_VERSION := $(shell cd $(GO_PKG); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/grpc-ecosystem/grpc-gateway)
+PROTOC_GEN_DOC_VERSION          := $(shell cd $(GO_PKG); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/pseudomuto/protoc-gen-doc)
 
 PROTOC_GEN_SWAGGER_VERSION      := $(PROTOC_GEN_GRPC_GATEWAY_VERSION)
 MODVENDOR_VERSION               ?= v0.5.0
 MOCKERY_VERSION                 ?= 2.42.0
-GOLANGCI_LINT_VERSION           ?= v1.56.1
+GOLANGCI_LINT_VERSION           ?= v1.58.0
 
 BUF_VERSION_FILE                     := $(AKASH_DEVCACHE_VERSIONS)/buf/$(BUF_VERSION)
 PROTOC_VERSION_FILE                  := $(AKASH_DEVCACHE_VERSIONS)/protoc/$(PROTOC_VERSION)
@@ -58,8 +59,8 @@ GOLANGCI_LINT_VERSION_FILE           := $(AKASH_DEVCACHE_VERSIONS)/golangci-lint
 
 BUF                              := $(AKASH_DEVCACHE_BIN)/buf
 PROTOC                           := $(AKASH_DEVCACHE_BIN)/protoc
-# TODO https://github.com/akash-network/support/issues/77
-PROTOC_GEN_GOCOSMOS              := $(AKASH_DEVCACHE_BIN)/legacy/protoc-gen-gocosmos
+PROTOC_GEN_GOCOSMOS              := $(AKASH_DEVCACHE_BIN)/protoc-gen-gocosmos
+GOGOPROTO                        := $(AKASH_DEVCACHE_BIN)/gogoproto
 PROTOC_GEN_GO_PULSAR             := $(AKASH_DEVCACHE_BIN)/protoc-gen-go-pulsar
 PROTOC_GEN_GO                    := $(AKASH_DEVCACHE_BIN)/protoc-gen-go
 PROTOC_GEN_GRPC_GATEWAY          := $(AKASH_DEVCACHE_BIN)/protoc-gen-grpc-gateway

buf.gen.ts.yaml

@@ -0,0 +1,6 @@
+version: v1
+plugins:
+  - name: ts
+    out: ./ts/src/generated
+    strategy: all
+    path: ./ts/node_modules/.bin/protoc-gen-ts_proto

buf.work.yaml

@@ -3,5 +3,3 @@ directories:
   - proto/node
   - proto/provider
   - .cache/include
-  - vendor/github.com/cosmos/cosmos-sdk/proto
-  - vendor/github.com/cosmos/cosmos-sdk/third_party/proto

docs/config.yaml

@@ -4,13 +4,13 @@ info:
   description: "A REST interface for state queries"
   version: "1.0.0"
 apis:
-  - url: "./.cache/tmp/swagger-gen/akash/audit/v1beta3/query.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/cert/v1beta3/query.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/deployment/v1beta3/query.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/deployment/v1beta3/service.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta3/query.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta3/service.swagger.json"
-  - url: "./.cache/tmp/swagger-gen/akash/provider/v1beta3/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/audit/v1/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/cert/v1/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/deployment/v1beta4/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/deployment/v1beta4/service.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta5/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta5/service.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/provider/v1beta4/query.swagger.json"
   - url: "./vendor/github.com/cosmos/cosmos-sdk/client/docs/swagger-ui/swagger.yaml"
     dereference:
       circular: "ignore"