build fix (2)

BeamMW · Jun 29, 2023 · 18e765d · 18e765d
1 parent 594e218
commit 18e765d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bvm/evm.cpp b/bvm/evm.cpp
@@ -973,12 +973,16 @@ OnOpcode(Create2)
 	Address aNew;
 	{
 		KeccakProcessor<Word::nBits> hp;
+
 		uint8_t n = 0xff;
 		hp.Write(&n, sizeof(n));
-		hp << get_Caller(p).ToWord();
-		hp << wSalt;
 
 		Word wRes;
+		get_Caller(p).ToWord(wRes);
+
+		hp << wRes;
+		hp << wSalt;
+
 		hp >> wRes;
 		aNew = Address::W2A(wRes);
 	}

diff --git a/core/keccak.h b/core/keccak.h
@@ -17,7 +17,6 @@ namespace beam
 		static const uint32_t nWordsBlock = nSizeBlock / nSizeWord;
 
 		KeccakProcessor()
-			:m_LastWordBytes(0) // workaround, otherwise compiler with optimizations produces an out-of-bounds error/warning
 		{
 			ZeroObject(*this);