Merge remote-tracking branch 'origin/rollkit-main' into forma

.github/workflows/codeql.yml

@@ -34,7 +34,7 @@
 #       fail-fast: false
 #       matrix:
 #         language: ["go"]
-#         versions: [1.21.3]
+#         versions: [1.21.6]
 #         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
 #         # Use only 'java' to analyze code written in Java, Kotlin or both
 #         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both

.github/workflows/daily.yml

@@ -8,7 +8,7 @@ jobs:
   docs:
     strategy:
       matrix:
-        go-version: [1.21.3]
+        go-version: [1.21.6]
         python-version: [3.11.5]
     runs-on: ubuntu-latest
     steps:

.github/workflows/e2e.yml

@@ -36,7 +36,7 @@ jobs:
       matrix:
         docker-type: [base] # Changed docker-version to docker-type for consistency with the Makefile
         os: [polaris-linux-latest]
-        go-version: [1.21.3]
+        go-version: [1.21.6]
         arch: [amd64] # Changed go-arch to arch for consistency with the Makefile
         image-name: ["polard/base:v0.0.0"]
         export-name: [base-image]
@@ -76,7 +76,7 @@ jobs:
         namespace: [cosmos]
         docker-type: [localnet] # Changed docker-version to docker-type for consistency with the Makefile
         os: [polaris-linux-latest]
-        go-version: [1.21.3]
+        go-version: [1.21.6]
         arch: [amd64] # Changed go-arch to arch for consistency with the Makefile
         base-image: [base-image]
         image-name: ["polard/localnet:v0.0.0"]
@@ -123,7 +123,7 @@ jobs:
     strategy:
       matrix:
         os: [polaris-linux-latest]
-        go-version: [1.21.3]
+        go-version: [1.21.6]
         base-image: [base-image]
     runs-on: ${{ matrix.os }}
     steps:
@@ -153,7 +153,7 @@ jobs:
       matrix:
         namespace: ["e2e", "localnet"]
         os: [polaris-linux-latest]
-        go-version: [1.21.3]
+        go-version: [1.21.6]
         base-image: [localnet]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/pipeline.yml

@@ -36,7 +36,7 @@ jobs:
       matrix:
         args: ["build", "lint", "test-unit-race", "test-unit-cover"]
         os: [polaris-linux-latest]
-        go-version: [1.21.3]
+        go-version: [1.21.6]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

.gitignore

@@ -216,6 +216,7 @@ node_modules
 .next
 next-env.d.ts
 .env
+.envrc
 out
 
 # docker test
@@ -237,3 +238,5 @@ artifacts
 
 # integration testing coverage
 coverage-test-unit-cover.txt
+
+.direnv/

build/scripts/cosmos.mk

@@ -14,7 +14,7 @@ TESTAPP_DIR = ./e2e/testapp
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
 # process build tags
-build_tags = netgo
+build_tags = netgo pebbledb
 ifeq ($(LEDGER_ENABLED),true)
 	ifeq ($(OS),Windows_NT)
 	GCCEXE = $(shell where gcc.exe 2> NUL)
@@ -69,8 +69,8 @@ comma := ,
 build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
 
 # process linker flags
-ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \
-		-X github.com/cosmos/cosmos-sdk/version.AppName=simd \
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=polard \
+		-X github.com/cosmos/cosmos-sdk/version.AppName=polard \
 		-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
 		-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"

build/scripts/main.mk

@@ -65,7 +65,7 @@ proto-build:
 # Variables
 DOCKER_TYPE ?= base
 ARCH ?= arm64
-GO_VERSION ?= 1.21.3
+GO_VERSION ?= 1.21.6
 IMAGE_NAME ?= polard
 IMAGE_VERSION ?= v0.0.0
 BASE_IMAGE ?= polard/base:$(IMAGE_VERSION)
@@ -289,7 +289,7 @@ format:
 	@$(MAKE) license-fix buf-lint-fix forge-lint-fix golangci-fix
 
 lint:
-	@$(MAKE) license buf-lint forge-lint golangci gosec
+	@$(MAKE) license forge-lint golangci gosec
 
 
 #################
@@ -370,7 +370,9 @@ protoDir := "proto"
 
 buf-install:
 	@echo "--> Installing buf"
-	@go install github.com/bufbuild/buf/cmd/buf
+	@if [ "$(shell uname)" = "Darwin" ]; then \
+		brew install bufbuild/buf/buf; \
+	fi
 
 buf-lint-fix:
 	@$(MAKE) buf-install