Skip to content

Commit

Permalink
address comments on wrapping errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@EasterTheBunny @silaslenihan
EasterTheBunny authored and silaslenihan committed Oct 3, 2024
1 parent 722e42b commit 65e58b0
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 83 deletions.
2 changes: 0 additions & 2 deletions core/services/relay/evm/chain_reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ func (cr *chainReader) Unbind(ctx context.Context, bindings []commontypes.BoundC
func (cr *chainReader) GetLatestValue(ctx context.Context, readName string, confidenceLevel primitives.ConfidenceLevel, params any, returnVal any) error {
binding, address, err := cr.bindings.GetReader(readName)
if err != nil {
cr.lggr.Debug(err.Error())

return err
}

Expand Down
121 changes: 40 additions & 81 deletions core/services/relay/evm/read/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,123 +233,90 @@ func (b *EventBinding) BatchCall(_ common.Address, _, _ any) (Call, error) {
return Call{}, fmt.Errorf("%w: events are not yet supported in batch get latest values", commontypes.ErrInvalidType)
}

func (b *EventBinding) GetLatestValue(ctx context.Context, address common.Address, confidenceLevel primitives.ConfidenceLevel, params, into any) error {
if err := b.validateBound(address); err != nil {
return newErrorFromCall(err, Call{
func (b *EventBinding) GetLatestValue(ctx context.Context, address common.Address, confidenceLevel primitives.ConfidenceLevel, params, into any) (err error) {
var (
confs evmtypes.Confirmations
result *string
)

defer func() {
callErr := newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, "", false)
}, strconv.Itoa(int(confs)), false)

callErr.Result = result

err = callErr
}()

if err = b.validateBound(address); err != nil {
return err
}

confs, err := confidenceToConfirmations(b.confirmationsMapping, confidenceLevel)
confs, err = confidenceToConfirmations(b.confirmationsMapping, confidenceLevel)
if err != nil {
return newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, "", false)
return err
}

topicTypeID := codec.WrapItemType(b.contractName, b.eventName, true)

onChainTypedVal, err := b.toNativeOnChainType(topicTypeID, params)
if err != nil {
callErr := newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)

return callErr
return err
}

filterTopics, err := b.extractFilterTopics(topicTypeID, onChainTypedVal)
if err != nil {
return newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)
return err
}

var log *logpoller.Log
if len(filterTopics) != 0 {
var hashedTopics []common.Hash
hashedTopics, err = b.hashTopics(topicTypeID, filterTopics)
if err != nil {
return newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)
return err
}

if log, err = b.getLatestLog(ctx, address, confs, hashedTopics); err != nil {
return newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)
return err
}
} else {
if log, err = b.lp.LatestLogByEventSigWithConfs(ctx, b.hash, address, confs); err != nil {
return newErrorFromCall(wrapInternalErr(err), Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)
return wrapInternalErr(err)
}
}

if err := b.decodeLog(ctx, log, into); err != nil {
callErr := newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
Params: params,
ReturnVal: into,
}, strconv.Itoa(int(confs)), false)

encoded := hex.EncodeToString(log.Data)
callErr.Result = &encoded
result = &encoded

return callErr
return err
}

return nil
}

func (b *EventBinding) QueryKey(ctx context.Context, address common.Address, filter query.KeyFilter, limitAndSort query.LimitAndSort, sequenceDataType any) ([]commontypes.Sequence, error) {
if err := b.validateBound(address); err != nil {
return nil, newErrorFromCall(err, Call{
func (b *EventBinding) QueryKey(ctx context.Context, address common.Address, filter query.KeyFilter, limitAndSort query.LimitAndSort, sequenceDataType any) (sequences []commontypes.Sequence, err error) {
defer func() {
err = newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
}, "", false)
}()

if err = b.validateBound(address); err != nil {
return nil, err
}

remapped, err := b.remap(filter)
if err != nil {
return nil, newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
}, "", false)
return nil, err
}

// filter should always use the address and event sig
Expand All @@ -361,25 +328,17 @@ func (b *EventBinding) QueryKey(ctx context.Context, address common.Address, fil

logs, err := b.lp.FilteredLogs(ctx, remapped.Expressions, limitAndSort, b.contractName+"-"+address.String()+"-"+b.eventName)
if err != nil {
return nil, newErrorFromCall(wrapInternalErr(err), Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
}, "", false)
return nil, wrapInternalErr(err)
}

// no need to return an error. an empty list is fine
if len(logs) == 0 {
return []commontypes.Sequence{}, nil
}

sequences, err := b.decodeLogsIntoSequences(ctx, logs, sequenceDataType)
sequences, err = b.decodeLogsIntoSequences(ctx, logs, sequenceDataType)
if err != nil {
return nil, newErrorFromCall(err, Call{
ContractAddress: address,
ContractName: b.contractName,
MethodName: b.eventName,
}, "", false)
return nil, err
}

return sequences, nil
Expand Down Expand Up @@ -460,13 +419,13 @@ func (b *EventBinding) extractFilterTopics(topicTypeID string, value any) (filte
var native any
native, err = codec.RepresentArray(item, b.eventTypes[topicTypeID])
if err != nil {
return nil, fmt.Errorf("%w: error representing type as array: %s", commontypes.ErrInternal, err.Error())
return nil, fmt.Errorf("%w: error converting params to log topics: %s", commontypes.ErrInternal, err.Error())
}

filterTopics = []any{native}
case reflect.Struct, reflect.Map:
if filterTopics, err = codec.UnrollItem(item, b.eventTypes[topicTypeID]); err != nil {
return nil, fmt.Errorf("%w: %s", commontypes.ErrInternal, err.Error())
return nil, fmt.Errorf("%w: error unrolling params into log topics: %s", commontypes.ErrInternal, err.Error())
}
default:
return nil, fmt.Errorf("%w: cannot encode kind %v", commontypes.ErrInvalidType, item.Kind())
Expand Down Expand Up @@ -499,7 +458,7 @@ func (b *EventBinding) hashTopics(topicTypeID string, topics []any) ([]common.Ha
if abiArg := topicTyp.Args()[i]; abiArg.Type.T == abi.ArrayTy && (abiArg.Type.Elem != nil && abiArg.Type.Elem.T == abi.UintTy) {
packed, err := abi.Arguments{abiArg}.Pack(topic)
if err != nil {
return nil, fmt.Errorf("%w: %s", commontypes.ErrInternal, err.Error())
return nil, fmt.Errorf("%w: err failed to abi pack topics: %s", commontypes.ErrInternal, err.Error())
}

topic = crypto.Keccak256Hash(packed)
Expand Down

0 comments on commit 65e58b0

Please sign in to comment.