Skip to content

Commit 924f704

Browse files
authored
Merge pull request #349 from urnetwork/payment-estimation-change
apc: remove fee estimation
2 parents bc40ced + 471a825 commit 924f704

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

controller/account_payment_controller.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -337,34 +337,34 @@ func advancePayment(
337337

338338
payoutAmount := model.NanoCentsToUsd(payment.Payout)
339339

340-
feeInUSDC, err := func() (float64, error) {
341-
estimatedFees, err := circleClient.EstimateTransferFee(
342-
clientSession.Ctx,
343-
payoutAmount,
344-
accountWallet.WalletAddress,
345-
formattedBlockchain,
346-
)
347-
if err != nil {
348-
return 0, fmt.Errorf("[%s]Payment fee estimate error = %s", payment.PaymentId, err)
349-
}
350-
351-
fee, err := CalculateFee(*estimatedFees.Medium, formattedBlockchain)
352-
if err != nil {
353-
return 0, err
354-
}
355-
356-
feeInUSDC, err := ConvertFeeToUSDC(clientSession.Ctx, formattedBlockchain, *fee)
357-
if err != nil {
358-
return 0, fmt.Errorf("[%s]Payment fee conversion error = %s", payment.PaymentId, err)
359-
}
360-
361-
return feeInUSDC, nil
362-
}()
363-
if err != nil {
364-
// just choose a reasonable value
365-
glog.Infof("[payout][%s]fee estimate failed. Using default fee. err = %s\n", payment.PaymentId, err)
366-
feeInUSDC = 0.01
367-
}
340+
// feeInUSDC, err := func() (float64, error) {
341+
// estimatedFees, err := circleClient.EstimateTransferFee(
342+
// clientSession.Ctx,
343+
// payoutAmount,
344+
// accountWallet.WalletAddress,
345+
// formattedBlockchain,
346+
// )
347+
// if err != nil {
348+
// return 0, fmt.Errorf("[%s]Payment fee estimate error = %s", payment.PaymentId, err)
349+
// }
350+
351+
// fee, err := CalculateFee(*estimatedFees.Medium, formattedBlockchain)
352+
// if err != nil {
353+
// return 0, err
354+
// }
355+
356+
// feeInUSDC, err := ConvertFeeToUSDC(clientSession.Ctx, formattedBlockchain, *fee)
357+
// if err != nil {
358+
// return 0, fmt.Errorf("[%s]Payment fee conversion error = %s", payment.PaymentId, err)
359+
// }
360+
361+
// return feeInUSDC, nil
362+
// }()
363+
// if err != nil {
364+
// just choose a reasonable value
365+
// glog.Infof("[payout][%s]fee estimate failed. Using default fee. err = %s\n", payment.PaymentId, err)
366+
feeInUSDC := 0.01
367+
// }
368368

369369
payoutAmount = payoutAmount - feeInUSDC
370370

0 commit comments

Comments
 (0)