Merge #6340: fix: make 6336 compile in v21.1.x branch, using older CHECK_NONFATAL functionality

PastaPastaPasta · PastaPastaPasta · commit d494339b9f05 · 2024-10-22T12:22:14.000-05:00
a7bbcc8 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 a7bbcc8 UdjinM6: utACK a7bbcc8 (#6339 compiles with this one applied on top of it) kwvg: utACK a7bbcc8 Tree-SHA512: 17b6d8223f653eaafa6ef9d1a4e8fc14ca1fe1623fbb13d23a9429e87a64c8fae3ddaf6d2d8d5a52138ab712a36949662b38a8a9cbbc5db3618ce24f565f6f2a
diff --git 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
@@ -2453,7 +2453,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
@@ -408,7 +408,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;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2453,7 +2453,9 @@ static RPCHelpMan getblockstats()`
`2453`	`2453`	`CAmount txfee = tx_total_in - tx_total_out;`
`2454`	`2454`
`2455`	`2455`	`if (tx->IsPlatformTransfer()) {`
`2456`		`- txfee = CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(*tx))->getFee();`
	`2456`	`+ auto payload = GetTxPayload<CAssetUnlockPayload>(*tx);`
	`2457`	`+ CHECK_NONFATAL(payload);`
	`2458`	`+ txfee = payload->getFee();`
`2457`	`2459`	`}`
`2458`	`2460`
`2459`	`2461`	`CHECK_NONFATAL(MoneyRange(txfee));`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,9 @@ static RPCHelpMan masternode_payments()`
`408`	`408`	`continue;`
`409`	`409`	`}`
`410`	`410`	`if (tx->IsPlatformTransfer()) {`
`411`		`- nBlockFees += CHECK_NONFATAL(GetTxPayload<CAssetUnlockPayload>(*tx))->getFee();`
	`411`	`+ auto payload = GetTxPayload<CAssetUnlockPayload>(*tx);`
	`412`	`+ CHECK_NONFATAL(payload);`
	`413`	`+ nBlockFees += payload->getFee();`
`412`	`414`	`continue;`
`413`	`415`	`}`
`414`	`416`