Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
fb263ce
jsonrpsee v0.20.3
niklasad1 Aug 30, 2023
989ad97
RpcHandlers: fix panic in tokio::mpsc
niklasad1 Oct 30, 2023
310227c
fix host filtering
niklasad1 Oct 30, 2023
635e6f9
Update substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
niklasad1 Oct 31, 2023
97335eb
fix nits
niklasad1 Oct 31, 2023
49dcc5f
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.20
niklasad1 Oct 31, 2023
875319c
Update substrate/client/rpc-spec-v2/src/chain_head/chain_head.rs
niklasad1 Nov 1, 2023
98da3fc
cargo fmt
niklasad1 Nov 1, 2023
4be7c05
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-v0.20
niklasad1 Nov 1, 2023
780cd6e
rpc rate limit PoC
niklasad1 Nov 2, 2023
395848c
add metrics support
niklasad1 Nov 3, 2023
eaaf70a
more work
niklasad1 Nov 6, 2023
f83d26a
cleanup
niklasad1 Nov 7, 2023
c520780
fix warnings
niklasad1 Nov 7, 2023
2f52aad
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Nov 8, 2023
9fb1404
fix bad merge
niklasad1 Nov 8, 2023
6a128be
patch jsonrpsee_core as well
niklasad1 Nov 8, 2023
1730922
option layer for metrics
niklasad1 Nov 9, 2023
0f1c200
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Nov 9, 2023
234f515
add CLI param --rpc-rate-limit
niklasad1 Nov 10, 2023
cb2e6bb
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Nov 10, 2023
d66415f
fix nits
niklasad1 Nov 10, 2023
4fb4e78
fix test build
niklasad1 Nov 10, 2023
242a4cb
update jsonrpsee
niklasad1 Nov 13, 2023
d2895ba
update jsonrpsee again
niklasad1 Dec 5, 2023
79d7b6f
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Dec 6, 2023
423018c
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Dec 6, 2023
615e72a
update jsonrpsee again
niklasad1 Dec 8, 2023
46f7e23
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Dec 8, 2023
ace52dc
fix nits
niklasad1 Dec 8, 2023
bd78593
fix more merge nits
niklasad1 Dec 8, 2023
c128075
fix cumulus
niklasad1 Dec 8, 2023
271307a
fix more nits
niklasad1 Dec 9, 2023
284da03
Merge branch 'master' into na-jsonrpsee-middleware-poc
niklasad1 Dec 11, 2023
15439db
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-middle…
niklasad1 Jan 24, 2024
3f7e94b
jsonrpsee v0.22
niklasad1 Feb 6, 2024
250f109
fix race in chainhead
niklasad1 Feb 6, 2024
8bc7fd7
fix some nits
niklasad1 Feb 6, 2024
b0769b7
fix bad Cargo.toml fmt
niklasad1 Feb 6, 2024
3d16db8
make test compile
niklasad1 Feb 6, 2024
a7032d9
fix tests
niklasad1 Feb 7, 2024
be5052a
jsonrpsee v0.22
niklasad1 Feb 7, 2024
6326b34
fix more nits
niklasad1 Feb 7, 2024
dc856ac
Merge remote-tracking branch 'origin/master' into na-bump-jsonrpsee-v…
niklasad1 Feb 7, 2024
6d088e1
Update cumulus/client/relay-chain-interface/Cargo.toml
niklasad1 Feb 7, 2024
b77a992
update Cargo.lock
niklasad1 Feb 7, 2024
4802cc4
fix rustdocs
niklasad1 Feb 7, 2024
485393f
remove needless box
niklasad1 Feb 8, 2024
bdc42f6
address grumbles
niklasad1 Feb 8, 2024
8bf3636
Update substrate/client/rpc-servers/src/lib.rs
niklasad1 Feb 8, 2024
3a78c54
clarify breaking ws pings
niklasad1 Feb 8, 2024
118480d
fix nits
niklasad1 Feb 8, 2024
104dc2d
Merge remote-tracking branch 'origin/master' into na-bump-jsonrpsee-v…
niklasad1 Feb 9, 2024
e310c9d
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-rate-l…
niklasad1 Feb 12, 2024
9407c78
Merge remote-tracking branch 'origin/na-bump-jsonrpsee-v0.22' into na…
niklasad1 Feb 12, 2024
0f77b36
move to governor crate for rate-limiting
niklasad1 Feb 12, 2024
776be60
add API to inject custom middleware
niklasad1 Feb 13, 2024
0380d9a
Merge branch 'master' into na-jsonrpsee-rate-limit-middleware
niklasad1 Feb 14, 2024
7958229
rewrite me
niklasad1 Feb 14, 2024
4d92963
cleanup
niklasad1 Feb 14, 2024
3a9231d
cargo fmt
niklasad1 Feb 14, 2024
9f60cd5
fix prdoc
niklasad1 Feb 14, 2024
d1daf61
fix build again
niklasad1 Feb 14, 2024
6085873
Merge remote-tracking branch 'origin/master' into na-jsonrpsee-rate-l…
niklasad1 Feb 15, 2024
d2c6154
Update substrate/client/rpc-servers/src/middleware/mod.rs
niklasad1 Feb 15, 2024
7804d43
Update Cargo.toml
niklasad1 Feb 15, 2024
ca2d1f9
fix nits
niklasad1 Feb 15, 2024
e1c293e
more nits
niklasad1 Feb 15, 2024
2fccb5c
Update substrate/client/service/src/config.rs
niklasad1 Feb 15, 2024
de24325
Update prdoc/pr_3301.prdoc
niklasad1 Feb 15, 2024
7b5c885
cli: change to NonZeroU32
niklasad1 Feb 15, 2024
0fdc928
Merge remote-tracking branch 'origin/na-jsonrpsee-rate-limit-middlewa…
niklasad1 Feb 15, 2024
94a7ac9
cargo fmt
niklasad1 Feb 15, 2024
c2f0b6d
Update substrate/client/rpc-servers/src/middleware/rate_limit.rs
niklasad1 Feb 15, 2024
16273a4
address grumbles
niklasad1 Feb 15, 2024
d4841fd
Merge remote-tracking branch 'origin/na-jsonrpsee-rate-limit-middlewa…
niklasad1 Feb 15, 2024
970d5a4
address grumbles
niklasad1 Feb 15, 2024
c1c195a
grumbles: register metrics middleware first
niklasad1 Feb 15, 2024
4bc1b94
cargo fmt
niklasad1 Feb 15, 2024
2451e27
Merge branch 'master' into na-jsonrpsee-rate-limit-middleware
niklasad1 Feb 16, 2024
7fc7e11
Update substrate/client/cli/src/commands/run_cmd.rs
niklasad1 Feb 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rewrite me
  • Loading branch information
