From cf8436f9e1f9e1d6a76ec861a5f3f7b6d2d02158 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 18 Oct 2024 11:17:03 +1000 Subject: [PATCH 1/2] Minimise features used by RPC servers --- crates/sc-consensus-subspace-rpc/Cargo.toml | 2 +- crates/subspace-gateway-rpc/Cargo.toml | 2 +- crates/subspace-gateway/Cargo.toml | 2 +- crates/subspace-service/Cargo.toml | 2 +- domains/client/eth-service/Cargo.toml | 2 +- domains/service/Cargo.toml | 2 +- test/subspace-test-service/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/sc-consensus-subspace-rpc/Cargo.toml b/crates/sc-consensus-subspace-rpc/Cargo.toml index 701917d88a..31bb22a4b6 100644 --- a/crates/sc-consensus-subspace-rpc/Cargo.toml +++ b/crates/sc-consensus-subspace-rpc/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] async-oneshot = "0.5.9" futures = "0.3.31" futures-timer = "3.0.3" -jsonrpsee = { version = "0.24.5", features = ["server", "macros"] } +jsonrpsee = { version = "0.24.5", features = ["server-core", "macros"] } parking_lot = "0.12.2" schnellru = "0.2.3" sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } diff --git a/crates/subspace-gateway-rpc/Cargo.toml b/crates/subspace-gateway-rpc/Cargo.toml index 4380666357..5d62cde7b3 100644 --- a/crates/subspace-gateway-rpc/Cargo.toml +++ b/crates/subspace-gateway-rpc/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] hex = "0.4.3" -jsonrpsee = { version = "0.24.5", features = ["server", "macros"] } +jsonrpsee = { version = "0.24.5", features = ["client-core", "server-core", "macros"] } serde = { version = "1.0.110", default-features = false, features = ["alloc", "derive"] } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } subspace-data-retrieval = { version = "0.1.0", path = "../../shared/subspace-data-retrieval" } diff --git a/crates/subspace-gateway/Cargo.toml b/crates/subspace-gateway/Cargo.toml index 2ee2195d1b..977e7952c4 100644 --- a/crates/subspace-gateway/Cargo.toml +++ b/crates/subspace-gateway/Cargo.toml @@ -24,6 +24,6 @@ futures = "0.3.31" mimalloc = "0.1.43" supports-color = "3.0.1" thiserror = "1.0.64" -tokio = { version = "1.40.0", features = ["macros"] } +tokio = { version = "1.40.0", features = ["rt-multi-thread", "signal", "macros"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } diff --git a/crates/subspace-service/Cargo.toml b/crates/subspace-service/Cargo.toml index ec9668805e..aea47144e7 100644 --- a/crates/subspace-service/Cargo.toml +++ b/crates/subspace-service/Cargo.toml @@ -24,7 +24,7 @@ domain-runtime-primitives = { version = "0.1.0", path = "../../domains/primitive frame-benchmarking = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42", optional = true } futures = "0.3.31" hex = "0.4.3" -jsonrpsee = { version = "0.24.5", features = ["server"] } +jsonrpsee = { version = "0.24.5", features = ["server-core"] } mmr-gadget = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } mmr-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } pallet-transaction-payment-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } diff --git a/domains/client/eth-service/Cargo.toml b/domains/client/eth-service/Cargo.toml index 263548ba41..224125211e 100644 --- a/domains/client/eth-service/Cargo.toml +++ b/domains/client/eth-service/Cargo.toml @@ -23,7 +23,7 @@ fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/autonomys/front fc-storage = { version = "1.0.0-dev", git = "https://github.com/autonomys/frontier", rev = "f80f9e2bad338f3bf3854b256b3c4edea23e5968" } fp-rpc = { version = "3.0.0-dev", git = "https://github.com/autonomys/frontier", rev = "f80f9e2bad338f3bf3854b256b3c4edea23e5968", features = ['default'] } futures = "0.3.31" -jsonrpsee = { version = "0.24.5", features = ["server"] } +jsonrpsee = { version = "0.24.5", features = ["server-core"] } pallet-transaction-payment-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } parity-scale-codec = "3.6.12" sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } diff --git a/domains/service/Cargo.toml b/domains/service/Cargo.toml index 8196fa3e31..5b14f3fdfd 100644 --- a/domains/service/Cargo.toml +++ b/domains/service/Cargo.toml @@ -22,7 +22,7 @@ domain-client-operator = { version = "0.1.0", path = "../client/domain-operator" domain-runtime-primitives = { version = "0.1.0", path = "../primitives/runtime" } frame-benchmarking = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42", optional = true } futures = "0.3.31" -jsonrpsee = { version = "0.24.5", features = ["server"] } +jsonrpsee = { version = "0.24.5", features = ["server-core"] } log = "0.4.22" pallet-transaction-payment-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } parity-scale-codec = "3.6.12" diff --git a/test/subspace-test-service/Cargo.toml b/test/subspace-test-service/Cargo.toml index 77fd9ca44d..7655e1c5ee 100644 --- a/test/subspace-test-service/Cargo.toml +++ b/test/subspace-test-service/Cargo.toml @@ -22,7 +22,7 @@ domain-client-message-relayer = { version = "0.1.0", path = "../../domains/clien domain-runtime-primitives = { version = "0.1.0", path = "../../domains/primitives/runtime" } frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } futures = "0.3.31" -jsonrpsee = { version = "0.24.5", features = ["server"] } +jsonrpsee = { version = "0.24.5", features = ["server-core"] } pallet-transaction-payment = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } mmr-gadget = { git = "https://github.com/subspace/polkadot-sdk", rev = "5871818e1d736f1843eb9078f886290695165c42" } rand = "0.8.5" From 5c04b27c85e24facc419dcd62f83a581cfc4e16c Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 18 Oct 2024 11:17:37 +1000 Subject: [PATCH 2/2] Support IPv6 in CORS rules --- crates/subspace-node/src/commands/run/consensus.rs | 2 ++ crates/subspace-node/src/commands/run/domain.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/crates/subspace-node/src/commands/run/consensus.rs b/crates/subspace-node/src/commands/run/consensus.rs index 1d7f724d94..fc8ebbeb08 100644 --- a/crates/subspace-node/src/commands/run/consensus.rs +++ b/crates/subspace-node/src/commands/run/consensus.rs @@ -492,8 +492,10 @@ pub(super) fn create_consensus_chain_configuration( Cors::List(vec![ "http://localhost:*".into(), "http://127.0.0.1:*".into(), + "http://[::1]:*".into(), "https://localhost:*".into(), "https://127.0.0.1:*".into(), + "https://[::1]:*".into(), "https://polkadot.js.org".into(), ]) } diff --git a/crates/subspace-node/src/commands/run/domain.rs b/crates/subspace-node/src/commands/run/domain.rs index bbf875d5ab..f0aaee41df 100644 --- a/crates/subspace-node/src/commands/run/domain.rs +++ b/crates/subspace-node/src/commands/run/domain.rs @@ -190,8 +190,10 @@ pub(super) fn create_domain_configuration( Cors::List(vec![ "http://localhost:*".into(), "http://127.0.0.1:*".into(), + "http://[::1]:*".into(), "https://localhost:*".into(), "https://127.0.0.1:*".into(), + "https://[::1]:*".into(), "https://polkadot.js.org".into(), ]) }