BugFix: sapling operation, only set the final transaction at the end of the process.

furszy · furszy · commit 362366b28899 · 2021-02-15T17:44:32.000-03:00
And migrate the member type to CTransactionRef.
diff --git a/src/sapling/sapling_operation.cpp b/src/sapling/sapling_operation.cpp
@@ -177,13 +177,11 @@ OperationResult SaplingOperation::build()
         if (!opTx) {
             return errorOut("Failed to build transaction: " + txResult.GetError());
         }
-        finalTx.reset();
-        finalTx = MakeTransactionRef(*opTx);
 
         // Now check fee
-        bool isShielded = finalTx->IsShieldedTx();
-        const CAmount& nFeeNeeded = isShielded ? GetShieldedTxMinFee(*finalTx) :
-                                                 GetMinRelayFee(finalTx->GetTotalSize(), false);
+        bool isShielded = opTx->IsShieldedTx();
+        const CAmount& nFeeNeeded = isShielded ? GetShieldedTxMinFee(*opTx) :
+                                                 GetMinRelayFee(opTx->GetTotalSize(), false);
         if (nFeeNeeded <= nFeeRet) {
             // Check that the fee is not too high.
             CAmount nMaxFee = nFeeNeeded * (isShielded ? 100 : 10000);
@@ -223,7 +221,6 @@ OperationResult SaplingOperation::build()
     if (!opTx) {
         return errorOut("Failed to build transaction: " + txResult.GetError());
     }
-    finalTx.reset();
     finalTx = MakeTransactionRef(*opTx);
     return OperationResult(true);
 }
diff --git a/src/test/librust/sapling_rpc_wallet_tests.cpp b/src/test/librust/sapling_rpc_wallet_tests.cpp
@@ -408,8 +408,9 @@ BOOST_AUTO_TEST_CASE(rpc_shieldsendmany_taddr_to_sapling)
     // Add a fake transaction to the wallet
     CMutableTransaction mtx;
     mtx.vout.emplace_back(5 * COIN, GetScriptForDestination(taddr));
-    CWalletTx wtx(pwalletMain, MakeTransactionRef(mtx));
-    pwalletMain->LoadToWallet(wtx);
+    // Add to wallet and get the updated wtx
+    pwalletMain->LoadToWallet({pwalletMain, MakeTransactionRef(mtx)});
+    CWalletTx& wtx = pwalletMain->mapWallet.at(mtx.GetHash());
 
     // Fake-mine the transaction
     BOOST_CHECK_EQUAL(0, chainActive.Height());
@@ -426,6 +427,7 @@ BOOST_AUTO_TEST_CASE(rpc_shieldsendmany_taddr_to_sapling)
     BOOST_CHECK_EQUAL(1, chainActive.Height());
     wtx.SetMerkleBranch(blockHash, 0);
     pwalletMain->LoadToWallet(wtx);
+    BOOST_CHECK_MESSAGE(pwalletMain->GetAvailableBalance() > 0, "tx not confirmed");
 
     // Context that shieldsendmany requires
     auto builder = TransactionBuilder(consensusParams, nextBlockHeight, pwalletMain);
