diff --git a/pkg/relay/ethereum/events.go b/pkg/relay/ethereum/events.go index 92bb357..a9f45a6 100644 --- a/pkg/relay/ethereum/events.go +++ b/pkg/relay/ethereum/events.go @@ -82,8 +82,7 @@ func (chain *Chain) findSentPackets(ctx core.QueryContext, fromHeight uint64) (c sendPacket, err := chain.ibcHandler.ParseSendPacket(log) if err != nil { - revertReason, data := chain.parseRpcError(err) - return nil, fmt.Errorf("failed to parse SendPacket event: err=%v, log=%v, reason=%s, data=%s", err, log, revertReason, data) + return nil, fmt.Errorf("failed to parse SendPacket event: err=%v, log=%v", err, log) } if sendPacket.SourceChannel != chain.Path().ChannelID || sendPacket.SourcePort != chain.Path().PortID { continue @@ -165,8 +164,7 @@ func (chain *Chain) findRecvPacketEvents(ctx core.QueryContext, fromHeight uint6 for _, log := range logs { event, err := chain.ibcHandler.ParseRecvPacket(log) if err != nil { - revertReason, data := chain.parseRpcError(err) - return nil, fmt.Errorf("failed to parse RecvPacket event: err=%v, log=%v, reason%s, data=%s", err, log, revertReason, data) +- return nil, fmt.Errorf("failed to parse RecvPacket event: err=%v, log=%v", err, log) } if event.Packet.DestinationChannel != chain.Path().ChannelID || event.Packet.DestinationPort != chain.Path().PortID { continue @@ -186,8 +184,7 @@ func (chain *Chain) findWriteAckEvents(ctx core.QueryContext, fromHeight uint64) for _, log := range logs { event, err := chain.ibcHandler.ParseWriteAcknowledgement(log) if err != nil { - revertReason, data := chain.parseRpcError(err) - return nil, fmt.Errorf("failed to parse WriteAcknowledgement event: err=%v, log=%v, reason=%s, data=%s", err, log, revertReason, data) + return nil, fmt.Errorf("failed to parse WriteAcknowledgement event: err=%v, log=%v", err, log) } if event.DestinationChannel != chain.Path().ChannelID || event.DestinationPortId != chain.Path().PortID { continue diff --git a/pkg/relay/ethereum/msg.go b/pkg/relay/ethereum/msg.go index 7270cd4..3729f5e 100644 --- a/pkg/relay/ethereum/msg.go +++ b/pkg/relay/ethereum/msg.go @@ -70,29 +70,25 @@ func (c *Chain) parseMsgEventLogs(logs []*types.Log) ([]core.MsgEventLog, error) case abiGeneratedClientIdentifier.ID: ev, err := c.ibcHandler.ParseGeneratedClientIdentifier(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse GeneratedClientIdentifier event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) + return nil, fmt.Errorf("failed to parse GeneratedClientIdentifier event: logIndex=%d, log=%v", i, log) } event = &core.EventGenerateClientIdentifier{ID: ev.ClientId} case abiGeneratedConnectionIdentifier.ID: ev, err := c.ibcHandler.ParseGeneratedConnectionIdentifier(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse GeneratedConnectionIdentifier event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) +- return nil, fmt.Errorf("failed to parse GeneratedConnectionIdentifier event: logIndex=%d, log=%v", i, log) } event = &core.EventGenerateConnectionIdentifier{ID: ev.ConnectionId} case abiGeneratedChannelIdentifier.ID: ev, err := c.ibcHandler.ParseGeneratedChannelIdentifier(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse GeneratedChannelIdentifier event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) +- return nil, fmt.Errorf("failed to parse GeneratedChannelIdentifier event: logIndex=%d, log=%v", i, log) } event = &core.EventGenerateChannelIdentifier{ID: ev.ChannelId} case abiSendPacket.ID: ev, err := c.ibcHandler.ParseSendPacket(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse SendPacket event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) +- return nil, fmt.Errorf("failed to parse SendPacket event: logIndex=%d, log=%v", i, log) } event = &core.EventSendPacket{ Sequence: ev.Sequence, @@ -105,8 +101,7 @@ func (c *Chain) parseMsgEventLogs(logs []*types.Log) ([]core.MsgEventLog, error) case abiRecvPacket.ID: ev, err := c.ibcHandler.ParseRecvPacket(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse RecvPacket event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) + return nil, fmt.Errorf("failed to parse RecvPacket event: logIndex=%d, log=%v", i, log) } event = &core.EventRecvPacket{ Sequence: ev.Packet.Sequence, @@ -119,8 +114,7 @@ func (c *Chain) parseMsgEventLogs(logs []*types.Log) ([]core.MsgEventLog, error) case abiWriteAcknowledgement.ID: ev, err := c.ibcHandler.ParseWriteAcknowledgement(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse WriteAcknowledgement event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) + return nil, fmt.Errorf("failed to parse WriteAcknowledgement event: logIndex=%d, log=%v", i, log) } event = &core.EventWriteAcknowledgement{ Sequence: ev.Sequence, @@ -131,8 +125,7 @@ func (c *Chain) parseMsgEventLogs(logs []*types.Log) ([]core.MsgEventLog, error) case abiAcknowledgePacket.ID: ev, err := c.ibcHandler.ParseAcknowledgePacket(*log) if err != nil { - revertReason, data := c.parseRpcError(err) - return nil, fmt.Errorf("failed to parse AcknowledgePacket event: logIndex=%d, log=%v, reason=%s, data=%s", i, log, revertReason, data) + return nil, fmt.Errorf("failed to parse AcknowledgePacket event: logIndex=%d, log=%v", i, log) } event = &core.EventAcknowledgePacket{ Sequence: ev.Packet.Sequence,