Merge branch 'main' into srene/812-p2p-advertise-option

.github/workflows/changelog.yml

@@ -12,42 +12,66 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 1
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: '18'
 
-      - name: Generate Changelog Update
+      - name: Configure Git
         run: |
-          npm install -g conventional-changelog-cli
-          conventional-changelog -p angular -i CHANGELOG.md -s
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
 
-      - name: Check if "auto-changelog-update" branch exists and update if needed
+      - name: Check if "auto-changelog-update-do-not-create-manually" branch exists
         id: check_branch
         run: |
-          git fetch origin auto-changelog-update:auto-changelog-update --no-tags
-          if git rev-parse --verify --quiet auto-changelog-update; then
-            echo "::set-output name=branch_exists::true"
-            git checkout auto-changelog-update
-            git merge main --no-edit
+          if [ -n "$(git ls-remote --heads origin auto-changelog-update-do-not-create-manually)" ]; then
+            git fetch origin auto-changelog-update-do-not-create-manually
+            echo "branch_exists=true" >> $GITHUB_ENV
           else
-            echo "::set-output name=branch_exists::false"
-            git checkout -b auto-changelog-update
+            echo "branch_exists=false" >> $GITHUB_ENV
           fi
 
-      - name: Create or Update Pull Request
+      - name: Generate Changelog Update and update if branch exists
+        run: |
+          npm install -g conventional-changelog-cli
+          if [ "$branch_exists" == "true" ]; then
+            git checkout auto-changelog-update-do-not-create-manually
+            git merge main --strategy-option theirs --allow-unrelated-histories --no-edit
+            conventional-changelog -p angular -i CHANGELOG.md -s -r 0 --append
+            git add CHANGELOG.md
+            git commit -m "Update CHANGELOG.md [skip ci]"
+            git push origin auto-changelog-update-do-not-create-manually
+            exit 0
+          else
+            git checkout main
+            git checkout -b auto-changelog-update-do-not-create-manually
+            git push origin auto-changelog-update-do-not-create-manually
+            conventional-changelog -p angular -i CHANGELOG.md -s -r 0 --append
+          fi
+
+      - name: Create Pull Request
+        if: env.branch_exists == 'false'
         id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
+          token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "Update CHANGELOG.md [skip ci]"
-          title: "Automated Changelog Update"
+          title: "Chore(changelog): Automated Changelog Update [skip ci]"
           body: "Update the CHANGELOG.md with recent pushes to branch main."
-          branch: "auto-changelog-update"  # Static branch name
+          base: "main"
+          branch: "auto-changelog-update-do-not-create-manually"
           delete-branch: true
-          branch-suffix: none
-      - name: Check if PR needs to be updated
+
+      - name: Check outputs
+        if: env.branch_exists == 'false'
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Log if PR updated
         if: steps.cpr.outputs.pull-request-operation == 'updated'
         run: |
           echo "Changelog PR updated due to new commit to main."

.github/workflows/golangci_lint.yml

@@ -0,0 +1,23 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  golangci:
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.58
+          skip-cache: true

.github/workflows/label-internal-pr.yml

@@ -0,0 +1,38 @@
+name: "Label PRs from Dymension internal"
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  label-prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+
+      - name: Get Pull Request Author and Check Membership
+        id: pr
+        run: |
+          pr_author=$(jq -r .pull_request.user.login "$GITHUB_EVENT_PATH")
+          echo "PR Author: ${pr_author}"
+          org="dymensionxyz"
+          membership_response=$(curl -s -L \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/orgs/${org}/public_members/${pr_author})
+          echo "Membership response: ${membership_response}"
+          if [ -z "$membership_response" ]; then
+            is_member=false
+          else
+            is_member=true
+          fi
+          echo "is_member=${is_member}" >> $GITHUB_ENV
+
+      - name: Add Label if Author is from Organization
+        if: env.is_member == 'true'
+        run: |
+          curl -s -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels \
+          -d '{"labels":["dym-internal"]}'

.github/workflows/stalebot.yml

@@ -0,0 +1,27 @@
+name: "Close stale pull requests"
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  stale:
+    permissions:
+      issues: write # for actions/stale to close stale issues
+      pull-requests: write # for actions/stale to close stale PRs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-pr-message: >
+            This pull request has been automatically marked as stale because it
+            has not had any recent activity. It will be closed if no further
+            activity occurs. Thank you!
+          days-before-stale: -1
+          days-before-close: -1
+          days-before-pr-stale: 8
+          days-before-pr-close: 3
+          exempt-pr-labels: "security, proposal, blocked, dym-internal"

.gitignore

@@ -5,4 +5,5 @@ proto/pb
 .go-version
 build
 
-vendor/
+vendor/
+da/grpc/mockserv/db/

.golangci.yml

@@ -1,31 +1,76 @@
 run:
   concurrency: 4
   timeout: 5m
+  tests: true
   modules-download-mode: readonly
-  # mempool and indexer code is borrowed from Tendermint
+
+output:
+  # Format: colored-line-number|line-number|json|colored-tab|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
+  #
+  # Multiple can be specified by separating them by comma, output can be provided
+  # for each of them by separating format name and path by colon symbol.
+  # Output path can be either `stdout`, `stderr` or path to the file to write to.
+  # Example: "checkstyle:report.xml,json:stdout,colored-line-number"
+  #
+  # Default: colored-line-number
+  format: colored-line-number
+  # Print lines of code with issue.
+  # Default: true
+  print-issued-lines: true
+  # Print linter name in the end of issue text.
+  # Default: true
+  print-linter-name: true
+  # Make issues output unique by line.
+  # Default: true
+  uniq-by-line: true
+  # Add a prefix to the output file references.
+  # Default: ""
+  path-prefix: ""
+  # Sort results by: filepath, line and column.
+  # Default: false
+  sort-results: true
+
 
 linters:
   disable-all: true
   enable:
     - errcheck
+    - gocyclo
     - gofmt
+    - gofumpt
     - goimports
+    - gosec
     - gosimple
     - govet
     - ineffassign
     - misspell
+    - revive
     - staticcheck
     - typecheck
+    - unconvert
     - unused
-    - gosec
-    - gocyclo
 
 issues:
   exclude-use-default: false
+  exclude:
+    - "^.*SA1019.*$" # Excluding SA1019 errors
   exclude-files: 
     - da/celestia/mock/server.go
-    - ./*_test.go
+    - ./*_test.go # TODO: bring back
   exclude-dirs:
+    # mempool and indexer code is borrowed from Tendermint
     - mempool
     - state/indexer
-    - state/txindex
+    - state/txindex
+
+
+linters-settings:
+  go-version-checker:
+    min-version: "1.22"
+  revive:
+    rules:
+      - name: exported
+        severity: warning
+        disabled: true
+  errcheck:
+    check-type-assertions: true