Merge pull request #443 from ewasm/evmc-v6

Upgrade EVMC to version 6.0.0

Author: axic

circle.yml

@@ -69,7 +69,7 @@ defaults:
 
   save-aleth-cache: &save-aleth-cache
     save_cache:
-      key: &aleth-cache-key aleth-prebuilt-cache-{{arch}}-{{checksum "toolchain"}}-v1.4.0rc7
+      key: &aleth-cache-key aleth-prebuilt-cache-{{arch}}-{{checksum "toolchain"}}-v1.5.0-alpha.5
       paths:
         - ~/build
         - ~/.hunter
@@ -83,7 +83,7 @@ defaults:
       name: "Checkout aleth repo"
       working_directory: ~/
       command: |
-        git clone https://github.com/ethereum/aleth --branch v1.4.0rc7 --single-branch --recurse-submodules --depth 1
+        git clone https://github.com/ethereum/aleth --branch v1.5.0-alpha.5 --single-branch --recurse-submodules --depth 1
 
   link-hera: &link-hera
     run:
@@ -118,7 +118,7 @@ defaults:
     run:
       name: "Install aleth"
       command: |
-        URL=https://github.com/ethereum/aleth/releases/download/v1.4.0rc7/aleth-1.4.0rc7-linux-x86_64.tar.gz
+        URL=https://github.com/ethereum/aleth/releases/download/v1.5.0-alpha.5/aleth-1.5.0-alpha.5-linux-x86_64.tar.gz
         curl -L $URL | sudo tar xz -C /usr/local
 
   fetch-tests: &fetch-tests

evmc

