From 168cdc6157cd7ee218bc16ca6f1b8f15a22fa87a Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Tue, 18 May 2021 20:14:56 -0400
Subject: [PATCH 1/2] Passthrough return of main within start function of
 tester WASMs.

---
 libraries/eosiolib/tester/crt0.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/eosiolib/tester/crt0.cpp b/libraries/eosiolib/tester/crt0.cpp
index 2dab93fe57..f7f0faef42 100644
--- a/libraries/eosiolib/tester/crt0.cpp
+++ b/libraries/eosiolib/tester/crt0.cpp
@@ -4,7 +4,7 @@
 int main(int argc, char** argv);
 
 extern "C" __attribute__((eosio_wasm_entry)) void initialize() {}
-extern "C" __attribute__((eosio_wasm_entry)) void start(void (*f)()) {
+extern "C" __attribute__((eosio_wasm_entry)) int start(void (*f)()) {
   std::vector<std::string> args = eosio::get_args();
    char buf[] = "eosio-tester";
    std::vector<char*> argv;
@@ -12,5 +12,5 @@ extern "C" __attribute__((eosio_wasm_entry)) void start(void (*f)()) {
    for(std::string& s : args) {
       argv.push_back(const_cast<char*>(s.data()));
    }
-   main(argv.size(), argv.data());
+   return main(argv.size(), argv.data());
 }

From 2b55724f4ab0ed98547d32c5e3874840191f53cc Mon Sep 17 00:00:00 2001
From: Maxim Kirov <maxim.kirov@block.one>
Date: Mon, 21 Jun 2021 12:38:48 -0400
Subject: [PATCH 2/2] updated abieos to the latest eosio-2.1.x branch and
 removed usage of depricated methods

---
 libraries/abieos                                 | 2 +-
 libraries/eosiolib/contracts/eosio/key_value.hpp | 2 +-
 libraries/eosiolib/tester/tester.cpp             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/abieos b/libraries/abieos
index 89bf52fd71..e5dad451c2 160000
--- a/libraries/abieos
+++ b/libraries/abieos
@@ -1 +1 @@
-Subproject commit 89bf52fd718ef5c45a4b53e34b778e2036dd7c0f
+Subproject commit e5dad451c2b1cb58b0d53573ab98e5a8ed8455a6
diff --git a/libraries/eosiolib/contracts/eosio/key_value.hpp b/libraries/eosiolib/contracts/eosio/key_value.hpp
index 053798a355..8f1dab69f2 100644
--- a/libraries/eosiolib/contracts/eosio/key_value.hpp
+++ b/libraries/eosiolib/contracts/eosio/key_value.hpp
@@ -170,7 +170,7 @@ inline partial_key make_key(T&& t) {
    return partial_key(convert_to_key(std::forward<T>(t)));
 }
 inline partial_key make_key(partial_key&& t) {
-   return t;
+   return std::move(t);
 }
 inline partial_key make_key(partial_key& t) {
    return t;
diff --git a/libraries/eosiolib/tester/tester.cpp b/libraries/eosiolib/tester/tester.cpp
index b264974039..7ab9defdda 100644
--- a/libraries/eosiolib/tester/tester.cpp
+++ b/libraries/eosiolib/tester/tester.cpp
@@ -365,10 +365,10 @@ void build_history_result(eosio::test_chain::get_history_result& history_result,
       history_result.block = std::move(*blocks_result.block);
    }
    if (!blocks_result.traces.empty()) {
-      blocks_result.traces.unpack(history_result.traces);
+      unpack(blocks_result.traces, history_result.traces);
    }
    if (blocks_result.deltas.empty()) {
-      blocks_result.deltas.unpack(history_result.deltas);
+      unpack(blocks_result.deltas, history_result.deltas);
    }
 }