From 74ab2085b4ab84928a71df61af28f50ce7a221a0 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 11:54:27 +0800
Subject: [PATCH 01/50] Bug fixes to little endianness on dvm

---
 src/key.h                        | 10 ++++++++++
 src/key_io.cpp                   |  5 ++---
 src/masternodes/mn_checks.cpp    |  3 +--
 src/masternodes/rpc_accounts.cpp |  6 ++----
 src/masternodes/rpc_evm.cpp      | 14 +++++---------
 test/functional/test_runner.py   |  8 ++++----
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/key.h b/src/key.h
index 26699ab05e..41bb99e421 100644
--- a/src/key.h
+++ b/src/key.h
@@ -140,6 +140,16 @@ class CKey
 
     //! Load private key and check that public key matches.
     bool Load(const CPrivKey& privkey, const CPubKey& vchPubKey, bool fSkipCheck);
+
+    std::array<uint8_t, 32> GetByteArray() const
+    {
+        // We store bytes in the reverse order. So any expectations of
+        // an array of bytes should be in same order as the hex string.
+        // The protected data array is an internal implementation detail. 
+        std::array<uint8_t, 32> reversedArray;
+        std::copy(keydata.rbegin(), keydata.rend(), reversedArray.begin());
+        return reversedArray;
+    }
 };
 
 struct CExtKey {
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 2daef35380..092e155938 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -63,9 +63,7 @@ class DestinationEncoder
     {
         // Raw addr = ETH_ADDR_PREFIX + HexStr(id);
         // Produce ERC55 checksum address: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md
-        // TODO: This should ideally be id.ToString()
-        // HexStr now is hashing the reversed form. 
-        const auto address = HexStr(id);
+        const auto address = id.GetHex();
         std::vector<unsigned char> input(address.begin(), address.end());
         std::vector<unsigned char> output;
         sha3(input, output);
@@ -95,6 +93,7 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
             return CNoDestination();
         }
         data = ParseHex(hex);
+        std::reverse(data.begin(), data.end());
         return WitnessV16EthHash(uint160(data));
     }
     if (DecodeBase58Check(str, data)) {
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 9c881c21ae..fd4ac73c95 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4018,8 +4018,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         }
 
         auto txHash = tx.GetHash();
-        auto evmTxHashBytes = std::vector<uint8_t>(validateResults.tx_hash.begin(), validateResults.tx_hash.end());
-        auto evmTxHash = uint256S(HexStr(evmTxHashBytes));
+        auto evmTxHash = uint256::FromByteArray(validateResults.tx_hash);
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
             LogPrintf("Failed to store DVMtoEVM TX hash for DFI TX %s\n", txHash.ToString());
diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index 238d0a4867..3ed0da26e8 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -477,8 +477,7 @@ UniValue getaccount(const JSONRPCRequest& request) {
     CTxDestination dest;
     if (ExtractDestination(reqOwner, dest) && dest.index() == WitV16KeyEthHashType) {
         const auto keyID = std::get<WitnessV16EthHash>(dest);
-        EvmAddressData address{};
-        std::copy(keyID.begin(), keyID.end(), address.begin());
+        EvmAddressData address = keyID.GetByteArray();
         auto r = XResultValue(evm_try_get_balance(result, address));
         if (!r) throw JSONRPCError(RPC_MISC_ERROR, r.msg);
         if (const auto balance = *r) {
@@ -606,8 +605,7 @@ UniValue gettokenbalances(const JSONRPCRequest& request) {
 
     if (evm_dfi_lookup) {
         for (const auto keyID : pwallet->GetKeys()) {
-            EvmAddressData address{};
-            std::copy(keyID.begin(), keyID.end(), address.begin());
+            EvmAddressData address = keyID.GetByteArray();
             auto res = XResultValue(evm_try_get_balance(result, address));
             if (res) {
                 auto evmAmount = *res;
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 7a82f34022..c4fef25c02 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -76,8 +76,8 @@ UniValue evmtx(const JSONRPCRequest &request) {
     const auto fromEth = std::get<WitnessV16EthHash>(fromDest);
     const CKeyID keyId{fromEth};
 
-    CKey key;
-    if (!pwallet->GetKey(keyId, key)) {
+    CKey privKey;
+    if (!pwallet->GetKey(keyId, privKey)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Private key for from address not found in wallet");
     }
 
@@ -109,7 +109,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
         }
 
         const auto toEth = std::get<WitnessV16EthHash>(toDest);
-        std::copy(toEth.begin(), toEth.end(), to.begin());
+        to = toEth.GetByteArray();
     }
 
     const arith_uint256 valueParam = AmountFromValue(request.params[5]);
@@ -127,9 +127,6 @@ UniValue evmtx(const JSONRPCRequest &request) {
         std::copy(inputVec.begin(), inputVec.end(), input.begin());
     }
 
-    std::array<uint8_t, 32> privKey{};
-    std::copy(key.begin(), key.end(), privKey.begin());
-
     CrossBoundaryResult result;
     const auto signedTx = evm_try_create_and_sign_tx(result,
                                                      CreateTransactionContext{chainID,
@@ -139,7 +136,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
                                                                               to,
                                                                               value.GetByteArray(),
                                                                               input,
-                                                                              privKey});
+                                                                              privKey.GetByteArray()});
     if (!result.ok) {
         throw JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to create and sign TX: %s", result.reason.c_str()));
     }
@@ -313,8 +310,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
         CrossBoundaryResult result;
         auto evmHash = evm_try_get_block_hash_by_number(result, height);
         crossBoundaryOkOrThrow(result);
-        auto evmBlockHash = std::vector<uint8_t>(evmHash.begin(), evmHash.end());
-        std::reverse(evmBlockHash.begin(), evmBlockHash.end());
+        auto evmBlockHash = std::uint256::FromByteArray(evmHash);
         ResVal<uint256> dvm_block = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, uint256(evmBlockHash));
         if (!dvm_block) {
             throwInvalidParam(dvm_block.msg);
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index d4166a95d5..ff070d5066 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -295,19 +295,20 @@
     "feature_loan_priceupdate.py",
     "feature_loan_vaultstate.py",
     "feature_loan.py",
+    "feature_dst20.py",
     "feature_evm_contracts.py",
+    "feature_evm_dfi_intrinsics.py",
     "feature_evm_logs.py",
     "feature_evm_fee.py",
     "feature_evm_genesis.py",
     "feature_evm_rollback.py",
     "feature_evm_rpc_transaction.py",
     "feature_evm_rpc.py",
-    "feature_evm_vmmap_rpc.py",
     "feature_evm_smart_contract.py",
+    "feature_evm_transaction_replacement.py",
     "feature_evm_transferdomain.py",
+    "feature_evm_vmmap_rpc.py",
     "feature_evm.py",
-    "feature_dst20.py",
-    "feature_evm_dfi_intrinsics.py",
     "feature_loan_low_interest.py",
     "feature_loan_estimatecollateral.py",
     "feature_vault_pct_check_factor.py",
@@ -339,7 +340,6 @@
     "feature_negative_interest.py",
     "rpc_getstoredinterest.py",
     "feature_dusd_loans.py",
-    "feature_evm_transaction_replacement.py",
     # Don't append tests at the end to avoid merge conflicts
     # Put them in a random line within the section that fits their approximate run-time
 ]

From 34086b068819b02139e69a1211c3d7789bba8825 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 13:19:09 +0800
Subject: [PATCH 02/50] Revert changes on encoding decoding tx dest

---
 src/key_io.cpp                     | 3 +--
 test/functional/feature_evm_rpc.py | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/key_io.cpp b/src/key_io.cpp
index 092e155938..8a3e5a14ca 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -63,7 +63,7 @@ class DestinationEncoder
     {
         // Raw addr = ETH_ADDR_PREFIX + HexStr(id);
         // Produce ERC55 checksum address: https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md
-        const auto address = id.GetHex();
+        const auto address = HexStr(id);
         std::vector<unsigned char> input(address.begin(), address.end());
         std::vector<unsigned char> output;
         sha3(input, output);
@@ -93,7 +93,6 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par
             return CNoDestination();
         }
         data = ParseHex(hex);
-        std::reverse(data.begin(), data.end());
         return WitnessV16EthHash(uint160(data));
     }
     if (DecodeBase58Check(str, data)) {
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 26a4f7e9f1..4d4353fbc9 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -5,6 +5,7 @@
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 """Test EVM behaviour"""
 
+from test_framework.evm_key_pair import EvmKeyPair
 from test_framework.test_framework import DefiTestFramework
 from test_framework.util import (
     assert_equal,
@@ -49,6 +50,7 @@ def setup(self):
         self.nodes[0].importprivkey(
             "17b8cb134958b3d8422b6c43b0732fcdb8c713b524df2d45de12f0c7e214ba35"
         )  # toAddress
+        EvmKeyPair.validate_key(self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress)
 
         # Generate chain
         self.nodes[0].generate(101)

From 0e2e97b6fafd8c5df8ebed26eacb9c7fa95348d1 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 13:20:04 +0800
Subject: [PATCH 03/50] Fix lint

---
 test/functional/feature_evm_rpc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 4d4353fbc9..0c0fec3f0b 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -50,7 +50,9 @@ def setup(self):
         self.nodes[0].importprivkey(
             "17b8cb134958b3d8422b6c43b0732fcdb8c713b524df2d45de12f0c7e214ba35"
         )  # toAddress
-        EvmKeyPair.validate_key(self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress)
+        EvmKeyPair.validate_key(
+            self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress
+        )
 
         # Generate chain
         self.nodes[0].generate(101)

From 9afcdfbcba849d8654a2f13d4b53bd2ebf2f82f6 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Tue, 15 Aug 2023 14:22:16 +0800
Subject: [PATCH 04/50] Add more key checks

---
 test/functional/feature_address_map.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/test/functional/feature_address_map.py b/test/functional/feature_address_map.py
index 64613695a8..0386f41efa 100755
--- a/test/functional/feature_address_map.py
+++ b/test/functional/feature_address_map.py
@@ -60,14 +60,23 @@ def set_test_params(self):
 
     def setup(self):
         self.address = self.nodes[0].get_genesis_keys().ownerAuthAddress
-        self.ethAddress = "0x9b8a4af42140d8a4c153a822f02571a1dd037e89"
-        self.toAddress = "0x6c34cbb9219d8caa428835d2073e8ec88ba0a110"
-        self.nodes[0].importprivkey(
-            "af990cc3ba17e776f7f57fcc59942a82846d75833fa17d2ba59ce6858d886e23"
-        )  # ethAddress
-        self.nodes[0].importprivkey(
-            "17b8cb134958b3d8422b6c43b0732fcdb8c713b524df2d45de12f0c7e214ba35"
-        )  # toAddress
+        addr_keys = [
+            [
+                "0x9b8a4af42140d8a4c153a822f02571a1dd037e89",
+                "af990cc3ba17e776f7f57fcc59942a82846d75833fa17d2ba59ce6858d886e23",
+            ],
+            [
+                "0x6c34cbb9219d8caa428835d2073e8ec88ba0a110",
+                "17b8cb134958b3d8422b6c43b0732fcdb8c713b524df2d45de12f0c7e214ba35",
+            ],
+        ]
+
+        self.ethAddress = addr_keys[0][0]
+        self.toAddress = addr_keys[1][0]
+
+        for [addr, key] in addr_keys:
+            self.nodes[0].importprivkey(key)
+            assert_equal(self.nodes[0].dumpprivkey(addr), key)
 
         # Generate chain
         self.nodes[0].generate(101)

From bf08250df86f3160ee7fc6b40c666c19304bd316 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Tue, 15 Aug 2023 13:51:12 +0800
Subject: [PATCH 05/50] Cleanup hashing, add wallet tests

---
 src/crypto/sha3.cpp              |  4 ++--
 src/crypto/sha3.h                |  4 +++-
 src/hash.h                       |  4 ++--
 src/key_io.cpp                   |  2 +-
 src/pubkey.h                     |  4 +++-
 src/script/interpreter.cpp       |  2 +-
 src/script/sign.cpp              |  1 -
 src/script/signingprovider.cpp   |  2 +-
 src/script/signingprovider.h     |  4 ++--
 src/test/pos_tests.cpp           |  2 +-
 src/test/setup_common.cpp        | 18 ++++++++++++++-
 src/test/setup_common.h          | 39 ++++++++++++++++++++++++++++++++
 src/test/transaction_tests.cpp   | 12 +++++-----
 src/wallet/test/wallet_tests.cpp |  8 +++----
 src/wallet/wallet.cpp            |  8 +++----
 src/wallet/wallet.h              |  2 +-
 16 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/src/crypto/sha3.cpp b/src/crypto/sha3.cpp
index 8116de0d61..fd36a02975 100644
--- a/src/crypto/sha3.cpp
+++ b/src/crypto/sha3.cpp
@@ -174,9 +174,9 @@ defsha3(256)
 defsha3(384)
 defsha3(512)
 
-bool sha3(const std::vector<unsigned char> &input, std::vector<unsigned char> &output)
+bool sha3_256_safe(const std::vector<unsigned char> &input, std::vector<unsigned char> &output)
 {
-    output.resize(32);
+  output.resize(32);
 	sha3_256(output.data(), 32, input.data(), input.size());
 	return true;
 }
diff --git a/src/crypto/sha3.h b/src/crypto/sha3.h
index 1f6db21edd..10c6761eae 100644
--- a/src/crypto/sha3.h
+++ b/src/crypto/sha3.h
@@ -3,6 +3,8 @@
 
 #include <vector>
 
-bool sha3(const std::vector<unsigned char> &input, std::vector<unsigned char> &output);
+// SH3 256, but safer version, that always resizes the output to 256 bits.
+// Otherwise, the internal sha3_256 call can fail. 
+bool sha3_256_safe(const std::vector<unsigned char> &input, std::vector<unsigned char> &output);
 
 #endif // DEFI_CRYPTO_SHA3_H
\ No newline at end of file
diff --git a/src/hash.h b/src/hash.h
index bfacd6d843..78e1d3e807 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -128,9 +128,9 @@ inline uint160 Hash160(const prevector<N, unsigned char>& vch)
     return Hash160(vch.begin(), vch.end());
 }
 
-inline uint160 Sha3(const std::vector<unsigned char>& vch) {
+inline uint160 EthHash160(const std::vector<unsigned char>& vch) {
     std::vector<unsigned char> output;
-    sha3(vch, output);
+    sha3_256_safe(vch, output);
     const size_t ADDRESS_OFFSET{12};
     return uint160({output.begin() + ADDRESS_OFFSET, output.end()});
 }
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 2daef35380..60890cb473 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -68,7 +68,7 @@ class DestinationEncoder
         const auto address = HexStr(id);
         std::vector<unsigned char> input(address.begin(), address.end());
         std::vector<unsigned char> output;
-        sha3(input, output);
+        sha3_256_safe(input, output);
         const auto hashedAddress = HexStr(output);
         std::string result;
         for (size_t i{}; i < address.size(); ++i) {
diff --git a/src/pubkey.h b/src/pubkey.h
index a07ccec084..883c6cddf7 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -194,7 +194,9 @@ class CPubKey
     CKeyID GetEthID() const
     {
         const size_t HEADER_OFFSET{1};
-        return CKeyID(Sha3({vch + HEADER_OFFSET, vch + size()}));
+        auto begin = vch + HEADER_OFFSET;
+        auto end = vch + size();
+        return CKeyID(EthHash160({begin, end}));
     }
 
     //! Get the 256-bit hash of this public key.
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 7f70619c30..e4f0a759e5 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -897,7 +897,7 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                         CSHA1().Write(vch.data(), vch.size()).Finalize(vchHash.data());
                     else if (opcode == OP_KECCAK) {
                         const size_t HEADER_OFFSET{1};
-                        const auto result = Sha3({vch.begin() + HEADER_OFFSET, vch.end()});
+                        const auto result = EthHash160({vch.begin() + HEADER_OFFSET, vch.end()});
                         memcpy(vchHash.data(), result.begin(), 20);
                     } else if (opcode == OP_SHA256)
                         CSHA256().Write(vch.data(), vch.size()).Finalize(vchHash.data());
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index d03499b6be..9f8bca5eb3 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -216,7 +216,6 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
         solved = solved && SignStep(provider, creator, subscript, result, whichType, SigVersion::BASE, sigdata) && whichType != TX_SCRIPTHASH;
         P2SH = true;
     }
-
     if (solved && whichType == TX_WITNESS_V0_KEYHASH)
     {
         CScript witnessscript;
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
index b93c2f7439..54479efac3 100644
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -108,7 +108,7 @@ bool FillableSigningProvider::GetPubKey(const CKeyID &address, CPubKey &vchPubKe
     return true;
 }
 
-bool FillableSigningProvider::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
+bool FillableSigningProvider::AddKeyPair(const CKey& key, const CPubKey &pubkey)
 {
     LOCK(cs_KeyStore);
 
diff --git a/src/script/signingprovider.h b/src/script/signingprovider.h
index bdfaea873e..927fdceead 100644
--- a/src/script/signingprovider.h
+++ b/src/script/signingprovider.h
@@ -74,8 +74,8 @@ class FillableSigningProvider : public SigningProvider
     void ImplicitlyLearnRelatedKeyScripts(const CPubKey& pubkey) EXCLUSIVE_LOCKS_REQUIRED(cs_KeyStore);
 
 public:
-    virtual bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey);
-    virtual bool AddKey(const CKey &key) { return AddKeyPubKey(key, key.GetPubKey()); }
+    virtual bool AddKeyPair(const CKey& key, const CPubKey &pubkey);
+    virtual bool AddKey(const CKey &key) { return AddKeyPair(key, key.GetPubKey()); }
     virtual bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
     virtual bool HaveKey(const CKeyID &address) const override;
     virtual std::set<CKeyID> GetKeys() const;
diff --git a/src/test/pos_tests.cpp b/src/test/pos_tests.cpp
index 2339070f91..5e49dcc794 100644
--- a/src/test/pos_tests.cpp
+++ b/src/test/pos_tests.cpp
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(calc_kernel)
 //    CKey key;
 //    key.MakeNewKey(true); // Need to use compressed keys in segwit or the signing will fail
 //    FillableSigningProvider keystore;
-//    BOOST_CHECK(keystore.AddKeyPubKey(key, key.GetPubKey()));
+//    BOOST_CHECK(keystore.AddKeyPair(key, key.GetPubKey()));
 //    CKeyID keyID = key.GetPubKey().GetID();
 //
 //    uint256 prevStakeModifier = uint256S("fedcba0987654321fedcba0987654321fedcba0987654321fedcba0987654321");
diff --git a/src/test/setup_common.cpp b/src/test/setup_common.cpp
index a29ad05681..8eeb333f3a 100644
--- a/src/test/setup_common.cpp
+++ b/src/test/setup_common.cpp
@@ -22,6 +22,7 @@
 #include <rpc/server.h>
 #include <script/sigcache.h>
 #include <streams.h>
+#include <execinfo.h>
 #include <txdb.h>
 #include <util/strencodings.h>
 #include <util/time.h>
@@ -29,7 +30,6 @@
 #include <util/validation.h>
 #include <validation.h>
 #include <validationinterface.h>
-
 #include <functional>
 
 const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
@@ -266,3 +266,19 @@ CBlock getBlock13b8a()
     stream >> block;
     return block;
 }
+
+void print_backtrace()
+{
+    void* array[10];
+    char** strings;
+    int size, i;
+    size = backtrace(array, 10);
+    strings = backtrace_symbols(array, size);
+    if (strings != NULL) {
+        printf("Obtained %d stack frames.\n", size);
+        for (i = 0; i < size; i++) {
+            printf("%s\n", strings[i]);
+        }
+    }
+    free(strings);
+}
\ No newline at end of file
diff --git a/src/test/setup_common.h b/src/test/setup_common.h
index 4dab9ce4ee..8a26e9606c 100644
--- a/src/test/setup_common.h
+++ b/src/test/setup_common.h
@@ -15,6 +15,7 @@
 
 #include <type_traits>
 #include <vector>
+#include <boost/test/output_test_stream.hpp>
 
 // Enable BOOST_CHECK_EQUAL for enum class types
 template <typename T>
@@ -131,4 +132,42 @@ CBlock getBlock13b8a();
 // define an implicit conversion here so that uint256 may be used directly in BOOST_CHECK_*
 std::ostream& operator<<(std::ostream& os, const uint256& num);
 
+// Scopes to help with redirecting stdout to boost test logging
+struct StdOutRedirectScope {
+    StdOutRedirectScope() {}
+    StdOutRedirectScope(std::streambuf* buf)
+        : old(std::cout.rdbuf(buf)),
+          isInit(true) {}
+
+    ~StdOutRedirectScope()
+    {
+        if (!isInit) return;
+        std::cout.rdbuf(old);
+    }
+
+    void Init(std::streambuf* buf)
+    {
+        assert(!isInit);
+        old = std::cout.rdbuf(buf);
+        isInit = true;
+    }
+
+private:
+    std::streambuf* old = nullptr;
+    bool isInit{false};
+};
+
+struct StdOutTestStreamRedirectScope : StdOutRedirectScope {
+    StdOutTestStreamRedirectScope()
+        : StdOutRedirectScope()
+    {
+        Init(output.rdbuf());
+    }
+
+private:
+    boost::test_tools::output_test_stream output{};
+};
+
+void print_backtrace();
+
 #endif
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 789ac493ec..d6efa71811 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE(test_big_witness_transaction)
     CKey key;
     key.MakeNewKey(true); // Need to use compressed keys in segwit or the signing will fail
     FillableSigningProvider keystore;
-    BOOST_CHECK(keystore.AddKeyPubKey(key, key.GetPubKey()));
+    BOOST_CHECK(keystore.AddKeyPair(key, key.GetPubKey()));
     CKeyID hash = key.GetPubKey().GetID();
     CScript scriptPubKey = CScript() << OP_0 << std::vector<unsigned char>(hash.begin(), hash.end());
 
@@ -518,10 +518,10 @@ BOOST_AUTO_TEST_CASE(test_witness)
     pubkey3 = key3.GetPubKey();
     pubkey1L = key1L.GetPubKey();
     pubkey2L = key2L.GetPubKey();
-    BOOST_CHECK(keystore.AddKeyPubKey(key1, pubkey1));
-    BOOST_CHECK(keystore.AddKeyPubKey(key2, pubkey2));
-    BOOST_CHECK(keystore.AddKeyPubKey(key1L, pubkey1L));
-    BOOST_CHECK(keystore.AddKeyPubKey(key2L, pubkey2L));
+    BOOST_CHECK(keystore.AddKeyPair(key1, pubkey1));
+    BOOST_CHECK(keystore.AddKeyPair(key2, pubkey2));
+    BOOST_CHECK(keystore.AddKeyPair(key1L, pubkey1L));
+    BOOST_CHECK(keystore.AddKeyPair(key2L, pubkey2L));
     CScript scriptPubkey1, scriptPubkey2, scriptPubkey1L, scriptPubkey2L, scriptMulti;
     scriptPubkey1 << ToByteVector(pubkey1) << OP_CHECKSIG;
     scriptPubkey2 << ToByteVector(pubkey2) << OP_CHECKSIG;
@@ -543,7 +543,7 @@ BOOST_AUTO_TEST_CASE(test_witness)
     BOOST_CHECK(keystore.AddCScript(GetScriptForWitness(scriptMulti)));
     BOOST_CHECK(keystore2.AddCScript(scriptMulti));
     BOOST_CHECK(keystore2.AddCScript(GetScriptForWitness(scriptMulti)));
-    BOOST_CHECK(keystore2.AddKeyPubKey(key3, pubkey3));
+    BOOST_CHECK(keystore2.AddKeyPair(key3, pubkey3));
 
     CTransactionRef output1, output2;
     CMutableTransaction input1, input2;
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 9f78f3ac0e..307c77c5b5 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -30,7 +30,7 @@ BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
 static void AddKey(CWallet& wallet, const CKey& key)
 {
     LOCK(wallet.cs_wallet);
-    wallet.AddKeyPubKey(key, key.GetPubKey());
+    wallet.AddKeyPair(key, key.GetPubKey());
 }
 
 static CMutableTransaction TestSimpleSpend(const CTransaction& from, uint32_t index, const CKey& key, const CScript& pubkey)
@@ -222,7 +222,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
         wallet->mapKeyMetadata[uncomp.GetID()].nCreateTime = KEY_TIME;
         wallet->mapKeyMetadata[uncomp.GetEthID()].nCreateTime = KEY_TIME;
         wallet->mapKeyMetadata[comp.GetID()].nCreateTime = KEY_TIME;
-        wallet->AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey());
+        wallet->AddKeyPair(coinbaseKey, coinbaseKey.GetPubKey());
 
         JSONRPCRequest request;
         request.params.setArray();
@@ -286,7 +286,7 @@ BOOST_FIXTURE_TEST_CASE(coin_mark_dirty_immature_credit, TestChain100Setup)
     // Invalidate the cached value, add the key, and make sure a new immature
     // credit amount is calculated.
     wtx.MarkDirty();
-    wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey());
+    wallet.AddKeyPair(coinbaseKey, coinbaseKey.GetPubKey());
     BOOST_CHECK_EQUAL(wtx.GetImmatureCredit(*locked_chain), 50*COIN);
     wallet.NotifyUnload();
 }
@@ -522,7 +522,7 @@ static size_t CalculateNestedKeyhashInputSize(bool use_max_sig)
     // Add inner-script to key store and key to watchonly
     FillableSigningProvider keystore;
     keystore.AddCScript(inner_script);
-    keystore.AddKeyPubKey(key, pubkey);
+    keystore.AddKeyPair(key, pubkey);
 
     // Fill in dummy signatures for fee calculation.
     SignatureData sig_data;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e7114dcbad..0cdcd956ab 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -401,7 +401,7 @@ bool CWallet::AddKeyPubKeyWithDB(WalletBatch& batch, const CKey& secret, const C
     return true;
 }
 
-bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey)
+bool CWallet::AddKeyPair(const CKey& secret, const CPubKey &pubkey)
 {
     WalletBatch batch(*database);
     return CWallet::AddKeyPubKeyWithDB(batch, secret, pubkey);
@@ -1656,8 +1656,8 @@ CPubKey CWallet::DeriveNewSeed(const CKey& key)
         mapKeyMetadata[uncomp.GetID()] = metadata;
 
         // write the key&metadata to the database
-        if (!AddKeyPubKey(key, seed))
-            throw std::runtime_error(std::string(__func__) + ": AddKeyPubKey failed");
+        if (!AddKeyPair(key, seed))
+            throw std::runtime_error(std::string(__func__) + ": AddKeyPair failed");
     }
 
     return seed;
@@ -5031,7 +5031,7 @@ bool CWallet::AddKeyPubKeyInner(const CKey& key, const CPubKey &pubkey)
 {
     LOCK(cs_KeyStore);
     if (!IsCrypted()) {
-        return FillableSigningProvider::AddKeyPubKey(key, pubkey);
+        return FillableSigningProvider::AddKeyPair(key, pubkey);
     }
 
     if (IsLocked()) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7b2b0bd057..2c99aa92af 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1004,7 +1004,7 @@ class CWallet final : public FillableSigningProvider, private interfaces::Chain:
      */
     CPubKey GenerateNewKey(WalletBatch& batch, bool internal = false) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     //! Adds a key to the store, and saves it to disk.
-    bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    bool AddKeyPair(const CKey& key, const CPubKey &pubkey) override EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     //! Adds a key to the store, without saving it to disk (used by LoadWallet)
     bool LoadKey(const CKey& key, const CPubKey &pubkey) { return AddKeyPubKeyInner(key, pubkey); }
     //! Load metadata (used by LoadWallet)

From 2cf455ae508c5475ffea8d5dc64c9298f8687aae Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Tue, 15 Aug 2023 14:35:32 +0800
Subject: [PATCH 06/50] Enable migration

---
 src/crypto/sha3.cpp            | 2 +-
 src/masternodes/validation.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/crypto/sha3.cpp b/src/crypto/sha3.cpp
index fd36a02975..3c6738484f 100644
--- a/src/crypto/sha3.cpp
+++ b/src/crypto/sha3.cpp
@@ -176,7 +176,7 @@ defsha3(512)
 
 bool sha3_256_safe(const std::vector<unsigned char> &input, std::vector<unsigned char> &output)
 {
-  output.resize(32);
+	output.resize(32);
 	sha3_256(output.data(), 32, input.data(), input.size());
 	return true;
 }
diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 69a7d44307..7475cdd426 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2574,11 +2574,11 @@ Res ProcessDeFiEventFallible(const CBlock &block, const CBlockIndex *pindex, CCu
     CCustomCSView cache(mnview);
     
     if (isEvmEnabledForBlock) {
-        // auto res = ProcessDST20Migration(pindex, cache, chainparams, evmQueueId);
-        // if (!res) return res;
+        auto res = ProcessDST20Migration(pindex, cache, chainparams, evmQueueId);
+        if (!res) return res;
 
         // Process EVM block
-        auto res = ProcessEVMQueue(block, pindex, cache, chainparams, evmQueueId);
+        res = ProcessEVMQueue(block, pindex, cache, chainparams, evmQueueId);
         if (!res) return res;
     }
 

From 57fa031dc5fb82937f3b08c27ba26c06f7014838 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Tue, 15 Aug 2023 14:41:51 +0800
Subject: [PATCH 07/50] Fix lints

---
 test/lint/lint-includes.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
index 4ae876bb24..2b8b3a9fc8 100755
--- a/test/lint/lint-includes.sh
+++ b/test/lint/lint-includes.sh
@@ -74,6 +74,7 @@ EXPECTED_BOOST_INCLUDES=(
     boost/signals2/last_value.hpp
     boost/signals2/signal.hpp
     boost/test/unit_test.hpp
+    boost/test/output_test_stream.hpp
 )
 
 for BOOST_INCLUDE in $(git grep '^#include <boost/' -- "*.cpp" "*.h" | cut -f2 -d: | cut -f2 -d'<' | cut -f1 -d'>' | sort -u); do

From 3645c9dffb6f35d073546a016d43fd10085f947d Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 15:38:37 +0800
Subject: [PATCH 08/50] Fixes to feature_evm_rpc test

---
 lib/ain-evm/src/evm.rs                        | 32 +++---------
 src/masternodes/evm.cpp                       |  2 +-
 src/masternodes/validation.cpp                |  4 +-
 test/functional/feature_dst20.py              | 51 +------------------
 test/functional/feature_evm_rpc.py            | 10 +++-
 .../functional/test_framework/evm_key_pair.py | 32 ++++++------
 6 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index 7d34333b1c..2cfe1b3da9 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -514,36 +514,16 @@ impl EVMServices {
             .backend
             .get_contract_storage(contract, storage_index.as_bytes())?;
 
-        let total_supply_index = H256::from_low_u64_be(2);
-        let total_supply = executor
-            .backend
-            .get_contract_storage(contract, total_supply_index.as_bytes())?;
-
-        let (new_balance, new_total_supply) = if out {
-            (
-                balance.checked_sub(amount),
-                total_supply.checked_sub(amount),
-            )
+        let new_balance = if out {
+            balance.checked_sub(amount)
         } else {
-            (
-                balance.checked_add(amount),
-                total_supply.checked_add(amount),
-            )
-        };
-
-        let new_balance = new_balance.ok_or_else(|| format_err!("Balance overflow/underflow"))?;
-        let new_total_supply =
-            new_total_supply.ok_or_else(|| format_err!("Total supply overflow/underflow"))?;
+            balance.checked_add(amount)
+        }
+        .ok_or_else(|| format_err!("Balance overflow/underflow"))?;
 
         Ok(DST20BridgeInfo {
             address: contract,
-            storage: vec![
-                (storage_index, ain_contracts::u256_to_h256(new_balance)),
-                (
-                    total_supply_index,
-                    ain_contracts::u256_to_h256(new_total_supply),
-                ),
-            ],
+            storage: vec![(storage_index, ain_contracts::u256_to_h256(new_balance))],
         })
     }
 
diff --git a/src/masternodes/evm.cpp b/src/masternodes/evm.cpp
index 4eb30284b0..4afe1343e6 100644
--- a/src/masternodes/evm.cpp
+++ b/src/masternodes/evm.cpp
@@ -6,7 +6,7 @@
 Res CVMDomainGraphView::SetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey, uint256 blockHash)
 {
     return WriteBy<VMDomainBlockEdge>(std::pair(static_cast<uint8_t>(type), blockHashKey), blockHash)
-            ? Res::Ok() : DeFiErrors::DatabaseRWFailure(blockHashKey.GetHex());
+        ? Res::Ok() : DeFiErrors::DatabaseRWFailure(blockHashKey.GetHex());
 }
 
 ResVal<uint256> CVMDomainGraphView::GetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey) const
diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 69a7d44307..957370e62c 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2444,9 +2444,7 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     if (!result.ok) {
         return Res::Err(result.reason.c_str());
     }
-    auto evmBlockHashData = std::vector<uint8_t>(blockResult.block_hash.rbegin(), blockResult.block_hash.rend());
-    auto evmBlockHash = uint256(evmBlockHashData);
-
+    auto evmBlockHash = uint256::FromByteArray(blockResult.block_hash);
     if (block.vtx[0]->vout.size() < 2) {
         return Res::Err("Not enough outputs in coinbase TX");
     }
diff --git a/test/functional/feature_dst20.py b/test/functional/feature_dst20.py
index e1abd09ef6..b99b0b4c23 100755
--- a/test/functional/feature_dst20.py
+++ b/test/functional/feature_dst20.py
@@ -218,13 +218,6 @@ def test_dst20_dvm_to_evm_bridge(self):
             Decimal(1),
         )
 
