Skip to content

Commit f309d3c

Browse files
authoredApr 15, 2024··
rpcdaemon: yParity field not conditioned to Erigon compatibility flag (#1965)
Update rpc-tests v0.11.0 in RPC integration workflow
1 parent 0d71288 commit f309d3c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed
 

‎.github/workflows/rpc-integration-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Checkout RPC Tests Repository & Install Requirements
2828
run: |
2929
rm -rf ${{runner.workspace}}/rpc-tests
30-
git -c advice.detachedHead=false clone --depth 1 --branch v0.10.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
30+
git -c advice.detachedHead=false clone --depth 1 --branch v0.11.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
3131
cd ${{runner.workspace}}/rpc-tests
3232
pip3 install -r requirements.txt
3333

‎silkworm/rpc/json/transaction.cpp

+2-9
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ void to_json(nlohmann::json& json, const Transaction& transaction) {
4747
json["chainId"] = rpc::to_quantity(*transaction.chain_id);
4848
json["v"] = rpc::to_quantity(uint64_t(transaction.odd_y_parity));
4949
json["accessList"] = transaction.access_list; // EIP2930
50-
// Erigon currently at 2.48.1 does not yet support yParity field
51-
if (!rpc::compatibility::is_erigon_json_api_compatibility_required()) {
52-
json["yParity"] = rpc::to_quantity(transaction.odd_y_parity);
53-
}
50+
json["yParity"] = rpc::to_quantity(transaction.odd_y_parity);
5451
} else if (transaction.chain_id) {
5552
json["chainId"] = rpc::to_quantity(*transaction.chain_id);
5653
json["v"] = rpc::to_quantity(silkworm::endian::to_big_compact(transaction.v()));
@@ -100,11 +97,7 @@ void make_glaze_json_transaction(const silkworm::Transaction& tx, GlazeJsonTrans
10097
glaze_access_list.push_back(std::move(access_list_json_tx));
10198
}
10299
json_tx.access_list = std::make_optional(std::move(glaze_access_list));
103-
104-
// Erigon currently at 2.48.1 does not yet support yParity field
105-
if (!rpc::compatibility::is_erigon_json_api_compatibility_required()) {
106-
json_tx.yparity = std::make_optional(rpc::to_quantity(tx.odd_y_parity));
107-
}
100+
json_tx.yparity = std::make_optional(rpc::to_quantity(tx.odd_y_parity));
108101
} else if (tx.chain_id) {
109102
json_tx.chain_id = std::make_optional(to_quantity(*tx.chain_id));
110103
to_quantity(std::span(json_tx.v), silkworm::endian::to_big_compact(tx.v()));

0 commit comments

Comments
 (0)
Please sign in to comment.