Skip to content
Merged
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions controller/account_payment_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,34 +337,34 @@ func advancePayment(

payoutAmount := model.NanoCentsToUsd(payment.Payout)

feeInUSDC, err := func() (float64, error) {
estimatedFees, err := circleClient.EstimateTransferFee(
clientSession.Ctx,
payoutAmount,
accountWallet.WalletAddress,
formattedBlockchain,
)
if err != nil {
return 0, fmt.Errorf("[%s]Payment fee estimate error = %s", payment.PaymentId, err)
}

fee, err := CalculateFee(*estimatedFees.Medium, formattedBlockchain)
if err != nil {
return 0, err
}

feeInUSDC, err := ConvertFeeToUSDC(clientSession.Ctx, formattedBlockchain, *fee)
if err != nil {
return 0, fmt.Errorf("[%s]Payment fee conversion error = %s", payment.PaymentId, err)
}

return feeInUSDC, nil
}()
if err != nil {
// just choose a reasonable value
glog.Infof("[payout][%s]fee estimate failed. Using default fee. err = %s\n", payment.PaymentId, err)
feeInUSDC = 0.01
}
// feeInUSDC, err := func() (float64, error) {
// estimatedFees, err := circleClient.EstimateTransferFee(
// clientSession.Ctx,
// payoutAmount,
// accountWallet.WalletAddress,
// formattedBlockchain,
// )
// if err != nil {
// return 0, fmt.Errorf("[%s]Payment fee estimate error = %s", payment.PaymentId, err)
// }

// fee, err := CalculateFee(*estimatedFees.Medium, formattedBlockchain)
// if err != nil {
// return 0, err
// }

// feeInUSDC, err := ConvertFeeToUSDC(clientSession.Ctx, formattedBlockchain, *fee)
// if err != nil {
// return 0, fmt.Errorf("[%s]Payment fee conversion error = %s", payment.PaymentId, err)
// }

// return feeInUSDC, nil
// }()
// if err != nil {
// just choose a reasonable value
// glog.Infof("[payout][%s]fee estimate failed. Using default fee. err = %s\n", payment.PaymentId, err)
feeInUSDC := 0.01
// }

payoutAmount = payoutAmount - feeInUSDC

Expand Down