From dfd3dfae097866e9cec4911dd4b3891748ca69e6 Mon Sep 17 00:00:00 2001
From: Vlad Dobromyslov <vdobrik@peerplays.com>
Date: Fri, 21 Apr 2023 09:21:17 +0300
Subject: [PATCH] #530 - fix ETH deposit_address

---
 .../graphene/chain/sidechain_address_object.hpp       | 11 ++++++++++-
 .../sidechain_net_handler_ethereum.cpp                |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/include/graphene/chain/sidechain_address_object.hpp b/libraries/chain/include/graphene/chain/sidechain_address_object.hpp
index 73be44d5..b808a23c 100644
--- a/libraries/chain/include/graphene/chain/sidechain_address_object.hpp
+++ b/libraries/chain/include/graphene/chain/sidechain_address_object.hpp
@@ -36,6 +36,15 @@ namespace graphene { namespace chain {
             deposit_address(""),
             withdraw_public_key(""),
             withdraw_address("") {}
+
+         inline string get_deposit_address() const {
+            if(sidechain_type::ethereum != sidechain)
+               return deposit_address;
+
+            auto deposit_address_lower = deposit_address;
+            std::transform(deposit_address_lower.begin(), deposit_address_lower.end(), deposit_address_lower.begin(), ::tolower);
+            return deposit_address_lower;
+         }
    };
 
    struct by_account;
@@ -76,7 +85,7 @@ namespace graphene { namespace chain {
          ordered_non_unique< tag<by_sidechain_and_deposit_address_and_expires>,
             composite_key<sidechain_address_object,
                member<sidechain_address_object, sidechain_type, &sidechain_address_object::sidechain>,
-               member<sidechain_address_object, string, &sidechain_address_object::deposit_address>,
+               const_mem_fun<sidechain_address_object, string, &sidechain_address_object::get_deposit_address>,
                member<sidechain_address_object, time_point_sec, &sidechain_address_object::expires>
             >
          >
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
index 5ffe1332..fb21a87c 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
@@ -914,8 +914,9 @@ void sidechain_net_handler_ethereum::handle_event(const std::string &block_numbe
          const boost::property_tree::ptree tx = tx_child.second;
          tx_idx = tx_idx + 1;
 
-         const std::string from = tx.get<std::string>("from");
          const std::string to = tx.get<std::string>("to");
+         std::string from = tx.get<std::string>("from");
+         std::transform(from.begin(), from.end(), from.begin(), ::tolower);
 
          std::string cmp_to = to;
          std::transform(cmp_to.begin(), cmp_to.end(), cmp_to.begin(), ::toupper);
-- 
2.45.2