(WIP)feat: sdk-47

.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

.envrc

@@ -2,7 +2,6 @@ AKASH_ROOT=$(pwd)
 export AKASH_ROOT
 
 dotenv
-dotenv_if_exists dev.env
 
 TOOLS=${AKASH_ROOT}/script/tools.sh
 SEMVER=${AKASH_ROOT}/script/semver.sh
@@ -19,6 +18,15 @@ fi
 
 AKASH_DIRENV_SET=1
 
+dotenv_if_exists dev.env
+
+if [[ ${GOWORK} != "off" ]] && [[ -f go.work ]]; then
+	GOWORK=${AKASH_ROOT}/go.work
+else
+	GOWORK=off
+fi
+
+export TOOLS
 export SEMVER
 export GOTOOLCHAIN
 export GOTOOLCHAIN_SEMVER

.gitignore

@@ -13,7 +13,7 @@
 vendor/
 
 # Go workspace file
-go.work
+go.work*
 
 # coverage
 coverage.txt

.golangci.yaml

@@ -6,11 +6,8 @@ issues:
 
 # Skip generated k8s code
 run:
-  skip-dirs:
-    - "^go/node/types/v1beta1"
-    - "^go/node/types/v1beta2"
-    - "^go/node/market/v1beta3"
-  skip-files:
+  exclude-dirs:
+  exclude-files:
     - "\\.pb\\.go$"
     - "\\.pb\\.gw\\.go$"
   # Skip vendor/ etc
@@ -29,7 +26,7 @@ linters:
     - staticcheck
     - revive
     - gosec
-    - exportloopref
+    - copyloopvar
     - prealloc
 linters-settings:
   gocritic:

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,52 @@ ifeq (, $(GOTOOLCHAIN))
 $(error "GOTOOLCHAIN is not set")
 endif
 
+ifeq ($(GO111MODULE),off)
+else
+	GOMOD=readonly
+endif
+
+ifneq ($(GOWORK),off)
+	ifeq ($(shell test -e ${AKASH_ROOT}/go/go.work && echo -n yes),yes)
+		GOWORK=${AKASH_ROOT}/go/go.work
+	else
+		GOWORK=off
+	endif
+endif
+
+ifneq ($(GOWORK),off)
+	ifeq ($(GOMOD),$(filter $(GOMOD),mod ""))
+$(error '-mod may only be set to readonly or vendor when in workspace mode, but it is set to ""')
+	endif
+endif
+
+ifeq ($(GOMOD),vendor)
+	ifneq ($(wildcard ./vendor/.),)
+$(error "go -mod is in vendor mode but vendor dir has not been found. consider to run go mod vendor")
+	endif
+endif
+
+GO_ROOT                       := go
+TS_ROOT                       := $(AKASH_TS_ROOT)
+
+BUMP_MOD                      ?=
+
 GO                           := GO111MODULE=$(GO111MODULE) go
-GO_MOD_NAME                  := $(shell 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)
+GO_MOD_NAME                  := $(shell cd $(GO_ROOT); GOWORK=off go list -m 2>/dev/null)
+
+BUF_VERSION                     ?= 1.38.0
+PROTOC_VERSION                  ?= 26.1
+GOGOPROTO_VERSION               ?= $(shell cd $(GO_ROOT); $(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_ROOT); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/cosmos/cosmos-proto)
+PROTOC_GEN_GO_VERSION           ?= $(shell cd $(GO_ROOT); $(GO) list -mod=readonly -m -f '{{ .Version }}' google.golang.org/protobuf)
+PROTOC_GEN_GRPC_GATEWAY_VERSION := $(shell cd $(GO_ROOT); $(GO) list -mod=readonly -m -f '{{ .Version }}' github.com/grpc-ecosystem/grpc-gateway)
+PROTOC_GEN_DOC_VERSION          := $(shell cd $(GO_ROOT); $(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
+MOCKERY_VERSION                 ?= 2.45.0
+GOLANGCI_LINT_VERSION           ?= v1.60.3
 
 BUF_VERSION_FILE                     := $(AKASH_DEVCACHE_VERSIONS)/buf/$(BUF_VERSION)
 PROTOC_VERSION_FILE                  := $(AKASH_DEVCACHE_VERSIONS)/protoc/$(PROTOC_VERSION)
@@ -58,8 +86,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
@@ -72,11 +100,14 @@ MOCKERY                          := $(AKASH_DEVCACHE_BIN)/mockery
 GOLANGCI_LINT                    := $(AKASH_DEVCACHE_BIN)/golangci-lint
 
 GOLANGCI_LINT_RUN                := $(GOLANGCI_LINT) run
-GOLINT                           := $(GOLANGCI_LINT_RUN) ./... --disable-all --deadline=5m --enable
+GOLINT                           := $(GOLANGCI_LINT_RUN) ./... --disable-all --deadline=10m --enable
 
 DOCKER_RUN            := docker run --rm -v $(shell pwd):/workspace -w /workspace
 DOCKER_BUF            := $(DOCKER_RUN) bufbuild/buf:$(BUF_VERSION)
 
+GO_MODULES            ?= $(shell find * -name go.mod -exec dirname {} \;)
+GO_TEST_DIRS          ?= ./...
+
 include $(AKASH_ROOT)/make/setup-cache.mk
 include $(AKASH_ROOT)/make/mod.mk
 include $(AKASH_ROOT)/make/test.mk
@@ -85,6 +116,10 @@ include $(AKASH_ROOT)/make/lint.mk
 include $(AKASH_ROOT)/make/release-ts.mk
 include $(AKASH_ROOT)/make/code-style.mk
 
+.PHONY: bump-%
+bump-%:
+	@./script/tools.sh bump "$*" "$(BUMP_MOD)"
+
 .PHONY: clean
 clean:
 	rm -rf $(AKASH_DEVCACHE)

buf.gen.ts.yaml

@@ -0,0 +1,11 @@
+version: v1
+plugins:
+  - name: ts
+    strategy: all
+    path: ./ts/node_modules/.bin/protoc-gen-ts_proto
+    out: ./ts/src/generated
+    opt: "esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputIndex=true"
+  - name: grpc-gateway-ts
+    path: ./ts/node_modules/.bin/protoc-gen-ts_proto
+    out: ./.cache/tmp/ts/generated-grpc-js
+    opt: "esModuleInterop=true,forceLong=long,outputTypeRegistry=true,useExactTypes=false,outputServices=grpc-js"

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

@@ -1,16 +1,28 @@
+---
 swagger: '2.0'
 info:
   title: "AKASH - gRPC Gateway docs"
   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: "./vendor/github.com/cosmos/cosmos-sdk/client/docs/swagger-ui/swagger.yaml"
+  - 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"
+    operationIds:
+      rename:
+        Params: DeploymentParams
+  - url: "./.cache/tmp/swagger-gen/akash/deployment/v1beta4/service.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta5/query.swagger.json"
+    operationIds:
+      rename:
+        Params: MarketParams
+  - url: "./.cache/tmp/swagger-gen/akash/market/v1beta5/service.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/provider/v1beta4/query.swagger.json"
+  - url: "./.cache/tmp/swagger-gen/akash/take/v1/query.swagger.json"
+    operationIds:
+      rename:
+        Params: TakeParams
+  - url: "./.cache/tmp/swagger-gen/akash/take/v1/service.swagger.json"
+  - url: "./go/vendor/github.com/cosmos/cosmos-sdk/client/docs/swagger-ui/swagger.yaml"
     dereference:
       circular: "ignore"