niklasad1 committed Feb 14, 2024
commit 7958229cd6bba5b98b1ca571eddeecfb15321e90
11 changes: 11 additions & 0 deletions prdoc/pr_3301.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json

title: ...

doc:
- audience: Node Dev
description: |
...

crates: [ ]
20 changes: 20 additions & 0 deletions substrate/client/rpc-servers/src/middleware/rate_limit.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
// This file is part of Substrate.

// Copyright (C) Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0

// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.

//! RPC rate limiting middleware.

use futures::future::{BoxFuture, FutureExt};
use governor::{
clock::DefaultClock,
Expand Down
4 changes: 2 additions & 2 deletions substrate/client/rpc-spec-v2/src/chain_head/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@ async fn unpin_duplicate_hashes() {
.await
.unwrap_err();
assert_matches!(err,
Error::Call(err) if err.code() == super::error::rpc_spec_v2::INVALID_DUPLICATE_HASHES && err.message() == "Received duplicate hashes for the `chainHead_unpin` method"
Error::JsonRpc(err) if err.code() == super::error::rpc_spec_v2::INVALID_DUPLICATE_HASHES && err.message() == "Received duplicate hashes for the `chainHead_unpin` method"
);

// Block tree:
Expand Down Expand Up @@ -1708,7 +1708,7 @@ async fn unpin_duplicate_hashes() {
.await
.unwrap_err();
assert_matches!(err,
Error::Call(err) if err.code() == super::error::rpc_spec_v2::INVALID_DUPLICATE_HASHES && err.message() == "Received duplicate hashes for the `chainHead_unpin` method"
Error::JsonRpc(err) if err.code() == super::error::rpc_spec_v2::INVALID_DUPLICATE_HASHES && err.message() == "Received duplicate hashes for the `chainHead_unpin` method"
);

// Can unpin blocks.
Expand Down
8 changes: 4 additions & 4 deletions substrate/client/rpc-spec-v2/src/transaction/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::{
use assert_matches::assert_matches;
use codec::Encode;
use futures::Future;
use jsonrpsee::{core::error::Error, rpc_params, RpcModule};
use jsonrpsee::{MethodsError as Error, rpc_params, RpcModule};
use sc_transaction_pool::*;
use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool, TransactionPool};
use sp_core::{testing::TaskExecutor, traits::SpawnNamed};
Expand Down Expand Up @@ -194,7 +194,7 @@ async fn tx_broadcast_invalid_tx() {
.await
.unwrap_err();
assert_matches!(err,
Error::Call(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid params"
Error::JsonRpc(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid params"
);

assert_eq!(0, pool.status().ready);
Expand All @@ -219,7 +219,7 @@ async fn tx_broadcast_invalid_tx() {
.await
.unwrap_err();
assert_matches!(err,
Error::Call(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid operation id"
Error::JsonRpc(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid operation id"
);
}

Expand All @@ -233,6 +233,6 @@ async fn tx_invalid_stop() {
.await
.unwrap_err();
assert_matches!(err,
Error::Call(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid operation id"
Error::JsonRpc(err) if err.code() == super::error::json_rpc_spec::INVALID_PARAM_ERROR && err.message() == "Invalid operation id"
);
}