From a3941a29ccd5b4e679ccdb2afa41e791e0a668ee Mon Sep 17 00:00:00 2001 From: GuillemGarciaDev Date: Wed, 3 Dec 2025 13:43:08 +0100 Subject: [PATCH 1/2] tmp: local dependencies --- go.mod | 4 ++-- go.sum | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 78996a9..4b9c4af 100644 --- a/go.mod +++ b/go.mod @@ -280,11 +280,11 @@ replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // use Cosmos-SDK fork to enable Ledger functionality - github.com/cosmos/cosmos-sdk => github.com/xrplevm/cosmos-sdk v0.53.4-xrplevm.2 + github.com/cosmos/cosmos-sdk => ../cosmos-sdk // fix cosmos-sdk store path mismatch github.com/cosmos/cosmos-sdk/store => cosmossdk.io/store v1.1.2 // TODO: remove this once we have a proper fork of cosmos/evm - github.com/cosmos/evm => github.com/xrplevm/evm v0.4.1-xrplevm.1 + github.com/cosmos/evm => ../evm github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v0.0.0-20250806193535-2fc7571efa91 // Security Advisory https://github.com/advisories/GHSA-h395-qcrw-5vmq github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1 diff --git a/go.sum b/go.sum index f1c7534..3974c17 100644 --- a/go.sum +++ b/go.sum @@ -1733,10 +1733,6 @@ github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= -github.com/xrplevm/cosmos-sdk v0.53.4-xrplevm.2 h1:6wrgalo5fN/iBbDSfBYZ1RldNFHZIxE7ARV1JbrrBtM= -github.com/xrplevm/cosmos-sdk v0.53.4-xrplevm.2/go.mod h1:7U3+WHZtI44dEOnU46+lDzBb2tFh1QlMvi8Z5JugopI= -github.com/xrplevm/evm v0.4.1-xrplevm.1 h1:ZLkJrj9Gv3yQfYd67IuK/URhSz3BLovKZUWn6iKWTNc= -github.com/xrplevm/evm v0.4.1-xrplevm.1/go.mod h1:cNTIB4xuCht7Y6EnGdkwR2c2nCmhILZ8WHSdQ5m+g/E= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From d1166407a9c918f9faf9fbc0cc705a6d8ee27b75 Mon Sep 17 00:00:00 2001 From: GuillemGarciaDev Date: Mon, 8 Dec 2025 12:29:25 +0100 Subject: [PATCH 2/2] fix: unregister legacy evm types since they are already registered in cosmos/evm fork --- app/encoding.go | 3 --- go.mod | 4 ++-- types/legacy/ethermint/evm/tx.pb.go | 22 ++++++++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/encoding.go b/app/encoding.go index 814797b..6551bb8 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -19,7 +19,6 @@ import ( "github.com/cosmos/gogoproto/proto" "google.golang.org/protobuf/reflect/protoreflect" - evmlegacytypes "github.com/xrplevm/node/v9/types/legacy/ethermint/evm" feemarketlegacytypes "github.com/xrplevm/node/v9/types/legacy/ethermint/feemarket" erc20legacytypes "github.com/xrplevm/node/v9/types/legacy/evmos/erc20" poalegacytypes "github.com/xrplevm/node/v9/x/poa/types/legacy" @@ -48,8 +47,6 @@ func MakeEncodingConfig(evmChainID uint64) sdktestutil.TestEncodingConfig { interfaceRegistry.RegisterImplementations((*sdk.Msg)(nil), &poalegacytypes.MsgAddValidator{}, &poalegacytypes.MsgRemoveValidator{}, - &evmlegacytypes.MsgEthereumTx{}, - &evmlegacytypes.MsgUpdateParams{}, &feemarketlegacytypes.MsgUpdateParams{}, &erc20legacytypes.MsgConvertERC20{}, &erc20legacytypes.MsgConvertCoin{}, diff --git a/go.mod b/go.mod index 4b9c4af..3d910c8 100644 --- a/go.mod +++ b/go.mod @@ -280,11 +280,11 @@ replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // use Cosmos-SDK fork to enable Ledger functionality - github.com/cosmos/cosmos-sdk => ../cosmos-sdk + github.com/cosmos/cosmos-sdk => github.com/xrplevm/cosmos-sdk v0.53.4-xrplevm.2 // fix cosmos-sdk store path mismatch github.com/cosmos/cosmos-sdk/store => cosmossdk.io/store v1.1.2 // TODO: remove this once we have a proper fork of cosmos/evm - github.com/cosmos/evm => ../evm + github.com/cosmos/evm => github.com/xrplevm/evm v0.4.2-xrplevm.2 github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v0.0.0-20250806193535-2fc7571efa91 // Security Advisory https://github.com/advisories/GHSA-h395-qcrw-5vmq github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1 diff --git a/types/legacy/ethermint/evm/tx.pb.go b/types/legacy/ethermint/evm/tx.pb.go index 4d9b561..5e26b2e 100644 --- a/types/legacy/ethermint/evm/tx.pb.go +++ b/types/legacy/ethermint/evm/tx.pb.go @@ -442,14 +442,20 @@ func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgEthereumTx)(nil), "ethermint.evm.v1.MsgEthereumTx") - proto.RegisterType((*LegacyTx)(nil), "ethermint.evm.v1.LegacyTx") - proto.RegisterType((*AccessListTx)(nil), "ethermint.evm.v1.AccessListTx") - proto.RegisterType((*DynamicFeeTx)(nil), "ethermint.evm.v1.DynamicFeeTx") - proto.RegisterType((*ExtensionOptionsEthereumTx)(nil), "ethermint.evm.v1.ExtensionOptionsEthereumTx") - proto.RegisterType((*MsgEthereumTxResponse)(nil), "ethermint.evm.v1.MsgEthereumTxResponse") - proto.RegisterType((*MsgUpdateParams)(nil), "ethermint.evm.v1.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "ethermint.evm.v1.MsgUpdateParamsResponse") + // NOTE: Proto type registration is DISABLED here to avoid conflicts. + // The node application uses the EVM module via a local replace (github.com/cosmos/evm => ../evm), + // which means proto registration happens in evm/rpc/types/legacy/tx.pb.go. + // + // These struct definitions are kept for backward compatibility but registration is done elsewhere. + + //proto.RegisterType((*MsgEthereumTx)(nil), "ethermint.evm.v1.MsgEthereumTx") + //proto.RegisterType((*LegacyTx)(nil), "ethermint.evm.v1.LegacyTx") + //proto.RegisterType((*AccessListTx)(nil), "ethermint.evm.v1.AccessListTx") + //proto.RegisterType((*DynamicFeeTx)(nil), "ethermint.evm.v1.DynamicFeeTx") + //proto.RegisterType((*ExtensionOptionsEthereumTx)(nil), "ethermint.evm.v1.ExtensionOptionsEthereumTx") + //proto.RegisterType((*MsgEthereumTxResponse)(nil), "ethermint.evm.v1.MsgEthereumTxResponse") + //proto.RegisterType((*MsgUpdateParams)(nil), "ethermint.evm.v1.MsgUpdateParams") + //proto.RegisterType((*MsgUpdateParamsResponse)(nil), "ethermint.evm.v1.MsgUpdateParamsResponse") } func init() { proto.RegisterFile("ethermint/evm/v1/tx.proto", fileDescriptor_f75ac0a12d075f21) }