tools: Add --create option to evmc run

Author: chfast

test/tools/CMakeLists.txt

@@ -33,5 +33,11 @@ add_evmc_tool_test(
     "Result: +success[\r\n]+Gas used: +7[\r\n]+Output: +aabbccdd00000000000000000000000000000000000000000000000000000000[\r\n]"
 )
 
+add_evmc_tool_test(
+    create_return_2
+    "--vm $<TARGET_FILE:evmc::example-vm> run --create 6960026000526001601ff3600052600a6016f3"
+    "Result: +success[\r\n]+Gas used: +6[\r\n]+Output: +02[\r\n]"
+)
+
 get_property(TOOLS_TESTS DIRECTORY PROPERTY TESTS)
 set_tests_properties(${TOOLS_TESTS} PROPERTIES ENVIRONMENT LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/tools-%p.profraw)

test/unittests/tool_commands_test.cpp

@@ -15,12 +15,14 @@ std::string out_pattern(const char* rev,
                         int gas_limit,
                         const char* status,
                         int gas_used,
-                        const char* output = nullptr)
+                        const char* output = nullptr,
+                        bool create = false)
 {
     std::ostringstream s;
-    s << "Executing on " << rev << " with " << gas_limit << " gas limit\n\n"
+    s << (create ? "Creating and executing on " : "Executing on ") << rev << " with " << gas_limit
+      << " gas limit\n\n"
       << "Result:   " << status << "\nGas used: " << gas_used << "\n";
-    if (output)
+    if (output != nullptr)
         s << "Output:   " << output << "\n";
     return s.str();
 }
@@ -31,7 +33,7 @@ TEST(tool_commands, run_empty_code)
     auto vm = evmc::VM{evmc_create_example_vm()};
     std::ostringstream out;
 
-    const auto exit_code = cmd::run(vm, EVMC_FRONTIER, 1, "", "", out);
+    const auto exit_code = cmd::run(vm, EVMC_FRONTIER, 1, "", "", false, out);
     EXPECT_EQ(exit_code, 0);
     EXPECT_EQ(out.str(), out_pattern("Frontier", 1, "success", 0, ""));
 }
@@ -41,7 +43,7 @@ TEST(tool_commands, run_return_my_address)
     auto vm = evmc::VM{evmc_create_example_vm()};
     std::ostringstream out;
 
-    const auto exit_code = cmd::run(vm, EVMC_HOMESTEAD, 200, "30600052596000f3", "", out);
+    const auto exit_code = cmd::run(vm, EVMC_HOMESTEAD, 200, "30600052596000f3", "", false, out);
     EXPECT_EQ(exit_code, 0);
     EXPECT_EQ(out.str(),
               out_pattern("Homestead", 200, "success", 6,
@@ -56,9 +58,38 @@ TEST(tool_commands, run_copy_input_to_output)
 
     const auto exit_code =
         cmd::run(vm, EVMC_TANGERINE_WHISTLE, 200, "600035600052596000f3",
-                 "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", out);
+                 "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", false, out);
     EXPECT_EQ(exit_code, 0);
     EXPECT_EQ(out.str(),
               out_pattern("Tangerine Whistle", 200, "success", 7,
                           "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"));
 }
+
+TEST(tool_commands, create_return_1)
+{
+    // Contract: mstore(0, 1) return(31, 1)
+    // Create:   mstore(0, 0x60016000526001601ff3) return(22, 10)
+    auto vm = evmc::VM{evmc_create_example_vm()};
+    std::ostringstream out;
+
+    const auto exit_code = cmd::run(vm, EVMC_SPURIOUS_DRAGON, 200,
+                                    "6960016000526001601ff3600052600a6016f3", "", true, out);
+    EXPECT_EQ(exit_code, 0);
+    EXPECT_EQ(out.str(), out_pattern("Spurious Dragon", 200, "success", 6, "01", true));
+}
+
+TEST(tool_commands, create_copy_input_to_output)
+{
+    // Contract: mstore(0, calldataload(0)) return(0, msize())
+    // Create:   mstore(0, 0x600035600052596000f3) return(22, 10)
+    auto vm = evmc::VM{evmc_create_example_vm()};
+    std::ostringstream out;
+
+    const auto exit_code = cmd::run(vm, EVMC_SPURIOUS_DRAGON, 200,
+                                    "69600035600052596000f3600052600a6016f3", "0c49c4", true, out);
+    EXPECT_EQ(exit_code, 0);
+    EXPECT_EQ(
+        out.str(),
+        out_pattern("Spurious Dragon", 200, "success", 7,
+                    "0c49c40000000000000000000000000000000000000000000000000000000000", true));
+}

