Skip to content

fix(bridge): correct error wrapping, trace_id key, and a log message #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sameh-farouk merged 1 commit into from
Jun 1, 2026
+4 −4
Merged

fix(bridge): correct error wrapping, trace_id key, and a log message #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bridge/tfchain_bridge/pkg/bridge/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (bridge *Bridge) Start(ctx context.Context) error {
select {
case data := <-tfchainSub:
if data.Err != nil {
return errors.Wrap(err, "failed to get tfchain events")
return errors.Wrap(data.Err, "failed to get tfchain events")
}
for _, withdrawCreatedEvent := range data.Events.WithdrawCreatedEvents {
err := bridge.handleWithdrawCreated(ctx, withdrawCreatedEvent)
Expand Down Expand Up @@ -190,7 +190,7 @@ func (bridge *Bridge) Start(ctx context.Context) error {
}
case data := <-stellarSub:
if data.Err != nil {
return errors.Wrap(err, "failed to get stellar payments")
return errors.Wrap(data.Err, "failed to get stellar payments")
}

for _, mEvent := range data.Events {
Expand Down
2 changes: 1 addition & 1 deletion bridge/tfchain_bridge/pkg/stellar/stellar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func (w *StellarWallet) submitTransaction(ctx context.Context, txn *txnbuild.Tra
return errors.Wrap(err, "an error occurred while submitting the transaction")
}
log.Info().
Str("trace_id", fmt.Sprint(ctx.Value("trace_id"))).
Str("trace_id", fmt.Sprint(ctx.Value(TraceIdKey{}))).
Str("event_action", "stellar_transaction_submitted").
Str("event_kind", "event").
Str("category", "vault").
Expand Down
2 changes: 1 addition & 1 deletion bridge/tfchain_bridge/pkg/substrate/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func NewSubstrateClient(url string, seed string) (*SubstrateClient, error) {
func (s *SubstrateClient) RetrySetWithdrawExecuted(ctx context.Context, tixd uint64) error {
err := s.SetBurnTransactionExecuted(s.identity, tixd)
for err != nil {
log.Err(err).Msg("error while setting refund transaction as executed")
log.Err(err).Msg("error while setting burn transaction as executed")

select {
case <-ctx.Done():
Expand Down
Loading