From c0ca93cf7aba5371fb8b2880b40fc5252a455c56 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 22 Oct 2024 12:21:19 -0500
Subject: [PATCH] Merge #6340: fix: make 6336 compile in v21.1.x branch, using
 older CHECK_NONFATAL functionality

a7bbcc823d800b293e9ec54dff518fa9929c763c fix: make 6336 compile in v21.1.x branch, using older CHECK_NONFATAL functionality (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  Resolve build failures when 6336 is back ported

  ## What was done?
  Use older functionality of CHECK_NONFATAL

  ## How Has This Been Tested?
  built on both branches

  ## Breaking Changes

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK a7bbcc823d800b293e9ec54dff518fa9929c763c
  UdjinM6:
    utACK a7bbcc823d800b293e9ec54dff518fa9929c763c (#6339 compiles with this one applied on top of it)
  kwvg:
    utACK a7bbcc823d800b293e9ec54dff518fa9929c763c

Tree-SHA512: 17b6d8223f653eaafa6ef9d1a4e8fc14ca1fe1623fbb13d23a9429e87a64c8fae3ddaf6d2d8d5a52138ab712a36949662b38a8a9cbbc5db3618ce24f565f6f2a
---
 src/core_write.cpp     | 4 +++-
 src/rpc/blockchain.cpp | 4 +++-
 src/rpc/masternode.cpp | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core_write.cpp b/src/core_write.cpp
index 2edee784bb..a2cdf68aa4 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -336,7 +336,9 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, bool include_add
     if (calculate_fee) {
         CAmount fee = amt_total_in - amt_total_out;
         if (tx.IsPlatformTransfer()) {
-            fee = CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(tx))->getFee();
+            auto payload = GetTxPayload<CAssetUnlockPayload>(tx);
+            CHECK_NONFATAL(payload);
+            fee = payload->getFee();
         }
         CHECK_NONFATAL(MoneyRange(fee));
         entry.pushKV("fee", ValueFromAmount(fee));
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 44221b64d1..6535a70f93 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2426,7 +2426,9 @@ static RPCHelpMan getblockstats()
             CAmount txfee = tx_total_in - tx_total_out;
 
             if (tx->IsPlatformTransfer()) {
-                txfee = CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(*tx))->getFee();
+                auto payload = GetTxPayload<CAssetUnlockPayload>(*tx);
+                CHECK_NONFATAL(payload);
+                txfee = payload->getFee();
             }
 
             CHECK_NONFATAL(MoneyRange(txfee));
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 92940d4b28..ad0869c3b7 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -411,7 +411,9 @@ static RPCHelpMan masternode_payments()
                 continue;
             }
             if (tx->IsPlatformTransfer()) {
-                nBlockFees += CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(*tx))->getFee();
+                auto payload = GetTxPayload<CAssetUnlockPayload>(*tx);
+                CHECK_NONFATAL(payload);
+                nBlockFees += payload->getFee();
                 continue;
             }