wip: fix ci

.github/workflows/changelog.yml

@@ -14,14 +14,4 @@ jobs:
       - name: Check Changelog for changes
         uses: tarides/changelog-check-action@v3
         with:
-          changelog: CHANGELOG.md
-
-  lint_changelog:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the repository
-      uses: actions/checkout@v4
-
-    - name: Run changelog linter
-      uses: MalteHerrmann/changelog-lint-action@0918ef12e6dc06adce0743e1c6c13707a7c20323
+          changelog: CHANGELOG.md

.github/workflows/dependencies.yml

@@ -1,5 +1,10 @@
 name: "Dependency Review"
-on: pull_request
+on:
+  workflow_call:
+  workflow_dispatch:
+  schedule:
+    # run every day at 3:00 UTC
+    - cron: "0 3 * * *"
 
 permissions: read-all
 
@@ -9,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23.6'
           check-latest: true
       - name: "Checkout Repository"
         uses: actions/checkout@v4
@@ -23,6 +28,9 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v4
         if: env.GIT_DIFF
-      - name: "Go vulnerability check"
-        run: make vulncheck
+      - name: "Get govulncheck"
+        run: go install golang.org/x/vuln/cmd/govulncheck@latest
         if: env.GIT_DIFF
+      - name: Run govulncheck
+        run: govulncheck -show verbose ./...
+        shell: bash

.gitignore