-        # test totalSupply variable
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(1),
-        )
-
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "9.00000000@BTC")
 
@@ -248,11 +241,6 @@ def test_dst20_dvm_to_evm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(2),
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(2),
-        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "8.00000000@BTC")
 
@@ -276,11 +264,6 @@ def test_dst20_evm_to_dvm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(0.5),
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(0.5),
-        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "9.50000000@BTC")
 
@@ -316,11 +299,6 @@ def test_multiple_dvm_evm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(3.5),
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(3.5),
-        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "6.50000000@BTC")
 
@@ -358,11 +336,6 @@ def test_conflicting_bridge(self):
         assert_equal(
             self.btc.functions.balanceOf(self.key_pair2.address).call(), Decimal(0)
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(3.5),
-        )
         assert_equal(beforeAmount, afterAmount)
 
     def test_bridge_when_no_balance(self):
@@ -388,11 +361,6 @@ def test_bridge_when_no_balance(self):
         assert_equal(
             self.btc.functions.balanceOf(self.key_pair2.address).call(), Decimal(0)
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(5.5),
-        )
         [afterAmount] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(beforeAmount, afterAmount)
 
@@ -451,11 +419,6 @@ def test_transfer_to_token_address(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(2),
         )
-        assert_equal(
-            self.btc.functions.totalSupply().call()
-            / math.pow(10, self.btc.functions.decimals().call()),
-            Decimal(5.5),
-        )
 
     def test_negative_transfer(self):
         assert_raises_rpc_error(
@@ -569,12 +532,7 @@ def test_loan_token(self):
         assert_equal(TSLAAmount, "98.00000000@TSLA")
         assert_equal(
             self.tsla.functions.balanceOf(self.key_pair.address).call()
-            / math.pow(10, self.tsla.functions.decimals().call()),
-            Decimal(2),
-        )
-        assert_equal(
-            self.tsla.functions.totalSupply().call()
-            / math.pow(10, self.tsla.functions.decimals().call()),
+            / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(2),
         )
 
@@ -596,12 +554,7 @@ def test_loan_token(self):
         assert_equal(TSLAAmount, "99.00000000@TSLA")
         assert_equal(
             self.tsla.functions.balanceOf(self.key_pair.address).call()
-            / math.pow(10, self.tsla.functions.decimals().call()),
-            Decimal(1),
-        )
-        assert_equal(
-            self.tsla.functions.totalSupply().call()
-            / math.pow(10, self.tsla.functions.decimals().call()),
+            / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(1),
         )
 
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 0c0fec3f0b..e8739f26cd 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -53,6 +53,7 @@ def setup(self):
         EvmKeyPair.validate_key(
             self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress
         )
+        self.dst20_accounts = ['0x0a06de8abc3f15359ec0dfe32394c8b8f09e828f', '0x3aeddfb7ffd59d0909145e6a11db224a13e7a9f6']
 
         # Generate chain
         self.nodes[0].generate(101)
@@ -118,7 +119,14 @@ def test_gas(self):
 
     def test_accounts(self):
         eth_accounts = self.nodes[0].eth_accounts()
-        assert_equal(eth_accounts.sort(), [self.ethAddress, self.toAddress].sort())
+        check_accounts = []
+        for acc in eth_accounts:
+            address = acc.lower()
+            if address not in self.dst20_accounts:
+                check_accounts.append(address)
+        accounts = [self.ethAddress, self.toAddress]
+        accounts.sort()
+        assert_equal(check_accounts, accounts)
 
     def test_address_state(self, address):
         assert_raises_rpc_error(
diff --git a/test/functional/test_framework/evm_key_pair.py b/test/functional/test_framework/evm_key_pair.py
index 17af559662..972b235a56 100644
--- a/test/functional/test_framework/evm_key_pair.py
+++ b/test/functional/test_framework/evm_key_pair.py
@@ -1,24 +1,9 @@
 from eth_account import Account
 
 
-def validate_key(privkey, address):
-    account = Account.from_key(privkey)
-
-    if account.address != address:
-        raise RuntimeError(
-            f"""
-            Private key does not correspond to provided address.
-            Address provided: {address}
-            Address computed: {account.address}
-            """
-        )
-    else:
-        return privkey, address
-
-
 class EvmKeyPair:
     def __init__(self, privkey: str = None, address: str = None):
-        self.privkey, self.address = validate_key(privkey, address)
+        self.privkey, self.address = EvmKeyPair.validate_key(privkey, address)
 
     @staticmethod
     def from_node(node):
@@ -27,3 +12,18 @@ def from_node(node):
         privkey = node.dumpprivkey(address)
 
         return EvmKeyPair(privkey, address)
+    
+    @staticmethod
+    def validate_key(privkey, address):
+        account = Account.from_key(privkey)
+
+        if account.address != address:
+            raise RuntimeError(
+                f"""
+                Private key does not correspond to provided address.
+                Address provided: {address}
+                Address computed: {account.address}
+                """
+            )
+        else:
+            return privkey, address

From d3b4811b3a1e6843ac8a9a96ca52c6860bd3c2dd Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 15:39:12 +0800
Subject: [PATCH 09/50] Fix lint

---
 test/functional/feature_evm_rpc.py             | 5 ++++-
 test/functional/test_framework/evm_key_pair.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index e8739f26cd..160fd397fc 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -53,7 +53,10 @@ def setup(self):
         EvmKeyPair.validate_key(
             self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress
         )
-        self.dst20_accounts = ['0x0a06de8abc3f15359ec0dfe32394c8b8f09e828f', '0x3aeddfb7ffd59d0909145e6a11db224a13e7a9f6']
+        self.dst20_accounts = [
+            "0x0a06de8abc3f15359ec0dfe32394c8b8f09e828f",
+            "0x3aeddfb7ffd59d0909145e6a11db224a13e7a9f6",
+        ]
 
         # Generate chain
         self.nodes[0].generate(101)
diff --git a/test/functional/test_framework/evm_key_pair.py b/test/functional/test_framework/evm_key_pair.py
index 972b235a56..f369299b43 100644
--- a/test/functional/test_framework/evm_key_pair.py
+++ b/test/functional/test_framework/evm_key_pair.py
@@ -12,7 +12,7 @@ def from_node(node):
         privkey = node.dumpprivkey(address)
 
         return EvmKeyPair(privkey, address)
-    
+
     @staticmethod
     def validate_key(privkey, address):
         account = Account.from_key(privkey)

From 2f21b8872eecfaa260a6ca297e6985f5511c2e64 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 22:38:40 +0800
Subject: [PATCH 10/50] Fixes to cross boundary ffi endianness

---
 lib/ain-evm/src/core.rs                     |  6 ++---
 lib/ain-evm/src/evm.rs                      | 14 +++++------
 lib/ain-evm/src/transaction/mod.rs          |  6 ++---
 lib/ain-evm/src/txqueue.rs                  |  7 +++---
 lib/ain-rs-exports/src/evm.rs               | 26 ++++++++++++---------
 lib/ain-rs-exports/src/lib.rs               | 10 ++++----
 src/key.h                                   | 13 ++++++++++-
 src/masternodes/govvariables/attributes.cpp |  2 +-
 src/masternodes/mn_checks.cpp               | 15 ++++++------
 src/masternodes/mn_checks.h                 |  1 +
 src/masternodes/rpc_accounts.cpp            |  6 ++---
 src/masternodes/rpc_customtx.cpp            |  6 ++---
 src/masternodes/rpc_evm.cpp                 | 18 +++++++-------
 src/masternodes/validation.cpp              |  6 ++---
 src/miner.cpp                               |  6 +++--
 src/rpc/blockchain.cpp                      | 10 ++++----
 src/test/transaction_tests.cpp              |  5 ++--
 src/test/xvm_tests.cpp                      |  2 +-
 src/uint256.h                               | 21 ++++++++++++++---
 test/functional/feature_dst20.py            |  2 +-
 test/functional/feature_evm_rpc.py          |  2 +-
 21 files changed, 106 insertions(+), 78 deletions(-)

diff --git a/lib/ain-evm/src/core.rs b/lib/ain-evm/src/core.rs
index 1bc50fb645..5d21a5ea92 100644
--- a/lib/ain-evm/src/core.rs
+++ b/lib/ain-evm/src/core.rs
@@ -27,8 +27,6 @@ use crate::{
     Result,
 };
 
-pub type NativeTxHash = [u8; 32];
-
 pub struct EVMCoreService {
     pub tx_queues: Arc<TransactionQueueMap>,
     pub trie_store: Arc<TrieDBStore>,
@@ -323,7 +321,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: NativeTxHash,
+        hash: String,
     ) -> Result<()> {
         let queue_tx = QueueTx::SystemTx(SystemTx::EvmIn(BalanceUpdate { address, amount }));
         self.tx_queues
@@ -342,7 +340,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: NativeTxHash,
+        hash: String,
     ) -> Result<()> {
         let block_number = self
             .storage
diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index c952726331..2b1d798505 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -11,7 +11,7 @@ use primitive_types::H256;
 use crate::backend::{EVMBackend, Vicinity};
 use crate::block::BlockService;
 use crate::bytes::Bytes;
-use crate::core::{EVMCoreService, NativeTxHash};
+use crate::core::EVMCoreService;
 use crate::executor::{AinExecutor, TxResponse};
 use crate::fee::{calculate_gas_fee, calculate_prepay_gas_fee};
 use crate::filters::FilterService;
@@ -209,7 +209,7 @@ impl EVMServices {
                     );
 
                     if !exit_reason.is_succeed() {
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
 
                     let gas_fee = calculate_gas_fee(&signed_tx, U256::from(used_gas), base_fee)?;
@@ -227,7 +227,7 @@ impl EVMServices {
                     );
                     if let Err(e) = executor.add_balance(address, amount) {
                         debug!("[construct_block] EvmIn failed with {e}");
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
                 }
                 QueueTx::SystemTx(SystemTx::EvmOut(BalanceUpdate { address, amount })) => {
@@ -238,7 +238,7 @@ impl EVMServices {
 
                     if let Err(e) = executor.sub_balance(address, amount) {
                         debug!("[construct_block] EvmOut failed with {e}");
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
                 }
                 QueueTx::SystemTx(SystemTx::DeployContract(DeployContractData {
@@ -276,12 +276,12 @@ impl EVMServices {
                         Ok(DST20BridgeInfo { address, storage }) => {
                             if let Err(e) = executor.update_storage(address, storage) {
                                 debug!("[construct_block] EvmOut failed with {e}");
-                                failed_transactions.push(hex::encode(queue_item.tx_hash));
+                                failed_transactions.push(queue_item.tx_hash);
                             }
                         }
                         Err(e) => {
                             debug!("[construct_block] EvmOut failed with {e}");
-                            failed_transactions.push(hex::encode(queue_item.tx_hash));
+                            failed_transactions.push(queue_item.tx_hash);
                         }
                     }
                 }
@@ -410,7 +410,7 @@ impl EVMServices {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: NativeTxHash,
+        hash: String,
         gas_used: U256,
     ) -> Result<()> {
         let parent_data = self.block.get_latest_block_hash_and_number()?;
diff --git a/lib/ain-evm/src/transaction/mod.rs b/lib/ain-evm/src/transaction/mod.rs
index 74b206379b..74b8807501 100644
--- a/lib/ain-evm/src/transaction/mod.rs
+++ b/lib/ain-evm/src/transaction/mod.rs
@@ -50,18 +50,18 @@ impl LegacyUnsignedTransaction {
         H256::from(output)
     }
 
-    pub fn sign(&self, key: &H256, chain_id: u64) -> Result<LegacyTransaction, TransactionError> {
+    pub fn sign(&self, key: &[u8], chain_id: u64) -> Result<LegacyTransaction, TransactionError> {
         self.sign_with_chain_id(key, chain_id)
     }
 
     pub fn sign_with_chain_id(
         &self,
-        key: &H256,
+        key: &[u8],
         chain_id: u64,
     ) -> Result<LegacyTransaction, TransactionError> {
         let hash = self.signing_hash(chain_id);
         let msg = libsecp256k1::Message::parse(hash.as_fixed_bytes());
-        let s = libsecp256k1::sign(&msg, &libsecp256k1::SecretKey::parse_slice(&key[..])?);
+        let s = libsecp256k1::sign(&msg, &libsecp256k1::SecretKey::parse_slice(key)?);
         let sig = s.0.serialize();
 
         let sig = TransactionSignature::new(
diff --git a/lib/ain-evm/src/txqueue.rs b/lib/ain-evm/src/txqueue.rs
index a92b1ea01d..bc729fef03 100644
--- a/lib/ain-evm/src/txqueue.rs
+++ b/lib/ain-evm/src/txqueue.rs
@@ -7,7 +7,6 @@ use ethereum::{Block, TransactionV2};
 use ethereum_types::{H160, U256};
 use rand::Rng;
 
-use crate::core::NativeTxHash;
 use crate::fee::calculate_gas_fee;
 use crate::receipt::Receipt;
 use crate::transaction::{system::SystemTx, SignedTx};
@@ -119,7 +118,7 @@ impl TransactionQueueMap {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: NativeTxHash,
+        hash: String,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {
@@ -219,7 +218,7 @@ pub enum QueueTx {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct QueueTxItem {
     pub tx: QueueTx,
-    pub tx_hash: NativeTxHash,
+    pub tx_hash: String,
     pub tx_fee: U256,
     pub gas_used: U256,
 }
@@ -277,7 +276,7 @@ impl TransactionQueue {
     pub fn queue_tx(
         &self,
         tx: QueueTx,
-        tx_hash: NativeTxHash,
+        tx_hash: String,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 881876c52c..d203388af4 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -38,7 +38,7 @@ pub fn evm_try_create_and_sign_tx(
     let to_action = if ctx.to.is_empty() {
         TransactionAction::Create
     } else {
-        TransactionAction::Call(H160::from_slice(&ctx.to))
+        TransactionAction::Call(H160::from(ctx.to))
     };
 
     let nonce_u256 = U256::from(ctx.nonce);
@@ -59,8 +59,7 @@ pub fn evm_try_create_and_sign_tx(
     };
 
     // Sign
-    let priv_key_h256 = H256::from(ctx.priv_key);
-    match t.sign(&priv_key_h256, ctx.chain_id) {
+    match t.sign(&ctx.priv_key, ctx.chain_id) {
         Ok(signed) => cross_boundary_success_return(result, signed.encode().into()),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
     }
@@ -164,8 +163,9 @@ pub fn evm_unsafe_try_add_balance_in_q(
     queue_id: u64,
     address: &str,
     amount: [u8; 32],
-    hash: [u8; 32],
+    native_hash: &str,
 ) {
+    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
@@ -174,7 +174,7 @@ pub fn evm_unsafe_try_add_balance_in_q(
         match SERVICES
             .evm
             .core
-            .add_balance(queue_id, address, amount.into(), hash)
+            .add_balance(queue_id, address, amount.into(), native_hash)
         {
             Ok(_) => cross_boundary_success_return(result, ()),
             Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -206,8 +206,9 @@ pub fn evm_unsafe_try_sub_balance_in_q(
     queue_id: u64,
     address: &str,
     amount: [u8; 32],
-    hash: [u8; 32],
+    native_hash: &str,
 ) -> bool {
+    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
@@ -216,7 +217,7 @@ pub fn evm_unsafe_try_sub_balance_in_q(
         match SERVICES
             .evm
             .core
-            .sub_balance(queue_id, address, amount.into(), hash)
+            .sub_balance(queue_id, address, amount.into(), native_hash)
         {
             Ok(_) => cross_boundary_success_return(result, true),
             Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -396,9 +397,10 @@ pub fn evm_unsafe_try_push_tx_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
     raw_tx: &str,
-    hash: [u8; 32],
+    native_hash: &str,
     gas_used: u64,
 ) {
+    let native_hash = native_hash.to_string();
     let signed_tx: Result<SignedTx, TransactionError> = raw_tx.try_into();
     unsafe {
         match signed_tx {
@@ -406,7 +408,7 @@ pub fn evm_unsafe_try_push_tx_in_q(
                 match SERVICES.evm.push_tx_in_queue(
                     queue_id,
                     signed_tx.into(),
-                    hash,
+                    native_hash,
                     U256::from(gas_used),
                 ) {
                     Ok(_) => cross_boundary_success(result),
@@ -733,11 +735,12 @@ pub fn evm_try_get_tx_by_hash(
 pub fn evm_try_create_dst20(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
-    native_hash: [u8; 32],
+    native_hash: &str,
     name: &str,
     symbol: &str,
     token_id: &str,
 ) {
+    let native_hash = native_hash.to_string();
     let address = match ain_contracts::dst20_address_from_token_id(token_id) {
         Ok(address) => address,
         Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -766,10 +769,11 @@ pub fn evm_try_bridge_dst20(
     queue_id: u64,
     address: &str,
     amount: [u8; 32],
-    native_hash: [u8; 32],
+    native_hash: &str,
     token_id: &str,
     out: bool,
 ) {
+    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index 17a886092f..831bcb0153 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -128,14 +128,14 @@ pub mod ffi {
             queue_id: u64,
             address: &str,
             amount: [u8; 32],
-            native_tx_hash: [u8; 32],
+            native_hash: &str,
         );
         fn evm_unsafe_try_sub_balance_in_q(
             result: &mut CrossBoundaryResult,
             queue_id: u64,
             address: &str,
             amount: [u8; 32],
-            native_tx_hash: [u8; 32],
+            native_hash: &str,
         ) -> bool;
         fn evm_unsafe_try_prevalidate_raw_tx(
             result: &mut CrossBoundaryResult,
@@ -150,7 +150,7 @@ pub mod ffi {
             result: &mut CrossBoundaryResult,
             queue_id: u64,
             raw_tx: &str,
-            hash: [u8; 32],
+            native_hash: &str,
             gas_used: u64,
         );
         fn evm_unsafe_try_construct_block_in_q(
@@ -193,7 +193,7 @@ pub mod ffi {
         fn evm_try_create_dst20(
             result: &mut CrossBoundaryResult,
             context: u64,
-            native_hash: [u8; 32],
+            native_hash: &str,
             name: &str,
             symbol: &str,
             token_id: &str,
@@ -203,7 +203,7 @@ pub mod ffi {
             context: u64,
             address: &str,
             amount: [u8; 32],
-            native_hash: [u8; 32],
+            native_hash: &str,
             token_id: &str,
             out: bool,
         );
diff --git a/src/key.h b/src/key.h
index 41bb99e421..e0a4739cac 100644
--- a/src/key.h
+++ b/src/key.h
@@ -15,6 +15,7 @@
 #include <stdexcept>
 #include <vector>
 
+/** Byte array of an EVM address stored as big endian. */
 typedef std::array<uint8_t, 20> EvmAddressData;
 
 /**
@@ -141,7 +142,7 @@ class CKey
     //! Load private key and check that public key matches.
     bool Load(const CPrivKey& privkey, const CPubKey& vchPubKey, bool fSkipCheck);
 
-    std::array<uint8_t, 32> GetByteArray() const
+    std::array<uint8_t, 32> GetByteArrayLE() const
     {
         // We store bytes in the reverse order. So any expectations of
         // an array of bytes should be in same order as the hex string.
@@ -150,6 +151,16 @@ class CKey
         std::copy(keydata.rbegin(), keydata.rend(), reversedArray.begin());
         return reversedArray;
     }
+
+    std::array<uint8_t, 32> GetByteArrayBE() const
+    {
+        // We store bytes in the reverse order. So any expectations of
+        // an array of bytes should be in same order as the hex string.
+        // The protected data array is an internal implementation detail. 
+        std::array<uint8_t, 32> array;
+        std::copy(keydata.begin(), keydata.end(), array.begin());
+        return array;
+    }
 };
 
 struct CExtKey {
diff --git a/src/masternodes/govvariables/attributes.cpp b/src/masternodes/govvariables/attributes.cpp
index 8887ee7b96..f636df38da 100644
--- a/src/masternodes/govvariables/attributes.cpp
+++ b/src/masternodes/govvariables/attributes.cpp
@@ -1820,7 +1820,7 @@ Res ATTRIBUTES::Validate(const CCustomCSView &view) const {
                             evmQueueId &&
                             !evm_try_is_dst20_deployed_or_queued(result, evmQueueId, token->name, token->symbol,
                                                        tokenID.ToString())) {
-                            evm_try_create_dst20(result, evmQueueId, token->creationTx.GetByteArray(),
+                            evm_try_create_dst20(result, evmQueueId, token->creationTx.GetHex(),
                                                  token->name,
                                                  token->symbol,
                                                  tokenID.ToString());
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 876c134398..cd6ce21695 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -1073,7 +1073,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
 
         if (tokenId && token.IsDAT() && isEvmEnabledForBlock) {
             CrossBoundaryResult result;
-            evm_try_create_dst20(result, evmQueueId, tx.GetHash().GetByteArray(),
+            evm_try_create_dst20(result, evmQueueId, tx.GetHash().GetHex(),
                              rust::string(tokenName.c_str()),
                              rust::string(tokenSymbol.c_str()),
                              tokenId->ToString());
@@ -3917,7 +3917,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 CrossBoundaryResult result;
                 if (tokenId == DCT_ID{0}) {
                     evm_unsafe_try_add_balance_in_q(result, evmQueueId, HexStr(toAddress.begin(), toAddress.end()),
-                                    ArithToUint256(balanceIn).GetByteArray(), tx.GetHash().GetByteArray());
+                                    ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex());
                     if (!result.ok) {
                         return Res::Err("Error bridging DFI: %s", result.reason);
                     }
@@ -3925,7 +3925,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 else {
                     CrossBoundaryResult result;
                     evm_try_bridge_dst20(result, evmQueueId, HexStr(toAddress.begin(), toAddress.end()),
-                                     ArithToUint256(balanceIn).GetByteArray(), tx.GetHash().GetByteArray(), tokenId.ToString(), false);
+                                     ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex(), tokenId.ToString(), false);
 
                     if (!result.ok) {
                         return Res::Err("Error bridging DST20: %s", result.reason);
@@ -3945,7 +3945,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 if (tokenId == DCT_ID{0}) {
                     CrossBoundaryResult result;
                     if (!evm_unsafe_try_sub_balance_in_q(result, evmQueueId, HexStr(fromAddress.begin(), fromAddress.end()),
-                            ArithToUint256(balanceIn).GetByteArray(), tx.GetHash().GetByteArray())) {
+                            ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex())) {
                         return DeFiErrors::TransferDomainNotEnoughBalance(EncodeDestination(dest));
                     }
                     if (!result.ok) {
@@ -3954,8 +3954,9 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 }
                 else {
                     CrossBoundaryResult result;
+                    LogPrintf("XXX tx hash is: %s\n", tx.GetHash().ToString());
                     evm_try_bridge_dst20(result, evmQueueId, HexStr(fromAddress.begin(), fromAddress.end()),
-                                     ArithToUint256(balanceIn).GetByteArray(), tx.GetHash().GetByteArray(), tokenId.ToString(), true);
+                                     ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex(), tokenId.ToString(), true);
 
                     if (!result.ok) {
                         return Res::Err("Error bridging DST20: %s", result.reason);
@@ -4004,7 +4005,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 return Res::Err("evm tx failed to validate %s", result.reason);
             }
 
-            evm_unsafe_try_push_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), tx.GetHash().GetByteArray(), validateResults.gas_used);
+            evm_unsafe_try_push_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), tx.GetHash().GetHex(), validateResults.gas_used);
             if (!result.ok) {
                 LogPrintf("[evm_try_push_tx_in_q] failed, reason : %s\n", result.reason);
                 return Res::Err("evm tx failed to queue %s\n", result.reason);
@@ -4019,7 +4020,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         }
 
         auto txHash = tx.GetHash();
-        auto evmTxHash = uint256::FromByteArray(validateResults.tx_hash);
+        auto evmTxHash = uint256::FromByteArrayBE(validateResults.tx_hash);
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
             LogPrintf("Failed to store DVMtoEVM TX hash for DFI TX %s\n", txHash.ToString());
diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
index 1f73d83529..5fbc496c53 100644
--- a/src/masternodes/mn_checks.h
+++ b/src/masternodes/mn_checks.h
@@ -26,6 +26,7 @@ struct EVM {
     uint256 blockHash;
     uint64_t burntFee;
     uint64_t priorityFee;
+    // miner address in big endian
     EvmAddressData beneficiary;
 
     ADD_SERIALIZE_METHODS;
diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index 3ed0da26e8..3fe3c267c7 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -477,8 +477,7 @@ UniValue getaccount(const JSONRPCRequest& request) {
     CTxDestination dest;
     if (ExtractDestination(reqOwner, dest) && dest.index() == WitV16KeyEthHashType) {
         const auto keyID = std::get<WitnessV16EthHash>(dest);
-        EvmAddressData address = keyID.GetByteArray();
-        auto r = XResultValue(evm_try_get_balance(result, address));
+        auto r = XResultValue(evm_try_get_balance(result, keyID.GetByteArrayBE()));
         if (!r) throw JSONRPCError(RPC_MISC_ERROR, r.msg);
         if (const auto balance = *r) {
             balances[DCT_ID{}] = balance;
@@ -605,8 +604,7 @@ UniValue gettokenbalances(const JSONRPCRequest& request) {
 
     if (evm_dfi_lookup) {
         for (const auto keyID : pwallet->GetKeys()) {
-            EvmAddressData address = keyID.GetByteArray();
-            auto res = XResultValue(evm_try_get_balance(result, address));
+            auto res = XResultValue(evm_try_get_balance(result, keyID.GetByteArrayBE()));
             if (res) {
                 auto evmAmount = *res;
                 totalBalances.Add({{}, static_cast<CAmount>(evmAmount)});
diff --git a/src/masternodes/rpc_customtx.cpp b/src/masternodes/rpc_customtx.cpp
index f6626c03f4..99f3dbeeb1 100644
--- a/src/masternodes/rpc_customtx.cpp
+++ b/src/masternodes/rpc_customtx.cpp
@@ -579,7 +579,7 @@ class CCustomTxRpcVisitor {
         auto txHash = tx.GetHash();
         if (auto evmTxHash =  mnview.GetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash)) {
             CrossBoundaryResult result;
-            auto txInfo = evm_try_get_tx_by_hash(result, evmTxHash->GetByteArray());
+            auto txInfo = evm_try_get_tx_by_hash(result, evmTxHash->GetByteArrayBE());
             if (result.ok) {
                 std::string tx_type;
                 switch (txInfo.tx_type) {
@@ -601,7 +601,7 @@ class CCustomTxRpcVisitor {
                 }
                 rpcInfo.pushKV("type", tx_type);
                 rpcInfo.pushKV("hash", evmTxHash->ToString());
-                rpcInfo.pushKV("sender", EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArray(txInfo.sender)))));
+                rpcInfo.pushKV("sender", EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArrayBE(txInfo.sender)))));
                 rpcInfo.pushKV("nonce", txInfo.nonce);
                 rpcInfo.pushKV("gasPrice", txInfo.gas_price);
                 rpcInfo.pushKV("gasLimit", txInfo.gas_limit);
@@ -610,7 +610,7 @@ class CCustomTxRpcVisitor {
                 rpcInfo.pushKV("createTx", txInfo.create_tx);
                 std::string to = "";
                 if (!txInfo.create_tx)
-                    to = EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArray(txInfo.to))));
+                    to = EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArrayBE(txInfo.to))));
                 rpcInfo.pushKV("to", to);
                 rpcInfo.pushKV("value", txInfo.value);
             }
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index c4fef25c02..826a181d56 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -109,7 +109,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
         }
 
         const auto toEth = std::get<WitnessV16EthHash>(toDest);
-        to = toEth.GetByteArray();
+        to = toEth.GetByteArrayBE();
     }
 
     const arith_uint256 valueParam = AmountFromValue(request.params[5]);
@@ -130,13 +130,13 @@ UniValue evmtx(const JSONRPCRequest &request) {
     CrossBoundaryResult result;
     const auto signedTx = evm_try_create_and_sign_tx(result,
                                                      CreateTransactionContext{chainID,
-                                                                              nonce.GetByteArray(),
-                                                                              gasPrice.GetByteArray(),
-                                                                              gasLimit.GetByteArray(),
+                                                                              nonce.GetByteArrayLE(),
+                                                                              gasPrice.GetByteArrayLE(),
+                                                                              gasLimit.GetByteArrayLE(),
                                                                               to,
-                                                                              value.GetByteArray(),
+                                                                              value.GetByteArrayLE(),
                                                                               input,
-                                                                              privKey.GetByteArray()});
+                                                                              privKey.GetByteArrayBE()});
     if (!result.ok) {
         throw JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to create and sign TX: %s", result.reason.c_str()));
     }
@@ -310,8 +310,8 @@ UniValue vmmap(const JSONRPCRequest &request) {
         CrossBoundaryResult result;
         auto evmHash = evm_try_get_block_hash_by_number(result, height);
         crossBoundaryOkOrThrow(result);
-        auto evmBlockHash = std::uint256::FromByteArray(evmHash);
-        ResVal<uint256> dvm_block = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, uint256(evmBlockHash));
+        auto evmBlockHash = uint256::FromByteArrayBE(evmHash);
+        ResVal<uint256> dvm_block = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, evmBlockHash);
         if (!dvm_block) {
             throwInvalidParam(dvm_block.msg);
         }
@@ -336,7 +336,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
             throwInvalidParam(evmBlockHash.msg);
         }
         CrossBoundaryResult result;
-        uint64_t blockNumber = evm_try_get_block_number_by_hash(result, evmBlockHash.val.value().GetByteArray());
+        uint64_t blockNumber = evm_try_get_block_number_by_hash(result, evmBlockHash.val.value().GetByteArrayBE());
         crossBoundaryOkOrThrow(result);
         return finalizeBlockNumberResult(blockNumber, VMDomainRPCMapType::BlockNumberDVMToEVM, height);
     };
diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 8a0d13a3f8..39cb54b51e 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2382,7 +2382,7 @@ static void RevertFailedTransferDomainTxs(const std::vector<std::string> &failed
 }
 
 static Res ValidateCoinbaseXVMOutput(const XVM &xvm, const FinalizeBlockCompletion &blockResult) {
-    const auto blockResultBlockHash = uint256::FromByteArray(blockResult.block_hash);
+    const auto blockResultBlockHash = uint256::FromByteArrayBE(blockResult.block_hash);
     
     if (xvm.evm.blockHash != blockResultBlockHash) {
         return Res::Err("Incorrect EVM block hash in coinbase output");
@@ -2444,7 +2444,6 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     if (!result.ok) {
         return Res::Err(result.reason.c_str());
     }
-    auto evmBlockHash = uint256::FromByteArray(blockResult.block_hash);
     if (block.vtx[0]->vout.size() < 2) {
         return Res::Err("Not enough outputs in coinbase TX");
     }
@@ -2452,6 +2451,7 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     auto res = ValidateCoinbaseXVMOutput(*xvmRes, blockResult);
     if (!res) return res;
 
+    auto evmBlockHash = uint256::FromByteArrayBE(blockResult.block_hash);
     res = cache.SetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, block.GetHash(), evmBlockHash);
     if (!res) return res;
 
@@ -2543,7 +2543,7 @@ Res ProcessDST20Migration(const CBlockIndex *pindex, CCustomCSView &cache, const
             return true;
         }
 
-        evm_try_create_dst20(result, evmQueueId, token.creationTx.GetByteArray(), token.name, token.symbol, id.ToString());
+        evm_try_create_dst20(result, evmQueueId, token.creationTx.GetHex(), token.name, token.symbol, id.ToString());
         if (!result.ok) {
             errMsg = result.reason.c_str();
             return false;
diff --git a/src/miner.cpp b/src/miner.cpp
index a650744f60..a0337e0cb1 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -40,7 +40,9 @@
 #include <random>
 #include <utility>
 
+
 struct EvmAddressWithNonce {
+    // Byte array of EVM address stored as big endian
     EvmAddressData address;
     uint64_t nonce;
 
@@ -298,7 +300,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         auto r = XResultStatusLogged(evm_unsafe_try_remove_queue(result, evmQueueId));
         if (!r) { return nullptr; }
 
-        xvm = XVM{0, {0, uint256::FromByteArray(blockResult.block_hash), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
+        xvm = XVM{0, {0, uint256::FromByteArrayBE(blockResult.block_hash), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
         // LogPrintf("DEBUG:: CreateNewBlock:: xvm-init:: %s\n", xvm.ToUniValue().write());
 
         std::set<uint256> failedTransactions;
@@ -1143,7 +1145,7 @@ Staker::Status Staker::stake(const CChainParams& chainparams, const ThreadStaker
     if (pubKey.IsCompressed()) {
         pubKey.Decompress();
     }
-    const auto evmBeneficiary = pubKey.GetEthID().GetByteArray();
+    const auto evmBeneficiary = pubKey.GetEthID().GetByteArrayBE();
     auto pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey, blockTime, evmBeneficiary);
     if (!pblocktemplate) {
         LogPrintf("Error: WalletStaker: Keypool ran out, keypoolrefill and restart required\n");
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f5180d3948..f76022b0c6 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -274,10 +274,10 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn
 
     auto evmBlockHeaderToUniValue = [](const EVMBlockHeader& header) {
             UniValue r(UniValue::VOBJ);
-            r.pushKV("parenthash", uint256::FromByteArray(header.parent_hash).ToString());
-            r.pushKV("beneficiary", uint160::FromByteArray(header.beneficiary).ToString());
-            r.pushKV("stateRoot", uint256::FromByteArray(header.state_root).ToString());
-            r.pushKV("receiptRoot", uint256::FromByteArray(header.receipts_root).ToString());
+            r.pushKV("parenthash", uint256::FromByteArrayBE(header.parent_hash).ToString());
+            r.pushKV("beneficiary", uint160::FromByteArrayBE(header.beneficiary).ToString());
+            r.pushKV("stateRoot", uint256::FromByteArrayBE(header.state_root).ToString());
+            r.pushKV("receiptRoot", uint256::FromByteArrayBE(header.receipts_root).ToString());
             r.pushKV("number", header.number);
             r.pushKV("gasLimit", header.gas_limit);
             r.pushKV("gasUsed", header.gas_used);
@@ -304,7 +304,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn
             result.pushKV("txtype", "coinbase");
             result.pushKV("msg", xvm->ToUniValue());
             CrossBoundaryResult res;
-            auto evmBlockHeader = evm_try_get_block_header_by_hash(res, xvm->evm.blockHash.GetByteArray());
+            auto evmBlockHeader = evm_try_get_block_header_by_hash(res, xvm->evm.blockHash.GetByteArrayBE());
             if (!res.ok) return {};
             result.pushKV("xvmHeader", evmBlockHeaderToUniValue(evmBlockHeader));
             return result;
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index d6efa71811..f1f3e6fa30 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -778,8 +778,7 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
 
     // Check address on explorer to calc nonce
     const std::vector<uint8_t> nonceVec{ParseHex("0000000000000000000000000000000000000000000000000000000000000000")};
-    std::array<uint8_t, 32> nonce{};
-    std::copy(nonceVec.begin(), nonceVec.end(), nonce.begin()); // Not need with nonce 0 but useful later
+    uint256 nonce(nonceVec);
 
     const uint256 gasPrice{uint256S("689451EEE1")}; // 449.164996321 Gwei
     const uint256 gasLimit{uint256S("5208")}; // 21,000
@@ -797,7 +796,7 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
     rust::Vec<uint8_t> input{};
 
     CrossBoundaryResult result;
-    const auto reply = evm_try_create_and_sign_tx(result, CreateTransactionContext{chainID, nonce, gasPrice.GetByteArray(), gasLimit.GetByteArray(), to, value, input, privKey});
+    const auto reply = evm_try_create_and_sign_tx(result, CreateTransactionContext{chainID, nonce.GetByteArrayLE(), gasPrice.GetByteArrayLE(), gasLimit.GetByteArrayLE(), to, value, input, privKey});
     std::vector<uint8_t> replyVector(reply.size());
     std::copy(reply.begin(), reply.end(), replyVector.begin());
     std::string transaction(HexStr(replyVector.begin(), replyVector.end()));
diff --git a/src/test/xvm_tests.cpp b/src/test/xvm_tests.cpp
index 117517204d..a04726b782 100644
--- a/src/test/xvm_tests.cpp
+++ b/src/test/xvm_tests.cpp
@@ -12,7 +12,7 @@ BOOST_AUTO_TEST_CASE(xvm_test_case_1)
 {
     auto zero = uint256S("0x0");
     auto one = uint256S("0x1");
-    auto oneArr = uint256S("0x1").GetByteArray();
+    auto oneArr = uint256S("0x1").GetByteArrayLE();
     auto oneVec = std::vector<uint8_t>(oneArr.begin(), oneArr.end());
     auto oneVecReversed = std::vector<uint8_t>(oneArr.begin(), oneArr.end());
     std::reverse(oneVecReversed.begin(), oneVecReversed.end());
diff --git a/src/uint256.h b/src/uint256.h
index 7350aad13e..f8edd3d813 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -66,7 +66,14 @@ class base_blob
                ((uint64_t)ptr[7]) << 56;
     }
 
-    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArray() const
+    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArrayBE() const
+    {
+        std::array<uint8_t, WIDTH> array;
+        std::copy(data, data + sizeof(data), array.begin());
+        return array;
+    }
+
+    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArrayLE() const
     {
         // We store bytes in the reverse order. So any expectations of
         // an array of bytes should be in same order as the hex string.
@@ -124,7 +131,11 @@ class uint160 : public base_blob<160> {
     uint160() {}
     explicit uint160(const std::vector<unsigned char>& vch) : base_blob<160>(vch) {}
 
-    static uint160 FromByteArray(const std::array<uint8_t, 20>& data) {
+    static uint160 FromByteArrayBE(const std::array<uint8_t, 20>& data) {
+        return uint160(std::vector<unsigned char>(data.begin(), data.end()));
+    }
+
+    static uint160 FromByteArrayLE(const std::array<uint8_t, 20>& data) {
         return uint160(std::vector<unsigned char>(data.rbegin(), data.rend()));
     }
 };
@@ -139,7 +150,11 @@ class uint256 : public base_blob<256> {
     uint256() {}
     explicit uint256(const std::vector<unsigned char>& vch) : base_blob<256>(vch) {}
 
-    static uint256 FromByteArray(const std::array<uint8_t, 32>& data) {
+    static uint256 FromByteArrayBE(const std::array<uint8_t, 32>& data) {
+        return uint256(std::vector<unsigned char>(data.begin(), data.end()));
+    }
+
+    static uint256 FromByteArrayLE(const std::array<uint8_t, 32>& data) {
         return uint256(std::vector<unsigned char>(data.rbegin(), data.rend()));
     }
 };
diff --git a/test/functional/feature_dst20.py b/test/functional/feature_dst20.py
index b99b0b4c23..746188864b 100755
--- a/test/functional/feature_dst20.py
+++ b/test/functional/feature_dst20.py
@@ -619,7 +619,7 @@ def run_test(self):
                 }
             }
         )
-        self.nodes[0].generate(1)
+        self.nodes[0].generate(2)
 
         self.test_pre_evm_token()
         self.test_deploy_token()
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 160fd397fc..34514c28d1 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -182,7 +182,7 @@ def test_block(self):
         res = self.nodes[0].getcustomtx(block["tx"][1])
         assert_equal(
             res["results"]["hash"],
-            "8c99e9f053e033078e33c2756221f38fd529b914165090a615f27961de687497",
+            "977468de6179f215a690501614b929d58ff3216275c2338e0733e053f0e9998c",
         )
         # Note: This will fail. Re-evaluate
         assert_equal(res["results"]["sender"].lower(), self.ethAddress)

From 615f4d433e62436057ca1f0b14bf657bfccbd13a Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Tue, 15 Aug 2023 22:47:20 +0800
Subject: [PATCH 11/50] Fix lint

---
 src/miner.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index a0337e0cb1..ecffa797e5 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -40,7 +40,6 @@
 #include <random>
 #include <utility>
 
-
 struct EvmAddressWithNonce {
     // Byte array of EVM address stored as big endian
     EvmAddressData address;

From f05ba92e10669d2a8049a72e3179e71b38e65d80 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 09:51:18 +0800
Subject: [PATCH 12/50] Fix evmtx rpc and rust ffi to pass uint64

---
 lib/ain-rs-exports/src/evm.rs  | 27 ++++++++++++++++++---------
 lib/ain-rs-exports/src/lib.rs  | 10 ++++++----
 src/masternodes/rpc_evm.cpp    | 27 +++++++++++----------------
 src/test/transaction_tests.cpp | 11 +++++------
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index d203388af4..8abcd1a75c 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -8,7 +8,7 @@ use ain_evm::{
     storage::traits::Rollback,
     storage::traits::TransactionStorage,
     transaction::{self, SignedTx},
-    weiamount::WeiAmount,
+    weiamount::{WeiAmount, try_from_gwei, try_from_satoshi},
 };
 use ethereum::{EnvelopedEncodable, TransactionAction, TransactionSignature, TransactionV2};
 use log::debug;
@@ -41,18 +41,27 @@ pub fn evm_try_create_and_sign_tx(
         TransactionAction::Call(H160::from(ctx.to))
     };
 
-    let nonce_u256 = U256::from(ctx.nonce);
-    let gas_price_u256 = U256::from(ctx.gas_price);
-    let gas_limit_u256 = U256::from(ctx.gas_limit);
-    let value_u256 = U256::from(ctx.value);
+    let nonce = U256::from(ctx.nonce);
+    let gas_price_gwei = U256::from(ctx.gas_price);
+    let gas_price_wei = match try_from_gwei(gas_price_gwei) {
+        Ok(wei) => wei,
+        Err(e) => return cross_boundary_error_return(result, e.to_string()),
+    };
+
+    let gas_limit = U256::from(ctx.gas_limit);
+    let value_satoshi = U256::from(ctx.value);
+    let value_wei = match try_from_satoshi(value_satoshi) {
+        Ok(wei) => wei,
+        Err(e) => return cross_boundary_error_return(result, e.to_string()),
+    };
 
     // Create
     let t = LegacyUnsignedTransaction {
-        nonce: nonce_u256,
-        gas_price: gas_price_u256,
-        gas_limit: gas_limit_u256,
+        nonce,
+        gas_price: gas_price_wei.0,
+        gas_limit,
         action: to_action,
-        value: value_u256,
+        value: value_wei.0,
         input: ctx.input,
         // Dummy sig for now. Needs 27, 28 or > 36 for valid v.
         sig: TransactionSignature::new(27, LOWER_H256, LOWER_H256).unwrap(),
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index 831bcb0153..bb1955f91e 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -66,11 +66,13 @@ pub mod ffi {
 
     pub struct CreateTransactionContext {
         pub chain_id: u64,
-        pub nonce: [u8; 32],
-        pub gas_price: [u8; 32],
-        pub gas_limit: [u8; 32],
+        pub nonce: u64,
+        // GWei
+        pub gas_price: u64,
+        pub gas_limit: u64,
         pub to: [u8; 20],
-        pub value: [u8; 32],
+        // Satoshi
+        pub value: u64,
         pub input: Vec<u8>,
         pub priv_key: [u8; 32],
     }
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 826a181d56..3a88caa37b 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -90,15 +90,13 @@ UniValue evmtx(const JSONRPCRequest &request) {
     // TODO Get chain ID from Params when defined
     const uint64_t chainID{1};
 
-    const arith_uint256 nonceParam = request.params[1].get_int64();
-    const auto nonce               = ArithToUint256(nonceParam);
-
-    arith_uint256 gasPriceArith = request.params[2].get_int64();  // Price as GWei
-    gasPriceArith *= WEI_IN_GWEI;                                 // Convert to Wei
-    const uint256 gasPrice = ArithToUint256(gasPriceArith);
-
-    arith_uint256 gasLimitArith = request.params[3].get_int64();
-    const uint256 gasLimit      = ArithToUint256(gasLimitArith);
+    if (request.params[1].get_int64() < 0 || request.params[2].get_int64() < 0 || request.params[3].get_int64() < 0) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Input params cannot be negative");
+    }
+    const auto nonce = static_cast<uint64_t>(request.params[1].get_int64());
+    const auto gasPrice = static_cast<uint64_t>(request.params[2].get_int64());  // Price as GWei
+    const auto gasLimit = static_cast<uint64_t>(request.params[3].get_int64());
+    const uint64_t value = AmountFromValue(request.params[5]);   // Amount in CAmount
 
     const auto toStr = request.params[4].get_str();
     EvmAddressData to{};
@@ -112,9 +110,6 @@ UniValue evmtx(const JSONRPCRequest &request) {
         to = toEth.GetByteArrayBE();
     }
 
-    const arith_uint256 valueParam = AmountFromValue(request.params[5]);
-    const auto value               = ArithToUint256(valueParam * CAMOUNT_TO_GWEI * WEI_IN_GWEI);
-
     rust::Vec<uint8_t> input{};
     if (!request.params[6].isNull()) {
         const auto inputStr = request.params[6].get_str();
@@ -130,11 +125,11 @@ UniValue evmtx(const JSONRPCRequest &request) {
     CrossBoundaryResult result;
     const auto signedTx = evm_try_create_and_sign_tx(result,
                                                      CreateTransactionContext{chainID,
-                                                                              nonce.GetByteArrayLE(),
-                                                                              gasPrice.GetByteArrayLE(),
-                                                                              gasLimit.GetByteArrayLE(),
+                                                                              nonce,
+                                                                              gasPrice,
+                                                                              gasLimit,
                                                                               to,
-                                                                              value.GetByteArrayLE(),
+                                                                              value,
                                                                               input,
                                                                               privKey.GetByteArrayBE()});
     if (!result.ok) {
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index f1f3e6fa30..da6d2fbf5d 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -777,17 +777,16 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
     const uint64_t chainID{5}; // Goerli testnetwork
 
     // Check address on explorer to calc nonce
-    const std::vector<uint8_t> nonceVec{ParseHex("0000000000000000000000000000000000000000000000000000000000000000")};
-    uint256 nonce(nonceVec);
+    uint64_t nonce = 0;
 
-    const uint256 gasPrice{uint256S("689451EEE1")}; // 449.164996321 Gwei
-    const uint256 gasLimit{uint256S("5208")}; // 21,000
+    const uint64_t gasPrice = 449164996321; // 449.164996321 GWei
+    const uint64_t gasLimit = 21000; // 21,000
 
     std::vector<uint8_t> toVec{ParseHex("34c1ca09a2dc717d89baef2f30ff6a6b2975e17e")};
     EvmAddressData to{};
     std::copy(toVec.begin(), toVec.end(), to.begin());
 
-    std::array<uint8_t, 32> value{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,ParseHex("23")[0],ParseHex("86")[0],ParseHex("F2")[0],ParseHex("6F")[0],ParseHex("C1")[0],0,0}; // 0.01 Eth
+    uint64_t value = 1000000;   // 0.01 DFI
 
     const std::vector<uint8_t> privKeyVec{ParseHex("1a8ec29c671461a375ee1fb193ab3b64ab5449837e060362daadd4b299ae5571")};
     std::array<uint8_t, 32> privKey{};
@@ -796,7 +795,7 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
     rust::Vec<uint8_t> input{};
 
     CrossBoundaryResult result;
-    const auto reply = evm_try_create_and_sign_tx(result, CreateTransactionContext{chainID, nonce.GetByteArrayLE(), gasPrice.GetByteArrayLE(), gasLimit.GetByteArrayLE(), to, value, input, privKey});
+    const auto reply = evm_try_create_and_sign_tx(result, CreateTransactionContext{chainID, nonce, gasPrice, gasLimit, to, value, input, privKey});
     std::vector<uint8_t> replyVector(reply.size());
     std::copy(reply.begin(), reply.end(), replyVector.begin());
     std::string transaction(HexStr(replyVector.begin(), replyVector.end()));

From 02fb437f561db6d5022eefe8debbb63f3d866352 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 09:53:53 +0800
Subject: [PATCH 13/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 8abcd1a75c..968ddd1a11 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -8,7 +8,7 @@ use ain_evm::{
     storage::traits::Rollback,
     storage::traits::TransactionStorage,
     transaction::{self, SignedTx},
-    weiamount::{WeiAmount, try_from_gwei, try_from_satoshi},
+    weiamount::{WeiAmount, try_from_satoshi, try_from_gwei},
 };
 use ethereum::{EnvelopedEncodable, TransactionAction, TransactionSignature, TransactionV2};
 use log::debug;

From 120fd7dad2380dbeb77a95e5f31ba6cd6737615b Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 09:54:40 +0800
Subject: [PATCH 14/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 968ddd1a11..7ba0c1acd3 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -8,7 +8,7 @@ use ain_evm::{
     storage::traits::Rollback,
     storage::traits::TransactionStorage,
     transaction::{self, SignedTx},
-    weiamount::{WeiAmount, try_from_satoshi, try_from_gwei},
+    weiamount::{try_from_gwei, try_from_satoshi, WeiAmount},
 };
 use ethereum::{EnvelopedEncodable, TransactionAction, TransactionSignature, TransactionV2};
 use log::debug;

From 57fd2f1f9e924971b6b8b4bc3c3ab000b699c895 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 17:05:55 +0800
Subject: [PATCH 15/50] Changes to pass hash as string between boundaries

---
 lib/ain-evm/src/evm.rs             |   4 +-
 lib/ain-rs-exports/src/evm.rs      | 129 ++++++++++++++++++-----------
 lib/ain-rs-exports/src/lib.rs      |  52 ++++++------
 src/ffi/ffiexports.cpp             |   2 +-
 src/ffi/ffiexports.h               |   2 +-
 src/key.h                          |  23 -----
 src/masternodes/evm.cpp            |  36 ++++----
 src/masternodes/evm.h              |  12 +--
 src/masternodes/mn_checks.cpp      |  32 +++----
 src/masternodes/mn_checks.h        |   5 +-
 src/masternodes/rpc_accounts.cpp   |   5 +-
 src/masternodes/rpc_customtx.cpp   |  13 ++-
 src/masternodes/rpc_evm.cpp        |  61 +++++++-------
 src/masternodes/validation.cpp     |   8 +-
 src/miner.cpp                      |  23 ++---
 src/miner.h                        |   2 +-
 src/rpc/blockchain.cpp             |  10 +--
 src/script/standard.cpp            |   5 ++
 src/script/standard.h              |   1 +
 src/test/transaction_tests.cpp     |   5 +-
 src/test/xvm_tests.cpp             |  32 +++----
 src/txmempool.cpp                  |   2 +-
 src/txmempool.h                    |   4 +-
 src/uint256.h                      |  29 +------
 src/validation.cpp                 |   7 +-
 test/functional/feature_evm_rpc.py |   3 +-
 26 files changed, 238 insertions(+), 269 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index 2b1d798505..418a5ec035 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -37,7 +37,7 @@ pub struct EVMServices {
 }
 
 pub struct FinalizedBlockInfo {
-    pub block_hash: [u8; 32],
+    pub block_hash: String,
     pub failed_transactions: Vec<String>,
     pub total_burnt_fees: U256,
     pub total_priority_fees: U256,
@@ -343,7 +343,7 @@ impl EVMServices {
         });
 
         Ok(FinalizedBlockInfo {
-            block_hash: *block.header.hash().as_fixed_bytes(),
+            block_hash: block.header.hash().to_string(),
             failed_transactions,
             total_burnt_fees,
             total_priority_fees,
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 7ba0c1acd3..dd68e1abae 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -12,7 +12,7 @@ use ain_evm::{
 };
 use ethereum::{EnvelopedEncodable, TransactionAction, TransactionSignature, TransactionV2};
 use log::debug;
-use primitive_types::{H160, H256, U256};
+use primitive_types::U256;
 use transaction::{LegacyUnsignedTransaction, TransactionError, LOWER_H256};
 
 use crate::ffi;
@@ -38,30 +38,29 @@ pub fn evm_try_create_and_sign_tx(
     let to_action = if ctx.to.is_empty() {
         TransactionAction::Create
     } else {
-        TransactionAction::Call(H160::from(ctx.to))
+        let Ok(to_address) = ctx.to.parse() else {
+            return cross_boundary_error_return(result, "Invalid address");
+        };
+        TransactionAction::Call(to_address)
     };
-
     let nonce = U256::from(ctx.nonce);
-    let gas_price_gwei = U256::from(ctx.gas_price);
-    let gas_price_wei = match try_from_gwei(gas_price_gwei) {
-        Ok(wei) => wei,
+    let gas_price = match try_from_gwei(U256::from(ctx.gas_price)) {
+        Ok(price) => price,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-
     let gas_limit = U256::from(ctx.gas_limit);
-    let value_satoshi = U256::from(ctx.value);
-    let value_wei = match try_from_satoshi(value_satoshi) {
-        Ok(wei) => wei,
+    let value = match try_from_satoshi(U256::from(ctx.value)) {
+        Ok(wei_value) => wei_value,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
 
     // Create
     let t = LegacyUnsignedTransaction {
         nonce,
-        gas_price: gas_price_wei.0,
+        gas_price: gas_price.0,
         gas_limit,
         action: to_action,
-        value: value_wei.0,
+        value: value.0,
         input: ctx.input,
         // Dummy sig for now. Needs 27, 28 or > 36 for valid v.
         sig: TransactionSignature::new(27, LOWER_H256, LOWER_H256).unwrap(),
@@ -87,14 +86,16 @@ pub fn evm_try_create_and_sign_tx(
 /// # Returns
 ///
 /// Returns the balance of the account as a `u64` on success.
-pub fn evm_try_get_balance(result: &mut ffi::CrossBoundaryResult, address: [u8; 20]) -> u64 {
-    let account = H160::from(address);
+pub fn evm_try_get_balance(result: &mut ffi::CrossBoundaryResult, address: &str) -> u64 {
+    let Ok(address) = address.parse() else {
+        return cross_boundary_error_return(result, "Invalid address");
+    };
     let (_, latest_block_number) = match SERVICES.evm.block.get_latest_block_hash_and_number() {
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
         Ok(data) => data.unwrap_or_default(),
     };
 
-    match SERVICES.evm.core.get_balance(account, latest_block_number) {
+    match SERVICES.evm.core.get_balance(address, latest_block_number) {
         Err(e) => cross_boundary_error_return(result, e.to_string()),
         Ok(balance) => {
             let amount = WeiAmount(balance).to_satoshi().try_into();
@@ -117,9 +118,12 @@ pub fn evm_try_get_balance(result: &mut ffi::CrossBoundaryResult, address: [u8;
 pub fn evm_unsafe_try_get_next_valid_nonce_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
-    address: [u8; 20],
+    address: &str,
 ) -> u64 {
-    let address = H160::from(address);
+    let Ok(address) = address.parse() else {
+        return cross_boundary_error_return(result, "Invalid address");
+    };
+
     unsafe {
         match SERVICES
             .evm
@@ -147,9 +151,12 @@ pub fn evm_unsafe_try_get_next_valid_nonce_in_q(
 pub fn evm_unsafe_try_remove_txs_by_sender_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
-    address: [u8; 20],
+    address: &str,
 ) {
-    let address = H160::from(address);
+    let Ok(address) = address.parse() else {
+        return cross_boundary_error_return(result, "Invalid address");
+    };
+
     unsafe {
         match SERVICES.evm.core.remove_txs_by_sender_in(queue_id, address) {
             Ok(_) => cross_boundary_success_return(result, ()),
@@ -171,19 +178,23 @@ pub fn evm_unsafe_try_add_balance_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
     address: &str,
-    amount: [u8; 32],
+    amount: u64,
     native_hash: &str,
 ) {
-    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
+    let amount = match try_from_satoshi(U256::from(amount)) {
+        Ok(wei_amount) => wei_amount,
+        Err(e) => return cross_boundary_error_return(result, e.to_string()),
+    };
+    let native_hash = native_hash.to_string();
 
     unsafe {
         match SERVICES
             .evm
             .core
-            .add_balance(queue_id, address, amount.into(), native_hash)
+            .add_balance(queue_id, address, amount.0, native_hash)
         {
             Ok(_) => cross_boundary_success_return(result, ()),
             Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -214,19 +225,23 @@ pub fn evm_unsafe_try_sub_balance_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
     address: &str,
-    amount: [u8; 32],
+    amount: u64,
     native_hash: &str,
 ) -> bool {
-    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
+    let amount = match try_from_satoshi(U256::from(amount)) {
+        Ok(wei_amount) => wei_amount,
+        Err(e) => return cross_boundary_error_return(result, e.to_string()),
+    };
+    let native_hash = native_hash.to_string();
 
     unsafe {
         match SERVICES
             .evm
             .core
-            .sub_balance(queue_id, address, amount.into(), native_hash)
+            .sub_balance(queue_id, address, amount.0, native_hash)
         {
             Ok(_) => cross_boundary_success_return(result, true),
             Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -261,6 +276,7 @@ pub fn evm_unsafe_try_prevalidate_raw_tx(
     tx: &str,
 ) -> ffi::PreValidateTxCompletion {
     let queue_id = 0;
+
     unsafe {
         match SERVICES.evm.core.validate_raw_tx(tx, queue_id) {
             Ok(ValidateTxInfo {
@@ -280,7 +296,7 @@ pub fn evm_unsafe_try_prevalidate_raw_tx(
                     result,
                     ffi::PreValidateTxCompletion {
                         nonce,
-                        sender: signed_tx.sender.to_fixed_bytes(),
+                        sender: signed_tx.sender.to_string(),
                         prepay_fee,
                     },
                 )
@@ -348,8 +364,8 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
                     result,
                     ffi::ValidateTxCompletion {
                         nonce,
-                        sender: signed_tx.sender.to_fixed_bytes(),
-                        tx_hash: signed_tx.hash().to_fixed_bytes(),
+                        sender: signed_tx.sender.to_string(),
+                        tx_hash: signed_tx.hash().to_string(),
                         prepay_fee,
                         gas_used: used_gas,
                     },
@@ -411,6 +427,7 @@ pub fn evm_unsafe_try_push_tx_in_q(
 ) {
     let native_hash = native_hash.to_string();
     let signed_tx: Result<SignedTx, TransactionError> = raw_tx.try_into();
+
     unsafe {
         match signed_tx {
             Ok(signed_tx) => {
@@ -445,11 +462,14 @@ pub fn evm_unsafe_try_construct_block_in_q(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
     difficulty: u32,
-    miner_address: [u8; 20],
+    miner_address: &str,
     timestamp: u64,
     dvm_block_number: u64,
 ) -> ffi::FinalizeBlockCompletion {
-    let eth_address = H160::from(miner_address);
+    let Ok(eth_address) = miner_address.parse() else {
+        return cross_boundary_error_return(result, "Invalid address");
+    };
+
     unsafe {
         match SERVICES.evm.construct_block_in_queue(
             queue_id,
@@ -528,14 +548,14 @@ pub fn evm_try_set_attribute(
 pub fn evm_try_get_block_hash_by_number(
     result: &mut ffi::CrossBoundaryResult,
     height: u64,
-) -> [u8; 32] {
+) -> String {
     match SERVICES
         .evm
         .storage
         .get_block_by_number(&U256::from(height))
     {
         Ok(Some(block)) => {
-            cross_boundary_success_return(result, block.header.hash().to_fixed_bytes())
+            cross_boundary_success_return(result, block.header.hash().to_string())
         }
         Ok(None) => cross_boundary_error_return(result, "Invalid block number"),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -553,11 +573,12 @@ pub fn evm_try_get_block_hash_by_number(
 /// Returns the block number associated with the given blockhash.
 pub fn evm_try_get_block_number_by_hash(
     result: &mut ffi::CrossBoundaryResult,
-    hash: [u8; 32],
+    hash: &str,
 ) -> u64 {
-    let Ok(hash) = H256::try_from(hash) else {
+    let Ok(hash) = hash.parse() else {
         return cross_boundary_error_return(result, "Invalid block hash");
     };
+
     match SERVICES.evm.storage.get_block_by_hash(&hash) {
         Ok(Some(block)) => {
             let Ok(block_number) = u64::try_from(block.header.number) else {
@@ -572,9 +593,9 @@ pub fn evm_try_get_block_number_by_hash(
 
 pub fn evm_try_get_block_header_by_hash(
     result: &mut ffi::CrossBoundaryResult,
-    hash: [u8; 32],
+    hash: &str,
 ) -> ffi::EVMBlockHeader {
-    let Ok(hash) = H256::try_from(hash) else {
+    let Ok(hash) = hash.parse() else {
         return cross_boundary_error_return(result, "Invalid block hash");
     };
 
@@ -594,16 +615,16 @@ pub fn evm_try_get_block_header_by_hash(
             };
 
             let out = ffi::EVMBlockHeader {
-                parent_hash: block.header.parent_hash.to_fixed_bytes(),
-                beneficiary: block.header.beneficiary.to_fixed_bytes(),
-                state_root: block.header.state_root.to_fixed_bytes(),
-                receipts_root: block.header.receipts_root.to_fixed_bytes(),
+                parent_hash: block.header.parent_hash.to_string(),
+                beneficiary: block.header.beneficiary.to_string(),
+                state_root: block.header.state_root.to_string(),
+                receipts_root: block.header.receipts_root.to_string(),
                 number,
                 gas_limit,
                 gas_used,
                 timestamp: block.header.timestamp,
                 extra_data: block.header.extra_data.clone(),
-                mix_hash: block.header.mix_hash.to_fixed_bytes(),
+                mix_hash: block.header.mix_hash.to_string(),
                 nonce: block.header.nonce.to_low_u64_ne(),
                 base_fee,
             };
@@ -647,12 +668,16 @@ pub fn evm_try_is_dst20_deployed_or_queued(
 
 pub fn evm_try_get_tx_by_hash(
     result: &mut ffi::CrossBoundaryResult,
-    tx_hash: [u8; 32],
+    tx_hash: &str,
 ) -> ffi::EVMTransaction {
+    let Ok(tx_hash) = tx_hash.parse() else {
+        return cross_boundary_error_return(result, "Invalid tx hash");
+    };
+
     match SERVICES
         .evm
         .storage
-        .get_transaction_by_hash(&H256::from(tx_hash))
+        .get_transaction_by_hash(&tx_hash)
     {
         Ok(Some(tx)) => {
             let Ok(tx) = SignedTx::try_from(tx) else {
@@ -716,8 +741,8 @@ pub fn evm_try_get_tx_by_hash(
 
             let out = ffi::EVMTransaction {
                 tx_type,
-                hash: tx.hash().to_fixed_bytes(),
-                sender: tx.sender.to_fixed_bytes(),
+                hash: tx.hash().to_string(),
+                sender: tx.sender.to_string(),
                 nonce,
                 gas_price,
                 gas_limit,
@@ -728,8 +753,8 @@ pub fn evm_try_get_tx_by_hash(
                     TransactionAction::Create => true,
                 },
                 to: match tx.to() {
-                    Some(to) => to.to_fixed_bytes(),
-                    None => H160::zero().to_fixed_bytes(),
+                    Some(to) => to.to_string(),
+                    None => String::new(),
                 },
                 value,
                 data: tx.data().to_vec(),
@@ -777,22 +802,26 @@ pub fn evm_try_bridge_dst20(
     result: &mut ffi::CrossBoundaryResult,
     queue_id: u64,
     address: &str,
-    amount: [u8; 32],
+    amount: u64,
     native_hash: &str,
     token_id: &str,
     out: bool,
 ) {
-    let native_hash = native_hash.to_string();
     let Ok(address) = address.parse() else {
         return cross_boundary_error_return(result, "Invalid address");
     };
+    let amount = match try_from_satoshi(U256::from(amount)) {
+        Ok(wei_amount) => wei_amount,
+        Err(e) => return cross_boundary_error_return(result, e.to_string()),
+    };
+    let native_hash = native_hash.to_string();
     let contract = ain_contracts::dst20_address_from_token_id(token_id)
         .unwrap_or_else(|e| cross_boundary_error_return(result, e.to_string()));
 
     let system_tx = QueueTx::SystemTx(SystemTx::DST20Bridge(DST20Data {
         to: address,
         contract,
-        amount: amount.into(),
+        amount: amount.0,
         out,
     }));
 
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index bb1955f91e..ed603d6544 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -10,16 +10,16 @@ pub mod ffi {
     // ========== Block ==========
     #[derive(Default)]
     pub struct EVMBlockHeader {
-        pub parent_hash: [u8; 32],
-        pub beneficiary: [u8; 20],
-        pub state_root: [u8; 32],
-        pub receipts_root: [u8; 32],
+        pub parent_hash: String,
+        pub beneficiary: String,
+        pub state_root: String,
+        pub receipts_root: String,
         pub number: u64,
         pub gas_limit: u64,
         pub gas_used: u64,
         pub timestamp: u64,
         pub extra_data: Vec<u8>,
-        pub mix_hash: [u8; 32],
+        pub mix_hash: String,
         pub nonce: u64,
         pub base_fee: u64,
     }
@@ -29,15 +29,15 @@ pub mod ffi {
     pub struct EVMTransaction {
         // EIP-2718 transaction type: legacy - 0x0, EIP2930 - 0x1, EIP1559 - 0x2
         pub tx_type: u8,
-        pub hash: [u8; 32],
-        pub sender: [u8; 20],
+        pub hash: String,
+        pub sender: String,
         pub nonce: u64,
         pub gas_price: u64,
         pub gas_limit: u64,
         pub max_fee_per_gas: u64,
         pub max_priority_fee_per_gas: u64,
         pub create_tx: bool,
-        pub to: [u8; 20],
+        pub to: String,
         pub value: u64,
         pub data: Vec<u8>,
     }
@@ -64,14 +64,12 @@ pub mod ffi {
 
     // ========== EVM ==========
 
-    pub struct CreateTransactionContext {
+    pub struct CreateTransactionContext<'a> {
         pub chain_id: u64,
         pub nonce: u64,
-        // GWei
         pub gas_price: u64,
         pub gas_limit: u64,
-        pub to: [u8; 20],
-        // Satoshi
+        pub to: &'a str,
         pub value: u64,
         pub input: Vec<u8>,
         pub priv_key: [u8; 32],
@@ -79,7 +77,7 @@ pub mod ffi {
 
     #[derive(Default)]
     pub struct FinalizeBlockCompletion {
-        pub block_hash: [u8; 32],
+        pub block_hash: String,
         pub failed_transactions: Vec<String>,
         pub total_burnt_fees: u64,
         pub total_priority_fees: u64,
@@ -89,15 +87,15 @@ pub mod ffi {
     #[derive(Default)]
     pub struct PreValidateTxCompletion {
         pub nonce: u64,
-        pub sender: [u8; 20],
+        pub sender: String,
         pub prepay_fee: u64,
     }
 
     #[derive(Default)]
     pub struct ValidateTxCompletion {
         pub nonce: u64,
-        pub sender: [u8; 20],
-        pub tx_hash: [u8; 32],
+        pub sender: String,
+        pub tx_hash: String,
         pub prepay_fee: u64,
         pub gas_used: u64,
     }
@@ -107,7 +105,7 @@ pub mod ffi {
         //
         // If they are fallible, it's a TODO to changed and move later
         // so errors are propogated up properly.
-        fn evm_try_get_balance(result: &mut CrossBoundaryResult, address: [u8; 20]) -> u64;
+        fn evm_try_get_balance(result: &mut CrossBoundaryResult, address: &str) -> u64;
         fn evm_unsafe_try_create_queue(result: &mut CrossBoundaryResult) -> u64;
         fn evm_unsafe_try_remove_queue(result: &mut CrossBoundaryResult, queue_id: u64);
         fn evm_try_disconnect_latest_block(result: &mut CrossBoundaryResult);
@@ -118,25 +116,25 @@ pub mod ffi {
         fn evm_unsafe_try_get_next_valid_nonce_in_q(
             result: &mut CrossBoundaryResult,
             queue_id: u64,
-            address: [u8; 20],
+            address: &str,
         ) -> u64;
         fn evm_unsafe_try_remove_txs_by_sender_in_q(
             result: &mut CrossBoundaryResult,
             queue_id: u64,
-            address: [u8; 20],
+            address: &str,
         );
         fn evm_unsafe_try_add_balance_in_q(
             result: &mut CrossBoundaryResult,
             queue_id: u64,
             address: &str,
-            amount: [u8; 32],
+            amount: u64,
             native_hash: &str,
         );
         fn evm_unsafe_try_sub_balance_in_q(
             result: &mut CrossBoundaryResult,
             queue_id: u64,
             address: &str,
-            amount: [u8; 32],
+            amount: u64,
             native_hash: &str,
         ) -> bool;
         fn evm_unsafe_try_prevalidate_raw_tx(
@@ -159,7 +157,7 @@ pub mod ffi {
             result: &mut CrossBoundaryResult,
             queue_id: u64,
             difficulty: u32,
-            miner_address: [u8; 20],
+            miner_address: &str,
             timestamp: u64,
             dvm_block_number: u64,
         ) -> FinalizeBlockCompletion;
@@ -177,19 +175,19 @@ pub mod ffi {
         fn evm_try_get_block_hash_by_number(
             result: &mut CrossBoundaryResult,
             height: u64,
-        ) -> [u8; 32];
+        ) -> String;
         fn evm_try_get_block_number_by_hash(
             result: &mut CrossBoundaryResult,
-            hash: [u8; 32],
+            hash: &str,
         ) -> u64;
         fn evm_try_get_block_header_by_hash(
             result: &mut CrossBoundaryResult,
-            hash: [u8; 32],
+            hash: &str,
         ) -> EVMBlockHeader;
         fn evm_try_get_block_count(result: &mut CrossBoundaryResult) -> u64;
         fn evm_try_get_tx_by_hash(
             result: &mut CrossBoundaryResult,
-            tx_hash: [u8; 32],
+            tx_hash: &str,
         ) -> EVMTransaction;
 
         fn evm_try_create_dst20(
@@ -204,7 +202,7 @@ pub mod ffi {
             result: &mut CrossBoundaryResult,
             context: u64,
             address: &str,
-            amount: [u8; 32],
+            amount: u64,
             native_hash: &str,
             token_id: &str,
             out: bool,
diff --git a/src/ffi/ffiexports.cpp b/src/ffi/ffiexports.cpp
index 712a7e295a..2361be9b4d 100644
--- a/src/ffi/ffiexports.cpp
+++ b/src/ffi/ffiexports.cpp
@@ -194,7 +194,7 @@ uint64_t getMinRelayTxFee() {
     return ::minRelayTxFee.GetFeePerK() * 10000000;
 }
 
-std::array<uint8_t, 32> getEthPrivKey(EvmAddressData keyID) {
+std::array<uint8_t, 32> getEthPrivKey(std::array<uint8_t, 20> keyID) {
     CKey ethPrivKey;
     const auto ethKeyID = CKeyID{uint160{std::vector<uint8_t>(keyID.begin(), keyID.end())}};
     for (const auto &wallet: GetWallets()) {
diff --git a/src/ffi/ffiexports.h b/src/ffi/ffiexports.h
index cb31ad4f0e..a77d6bc2c7 100644
--- a/src/ffi/ffiexports.h
+++ b/src/ffi/ffiexports.h
@@ -34,7 +34,7 @@ std::array<uint8_t, 32> getChainWork(std::array<uint8_t, 32> blockHash);
 rust::vec<rust::string> getPoolTransactions();
 uint64_t getNativeTxSize(rust::Vec<uint8_t> rawTransaction);
 uint64_t getMinRelayTxFee();
-std::array<uint8_t, 32> getEthPrivKey(EvmAddressData keyID);
+std::array<uint8_t, 32> getEthPrivKey(std::array<uint8_t, 20> keyID);
 rust::string getStateInputJSON();
 int getHighestBlock();
 int getCurrentHeight();
diff --git a/src/key.h b/src/key.h
index e0a4739cac..ef8a662198 100644
--- a/src/key.h
+++ b/src/key.h
@@ -15,9 +15,6 @@
 #include <stdexcept>
 #include <vector>
 
-/** Byte array of an EVM address stored as big endian. */
-typedef std::array<uint8_t, 20> EvmAddressData;
-
 /**
  * secure_allocator is defined in allocators.h
  * CPrivKey is a serialized private key, with all parameters included
@@ -141,26 +138,6 @@ class CKey
 
     //! Load private key and check that public key matches.
     bool Load(const CPrivKey& privkey, const CPubKey& vchPubKey, bool fSkipCheck);
-
-    std::array<uint8_t, 32> GetByteArrayLE() const
-    {
-        // We store bytes in the reverse order. So any expectations of
-        // an array of bytes should be in same order as the hex string.
-        // The protected data array is an internal implementation detail. 
-        std::array<uint8_t, 32> reversedArray;
-        std::copy(keydata.rbegin(), keydata.rend(), reversedArray.begin());
-        return reversedArray;
-    }
-
-    std::array<uint8_t, 32> GetByteArrayBE() const
-    {
-        // We store bytes in the reverse order. So any expectations of
-        // an array of bytes should be in same order as the hex string.
-        // The protected data array is an internal implementation detail. 
-        std::array<uint8_t, 32> array;
-        std::copy(keydata.begin(), keydata.end(), array.begin());
-        return array;
-    }
 };
 
 struct CExtKey {
diff --git a/src/masternodes/evm.cpp b/src/masternodes/evm.cpp
index 4afe1343e6..8486c9ffef 100644
--- a/src/masternodes/evm.cpp
+++ b/src/masternodes/evm.cpp
@@ -3,45 +3,45 @@
 #include <masternodes/res.h>
 #include <uint256.h>
 
-Res CVMDomainGraphView::SetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey, uint256 blockHash)
+Res CVMDomainGraphView::SetVMDomainBlockEdge(VMDomainEdge type, std::string blockHashKey, std::string blockHash)
 {
     return WriteBy<VMDomainBlockEdge>(std::pair(static_cast<uint8_t>(type), blockHashKey), blockHash)
-        ? Res::Ok() : DeFiErrors::DatabaseRWFailure(blockHashKey.GetHex());
+        ? Res::Ok() : DeFiErrors::DatabaseRWFailure(blockHashKey);
 }
 
-ResVal<uint256> CVMDomainGraphView::GetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey) const
+ResVal<std::string> CVMDomainGraphView::GetVMDomainBlockEdge(VMDomainEdge type, std::string blockHashKey) const
 {
-    uint256 blockHash;
+    std::string blockHash;
     if (ReadBy<VMDomainBlockEdge>(std::pair(static_cast<uint8_t>(type), blockHashKey), blockHash))
-        return ResVal<uint256>(blockHash, Res::Ok());
-    return DeFiErrors::DatabaseKeyNotFound(blockHashKey.GetHex());
+        return ResVal<std::string>(blockHash, Res::Ok());
+    return DeFiErrors::DatabaseKeyNotFound(blockHashKey);
 }
 
-Res CVMDomainGraphView::SetVMDomainTxEdge(VMDomainEdge type, uint256 txHashKey, uint256 txHash)
+Res CVMDomainGraphView::SetVMDomainTxEdge(VMDomainEdge type, std::string txHashKey, std::string txHash)
 {
     return WriteBy<VMDomainTxEdge>(std::pair(static_cast<uint8_t>(type), txHashKey), txHash) 
-        ? Res::Ok() : DeFiErrors::DatabaseRWFailure(txHashKey.GetHex());
+        ? Res::Ok() : DeFiErrors::DatabaseRWFailure(txHashKey);
 }
 
-ResVal<uint256> CVMDomainGraphView::GetVMDomainTxEdge(VMDomainEdge type, uint256 txHashKey) const
+ResVal<std::string> CVMDomainGraphView::GetVMDomainTxEdge(VMDomainEdge type, std::string txHashKey) const
 {
-    uint256 txHash;
+    std::string txHash;
     if (ReadBy<VMDomainTxEdge>(std::pair(static_cast<uint8_t>(type), txHashKey), txHash))
-        return ResVal<uint256>(txHash, Res::Ok());
-    return DeFiErrors::DatabaseKeyNotFound(txHashKey.GetHex());
+        return ResVal<std::string>(txHash, Res::Ok());
+    return DeFiErrors::DatabaseKeyNotFound(txHashKey);
 }
 
-void CVMDomainGraphView::ForEachVMDomainBlockEdges(std::function<bool(const std::pair<VMDomainEdge, uint256> &, const uint256 &)> callback, const std::pair<VMDomainEdge, uint256> &start) {
-    ForEach<VMDomainBlockEdge, std::pair<uint8_t, uint256>, uint256>(
-            [&callback](const std::pair<uint8_t, uint256> &key, uint256 val) {
+void CVMDomainGraphView::ForEachVMDomainBlockEdges(std::function<bool(const std::pair<VMDomainEdge, std::string> &, const std::string &)> callback, const std::pair<VMDomainEdge, std::string> &start) {
+    ForEach<VMDomainBlockEdge, std::pair<uint8_t, std::string>, std::string>(
+            [&callback](const std::pair<uint8_t, std::string> &key, std::string val) {
                 auto k = std::make_pair(static_cast<VMDomainEdge>(key.first), key.second);
                 return callback(k, val);
             }, std::make_pair(static_cast<uint8_t>(start.first), start.second));
 }
 
-void CVMDomainGraphView::ForEachVMDomainTxEdges(std::function<bool(const std::pair<VMDomainEdge, uint256> &, const uint256 &)> callback, const std::pair<VMDomainEdge, uint256> &start) {
-    ForEach<VMDomainTxEdge, std::pair<uint8_t, uint256>, uint256>(
-            [&callback](const std::pair<uint8_t, uint256> &key, uint256 val) {
+void CVMDomainGraphView::ForEachVMDomainTxEdges(std::function<bool(const std::pair<VMDomainEdge, std::string> &, const std::string &)> callback, const std::pair<VMDomainEdge, std::string> &start) {
+    ForEach<VMDomainTxEdge, std::pair<uint8_t, std::string>, std::string>(
+            [&callback](const std::pair<uint8_t, std::string> &key, std::string val) {
                 auto k = std::make_pair(static_cast<VMDomainEdge>(key.first), key.second);
                 return callback(k, val);
             }, std::make_pair(static_cast<uint8_t>(start.first), start.second));
diff --git a/src/masternodes/evm.h b/src/masternodes/evm.h
index cc4973cb6f..8724dc580e 100644
--- a/src/masternodes/evm.h
+++ b/src/masternodes/evm.h
@@ -35,13 +35,13 @@ struct CEvmTxMessage {
 
 class CVMDomainGraphView : public virtual CStorageView {
 public:
-    Res SetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey, uint256 blockHash);
-    ResVal<uint256> GetVMDomainBlockEdge(VMDomainEdge type, uint256 blockHashKey) const;
-    void ForEachVMDomainBlockEdges(std::function<bool(const std::pair<VMDomainEdge, uint256> &, const uint256 &)> callback, const std::pair<VMDomainEdge, uint256> &start = {});
+    Res SetVMDomainBlockEdge(VMDomainEdge type, std::string blockHashKey, std::string blockHash);
+    ResVal<std::string> GetVMDomainBlockEdge(VMDomainEdge type, std::string blockHashKey) const;
+    void ForEachVMDomainBlockEdges(std::function<bool(const std::pair<VMDomainEdge, std::string> &, const std::string &)> callback, const std::pair<VMDomainEdge, std::string> &start = {});
 
-    Res SetVMDomainTxEdge(VMDomainEdge type, uint256 txHashKey, uint256 txHash);
-    ResVal<uint256> GetVMDomainTxEdge(VMDomainEdge type, uint256 txHashKey) const;
-    void ForEachVMDomainTxEdges(std::function<bool(const std::pair<VMDomainEdge, uint256> &, const uint256 &)> callback, const std::pair<VMDomainEdge, uint256> &start = {});
+    Res SetVMDomainTxEdge(VMDomainEdge type, std::string txHashKey, std::string txHash);
+    ResVal<std::string> GetVMDomainTxEdge(VMDomainEdge type, std::string txHashKey) const;
+    void ForEachVMDomainTxEdges(std::function<bool(const std::pair<VMDomainEdge, std::string> &, const std::string &)> callback, const std::pair<VMDomainEdge, std::string> &start = {});
 
     struct VMDomainBlockEdge {
         static constexpr uint8_t prefix() { return 'N'; }
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index cd6ce21695..f8b44921f9 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -3911,22 +3911,18 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 CTxDestination dest;
                 ExtractDestination(dst.address, dest);
                 const auto toAddress = std::get<WitnessV16EthHash>(dest);
-                arith_uint256 balanceIn = dst.amount.nValue;
+                const auto balanceIn = static_cast<uint64_t>(dst.amount.nValue);
                 auto tokenId = dst.amount.nTokenId;
-                balanceIn *= CAMOUNT_TO_GWEI * WEI_IN_GWEI;
                 CrossBoundaryResult result;
                 if (tokenId == DCT_ID{0}) {
-                    evm_unsafe_try_add_balance_in_q(result, evmQueueId, HexStr(toAddress.begin(), toAddress.end()),
-                                    ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex());
+                    evm_unsafe_try_add_balance_in_q(result, evmQueueId, toAddress.ToHexString(), balanceIn, tx.GetHash().GetHex());
                     if (!result.ok) {
                         return Res::Err("Error bridging DFI: %s", result.reason);
                     }
                 }
                 else {
                     CrossBoundaryResult result;
-                    evm_try_bridge_dst20(result, evmQueueId, HexStr(toAddress.begin(), toAddress.end()),
-                                     ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex(), tokenId.ToString(), false);
-
+                    evm_try_bridge_dst20(result, evmQueueId, toAddress.ToHexString(), balanceIn, tx.GetHash().GetHex(), tokenId.ToString(), false);
                     if (!result.ok) {
                         return Res::Err("Error bridging DST20: %s", result.reason);
                     }
@@ -3939,13 +3935,11 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 CTxDestination dest;
                 ExtractDestination(src.address, dest);
                 const auto fromAddress = std::get<WitnessV16EthHash>(dest);
-                arith_uint256 balanceIn = src.amount.nValue;
+                const auto balanceIn = static_cast<uint64_t>(src.amount.nValue);
                 auto tokenId = dst.amount.nTokenId;
-                balanceIn *= CAMOUNT_TO_GWEI * WEI_IN_GWEI;
                 if (tokenId == DCT_ID{0}) {
                     CrossBoundaryResult result;
-                    if (!evm_unsafe_try_sub_balance_in_q(result, evmQueueId, HexStr(fromAddress.begin(), fromAddress.end()),
-                            ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex())) {
+                    if (!evm_unsafe_try_sub_balance_in_q(result, evmQueueId, fromAddress.ToHexString(), balanceIn, tx.GetHash().GetHex())) {
                         return DeFiErrors::TransferDomainNotEnoughBalance(EncodeDestination(dest));
                     }
                     if (!result.ok) {
@@ -3954,9 +3948,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 }
                 else {
                     CrossBoundaryResult result;
-                    LogPrintf("XXX tx hash is: %s\n", tx.GetHash().ToString());
-                    evm_try_bridge_dst20(result, evmQueueId, HexStr(fromAddress.begin(), fromAddress.end()),
-                                     ArithToUint256(balanceIn).GetByteArrayLE(), tx.GetHash().GetHex(), tokenId.ToString(), true);
+                    evm_try_bridge_dst20(result, evmQueueId, fromAddress.ToHexString(), balanceIn, tx.GetHash().GetHex(), tokenId.ToString(), true);
 
                     if (!result.ok) {
                         return Res::Err("Error bridging DST20: %s", result.reason);
@@ -4019,15 +4011,15 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
             }
         }
 
-        auto txHash = tx.GetHash();
-        auto evmTxHash = uint256::FromByteArrayBE(validateResults.tx_hash);
+        auto txHash = tx.GetHash().GetHex();
+        auto evmTxHash = std::string(validateResults.tx_hash.data(), validateResults.tx_hash.length());
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
-            LogPrintf("Failed to store DVMtoEVM TX hash for DFI TX %s\n", txHash.ToString());
+            LogPrintf("Failed to store DVMtoEVM TX hash for DFI TX %s\n", txHash);
         }
         res = mnview.SetVMDomainTxEdge(VMDomainEdge::EVMToDVM, evmTxHash, txHash);
         if (!res) {
-            LogPrintf("Failed to store EVMToDVM TX hash for DFI TX %s\n", txHash.ToString());
+            LogPrintf("Failed to store EVMToDVM TX hash for DFI TX %s\n", txHash);
         }
         return Res::Ok();
     }
@@ -5271,10 +5263,10 @@ bool IsTransferDomainEnabled(const int height, const CCustomCSView &view, const
 UniValue EVM::ToUniValue() const {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("version", static_cast<uint64_t>(version));
-    obj.pushKV("blockHash", "0x" + blockHash.GetHex());
+    obj.pushKV("blockHash", "0x" + blockHash);
     obj.pushKV("burntFee", burntFee);
     obj.pushKV("priorityFee", priorityFee);
-    obj.pushKV("beneficiary", "0x" + HexStr(beneficiary));
+    obj.pushKV("beneficiary", "0x" + beneficiary);
     return obj;
 }
 
diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
index 5fbc496c53..e5273bb15e 100644
--- a/src/masternodes/mn_checks.h
+++ b/src/masternodes/mn_checks.h
@@ -23,11 +23,10 @@ class CCustomCSView;
 
 struct EVM {
     uint32_t version;
-    uint256 blockHash;
+    std::string blockHash;
     uint64_t burntFee;
     uint64_t priorityFee;
-    // miner address in big endian
-    EvmAddressData beneficiary;
+    std::string beneficiary;
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index 3fe3c267c7..e13299554f 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -477,7 +477,7 @@ UniValue getaccount(const JSONRPCRequest& request) {
     CTxDestination dest;
     if (ExtractDestination(reqOwner, dest) && dest.index() == WitV16KeyEthHashType) {
         const auto keyID = std::get<WitnessV16EthHash>(dest);
-        auto r = XResultValue(evm_try_get_balance(result, keyID.GetByteArrayBE()));
+        auto r = XResultValue(evm_try_get_balance(result, keyID.ToHexString()));
         if (!r) throw JSONRPCError(RPC_MISC_ERROR, r.msg);
         if (const auto balance = *r) {
             balances[DCT_ID{}] = balance;
@@ -604,7 +604,8 @@ UniValue gettokenbalances(const JSONRPCRequest& request) {
 
     if (evm_dfi_lookup) {
         for (const auto keyID : pwallet->GetKeys()) {
-            auto res = XResultValue(evm_try_get_balance(result, keyID.GetByteArrayBE()));
+            // TODO: Use GetHex when eth key is fixed to be stored in LE
+            auto res = XResultValue(evm_try_get_balance(result, HexStr(keyID)));
             if (res) {
                 auto evmAmount = *res;
                 totalBalances.Add({{}, static_cast<CAmount>(evmAmount)});
diff --git a/src/masternodes/rpc_customtx.cpp b/src/masternodes/rpc_customtx.cpp
index 99f3dbeeb1..e57f9de57a 100644
--- a/src/masternodes/rpc_customtx.cpp
+++ b/src/masternodes/rpc_customtx.cpp
@@ -576,10 +576,10 @@ class CCustomTxRpcVisitor {
     }
 
     void operator()(const CEvmTxMessage &obj) const {
-        auto txHash = tx.GetHash();
+        auto txHash = tx.GetHash().GetHex();
         if (auto evmTxHash =  mnview.GetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash)) {
             CrossBoundaryResult result;
-            auto txInfo = evm_try_get_tx_by_hash(result, evmTxHash->GetByteArrayBE());
+            auto txInfo = evm_try_get_tx_by_hash(result, *evmTxHash);
             if (result.ok) {
                 std::string tx_type;
                 switch (txInfo.tx_type) {
@@ -600,18 +600,15 @@ class CCustomTxRpcVisitor {
                     }
                 }
                 rpcInfo.pushKV("type", tx_type);
-                rpcInfo.pushKV("hash", evmTxHash->ToString());
-                rpcInfo.pushKV("sender", EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArrayBE(txInfo.sender)))));
+                rpcInfo.pushKV("hash", *evmTxHash);
+                rpcInfo.pushKV("sender", std::string(txInfo.sender.data(), txInfo.sender.length()));
                 rpcInfo.pushKV("nonce", txInfo.nonce);
                 rpcInfo.pushKV("gasPrice", txInfo.gas_price);
                 rpcInfo.pushKV("gasLimit", txInfo.gas_limit);
                 rpcInfo.pushKV("maxFeePerGas", txInfo.max_fee_per_gas);
                 rpcInfo.pushKV("maxPriorityFeePerGas", txInfo.max_priority_fee_per_gas);
                 rpcInfo.pushKV("createTx", txInfo.create_tx);
-                std::string to = "";
-                if (!txInfo.create_tx)
-                    to = EncodeDestination(CTxDestination(WitnessV16EthHash(uint160::FromByteArrayBE(txInfo.to))));
-                rpcInfo.pushKV("to", to);
+                rpcInfo.pushKV("to", std::string(txInfo.to.data(), txInfo.to.length()));
                 rpcInfo.pushKV("value", txInfo.value);
             }
         }
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 3a88caa37b..8640d86f10 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -76,8 +76,8 @@ UniValue evmtx(const JSONRPCRequest &request) {
     const auto fromEth = std::get<WitnessV16EthHash>(fromDest);
     const CKeyID keyId{fromEth};
 
-    CKey privKey;
-    if (!pwallet->GetKey(keyId, privKey)) {
+    CKey key;
+    if (!pwallet->GetKey(keyId, key)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Private key for from address not found in wallet");
     }
 
@@ -99,7 +99,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
     const uint64_t value = AmountFromValue(request.params[5]);   // Amount in CAmount
 
     const auto toStr = request.params[4].get_str();
-    EvmAddressData to{};
+    std::string to = "";
     if (!toStr.empty()) {
         const auto toDest = DecodeDestination(toStr);
         if (toDest.index() != WitV16KeyEthHashType) {
@@ -107,7 +107,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
         }
 
         const auto toEth = std::get<WitnessV16EthHash>(toDest);
-        to = toEth.GetByteArrayBE();
+        to = toEth.ToHexString();
     }
 
     rust::Vec<uint8_t> input{};
@@ -122,6 +122,9 @@ UniValue evmtx(const JSONRPCRequest &request) {
         std::copy(inputVec.begin(), inputVec.end(), input.begin());
     }
 
+    std::array<uint8_t, 32> privKey{};
+    std::copy(key.begin(), key.end(), privKey.begin());
+
     CrossBoundaryResult result;
     const auto signedTx = evm_try_create_and_sign_tx(result,
                                                      CreateTransactionContext{chainID,
@@ -131,7 +134,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
                                                                               to,
                                                                               value,
                                                                               input,
-                                                                              privKey.GetByteArrayBE()});
+                                                                              privKey});
     if (!result.ok) {
         throw JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to create and sign TX: %s", result.reason.c_str()));
     }
@@ -204,7 +207,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
         throwInvalidParam();
     }
 
-    auto tryResolveMapBlockOrTxResult = [](ResVal<uint256> &res, const uint256 input) {
+    auto tryResolveMapBlockOrTxResult = [](ResVal<std::string> &res, const std::string input) {
         res = pcustomcsview->GetVMDomainTxEdge(VMDomainEdge::DVMToEVM, input);
         if (res)
             return VMDomainRPCMapType::TxHashDVMToEVM;
@@ -255,7 +258,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
         };
 */
     auto type  = static_cast<VMDomainRPCMapType>(typeInt);
-    ResVal res = ResVal<uint256>(uint256{}, Res::Ok());
+    ResVal res = ResVal<std::string>(std::string{}, Res::Ok());
 
     auto handleAutoInfer = [&]() -> std::tuple<VMDomainRPCMapType, bool> {
         // auto mapType = tryResolveBlockNumberType(input);
@@ -264,7 +267,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
 
         auto inLength = input.length();
         if (inLength == 64 || inLength == 66) {
-            auto mapType = tryResolveMapBlockOrTxResult(res, uint256S(input));
+            auto mapType = tryResolveMapBlockOrTxResult(res, input);
             // We don't pass this type back on purpose
             if (mapType != VMDomainRPCMapType::Unknown) {
                 return {mapType, true};
@@ -274,14 +277,14 @@ UniValue vmmap(const JSONRPCRequest &request) {
         return {VMDomainRPCMapType::Unknown, false};
     };
 
-    auto finalizeResult = [&](ResVal<uint256> &res, const VMDomainRPCMapType type, const std::string input) {
+    auto finalizeResult = [&](ResVal<std::string> &res, const VMDomainRPCMapType type, const std::string input) {
         if (!res) {
             throw JSONRPCError(RPC_INVALID_REQUEST, res.msg);
         } else {
             UniValue ret(UniValue::VOBJ);
             ret.pushKV("input", input);
             ret.pushKV("type", GetVMDomainRPCMapType(type));
-            ret.pushKV("output", ensureEVMHashPrefixed(res.val->ToString(), type));
+            ret.pushKV("output", ensureEVMHashPrefixed(*res.val, type));
             return ret;
         }
     };
@@ -304,8 +307,8 @@ UniValue vmmap(const JSONRPCRequest &request) {
         }
         CrossBoundaryResult result;
         auto evmHash = evm_try_get_block_hash_by_number(result, height);
+        auto evmBlockHash = std::string(evmHash.data(), evmHash.length());
         crossBoundaryOkOrThrow(result);
-        auto evmBlockHash = uint256::FromByteArrayBE(evmHash);
         ResVal<uint256> dvm_block = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, evmBlockHash);
         if (!dvm_block) {
             throwInvalidParam(dvm_block.msg);
@@ -326,12 +329,12 @@ UniValue vmmap(const JSONRPCRequest &request) {
         }
         CBlockIndex *pindex = ::ChainActive()[height];
         auto evmBlockHash =
-            pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, uint256S(pindex->GetBlockHash().GetHex()));
+            pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, pindex->GetBlockHash().GetHex());
         if (!evmBlockHash.val.has_value()) {
             throwInvalidParam(evmBlockHash.msg);
         }
         CrossBoundaryResult result;
-        uint64_t blockNumber = evm_try_get_block_number_by_hash(result, evmBlockHash.val.value().GetByteArrayBE());
+        uint64_t blockNumber = evm_try_get_block_number_by_hash(result, *evmBlockHash.val);
         crossBoundaryOkOrThrow(result);
         return finalizeBlockNumberResult(blockNumber, VMDomainRPCMapType::BlockNumberDVMToEVM, height);
     };
@@ -348,19 +351,19 @@ UniValue vmmap(const JSONRPCRequest &request) {
 
     switch (type) {
         case VMDomainRPCMapType::TxHashDVMToEVM: {
-            res = pcustomcsview->GetVMDomainTxEdge(VMDomainEdge::DVMToEVM, uint256S(input));
+            res = pcustomcsview->GetVMDomainTxEdge(VMDomainEdge::DVMToEVM, input);
             break;
         }
         case VMDomainRPCMapType::TxHashEVMToDVM: {
-            res = pcustomcsview->GetVMDomainTxEdge(VMDomainEdge::EVMToDVM, uint256S(input));
+            res = pcustomcsview->GetVMDomainTxEdge(VMDomainEdge::EVMToDVM, input);
             break;
         }
         case VMDomainRPCMapType::BlockHashDVMToEVM: {
-            res = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, uint256S(input));
+            res = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, input);
             break;
         }
         case VMDomainRPCMapType::BlockHashEVMToDVM: {
-            res = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, uint256S(input));
+            res = pcustomcsview->GetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, input);
             break;
         }
         // TODO(canonbrother): disable for release, more investigation needed
@@ -408,50 +411,50 @@ UniValue logvmmaps(const JSONRPCRequest &request) {
     switch (type) {
         case VMDomainIndexType::BlockHashDVMToEVM: {
             pcustomcsview->ForEachVMDomainBlockEdges(
-                [&](const std::pair<VMDomainEdge, uint256> &index, const uint256 &blockHash) {
+                [&](const std::pair<VMDomainEdge, std::string> &index, const std::string &blockHash) {
                     if (index.first == VMDomainEdge::DVMToEVM) {
-                        indexesJson.pushKV(index.second.GetHex(), blockHash.GetHex());
+                        indexesJson.pushKV(index.second, blockHash);
                         ++count;
                     }
                     return true;
                 },
-                std::make_pair(VMDomainEdge::DVMToEVM, uint256{}));
+                std::make_pair(VMDomainEdge::DVMToEVM, std::string{}));
             break;
         }
         case VMDomainIndexType::BlockHashEVMToDVM: {
             pcustomcsview->ForEachVMDomainBlockEdges(
-                [&](const std::pair<VMDomainEdge, uint256> &index, const uint256 &blockHash) {
+                [&](const std::pair<VMDomainEdge, std::string> &index, const std::string &blockHash) {
                     if (index.first == VMDomainEdge::EVMToDVM) {
-                        indexesJson.pushKV(index.second.GetHex(), blockHash.GetHex());
+                        indexesJson.pushKV(index.second, blockHash);
                         ++count;
                     }
                     return true;
                 },
-                std::make_pair(VMDomainEdge::EVMToDVM, uint256{}));
+                std::make_pair(VMDomainEdge::EVMToDVM, std::string{}));
             break;
         }
         case VMDomainIndexType::TxHashDVMToEVM: {
             pcustomcsview->ForEachVMDomainTxEdges(
-                [&](const std::pair<VMDomainEdge, uint256> &index, const uint256 &txHash) {
+                [&](const std::pair<VMDomainEdge, std::string> &index, const std::string &txHash) {
                     if (index.first == VMDomainEdge::DVMToEVM) {
-                        indexesJson.pushKV(index.second.GetHex(), txHash.GetHex());
+                        indexesJson.pushKV(index.second, txHash);
                         ++count;
                     }
                     return true;
                 },
-                std::make_pair(VMDomainEdge::DVMToEVM, uint256{}));
+                std::make_pair(VMDomainEdge::DVMToEVM, std::string{}));
             break;
         }
         case VMDomainIndexType::TxHashEVMToDVM: {
             pcustomcsview->ForEachVMDomainTxEdges(
-                [&](const std::pair<VMDomainEdge, uint256> &index, const uint256 &txHash) {
+                [&](const std::pair<VMDomainEdge, std::string> &index, const std::string &txHash) {
                     if (index.first == VMDomainEdge::EVMToDVM) {
-                        indexesJson.pushKV(index.second.GetHex(), txHash.GetHex());
+                        indexesJson.pushKV(index.second, txHash);
                         ++count;
                     }
                     return true;
                 },
-                std::make_pair(VMDomainEdge::EVMToDVM, uint256{}));
+                std::make_pair(VMDomainEdge::EVMToDVM, std::string{}));
             break;
         }
         default:
diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 39cb54b51e..8b2de100fd 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2382,7 +2382,7 @@ static void RevertFailedTransferDomainTxs(const std::vector<std::string> &failed
 }
 
 static Res ValidateCoinbaseXVMOutput(const XVM &xvm, const FinalizeBlockCompletion &blockResult) {
-    const auto blockResultBlockHash = uint256::FromByteArrayBE(blockResult.block_hash);
+    const auto blockResultBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length());
     
     if (xvm.evm.blockHash != blockResultBlockHash) {
         return Res::Err("Incorrect EVM block hash in coinbase output");
@@ -2451,11 +2451,11 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     auto res = ValidateCoinbaseXVMOutput(*xvmRes, blockResult);
     if (!res) return res;
 
-    auto evmBlockHash = uint256::FromByteArrayBE(blockResult.block_hash);
-    res = cache.SetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, block.GetHash(), evmBlockHash);
+    auto evmBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length());
+    res = cache.SetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, block.GetHash().GetHex(), evmBlockHash);
     if (!res) return res;
 
-    res = cache.SetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, evmBlockHash, block.GetHash());
+    res = cache.SetVMDomainBlockEdge(VMDomainEdge::EVMToDVM, evmBlockHash, block.GetHash().GetHex());
     if (!res) return res;
 
     if (!blockResult.failed_transactions.empty()) {
diff --git a/src/miner.cpp b/src/miner.cpp
index ecffa797e5..a59c2abbb0 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -41,8 +41,7 @@
 #include <utility>
 
 struct EvmAddressWithNonce {
-    // Byte array of EVM address stored as big endian
-    EvmAddressData address;
+    std::string address;
     uint64_t nonce;
 
     bool operator<(const EvmAddressWithNonce& item) const
@@ -55,7 +54,7 @@ struct EvmPackageContext {
     // Used to track EVM TX fee by sender and nonce.
     std::map<EvmAddressWithNonce, uint64_t> feeMap;
     // Used to track EVM nonce and TXs by sender
-    std::map<EvmAddressData, std::map<uint64_t, CTxMemPool::txiter>> addressTxsMap;
+    std::map<std::string, std::map<uint64_t, CTxMemPool::txiter>> addressTxsMap;
     // Keep track of EVM entries that failed nonce check
     std::multimap<uint64_t, CTxMemPool::txiter> failedNonces;
     // Used for replacement Eth TXs when a TX in chain pays a higher fee
@@ -133,7 +132,7 @@ void BlockAssembler::resetBlock()
     nFees = 0;
 }
 
-std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime, const EvmAddressData& evmBeneficiary)
+std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime, const std::string& evmBeneficiary)
 {
     int64_t nTimeStart = GetTimeMicros();
 
@@ -299,7 +298,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         auto r = XResultStatusLogged(evm_unsafe_try_remove_queue(result, evmQueueId));
         if (!r) { return nullptr; }
 
-        xvm = XVM{0, {0, uint256::FromByteArrayBE(blockResult.block_hash), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
+        xvm = XVM{0, {0, std::string(blockResult.block_hash.data(), blockResult.block_hash.length()), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
         // LogPrintf("DEBUG:: CreateNewBlock:: xvm-init:: %s\n", xvm.ToUniValue().write());
 
         std::set<uint256> failedTransactions;
@@ -399,7 +398,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         }
 
         if (isEvmEnabledForBlock) {
-            if (xvm.evm.blockHash.IsNull()) {
+            if (xvm.evm.blockHash.empty()) {
                 LogPrint(BCLog::STAKING, "%s: EVM block hash is null\n", __func__);
                 return nullptr;
             }
@@ -671,8 +670,9 @@ bool BlockAssembler::EvmTxPreapply(const EvmTxPreApplyContext& ctx)
 
     auto& evmFeeMap = pkgCtx.feeMap;
     auto& evmAddressTxsMap = pkgCtx.addressTxsMap;
+    const auto txResultSender = std::string(txResult.sender.data(), txResult.sender.length());
 
-    const auto addrKey = EvmAddressWithNonce{txResult.sender, txResult.nonce};
+    const auto addrKey = EvmAddressWithNonce{txResultSender, txResult.nonce};
     if (auto feeEntry = evmFeeMap.find(addrKey); feeEntry != evmFeeMap.end()) {
         // Key already exists. We check to see if we need to prioritize higher fee tx
         const auto& lastFee = feeEntry->second;
@@ -705,7 +705,7 @@ bool BlockAssembler::EvmTxPreapply(const EvmTxPreApplyContext& ctx)
         }
     }
 
-    const auto nonce = evm_unsafe_try_get_next_valid_nonce_in_q(result, evmQueueId, txResult.sender);
+    const auto nonce = evm_unsafe_try_get_next_valid_nonce_in_q(result, evmQueueId, txResultSender);
     if (!result.ok) {
         return false;
     }
@@ -717,9 +717,9 @@ bool BlockAssembler::EvmTxPreapply(const EvmTxPreApplyContext& ctx)
         return false;
     }
 
-    auto addrNonce = EvmAddressWithNonce{txResult.sender, txResult.nonce};
+    auto addrNonce = EvmAddressWithNonce{txResultSender, txResult.nonce};
     evmFeeMap.insert({addrNonce, txResult.prepay_fee});
-    evmAddressTxsMap[txResult.sender].emplace(txResult.nonce, txIter);
+    evmAddressTxsMap[txResultSender].emplace(txResult.nonce, txIter);
     return true;
 }
 
@@ -1144,7 +1144,8 @@ Staker::Status Staker::stake(const CChainParams& chainparams, const ThreadStaker
     if (pubKey.IsCompressed()) {
         pubKey.Decompress();
     }
-    const auto evmBeneficiary = pubKey.GetEthID().GetByteArrayBE();
+    // TODO: Use GetHex when eth key is fixed to be stored in LE
+    const auto evmBeneficiary = HexStr(pubKey.GetEthID());
     auto pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey, blockTime, evmBeneficiary);
     if (!pblocktemplate) {
         LogPrintf("Error: WalletStaker: Keypool ran out, keypoolrefill and restart required\n");
diff --git a/src/miner.h b/src/miner.h
index ac550b48f7..c3467fb85c 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -178,7 +178,7 @@ class BlockAssembler
     BlockAssembler(const CChainParams& params, const Options& options);
 
     /** Construct a new block template with coinbase to scriptPubKeyIn */
-    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime = 0, const EvmAddressData& beneficiary = {});
+    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime = 0, const std::string& beneficiary = {});
 
     inline static std::optional<int64_t> m_last_block_num_txs{};
     inline static std::optional<int64_t> m_last_block_weight{};
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index f76022b0c6..291cee7f17 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -274,10 +274,10 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn
 
     auto evmBlockHeaderToUniValue = [](const EVMBlockHeader& header) {
             UniValue r(UniValue::VOBJ);
-            r.pushKV("parenthash", uint256::FromByteArrayBE(header.parent_hash).ToString());
-            r.pushKV("beneficiary", uint160::FromByteArrayBE(header.beneficiary).ToString());
-            r.pushKV("stateRoot", uint256::FromByteArrayBE(header.state_root).ToString());
-            r.pushKV("receiptRoot", uint256::FromByteArrayBE(header.receipts_root).ToString());
+            r.pushKV("parenthash", std::string(header.parent_hash.data(), header.parent_hash.length()));
+            r.pushKV("beneficiary", std::string(header.beneficiary.data(), header.beneficiary.length()));
+            r.pushKV("stateRoot", std::string(header.state_root.data(), header.state_root.length()));
+            r.pushKV("receiptRoot", std::string(header.receipts_root.data(), header.receipts_root.length()));
             r.pushKV("number", header.number);
             r.pushKV("gasLimit", header.gas_limit);
             r.pushKV("gasUsed", header.gas_used);
@@ -304,7 +304,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn
             result.pushKV("txtype", "coinbase");
             result.pushKV("msg", xvm->ToUniValue());
             CrossBoundaryResult res;
-            auto evmBlockHeader = evm_try_get_block_header_by_hash(res, xvm->evm.blockHash.GetByteArrayBE());
+            auto evmBlockHeader = evm_try_get_block_header_by_hash(res, xvm->evm.blockHash);
             if (!res.ok) return {};
             result.pushKV("xvmHeader", evmBlockHeaderToUniValue(evmBlockHeader));
             return result;
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index cb20c0b181..5b2a108f94 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -29,6 +29,11 @@ WitnessV0KeyHash::WitnessV0KeyHash(const CPubKey& pubkey) : uint160(pubkey.GetID
 
 WitnessV16EthHash::WitnessV16EthHash(const CPubKey& pubkey) : uint160(pubkey.GetEthID()) {}
 
+// TO DO: Remove this temporary fix to return hex string, once EthHash is switched from big endian to little endian.
+std::string WitnessV16EthHash::ToHexString() const {
+    return HexStr(data, data + sizeof(data));
+}
+
 const char* GetTxnOutputType(txnouttype t)
 {
     switch (t)
diff --git a/src/script/standard.h b/src/script/standard.h
index f17602e733..39488ee88f 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -114,6 +114,7 @@ struct WitnessV16EthHash : public uint160 {
     WitnessV16EthHash() : uint160() {}
     explicit WitnessV16EthHash(const uint160& hash) : uint160(hash) {}
     explicit WitnessV16EthHash(const CPubKey& pubkey);
+    std::string ToHexString() const;
     using uint160::uint160;
 };
 
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index da6d2fbf5d..60220ba449 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -781,10 +781,7 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
 
     const uint64_t gasPrice = 449164996321; // 449.164996321 GWei
     const uint64_t gasLimit = 21000; // 21,000
-
-    std::vector<uint8_t> toVec{ParseHex("34c1ca09a2dc717d89baef2f30ff6a6b2975e17e")};
-    EvmAddressData to{};
-    std::copy(toVec.begin(), toVec.end(), to.begin());
+    std::string to = "34c1ca09a2dc717d89baef2f30ff6a6b2975e17e";
 
     uint64_t value = 1000000;   // 0.01 DFI
 
diff --git a/src/test/xvm_tests.cpp b/src/test/xvm_tests.cpp
index a04726b782..c00939bad0 100644
--- a/src/test/xvm_tests.cpp
+++ b/src/test/xvm_tests.cpp
@@ -12,43 +12,33 @@ BOOST_AUTO_TEST_CASE(xvm_test_case_1)
 {
     auto zero = uint256S("0x0");
     auto one = uint256S("0x1");
-    auto oneArr = uint256S("0x1").GetByteArrayLE();
+    auto oneArr = uint256S("0x1").GetByteArray();
     auto oneVec = std::vector<uint8_t>(oneArr.begin(), oneArr.end());
     auto oneVecReversed = std::vector<uint8_t>(oneArr.begin(), oneArr.end());
     std::reverse(oneVecReversed.begin(), oneVecReversed.end());
 
-    auto twoArr20 = EvmAddressData{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2};
-    auto toString = [](EvmAddressData arr) {
-        std::ostringstream os;
-        for (int i: arr) {
-            os << i;
-        }
-        return os.str();
-    };
-
     XVM xvm;
-    xvm.evm.blockHash = one;
-    xvm.evm.beneficiary = twoArr20;
+    xvm.evm.blockHash = one.GetHex();
+    xvm.evm.beneficiary = "00000000000000000002";
 
     auto s = xvm.ToScript();
     auto xvm2 = XVM::TryFrom(s);
 
     XVM xvm3;
-    xvm3.evm.blockHash = uint256(oneVec);
+    xvm3.evm.blockHash = uint256(oneVec).GetHex();
 
     XVM xvm4;
-    xvm4.evm.blockHash = uint256(oneVecReversed);
+    xvm4.evm.blockHash = uint256(oneVecReversed).GetHex();
 
     for (const auto& [result, expected]: std::vector<std::tuple<std::string, std::string>> { 
         { zero.GetHex(), "0000000000000000000000000000000000000000000000000000000000000000" },
         { one.GetHex(), "0000000000000000000000000000000000000000000000000000000000000001" },
-        { xvm.evm.blockHash.GetHex(), "0000000000000000000000000000000000000000000000000000000000000001" },
-        { xvm2->evm.blockHash.GetHex(), "0000000000000000000000000000000000000000000000000000000000000001" },
-        { xvm3.evm.blockHash.GetHex(), "0100000000000000000000000000000000000000000000000000000000000000" },
-        { xvm4.evm.blockHash.GetHex(), "0000000000000000000000000000000000000000000000000000000000000001" },
-        { toString(twoArr20), "00000000000000000002" },
-        { toString(xvm.evm.beneficiary), "00000000000000000002" },
-        { toString(xvm2->evm.beneficiary), "00000000000000000002" },
+        { xvm.evm.blockHash, "0000000000000000000000000000000000000000000000000000000000000001" },
+        { xvm2->evm.blockHash, "0000000000000000000000000000000000000000000000000000000000000001" },
+        { xvm3.evm.blockHash, "0100000000000000000000000000000000000000000000000000000000000000" },
+        { xvm4.evm.blockHash, "0000000000000000000000000000000000000000000000000000000000000001" },
+        { xvm.evm.beneficiary, "00000000000000000002" },
+        { xvm2->evm.beneficiary, "00000000000000000002" },
     }) { 
         // BOOST_TEST_MESSAGE("expected: " + expected + ", result: " + result);
         BOOST_CHECK(result == expected);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index e8dbb440c0..7f9ec3a7de 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -353,7 +353,7 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
     nTransactionsUpdated += n;
 }
 
-void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate, const std::optional<std::array<::std::uint8_t, 20>> ethSender)
+void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate, const std::optional<std::string> ethSender)
 {
     NotifyEntryAdded(entry.GetSharedTx());
     // Add to memory pool without checking anything.
diff --git a/src/txmempool.h b/src/txmempool.h
index 01256a2418..d2dda5e6a3 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -520,7 +520,7 @@ class CTxMemPool
     mutable RecursiveMutex cs;
     indexed_transaction_set mapTx GUARDED_BY(cs);
 
-    std::map<EvmAddressData, std::set<uint256>> ethTxsBySender;
+    std::map<std::string, std::set<uint256>> ethTxsBySender;
 
     using txiter = indexed_transaction_set::nth_index<0>::type::const_iterator;
     std::vector<std::pair<uint256, txiter>> vTxHashes GUARDED_BY(cs); //!< All tx witness hashes/entries in mapTx, in random order
@@ -581,7 +581,7 @@ class CTxMemPool
     // and any other callers may break wallet's in-mempool tracking (due to
     // lack of CValidationInterface::TransactionAddedToMempool callbacks).
     void addUnchecked(const CTxMemPoolEntry& entry, bool validFeeEstimate = true) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
-    void addUnchecked(const CTxMemPoolEntry& entry, setEntries& setAncestors, bool validFeeEstimate = true, const std::optional<std::array<::std::uint8_t, 20>> ethSender = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
+    void addUnchecked(const CTxMemPoolEntry& entry, setEntries& setAncestors, bool validFeeEstimate = true, const std::optional<std::string> ethSender = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
 
     void removeRecursive(const CTransaction& tx, MemPoolRemovalReason reason) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void removeForReorg(const CCoinsViewCache* pcoins, unsigned int nMemPoolHeight, int flags) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
diff --git a/src/uint256.h b/src/uint256.h
index f8edd3d813..84a16e521c 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -66,18 +66,11 @@ class base_blob
                ((uint64_t)ptr[7]) << 56;
     }
 
-    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArrayBE() const
+    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArray() const
     {
-        std::array<uint8_t, WIDTH> array;
-        std::copy(data, data + sizeof(data), array.begin());
-        return array;
-    }
-
-    [[nodiscard]] std::array<uint8_t, WIDTH> GetByteArrayLE() const
-    {
-        // We store bytes in the reverse order. So any expectations of
+        // We store bytes in little endian. So any expectations of
         // an array of bytes should be in same order as the hex string.
-        // The protected data array is an internal implementation detail. 
+        // The protected data array is an internal implementation detail.
         std::array<uint8_t, WIDTH> reversedArray;
         std::copy(std::reverse_iterator<const uint8_t*>(data + sizeof(data)), std::reverse_iterator<const uint8_t*>(data), reversedArray.begin());
         return reversedArray;
@@ -130,14 +123,6 @@ class uint160 : public base_blob<160> {
 public:
     uint160() {}
     explicit uint160(const std::vector<unsigned char>& vch) : base_blob<160>(vch) {}
-
-    static uint160 FromByteArrayBE(const std::array<uint8_t, 20>& data) {
-        return uint160(std::vector<unsigned char>(data.begin(), data.end()));
-    }
-
-    static uint160 FromByteArrayLE(const std::array<uint8_t, 20>& data) {
-        return uint160(std::vector<unsigned char>(data.rbegin(), data.rend()));
-    }
 };
 
 /** 256-bit opaque blob.
@@ -149,14 +134,6 @@ class uint256 : public base_blob<256> {
 public:
     uint256() {}
     explicit uint256(const std::vector<unsigned char>& vch) : base_blob<256>(vch) {}
-
-    static uint256 FromByteArrayBE(const std::array<uint8_t, 32>& data) {
-        return uint256(std::vector<unsigned char>(data.begin(), data.end()));
-    }
-
-    static uint256 FromByteArrayLE(const std::array<uint8_t, 32>& data) {
-        return uint256(std::vector<unsigned char>(data.rbegin(), data.rend()));
-    }
 };
 
 /* uint256 from const char *.
diff --git a/src/validation.cpp b/src/validation.cpp
index 63d6f8547d..6e8a4f49c0 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -910,7 +910,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
                     __func__, hash.ToString(), FormatStateMessage(state));
         }
 
-        std::optional<std::array<::std::uint8_t, 20>> ethSender;
+        std::string ethSender{};
 
         if (isEvmTx) {
             auto txMessage = customTypeToMessage(txType);
@@ -925,11 +925,12 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
             if (!result.ok) {
                 return state.Invalid(ValidationInvalidReason::CONSENSUS, error("evm tx failed to validate %s", result.reason.c_str()), REJECT_INVALID, "evm-validate-failed");
             }
-            const auto sender = pool.ethTxsBySender.find(txResult.sender);
+            const auto txResultSender = std::string(txResult.sender.data(), txResult.sender.length());
+            const auto sender = pool.ethTxsBySender.find(txResultSender);
             if (sender != pool.ethTxsBySender.end() && sender->second.size() >= MEMPOOL_MAX_ETH_TXS) {
                 return state.Invalid(ValidationInvalidReason::TX_MEMPOOL_POLICY, error("Too many Eth trransaction from the same sender in mempool. Limit %d.", MEMPOOL_MAX_ETH_TXS), REJECT_INVALID, "too-many-eth-txs-by-sender");
             } else {
-                ethSender = txResult.sender;
+                ethSender = txResultSender;
             }
         }
 
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 34514c28d1..f21da3b5aa 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -178,7 +178,8 @@ def test_block(self):
         self.nodes[0].generate(1)
 
         # Test evm tx RPC
-        block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
+        block = self.nodes[0].getblock(self.nodes[0].getbestblockhash(), 3)
+        assert_equal(block, False)
         res = self.nodes[0].getcustomtx(block["tx"][1])
         assert_equal(
             res["results"]["hash"],

From 875d86b8c6fb7eb732a1623513c9cb664b289355 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 17:11:41 +0800
Subject: [PATCH 16/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 15 +++------------
 lib/ain-rs-exports/src/lib.rs |  5 +----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index dd68e1abae..f8fd8dc59a 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -554,9 +554,7 @@ pub fn evm_try_get_block_hash_by_number(
         .storage
         .get_block_by_number(&U256::from(height))
     {
-        Ok(Some(block)) => {
-            cross_boundary_success_return(result, block.header.hash().to_string())
-        }
+        Ok(Some(block)) => cross_boundary_success_return(result, block.header.hash().to_string()),
         Ok(None) => cross_boundary_error_return(result, "Invalid block number"),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
     }
@@ -571,10 +569,7 @@ pub fn evm_try_get_block_hash_by_number(
 /// # Returns
 ///
 /// Returns the block number associated with the given blockhash.
-pub fn evm_try_get_block_number_by_hash(
-    result: &mut ffi::CrossBoundaryResult,
-    hash: &str,
-) -> u64 {
+pub fn evm_try_get_block_number_by_hash(result: &mut ffi::CrossBoundaryResult, hash: &str) -> u64 {
     let Ok(hash) = hash.parse() else {
         return cross_boundary_error_return(result, "Invalid block hash");
     };
@@ -674,11 +669,7 @@ pub fn evm_try_get_tx_by_hash(
         return cross_boundary_error_return(result, "Invalid tx hash");
     };
 
-    match SERVICES
-        .evm
-        .storage
-        .get_transaction_by_hash(&tx_hash)
-    {
+    match SERVICES.evm.storage.get_transaction_by_hash(&tx_hash) {
         Ok(Some(tx)) => {
             let Ok(tx) = SignedTx::try_from(tx) else {
                 return cross_boundary_error_return(result, "failed to convert tx to SignedTx");
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index ed603d6544..a7313a4116 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -176,10 +176,7 @@ pub mod ffi {
             result: &mut CrossBoundaryResult,
             height: u64,
         ) -> String;
-        fn evm_try_get_block_number_by_hash(
-            result: &mut CrossBoundaryResult,
-            hash: &str,
-        ) -> u64;
+        fn evm_try_get_block_number_by_hash(result: &mut CrossBoundaryResult, hash: &str) -> u64;
         fn evm_try_get_block_header_by_hash(
             result: &mut CrossBoundaryResult,
             hash: &str,

From 63eda4046dc73aa7b902e9a4333c4ba60072cf76 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 17:13:12 +0800
Subject: [PATCH 17/50] Revert rpc test

---
 test/functional/feature_evm_rpc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index f21da3b5aa..34514c28d1 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -178,8 +178,7 @@ def test_block(self):
         self.nodes[0].generate(1)
 
         # Test evm tx RPC
-        block = self.nodes[0].getblock(self.nodes[0].getbestblockhash(), 3)
-        assert_equal(block, False)
+        block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
         res = self.nodes[0].getcustomtx(block["tx"][1])
         assert_equal(
             res["results"]["hash"],

From 37d6627beb4aaaf0807402d789ddbd5999e0d550 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 17:22:05 +0800
Subject: [PATCH 18/50] Switch to BE for nonce conversion

---
 lib/ain-rs-exports/src/evm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index f8fd8dc59a..4db80bad7e 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -620,7 +620,7 @@ pub fn evm_try_get_block_header_by_hash(
                 timestamp: block.header.timestamp,
                 extra_data: block.header.extra_data.clone(),
                 mix_hash: block.header.mix_hash.to_string(),
-                nonce: block.header.nonce.to_low_u64_ne(),
+                nonce: block.header.nonce.to_low_u64_be(),
                 base_fee,
             };
             cross_boundary_success_return(result, out)

From d760926d9a2dee631cfbfbbb9c2502aaabd0b96b Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 18:38:54 +0800
Subject: [PATCH 19/50] Fix passing lossy string

---
 lib/ain-evm/src/evm.rs             |  2 +-
 lib/ain-rs-exports/src/evm.rs      | 62 ++++++++++++++++++++++--------
 test/functional/feature_evm_rpc.py |  4 +-
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index 418a5ec035..38e4134c12 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -343,7 +343,7 @@ impl EVMServices {
         });
 
         Ok(FinalizedBlockInfo {
-            block_hash: block.header.hash().to_string(),
+            block_hash: format!("{:?}", block.header.hash()),
             failed_transactions,
             total_burnt_fees,
             total_priority_fees,
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 4db80bad7e..c9c4eb52df 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -132,11 +132,15 @@ pub fn evm_unsafe_try_get_next_valid_nonce_in_q(
         {
             Ok(nonce) => {
                 let Ok(nonce) = u64::try_from(nonce) else {
+                    debug!("XX Here1");
                     return cross_boundary_error_return(result, "nonce value overflow");
                 };
                 cross_boundary_success_return(result, nonce)
             }
-            Err(e) => cross_boundary_error_return(result, e.to_string()),
+            Err(e) => {
+                debug!("XX Here2");
+                cross_boundary_error_return(result, e.to_string())
+            }
         }
     }
 }
@@ -188,7 +192,7 @@ pub fn evm_unsafe_try_add_balance_in_q(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = native_hash.to_string();
+    let native_hash = String::from(native_hash);
 
     unsafe {
         match SERVICES
@@ -235,7 +239,7 @@ pub fn evm_unsafe_try_sub_balance_in_q(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = native_hash.to_string();
+    let native_hash = String::from(native_hash);
 
     unsafe {
         match SERVICES
@@ -296,7 +300,7 @@ pub fn evm_unsafe_try_prevalidate_raw_tx(
                     result,
                     ffi::PreValidateTxCompletion {
                         nonce,
-                        sender: signed_tx.sender.to_string(),
+                        sender: format!("{:?}", signed_tx.sender),
                         prepay_fee,
                     },
                 )
@@ -364,8 +368,8 @@ pub fn evm_unsafe_try_validate_raw_tx_in_q(
                     result,
                     ffi::ValidateTxCompletion {
                         nonce,
-                        sender: signed_tx.sender.to_string(),
-                        tx_hash: signed_tx.hash().to_string(),
+                        sender: format!("{:?}", signed_tx.sender),
+                        tx_hash: format!("{:?}", signed_tx.hash()),
                         prepay_fee,
                         gas_used: used_gas,
                     },
@@ -554,7 +558,7 @@ pub fn evm_try_get_block_hash_by_number(
         .storage
         .get_block_by_number(&U256::from(height))
     {
-        Ok(Some(block)) => cross_boundary_success_return(result, block.header.hash().to_string()),
+        Ok(Some(block)) => cross_boundary_success_return(result, format!("{:?}", block.header.hash())),
         Ok(None) => cross_boundary_error_return(result, "Invalid block number"),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
     }
@@ -610,16 +614,16 @@ pub fn evm_try_get_block_header_by_hash(
             };
 
             let out = ffi::EVMBlockHeader {
-                parent_hash: block.header.parent_hash.to_string(),
-                beneficiary: block.header.beneficiary.to_string(),
-                state_root: block.header.state_root.to_string(),
-                receipts_root: block.header.receipts_root.to_string(),
+                parent_hash: format!("{:?}", block.header.parent_hash),
+                beneficiary: format!("{:?}", block.header.beneficiary),
+                state_root: format!("{:?}", block.header.state_root),
+                receipts_root: format!("{:?}", block.header.receipts_root),
                 number,
                 gas_limit,
                 gas_used,
                 timestamp: block.header.timestamp,
                 extra_data: block.header.extra_data.clone(),
-                mix_hash: block.header.mix_hash.to_string(),
+                mix_hash: format!("{:?}", block.header.mix_hash),
                 nonce: block.header.nonce.to_low_u64_be(),
                 base_fee,
             };
@@ -732,8 +736,8 @@ pub fn evm_try_get_tx_by_hash(
 
             let out = ffi::EVMTransaction {
                 tx_type,
-                hash: tx.hash().to_string(),
-                sender: tx.sender.to_string(),
+                hash: format!("{:?}", tx.hash()),
+                sender: format!("{:?}", tx.sender),
                 nonce,
                 gas_price,
                 gas_limit,
@@ -744,7 +748,7 @@ pub fn evm_try_get_tx_by_hash(
                     TransactionAction::Create => true,
                 },
                 to: match tx.to() {
-                    Some(to) => to.to_string(),
+                    Some(to) => format!("{:?}", to),
                     None => String::new(),
                 },
                 value,
@@ -765,7 +769,7 @@ pub fn evm_try_create_dst20(
     symbol: &str,
     token_id: &str,
 ) {
-    let native_hash = native_hash.to_string();
+    let native_hash = String::from(native_hash);
     let address = match ain_contracts::dst20_address_from_token_id(token_id) {
         Ok(address) => address,
         Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -805,7 +809,7 @@ pub fn evm_try_bridge_dst20(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = native_hash.to_string();
+    let native_hash = String::from(native_hash);
     let contract = ain_contracts::dst20_address_from_token_id(token_id)
         .unwrap_or_else(|e| cross_boundary_error_return(result, e.to_string()));
 
@@ -847,3 +851,27 @@ pub fn evm_unsafe_try_get_target_block_in_q(
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_hash_type_string() {
+        use primitive_types::H160;
+        let num = 0b11010111_11010111_11010111_11010111_11010111_11010111_11010111_11010111;
+        let num_h160 = H160::from_low_u64_be(num);
+        let num_h160_string = format!("{:?}", num_h160);
+        println!("{}", num_h160_string);
+
+        let num_h160_test: H160 = num_h160_string.parse().unwrap();
+        assert_eq!(num_h160_test, num_h160);
+
+        use primitive_types::H256;
+        let num_h256: H256 = "0x3186715414c5fbd73586662d26b83b66b5754036379d56e896a560a90e409351".parse().unwrap();
+        let num_h256_string = format!("{:?}", num_h256);
+        println!("{}", num_h256_string);
+        let num_h256_test: H256 = num_h256_string.parse().unwrap();
+        assert_eq!(num_h256_test, num_h256);
+    }
+}
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 34514c28d1..0ff474dfd7 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -181,8 +181,8 @@ def test_block(self):
         block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
         res = self.nodes[0].getcustomtx(block["tx"][1])
         assert_equal(
-            res["results"]["hash"],
-            "977468de6179f215a690501614b929d58ff3216275c2338e0733e053f0e9998c",
+            res["results"]["hash"][2:],
+            "8c99e9f053e033078e33c2756221f38fd529b914165090a615f27961de687497",
         )
         # Note: This will fail. Re-evaluate
         assert_equal(res["results"]["sender"].lower(), self.ethAddress)

From ebea6a7373d1468d7d52f204963ffef22cce42ab Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 18:42:21 +0800
Subject: [PATCH 20/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index c9c4eb52df..da8fdf12bc 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -558,7 +558,9 @@ pub fn evm_try_get_block_hash_by_number(
         .storage
         .get_block_by_number(&U256::from(height))
     {
-        Ok(Some(block)) => cross_boundary_success_return(result, format!("{:?}", block.header.hash())),
+        Ok(Some(block)) => {
+            cross_boundary_success_return(result, format!("{:?}", block.header.hash()))
+        }
         Ok(None) => cross_boundary_error_return(result, "Invalid block number"),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
     }
@@ -868,7 +870,9 @@ mod tests {
         assert_eq!(num_h160_test, num_h160);
 
         use primitive_types::H256;
-        let num_h256: H256 = "0x3186715414c5fbd73586662d26b83b66b5754036379d56e896a560a90e409351".parse().unwrap();
+        let num_h256: H256 = "0x3186715414c5fbd73586662d26b83b66b5754036379d56e896a560a90e409351"
+            .parse()
+            .unwrap();
         let num_h256_string = format!("{:?}", num_h256);
         println!("{}", num_h256_string);
         let num_h256_test: H256 = num_h256_string.parse().unwrap();

From db692d6518e9cc28e05f3b2008899bd78961c718 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 19:06:14 +0800
Subject: [PATCH 21/50] Fix prefix for vmmap

---
 src/masternodes/mn_checks.cpp  | 2 +-
 src/masternodes/validation.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index f8b44921f9..6b90e8f6b2 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4012,7 +4012,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         }
 
         auto txHash = tx.GetHash().GetHex();
-        auto evmTxHash = std::string(validateResults.tx_hash.data(), validateResults.tx_hash.length());
+        auto evmTxHash = std::string(validateResults.tx_hash.data(), validateResults.tx_hash.length()).substr(2);
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
             LogPrintf("Failed to store DVMtoEVM TX hash for DFI TX %s\n", txHash);
diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 8b2de100fd..227206929b 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2451,7 +2451,7 @@ static Res ProcessEVMQueue(const CBlock &block, const CBlockIndex *pindex, CCust
     auto res = ValidateCoinbaseXVMOutput(*xvmRes, blockResult);
     if (!res) return res;
 
-    auto evmBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length());
+    auto evmBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length()).substr(2);
     res = cache.SetVMDomainBlockEdge(VMDomainEdge::DVMToEVM, block.GetHash().GetHex(), evmBlockHash);
     if (!res) return res;
 

From 5a945ddc974fc7e9ed7e83752a9d7efc4df1ef0b Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 19:16:31 +0800
Subject: [PATCH 22/50] Resolve merge conflict error

---
 test/functional/feature_dst20.py | 51 ++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/test/functional/feature_dst20.py b/test/functional/feature_dst20.py
index 746188864b..c075c8bbee 100755
--- a/test/functional/feature_dst20.py
+++ b/test/functional/feature_dst20.py
@@ -218,6 +218,13 @@ def test_dst20_dvm_to_evm_bridge(self):
             Decimal(1),
         )
 
+        # test totalSupply variable
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(1),
+        )
+
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "9.00000000@BTC")
 
@@ -241,6 +248,11 @@ def test_dst20_dvm_to_evm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(2),
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(2),
+        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "8.00000000@BTC")
 
@@ -264,6 +276,11 @@ def test_dst20_evm_to_dvm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(0.5),
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(0.5),
+        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "9.50000000@BTC")
 
@@ -299,6 +316,11 @@ def test_multiple_dvm_evm_bridge(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(3.5),
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(3.5),
+        )
         [amountBTC] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(amountBTC, "6.50000000@BTC")
 
@@ -336,6 +358,11 @@ def test_conflicting_bridge(self):
         assert_equal(
             self.btc.functions.balanceOf(self.key_pair2.address).call(), Decimal(0)
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(3.5),
+        )
         assert_equal(beforeAmount, afterAmount)
 
     def test_bridge_when_no_balance(self):
@@ -361,6 +388,11 @@ def test_bridge_when_no_balance(self):
         assert_equal(
             self.btc.functions.balanceOf(self.key_pair2.address).call(), Decimal(0)
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(5.5),
+        )
         [afterAmount] = [x for x in self.node.getaccount(self.address) if "BTC" in x]
         assert_equal(beforeAmount, afterAmount)
 
@@ -419,6 +451,11 @@ def test_transfer_to_token_address(self):
             / math.pow(10, self.btc.functions.decimals().call()),
             Decimal(2),
         )
+        assert_equal(
+            self.btc.functions.totalSupply().call()
+            / math.pow(10, self.btc.functions.decimals().call()),
+            Decimal(5.5),
+        )
 
     def test_negative_transfer(self):
         assert_raises_rpc_error(
@@ -532,7 +569,12 @@ def test_loan_token(self):
         assert_equal(TSLAAmount, "98.00000000@TSLA")
         assert_equal(
             self.tsla.functions.balanceOf(self.key_pair.address).call()
-            / math.pow(10, self.btc.functions.decimals().call()),
+            / math.pow(10, self.tsla.functions.decimals().call()),
+            Decimal(2),
+        )
+        assert_equal(
+            self.tsla.functions.totalSupply().call()
+            / math.pow(10, self.tsla.functions.decimals().call()),
             Decimal(2),
         )
 
@@ -554,7 +596,12 @@ def test_loan_token(self):
         assert_equal(TSLAAmount, "99.00000000@TSLA")
         assert_equal(
             self.tsla.functions.balanceOf(self.key_pair.address).call()
-            / math.pow(10, self.btc.functions.decimals().call()),
+            / math.pow(10, self.tsla.functions.decimals().call()),
+            Decimal(1),
+        )
+        assert_equal(
+            self.tsla.functions.totalSupply().call()
+            / math.pow(10, self.tsla.functions.decimals().call()),
             Decimal(1),
         )
 

From c6422f154deed6dbc0e2a40c1f99ccc511bb8b39 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 19:18:19 +0800
Subject: [PATCH 23/50] Fix merge error

---
 lib/ain-evm/src/evm.rs | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index c40ffacdac..5b732169a1 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -518,18 +518,38 @@ impl EVMServices {
             .backend
             .get_contract_storage(contract, storage_index.as_bytes())?;
 
-        let new_balance = if out {
-            balance.checked_sub(amount)
-        } else {
-            balance.checked_add(amount)
+            let total_supply_index = H256::from_low_u64_be(2);
+            let total_supply = executor
+                .backend
+                .get_contract_storage(contract, total_supply_index.as_bytes())?;
+    
+            let (new_balance, new_total_supply) = if out {
+                (
+                    balance.checked_sub(amount),
+                    total_supply.checked_sub(amount),
+                )
+            } else {
+                (
+                    balance.checked_add(amount),
+                    total_supply.checked_add(amount),
+                )
+            };
+    
+            let new_balance = new_balance.ok_or_else(|| format_err!("Balance overflow/underflow"))?;
+            let new_total_supply =
+                new_total_supply.ok_or_else(|| format_err!("Total supply overflow/underflow"))?;
+    
+            Ok(DST20BridgeInfo {
+                address: contract,
+                storage: vec![
+                    (storage_index, ain_contracts::u256_to_h256(new_balance)),
+                    (
+                        total_supply_index,
+                        ain_contracts::u256_to_h256(new_total_supply),
+                    ),
+                ],
+            })
         }
-        .ok_or_else(|| format_err!("Balance overflow/underflow"))?;
-
-        Ok(DST20BridgeInfo {
-            address: contract,
-            storage: vec![(storage_index, ain_contracts::u256_to_h256(new_balance))],
-        })
-    }
 
     ///
     /// # Safety

From 627234020e8b15ccf2764c3342ceb5702c300aba Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 19:19:38 +0800
Subject: [PATCH 24/50] Fix lint

---
 .../feature_evm_contract_env_vars.py          | 86 ++++++++++++-------
 1 file changed, 54 insertions(+), 32 deletions(-)

diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
index 2344ec3ca1..c02dcbdbc1 100755
--- a/test/functional/feature_evm_contract_env_vars.py
+++ b/test/functional/feature_evm_contract_env_vars.py
@@ -78,7 +78,9 @@ def should_create_contract(self):
         )
         node.generate(1)
 
-        abi, bytecode = EVMContract.from_file("GlobalVariable.sol", "GlobalVariable").compile()
+        abi, bytecode = EVMContract.from_file(
+            "GlobalVariable.sol", "GlobalVariable"
+        ).compile()
         compiled = node.w3.eth.contract(abi=abi, bytecode=bytecode)
 
         tx = compiled.constructor().build_transaction(
@@ -114,11 +116,15 @@ def test_block_chainid(self):
         assert_equal(chain_id, 1133)
 
     def test_coinbase(self):
-        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
-        raw_tx = self.nodes[0].getrawtransaction(block['tx'][0], 1)
-        opreturn_miner_keyid = raw_tx['vout'][1]['scriptPubKey']['hex'][120:]
+        block = self.nodes[0].getblock(
+            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        )
+        raw_tx = self.nodes[0].getrawtransaction(block["tx"][0], 1)
+        opreturn_miner_keyid = raw_tx["vout"][1]["scriptPubKey"]["hex"][120:]
         coinbase = self.contract.functions.coinbase().call()
-        assert_equal(coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}"))
+        assert_equal(
+            coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}")
+        )
 
     def test_difficulty(self):
         difficulty = self.contract.functions.difficulty().call()
@@ -134,7 +140,9 @@ def test_block_number(self):
         assert_equal(f"0x{n}", bn)
 
     def test_timestamp(self):
-        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
+        block = self.nodes[0].getblock(
+            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        )
         ts = self.contract.functions.timestamp().call()
         assert_equal(ts, block["time"])
 
@@ -143,13 +151,15 @@ def test_gasleft(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        gas_left = self.contract.functions.gasLeft().call(tx) # 978_708
+        gas_left = self.contract.functions.gasLeft().call(tx)  # 978_708
         assert tx["gas"] > gas_left
 
     def test_msg_sender(self):
@@ -161,7 +171,9 @@ def test_msg_value(self):
             "from": self.evm_key_pair.address,
             "value": "0x1a",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -175,13 +187,15 @@ def test_msg_data(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI('getData', [])
+        data = self.contract.encodeABI("getData", [])
         d = self.contract.functions.getData().call(tx)
         assert_equal(data, f"0x{d.hex()}")
 
@@ -190,13 +204,15 @@ def test_msg_sig(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI('getSig', [])
+        data = self.contract.encodeABI("getSig", [])
         sig = self.contract.functions.getSig().call(tx)
         assert_equal(data, f"0x{sig.hex()}")
 
@@ -205,7 +221,9 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gasPrice": 10_000_000_000,
             "gas": 1_000_000,
         }
@@ -216,7 +234,9 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -230,7 +250,9 @@ def test_tx_origin(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -243,43 +265,43 @@ def test_call_contract_property(self):
         count = self.contract.functions.count().call()
         assert_equal(count, 45)
 
-
     def run_test(self):
         self.setup()
 
         self.should_create_contract()
 
-        self.test_blockhash() # blockhash(number)
+        self.test_blockhash()  # blockhash(number)
 
-        self.test_block_basefee() # block.basefee
+        self.test_block_basefee()  # block.basefee
 
-        self.test_block_chainid() # block.chainid
+        self.test_block_chainid()  # block.chainid
 
-        self.test_coinbase() # block.coinbase
+        self.test_coinbase()  # block.coinbase
 
-        self.test_difficulty() # block.difficulty
+        self.test_difficulty()  # block.difficulty
 
-        self.test_block_gaslimit() # block.gaslimit
+        self.test_block_gaslimit()  # block.gaslimit
 
-        self.test_block_number() # block.number
+        self.test_block_number()  # block.number
 
-        self.test_timestamp() # block.timestamp
+        self.test_timestamp()  # block.timestamp
 
-        self.test_gasleft() # gasleft()
+        self.test_gasleft()  # gasleft()
 
-        self.test_msg_sender() # msg.sender
+        self.test_msg_sender()  # msg.sender
 
-        self.test_msg_value() # msg.value
+        self.test_msg_value()  # msg.value
 
-        self.test_msg_data() # msg.data
+        self.test_msg_data()  # msg.data
 
-        self.test_msg_sig() # msg.sig
+        self.test_msg_sig()  # msg.sig
 
-        self.test_tx_gasprice() # tx.gasprice
+        self.test_tx_gasprice()  # tx.gasprice
 
-        self.test_tx_origin() # tx.origin
+        self.test_tx_origin()  # tx.origin
 
         self.test_call_contract_property()
 
+
 if __name__ == "__main__":
     EVMTest().main()

From e372604248c46b6d2b875d983fbcec627b4b46f1 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 19:23:44 +0800
Subject: [PATCH 25/50] Fix lint

---
 lib/ain-evm/src/evm.rs        | 62 +++++++++++++++++------------------
 lib/ain-rs-exports/src/evm.rs |  6 +---
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index 5b732169a1..fd76499fba 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -518,38 +518,38 @@ impl EVMServices {
             .backend
             .get_contract_storage(contract, storage_index.as_bytes())?;
 
-            let total_supply_index = H256::from_low_u64_be(2);
-            let total_supply = executor
-                .backend
-                .get_contract_storage(contract, total_supply_index.as_bytes())?;
-    
-            let (new_balance, new_total_supply) = if out {
-                (
-                    balance.checked_sub(amount),
-                    total_supply.checked_sub(amount),
-                )
-            } else {
+        let total_supply_index = H256::from_low_u64_be(2);
+        let total_supply = executor
+            .backend
+            .get_contract_storage(contract, total_supply_index.as_bytes())?;
+
+        let (new_balance, new_total_supply) = if out {
+            (
+                balance.checked_sub(amount),
+                total_supply.checked_sub(amount),
+            )
+        } else {
+            (
+                balance.checked_add(amount),
+                total_supply.checked_add(amount),
+            )
+        };
+
+        let new_balance = new_balance.ok_or_else(|| format_err!("Balance overflow/underflow"))?;
+        let new_total_supply =
+            new_total_supply.ok_or_else(|| format_err!("Total supply overflow/underflow"))?;
+
+        Ok(DST20BridgeInfo {
+            address: contract,
+            storage: vec![
+                (storage_index, ain_contracts::u256_to_h256(new_balance)),
                 (
-                    balance.checked_add(amount),
-                    total_supply.checked_add(amount),
-                )
-            };
-    
-            let new_balance = new_balance.ok_or_else(|| format_err!("Balance overflow/underflow"))?;
-            let new_total_supply =
-                new_total_supply.ok_or_else(|| format_err!("Total supply overflow/underflow"))?;
-    
-            Ok(DST20BridgeInfo {
-                address: contract,
-                storage: vec![
-                    (storage_index, ain_contracts::u256_to_h256(new_balance)),
-                    (
-                        total_supply_index,
-                        ain_contracts::u256_to_h256(new_total_supply),
-                    ),
-                ],
-            })
-        }
+                    total_supply_index,
+                    ain_contracts::u256_to_h256(new_total_supply),
+                ),
+            ],
+        })
+    }
 
     ///
     /// # Safety
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index da8fdf12bc..69e272cbda 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -132,15 +132,11 @@ pub fn evm_unsafe_try_get_next_valid_nonce_in_q(
         {
             Ok(nonce) => {
                 let Ok(nonce) = u64::try_from(nonce) else {
-                    debug!("XX Here1");
                     return cross_boundary_error_return(result, "nonce value overflow");
                 };
                 cross_boundary_success_return(result, nonce)
             }
-            Err(e) => {
-                debug!("XX Here2");
-                cross_boundary_error_return(result, e.to_string())
-            }
+            Err(e) => cross_boundary_error_return(result, e.to_string()),
         }
     }
 }

From c45ff3030c7426c44d47ab9bf3b91b8e82a1e4d8 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Wed, 16 Aug 2023 21:10:22 +0800
Subject: [PATCH 26/50] Fix string prefixes

---
 src/masternodes/mn_checks.cpp |  3 +++
 src/masternodes/rpc_evm.cpp   | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 6b90e8f6b2..bf9288e287 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4012,6 +4012,9 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         }
 
         auto txHash = tx.GetHash().GetHex();
+        if (validateResults.tx_hash.length() < 2) {
+            return Res::Ok();
+        }
         auto evmTxHash = std::string(validateResults.tx_hash.data(), validateResults.tx_hash.length()).substr(2);
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 8640d86f10..9affc160f1 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -200,7 +200,15 @@ UniValue vmmap(const JSONRPCRequest &request) {
         return str;
     };
 
-    const std::string input = request.params[0].get_str();
+    auto ensureEVMHashStripped = [](const std::string &str) {
+        if (str.length() > 2 && str.substr(0, 2) == "0x") {
+            return str.substr(2);
+        }
+        return str;
+    };
+
+    const auto inputStr = request.params[0].get_str();
+    const auto input = ensureEVMHashStripped(inputStr);
 
     int typeInt = request.params[1].get_int();
     if (typeInt < 0 || typeInt >= VMDomainRPCMapTypeCount) {
@@ -282,7 +290,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
             throw JSONRPCError(RPC_INVALID_REQUEST, res.msg);
         } else {
             UniValue ret(UniValue::VOBJ);
-            ret.pushKV("input", input);
+            ret.pushKV("input", inputStr);
             ret.pushKV("type", GetVMDomainRPCMapType(type));
             ret.pushKV("output", ensureEVMHashPrefixed(*res.val, type));
             return ret;

From 9d497dec3232ac64adeaa4735bbb60dbb1b61008 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:32:24 +0800
Subject: [PATCH 27/50] Fix vmmapping to remove hex prefix

---
 lib/ain-rs-exports/src/evm.rs            | 8 +++++---
 lib/ain-rs-exports/src/lib.rs            | 9 +--------
 src/masternodes/mn_checks.cpp            | 2 +-
 src/masternodes/rpc_evm.cpp              | 9 +--------
 test/functional/feature_evm_vmmap_rpc.py | 8 ++++----
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 69e272cbda..8fbbc2522c 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -274,7 +274,7 @@ pub fn evm_unsafe_try_sub_balance_in_q(
 pub fn evm_unsafe_try_prevalidate_raw_tx(
     result: &mut ffi::CrossBoundaryResult,
     tx: &str,
-) -> ffi::PreValidateTxCompletion {
+) -> ffi::ValidateTxCompletion {
     let queue_id = 0;
 
     unsafe {
@@ -282,7 +282,7 @@ pub fn evm_unsafe_try_prevalidate_raw_tx(
             Ok(ValidateTxInfo {
                 signed_tx,
                 prepay_fee,
-                used_gas: _,
+                used_gas,
             }) => {
                 let Ok(nonce) = u64::try_from(signed_tx.nonce()) else {
                     return cross_boundary_error_return(result, "nonce value overflow");
@@ -294,10 +294,12 @@ pub fn evm_unsafe_try_prevalidate_raw_tx(
 
                 cross_boundary_success_return(
                     result,
-                    ffi::PreValidateTxCompletion {
+                    ffi::ValidateTxCompletion {
                         nonce,
                         sender: format!("{:?}", signed_tx.sender),
+                        tx_hash: format!("{:?}", signed_tx.hash()),
                         prepay_fee,
+                        gas_used: used_gas,
                     },
                 )
             }
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
index a7313a4116..131896bc99 100644
--- a/lib/ain-rs-exports/src/lib.rs
+++ b/lib/ain-rs-exports/src/lib.rs
@@ -84,13 +84,6 @@ pub mod ffi {
         pub block_number: u64,
     }
 
-    #[derive(Default)]
-    pub struct PreValidateTxCompletion {
-        pub nonce: u64,
-        pub sender: String,
-        pub prepay_fee: u64,
-    }
-
     #[derive(Default)]
     pub struct ValidateTxCompletion {
         pub nonce: u64,
@@ -140,7 +133,7 @@ pub mod ffi {
         fn evm_unsafe_try_prevalidate_raw_tx(
             result: &mut CrossBoundaryResult,
             tx: &str,
-        ) -> PreValidateTxCompletion;
+        ) -> ValidateTxCompletion;
         fn evm_unsafe_try_validate_raw_tx_in_q(
             result: &mut CrossBoundaryResult,
             tx: &str,
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 6b90e8f6b2..ffb1c0b914 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4004,7 +4004,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
             }
         }
         else {
-            evm_unsafe_try_prevalidate_raw_tx(result, HexStr(obj.evmTx));
+            validateResults = evm_unsafe_try_prevalidate_raw_tx(result, HexStr(obj.evmTx));
             if (!result.ok) {
                 LogPrintf("[evm_try_prevalidate_raw_tx] failed, reason : %s\n", result.reason);
                 return Res::Err("evm tx failed to validate %s", result.reason);
diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 8640d86f10..9bc04ba5ea 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -193,13 +193,6 @@ UniValue vmmap(const JSONRPCRequest &request) {
         throwInvalidParam("Automatic detection not viable for input");
     };
 
-    auto ensureEVMHashPrefixed = [](const std::string &str, const VMDomainRPCMapType type) {
-        if (type == VMDomainRPCMapType::TxHashDVMToEVM || type == VMDomainRPCMapType::BlockHashDVMToEVM) {
-            return "0x" + str;
-        }
-        return str;
-    };
-
     const std::string input = request.params[0].get_str();
 
     int typeInt = request.params[1].get_int();
@@ -284,7 +277,7 @@ UniValue vmmap(const JSONRPCRequest &request) {
             UniValue ret(UniValue::VOBJ);
             ret.pushKV("input", input);
             ret.pushKV("type", GetVMDomainRPCMapType(type));
-            ret.pushKV("output", ensureEVMHashPrefixed(*res.val, type));
+            ret.pushKV("output", *res.val);
             return ret;
         }
     };
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 8b5fb0845d..8a40889018 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -141,7 +141,7 @@ def vmmap_valid_tx_should_succeed(self):
             eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)
             for j in range(num_txs):
                 # note dfi block is j+1 since we ignore coinbase
-                tx_maps.append([dfi_block["tx"][j + 1], eth_block["transactions"][j]])
+                tx_maps.append([dfi_block["tx"][j + 1], eth_block["transactions"][j][2:]])
         for item in tx_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.TxHashDVMToEVM)
             assert_equal(res["input"], item[0])
@@ -177,7 +177,7 @@ def vmmap_invalid_should_fail(self):
                 continue  # auto and num are ignored for this test
             assert_raises_rpc_error(
                 -32600,
-                "Key not found: " + fake_evm_tx[2:],
+                "Key not found: " + fake_evm_tx,
                 self.nodes[0].vmmap,
                 fake_evm_tx,
                 map_type,
@@ -208,7 +208,7 @@ def vmmap_valid_block_should_succeed(self):
             self.nodes[0].generate(1)
             dfi_block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
             eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)
-            block_maps.append([dfi_block["hash"], eth_block["hash"]])
+            block_maps.append([dfi_block["hash"], eth_block["hash"][2:]])
         for item in block_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.BlockHashDVMToEVM)
             assert_equal(res["input"], item[0])
@@ -365,7 +365,7 @@ def logvmmaps_block_exist(self):
         list_blocks = self.nodes[0].logvmmaps(0)
         eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)["hash"]
         assert_equal(eth_block[2:] in list(list_blocks["indexes"].values()), True)
-        dfi_block = self.nodes[0].vmmap(eth_block, VMMapType.BlockHashEVMToDVM)[
+        dfi_block = self.nodes[0].vmmap(eth_block[2:], VMMapType.BlockHashEVMToDVM)[
             "output"
         ]
         assert_equal(dfi_block in list(list_blocks["indexes"].keys()), True)

From 234e732b10280009973fcc7ed67236bb7427226f Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:33:24 +0800
Subject: [PATCH 28/50] Fix lint

---
 test/functional/feature_evm_vmmap_rpc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 8a40889018..388ad8ffa3 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -141,7 +141,9 @@ def vmmap_valid_tx_should_succeed(self):
             eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)
             for j in range(num_txs):
                 # note dfi block is j+1 since we ignore coinbase
-                tx_maps.append([dfi_block["tx"][j + 1], eth_block["transactions"][j][2:]])
+                tx_maps.append(
+                    [dfi_block["tx"][j + 1], eth_block["transactions"][j][2:]]
+                )
         for item in tx_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.TxHashDVMToEVM)
             assert_equal(res["input"], item[0])

From 38d71b86de303961ea2d3f6720508a1221aab197 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:39:37 +0800
Subject: [PATCH 29/50] Fix vmmap test

---
 .../feature_evm_contract_env_vars.py          | 86 +++++++------------
 test/functional/feature_evm_rpc.py            | 19 +---
 test/functional/feature_evm_vmmap_rpc.py      |  6 +-
 3 files changed, 37 insertions(+), 74 deletions(-)

diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
index c02dcbdbc1..2344ec3ca1 100755
--- a/test/functional/feature_evm_contract_env_vars.py
+++ b/test/functional/feature_evm_contract_env_vars.py
@@ -78,9 +78,7 @@ def should_create_contract(self):
         )
         node.generate(1)
 
-        abi, bytecode = EVMContract.from_file(
-            "GlobalVariable.sol", "GlobalVariable"
-        ).compile()
+        abi, bytecode = EVMContract.from_file("GlobalVariable.sol", "GlobalVariable").compile()
         compiled = node.w3.eth.contract(abi=abi, bytecode=bytecode)
 
         tx = compiled.constructor().build_transaction(
@@ -116,15 +114,11 @@ def test_block_chainid(self):
         assert_equal(chain_id, 1133)
 
     def test_coinbase(self):
-        block = self.nodes[0].getblock(
-            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
-        )
-        raw_tx = self.nodes[0].getrawtransaction(block["tx"][0], 1)
-        opreturn_miner_keyid = raw_tx["vout"][1]["scriptPubKey"]["hex"][120:]
+        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
+        raw_tx = self.nodes[0].getrawtransaction(block['tx'][0], 1)
+        opreturn_miner_keyid = raw_tx['vout'][1]['scriptPubKey']['hex'][120:]
         coinbase = self.contract.functions.coinbase().call()
-        assert_equal(
-            coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}")
-        )
+        assert_equal(coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}"))
 
     def test_difficulty(self):
         difficulty = self.contract.functions.difficulty().call()
@@ -140,9 +134,7 @@ def test_block_number(self):
         assert_equal(f"0x{n}", bn)
 
     def test_timestamp(self):
-        block = self.nodes[0].getblock(
-            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
-        )
+        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
         ts = self.contract.functions.timestamp().call()
         assert_equal(ts, block["time"])
 
@@ -151,15 +143,13 @@ def test_gasleft(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        gas_left = self.contract.functions.gasLeft().call(tx)  # 978_708
+        gas_left = self.contract.functions.gasLeft().call(tx) # 978_708
         assert tx["gas"] > gas_left
 
     def test_msg_sender(self):
@@ -171,9 +161,7 @@ def test_msg_value(self):
             "from": self.evm_key_pair.address,
             "value": "0x1a",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -187,15 +175,13 @@ def test_msg_data(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI("getData", [])
+        data = self.contract.encodeABI('getData', [])
         d = self.contract.functions.getData().call(tx)
         assert_equal(data, f"0x{d.hex()}")
 
@@ -204,15 +190,13 @@ def test_msg_sig(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI("getSig", [])
+        data = self.contract.encodeABI('getSig', [])
         sig = self.contract.functions.getSig().call(tx)
         assert_equal(data, f"0x{sig.hex()}")
 
@@ -221,9 +205,7 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gasPrice": 10_000_000_000,
             "gas": 1_000_000,
         }
@@ -234,9 +216,7 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -250,9 +230,7 @@ def test_tx_origin(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(
-                self.evm_key_pair.address
-            ),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -265,43 +243,43 @@ def test_call_contract_property(self):
         count = self.contract.functions.count().call()
         assert_equal(count, 45)
 
+
     def run_test(self):
         self.setup()
 
         self.should_create_contract()
 
-        self.test_blockhash()  # blockhash(number)
+        self.test_blockhash() # blockhash(number)
 
-        self.test_block_basefee()  # block.basefee
+        self.test_block_basefee() # block.basefee
 
-        self.test_block_chainid()  # block.chainid
+        self.test_block_chainid() # block.chainid
 
-        self.test_coinbase()  # block.coinbase
+        self.test_coinbase() # block.coinbase
 
-        self.test_difficulty()  # block.difficulty
+        self.test_difficulty() # block.difficulty
 
-        self.test_block_gaslimit()  # block.gaslimit
+        self.test_block_gaslimit() # block.gaslimit
 
-        self.test_block_number()  # block.number
+        self.test_block_number() # block.number
 
-        self.test_timestamp()  # block.timestamp
+        self.test_timestamp() # block.timestamp
 
-        self.test_gasleft()  # gasleft()
+        self.test_gasleft() # gasleft()
 
-        self.test_msg_sender()  # msg.sender
+        self.test_msg_sender() # msg.sender
 
-        self.test_msg_value()  # msg.value
+        self.test_msg_value() # msg.value
 
-        self.test_msg_data()  # msg.data
+        self.test_msg_data() # msg.data
 
-        self.test_msg_sig()  # msg.sig
+        self.test_msg_sig() # msg.sig
 
-        self.test_tx_gasprice()  # tx.gasprice
+        self.test_tx_gasprice() # tx.gasprice
 
-        self.test_tx_origin()  # tx.origin
+        self.test_tx_origin() # tx.origin
 
         self.test_call_contract_property()
 
-
 if __name__ == "__main__":
     EVMTest().main()
diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
index 0ff474dfd7..26a4f7e9f1 100755
--- a/test/functional/feature_evm_rpc.py
+++ b/test/functional/feature_evm_rpc.py
@@ -5,7 +5,6 @@
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 """Test EVM behaviour"""
 
-from test_framework.evm_key_pair import EvmKeyPair
 from test_framework.test_framework import DefiTestFramework
 from test_framework.util import (
     assert_equal,
@@ -50,13 +49,6 @@ def setup(self):
         self.nodes[0].importprivkey(
             "17b8cb134958b3d8422b6c43b0732fcdb8c713b524df2d45de12f0c7e214ba35"
         )  # toAddress
-        EvmKeyPair.validate_key(
-            self.nodes[0].dumpprivkey(self.ethAddress), self.ethAddress
-        )
-        self.dst20_accounts = [
-            "0x0a06de8abc3f15359ec0dfe32394c8b8f09e828f",
-            "0x3aeddfb7ffd59d0909145e6a11db224a13e7a9f6",
-        ]
 
         # Generate chain
         self.nodes[0].generate(101)
@@ -122,14 +114,7 @@ def test_gas(self):
 
     def test_accounts(self):
         eth_accounts = self.nodes[0].eth_accounts()
-        check_accounts = []
-        for acc in eth_accounts:
-            address = acc.lower()
-            if address not in self.dst20_accounts:
-                check_accounts.append(address)
-        accounts = [self.ethAddress, self.toAddress]
-        accounts.sort()
-        assert_equal(check_accounts, accounts)
+        assert_equal(eth_accounts.sort(), [self.ethAddress, self.toAddress].sort())
 
     def test_address_state(self, address):
         assert_raises_rpc_error(
@@ -181,7 +166,7 @@ def test_block(self):
         block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
         res = self.nodes[0].getcustomtx(block["tx"][1])
         assert_equal(
-            res["results"]["hash"][2:],
+            res["results"]["hash"],
             "8c99e9f053e033078e33c2756221f38fd529b914165090a615f27961de687497",
         )
         # Note: This will fail. Re-evaluate
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 388ad8ffa3..343489d7a0 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -142,7 +142,7 @@ def vmmap_valid_tx_should_succeed(self):
             for j in range(num_txs):
                 # note dfi block is j+1 since we ignore coinbase
                 tx_maps.append(
-                    [dfi_block["tx"][j + 1], eth_block["transactions"][j][2:]]
+                    [dfi_block["tx"][j + 1], eth_block["transactions"][j]]
                 )
         for item in tx_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.TxHashDVMToEVM)
@@ -179,7 +179,7 @@ def vmmap_invalid_should_fail(self):
                 continue  # auto and num are ignored for this test
             assert_raises_rpc_error(
                 -32600,
-                "Key not found: " + fake_evm_tx,
+                "Key not found: " + fake_evm_tx[2:],
                 self.nodes[0].vmmap,
                 fake_evm_tx,
                 map_type,
@@ -210,7 +210,7 @@ def vmmap_valid_block_should_succeed(self):
             self.nodes[0].generate(1)
             dfi_block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
             eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)
-            block_maps.append([dfi_block["hash"], eth_block["hash"][2:]])
+            block_maps.append([dfi_block["hash"], eth_block["hash"]])
         for item in block_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.BlockHashDVMToEVM)
             assert_equal(res["input"], item[0])

From 05775efe8096e3a6b62d03ed6ca5caf46e5826c7 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:40:06 +0800
Subject: [PATCH 30/50] Fix lint

---
 .../feature_evm_contract_env_vars.py          | 86 ++++++++++++-------
 test/functional/feature_evm_vmmap_rpc.py      |  4 +-
 2 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
index 2344ec3ca1..c02dcbdbc1 100755
--- a/test/functional/feature_evm_contract_env_vars.py
+++ b/test/functional/feature_evm_contract_env_vars.py
@@ -78,7 +78,9 @@ def should_create_contract(self):
         )
         node.generate(1)
 
-        abi, bytecode = EVMContract.from_file("GlobalVariable.sol", "GlobalVariable").compile()
+        abi, bytecode = EVMContract.from_file(
+            "GlobalVariable.sol", "GlobalVariable"
+        ).compile()
         compiled = node.w3.eth.contract(abi=abi, bytecode=bytecode)
 
         tx = compiled.constructor().build_transaction(
@@ -114,11 +116,15 @@ def test_block_chainid(self):
         assert_equal(chain_id, 1133)
 
     def test_coinbase(self):
-        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
-        raw_tx = self.nodes[0].getrawtransaction(block['tx'][0], 1)
-        opreturn_miner_keyid = raw_tx['vout'][1]['scriptPubKey']['hex'][120:]
+        block = self.nodes[0].getblock(
+            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        )
+        raw_tx = self.nodes[0].getrawtransaction(block["tx"][0], 1)
+        opreturn_miner_keyid = raw_tx["vout"][1]["scriptPubKey"]["hex"][120:]
         coinbase = self.contract.functions.coinbase().call()
-        assert_equal(coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}"))
+        assert_equal(
+            coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}")
+        )
 
     def test_difficulty(self):
         difficulty = self.contract.functions.difficulty().call()
@@ -134,7 +140,9 @@ def test_block_number(self):
         assert_equal(f"0x{n}", bn)
 
     def test_timestamp(self):
-        block = self.nodes[0].getblock(self.nodes[0].getblockhash(self.nodes[0].getblockcount()))
+        block = self.nodes[0].getblock(
+            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+        )
         ts = self.contract.functions.timestamp().call()
         assert_equal(ts, block["time"])
 
@@ -143,13 +151,15 @@ def test_gasleft(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        gas_left = self.contract.functions.gasLeft().call(tx) # 978_708
+        gas_left = self.contract.functions.gasLeft().call(tx)  # 978_708
         assert tx["gas"] > gas_left
 
     def test_msg_sender(self):
@@ -161,7 +171,9 @@ def test_msg_value(self):
             "from": self.evm_key_pair.address,
             "value": "0x1a",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -175,13 +187,15 @@ def test_msg_data(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI('getData', [])
+        data = self.contract.encodeABI("getData", [])
         d = self.contract.functions.getData().call(tx)
         assert_equal(data, f"0x{d.hex()}")
 
@@ -190,13 +204,15 @@ def test_msg_sig(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
             "type": "0x2",
         }
-        data = self.contract.encodeABI('getSig', [])
+        data = self.contract.encodeABI("getSig", [])
         sig = self.contract.functions.getSig().call(tx)
         assert_equal(data, f"0x{sig.hex()}")
 
@@ -205,7 +221,9 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gasPrice": 10_000_000_000,
             "gas": 1_000_000,
         }
@@ -216,7 +234,9 @@ def test_tx_gasprice(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -230,7 +250,9 @@ def test_tx_origin(self):
             "from": self.evm_key_pair.address,
             "value": "0x0",
             "chainId": self.nodes[0].w3.eth.chain_id,
-            "nonce": self.nodes[0].w3.eth.get_transaction_count(self.evm_key_pair.address),
+            "nonce": self.nodes[0].w3.eth.get_transaction_count(
+                self.evm_key_pair.address
+            ),
             "gas": 1_000_000,
             "maxFeePerGas": 15_000_000_000,
             "maxPriorityFeePerGas": 9_000_000_000,
@@ -243,43 +265,43 @@ def test_call_contract_property(self):
         count = self.contract.functions.count().call()
         assert_equal(count, 45)
 
-
     def run_test(self):
         self.setup()
 
         self.should_create_contract()
 
-        self.test_blockhash() # blockhash(number)
+        self.test_blockhash()  # blockhash(number)
 
-        self.test_block_basefee() # block.basefee
+        self.test_block_basefee()  # block.basefee
 
-        self.test_block_chainid() # block.chainid
+        self.test_block_chainid()  # block.chainid
 
-        self.test_coinbase() # block.coinbase
+        self.test_coinbase()  # block.coinbase
 
-        self.test_difficulty() # block.difficulty
+        self.test_difficulty()  # block.difficulty
 
-        self.test_block_gaslimit() # block.gaslimit
+        self.test_block_gaslimit()  # block.gaslimit
 
-        self.test_block_number() # block.number
+        self.test_block_number()  # block.number
 
-        self.test_timestamp() # block.timestamp
+        self.test_timestamp()  # block.timestamp
 
-        self.test_gasleft() # gasleft()
+        self.test_gasleft()  # gasleft()
 
-        self.test_msg_sender() # msg.sender
+        self.test_msg_sender()  # msg.sender
 
-        self.test_msg_value() # msg.value
+        self.test_msg_value()  # msg.value
 
-        self.test_msg_data() # msg.data
+        self.test_msg_data()  # msg.data
 
-        self.test_msg_sig() # msg.sig
+        self.test_msg_sig()  # msg.sig
 
-        self.test_tx_gasprice() # tx.gasprice
+        self.test_tx_gasprice()  # tx.gasprice
 
-        self.test_tx_origin() # tx.origin
+        self.test_tx_origin()  # tx.origin
 
         self.test_call_contract_property()
 
+
 if __name__ == "__main__":
     EVMTest().main()
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 343489d7a0..408a218a6d 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -141,9 +141,7 @@ def vmmap_valid_tx_should_succeed(self):
             eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)
             for j in range(num_txs):
                 # note dfi block is j+1 since we ignore coinbase
-                tx_maps.append(
-                    [dfi_block["tx"][j + 1], eth_block["transactions"][j]]
-                )
+                tx_maps.append([dfi_block["tx"][j + 1], eth_block["transactions"][j]])
         for item in tx_maps:
             res = self.nodes[0].vmmap(item[0], VMMapType.TxHashDVMToEVM)
             assert_equal(res["input"], item[0])

From 6df02596c6ac7571d2255ac20fa64f2976686265 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:42:19 +0800
Subject: [PATCH 31/50] Revert change in vmmap

---
 test/functional/feature_evm_vmmap_rpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 408a218a6d..8b5fb0845d 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -365,7 +365,7 @@ def logvmmaps_block_exist(self):
         list_blocks = self.nodes[0].logvmmaps(0)
         eth_block = self.nodes[0].eth_getBlockByNumber("latest", False)["hash"]
         assert_equal(eth_block[2:] in list(list_blocks["indexes"].values()), True)
-        dfi_block = self.nodes[0].vmmap(eth_block[2:], VMMapType.BlockHashEVMToDVM)[
+        dfi_block = self.nodes[0].vmmap(eth_block, VMMapType.BlockHashEVMToDVM)[
             "output"
         ]
         assert_equal(dfi_block in list(list_blocks["indexes"].keys()), True)

From f65a20d8f8605ede3ae7daf14678c9842b994fde Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 21:48:42 +0800
Subject: [PATCH 32/50] Fix format

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index a59c2abbb0..261e2d34fb 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -670,8 +670,8 @@ bool BlockAssembler::EvmTxPreapply(const EvmTxPreApplyContext& ctx)
 
     auto& evmFeeMap = pkgCtx.feeMap;
     auto& evmAddressTxsMap = pkgCtx.addressTxsMap;
-    const auto txResultSender = std::string(txResult.sender.data(), txResult.sender.length());
 
+    const auto txResultSender = std::string(txResult.sender.data(), txResult.sender.length());
     const auto addrKey = EvmAddressWithNonce{txResultSender, txResult.nonce};
     if (auto feeEntry = evmFeeMap.find(addrKey); feeEntry != evmFeeMap.end()) {
         // Key already exists. We check to see if we need to prioritize higher fee tx

From fc58f9f8fdeaddc56f97a8ea6c8985c84719a3d2 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Wed, 16 Aug 2023 22:22:06 +0800
Subject: [PATCH 33/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 8fbbc2522c..22c1bab154 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -854,8 +854,6 @@ pub fn evm_unsafe_try_get_target_block_in_q(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     #[test]
     fn test_hash_type_string() {
         use primitive_types::H160;

From 37ec93f6b539dc2d2a9d87b7177b7cebf4a1774a Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 17 Aug 2023 11:42:23 +0800
Subject: [PATCH 34/50] Fixes to getEthPrivKey cpp ffi

---
 lib/ain-cpp-imports/src/bridge.rs |  2 +-
 lib/ain-cpp-imports/src/lib.rs    |  6 +++---
 lib/ain-grpc/src/rpc/eth.rs       |  4 ++--
 lib/ain-rs-exports/src/evm.rs     |  2 +-
 src/ffi/ffiexports.cpp            | 10 ++++++++--
 src/ffi/ffiexports.h              |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/ain-cpp-imports/src/bridge.rs b/lib/ain-cpp-imports/src/bridge.rs
index 32e14feed2..5088faaaee 100644
--- a/lib/ain-cpp-imports/src/bridge.rs
+++ b/lib/ain-cpp-imports/src/bridge.rs
@@ -22,7 +22,7 @@ pub mod ffi {
         fn getPoolTransactions() -> Vec<String>;
         fn getNativeTxSize(data: Vec<u8>) -> u64;
         fn getMinRelayTxFee() -> u64;
-        fn getEthPrivKey(key_id: [u8; 20]) -> [u8; 32];
+        fn getEthPrivKey(key: String) -> [u8; 32];
         fn getStateInputJSON() -> String;
         fn getHighestBlock() -> i32;
         fn getCurrentHeight() -> i32;
diff --git a/lib/ain-cpp-imports/src/lib.rs b/lib/ain-cpp-imports/src/lib.rs
index ad6f2c81bd..d76303c4e1 100644
--- a/lib/ain-cpp-imports/src/lib.rs
+++ b/lib/ain-cpp-imports/src/lib.rs
@@ -49,7 +49,7 @@ mod ffi {
     pub fn getMinRelayTxFee() -> u64 {
         unimplemented!("{}", UNIMPL_MSG)
     }
-    pub fn getEthPrivKey(_key_id: [u8; 20]) -> [u8; 32] {
+    pub fn getEthPrivKey(_key: String) -> [u8; 32] {
         unimplemented!("{}", UNIMPL_MSG)
     }
     pub fn getStateInputJSON() -> String {
@@ -126,8 +126,8 @@ pub fn get_min_relay_tx_fee() -> Result<u64, Box<dyn Error>> {
     Ok(tx_fee)
 }
 
-pub fn get_eth_priv_key(key_id: [u8; 20]) -> Result<[u8; 32], Box<dyn Error>> {
-    let eth_key = ffi::getEthPrivKey(key_id);
+pub fn get_eth_priv_key(key: String) -> Result<[u8; 32], Box<dyn Error>> {
+    let eth_key = ffi::getEthPrivKey(key);
     Ok(eth_key)
 }
 
diff --git a/lib/ain-grpc/src/rpc/eth.rs b/lib/ain-grpc/src/rpc/eth.rs
index 7e621bef70..66ae03f952 100644
--- a/lib/ain-grpc/src/rpc/eth.rs
+++ b/lib/ain-grpc/src/rpc/eth.rs
@@ -1059,8 +1059,8 @@ fn sign(
     message: TransactionMessage,
 ) -> Result<TransactionV2, Box<dyn std::error::Error>> {
     debug!("sign address {:#x}", address);
-    let key_id = address.as_fixed_bytes().to_owned();
-    let priv_key = get_eth_priv_key(key_id).unwrap();
+    let key = format!("{:?}", address);
+    let priv_key = get_eth_priv_key(key).unwrap();
     let secret_key = SecretKey::parse(&priv_key).unwrap();
 
     match message {
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 22c1bab154..e88391e766 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -66,7 +66,7 @@ pub fn evm_try_create_and_sign_tx(
         sig: TransactionSignature::new(27, LOWER_H256, LOWER_H256).unwrap(),
     };
 
-    // Sign
+    // Sign with a big endian byte array
     match t.sign(&ctx.priv_key, ctx.chain_id) {
         Ok(signed) => cross_boundary_success_return(result, signed.encode().into()),
         Err(e) => cross_boundary_error_return(result, e.to_string()),
diff --git a/src/ffi/ffiexports.cpp b/src/ffi/ffiexports.cpp
index 2361be9b4d..bf5187dd6c 100644
--- a/src/ffi/ffiexports.cpp
+++ b/src/ffi/ffiexports.cpp
@@ -194,9 +194,15 @@ uint64_t getMinRelayTxFee() {
     return ::minRelayTxFee.GetFeePerK() * 10000000;
 }
 
-std::array<uint8_t, 32> getEthPrivKey(std::array<uint8_t, 20> keyID) {
+std::array<uint8_t, 32> getEthPrivKey(rust::string key) {
+    const auto dest = DecodeDestination(std::string(key.begin(), key.length()));
+    if (dest.index() != WitV16KeyEthHashType) {
+        return {};
+    }
+    const auto keyID = std::get<WitnessV16EthHash>(dest);
+    const CKeyID ethKeyID{keyID};
+
     CKey ethPrivKey;
-    const auto ethKeyID = CKeyID{uint160{std::vector<uint8_t>(keyID.begin(), keyID.end())}};
     for (const auto &wallet: GetWallets()) {
         if (wallet->GetKey(ethKeyID, ethPrivKey)) {
             std::array<uint8_t, 32> privKeyArray{};
diff --git a/src/ffi/ffiexports.h b/src/ffi/ffiexports.h
index a77d6bc2c7..863e36283a 100644
--- a/src/ffi/ffiexports.h
+++ b/src/ffi/ffiexports.h
@@ -34,7 +34,7 @@ std::array<uint8_t, 32> getChainWork(std::array<uint8_t, 32> blockHash);
 rust::vec<rust::string> getPoolTransactions();
 uint64_t getNativeTxSize(rust::Vec<uint8_t> rawTransaction);
 uint64_t getMinRelayTxFee();
-std::array<uint8_t, 32> getEthPrivKey(std::array<uint8_t, 20> keyID);
+std::array<uint8_t, 32> getEthPrivKey(rust::string key);
 rust::string getStateInputJSON();
 int getHighestBlock();
 int getCurrentHeight();

From cb48ebea46d2f8a2a007192261a10eed3b9c6ef6 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 17 Aug 2023 12:46:56 +0800
Subject: [PATCH 35/50] Fix failing unit test due to passing gwei instead of
 wei to ffi

---
 src/test/transaction_tests.cpp | 11 +++--------
 test/functional/test_runner.py |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 60220ba449..840689656f 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -775,20 +775,15 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
     // Address 0xf829754bae400b679febefdcfc9944c323e1f94e
 
     const uint64_t chainID{5}; // Goerli testnetwork
-
-    // Check address on explorer to calc nonce
     uint64_t nonce = 0;
-
-    const uint64_t gasPrice = 449164996321; // 449.164996321 GWei
-    const uint64_t gasLimit = 21000; // 21,000
+    const uint64_t gasPrice = 449; // 449 GWei
+    const uint64_t gasLimit = 21000; // 21_000
     std::string to = "34c1ca09a2dc717d89baef2f30ff6a6b2975e17e";
-
     uint64_t value = 1000000;   // 0.01 DFI
 
     const std::vector<uint8_t> privKeyVec{ParseHex("1a8ec29c671461a375ee1fb193ab3b64ab5449837e060362daadd4b299ae5571")};
     std::array<uint8_t, 32> privKey{};
     std::copy(privKeyVec.begin(), privKeyVec.end(), privKey.begin());
-
     rust::Vec<uint8_t> input{};
 
     CrossBoundaryResult result;
@@ -797,7 +792,7 @@ BOOST_AUTO_TEST_CASE(test_CreateEthTx) {
     std::copy(reply.begin(), reply.end(), replyVector.begin());
     std::string transaction(HexStr(replyVector.begin(), replyVector.end()));
     const auto rawBytes = ParseHex(transaction);
-    BOOST_CHECK_EQUAL(transaction, "f86b8085689451eee18252089434c1ca09a2dc717d89baef2f30ff6a6b2975e17e872386f26fc10000802da0ae5c76f8073460cbc7a911d3cc1b367072db64848a9532343559ce6917c51a46a01d2e4928450c59acca3de8340eb15b7446b37936265a51ab35e63f749a048002");
+    BOOST_CHECK_EQUAL(transaction, "f86b8085688a7c4a008252089434c1ca09a2dc717d89baef2f30ff6a6b2975e17e872386f26fc10000802ea0faaabaa535de3859c7ee5f924545fcaa071a3516ce7ef1e6dc91faceef9b7c7fa053d23409fc611d228c818111aa75d04e3701ea7944f8e2d7fd8cd695c21399f5");
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 4e1c496dfd..d464e888fb 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -297,9 +297,9 @@
     "feature_loan.py",
     "feature_dst20.py",
     "feature_evm_contracts.py",
+    "feature_evm_contract_env_vars.py",
     "feature_evm_dfi_intrinsics.py",
     "feature_evm_logs.py",
-    "feature_evm_contract_env_vars.py",
     "feature_evm_fee.py",
     "feature_evm_genesis.py",
     "feature_evm_rollback.py",

From 45bf15d65da584e2f75cbe1c64f3621e68e568f0 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 17 Aug 2023 12:49:52 +0800
Subject: [PATCH 36/50] Add RPC helper for metric clarity

---
 src/masternodes/rpc_evm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternodes/rpc_evm.cpp b/src/masternodes/rpc_evm.cpp
index 9affc160f1..2f5eff52aa 100644
--- a/src/masternodes/rpc_evm.cpp
+++ b/src/masternodes/rpc_evm.cpp
@@ -54,7 +54,7 @@ UniValue evmtx(const JSONRPCRequest &request) {
                           {"gasPrice", RPCArg::Type::NUM, RPCArg::Optional::NO, "Gas Price in Gwei"},
                           {"gasLimit", RPCArg::Type::NUM, RPCArg::Optional::NO, "Gas limit"},
                           {"to", RPCArg::Type::STR, RPCArg::Optional::NO, "To address. Can be empty"},
-                          {"value", RPCArg::Type::NUM, RPCArg::Optional::NO, "Amount to send"},
+                          {"value", RPCArg::Type::NUM, RPCArg::Optional::NO, "Amount to send in DFI"},
                           {"data", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Hex encoded data. Can be blank."},
                           },
         RPCResult{"\"hash\"                  (string) The hex-encoded hash of broadcasted transaction\n"},

From eb5f03d7fe1983c7148a45d1e059856763847cb6 Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Thu, 17 Aug 2023 13:44:13 +0800
Subject: [PATCH 37/50] Fixes to block hash in xvm struct and
 feature_evm_contract_env_vars test

---
 src/masternodes/validation.cpp                   |  2 +-
 src/miner.cpp                                    |  2 +-
 test/functional/feature_evm_contract_env_vars.py | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/masternodes/validation.cpp b/src/masternodes/validation.cpp
index 227206929b..50ba817884 100644
--- a/src/masternodes/validation.cpp
+++ b/src/masternodes/validation.cpp
@@ -2382,7 +2382,7 @@ static void RevertFailedTransferDomainTxs(const std::vector<std::string> &failed
 }
 
 static Res ValidateCoinbaseXVMOutput(const XVM &xvm, const FinalizeBlockCompletion &blockResult) {
-    const auto blockResultBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length());
+    const auto blockResultBlockHash = std::string(blockResult.block_hash.data(), blockResult.block_hash.length()).substr(2);
     
     if (xvm.evm.blockHash != blockResultBlockHash) {
         return Res::Err("Incorrect EVM block hash in coinbase output");
diff --git a/src/miner.cpp b/src/miner.cpp
index 261e2d34fb..81e869f34b 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -298,7 +298,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         auto r = XResultStatusLogged(evm_unsafe_try_remove_queue(result, evmQueueId));
         if (!r) { return nullptr; }
 
-        xvm = XVM{0, {0, std::string(blockResult.block_hash.data(), blockResult.block_hash.length()), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
+        xvm = XVM{0, {0, std::string(blockResult.block_hash.data(), blockResult.block_hash.length()).substr(2), blockResult.total_burnt_fees, blockResult.total_priority_fees, evmBeneficiary}};
         // LogPrintf("DEBUG:: CreateNewBlock:: xvm-init:: %s\n", xvm.ToUniValue().write());
 
         std::set<uint256> failedTransactions;
diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
index c02dcbdbc1..3641a8c974 100755
--- a/test/functional/feature_evm_contract_env_vars.py
+++ b/test/functional/feature_evm_contract_env_vars.py
@@ -117,13 +117,15 @@ def test_block_chainid(self):
 
     def test_coinbase(self):
         block = self.nodes[0].getblock(
-            self.nodes[0].getblockhash(self.nodes[0].getblockcount())
+            self.nodes[0].getblockhash(self.nodes[0].getblockcount()), 3
         )
-        raw_tx = self.nodes[0].getrawtransaction(block["tx"][0], 1)
-        opreturn_miner_keyid = raw_tx["vout"][1]["scriptPubKey"]["hex"][120:]
+        coinbase_xvm = block["tx"][0]["vm"]
+        assert_equal(coinbase_xvm["vmtype"], "coinbase")
+        assert_equal(coinbase_xvm["txtype"], "coinbase")
+        opreturn_miner_keyid = coinbase_xvm["msg"]["evm"]["beneficiary"]
         coinbase = self.contract.functions.coinbase().call()
         assert_equal(
-            coinbase, self.nodes[0].w3.to_checksum_address(f"0x{opreturn_miner_keyid}")
+            coinbase, self.nodes[0].w3.to_checksum_address(opreturn_miner_keyid)
         )
 
     def test_difficulty(self):

From c9a8b7f1b477d65c47f6f9a50f46c13b2fb12a71 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 11:28:31 +0800
Subject: [PATCH 38/50] Add early return

---
 src/masternodes/mn_checks.cpp | 45 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index db7ecc9ac7..3092e5f1d7 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -769,7 +769,7 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
     uint64_t time;
     uint32_t txn;
     uint64_t evmQueueId;
-    bool prevalidateEvm;
+    bool evmSanityCheckOnly;
     bool isEvmEnabledForBlock;
 
 public:
@@ -781,14 +781,14 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                           uint64_t time,
                           uint32_t txn,
                           const uint64_t evmQueueId,
-                          const bool prevalidateEvm,
+                          const bool evmSanityCheckOnly,
                           const bool isEvmEnabledForBlock)
 
         : CCustomTxVisitor(tx, height, coins, mnview, consensus),
           time(time),
           txn(txn),
           evmQueueId(evmQueueId),
-          prevalidateEvm(prevalidateEvm),
+          evmSanityCheckOnly(evmSanityCheckOnly),
           isEvmEnabledForBlock(isEvmEnabledForBlock) {}
 
     Res operator()(const CCreateMasterNodeMessage &obj) const {
@@ -3988,32 +3988,31 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
 
         CrossBoundaryResult result;
         ValidateTxCompletion validateResults;
-        if (!prevalidateEvm) {
-            validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, HexStr(obj.evmTx), evmQueueId);
-            // Completely remove this fork guard on mainnet upgrade to restore nonce check from EVM activation
-            if (!result.ok) {
-                LogPrintf("[evm_try_validate_raw_tx] failed, reason : %s\n", result.reason);
-                return Res::Err("evm tx failed to validate %s", result.reason);
-            }
 
-            evm_unsafe_try_push_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), tx.GetHash().GetHex(), validateResults.gas_used);
-            if (!result.ok) {
-                LogPrintf("[evm_try_push_tx_in_q] failed, reason : %s\n", result.reason);
-                return Res::Err("evm tx failed to queue %s\n", result.reason);
-            }
-        }
-        else {
+        if (evmSanityCheckOnly) {
             validateResults = evm_unsafe_try_prevalidate_raw_tx(result, HexStr(obj.evmTx));
             if (!result.ok) {
                 LogPrintf("[evm_try_prevalidate_raw_tx] failed, reason : %s\n", result.reason);
                 return Res::Err("evm tx failed to validate %s", result.reason);
             }
+            return Res::Ok();
         }
 
-        auto txHash = tx.GetHash().GetHex();
-        if (validateResults.tx_hash.length() < 2) {
-            return Res::Ok();
+        validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, HexStr(obj.evmTx), evmQueueId);
+        // Completely remove this fork guard on mainnet upgrade to restore nonce check from EVM activation
+        if (!result.ok) {
+            LogPrintf("[evm_try_validate_raw_tx] failed, reason : %s\n", result.reason);
+            return Res::Err("evm tx failed to validate %s", result.reason);
+        }
+
+        evm_unsafe_try_push_tx_in_q(result, evmQueueId, HexStr(obj.evmTx), tx.GetHash().GetHex(), validateResults.gas_used);
+        if (!result.ok) {
+            LogPrintf("[evm_try_push_tx_in_q] failed, reason : %s\n", result.reason);
+            return Res::Err("evm tx failed to queue %s\n", result.reason);
         }
+
+
+        auto txHash = tx.GetHash().GetHex();
         auto evmTxHash = std::string(validateResults.tx_hash.data(), validateResults.tx_hash.length()).substr(2);
         auto res = mnview.SetVMDomainTxEdge(VMDomainEdge::DVMToEVM, txHash, evmTxHash);
         if (!res) {
@@ -4275,16 +4274,16 @@ Res CustomTxVisit(CCustomCSView &mnview,
     }
 
     auto q = evmQueueId;
-    bool prevalidateEvm = false;
+    bool evmSanityCheckOnly = false;
     if (q == 0) {
-        prevalidateEvm = true;
+        evmSanityCheckOnly = true;
         auto r = XResultValue(evm_unsafe_try_create_queue(result));
         if (r) { q = *r; } else { return r; }
     }
 
     try {
         return std::visit(
-            CCustomTxApplyVisitor(tx, height, coins, mnview, consensus, time, txn, q, prevalidateEvm, isEvmEnabledForBlock),
+            CCustomTxApplyVisitor(tx, height, coins, mnview, consensus, time, txn, q, evmSanityCheckOnly, isEvmEnabledForBlock),
             txMessage);
     } catch (const std::bad_variant_access &e) {
         return Res::Err(e.what());

From fdc63fafa63f2589a57055e102f9afb3d39c293d Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 11:35:51 +0800
Subject: [PATCH 39/50] Alias x boundary hash strings

---
 lib/ain-evm/src/core.rs    | 6 ++++--
 lib/ain-evm/src/evm.rs     | 6 +++---
 lib/ain-evm/src/txqueue.rs | 7 ++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/ain-evm/src/core.rs b/lib/ain-evm/src/core.rs
index db94999986..58439dcbdc 100644
--- a/lib/ain-evm/src/core.rs
+++ b/lib/ain-evm/src/core.rs
@@ -27,6 +27,8 @@ use crate::{
     Result,
 };
 
+pub type XHash = String;
+
 pub struct EVMCoreService {
     pub tx_queues: Arc<TransactionQueueMap>,
     pub trie_store: Arc<TrieDBStore>,
@@ -347,7 +349,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: String,
+        hash: XHash,
     ) -> Result<()> {
         let queue_tx = QueueTx::SystemTx(SystemTx::EvmIn(BalanceUpdate { address, amount }));
         self.tx_queues
@@ -366,7 +368,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: String,
+        hash: XHash,
     ) -> Result<()> {
         let block_number = self
             .storage
diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index cac147fcb8..d10600c2d6 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -14,7 +14,7 @@ use primitive_types::H256;
 use crate::backend::{EVMBackend, Vicinity};
 use crate::block::BlockService;
 use crate::bytes::Bytes;
-use crate::core::EVMCoreService;
+use crate::core::{EVMCoreService, XHash};
 use crate::executor::{AinExecutor, TxResponse};
 use crate::fee::{calculate_gas_fee, calculate_prepay_gas_fee};
 use crate::filters::FilterService;
@@ -40,7 +40,7 @@ pub struct EVMServices {
 }
 
 pub struct FinalizedBlockInfo {
-    pub block_hash: String,
+    pub block_hash: XHash,
     pub failed_transactions: Vec<String>,
     pub total_burnt_fees: U256,
     pub total_priority_fees: U256,
@@ -435,7 +435,7 @@ impl EVMServices {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: String,
+        hash: XHash,
         gas_used: U256,
     ) -> Result<()> {
         let parent_data = self.block.get_latest_block_hash_and_number()?;
diff --git a/lib/ain-evm/src/txqueue.rs b/lib/ain-evm/src/txqueue.rs
index bc729fef03..572c5a4e23 100644
--- a/lib/ain-evm/src/txqueue.rs
+++ b/lib/ain-evm/src/txqueue.rs
@@ -7,6 +7,7 @@ use ethereum::{Block, TransactionV2};
 use ethereum_types::{H160, U256};
 use rand::Rng;
 
+use crate::core::XHash;
 use crate::fee::calculate_gas_fee;
 use crate::receipt::Receipt;
 use crate::transaction::{system::SystemTx, SignedTx};
@@ -118,7 +119,7 @@ impl TransactionQueueMap {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: String,
+        hash: XHash,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {
@@ -218,7 +219,7 @@ pub enum QueueTx {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct QueueTxItem {
     pub tx: QueueTx,
-    pub tx_hash: String,
+    pub tx_hash: XHash,
     pub tx_fee: U256,
     pub gas_used: U256,
 }
@@ -276,7 +277,7 @@ impl TransactionQueue {
     pub fn queue_tx(
         &self,
         tx: QueueTx,
-        tx_hash: String,
+        tx_hash: XHash,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {

From 44dfb541e2cd4426426bbe20450293185a738a32 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 11:56:05 +0800
Subject: [PATCH 40/50] Add <0 checks

---
 src/masternodes/mn_checks.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 3092e5f1d7..a912f8d3f5 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4126,6 +4126,11 @@ Res ValidateTransferDomainEdge(const CTransaction &tx,
     if (src.amount.nTokenId != dst.amount.nTokenId)
         return DeFiErrors::TransferDomainDifferentTokens();
 
+    // We allow 0 here, just if we need to touch something
+    // on either sides or special case later.
+    if (src.amount.nValue < 0)
+        return DeFiErrors::TransferDomainInvalid();
+
     auto tokenId = src.amount.nTokenId;
 
     if (tokenId != DCT_ID{0}) {

From 3652402f069abf64ea9e282603cfc4a5181a8647 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 12:00:35 +0800
Subject: [PATCH 41/50] Add safety note

---
 src/masternodes/mn_checks.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index a912f8d3f5..f2fae8cca2 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -3911,6 +3911,8 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 CTxDestination dest;
                 ExtractDestination(dst.address, dest);
                 const auto toAddress = std::get<WitnessV16EthHash>(dest);
+
+                // Safety: Safe since validate checks for < 0 
                 const auto balanceIn = static_cast<uint64_t>(dst.amount.nValue);
                 auto tokenId = dst.amount.nTokenId;
                 CrossBoundaryResult result;
@@ -3935,6 +3937,8 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
                 CTxDestination dest;
                 ExtractDestination(src.address, dest);
                 const auto fromAddress = std::get<WitnessV16EthHash>(dest);
+
+                // Safety: Safe since validate checks for < 0 
                 const auto balanceIn = static_cast<uint64_t>(src.amount.nValue);
                 auto tokenId = dst.amount.nTokenId;
                 if (tokenId == DCT_ID{0}) {

From 2068ff10d611e414e4a65534931a69af2fc7e8a5 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 12:29:29 +0800
Subject: [PATCH 42/50] Reuse EvmAddressData

---
 src/key.h                   | 3 +++
 src/masternodes/mn_checks.h | 2 +-
 src/miner.cpp               | 6 +++---
 src/miner.h                 | 2 +-
 src/txmempool.cpp           | 2 +-
 src/txmempool.h             | 4 ++--
 src/validation.cpp          | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/key.h b/src/key.h
index ef8a662198..0857fa6639 100644
--- a/src/key.h
+++ b/src/key.h
@@ -15,6 +15,9 @@
 #include <stdexcept>
 #include <vector>
 
+// typedef std::array<uint8_t, 20> EvmAddressData;
+typedef std::string EvmAddressData;
+
 /**
  * secure_allocator is defined in allocators.h
  * CPrivKey is a serialized private key, with all parameters included
diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
index e5273bb15e..e88a824e95 100644
--- a/src/masternodes/mn_checks.h
+++ b/src/masternodes/mn_checks.h
@@ -26,7 +26,7 @@ struct EVM {
     std::string blockHash;
     uint64_t burntFee;
     uint64_t priorityFee;
-    std::string beneficiary;
+    EvmAddressData beneficiary;
 
     ADD_SERIALIZE_METHODS;
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 879c7edc9c..af76061515 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -41,7 +41,7 @@
 #include <utility>
 
 struct EvmAddressWithNonce {
-    std::string address;
+    EvmAddressData address;
     uint64_t nonce;
 
     bool operator<(const EvmAddressWithNonce& item) const
@@ -54,7 +54,7 @@ struct EvmPackageContext {
     // Used to track EVM TX fee by sender and nonce.
     std::map<EvmAddressWithNonce, uint64_t> feeMap;
     // Used to track EVM nonce and TXs by sender
-    std::map<std::string, std::map<uint64_t, CTxMemPool::txiter>> addressTxsMap;
+    std::map<EvmAddressData, std::map<uint64_t, CTxMemPool::txiter>> addressTxsMap;
     // Keep track of EVM entries that failed nonce check
     std::multimap<uint64_t, CTxMemPool::txiter> failedNonces;
     // Used for replacement Eth TXs when a TX in chain pays a higher fee
@@ -132,7 +132,7 @@ void BlockAssembler::resetBlock()
     nFees = 0;
 }
 
-std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime, const std::string& evmBeneficiary)
+std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime, const EvmAddressData& evmBeneficiary)
 {
     int64_t nTimeStart = GetTimeMicros();
 
diff --git a/src/miner.h b/src/miner.h
index c3467fb85c..ac550b48f7 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -178,7 +178,7 @@ class BlockAssembler
     BlockAssembler(const CChainParams& params, const Options& options);
 
     /** Construct a new block template with coinbase to scriptPubKeyIn */
-    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime = 0, const std::string& beneficiary = {});
+    std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn, int64_t blockTime = 0, const EvmAddressData& beneficiary = {});
 
     inline static std::optional<int64_t> m_last_block_num_txs{};
     inline static std::optional<int64_t> m_last_block_weight{};
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 7f9ec3a7de..82094808e5 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -353,7 +353,7 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
     nTransactionsUpdated += n;
 }
 
-void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate, const std::optional<std::string> ethSender)
+void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate, const std::optional<EvmAddressData> ethSender)
 {
     NotifyEntryAdded(entry.GetSharedTx());
     // Add to memory pool without checking anything.
diff --git a/src/txmempool.h b/src/txmempool.h
index d2dda5e6a3..5d07f7a291 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -520,7 +520,7 @@ class CTxMemPool
     mutable RecursiveMutex cs;
     indexed_transaction_set mapTx GUARDED_BY(cs);
 
-    std::map<std::string, std::set<uint256>> ethTxsBySender;
+    std::map<EvmAddressData, std::set<uint256>> ethTxsBySender;
 
     using txiter = indexed_transaction_set::nth_index<0>::type::const_iterator;
     std::vector<std::pair<uint256, txiter>> vTxHashes GUARDED_BY(cs); //!< All tx witness hashes/entries in mapTx, in random order
@@ -581,7 +581,7 @@ class CTxMemPool
     // and any other callers may break wallet's in-mempool tracking (due to
     // lack of CValidationInterface::TransactionAddedToMempool callbacks).
     void addUnchecked(const CTxMemPoolEntry& entry, bool validFeeEstimate = true) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
-    void addUnchecked(const CTxMemPoolEntry& entry, setEntries& setAncestors, bool validFeeEstimate = true, const std::optional<std::string> ethSender = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
+    void addUnchecked(const CTxMemPoolEntry& entry, setEntries& setAncestors, bool validFeeEstimate = true, const std::optional<EvmAddressData> ethSender = std::nullopt) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
 
     void removeRecursive(const CTransaction& tx, MemPoolRemovalReason reason) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void removeForReorg(const CCoinsViewCache* pcoins, unsigned int nMemPoolHeight, int flags) EXCLUSIVE_LOCKS_REQUIRED(cs, cs_main);
diff --git a/src/validation.cpp b/src/validation.cpp
index 072a7702b8..1b9f642ec8 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -912,7 +912,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
                     __func__, hash.ToString(), FormatStateMessage(state));
         }
 
-        std::string ethSender{};
+        std::optional<EvmAddressData> ethSender{};
 
         if (isEvmTx) {
             auto txMessage = customTypeToMessage(txType);

From dc9ff165119ef8ce122d380cd6fa51255236cb0d Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 18 Aug 2023 12:50:07 +0800
Subject: [PATCH 43/50] Fix rust alias for xhash

---
 lib/ain-evm/src/evm.rs        |  2 +-
 lib/ain-rs-exports/src/evm.rs | 14 +++++++-------
 src/masternodes/mn_checks.cpp |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
index d10600c2d6..c170c740df 100644
--- a/lib/ain-evm/src/evm.rs
+++ b/lib/ain-evm/src/evm.rs
@@ -41,7 +41,7 @@ pub struct EVMServices {
 
 pub struct FinalizedBlockInfo {
     pub block_hash: XHash,
-    pub failed_transactions: Vec<String>,
+    pub failed_transactions: Vec<XHash>,
     pub total_burnt_fees: U256,
     pub total_priority_fees: U256,
     pub block_number: U256,
diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index f9d4f28769..6128ca3834 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -2,7 +2,7 @@ use ain_evm::storage::traits::BlockStorage;
 use ain_evm::transaction::system::{DST20Data, DeployContractData, SystemTx};
 use ain_evm::txqueue::QueueTx;
 use ain_evm::{
-    core::ValidateTxInfo,
+    core::{XHash, ValidateTxInfo},
     evm::FinalizedBlockInfo,
     services::SERVICES,
     storage::traits::Rollback,
@@ -188,7 +188,7 @@ pub fn evm_unsafe_try_add_balance_in_q(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = String::from(native_hash);
+    let native_hash = XHash::from(native_hash);
 
     unsafe {
         match SERVICES
@@ -235,7 +235,7 @@ pub fn evm_unsafe_try_sub_balance_in_q(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = String::from(native_hash);
+    let native_hash = XHash::from(native_hash);
 
     unsafe {
         match SERVICES
@@ -552,7 +552,7 @@ pub fn evm_try_set_attribute(
 pub fn evm_try_get_block_hash_by_number(
     result: &mut ffi::CrossBoundaryResult,
     height: u64,
-) -> String {
+) -> XHash {
     match SERVICES
         .evm
         .storage
@@ -751,7 +751,7 @@ pub fn evm_try_get_tx_by_hash(
                 },
                 to: match tx.to() {
                     Some(to) => format!("{:?}", to),
-                    None => String::new(),
+                    None => XHash::new(),
                 },
                 value,
                 data: tx.data().to_vec(),
@@ -771,7 +771,7 @@ pub fn evm_try_create_dst20(
     symbol: &str,
     token_id: u64,
 ) {
-    let native_hash = String::from(native_hash);
+    let native_hash = XHash::from(native_hash);
     let address = match ain_contracts::dst20_address_from_token_id(token_id) {
         Ok(address) => address,
         Err(e) => cross_boundary_error_return(result, e.to_string()),
@@ -812,7 +812,7 @@ pub fn evm_try_bridge_dst20(
         Ok(wei_amount) => wei_amount,
         Err(e) => return cross_boundary_error_return(result, e.to_string()),
     };
-    let native_hash = String::from(native_hash);
+    let native_hash = XHash::from(native_hash);
     let contract = ain_contracts::dst20_address_from_token_id(token_id)
         .unwrap_or_else(|e| cross_boundary_error_return(result, e.to_string()));
 
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index f2fae8cca2..ae65635b44 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -4003,7 +4003,6 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor {
         }
 
         validateResults = evm_unsafe_try_validate_raw_tx_in_q(result, HexStr(obj.evmTx), evmQueueId);
-        // Completely remove this fork guard on mainnet upgrade to restore nonce check from EVM activation
         if (!result.ok) {
             LogPrintf("[evm_try_validate_raw_tx] failed, reason : %s\n", result.reason);
             return Res::Err("evm tx failed to validate %s", result.reason);

From ff25f49b70b8a56df450e391cf3a57770864b64c Mon Sep 17 00:00:00 2001
From: Niven <sieniven@gmail.com>
Date: Fri, 18 Aug 2023 12:52:30 +0800
Subject: [PATCH 44/50] Fix lint

---
 lib/ain-rs-exports/src/evm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ain-rs-exports/src/evm.rs b/lib/ain-rs-exports/src/evm.rs
index 6128ca3834..549e609b4a 100644
--- a/lib/ain-rs-exports/src/evm.rs
+++ b/lib/ain-rs-exports/src/evm.rs
@@ -2,7 +2,7 @@ use ain_evm::storage::traits::BlockStorage;
 use ain_evm::transaction::system::{DST20Data, DeployContractData, SystemTx};
 use ain_evm::txqueue::QueueTx;
 use ain_evm::{
-    core::{XHash, ValidateTxInfo},
+    core::{ValidateTxInfo, XHash},
     evm::FinalizedBlockInfo,
     services::SERVICES,
     storage::traits::Rollback,

From 1a9c2e24f03467a56a9e77eed51e0f9fb34da2a3 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 14:23:22 +0800
Subject: [PATCH 45/50] Add rust logs to testing, WIP key tests

---
 lib/ain-evm/src/ecrecover.rs                  | 45 +++++++++++++++++++
 test/functional/feature_evm_vmmap_rpc.py      | 25 ++---------
 .../test_framework/test_framework.py          |  3 ++
 3 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/lib/ain-evm/src/ecrecover.rs b/lib/ain-evm/src/ecrecover.rs
index 5f9b54013c..2624cddd4f 100644
--- a/lib/ain-evm/src/ecrecover.rs
+++ b/lib/ain-evm/src/ecrecover.rs
@@ -56,4 +56,49 @@ mod tests {
             "89790061e1efe88bda902193c8ab3b061aa4ef2c".parse().unwrap()
         );
     }
+
+    fn test_recover_test2() {
+        // Tx hex: f86c808504e3b29200825208946c34cbb9219d8caa428835d2073e8ec88ba0a110880de0b6b3a76400008025a037f41c543402c9b02b35b45ef43ac31a63dcbeba0c622249810ecdec00aee376a05eb2be77eb0c7a1875a53ba15fc6afe246fbffe869157edbde64270e41ba045e
+
+        // Decoded: 
+        // {
+        //     "nonce": 0,
+        //     "gasPrice": 21000000000,
+        //     "gasLimit": 21000,
+        //     "to": "0x6c34cbb9219d8caa428835d2073e8ec88ba0a110",
+        //     "value": 1000000000000000000,
+        //     "data": "",
+        //     "from": "0x9b8a4af42140d8a4c153a822f02571a1dd037e89",
+        //     "r": "37f41c543402c9b02b35b45ef43ac31a63dcbeba0c622249810ecdec00aee376",
+        //     "v": "25",
+        //     "s": "5eb2be77eb0c7a1875a53ba15fc6afe246fbffe869157edbde64270e41ba045e"
+        //  }
+
+        let from = "0x9b8a4af42140d8a4c153a822f02571a1dd037e89";
+        let r = "37f41c543402c9b02b35b45ef43ac31a63dcbeba0c622249810ecdec00aee376";
+        let s = "5eb2be77eb0c7a1875a53ba15fc6afe246fbffe869157edbde64270e41ba045e";
+        let hash = "";
+
+        // let recovery_id = 0;
+
+        // let pubkey = recover_public_key(&hash, &r, &s, recovery_id);
+        // assert!(pubkey.is_ok());
+        // let address = public_key_to_address(&pubkey.unwrap());
+        // assert_eq!(
+        //     address,
+        //     from
+        // );
+
+    }
+
+
+    fn test3() {
+        // https://etherscan.io/getRawTx?tx=0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d
+        // Hex: 
+        // 0xf901ed828c848503d77a05008301754a94d9f61a4a96f66afe09c6f55b72aeaf1590ac849580b9018439125215000000000000000000000000260f38dbc414a9d588ca2dedddb7588da25736a60000000000000000000000000000000000000000000000000205061e42dd640000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000005dd767960000000000000000000000000000000000000000000000000000000000000c4a000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004187e330045ecad46221a46b1be365a45d293988e2162b94ef939d837d49be6cbb0425cfcfa16bed80a8a8fdb0984c24d081781603473e9077db8ff92618c310bd1c000000000000000000000000000000000000000000000000000000000000001ca02fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057a069bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f
+
+        let txhash = "0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d";
+
+
+    }
 }
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index 8b5fb0845d..c87ae78b58 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -23,26 +23,7 @@ class VMMapTests(DefiTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.setup_clean_chain = True
-        self.extra_args = [
-            [
-                "-dummypos=0",
-                "-txnotokens=0",
-                "-amkheight=50",
-                "-bayfrontheight=51",
-                "-eunosheight=80",
-                "-fortcanningheight=82",
-                "-fortcanninghillheight=84",
-                "-fortcanningroadheight=86",
-                "-fortcanningcrunchheight=88",
-                "-fortcanningspringheight=90",
-                "-fortcanninggreatworldheight=94",
-                "-fortcanningepilogueheight=96",
-                "-grandcentralheight=101",
-                "-nextnetworkupgradeheight=105",
-                "-subsidytest=1",
-                "-txindex=1",
-            ],
-            [
+        extra_args = [
                 "-dummypos=0",
                 "-txnotokens=0",
                 "-amkheight=50",
@@ -59,8 +40,8 @@ def set_test_params(self):
                 "-nextnetworkupgradeheight=105",
                 "-subsidytest=1",
                 "-txindex=1",
-            ],
-        ]
+            ]
+        self.extra_args = [extra_args, extra_args]
 
     def setup(self):
         self.address = self.nodes[0].get_genesis_keys().ownerAuthAddress
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index de0230a2e1..682771513b 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -249,6 +249,8 @@ def main(self):
             [os.path.join(config["environment"]["BUILDDIR"], "src"), os.environ["PATH"]]
         )
 
+        os.environ["RUST_LOG"] = "debug"
+
         # Set up temp directory and start logging
         if self.options.tmpdir:
             self.options.tmpdir = os.path.abspath(self.options.tmpdir)
@@ -449,6 +451,7 @@ def _rollback_to(self, block, node):
         if current_height == block:
             return
         blockhash = node.getblockhash(block + 1)
+        node.clearmempool()
         node.invalidateblock(blockhash)
         node.clearmempool()
 

From 7dd8877e0889c753b7dd20e74d2862d8d8718c9b Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 14:44:31 +0800
Subject: [PATCH 46/50] Add test

---
 lib/ain-evm/src/ecrecover.rs | 45 ++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/lib/ain-evm/src/ecrecover.rs b/lib/ain-evm/src/ecrecover.rs
index 2624cddd4f..1e4197f41b 100644
--- a/lib/ain-evm/src/ecrecover.rs
+++ b/lib/ain-evm/src/ecrecover.rs
@@ -31,7 +31,7 @@ pub fn public_key_to_address(pubkey: &PublicKey) -> H160 {
 #[cfg(test)]
 mod tests {
     use hex_literal::hex;
-    use primitive_types::H256;
+    use primitive_types::*;
 
     use super::{public_key_to_address, recover_public_key};
 
@@ -57,6 +57,7 @@ mod tests {
         );
     }
 
+    #[test]
     fn test_recover_test2() {
         // Tx hex: f86c808504e3b29200825208946c34cbb9219d8caa428835d2073e8ec88ba0a110880de0b6b3a76400008025a037f41c543402c9b02b35b45ef43ac31a63dcbeba0c622249810ecdec00aee376a05eb2be77eb0c7a1875a53ba15fc6afe246fbffe869157edbde64270e41ba045e
 
@@ -92,13 +93,49 @@ mod tests {
     }
 
 
+    #[test]
     fn test3() {
-        // https://etherscan.io/getRawTx?tx=0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d
+        // Tx: https://etherscan.io/getRawTx?tx=0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d
+        // 
         // Hex: 
         // 0xf901ed828c848503d77a05008301754a94d9f61a4a96f66afe09c6f55b72aeaf1590ac849580b9018439125215000000000000000000000000260f38dbc414a9d588ca2dedddb7588da25736a60000000000000000000000000000000000000000000000000205061e42dd640000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000005dd767960000000000000000000000000000000000000000000000000000000000000c4a000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004187e330045ecad46221a46b1be365a45d293988e2162b94ef939d837d49be6cbb0425cfcfa16bed80a8a8fdb0984c24d081781603473e9077db8ff92618c310bd1c000000000000000000000000000000000000000000000000000000000000001ca02fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057a069bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f
 
-        let txhash = "0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d";
-
+        // Decoded with https://flightwallet.github.io/decode-eth-tx/
+        // {
+        //     "nonce": 35972,
+        //     "gasPrice": 16500000000,
+        //     "gasLimit": 95562,
+        //     "to": "0xd9f61a4a96f66afe09c6f55b72aeaf1590ac8495",
+        //     "value": 0,
+        //     "data": "39125215000000000000000000000000260f38dbc414a9d588ca2dedddb7588da25736a60000000000000000000000000000000000000000000000000205061e42dd640000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000005dd767960000000000000000000000000000000000000000000000000000000000000c4a000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004187e330045ecad46221a46b1be365a45d293988e2162b94ef939d837d49be6cbb0425cfcfa16bed80a8a8fdb0984c24d081781603473e9077db8ff92618c310bd1c00000000000000000000000000000000000000000000000000000000000000",
+        //     "from": "0x3f1e01f65cac6cdb60ef5f7fc8f988f042949a2c",
+        //     "r": "2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057",
+        //     "v": "1c",
+        //     "s": "69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"
+        //   }
+
+        // let to_str = "0xd9f61a4A96f66Afe09c6F55B72AeaF1590AC8495";
+        // let txhash_str = "0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d";
+        // let from_str = "0x3f1e01F65Cac6CDB60Ef5F7fC8F988f042949a2C";
+        // let s_str = "69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f";
+        // let r_str = "2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057";
+
+        // let h_vals = &[txhash_str, s_str, r_str].iter().map(|x| H256::).collect::<Vec<_>>();
+        // let [hash, r, s ] = h_vals[..];
+
+        let to = H160::from_slice(&hex!("d9f61a4A96f66Afe09c6F55B72AeaF1590AC8495"));
+        let hash = H256::from_slice(&hex!("89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d"));
+        let from = H160::from_slice(&hex!("3f1e01F65Cac6CDB60Ef5F7fC8F988f042949a2C"));
+        let s = H256::from_slice(&hex!("69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"));
+        let r = H256::from_slice(&hex!("2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057"));
 
+        let recovery_id = 0;
+        let pubkey = recover_public_key(&hash, &r, &s, recovery_id);
+        assert!(pubkey.is_ok());
+        let address = public_key_to_address(&pubkey.unwrap());
+        assert_eq!(
+            address,
+            from
+        );
     }
 }

From bd32492775c9fe4cb5c2975eb0a2476d0a0aed84 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 15:33:35 +0800
Subject: [PATCH 47/50] Cleanup

---
 lib/ain-evm/src/ecrecover.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ain-evm/src/ecrecover.rs b/lib/ain-evm/src/ecrecover.rs
index 1e4197f41b..439a0011be 100644
--- a/lib/ain-evm/src/ecrecover.rs
+++ b/lib/ain-evm/src/ecrecover.rs
@@ -94,7 +94,7 @@ mod tests {
 
 
     #[test]
-    fn test3() {
+    fn test_recover_test3() {
         // Tx: https://etherscan.io/getRawTx?tx=0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d
         // 
         // Hex: 
@@ -123,19 +123,19 @@ mod tests {
         // let h_vals = &[txhash_str, s_str, r_str].iter().map(|x| H256::).collect::<Vec<_>>();
         // let [hash, r, s ] = h_vals[..];
 
+        let from = H160::from_slice(&hex!("3f1e01F65Cac6CDB60Ef5F7fC8F988f042949a2C"));
         let to = H160::from_slice(&hex!("d9f61a4A96f66Afe09c6F55B72AeaF1590AC8495"));
+
         let hash = H256::from_slice(&hex!("89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d"));
-        let from = H160::from_slice(&hex!("3f1e01F65Cac6CDB60Ef5F7fC8F988f042949a2C"));
-        let s = H256::from_slice(&hex!("69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"));
         let r = H256::from_slice(&hex!("2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057"));
+        let s = H256::from_slice(&hex!("69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"));
 
         let recovery_id = 0;
         let pubkey = recover_public_key(&hash, &r, &s, recovery_id);
         assert!(pubkey.is_ok());
         let address = public_key_to_address(&pubkey.unwrap());
-        assert_eq!(
-            address,
-            from
-        );
+        println!("address: {:x}", address);
+        println!("from: {:x}", from);
+        assert_eq!(address,from);
     }
 }

From 74ad2e0f2331c6c1f9ffc90d2d52c637f575a43e Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 16:00:19 +0800
Subject: [PATCH 48/50] Test loop check

---
 lib/ain-evm/src/ecrecover.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/ain-evm/src/ecrecover.rs b/lib/ain-evm/src/ecrecover.rs
index 439a0011be..f8043a07a3 100644
--- a/lib/ain-evm/src/ecrecover.rs
+++ b/lib/ain-evm/src/ecrecover.rs
@@ -130,12 +130,21 @@ mod tests {
         let r = H256::from_slice(&hex!("2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057"));
         let s = H256::from_slice(&hex!("69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"));
 
-        let recovery_id = 0;
-        let pubkey = recover_public_key(&hash, &r, &s, recovery_id);
-        assert!(pubkey.is_ok());
-        let address = public_key_to_address(&pubkey.unwrap());
-        println!("address: {:x}", address);
-        println!("from: {:x}", from);
-        assert_eq!(address,from);
+        for x in 0..=255 {
+            let rx = x;
+            let pubkey = recover_public_key(&hash, &r, &s, rx);
+            if pubkey.is_ok() {
+                let address = public_key_to_address(&pubkey.unwrap());
+                println!("address: {:x}", address);
+                println!("from: {:x}", from);
+                if address == from {
+                    println!("found: {}", rx);
+                    break;
+                }
+            } else {
+                println!("{:?}", pubkey.err().unwrap());
+            }
+        }
+
     }
 }

From 3ef473c3fb6024a2a900819e8f192ad571b22e08 Mon Sep 17 00:00:00 2001
From: jouzo <jdesclercs@gmail.com>
Date: Fri, 18 Aug 2023 10:21:06 +0200
Subject: [PATCH 49/50] Revert ecrecover changes

---
 lib/ain-evm/src/transaction/mod.rs | 49 ++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/lib/ain-evm/src/transaction/mod.rs b/lib/ain-evm/src/transaction/mod.rs
index e522b7d391..74b8807501 100644
--- a/lib/ain-evm/src/transaction/mod.rs
+++ b/lib/ain-evm/src/transaction/mod.rs
@@ -4,6 +4,7 @@ use ethereum::{
     AccessList, EnvelopedDecoderError, LegacyTransaction, TransactionAction, TransactionSignature,
     TransactionV2,
 };
+use libsecp256k1::PublicKey;
 use primitive_types::{H160, H256, U256};
 use rlp::RlpStream;
 use sha3::Digest;
@@ -100,15 +101,26 @@ impl From<&LegacyTransaction> for LegacyUnsignedTransaction {
 pub struct SignedTx {
     pub transaction: TransactionV2,
     pub sender: H160,
+    pub pubkey: PublicKey,
 }
 
 impl TryFrom<TransactionV2> for SignedTx {
     type Error = TransactionError;
 
-    fn try_from(transaction: TransactionV2) -> Result<Self, Self::Error> {
-        let pubkey = match &transaction {
+    fn try_from(src: TransactionV2) -> Result<Self, Self::Error> {
+        let pubkey = match &src {
             TransactionV2::Legacy(tx) => {
-                let hash = tx.hash();
+                let msg = ethereum::LegacyTransactionMessage {
+                    nonce: tx.nonce,
+                    gas_price: tx.gas_price,
+                    gas_limit: tx.gas_limit,
+                    action: tx.action,
+                    value: tx.value,
+                    input: tx.input.clone(),
+                    chain_id: tx.signature.chain_id(),
+                };
+                let signing_message = libsecp256k1::Message::parse_slice(&msg.hash()[..])?;
+                let hash = H256::from(signing_message.serialize());
                 recover_public_key(
                     &hash,
                     tx.signature.r(),
@@ -117,17 +129,41 @@ impl TryFrom<TransactionV2> for SignedTx {
                 )
             }
             TransactionV2::EIP2930(tx) => {
-                let hash = tx.hash();
+                let msg = ethereum::EIP2930TransactionMessage {
+                    chain_id: tx.chain_id,
+                    nonce: tx.nonce,
+                    gas_price: tx.gas_price,
+                    gas_limit: tx.gas_limit,
+                    action: tx.action,
+                    value: tx.value,
+                    input: tx.input.clone(),
+                    access_list: tx.access_list.clone(),
+                };
+                let signing_message = libsecp256k1::Message::parse_slice(&msg.hash()[..])?;
+                let hash = H256::from(signing_message.serialize());
                 recover_public_key(&hash, &tx.r, &tx.s, u8::from(tx.odd_y_parity))
             }
             TransactionV2::EIP1559(tx) => {
-                let hash = tx.hash();
+                let msg = ethereum::EIP1559TransactionMessage {
+                    chain_id: tx.chain_id,
+                    nonce: tx.nonce,
+                    max_priority_fee_per_gas: tx.max_priority_fee_per_gas,
+                    max_fee_per_gas: tx.max_fee_per_gas,
+                    gas_limit: tx.gas_limit,
+                    action: tx.action,
+                    value: tx.value,
+                    input: tx.input.clone(),
+                    access_list: tx.access_list.clone(),
+                };
+                let signing_message = libsecp256k1::Message::parse_slice(&msg.hash()[..])?;
+                let hash = H256::from(signing_message.serialize());
                 recover_public_key(&hash, &tx.r, &tx.s, u8::from(tx.odd_y_parity))
             }
         }?;
         Ok(SignedTx {
-            transaction,
+            transaction: src,
             sender: public_key_to_address(&pubkey),
+            pubkey,
         })
     }
 }
@@ -323,6 +359,7 @@ mod tests {
         // Legacy
         let signed_tx = crate::transaction::SignedTx::try_from("f86b8085689451eee18252089434c1ca09a2dc717d89baef2f30ff6a6b2975e17e872386f26fc10000802da0ae5c76f8073460cbc7a911d3cc1b367072db64848a9532343559ce6917c51a46a01d2e4928450c59acca3de8340eb15b7446b37936265a51ab35e63f749a048002").unwrap();
 
+        assert_eq!(hex::encode(signed_tx.pubkey.serialize()), "044c6412f7cd3ac0e2538c3c9843d27d1e03b422eaf655c6a699da22b57a89802989318dbaeea62f5fc751fa8cd1404e687d67b8ab8513fe0d37bafbf407aa6cf7");
         assert_eq!(
             hex::encode(signed_tx.sender.as_fixed_bytes()),
             "f829754bae400b679febefdcfc9944c323e1f94e"

From d6fa4ed243d14d7ccc9f85473433dc2c56657761 Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Fri, 18 Aug 2023 16:29:25 +0800
Subject: [PATCH 50/50] Cleanup

---
 lib/ain-evm/src/ecrecover.rs             | 27 ++++++++++---------
 test/functional/feature_evm_vmmap_rpc.py | 34 ++++++++++++------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/lib/ain-evm/src/ecrecover.rs b/lib/ain-evm/src/ecrecover.rs
index f8043a07a3..4e18be207d 100644
--- a/lib/ain-evm/src/ecrecover.rs
+++ b/lib/ain-evm/src/ecrecover.rs
@@ -61,7 +61,7 @@ mod tests {
     fn test_recover_test2() {
         // Tx hex: f86c808504e3b29200825208946c34cbb9219d8caa428835d2073e8ec88ba0a110880de0b6b3a76400008025a037f41c543402c9b02b35b45ef43ac31a63dcbeba0c622249810ecdec00aee376a05eb2be77eb0c7a1875a53ba15fc6afe246fbffe869157edbde64270e41ba045e
 
-        // Decoded: 
+        // Decoded:
         // {
         //     "nonce": 0,
         //     "gasPrice": 21000000000,
@@ -89,15 +89,13 @@ mod tests {
         //     address,
         //     from
         // );
-
     }
 
-
     #[test]
     fn test_recover_test3() {
         // Tx: https://etherscan.io/getRawTx?tx=0x89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d
-        // 
-        // Hex: 
+        //
+        // Hex:
         // 0xf901ed828c848503d77a05008301754a94d9f61a4a96f66afe09c6f55b72aeaf1590ac849580b9018439125215000000000000000000000000260f38dbc414a9d588ca2dedddb7588da25736a60000000000000000000000000000000000000000000000000205061e42dd640000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000005dd767960000000000000000000000000000000000000000000000000000000000000c4a000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004187e330045ecad46221a46b1be365a45d293988e2162b94ef939d837d49be6cbb0425cfcfa16bed80a8a8fdb0984c24d081781603473e9077db8ff92618c310bd1c000000000000000000000000000000000000000000000000000000000000001ca02fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057a069bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f
 
         // Decoded with https://flightwallet.github.io/decode-eth-tx/
@@ -126,15 +124,21 @@ mod tests {
         let from = H160::from_slice(&hex!("3f1e01F65Cac6CDB60Ef5F7fC8F988f042949a2C"));
         let to = H160::from_slice(&hex!("d9f61a4A96f66Afe09c6F55B72AeaF1590AC8495"));
 
-        let hash = H256::from_slice(&hex!("89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d"));
-        let r = H256::from_slice(&hex!("2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057"));
-        let s = H256::from_slice(&hex!("69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"));
+        let hash = H256::from_slice(&hex!(
+            "89221691a67b15427c97f1fd0cd65966ff617728cd897be27d88a04ee0bc1e2d"
+        ));
+        let r = H256::from_slice(&hex!(
+            "2fa2191f585d3f704d073dd19fd2dddc745612dacdd60fc27d4df53d2717a057"
+        ));
+        let s = H256::from_slice(&hex!(
+            "69bb520bc99dfa007ce23ba52b4eed758d53eb7cc4c66bf7e045c2c13e62675f"
+        ));
 
-        for x in 0..=255 {
+        for x in 0..=4 {
             let rx = x;
             let pubkey = recover_public_key(&hash, &r, &s, rx);
-            if pubkey.is_ok() {
-                let address = public_key_to_address(&pubkey.unwrap());
+            if let Ok(pubkey) = pubkey {
+                let address = public_key_to_address(&pubkey);
                 println!("address: {:x}", address);
                 println!("from: {:x}", from);
                 if address == from {
@@ -145,6 +149,5 @@ mod tests {
                 println!("{:?}", pubkey.err().unwrap());
             }
         }
-
     }
 }
diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
index c87ae78b58..f8dfbd4384 100755
--- a/test/functional/feature_evm_vmmap_rpc.py
+++ b/test/functional/feature_evm_vmmap_rpc.py
@@ -24,23 +24,23 @@ def set_test_params(self):
         self.num_nodes = 2
         self.setup_clean_chain = True
         extra_args = [
-                "-dummypos=0",
-                "-txnotokens=0",
-                "-amkheight=50",
-                "-bayfrontheight=51",
-                "-eunosheight=80",
-                "-fortcanningheight=82",
-                "-fortcanninghillheight=84",
-                "-fortcanningroadheight=86",
-                "-fortcanningcrunchheight=88",
-                "-fortcanningspringheight=90",
-                "-fortcanninggreatworldheight=94",
-                "-fortcanningepilogueheight=96",
-                "-grandcentralheight=101",
-                "-nextnetworkupgradeheight=105",
-                "-subsidytest=1",
-                "-txindex=1",
-            ]
+            "-dummypos=0",
+            "-txnotokens=0",
+            "-amkheight=50",
+            "-bayfrontheight=51",
+            "-eunosheight=80",
+            "-fortcanningheight=82",
+            "-fortcanninghillheight=84",
+            "-fortcanningroadheight=86",
+            "-fortcanningcrunchheight=88",
+            "-fortcanningspringheight=90",
+            "-fortcanninggreatworldheight=94",
+            "-fortcanningepilogueheight=96",
+            "-grandcentralheight=101",
+            "-nextnetworkupgradeheight=105",
+            "-subsidytest=1",
+            "-txindex=1",
+        ]
         self.extra_args = [extra_args, extra_args]
 
     def setup(self):