imp(all): Bump to latest state on Evmos main (b72a32d76) (#60)

Author: MalteHerrmann

.clconfig.json

@@ -44,9 +44,8 @@
     "OS": "os",
     "PR": "pr",
     "RPC": "rpc",
-    "SDK": "sdk",
-    "evmOS": "evmos"
+    "SDK": "sdk"
   },
   "legacy_version": null,
   "target_repo": "https://github.com/evmos/os"
-}
+}

.github/workflows/bsr-push.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.41.0
+      - uses: bufbuild/buf-setup-action@v1.47.2
       # Push evmOS protos to the Buf Schema Registry
       - uses: bufbuild/[email protected]
         with:

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
             go.mod
             go.sum
             *.toml
-      - uses: golangci/[email protected].0
+      - uses: golangci/[email protected].1
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: latest

.github/workflows/proto.yml

@@ -32,7 +32,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.41.0
+      - uses: bufbuild/buf-setup-action@v1.47.2
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: "proto"
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.41.0
+      - uses: bufbuild/buf-setup-action@v1.47.2
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

.github/workflows/super-linter.yml

@@ -30,6 +30,7 @@ jobs:
           PROTOBUF_CONFIG_FILE: .protolint.yml
           VALIDATE_NATURAL_LANGUAGE: false
           VALIDATE_OPENAPI: false
+          VALIDATE_JAVASCRIPT_STANDARD: false
           VALIDATE_JSCPD: false
           VALIDATE_GO: false
           VALIDATE_GO_MODULES: false

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
         run: |
           make test-unit-cover
         if: env.GIT_DIFF
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           file: ./coverage.txt
           # We were getting a 500 error on codecov servers
@@ -60,7 +60,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
-          cache: "pip" # caching pip dependencies
         if: env.GIT_DIFF
       - name: Install Pytest
         run: |

.golangci.yml

@@ -24,7 +24,7 @@ linters:
     - misspell
     - nakedret
     - prealloc
-    - exportloopref
+    - copyloopvar
     - staticcheck
     - stylecheck
     - typecheck
@@ -33,7 +33,6 @@ linters:
     - unused
     - nolintlint
     - asciicheck
-    - exportloopref
     - gofumpt
     - gomodguard
 

.mergify.yml

@@ -1,21 +1,17 @@
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>1"
-
-pull_request_rules:
-  - name: automerge to main with label "automerge" and branch protection passing
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>1"
       - base=main
       - label=automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+    merge_conditions:
+      - "#approved-reviews-by>1"
+    merge_method: squash
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+
+pull_request_rules:
   - name: backport patches to v6.0.x branch
     conditions:
       - base=main
@@ -48,3 +44,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v3.0.x
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue:

CHANGELOG.md

@@ -8,14 +8,15 @@ This changelog was created using the `clu` binary
 
 ### Improvements
 
+- (all) [#60](https://github.com/evmos/os/pull/60) Apply latest changes from Evmos repo (f943af3b to b72a32d76).
 - (cli) [#55](https://github.com/evmos/os/pull/55) Add missing list key types subcommand.
 - (cli) [#54](https://github.com/evmos/os/pull/54) Align debug CLI commands with Cosmos SDK plus other minor clean up.
 - (cli) [#53](https://github.com/evmos/os/pull/53) Enable specifying default key type for adding keys.
 - (ante) [#52](https://github.com/evmos/os/pull/52) Refactor ante handlers to be easier to use in partner chains.
-- (all) [#48](https://github.com/evmos/os/pull/48) Move latest changes from evmOS main (f943af3b incl. SDK v50).
-- (all) [#43](https://github.com/evmos/os/pull/43) Update with latest evmOS main changes (2b7a8e2).
+- (all) [#48](https://github.com/evmos/os/pull/48) Move latest changes from Evmos main (f943af3b incl. SDK v50).
+- (all) [#43](https://github.com/evmos/os/pull/43) Update with latest Evmos main changes (2b7a8e2).
 - (tests) [#41](https://github.com/evmos/os/pull/41) Add Solidity and Ledger tests.
-- (all) [#37](https://github.com/evmos/os/pull/37) Add EVM, feemarket and precompiles from evmOS.
+- (all) [#37](https://github.com/evmos/os/pull/37) Add EVM, feemarket and precompiles from Evmos.
 - (all) [#38](https://github.com/evmos/os/pull/38) Add readme.
 - (all) [#30](https://github.com/evmos/os/pull/30) Add example chain implementation and ante handlers.
 - (ci) [#35](https://github.com/evmos/os/pull/35) Disable dependabot temporarily.

Makefile

@@ -54,9 +54,9 @@ test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
 
 run-tests:
 ifneq (,$(shell which tparse 2>/dev/null))
-	go test -mod=readonly -json $(ARGS) $(EXTRA_ARGS) $(TEST_PACKAGES) | tparse
+	go test -tags=test -mod=readonly -json $(ARGS) $(EXTRA_ARGS) $(TEST_PACKAGES) | tparse
 else
-	go test -mod=readonly $(ARGS)  $(EXTRA_ARGS) $(TEST_PACKAGES)
+	go test -tags=test -mod=readonly $(ARGS)  $(EXTRA_ARGS) $(TEST_PACKAGES)
 endif
 
 test-scripts:
@@ -70,7 +70,7 @@ test-solidity:
 .PHONY: run-tests test test-all $(TEST_TARGETS)
 
 benchmark:
-	@go test -mod=readonly -bench=. $(PACKAGES_NOSIMULATION)
+	@go test -tags=test -mod=readonly -bench=. $(PACKAGES_NOSIMULATION)
 
 .PHONY: benchmark