fix: merge solidity 0.8.11 conflicts

Author: neo hong

test/ExecutionFramework.h

@@ -50,7 +50,8 @@ namespace solidity::test
 using rational = boost::rational<bigint>;
 
 // The various denominations; here for ease of use where needed within code.
-static u256 const sun = 1;
+static const u256 sun = 1;
+static const u256 trx = sun * 1000000;
 
 class ExecutionFramework
 {
@@ -274,8 +275,7 @@ class ExecutionFramework
 	}
 
 protected:
-	u256 const m_gasPrice = 10000 * sun;
-	u256 const m_gas = 100000000;
+	u256 const InitialGas = 100000000;
 
 	void selectVM(evmc_capabilities _cap = evmc_capabilities::EVMC_CAPABILITY_EVM1);
 	void reset();
@@ -306,6 +306,8 @@ class ExecutionFramework
 	bool m_transactionSuccessful = true;
 	util::h160 m_sender = account(0);
 	util::h160 m_contractAddress;
+	u256 const m_gasPrice = 10000 * sun;
+	u256 const m_gas = 100000000;
 	bytes m_output;
 	u256 m_gasUsed;
 };