move raw data field parsing to existing MsgEthereumTx parser

crypto-com · Dec 4, 2024 · 20df578 · 20df578
1 parent d329110
commit 20df578
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 303 deletions.
diff --git a/usecase/parser/msg.go b/usecase/parser/msg.go
@@ -1,6 +1,7 @@
 package parser
 
 import (
+	"bytes"
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
@@ -9,9 +10,7 @@ import (
 	"time"
 
 	"github.com/crypto-com/chain-indexing/entity/command"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/mitchellh/mapstructure"
-
+	"github.com/crypto-com/chain-indexing/external/json"
 	"github.com/crypto-com/chain-indexing/external/primptr"
 	"github.com/crypto-com/chain-indexing/external/tmcosmosutils"
 	"github.com/crypto-com/chain-indexing/external/utctime"
@@ -25,6 +24,10 @@ import (
 	"github.com/crypto-com/chain-indexing/usecase/parser/icaauth"
 	"github.com/crypto-com/chain-indexing/usecase/parser/utils"
 	mapstructure_utils "github.com/crypto-com/chain-indexing/usecase/parser/utils/mapstructure"
+	eth_types "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rlp"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/mitchellh/mapstructure"
 )
 
 const (
@@ -2359,14 +2362,52 @@ func ParseMsgEthereumTx(
 	var commands []command.Command
 	var possibleSignerAddresses []string
 
-	log := utils.NewParsedTxsResultLog(&parserParams.TxsResult.Log[parserParams.MsgIndex])
+	var input []byte
+	if rawMsg.Raw != "" {
+		events := utils.NewParsedTxsResultsEvents(parserParams.TxsResult.Events)
+		log := events.ParsedEventToTxsResultLog()
+		parserParams.TxsResult.Log = log
 
-	if rawMsg.Data.Data != "" {
-		inputData, err := base64.StdEncoding.DecodeString(rawMsg.Data.Data)
+		rawTxData, err := hex.DecodeString(rawMsg.Raw[2:]) // Remove hex prefix "0x..."
+		if err != nil {
+			panic("error decoding raw tx data")
+		}
+
+		// decode the raw tx data
+		var tx eth_types.Transaction
+		reader := bytes.NewReader(rawTxData)
+		err = tx.DecodeRLP(rlp.NewStream(reader, 0))
+		if err != nil {
+			err = tx.UnmarshalBinary(rawTxData)
+			if err != nil {
+				panic(fmt.Errorf("error unmarshalling tx: %v", err))
+			}
+		}
+
+		// unmarshal the raw tx data into `decodeRaw` field
+		var txBytes []byte
+		txBytes, err = tx.MarshalJSON()
+		if err != nil {
+			panic(fmt.Errorf("error marshalling tx: %v", err))
+		}
+
+		var decodedRaw model.DecodedRaw
+		err = json.Unmarshal(txBytes, &decodedRaw)
+		if err != nil {
+			panic(fmt.Errorf("error unmarshalling tx: %v", err))
+		}
+		msgEthereumTxParams.DecodedRaw = &decodedRaw
+		input = tx.Data()
+	} else if rawMsg.Data.Data != "" {
+		input, err = base64.StdEncoding.DecodeString(rawMsg.Data.Data)
 		if err != nil {
 			panic(fmt.Errorf("error decoding RawMsgEthereumTx.Data.Data: %v", err))
 		}
+	}
+
+	log := utils.NewParsedTxsResultLog(&parserParams.TxsResult.Log[parserParams.MsgIndex])
 
+	if string(input) != "" {
 		// parse IBC msgChannelOpenInit
 		if log.HasEvent("channel_open_init") {
 			events := log.GetEventsByType("channel_open_init")
@@ -2511,7 +2552,7 @@ func ParseMsgEthereumTx(
 			// parse msgCreateClient
 			sendEvents := log.GetEventsByType("create_client")
 			if len(sendEvents) > 0 {
-				msg, err := parserParams.EthereumTxInnerMsgDecoder.DecodeCosmosMsgFromTxInput(inputData, MSG_CREATE_CLIENT_TYPE_URL)
+				msg, err := parserParams.EthereumTxInnerMsgDecoder.DecodeCosmosMsgFromTxInput(input, MSG_CREATE_CLIENT_TYPE_URL)
 				if err != nil {
 					panic(fmt.Errorf("error deserializing MsgCreateClient: %v", err))
 				}
@@ -2526,7 +2567,7 @@ func ParseMsgEthereumTx(
 			// parse MsgUpdateClient
 			sendEvents := log.GetEventsByType("update_client")
 			if len(sendEvents) > 0 {
-				msg, err := parserParams.EthereumTxInnerMsgDecoder.DecodeCosmosMsgFromTxInput(inputData, MSG_UPDATE_CLIENT_TYPE_URL)
+				msg, err := parserParams.EthereumTxInnerMsgDecoder.DecodeCosmosMsgFromTxInput(input, MSG_UPDATE_CLIENT_TYPE_URL)
 				if err != nil {
 					panic(fmt.Errorf("error deserializing MsgUpdateClient: %v", err))
 				}

diff --git a/usecase/parser/register.go b/usecase/parser/register.go
@@ -108,9 +108,8 @@ func RegisterBreakingVersionParsers(manager *utils.CosmosParserManager) {
 	/*
 	   Cronos v1.4.0
 	*/
-
 	if manager.GetCronosV1_4_0BlockHeight() > 0 {
-		manager.RegisterParser("/ethermint.evm.v1.MsgEthereumTx", manager.GetCronosV1_4_0BlockHeight(), V1_4_0_cronos_msg.ParseMsgEthereumTx)
+		manager.RegisterParser("/ethermint.evm.v1.MsgEthereumTx", manager.GetCronosV1_4_0BlockHeight(), V1_4_0_cronos_msg.ParseMsgEventsToLog(ParseMsgEthereumTx))
 
 		// cosmos bank
 		manager.RegisterParser("/cosmos.bank.v1beta1.MsgSend", manager.GetCronosV1_4_0BlockHeight(), V1_4_0_cronos_msg.ParseMsgEventsToLog(ParseMsgSend))