From 25ac6b85173f6e4315a91a9be5b95bb29a25ce15 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 20 Oct 2015 17:30:22 +0200
Subject: New vocab.

---
 test/libsolidity/SolidityEndToEndTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 27c511f2..c9e6931f 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1151,7 +1151,7 @@ BOOST_AUTO_TEST_CASE(blockchain)
 							 "    blockNumber = block.number;\n"
 							 "  }\n"
 							 "}\n";
-	m_envInfo.setBeneficiary(Address(0x123));
+	m_envInfo.setAuthor(Address(0x123));
 	m_envInfo.setNumber(7);
 	compileAndRun(sourceCode, 27);
 	BOOST_CHECK(callContractFunctionWithValue("someInfo()", 28) == encodeArgs(28, 0x123, 7));
-- 
cgit v1.2.3


From a89fa9999400e8be775f757bd779eb4e025fd223 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Tue, 20 Oct 2015 17:30:22 +0200
Subject: New vocab.

---
 test/libsolidity/SolidityEndToEndTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 460396a8..700201aa 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1151,7 +1151,7 @@ BOOST_AUTO_TEST_CASE(blockchain)
 							 "    blockNumber = block.number;\n"
 							 "  }\n"
 							 "}\n";
-	m_envInfo.setBeneficiary(Address(0x123));
+	m_envInfo.setAuthor(Address(0x123));
 	m_envInfo.setNumber(7);
 	compileAndRun(sourceCode, 27);
 	BOOST_CHECK(callContractFunctionWithValue("someInfo()", 28) == encodeArgs(28, 0x123, 7));
-- 
cgit v1.2.3


From 2f85153dcc461f4c462071b6001c9bd453fab3b7 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Fri, 6 Nov 2015 14:23:18 +0100
Subject: Fixups for new API.

---
 test/libsolidity/solidityExecutionFramework.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
index 4da02eb2..7503b0fa 100644
--- a/test/libsolidity/solidityExecutionFramework.h
+++ b/test/libsolidity/solidityExecutionFramework.h
@@ -42,7 +42,8 @@ namespace test
 class ExecutionFramework
 {
 public:
-	ExecutionFramework()
+	ExecutionFramework():
+		m_state(eth::State::Null)
 	{
 		if (g_logVerbosity != -1)
 			g_logVerbosity = 0;
-- 
cgit v1.2.3


From ad249e5787862c900b6c9fa780f00fa034191dd2 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Mon, 16 Nov 2015 21:00:05 +0100
Subject: Fix tests for new API.

---
 test/libsolidity/solidityExecutionFramework.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
index 7503b0fa..64faf7b6 100644
--- a/test/libsolidity/solidityExecutionFramework.h
+++ b/test/libsolidity/solidityExecutionFramework.h
@@ -43,7 +43,7 @@ class ExecutionFramework
 {
 public:
 	ExecutionFramework():
-		m_state(eth::State::Null)
+		m_state(0)
 	{
 		if (g_logVerbosity != -1)
 			g_logVerbosity = 0;
-- 
cgit v1.2.3


From 938b6793f1a555d8e98e949c8fd2a6838f0d6c43 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Thu, 19 Nov 2015 10:19:53 +0100
Subject: Minor API change - must provide SealEngine to Executive now.

---
 libsolidity/codegen/CompilerUtils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index dd38ef97..6d82e94b 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -276,8 +276,10 @@ void CompilerUtils::memoryCopy()
 	m_context << u256(0) << u256(identityContractAddress);
 	// compute gas costs
 	m_context << u256(32) << eth::Instruction::DUP5 << u256(31) << eth::Instruction::ADD;
-	m_context << eth::Instruction::DIV << u256(eth::c_identityWordGas) << eth::Instruction::MUL;
-	m_context << u256(eth::c_identityGas) << eth::Instruction::ADD;
+	static unsigned c_identityGas = 3;
+	static unsigned c_identityWordGas = 15;
+	m_context << eth::Instruction::DIV << u256(c_identityWordGas) << eth::Instruction::MUL;
+	m_context << u256(c_identityGas) << eth::Instruction::ADD;
 	m_context << eth::Instruction::CALL;
 	m_context << eth::Instruction::POP; // ignore return value
 }
-- 
cgit v1.2.3