From 18e765d6df0e8af67114a70314416c3f6f10ef9b Mon Sep 17 00:00:00 2001
From: valdok <valdo@beam-mw.com>
Date: Thu, 29 Jun 2023 19:18:48 +0300
Subject: [PATCH] build fix (2)

---
 bvm/evm.cpp   | 8 ++++++--
 core/keccak.h | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bvm/evm.cpp b/bvm/evm.cpp
index aa3bc8369..9245896f2 100644
--- 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
index 9b7743d87..78d6a3c11 100644
--- 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);