Merge branch 'cosmos/v0.46.x' of /~https://github.com/forbole/bdjuno in…

…to chains/regen/mainnet

.github/workflows/docker-build.yml

@@ -3,27 +3,25 @@ name: docker-build
 on:
   push:
     branches:
+      - cosmos/*/*
       - chains/*/*
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - 
-        name: Set bdjuno chain_name
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Set BDJuno chain name 🔧
         shell: bash
         run: echo "CHAIN_NAME=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')" >> $GITHUB_ENV
-      -
-        name: Set bdjuno version
+
+      - name: Set BDJuno version 🔧
         shell: bash
         run: echo "GITHUB_VERSION=$(git describe --tags)" >> $GITHUB_ENV
-      -
-        name: Prepare tags
+
+      - name: Prepare tags 🏷️
         id: prep
         run: |
           DOCKER_IMAGE=${{ secrets.DOCKERHUB_BDJUNO_REPO }}
@@ -33,26 +31,27 @@ jobs:
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      - name: Determine Dockerfile to use
+
+      - name: Determine Dockerfile to use 🔍
         run: |
           if [[ -f Dockerfile.cosmwasm ]]; then
             export DOCKERFILE=Dockerfile.cosmwasm
           else
             export DOCKERFILE=Dockerfile.default
           fi
           echo "DOCKERFILE=${DOCKERFILE}" >> $GITHUB_ENV
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
+
+      - name: Set up Docker Buildx 🧰
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub 👤
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v4
+
+      - name: Build and push 📤
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: "./${{ env.DOCKERFILE }}"

.github/workflows/lint-pr.yml

@@ -11,6 +11,6 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5.2.0
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -5,25 +5,29 @@ name: Lint
 on:
   pull_request:
   push:
-    branches:
-      - master
 
 jobs:
   GolangCI:
     name: golangci-lint
     runs-on: ubuntu-latest
-    timeout-minutes: 6
+    timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
-      - uses: technote-space/get-diff-action@v6.1.2
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Go 🧰
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+
+      - name: Compute diff 📜
+        uses: technote-space/get-diff-action@v6.1.2
         with:
           SUFFIX_FILTER: |
             .go
             .mod
             .sum
-      - uses: golangci/golangci-lint-action@v3.4.0
-        with:
-          version: v1.51.1
-          args: --timeout 10m
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run lint ✅
         if: "env.GIT_DIFF != ''"
+        run: make lint

.github/workflows/test.yml

@@ -4,8 +4,6 @@ name: Tests
 on:
   pull_request:
   push:
-    branches:
-      - master
 
 jobs:
   Cleanup-runs:
@@ -14,21 +12,38 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/cosmos')"
 
   Unit-tests:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Go
-        uses: actions/setup-go@v4
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Go 🧰
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+
+      - name: Compute diff 📜
+        uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
         with:
-          go-version: 1.19
-      - name: Test & Create coverage report
-        run: make install test-unit stop-docker-test
-      - name: Upload cove coverage
-        uses: codecov/codecov-action@v3
+          SUFFIX_FILTER: |
+            .go
+            .mod
+            .sum
+
+      - name: Build 🔨
+        if: "env.GIT_DIFF != ''"
+        run: make build
+
+      - name: Test & Coverage report creation 🧪
+        run: make test-unit stop-docker-test
+
+      - name: Upload coverage 📤
+        if: "env.GIT_DIFF != ''"
+        uses: codecov/codecov-action@v4.0.1
         with:
           file: ./coverage.txt

.golangci.yaml

@@ -8,7 +8,6 @@ linters:
   enable:
     - bodyclose
     - deadcode
-    - depguard
     - dogsled
     - gocritic
     - gofmt

CHANGELOG.md

@@ -1,4 +1,6 @@
 ## Unreleased
