From 847f8ece9a068bb612c037a2139f83f2ca17a834 Mon Sep 17 00:00:00 2001
From: Matias Romeo <matias.romeo@gmail.com>
Date: Wed, 21 Aug 2024 01:19:37 -0300
Subject: [PATCH] Fix eth_call when evm_version>0

---
 external/silkworm            |  2 +-
 tests/nodeos_eos_evm_test.py | 47 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/external/silkworm b/external/silkworm
index 32a86f2..db4ab66 160000
--- a/external/silkworm
+++ b/external/silkworm
@@ -1 +1 @@
-Subproject commit 32a86f24cc0aac708f6553268f7e1cd6ce7c01bc
+Subproject commit db4ab663f18f86a2181f700ce6aa9548079d484f
diff --git a/tests/nodeos_eos_evm_test.py b/tests/nodeos_eos_evm_test.py
index 2f6736a..f781d5b 100755
--- a/tests/nodeos_eos_evm_test.py
+++ b/tests/nodeos_eos_evm_test.py
@@ -1052,6 +1052,53 @@ def get_block(num):
     b = get_block("latest")
     assert(b["baseFeePerGas"] == "0xd18c2e2800")
 
+    ####### Test eth_call for simple contract
+
+    # // SPDX-License-Identifier: GPL-3.0
+    # pragma solidity >=0.7.6;
+
+    # contract TimeShow {
+    #     function getTimestamp() public view  returns (uint) {
+    #         return block.timestamp;
+    #     } 
+    # }
+    Print("Test eth_call")
+    special_nonce += 1
+    signed_trx = w3.eth.account.sign_transaction(dict(
+        nonce=special_nonce,
+        gas=2000000,
+        maxFeePerGas = 900000000000,
+        maxPriorityFeePerGas = 900000000000,
+        data=Web3.to_bytes(hexstr='6080604052348015600e575f80fd5b5060ae80601a5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c8063188ec35614602a575b5f80fd5b60306044565b604051603b91906061565b60405180910390f35b5f42905090565b5f819050919050565b605b81604b565b82525050565b5f60208201905060725f8301846054565b9291505056fea2646970667358221220bf024720b7909e9eff500e9bccd1672f220872e152d393c961d4998e57a4944a64736f6c634300081a0033'),
+        chainId=15555
+    ), accSpecialKey)
+
+    # Deploy "Blocktime" contract
+    blocktime_contract = makeContractAddress(accSpecialAdd, special_nonce)
+    actData = {"miner":minerAcc.name, "rlptx":Web3.to_hex(get_raw_transaction(signed_trx))[2:]}
+    trans = prodNode.pushMessage(evmAcc.name, "pushtx", json.dumps(actData), '-p {0}'.format(minerAcc.name), silentErrors=True)
+    prodNode.waitForTransBlockIfNeeded(trans[1], True);
+    time.sleep(2)
+
+    b = get_block("latest")
+
+    call_msg = {
+        "method": "eth_call",
+        "params": [{
+            "from": accSpecialAdd,
+            "to": blocktime_contract,
+            "data": "0x188ec356", #getTimestamp()
+            "value": "0x0"
+        }, b['number']],
+        "jsonrpc": "2.0",
+        "id": 1,
+    }
+
+    result = processUrllibRequest("http://localhost:8881", payload=call_msg)
+    Utils.Print("Comparing: %s vs %s" % (b['timestamp'], result['payload']['result']))
+    assert(int(b["timestamp"],16) == int(result['payload']['result'],16))
+    ####### END Test eth_call for simple contract
+
     Utils.Print("Validate all balances (check evmtx event processing)")
     # Validate all balances (check evmtx event)
     validate_all_balances()