From 95d85d523bb735bcd3e21e63d47c38a9782814ba Mon Sep 17 00:00:00 2001 From: Dima Litvinov Date: Fri, 8 Nov 2024 15:24:20 +0200 Subject: [PATCH 1/4] Update json-rpc-interface.md --- docs/json-rpc-interface.md | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/docs/json-rpc-interface.md b/docs/json-rpc-interface.md index c05827aa2..94d4e5db5 100644 --- a/docs/json-rpc-interface.md +++ b/docs/json-rpc-interface.md @@ -502,8 +502,6 @@ Get details about block 2. Include transactions: boolean literal - true/false #### Return format Same as `eth_getBlockByHash` -#### Exceptions -Raises "block not found" error if block is "rotated out" ### `eth_getTransactionByHash` | Compatibility | | @@ -746,6 +744,8 @@ Get all events matching a filter Same as `eth_getFilterChanges` #### Exceptions Throws `INVALID_PARAMS` if filter cannot be found or if response size is exceeded +#### Notes +Response size limit is determined by `getLogsBlocksLimit` config parameter, and currenly is 2000 logs per request. ### `eth_getLogs` | Compatibility | | @@ -771,6 +771,8 @@ Same as `eth_getFilterLogs`, but doesn't require filter creation Same as `eth_getFilterChanges` #### Exceptions Throws `INVALID_PARAMS` if block does not exist, if response size is exceeded, or `fromBlock` or `toBlock` are present together with `blockHash` +#### Notes +Response size limit is determined by `getLogsBlocksLimit` config parameter, and currenly is 2000 logs per request. ### `eth_compile*` and `eth_getCompilers` Not supported @@ -869,35 +871,6 @@ Object: - "accessList" - empty list; - "gasUsed" - "0x" prefixed hex `String` - result of `eth_estimateGas`. -### `eth_getBlockTransactionCountByHash` -| Compatibility | | -|-----|-----------| -| Core vs ETH | Unknown | -| Historic vs ETH | Unknown | - -#### Description -Get number of transactions in a block -#### Parameters -1. Block hash: "0x"-prefixed hex `String`, 32 bytes -#### Return format -"0x"-prefixed hex `String` - -### `eth_getBlockTransactionCountByNumber` -| Compatibility | | -|-----|-----------| -| Core vs ETH | Unknown | -| Historic vs ETH | Unknown | - -#### Description -Get number of transactions in a block -#### Parameters -1. Block number: - - "latest" or "pending" - latest block is used; - - "earliest" - block 0; - - `String` representation of an integer block number, either decimal or "0x"-prefixed hexadecimal; -#### Return format -"0x"-prefixed hex `String` - ### `eth_getFilterChangesEx` | Compatibility | | |-----|-----------| From bc2fda4d040c98f2a751e6e490b08c9c70fcb551 Mon Sep 17 00:00:00 2001 From: Dima Litvinov Date: Fri, 8 Nov 2024 19:06:00 +0200 Subject: [PATCH 2/4] Update json-rpc-interface.md --- docs/json-rpc-interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json-rpc-interface.md b/docs/json-rpc-interface.md index 94d4e5db5..e11884cb9 100644 --- a/docs/json-rpc-interface.md +++ b/docs/json-rpc-interface.md @@ -745,7 +745,7 @@ Same as `eth_getFilterChanges` #### Exceptions Throws `INVALID_PARAMS` if filter cannot be found or if response size is exceeded #### Notes -Response size limit is determined by `getLogsBlocksLimit` config parameter, and currenly is 2000 logs per request. +Response size is limited by number of consecutive blocks that can be requested. It is set in `getLogsBlocksLimit` config parameter, which currenly is 2000 blocks. ### `eth_getLogs` | Compatibility | | From e44a1b7cf016f281d66b9e5b8b84d23c9c5baa37 Mon Sep 17 00:00:00 2001 From: DmytroNazarenko Date: Fri, 22 Nov 2024 12:45:19 +0000 Subject: [PATCH 3/4] Revert "Merge pull request #1948 from skalenetwork/bug/IS-552-zmq-assert" This reverts commit 39b6d8edd30c7011a427275c093e182c1f0c204d, reversing changes made to a21e9ad2e4ec00d5fe27a55ba63f32a639fdf80c. --- libskale/broadcaster.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libskale/broadcaster.cpp b/libskale/broadcaster.cpp index ee625536d..20d15b232 100644 --- a/libskale/broadcaster.cpp +++ b/libskale/broadcaster.cpp @@ -90,9 +90,17 @@ void* ZmqBroadcaster::server_socket() const { if ( !m_zmq_server_socket ) { m_zmq_server_socket = zmq_socket( m_zmq_context, ZMQ_PUB ); - int val = 16; + int val = 15000; + zmq_setsockopt( m_zmq_server_socket, ZMQ_HEARTBEAT_IVL, &val, sizeof( val ) ); + val = 3000; + zmq_setsockopt( m_zmq_server_socket, ZMQ_HEARTBEAT_TIMEOUT, &val, sizeof( val ) ); + val = 60000; + zmq_setsockopt( m_zmq_server_socket, ZMQ_HEARTBEAT_TTL, &val, sizeof( val ) ); + + val = 16; zmq_setsockopt( m_zmq_server_socket, ZMQ_SNDHWM, &val, sizeof( val ) ); + const dev::eth::ChainParams& ch = m_client.chainParams(); // connect server to clients @@ -116,11 +124,11 @@ void* ZmqBroadcaster::client_socket() const { int value = 1; zmq_setsockopt( m_zmq_client_socket, ZMQ_TCP_KEEPALIVE, &value, sizeof( value ) ); - value = 15; + value = 300; zmq_setsockopt( m_zmq_client_socket, ZMQ_TCP_KEEPALIVE_IDLE, &value, sizeof( value ) ); value = 10; zmq_setsockopt( m_zmq_client_socket, ZMQ_TCP_KEEPALIVE_CNT, &value, sizeof( value ) ); - value = 15; + value = 300; zmq_setsockopt( m_zmq_client_socket, ZMQ_TCP_KEEPALIVE_INTVL, &value, sizeof( value ) ); value = 16; From 9619a91748a61d0091d74467c6d80f3a00982556 Mon Sep 17 00:00:00 2001 From: Dmytro Nazarenko Date: Wed, 27 Nov 2024 20:31:29 +0000 Subject: [PATCH 4/4] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index eb9b76c9f..076e9c774 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.20.0 +3.20.1