tools/commands/commands.hpp

@@ -15,6 +15,7 @@ int run(evmc::VM& vm,
         int64_t gas,
         const std::string& code_hex,
         const std::string& input_hex,
+        bool create,
         std::ostream& out);
 }
 }  // namespace evmc

tools/commands/run.cpp

@@ -11,24 +11,62 @@ namespace evmc
 {
 namespace cmd
 {
+namespace
+{
+constexpr auto deploy_address = 0x000000000000000000000000000000000c9ea7ed_address;
+constexpr auto deploy_gas = 10'000'000;
+}  // namespace
+
 int run(evmc::VM& vm,
         evmc_revision rev,
         int64_t gas,
         const std::string& code_hex,
         const std::string& input_hex,
+        bool create,
         std::ostream& out)
 {
-    out << "Executing on " << rev << " with " << gas << " gas limit\n";
+    out << (create ? "Creating and executing on " : "Executing on ") << rev << " with " << gas
+        << " gas limit\n";
 
     const auto code = from_hex(code_hex);
     const auto input = from_hex(input_hex);
+
+    MockedHost host;
+
     evmc_message msg{};
     msg.gas = gas;
     msg.input_data = input.data();
     msg.input_size = input.size();
-    MockedHost host;
 
-    const auto result = vm.execute(host, rev, msg, code.data(), code.size());
+    const uint8_t* exec_code_data = nullptr;
+    size_t exec_code_size = 0;
+
+    if (create)
+    {
+        evmc_message deploy_msg{};
+        deploy_msg.kind = EVMC_CREATE;
+        deploy_msg.destination = deploy_address;
+        deploy_msg.gas = deploy_gas;
+
+        const auto deploy_result = vm.execute(host, rev, deploy_msg, code.data(), code.size());
+        if (deploy_result.status_code != EVMC_SUCCESS)
+            return 1;
+
+        auto& deployed_account = host.accounts[deploy_address];
+        deployed_account.code = bytes(deploy_result.output_data, deploy_result.output_size);
+
+        msg.destination = deploy_address;
+
+        exec_code_data = deployed_account.code.data();
+        exec_code_size = deployed_account.code.size();
+    }
+    else
+    {
+        exec_code_data = code.data();
+        exec_code_size = code.size();
+    }
+
+    const auto result = vm.execute(host, rev, msg, exec_code_data, exec_code_size);
 
     const auto gas_used = msg.gas - result.gas_left;
 

tools/evmc/main.cpp

@@ -15,6 +15,7 @@ int main(int argc, const char** argv)
     int64_t gas = 1000000;
     auto rev = EVMC_ISTANBUL;
     std::string input_hex;
+    auto create = false;
 
     CLI::App app{"EVMC tool"};
     const auto& version_flag = *app.add_flag("--version", "Print version information and exit");
@@ -26,6 +27,9 @@ int main(int argc, const char** argv)
     run_cmd.add_option("--gas", gas, "Execution gas limit", true)->check(CLI::Range(0, 1000000000));
     run_cmd.add_option("--rev", rev, "EVM revision", true);
     run_cmd.add_option("--input", input_hex, "Hex-encoded input bytes");
+    run_cmd.add_flag(
+        "--create", create,
+        "Create new contract out of the code and then execute this contract with the input");
 
     try
     {
@@ -67,7 +71,7 @@ int main(int argc, const char** argv)
                 throw CLI::RequiredError{vm_option.get_name()};
 
             std::cout << "Config: " << vm_config << "\n";
-            return cmd::run(vm, rev, gas, code_hex, input_hex, std::cout);
+            return cmd::run(vm, rev, gas, code_hex, input_hex, create, std::cout);
         }
 
         return 0;