@@ -31,3 +31,5 @@ contracts/@openzeppelin/*
 
 # Build files
 example_chain/build/
+
+build/

.golangci.yml

@@ -2,7 +2,7 @@ run:
   tests: true
   timeout: 5m
   concurrency: 4
-  go: '1.22'
+  go: '1.23'
 
 issues:
   exclude-dirs:

.govulncheck.yaml

@@ -0,0 +1,3 @@
+ignore:
+    -id: GO-2025-3443
+    reason: "Fixed in 0.38.16"

CHANGELOG.md

@@ -0,0 +1,28 @@
+# CHANGELOG
+
+## UNRELEASED
+
+### DEPENDENCIES
+
+- Migrated evmos/go-ethereum to cosmos/go-ethereum
+- Migrated evmos/cosmos-sdk to cosmos/cosmos-sdk
+
+### BUG FIXES
+
+- Fixed example chain's cmd by adding NoOpEVMOptions to tmpApp in root.go
+
+### IMPROVEMENTS
+
+### FEATURES
+
+### STATE BREAKING
+
+- Refactored evmos/os into cosmos/evm
+- Renamed x/evm to x/vm
+- Renamed protobuf files from evmos to cosmos org
+
+### API-Breaking
+
+- Refactored evmos/os into cosmos/evm
+- Renamed x/evm to x/vm
+- Renamed protobuf files from evmos to cosmos org

Makefile

@@ -22,9 +22,9 @@ go.sum: go.mod
 	go mod verify
 	go mod tidy
 
-vulncheck: $(BUILDDIR)/
-	GOBIN=$(BUILDDIR) go install golang.org/x/vuln/cmd/govulncheck@latest
-	$(BUILDDIR)/govulncheck ./...
+vulncheck:
+	@go install golang.org/x/vuln/cmd/govulncheck@latest
+	@govulncheck ./...
 
 ###############################################################################
 ###                           Tests & Simulation                            ###
@@ -213,21 +213,4 @@ contracts-compile:
 # Add a new solidity contract to be compiled
 contracts-add:
 	@echo "Adding a new smart contract to be compiled..."
-	@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --add $(CONTRACT)
-
-###############################################################################
-###                           Miscellaneous Checks                          ###
-###############################################################################
-
-# Use changelog linter and auto-fix from https://github.com/MalteHerrmann/changelog-utils
-cluVersion=v1.1.2
-cluImage=ghcr.io/malteherrmann/changelog-utils
-clu=$(DOCKER) run --rm -v "$(CURDIR):/workspace" --workdir /workspace --user 0 $(cluImage):$(cluVersion)
-
-changelog-check:
-	@echo "Checking changelog..."
-	@$(clu) lint
-
-changelog-fix:
-	@echo "Fixing changelog..."
-	@$(clu) fix
+	@python3 ./scripts/compile_smart_contracts/compile_smart_contracts.py --add $(CONTRACT)

README.md

@@ -16,7 +16,8 @@ and customizability to your Cosmos SDK chain.
 - With native support for EVM as VM and seamless EVM<>Cosmos wallet / token / user experience.
 - Leverage IBC with EVM, native support of ERC20 on Cosmos, and more with extensions and precompiles.
 
-Cosmos EVM is a fork of [evmOS](https://github.com/evmos/OS), maintained by Interchain Labs and the Interchain Foundation after the latter funded Tharsis to open-source the original codebase.
+Cosmos EVM is a fork of [evmOS](https://github.com/evmos/OS), maintained by Interchain Labs and the Interchain Foundation
+after the latter funded Tharsis to open-source the original codebase.
 
 **Cosmos EVM is fully open-source under the Apache 2.0 license.** With this open-sourced version, you can get:
 
@@ -27,7 +28,8 @@ Cosmos EVM is a fork of [evmOS](https://github.com/evmos/OS), maintained by Inte
 
 **Want to use Cosmos EVM but want to discuss it with an expert first? [Contact the Interchain Labs team](https://share-eu1.hsforms.com/2g6yO-PVaRoKj50rUgG4Pjg2e2sca).**
 
-For live discussions or support regarding advisories, join the #cosmos-tech channel in Slack. [Get a Slack invite here](https://forms.gle/A8jawLgB8zuL1FN36) or join the [Telegram Group](https://t.me/cosmostechstack)
+For live discussions or support regarding advisories, join the #cosmos-tech channel in Slack.
+[Get a Slack invite here](https://forms.gle/A8jawLgB8zuL1FN36) or join the [Telegram Group](https://t.me/cosmostechstack)
 
 ## Plug-in Cosmos EVM into your chain
 
@@ -138,4 +140,6 @@ thus moving the standard forward.
 
 ## Open-source License & Credits
 
-Cosmos EVM is open-source under the Apache 2.0 license, an extension of the license of the original codebase (https://github.com/evmos/OS) created by Tharsis and the evmOS team - who conducted the foundational work for EVM compatibility and interoperability in Cosmos.
+Cosmos EVM is open-source under the Apache 2.0 license, an extension of the license of the original codebase (https://github.com/evmos/OS)
+created by Tharsis and the evmOS team - who conducted the foundational work for EVM compatibility and
+interoperability in Cosmos.

SECURITY.md

@@ -61,4 +61,4 @@ If you follow these guidelines when reporting an issue to us, we commit to:
   bug bounty program.
 
 [h1]: https://hackerone.com/cosmos
-[EXAMPLES.md]: https://github.com/interchainio/security/blob/main/resources/CLASSIFICATION_MATRIX.md#real-world-examples
+[EXAMPLES.md]: https://github.com/interchainio/security/blob/main/resources/CLASSIFICATION_MATRIX.md#real-world-examples

example_chain/README.md

@@ -1,8 +1,9 @@
 # Example Cosmos EVM Chain
 
-This directory contains an example chain that uses the Cosmos EVM modules.
-It is based on the simapp implementation on the Cosmos SDK repository,
-which itself is a simplified version of a Cosmos SDK-based blockchain.
+This directory contains an example chain that uses the Cosmos EVM
+modules. It is based on the simapp implementation on the Cosmos SDK
+repository, which itself is a simplified version of a Cosmos SDK-based
+blockchain.
 
 This chain implementation is used to demonstrate the integration of Cosmos EVM
 as well as to provide a chain object for testing purposes within the repository.
@@ -13,15 +14,14 @@ By default, this chain has the following configuration:
 
 | Option              | Value                  |
 |---------------------|------------------------|
-| Binary              | `evmd`                  |
+| Binary              | `evmd`                 |
 | Chain ID            | `cosmos_262144-1`      |
 | Custom Opcodes      | -                      |
 | Default Token Pairs | 1 for the native token |
 | Denomination        | `utest`                |
 | EVM permissioning   | permissionless         |
 | Enabled Precompiles | all                    |
 
-
 ## Running The Chain
 
 To run the example, execute the local node script found within this repository:
@@ -41,7 +41,10 @@ Available flags are:
 
 For the sake of this example, we'll be using Metamask:
 
-1. Use the following seed phrase when adding a new wallet: ```gesture inject test cycle original hollow east ridge hen combine junk child bacon zero hope comfort vacuum milk pitch cage oppose unhappy lunar seat```
+1. Use the following seed phrase when adding a new wallet:
+`gesture inject test cycle original hollow east ridge hen combine
+junk child baconzero hope comfort vacuum milk pitch cage oppose
+unhappy lunar seat`
 2. On the top left of the Metamask extension, click the Network button.
 3. Click Add custom network from the bottom of the modal.
 4. Under Default RPC URL, add the RPC URL as http://localhost:8545. Ensure your chain is running.

example_chain/eips/README.md

@@ -1,7 +1,7 @@
 # Cosmos EVM Custom EIPs
 
-This document explain how **Cosmos EVM** allows chain built on top of it to define custom EIPs to modify the behavior of EVM
-opcodes.
+This document explain how **Cosmos EVM** allows chain built on top of it to define custom EIPs to modify
+the behavior of EVM opcodes.
 
 ## Custom EIPs
 

example_chain/go.mod

@@ -1,6 +1,6 @@
 module github.com/cosmos/evm/example_chain
 
-go 1.22.8
+go 1.23.6
 
 require (
 	cosmossdk.io/api v0.7.6
@@ -15,7 +15,7 @@ require (
 	cosmossdk.io/x/feegrant v0.1.1
 	cosmossdk.io/x/tx v0.13.7
 	cosmossdk.io/x/upgrade v0.1.4
-	github.com/cometbft/cometbft v0.38.15
+	github.com/cometbft/cometbft v0.38.17
 	github.com/cosmos/cosmos-db v1.1.1
 	github.com/cosmos/cosmos-sdk v0.50.13
 	github.com/cosmos/evm v0.0.0-20250318095025-e69e57ff2698
@@ -112,7 +112,7 @@ require (
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.2.2 // indirect
+	github.com/golang/glog v1.2.4 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -179,7 +179,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.60.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/prometheus/tsdb v0.10.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
@@ -213,15 +213,15 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.31.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/trace v1.31.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
@@ -230,10 +230,10 @@ require (
 	golang.org/x/tools v0.28.0 // indirect
 	google.golang.org/api v0.186.0 // indirect
 	google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.4 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect