Skip to content

refactor: cosmos evm fork #300

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

Merged
reecepbcups merged 2 commits into from
Apr 1, 2025
Merged

refactor: cosmos evm fork #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafd885
bump to `0.50.15`
reecepbcups Mar 31, 2025
2522e77
move to `cosmos/evm`
reecepbcups Mar 31, 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
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 @@ -24,7 +24,7 @@ If you do not have [`go 1.22+`](https://go.dev/doc/install), [`Docker`](https://

```bash
# Download the the Spawn repository
git clone https://github.com/rollchains/spawn.git --depth=1 --branch v0.50.14
git clone https://github.com/rollchains/spawn.git --depth=1 --branch v0.50.15
cd spawn

# Install Spawn
Expand Down
2 changes: 1 addition & 1 deletion docs/versioned_docs/version-v0.50.x/01-setup/02-install-spawn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Install Spawn from source.

```bash
# Install from latest source
git clone https://github.com/rollchains/spawn.git --depth 1 --branch v0.50.14
git clone https://github.com/rollchains/spawn.git --depth 1 --branch v0.50.15

# Change to this directory
cd spawn
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/rollchains/spawn

go 1.23.0
go 1.23.6

toolchain go1.23.1
toolchain go1.23.7

replace github.com/rollchains/spawn/simapp => ./simapp

Expand Down Expand Up @@ -93,13 +93,13 @@ require (
github.com/containerd/console v1.0.3 // indirect
github.com/cosmos/cosmos-db v1.1.1 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/cosmos-sdk v0.50.11 // indirect
github.com/cosmos/cosmos-sdk v0.50.13 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/cosmos/iavl v1.2.2 // indirect
github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
github.com/cosmos/ibc-go/v8 v8.5.2 // indirect
github.com/cosmos/ibc-go/v8 v8.7.0 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/interchain-security/v5 v5.1.1 // indirect
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
Expand All @@ -110,7 +110,7 @@ require (
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.9+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
Expand All @@ -133,7 +133,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.3 // indirect
github.com/golang/glog v1.2.3 // 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
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ github.com/cosmos/cosmos-db v1.1.1 h1:FezFSU37AlBC8S98NlSagL76oqBRWq/prTPvFcEJNC
github.com/cosmos/cosmos-db v1.1.1/go.mod h1:AghjcIPqdhSLP/2Z0yha5xPH3nLnskz81pBx3tcVSAw=
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
github.com/cosmos/cosmos-sdk v0.50.11 h1:LxR1aAc8kixdrs3itO+3a44sFoc+vjxVAOyPFx22yjk=
github.com/cosmos/cosmos-sdk v0.50.11/go.mod h1:gt14Meok2IDCjbDtjwkbUcgVNEpUBDN/4hg9cCUtLgw=
github.com/cosmos/cosmos-sdk v0.50.13 h1:xQ32hhzVy7agEe7behMdZN0ezWhPss3KoLZsF9KoBnw=
github.com/cosmos/cosmos-sdk v0.50.13/go.mod h1:hrWEFMU1eoXqLJeE6VVESpJDQH67FS1nnMrQIjO2daw=
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
Expand All @@ -437,8 +437,8 @@ github.com/cosmos/iavl v1.2.2 h1:qHhKW3I70w+04g5KdsdVSHRbFLgt3yY3qTMd4Xa4rC8=
github.com/cosmos/iavl v1.2.2/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/ibc-go/modules/capability v1.0.1 h1:ibwhrpJ3SftEEZRxCRkH0fQZ9svjthrX2+oXdZvzgGI=
github.com/cosmos/ibc-go/modules/capability v1.0.1/go.mod h1:rquyOV262nGJplkumH+/LeYs04P3eV8oB7ZM4Ygqk4E=
github.com/cosmos/ibc-go/v8 v8.5.2 h1:27s9oeD2AxLQF3e9BQsYt9doONyZ7FwZi/qkBv6Sdks=
github.com/cosmos/ibc-go/v8 v8.5.2/go.mod h1:P5hkAvq0Qbg0h18uLxDVA9q1kOJ0l36htMsskiNwXbo=
github.com/cosmos/ibc-go/v8 v8.7.0 h1:HqhVOkO8bDpClXE81DFQgFjroQcTvtpm0tCS7SQVKVY=
github.com/cosmos/ibc-go/v8 v8.7.0/go.mod h1:G2z+Q6ZQSMcyHI2+BVcJdvfOupb09M2h/tgpXOEdY6k=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/interchain-security/v5 v5.1.1 h1:xmRRMeE4xoc+JAZUh0XzXFYWaGBtzFFj5SETuOgnEnY=
Expand Down Expand Up @@ -480,8 +480,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
Expand Down Expand Up @@ -588,8 +588,8 @@ github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2
github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/glog v1.2.3 h1:oDTdz9f5VGVVNGu/Q7UXKWYsD0873HXLHdJUNBsSEKM=
github.com/golang/glog v1.2.3/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand Down
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# curl -sSL https://raw.githubusercontent.com/rollchains/spawn/release/v0.50/install.sh | bash
#

VERSION=${1:-"v0.50.14"}
VERSION=${1:-"v0.50.15"}
BASE_URL="https://github.com/rollchains/spawn/releases/download/$VERSION"

ARCH=$(uname -m)
Expand Down
4 changes: 2 additions & 2 deletions scripts/bump_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# bumps docs versions for spawn

OLD_VERSION=v0.50.13
NEW_VERSION=v0.50.14
OLD_VERSION=v0.50.14
NEW_VERSION=v0.50.15

findAndReplace() {
find . -type f -name "$1" -not -path "*node_modules*" -exec sed -i "$2" {} \;
Expand Down
2 changes: 1 addition & 1 deletion simapp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.4-alpine3.20 AS build-env
FROM golang:1.23.6-alpine3.20 AS build-env

SHELL ["/bin/sh", "-ecuxo", "pipefail"]

Expand Down
4 changes: 2 additions & 2 deletions simapp/app/ante/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
opts := txWithExtensions.GetExtensionOptions()
if len(opts) > 0 {
switch typeURL := opts[0].GetTypeUrl(); typeURL {
case "/os.evm.v1.ExtensionOptionsEthereumTx":
case "/cosmos.evm.vm.v1.ExtensionOptionsEthereumTx":
// handle as *evmtypes.MsgEthereumTx
anteHandler = newMonoEVMAnteHandler(options)
case "/os.types.v1.ExtensionOptionDynamicFeeTx":
case "/cosmos.evm.vm.v1.ExtensionOptionDynamicFeeTx":
// cosmos-sdk tx with dynamic fee extension
anteHandler = NewCosmosAnteHandler(options)
default:
Expand Down
6 changes: 3 additions & 3 deletions simapp/app/ante/ante_cosmos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
evmoscosmosante "github.com/evmos/os/ante/cosmos" // spawntag:evm
evmante "github.com/evmos/os/ante/evm" // spawntag:evm
evmtypes "github.com/evmos/os/x/evm/types"
evmoscosmosante "github.com/cosmos/evm/ante/cosmos" // spawntag:evm
evmante "github.com/cosmos/evm/ante/evm" // spawntag:evm
evmtypes "github.com/cosmos/evm/x/vm/types"

sdkmath "cosmossdk.io/math"
circuitante "cosmossdk.io/x/circuit/ante"
Expand Down
2 changes: 1 addition & 1 deletion simapp/app/ante/ante_evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ante

import (
sdk "github.com/cosmos/cosmos-sdk/types"
evmante "github.com/evmos/os/ante/evm"
evmante "github.com/cosmos/evm/ante/evm"
)

// newMonoEVMAnteHandler creates the sdk.AnteHandler implementation for the EVM transactions.
Expand Down
2 changes: 1 addition & 1 deletion simapp/app/ante/handler_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
anteinterfaces "github.com/cosmos/evm/ante/interfaces"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
anteinterfaces "github.com/evmos/os/ante/interfaces"
)

// BankKeeper defines the contract needed for supply related APIs (noalias)
Expand Down
42 changes: 21 additions & 21 deletions simapp/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ import (
ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee"
ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper"
ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
"github.com/ethereum/go-ethereum/core/vm"

// "github.com/cosmos/ibc-go/v8/modules/apps/transfer" // ?spawntag:evm
// ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" // ?spawntag:evm
transfer "github.com/cosmos/evm/x/ibc/transfer" // spawntag:evm
ibctransferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper" // spawntag:evm
ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
ibc "github.com/cosmos/ibc-go/v8/modules/core"
ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
Expand All @@ -40,8 +43,6 @@ import (
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
transfer "github.com/evmos/os/x/ibc/transfer" // spawntag:evm
ibctransferkeeper "github.com/evmos/os/x/ibc/transfer/keeper" // spawntag:evm
"github.com/spf13/cast"

autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
Expand Down Expand Up @@ -174,24 +175,23 @@ import (
//"github.com/cosmos/cosmos-sdk/x/gov" // ?spawntag:ics
//"github.com/cosmos/cosmos-sdk/x/staking" // ?spawntag:ics

evmosante "github.com/evmos/os/ante"
evmosevmante "github.com/evmos/os/ante/evm"
evmosencoding "github.com/evmos/os/encoding"
srvflags "github.com/evmos/os/server/flags"
evmostypes "github.com/evmos/os/types"
evmosutils "github.com/evmos/os/utils"
"github.com/evmos/os/x/erc20"
erc20keeper "github.com/evmos/os/x/erc20/keeper"
erc20types "github.com/evmos/os/x/erc20/types"
"github.com/evmos/os/x/evm"
_ "github.com/evmos/os/x/evm/core/tracers/js"
_ "github.com/evmos/os/x/evm/core/tracers/native"
"github.com/evmos/os/x/evm/core/vm"
evmkeeper "github.com/evmos/os/x/evm/keeper"
evmtypes "github.com/evmos/os/x/evm/types"
"github.com/evmos/os/x/feemarket"
feemarketkeeper "github.com/evmos/os/x/feemarket/keeper"
feemarkettypes "github.com/evmos/os/x/feemarket/types"
evmosante "github.com/cosmos/evm/ante"
evmosevmante "github.com/cosmos/evm/ante/evm"
evmosencoding "github.com/cosmos/evm/encoding"
srvflags "github.com/cosmos/evm/server/flags"
evmostypes "github.com/cosmos/evm/types"
evmosutils "github.com/cosmos/evm/utils"
"github.com/cosmos/evm/x/erc20"
erc20keeper "github.com/cosmos/evm/x/erc20/keeper"
erc20types "github.com/cosmos/evm/x/erc20/types"
"github.com/cosmos/evm/x/feemarket"
feemarketkeeper "github.com/cosmos/evm/x/feemarket/keeper"
feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
cosmosevmvm "github.com/cosmos/evm/x/vm"
_ "github.com/cosmos/evm/x/vm/core/tracers/js"
_ "github.com/cosmos/evm/x/vm/core/tracers/native"
evmkeeper "github.com/cosmos/evm/x/vm/keeper"
evmtypes "github.com/cosmos/evm/x/vm/types"
chainante "github.com/rollchains/spawn/simapp/app/ante"
// authante "github.com/cosmos/cosmos-sdk/x/auth/ante" // ?spawntag:evm
)
Expand Down Expand Up @@ -1095,7 +1095,7 @@ func NewChainApp(
ratelimit.NewAppModule(appCodec, app.RatelimitKeeper),
consumerModule, //spawntag:ics
// <spawntag:evm
evm.NewAppModule(app.EVMKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)),
cosmosevmvm.NewAppModule(app.EVMKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)),
feemarket.NewAppModule(app.FeeMarketKeeper, app.GetSubspace(feemarkettypes.ModuleName)),
erc20.NewAppModule(app.Erc20Keeper, app.AccountKeeper, app.GetSubspace(erc20types.ModuleName)),
// spawntag:evm>
Expand Down
2 changes: 1 addition & 1 deletion simapp/app/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
evmtypes "github.com/evmos/os/x/evm/types"
evmtypes "github.com/cosmos/evm/x/vm/types"
)

// EVMOptionsFn defines a function type for setting app options specifically for
Expand Down
26 changes: 13 additions & 13 deletions simapp/app/precompiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ import (
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
bankprecompile "github.com/cosmos/evm/precompiles/bank"
"github.com/cosmos/evm/precompiles/bech32"
distprecompile "github.com/cosmos/evm/precompiles/distribution"
evidenceprecompile "github.com/cosmos/evm/precompiles/evidence"
govprecompile "github.com/cosmos/evm/precompiles/gov"
ics20precompile "github.com/cosmos/evm/precompiles/ics20"
"github.com/cosmos/evm/precompiles/p256"
slashingprecompile "github.com/cosmos/evm/precompiles/slashing"
stakingprecompile "github.com/cosmos/evm/precompiles/staking"
erc20Keeper "github.com/cosmos/evm/x/erc20/keeper"
transferkeeper "github.com/cosmos/evm/x/ibc/transfer/keeper"
"github.com/cosmos/evm/x/vm/core/vm"
evmkeeper "github.com/cosmos/evm/x/vm/keeper"
channelkeeper "github.com/cosmos/ibc-go/v8/modules/core/04-channel/keeper"
"github.com/ethereum/go-ethereum/common"
bankprecompile "github.com/evmos/os/precompiles/bank"
"github.com/evmos/os/precompiles/bech32"
distprecompile "github.com/evmos/os/precompiles/distribution"
evidenceprecompile "github.com/evmos/os/precompiles/evidence"
govprecompile "github.com/evmos/os/precompiles/gov"
ics20precompile "github.com/evmos/os/precompiles/ics20"
"github.com/evmos/os/precompiles/p256"
slashingprecompile "github.com/evmos/os/precompiles/slashing"
stakingprecompile "github.com/evmos/os/precompiles/staking"
erc20Keeper "github.com/evmos/os/x/erc20/keeper"
"github.com/evmos/os/x/evm/core/vm"
evmkeeper "github.com/evmos/os/x/evm/keeper"
transferkeeper "github.com/evmos/os/x/ibc/transfer/keeper"
)

const bech32PrecompileBaseGas = 6_000
Expand Down
2 changes: 1 addition & 1 deletion simapp/app/token_pair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package app

import erc20types "github.com/evmos/os/x/erc20/types"
import erc20types "github.com/cosmos/evm/x/erc20/types"

// WTokenContractMainnet is the WrappedToken contract address for mainnet
const WTokenContractMainnet = "0xD4949664cD82660AaE99bEdc034a0deA8A0bd517"
Expand Down
8 changes: 4 additions & 4 deletions simapp/cmd/wasmd/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ import (
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
evmosserverconfig "github.com/evmos/os/server/config"
evmosserverconfig "github.com/cosmos/evm/server/config"

"github.com/CosmWasm/wasmd/x/wasm"
wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

evmoscmd "github.com/evmos/os/client"
evmosserver "github.com/evmos/os/server"
srvflags "github.com/evmos/os/server/flags"
evmoscmd "github.com/cosmos/evm/client"
evmosserver "github.com/cosmos/evm/server"
srvflags "github.com/cosmos/evm/server/flags"
)

// initCometBFTConfig helps to override default CometBFT Config values.
Expand Down
2 changes: 1 addition & 1 deletion simapp/cmd/wasmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
evmoskeyring "github.com/evmos/os/crypto/keyring"
evmoskeyring "github.com/cosmos/evm/crypto/keyring"
"github.com/rollchains/spawn/simapp/app"
"github.com/rollchains/spawn/simapp/app/params"
)
Expand Down
16 changes: 8 additions & 8 deletions simapp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/rollchains/spawn/simapp

go 1.23.0
go 1.23.6

toolchain go1.23.1
toolchain go1.23.7

// overrides
replace (
Expand All @@ -11,8 +11,8 @@ replace (
github.com/CosmWasm/wasmd => github.com/rollchains/wasmd v0.50.0-evm // spawntag:evm
// github.com/cosmos/cosmos-sdk => github.com/rollchains/cosmos-sdk v0.50.11 // ?spawntag:evm
github.com/cosmos/cosmos-sdk => github.com/strangelove-ventures/cosmos-sdk v0.0.0-20250317212103-0767f8c5b1e5 // https://github.com/strangelove-ventures/cosmos-sdk/pull/2 // spawntag:evm
github.com/cosmos/evm => github.com/strangelove-ventures/cosmos-evm v0.0.0-20250331170919-edd5c6adffa2 // spawntag:evm
github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc4 // spawntag:evm
github.com/evmos/os => github.com/strangelove-ventures/os v0.1.0 // spawntag:evm
github.com/spf13/viper => github.com/spf13/viper v1.17.0 // v1.18+ breaks app overrides
)

Expand Down Expand Up @@ -52,16 +52,16 @@ require (
github.com/cometbft/cometbft v0.38.17
github.com/cosmos/cosmos-db v1.1.1
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.50.11
github.com/cosmos/cosmos-sdk v0.50.13
github.com/cosmos/evm v0.1.0
github.com/cosmos/gogoproto v1.7.0
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.1.1
github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0
github.com/cosmos/ibc-go/modules/capability v1.0.1
github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092650-57fcdb9a9a9d
github.com/cosmos/ibc-go/v8 v8.5.2
github.com/cosmos/ibc-go/v8 v8.7.0
github.com/cosmos/interchain-security/v5 v5.1.1
github.com/ethereum/go-ethereum v1.15.3
github.com/evmos/os v0.0.0-20250130185216-d2cab8abc34d
github.com/golang/protobuf v1.5.4
github.com/gorilla/mux v1.8.1
github.com/grpc-ecosystem/grpc-gateway v1.16.0
Expand Down Expand Up @@ -132,7 +132,7 @@ require (
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
Expand All @@ -154,7 +154,7 @@ require (
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gogo/status v1.1.0 // indirect
github.com/golang/glog v1.2.3 // 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/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
Expand Down
Loading
Loading