Set the txversion to 1 when creating a raw transaction through rpc. Handle the "key" marking parameter properly and show the generate privkey only if no key parameter has been passed

Author: bitmarkcc

src/rpc/rawtransaction_util.cpp

@@ -146,6 +146,7 @@ void AddOutputs(CMutableTransaction& rawTx, const UniValue& outputs_in)
 CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, std::optional<bool> rbf)
 {
     CMutableTransaction rawTx;
+    rawTx.nVersion = 1; // todo make this more general for the future where tx version may be larger
 
     if (!locktime.isNull()) {
         int64_t nLockTime = locktime.getInt<int64_t>();

src/wallet/rpc/spend.cpp

@@ -474,7 +474,7 @@ void MarkPubKeysHLDK(std::vector<uchar>& pubkeyH, std::vector<uchar>& pubkeyL, s
     }
 
     unsigned int lenKeyHex = mark.keyHex.size();
-    if (lenKeyHex==32) {
+    if (lenKeyHex==32) { // nostr public key
 	pubkeyK.push_back(2); // (I think) prefix 02 is assumed for nostr
 	for (int i=0; i<lenKeyHex; i++) {
 	    pubkeyK.push_back(mark.keyHex[i]);
@@ -483,6 +483,10 @@ void MarkPubKeysHLDK(std::vector<uchar>& pubkeyH, std::vector<uchar>& pubkeyL, s
 	    pubkeyH.push_back(0);
 	}
     }
+    else if (lenKeyHex==33) { // compressed public key
+      for (int i=0; i<lenKeyHex; i++)
+	pubkeyK.push_back(mark.keyHex[i]);
+    }
 }
 
 RPCHelpMan mark()
@@ -678,9 +682,10 @@ RPCHelpMan mark()
     CKey key;
     key.MakeNewKey(false);
     CPubKey spendKey = key.GetPubKey();
-    pwallet->WalletLogPrintf("private key for %s = %s\n",spendKey.GetHash().GetHex(),EncodeSecret(key));
     std::vector<uchar> pubkeyH, pubkeyL, pubkeyD, pubkeyK;
     MarkPubKeysHLDK(pubkeyH,pubkeyL,pubkeyD,pubkeyK,mark);
+    if (!pubkeyK.size())
+      pwallet->WalletLogPrintf("private key for %s = %s\n",spendKey.GetHash().GetHex(),EncodeSecret(key));
     CPubKey hashKey;
     CPubKey linkKey;
     CPubKey descKey;