fix uchar merge conflict

josibake · Jan 19, 2024 · 67e7df4 · 67e7df4
1 parent 16cd62c
commit 67e7df4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/key.cpp b/src/key.cpp
@@ -221,7 +221,7 @@ CPubKey CKey::UnhashedECDH(const CPubKey& pubkey) const
         return 1;
     };
 
-    int ret = secp256k1_ecdh(secp256k1_context_sign, shared_secret, &ecdh_pubkey, this->begin(), not_a_hash_function, nullptr);
+    int ret = secp256k1_ecdh(secp256k1_context_sign, shared_secret, &ecdh_pubkey, UCharCast(this->begin()), not_a_hash_function, nullptr);
     assert(ret);
 
     CPubKey result(shared_secret);

diff --git a/src/wallet/silentpayments.cpp b/src/wallet/silentpayments.cpp
@@ -103,7 +103,7 @@ CKey SumInputPrivKeys(const std::vector<std::pair<CKey, bool>>& sender_secret_ke
         if (sender_is_taproot && sender_seckey.GetPubKey()[0] == 3) {
             temp_key.Negate();
         }
-        sum_seckey.TweakAdd(temp_key.begin());
+        sum_seckey.TweakAdd(UCharCast(temp_key.begin()));
     }
     return sum_seckey;
 }
@@ -151,7 +151,7 @@ std::vector<uint256> GetTxOutputTweaks(const CPubKey& spend_pubkey, const CPubKe
         CKey tmp;
         tmp.Set(tweak.begin(), tweak.end(), /*fCompressedIn=*/true);
         tmp.TweakAdd(label_tweak.begin());
-        std::copy(tmp.begin(), tmp.end(), combined_tweaks.begin());
+        std::copy(UCharCast(tmp.begin()), UCharCast(tmp.end()), combined_tweaks.begin());
         return combined_tweaks;
     };