Merge branch 'bright_boson_2.1RC' into mainnet

Author: anatolse

core/block_crypt.cpp

@@ -159,7 +159,15 @@ namespace beam
 
 	void SwitchCommitment::CreateInternal(ECC::Scalar::Native& sk, ECC::Point::Native& comm, bool bComm, Key::IKdf& kdf, const Key::IDV& kidv) const
 	{
-		kdf.DeriveKey(sk, kidv);
+		uint32_t iScheme = kidv.m_SubIdx >> 24;
+		if (2 == iScheme)
+		{
+			Key::IDV kidv2 = kidv;
+			kidv2.m_SubIdx &= ((1U << 24) - 1);
+			kdf.DeriveKey(sk, kidv2);
+		}
+		else
+			kdf.DeriveKey(sk, kidv);
 
 		comm = ECC::Context::get().G * sk;
 		AddValue(comm, kidv.m_Value);

wallet/wallet.cpp

@@ -615,10 +615,10 @@ namespace beam
 
     void Wallet::OnRequestComplete(MyRequestUtxoEvents& r)
     {
-        const std::vector<proto::UtxoEvent>& v = r.m_Res.m_Events;
+        std::vector<proto::UtxoEvent>& v = r.m_Res.m_Events;
 		for (size_t i = 0; i < v.size(); i++)
 		{
-			const proto::UtxoEvent& evt = v[i];
+			proto::UtxoEvent& evt = v[i];
 
 			// filter-out false positives
 			Scalar::Native sk;
@@ -627,6 +627,20 @@ namespace beam
 
 			if (comm == evt.m_Commitment)
 				ProcessUtxoEvent(evt);
+			else
+			{
+				uint32_t iScheme = evt.m_Kidv.m_SubIdx >> 24;
+				if (!iScheme && evt.m_Kidv.m_SubIdx)
+				{
+					// Is it BB2.1?
+					evt.m_Kidv.m_SubIdx |= (2U << 24);
+
+					m_WalletDB->calcCommitment(sk, comm, evt.m_Kidv);
+
+					if (comm == evt.m_Commitment)
+						ProcessUtxoEvent(evt);
+				}
+			}
 		}
 
 		if (r.m_Res.m_Events.size() < proto::UtxoEvent::s_Max)

wallet/wallet_db.cpp

@@ -1357,9 +1357,13 @@ namespace beam
     Key::IKdf::Ptr IWalletDB::get_ChildKdf(Key::Index iKdf) const
     {
         Key::IKdf::Ptr pMaster = get_MasterKdf();
-        if (!iKdf || pMaster)
+        if (!iKdf)
             return pMaster; // by convention 0 is not a childd
 
+		uint32_t iScheme = iKdf >> 24;
+		if (2 == iScheme)
+			return pMaster; // workaround!
+
         Key::IKdf::Ptr pRet;
         ECC::HKdf::CreateChild(pRet, *pMaster, iKdf);
         return pRet;