From 967b893c9d62adba43c44534a6606446d61424ed Mon Sep 17 00:00:00 2001 From: Matias Romeo Date: Tue, 14 Nov 2023 00:00:16 -0300 Subject: [PATCH 1/4] Update silkworm PR #88 (extra parameter eth_estimateGas) --- external/silkworm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/silkworm b/external/silkworm index 94676b1..a8ca582 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit 94676b198889f98c3e4a7bdc089c8c22d5cf97b5 +Subproject commit a8ca582f464ac76c43cd4f573b124a5b6d9f062d From 2811c9d86434436e4c235d5b28c17cb413b916f2 Mon Sep 17 00:00:00 2001 From: yarkin Date: Thu, 16 Nov 2023 11:54:15 +0800 Subject: [PATCH 2/4] Allow rpc-quirk-flag argument and update submodule. --- external/silkworm | 2 +- src/rpc_plugin.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/external/silkworm b/external/silkworm index a8ca582..8a04b5d 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit a8ca582f464ac76c43cd4f573b124a5b6d9f062d +Subproject commit 8a04b5d37b3a93b26587c897c94f62359b4e109c diff --git a/src/rpc_plugin.cpp b/src/rpc_plugin.cpp index 669b0e9..03bc2c1 100644 --- a/src/rpc_plugin.cpp +++ b/src/rpc_plugin.cpp @@ -42,6 +42,8 @@ void rpc_plugin::set_program_options( appbase::options_description& cli, appbase "comma separated api spec, possible values: debug,engine,eth,net,parity,erigon,txpool,trace,web3") ("chain-id", boost::program_options::value()->default_value(silkworm::kEOSEVMLocalTestnetConfig.chain_id), "override chain-id") + ("rpc-quirk-flag", boost::program_options::value()->default_value(0), + "rpc quirk flag") ; } @@ -76,6 +78,7 @@ void rpc_plugin::plugin_initialize( const appbase::variables_map& options ) try const auto& engine_port = options.at("rpc-engine-port").as(); const auto threads = options.at("rpc-threads").as(); const auto max_readers = options.at("rpc-max-readers").as(); + const auto rpc_quirk_flag = options.at("rpc-quirk-flag").as(); // TODO when we resolve issues with silkrpc compiling in eos-evm-node then remove // the `eos-evm-node` options and use silk_engine for the address and configuration @@ -125,7 +128,8 @@ void rpc_plugin::plugin_initialize( const appbase::variables_map& options ) try .eth_api_spec = options.at("api-spec").as(), .private_api_addr = node_port, .num_workers = threads, - .skip_protocol_check = true + .skip_protocol_check = true, + .rpc_quirk_flag = rpc_quirk_flag }; my.reset(new rpc_plugin_impl(settings)); From 22cbbbca8ea79746a11bcf4c0336b27222debe8c Mon Sep 17 00:00:00 2001 From: yarkin Date: Thu, 16 Nov 2023 21:52:31 +0800 Subject: [PATCH 3/4] Update submodule. --- external/silkworm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/silkworm b/external/silkworm index 8a04b5d..440e20a 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit 8a04b5d37b3a93b26587c897c94f62359b4e109c +Subproject commit 440e20a035e11eb74f6d6a5a79fd3ddc848749ff From 8496b9e73647ca94783c3e376c786cd20eab3f36 Mon Sep 17 00:00:00 2001 From: yarkin Date: Fri, 17 Nov 2023 08:53:29 +0800 Subject: [PATCH 4/4] Update silkworm --- external/silkworm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/silkworm b/external/silkworm index 6f440d5..4386ac2 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit 6f440d5006f29f9008512801acc4d73113c5327b +Subproject commit 4386ac20181f8f3b8641166cdf1cac9f884bfe10