mirror of
https://github.com/GMWalletApp/epusdt.git
synced 2026-07-07 10:16:15 +00:00
feat: isolate manual verification RPC usage
- add rpc node purpose support for general/manual_verify/both - keep scan, WSS and health checks away from manual_verify nodes - fallback manual hash verification from general RPC to manual_verify RPC - add public cashier hash submission path and errno responses - update tests for RPC selection, failover and manual payment flows
This commit is contained in:
@@ -60,7 +60,7 @@ func CreateTransaction(req *request.CreateTransactionRequest, apiKey *mdb.ApiKey
|
||||
network := strings.ToLower(strings.TrimSpace(req.Network))
|
||||
notifyURL := strings.TrimSpace(req.NotifyUrl)
|
||||
if err := security.ValidatePublicHTTPURL(notifyURL); err != nil {
|
||||
return nil, err
|
||||
return nil, constant.NotifyURLErr
|
||||
}
|
||||
|
||||
gCreateTransactionLock.Lock()
|
||||
@@ -351,16 +351,43 @@ func SubmitManualPayment(tradeId, blockTransactionId string) (*response.ManualPa
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if order.Status != mdb.StatusWaitPay {
|
||||
return nil, constant.OrderNotWaitPay
|
||||
return submitManualPaymentForOrder(order, blockTransactionId)
|
||||
}
|
||||
|
||||
// SubmitCashierManualPayment is the public cashier variant. It rejects hashes
|
||||
// already stored on any order before touching RPC so repeated/public probes do
|
||||
// not spend RPC quota. Admin mark-paid intentionally keeps using
|
||||
// SubmitManualPayment and the existing verification path.
|
||||
func SubmitCashierManualPayment(tradeId, blockTransactionId string) (*response.ManualPaymentResponse, error) {
|
||||
tradeId = strings.TrimSpace(tradeId)
|
||||
blockTransactionId = strings.TrimSpace(blockTransactionId)
|
||||
|
||||
order, err := GetOrderInfoByTradeId(tradeId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if !isOnChainOrder(order.PayProvider) {
|
||||
return nil, errors.New("order is not an on-chain payment order")
|
||||
if err = validateManualPaymentOrder(order); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = ensureManualBlockTransactionUnused(order, blockTransactionId); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return submitManualPaymentForOrder(order, blockTransactionId)
|
||||
}
|
||||
|
||||
func submitManualPaymentForOrder(order *mdb.Orders, blockTransactionId string) (*response.ManualPaymentResponse, error) {
|
||||
blockTransactionId = strings.TrimSpace(blockTransactionId)
|
||||
if err := validateManualPaymentOrder(order); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
verifiedBlockTransactionID, err := ValidateManualOrderPayment(order, blockTransactionId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
var rspErr *constant.RspError
|
||||
if errors.As(err, &rspErr) {
|
||||
return nil, err
|
||||
}
|
||||
return nil, constant.ManualPaymentVerifyErr
|
||||
}
|
||||
if err = OrderProcessing(&request.OrderProcessingRequest{
|
||||
ReceiveAddress: order.ReceiveAddress,
|
||||
@@ -385,6 +412,16 @@ func SubmitManualPayment(tradeId, blockTransactionId string) (*response.ManualPa
|
||||
}, nil
|
||||
}
|
||||
|
||||
func validateManualPaymentOrder(order *mdb.Orders) error {
|
||||
if order.Status != mdb.StatusWaitPay {
|
||||
return constant.OrderNotWaitPay
|
||||
}
|
||||
if !isOnChainOrder(order.PayProvider) {
|
||||
return constant.ManualPaymentProviderErr
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func isOnChainOrder(payProvider string) bool {
|
||||
payProvider = strings.TrimSpace(payProvider)
|
||||
return payProvider == "" || payProvider == mdb.PaymentProviderOnChain
|
||||
@@ -645,7 +682,7 @@ func switchToOkPay(parent *mdb.Orders, token string) (*response.CheckoutCounterR
|
||||
if err != nil {
|
||||
_ = data.MarkProviderOrderFailed(subTradeID, mdb.PaymentProviderOkPay)
|
||||
_ = data.ExpireOrderByTradeID(subTradeID)
|
||||
return nil, err
|
||||
return nil, constant.PaymentProviderCreateErr
|
||||
}
|
||||
if err = data.UpdateProviderOrderCreated(subTradeID, mdb.PaymentProviderOkPay, okpayOrder.ProviderOrderID, okpayOrder.PayURL); err != nil {
|
||||
_ = data.MarkProviderOrderFailed(subTradeID, mdb.PaymentProviderOkPay)
|
||||
|
||||
Reference in New Issue
Block a user