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 a529568..27609ac 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace ( 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 - github.com/cosmos/evm => github.com/xrplevm/evm v0.4.2-xrplevm.1 + 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/go.sum b/go.sum index 436dc17..b7da5af 100644 --- a/go.sum +++ b/go.sum @@ -1729,8 +1729,8 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC 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.2-xrplevm.1 h1:qWo+2DVQZ2KeuCKRXZGUDr624ULQZi9HRSlZRwdo7Jw= -github.com/xrplevm/evm v0.4.2-xrplevm.1/go.mod h1:cNTIB4xuCht7Y6EnGdkwR2c2nCmhILZ8WHSdQ5m+g/E= +github.com/xrplevm/evm v0.4.2-xrplevm.2 h1:KDdUCwlI57RwyqPglOigkLh7plzzPj+fGnHyFzxAU+Q= +github.com/xrplevm/evm v0.4.2-xrplevm.2/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= 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) }