@@ -66,8 +66,7 @@ namespace hera {
 
       HERA_DEBUG << "): " << dec;
 
-      evmc_uint256be result;
-      m_context->fn_table->get_storage(&result, m_context, &m_msg.destination, &path);
+      evmc_bytes32 result = m_context->host->get_storage(m_context, &m_msg.destination, &path);
 
       if (useHex)
       {
@@ -150,9 +149,8 @@ namespace hera {
       takeInterfaceGas(GasSchedule::balance);
 
       evmc_address address = loadAddress(addressOffset);
-      evmc_uint256be result;
-      m_context->fn_table->get_balance(&result, m_context, &address);
-      storeUint128(result, resultOffset);
+      evmc_uint256be balance = m_context->host->get_balance(m_context, &address);
+      storeUint128(balance, resultOffset);
   }
 
   uint32_t EthereumInterface::eeiGetBlockHash(uint64_t number, uint32_t resultOffset)
@@ -161,8 +159,7 @@ namespace hera {
 
       takeInterfaceGas(GasSchedule::blockhash);
 
-      evmc_uint256be blockhash;
-      m_context->fn_table->get_block_hash(&blockhash, m_context, static_cast<int64_t>(number));
+      evmc_bytes32 blockhash = m_context->host->get_block_hash(m_context, static_cast<int64_t>(number));
 
       if (isZeroUint256(blockhash))
         return 1;
@@ -236,7 +233,7 @@ namespace hera {
       evmc_address address = loadAddress(addressOffset);
       // FIXME: optimise this so no vector needs to be created
       vector<uint8_t> codeBuffer(length);
-      size_t numCopied = m_context->fn_table->copy_code(m_context, &address, codeOffset, codeBuffer.data(), codeBuffer.size());
+      size_t numCopied = m_context->host->copy_code(m_context, &address, codeOffset, codeBuffer.data(), codeBuffer.size());
       ensureCondition(numCopied == length, InvalidMemoryAccess, "Out of bounds (source) memory copy");
 
       storeMemory(codeBuffer, 0, resultOffset, length);
@@ -249,7 +246,7 @@ namespace hera {
       takeInterfaceGas(GasSchedule::extcode);
 
       evmc_address address = loadAddress(addressOffset);
-      size_t code_size = m_context->fn_table->get_code_size(m_context, &address);
+      size_t code_size = m_context->host->get_code_size(m_context, &address);
 
       return static_cast<uint32_t>(code_size);
   }
@@ -317,7 +314,7 @@ namespace hera {
       vector<uint8_t> data(length);
       loadMemory(dataOffset, data, length);
 
-      m_context->fn_table->emit_log(m_context, &m_msg.destination, data.data(), length, topics.data(), numberOfTopics);
+      m_context->host->emit_log(m_context, &m_msg.destination, data.data(), length, topics.data(), numberOfTopics);
   }
 
   int64_t EthereumInterface::eeiGetBlockNumber()
@@ -365,19 +362,17 @@ namespace hera {
 
       ensureCondition(!(m_msg.flags & EVMC_STATIC), StaticModeViolation, "storageStore");
 
-      evmc_uint256be path = loadBytes32(pathOffset);
-      evmc_uint256be value = loadBytes32(valueOffset);
-      evmc_uint256be current;
-
-      m_context->fn_table->get_storage(&current, m_context, &m_msg.destination, &path);
+      evmc_bytes32 path = loadBytes32(pathOffset);
+      evmc_bytes32 value = loadBytes32(valueOffset);
+      evmc_bytes32 current = m_context->host->get_storage(m_context, &m_msg.destination, &path);
 
       // Charge the right amount in case of the create case.
       if (isZeroUint256(current) && !isZeroUint256(value))
         takeInterfaceGas(GasSchedule::storageStoreCreate - GasSchedule::storageStoreChange);
 
       // We do not need to take care about the delete case (gas refund), the client does it.
 
-      m_context->fn_table->set_storage(m_context, &m_msg.destination, &path, &value);
+      m_context->host->set_storage(m_context, &m_msg.destination, &path, &value);
   }
 
   void EthereumInterface::eeiStorageLoad(uint32_t pathOffset, uint32_t resultOffset)
@@ -386,9 +381,8 @@ namespace hera {
 
       takeInterfaceGas(GasSchedule::storageLoad);
 
-      evmc_uint256be path = loadBytes32(pathOffset);
-      evmc_uint256be result;
-      m_context->fn_table->get_storage(&result, m_context, &m_msg.destination, &path);
+      evmc_bytes32 path = loadBytes32(pathOffset);
+      evmc_bytes32 result = m_context->host->get_storage(m_context, &m_msg.destination, &path);
 
       storeBytes32(result, resultOffset);
   }
@@ -431,7 +425,6 @@ namespace hera {
       evmc_message call_message;
       call_message.destination = loadAddress(addressOffset);
       call_message.flags = m_msg.flags & EVMC_STATIC;
-      call_message.code_hash = {};
       call_message.depth = m_msg.depth + 1;
 
       switch (kind) {
@@ -489,8 +482,6 @@ namespace hera {
         call_message.input_size = 0;
       }
 
-      evmc_result call_result;
-
       // Start with base call gas
       takeInterfaceGas(GasSchedule::call);
 
@@ -506,7 +497,7 @@ namespace hera {
           return 1;
 
         // Only charge callNewAccount gas if the account is new and non-zero value is being transferred per EIP161.
-        if ((kind == EEICallKind::Call) && !m_context->fn_table->account_exists(m_context, &call_message.destination))
+        if ((kind == EEICallKind::Call) && !m_context->host->account_exists(m_context, &call_message.destination))
           takeInterfaceGas(GasSchedule::callNewAccount);
       }
 
@@ -522,7 +513,7 @@ namespace hera {
 
       call_message.gas = gas;
 
-      m_context->fn_table->call(&call_result, m_context, &call_message);
+      evmc_result call_result = m_context->host->call(m_context, &call_message);
 
       if (call_result.output_data) {
         m_lastReturnData.assign(call_result.output_data, call_result.output_data + call_result.output_size);
@@ -579,18 +570,15 @@ namespace hera {
         create_message.input_size = 0;
       }
 
-      create_message.code_hash = {};
       create_message.depth = m_msg.depth + 1;
       create_message.kind = EVMC_CREATE;
       create_message.flags = 0;
 
-      evmc_result create_result;
-
       int64_t gas = maxCallGas(m_result.gasLeft);
       create_message.gas = gas;
       takeInterfaceGas(gas);
 
-      m_context->fn_table->call(&create_result, m_context, &create_message);
+      evmc_result create_result = m_context->host->call(m_context, &create_message);
 
       /* Return unspent gas */
       heraAssert(create_result.gas_left >= 0, "EVMC returned negative gas left");
@@ -628,9 +616,10 @@ namespace hera {
 
       evmc_address address = loadAddress(addressOffset);
 
-      if (!m_context->fn_table->account_exists(m_context, &address))
+      if (!m_context->host->account_exists(m_context, &address))
         takeInterfaceGas(GasSchedule::callNewAccount);
-      m_context->fn_table->selfdestruct(m_context, &m_msg.destination, &address);
+
+      m_context->host->selfdestruct(m_context, &m_msg.destination, &address);
 
       throw EndExecution{};
   }
@@ -815,8 +804,7 @@ namespace hera {
 
   bool EthereumInterface::enoughSenderBalanceFor(evmc_uint256be const& value) const
   {
-    evmc_uint256be balance;
-    m_context->fn_table->get_balance(&balance, m_context, &m_msg.destination);
+    evmc_uint256be balance = m_context->host->get_balance(m_context, &m_msg.destination);
     return safeLoadUint128(balance) >= safeLoadUint128(value);
   }
 

src/eei.cpp

@@ -73,7 +73,7 @@ class EthereumInterface {
     m_result.isRevert = false;
 
     // cache the transaction context here
-    m_context->fn_table->get_tx_context(&m_tx_context, m_context);
+    m_tx_context = m_context->host->get_tx_context(m_context);
   }
 
 // WAVM host functions access this interface through an instance,

src/eei.h

@@ -94,7 +94,7 @@ struct hera_instance : evmc_instance {
   bool metering = false;
   map<evmc_address, vector<uint8_t>> contract_preload_list;
 
-  hera_instance() noexcept : evmc_instance({EVMC_ABI_VERSION, "hera", hera_get_buildinfo()->project_version, nullptr, nullptr, nullptr, nullptr}) {}
+  hera_instance() noexcept : evmc_instance({EVMC_ABI_VERSION, "hera", hera_get_buildinfo()->project_version, nullptr, nullptr, nullptr, nullptr, nullptr}) {}
 };
 
 const evmc_address sentinelAddress = { .bytes = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xa } };
@@ -110,21 +110,19 @@ pair<evmc_status_code, vector<uint8_t>> callSystemContract(
   vector<uint8_t> const& input
 ) {
   evmc_message message = {
+    .kind = EVMC_CALL,
+    .flags = EVMC_STATIC,
+    .depth = 0,
+    .gas = gas,
     .destination = address,
     .sender = {},
-    .value = {},
     .input_data = input.data(),
     .input_size = input.size(),
-    .code_hash = {},
+    .value = {},
     .create2_salt = {},
-    .gas = gas,
-    .depth = 0,
-    .kind = EVMC_CALL,
-    .flags = EVMC_STATIC
   };
 
-  evmc_result result;
-  context->fn_table->call(&result, context, &message);
+  evmc_result result = context->host->call(context, &message);
 
   vector<uint8_t> ret;
   if (result.status_code == EVMC_SUCCESS && result.output_data)
@@ -471,7 +469,7 @@ bool hera_parse_sys_option(hera_instance *hera, string const& _name, string cons
   return true;
 }
 
-int hera_set_option(
+evmc_set_option_result hera_set_option(
   evmc_instance *instance,
   char const *name,
   char const *value
@@ -481,29 +479,32 @@ int hera_set_option(
   if (strcmp(name, "evm1mode") == 0) {
     if (evm1mode_options.count(value)) {
       hera->evm1mode = evm1mode_options.at(value);
-      return 1;
+      return EVMC_SET_OPTION_SUCCESS;
     }
+    return EVMC_SET_OPTION_INVALID_VALUE;
   }
 
   if (strcmp(name, "metering") == 0) {
     hera->metering = strcmp(value, "true") == 0;
-    return 1;
+    return EVMC_SET_OPTION_SUCCESS;
   }
 
   if (strcmp(name, "engine") == 0) {
     auto it = wasm_engine_map.find(value);
     if (it != wasm_engine_map.end()) {
       hera->engine = it->second();
-      return 1;
+      return EVMC_SET_OPTION_SUCCESS;
     }
+    return EVMC_SET_OPTION_INVALID_VALUE;
   }
 
   if (strncmp(name, "sys:", 4) == 0) {
     if (hera_parse_sys_option(hera, string(name), string(value)))
-      return 1;
+      return EVMC_SET_OPTION_SUCCESS;
+    return EVMC_SET_OPTION_INVALID_VALUE;
   }
 
-  return 0;
+  return EVMC_SET_OPTION_INVALID_NAME;
 }
 
 void hera_destroy(evmc_instance* instance) noexcept
@@ -512,6 +513,14 @@ void hera_destroy(evmc_instance* instance) noexcept
   delete hera;
 }
 
+evmc_capabilities_flagset hera_get_capabilities(evmc_instance* instance)
+{
+  evmc_capabilities_flagset caps = EVMC_CAPABILITY_EWASM;
+  if (static_cast<hera_instance*>(instance)->evm1mode != hera_evm1mode::reject)
+    caps |= EVMC_CAPABILITY_EVM1;
+  return caps;
+}
+
 } // anonymous namespace
 
 extern "C" {
@@ -521,6 +530,7 @@ evmc_instance* evmc_create_hera() noexcept
   hera_instance* instance = new hera_instance;
   instance->destroy = hera_destroy;
   instance->execute = hera_execute;
+  instance->get_capabilities = hera_get_capabilities;
   instance->set_option = hera_set_option;
   return instance;
 }