EVM invoke WIP (1)

BeamMW · Sep 18, 2023 · 32d33c7 · 32d33c7
1 parent 756ed92
commit 32d33c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/core/block_crypt.cpp b/core/block_crypt.cpp
@@ -1535,6 +1535,7 @@ namespace beam
 		v.m_To = m_To;
 		v.m_Nonce = m_Nonce;
 		v.m_Amount = m_Amount;
+		v.m_Subsidy = m_Subsidy;
 	}
 
 	void TxKernelEvmInvoke::HashSelfForMsg(ECC::Hash::Processor& hp) const
@@ -1544,7 +1545,8 @@ namespace beam
 			<< m_From
 			<< m_To
 			<< m_Nonce
-			<< m_Amount;
+			<< m_Amount
+			<< static_cast<Amount>(m_Subsidy);
 	}
 
 	void TxKernelEvmInvoke::TestValid(Height hScheme, ECC::Point::Native& exc, const TxKernel* pParent /* = nullptr */) const
@@ -1558,27 +1560,20 @@ namespace beam
 		pComm[0].ImportNnzStrict(m_Commitment);
 		exc += pComm[0];
 
-		bool bFromBlock = (m_From == Zero);
-		bool bToBlock = (m_To == Zero);
-
-		if (m_Amount && (bFromBlock != bToBlock))
+		if (m_Subsidy)
 		{
+			bool isPositive;
+			Amount val = SplitAmountSigned(m_Subsidy, isPositive);
+
 			ECC::Mode::Scope scope(ECC::Mode::Fast);
 
-			pComm[1] = ECC::Context::get().H * m_Amount;
-			if (bFromBlock)
+			pComm[1] = ECC::Context::get().H * val;
+			if (isPositive)
 				pComm[1] = -pComm[1];
 
 			pComm[0] += pComm[1];
 		}
 
-
-		if (bFromBlock)
-		{
-			if (!m_Signature.IsValid(m_Internal.m_ID, pComm[0]))
-				TxBase::Fail_Signature();
-		}
-		else
 		{
 			auto& s = Cast::Down<ECC::SignatureBase>(m_Signature);
 

diff --git a/core/block_crypt.h b/core/block_crypt.h
@@ -1249,9 +1249,10 @@ namespace beam
 		:public TxKernelContractControl
 	{
 		ECC::uintBig m_From;
-		ECC::uintBig m_To;
+		uintBig_t<20> m_To;
 		uint64_t m_Nonce; // not necessary
 		Amount m_Amount;
+		AmountSigned m_Subsidy;
 
 		typedef std::unique_ptr<TxKernelEvmInvoke> Ptr;
 

diff --git a/core/serialization_adapters.h b/core/serialization_adapters.h
@@ -1714,7 +1714,8 @@ namespace detail
 				& val.m_From
 				& val.m_To
 				& val.m_Nonce
-				& val.m_Amount;
+				& val.m_Amount
+				& val.m_Subsidy;
 			return ar;
 		}
 
@@ -1726,7 +1727,8 @@ namespace detail
 				& val.m_From
 				& val.m_To
 				& val.m_Nonce
-				& val.m_Amount;
+				& val.m_Amount
+				& val.m_Subsidy;
 		}
 
         /// beam::Transaction serialization