Skip to content

chore(deps): upgrade cosmos/evm to v0.4.1 (WIP) #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tgntr wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

chore(deps): upgrade cosmos/evm to v0.4.1 (WIP) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
db38bcf
bump cosmos/evm
tgntr Jun 2, 2025
bffc0e0
bump ibc
tgntr Jun 2, 2025
a166a1f
remove capability module
tgntr Jun 2, 2025
7a03514
WIP update evm
tgntr Jun 3, 2025
12bf266
wip update evm - test-localnet-evm fails
tgntr Jun 3, 2025
71a7e23
Merge branch 'main' into chore/upgrade-to-evm-v1.0.0-rc0
WyzaXX Jun 23, 2025
8fa8f47
deps + app.go
tgntr Sep 10, 2025
bc26977
ante
tgntr Sep 10, 2025
8b6b230
fix chain id
tgntr Sep 10, 2025
05f14fc
update go ver
tgntr Sep 10, 2025
71f3f6b
Merge branch 'main' into chore/upgrade-cosmos-evm-to-v0.4.1
tgntr Sep 10, 2025
c555582
cleanup
tgntr Sep 10, 2025
7e82c57
rename tendermint cmd to comet
tgntr Sep 10, 2025
6dda66d
cleanup
tgntr Sep 10, 2025
a6af979
cleanup go.mod
tgntr Sep 10, 2025
4f4dd9c
upgrade handler
tgntr Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
env:
GOOS: ${{ matrix.targetos }}
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-localnet-params
Expand All @@ -60,7 +60,7 @@ jobs:
- uses: actions/setup-go@v5
- uses: foundry-rs/foundry-toolchain@v1
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-localnet-evm
Expand All @@ -72,7 +72,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-unit
Expand All @@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-e2e
Expand All @@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-ledger
Expand All @@ -115,7 +115,7 @@ jobs:
- uses: actions/checkout@v5
- uses: actions/setup-go@v5
with:
go-version: "1.23.6"
go-version: "1.23.8"
check-latest: true
- run: make install
- run: make test-solidity
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"--chain-id",
"tacchain_2391-1",
"--default-denom",
"atom"
"utac"
],
},
{
Expand Down
20 changes: 10 additions & 10 deletions NETWORKS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ This example guide connects to mainnet. You can replace `chain-id`, `persistent_

#### Prerequisites

- [Go >= 1.23.6](https://go.dev/doc/install)
- [Go >= 1.23.8](https://go.dev/doc/install)
- jq
- curl

Expand Down Expand Up @@ -97,7 +97,7 @@ This example guide connects to mainnet. You can replace `chain-id`, `persistent_

#### Prerequisites

- [Go >= v1.23.6](https://go.dev/doc/install)
- [Go >= v1.23.8](https://go.dev/doc/install)
- jq
- curl
- tar
Expand Down Expand Up @@ -153,7 +153,7 @@ tacchaind start --chain-id tacchain_239-1 --home .mainnet

#### Prerequisites

- [Go >= v1.23.6](https://go.dev/doc/install)
- [Go >= v1.23.8](https://go.dev/doc/install)
- jq
- curl
- lz4
Expand Down Expand Up @@ -200,7 +200,7 @@ NOTE: The provided examples use `--keyring-backend test`. This is not recommende
In this example our moniker is `testnode` as named when we initialized our node. Don't forget to replace with your node moniker.

``` sh
echo "{\"pubkey\":$(tacchaind --home .mainnet tendermint show-validator),\"amount\":\"1000000000000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
echo "{\"pubkey\":$(tacchaind --home .mainnet comet show-validator),\"amount\":\"1000000000000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
```

2. Broadcast tx
Expand Down Expand Up @@ -303,7 +303,7 @@ This example guide connects to testnet. You can replace `chain-id`, `persistent_

#### Prerequisites

- [Go >= 1.23.6](https://go.dev/doc/install)
- [Go >= 1.23.8](https://go.dev/doc/install)
- jq
- curl

Expand Down Expand Up @@ -379,7 +379,7 @@ This example guide connects to testnet. You can replace `chain-id`, `persistent_

#### Prerequisites

- [Go >= v1.23.6](https://go.dev/doc/install)
- [Go >= v1.23.8](https://go.dev/doc/install)
- jq
- curl
- tar
Expand Down Expand Up @@ -435,7 +435,7 @@ tacchaind start --chain-id tacchain_2391-1 --home .testnet

#### Prerequisites

- [Go >= v1.23.6](https://go.dev/doc/install)
- [Go >= v1.23.8](https://go.dev/doc/install)
- jq
- curl
- lz4
Expand Down Expand Up @@ -488,7 +488,7 @@ tacchaind --home .testnet keys unsafe-import-eth-key validator <PRIVATE_KEY> --k
In this example our moniker is `testnode` as named when we initialized our node. Don't forget to replace with your node moniker.

``` sh
echo "{\"pubkey\":$(tacchaind --home .testnet tendermint show-validator),\"amount\":\"1000000000000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
echo "{\"pubkey\":$(tacchaind --home .testnet comet show-validator),\"amount\":\"1000000000000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
```

2. Broadcast tx
Expand Down Expand Up @@ -680,7 +680,7 @@ This example guide connects to testnet. You can replace `chain-id`, `persistent_

### Prerequisites

- [Go >= 1.23.6](https://go.dev/doc/install)
- [Go >= 1.23.8](https://go.dev/doc/install)
- jq
- curl

Expand Down Expand Up @@ -814,7 +814,7 @@ tacchaind --home .testnet keys unsafe-import-eth-key validator <PRIVATE_KEY> --k
In this example our moniker is `testnode` as named when we initialized our node. Don't forget to replace with your node moniker.

``` sh
echo "{\"pubkey\":$(tacchaind --home .testnet tendermint show-validator),\"amount\":\"1000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
echo "{\"pubkey\":$(tacchaind --home .testnet comet show-validator),\"amount\":\"1000000000utac\",\"moniker\":\"testnode\",\"identity\":null,\"website\":null,\"security\":null,\"details\":null,\"commission-rate\":\"0.1\",\"commission-max-rate\":\"0.2\",\"commission-max-change-rate\":\"0.01\",\"min-self-delegation\":\"1\"}" > validatortx.json
```

2. Broadcast tx
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Quickstart

- Prerequisites
- [Go >= v1.23.6](https://go.dev/doc/install)
- [Go >= v1.23.8](https://go.dev/doc/install)

```sh
git clone https://github.com/TacBuild/tacchain.git
Expand Down
19 changes: 11 additions & 8 deletions app/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
"github.com/cosmos/ibc-go/v8/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante"
"github.com/cosmos/ibc-go/v10/modules/core/keeper"

corestoretypes "cosmossdk.io/core/store"
circuitante "cosmossdk.io/x/circuit/ante"
Expand All @@ -15,8 +15,9 @@ import (
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"

evmante "github.com/cosmos/evm/ante"
evmcosmosante "github.com/cosmos/evm/ante/cosmos"
evmante "github.com/cosmos/evm/ante/evm"
evmevmante "github.com/cosmos/evm/ante/evm"
evmanteinterfaces "github.com/cosmos/evm/ante/interfaces"
evmtypes "github.com/cosmos/evm/x/vm/types"
)
Expand All @@ -34,9 +35,10 @@ type HandlerOptions struct {
CircuitKeeper *circuitkeeper.Keeper

// Cosmos EVM
FeeMarketKeeper evmanteinterfaces.FeeMarketKeeper
EvmKeeper evmanteinterfaces.EVMKeeper
MaxTxGasWanted uint64
FeeMarketKeeper evmanteinterfaces.FeeMarketKeeper
EvmKeeper evmanteinterfaces.EVMKeeper
MaxTxGasWanted uint64
PendingTxListener evmante.PendingTxListener
}

// NewAnteHandler returns an ante handler responsible for attempting to route an
Expand Down Expand Up @@ -76,12 +78,13 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
case "/cosmos.evm.vm.v1.ExtensionOptionsEthereumTx":
// handle as *evmtypes.MsgEthereumTx
anteHandler = sdk.ChainAnteDecorators(
evmante.NewEVMMonoDecorator(
evmevmante.NewEVMMonoDecorator(
options.AccountKeeper,
options.FeeMarketKeeper,
options.EvmKeeper,
options.MaxTxGasWanted,
),
evmante.NewTxListenerDecorator(options.PendingTxListener),
)
case "/cosmos.evm.types.v1.ExtensionOptionDynamicFeeTx":
// cosmos-sdk tx with dynamic fee extension
Expand Down Expand Up @@ -137,6 +140,6 @@ func newCosmosAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
authante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
authante.NewIncrementSequenceDecorator(options.AccountKeeper),
ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
evmante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
evmevmante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
), nil
}
Loading
Loading