tech/sendico
2
0
Fork 0
Code Issues 31 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixed balance fetch' (#428) from tron-428 into main
All checks were successful
ci/woodpecker/push/payments_orchestrator Pipeline was successful
Details
ci/woodpecker/push/gateway_tron Pipeline was successful
Details

Browse Source 
Reviewed-on: #428
This commit was merged in pull request #428.
This commit is contained in:
tech
2026-02-05 11:39:24 +00:00
parent 0675978bd1 6e3115e7fa
commit fb9def8c19
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/gateway/tron/internal/service/gateway/driver/evm/evm.go
View File

@@ -155,7 +155,11 @@ func Balance(ctx context.Context, deps driver.Deps, network shared.Network, wall
return nil, merrors.Internal("network rpc url is not configured") return nil, merrors.Internal("network rpc url is not configured")
} }
contract := strings.TrimSpace(wallet.ContractAddress) contract, err := tronBase58ToHex(strings.TrimSpace(wallet.ContractAddress))
if err != nil {
logger.Warn("Failed to convert contract address", zap.String("contract_address", wallet.ContractAddress))
return nil, err
}
if contract == "" { if contract == "" {
logger.Debug("Native balance requested", logFields...) logger.Debug("Native balance requested", logFields...)
return NativeBalance(ctx, deps, network, wallet, normalizedAddress) return NativeBalance(ctx, deps, network, wallet, normalizedAddress)

11
api/payments/orchestrator/storage/mongo/store/payments.go
View File

@@ -200,12 +200,11 @@ func (p *Payments) List(ctx context.Context, filter *model.PaymentFilter) (*mode
query = query.And(endpointFilter) query = query.And(endpointFilter)
} }
} }
if ref := strings.TrimSpace(filter.OrganizationRef); ref != "" { if orgRef, err := bson.ObjectIDFromHex(strings.TrimSpace(filter.OrganizationRef)); err != nil {
orgRef, err := bson.ObjectIDFromHex(ref) p.logger.Warn("Failed to decode organization reference", zap.Error(err),
if err != nil { zap.String("provided_org_ref", filter.OrganizationRef))
p.logger.Warn("Failed to decode organization reference", zap.Error(err), zap.String("provided_org_ref", ref))
return nil, err return nil, err
} } else {
query.And(repository.OrgFilter(orgRef)) query.And(repository.OrgFilter(orgRef))
} }
@@ -231,7 +230,7 @@ func (p *Payments) List(ctx context.Context, filter *model.PaymentFilter) (*mode
decoder := func(cur *mongo.Cursor) error { decoder := func(cur *mongo.Cursor) error {
item := &model.Payment{} item := &model.Payment{}
if err := cur.Decode(item); err != nil { if err := cur.Decode(item); err != nil {
p.logger.Warn("Failed to decode item", zap.Error(err), zap.Any("item", cur.Current)) p.logger.Warn("Failed to decode item", zap.Error(err))
return err return err
} }
payments = append(payments, item) payments = append(payments, item)