+- ([\#702](/~https://github.com/forbole/bdjuno/pull/702)) Add `message_type` module and store msg types inside `message_type` table, add `messages_by_type` function to allow to query messages by their types
+
 ### Changes
 
 #### CI
@@ -21,7 +23,8 @@
 - ([\#489](/~https://github.com/forbole/bdjuno/pull/489)) Remove block height foreign key from proposal_vote and proposal_deposit tables and add column timestamp
 - ([\#499](/~https://github.com/forbole/bdjuno/pull/499)) Check if proposal has passed voting end time before marking it invalid
 - ([\#523](/~https://github.com/forbole/bdjuno/pull/523)) Update proposal snapshots handling on block
-
+- ([\#681](/~https://github.com/forbole/bdjuno/pull/681)) Handle proposal status change from deposit to voting
+- 
 #### Daily refetch
 - ([\#454](/~https://github.com/forbole/bdjuno/pull/454)) Added `daily refetch` module to refetch missing blocks every day
 

Dockerfile.cosmwasm

@@ -1,6 +1,6 @@
 
 
-FROM golang:1.19-alpine AS builder
+FROM golang:1.21-alpine AS builder
 RUN apk update && apk add --no-cache make git
 WORKDIR /go/src/github.com/forbole/bdjuno
 COPY . ./

Dockerfile.default

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine AS builder
+FROM golang:1.21-alpine AS builder
 RUN apk update && apk add --no-cache make git
 WORKDIR /go/src/github.com/forbole/bdjuno
 COPY . ./

Makefile

@@ -68,17 +68,25 @@ test-unit: start-docker-test
 	@go test -mod=readonly -v -coverprofile coverage.txt ./...
 .PHONY: test-unit
 
+###############################################################################
+###                                Linting                                  ###
+###############################################################################
+golangci_lint_cmd=github.com/golangci/golangci-lint/cmd/golangci-lint
+
 lint:
-	golangci-lint run --out-format=tab
+	@echo "--> Running linter"
+	@go run $(golangci_lint_cmd) run --timeout=10m
 
 lint-fix:
-	golangci-lint run --fix --out-format=tab --issues-exit-code=0
+	@echo "--> Running linter"
+	@go run $(golangci_lint_cmd) run --fix --out-format=tab --issues-exit-code=0
+
 .PHONY: lint lint-fix
 
 format:
-	find . -name '*.go' -type f -not -path "*.git*" | xargs gofmt -w -s
-	find . -name '*.go' -type f -not -path "*.git*" | xargs misspell -w
-	find . -name '*.go' -type f -not -path "*.git*" | xargs goimports -w -local github.com/forbole/bdjuno
+	find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*_mocks.go' | xargs gofmt -w -s
+	find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*_mocks.go' | xargs misspell -w
+	find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*_mocks.go' | xargs goimports -w -local github.com/forbole/bdjuno
 .PHONY: format
 
 clean:

cmd/migrate/cmd.go

@@ -8,13 +8,15 @@ import (
 	"github.com/spf13/cobra"
 
 	v3 "github.com/forbole/bdjuno/v4/cmd/migrate/v3"
+	v5 "github.com/forbole/bdjuno/v4/cmd/migrate/v5"
 )
 
 type Migrator func(parseCfg *parsecmdtypes.Config) error
 
 var (
 	migrations = map[string]Migrator{
 		"v3": v3.RunMigration,
+		"v5": v5.RunMigration,
 	}
 )
 

cmd/migrate/v5/migrate.go

@@ -0,0 +1,43 @@
+package v5
+
+import (
+	"fmt"
+
+	v5db "github.com/forbole/bdjuno/v4/database/migrate/v5"
+	parse "github.com/forbole/juno/v5/cmd/parse/types"
+	"github.com/forbole/juno/v5/database"
+	"github.com/forbole/juno/v5/database/postgresql"
+	"github.com/forbole/juno/v5/types/config"
+)
+
+// RunMigration runs the migrations to v5
+func RunMigration(parseConfig *parse.Config) error {
+	cfg, err := GetConfig()
+	if err != nil {
+		return fmt.Errorf("error while reading config: %s", err)
+	}
+
+	// Migrate the database
+	err = migrateDb(cfg, parseConfig)
+	if err != nil {
+		return fmt.Errorf("error while migrating database: %s", err)
+	}
+
+	return nil
+}
+
+func migrateDb(cfg config.Config, parseConfig *parse.Config) error {
+	// Build the codec
+	encodingConfig := parseConfig.GetEncodingConfigBuilder()()
+
+	// Get the db
+	databaseCtx := database.NewContext(cfg.Database, &encodingConfig, parseConfig.GetLogger())
+	db, err := postgresql.Builder(databaseCtx)
+	if err != nil {
+		return fmt.Errorf("error while building the db: %s", err)
+	}
+
+	// Build the migrator and perform the migrations
+	migrator := v5db.NewMigrator(db.(*postgresql.Database))
+	return migrator.Migrate()
+}

cmd/migrate/v5/utils.go

@@ -0,0 +1,29 @@
+package v5
+
+import (
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/forbole/juno/v5/types/config"
+	"gopkg.in/yaml.v3"
+)
+
+// GetConfig returns the configuration reading it from the config.yaml file present inside the home directory
+func GetConfig() (config.Config, error) {
+	file := path.Join(config.HomePath, "config.yaml")
+
+	// Make sure the path exists
+	if _, err := os.Stat(file); os.IsNotExist(err) {
+		return config.Config{}, fmt.Errorf("config file does not exist")
+	}
+
+	bz, err := os.ReadFile(file)
+	if err != nil {
+		return config.Config{}, fmt.Errorf("error while reading config file: %s", err)
+	}
+
+	var cfg config.Config
+	err = yaml.Unmarshal(bz, &cfg)
+	return cfg, err
+}

database/auth.go

@@ -174,4 +174,4 @@ func (db *Db) GetAccounts() ([]string, error) {
 	var rows []string
 	err := db.Sqlx.Select(&rows, `SELECT address FROM account`)
 	return rows, err
-}
+}

database/database_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cheqd/cheqd-node/simapp"
 	dbconfig "github.com/forbole/juno/v5/database/config"
 	"github.com/forbole/juno/v5/logging"
 
@@ -46,6 +47,10 @@ func (suite *DbTestSuite) SetupTest() {
 	// Build the database
 	dbCfg := dbconfig.NewDatabaseConfig(
 		"postgresql://bdjuno:password@localhost:6433/bdjuno?sslmode=disable&search_path=public",
+		"",
+		"",
+		"",
+		"",
 		-1,
 		-1,
 		100000,

database/feegrant_test.go

@@ -37,7 +37,7 @@ func (suite *DbTestSuite) TestBigDipperDb_SaveFeeGrantAllowance() {
 	suite.Require().Equal(rows[0].Height, int64(121622))
 
 	var stored feegranttypes.FeeAllowanceI
-	err = suite.database.EncodingConfig.Codec.UnmarshalInterfaceJSON([]byte(rows[0].Allowance), &stored)
+	err = suite.database.Cdc.UnmarshalInterfaceJSON([]byte(rows[0].Allowance), &stored)
 	suite.Require().NoError(err)
 	suite.Require().Equal(allowance, stored)
 }

database/gov_test.go

@@ -105,7 +105,7 @@ func (suite *DbTestSuite) encodeProposalContent(content govtypesv1beta1.Content)
 	anyContent, err := codectypes.NewAnyWithValue(protoContent)
 	suite.Require().NoError(err)
 
-	contentBz, err := suite.database.EncodingConfig.Codec.MarshalJSON(anyContent)
+	contentBz, err := suite.database.Cdc.MarshalJSON(anyContent)
 	suite.Require().NoError(err)
 
 	return string(contentBz)