Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
upgrade to gemini-3g-nov-14 snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
@ParthDesai
ParthDesai committed Nov 15, 2023
1 parent a95aebd commit c76a536
Show file tree
Hide file tree
Showing 9 changed files with 1,135 additions and 875 deletions.
1,895 changes: 1,073 additions & 822 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sdk-substrate = { path = "substrate" }
sdk-utils = { path = "utils" }
static_assertions = "1.1.0"

subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }

# The only triple tested and confirmed as working in `jemallocator` crate is `x86_64-unknown-linux-gnu`
[target.'cfg(all(target_arch = "x86_64", target_vendor = "unknown", target_os = "linux", target_env = "gnu"))'.dev-dependencies]
Expand All @@ -28,7 +28,7 @@ derive_more = "0.99"
fdlimit = "0.2"
futures = "0.3"
serde_json = "1"
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
tempfile = "3"
tokio = { version = "1.26", features = ["rt-multi-thread", "macros"] }
tracing = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions dsn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ derive_more = "0.99"
futures = "0.3"
hex = "0.4.3"
parking_lot = "0.12"
prometheus-client = "0.21.2"
prometheus-client = "0.22.0"
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sdk-utils = { path = "../utils" }
serde = { version = "1", features = ["derive"] }
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
tracing = "0.1"

[features]
Expand Down
12 changes: 8 additions & 4 deletions dsn/src/builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,18 +303,22 @@ impl Dsn {
bootstrap_addresses: bootstrap_nodes,
kademlia_mode: KademliaMode::Dynamic { initial_mode: Mode::Client },
external_addresses: external_addresses.into_iter().map(Into::into).collect(),
// Proactively maintain permanent connections with farmers (least restrictive value taken from farmer)
// Proactively maintain permanent connections with farmers (least restrictive value
// taken from farmer)
special_connected_peers_handler: Some(Arc::new(PeerInfo::is_farmer)),
// Maintain proactive connections with all peers (least restrictive value taken from node)
// Maintain proactive connections with all peers (least restrictive value taken from
// node)
general_connected_peers_handler: Some(Arc::new(|_| true)),
// Maintain some number of persistent connections (taken from farmer)
general_connected_peers_target: 0,
// Special peers (taken from farmer)
special_connected_peers_target: target_connections,
// Allow up to quarter of incoming connections to be maintained (taken from node)
general_connected_peers_limit: max_established_incoming_connections / 4,
// Allow to maintain some extra farmer connections beyond direct interest too (taken from farmer)
special_connected_peers_limit: target_connections + max_established_incoming_connections / 4,
// Allow to maintain some extra farmer connections beyond direct interest too (taken
// from farmer)
special_connected_peers_limit: target_connections
+ max_established_incoming_connections / 4,
metrics,
..default_networking_config
};
Expand Down
14 changes: 7 additions & 7 deletions farmer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ rayon = "1.7.0"
sdk-traits = { path = "../traits" }
sdk-utils = { path = "../utils" }
serde = { version = "1", features = ["derive"] }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd", features = ["parallel"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d", features = ["parallel"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
thiserror = "1"
tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
tokio-stream = { version = "0.1", features = ["sync", "time"] }
Expand Down
46 changes: 23 additions & 23 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ edition = "2021"
[dependencies]
anyhow = "1"
backoff = "0.4"
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
derivative = "2.2.0"
derive_builder = "0.12"
derive_more = "0.99"
domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "56086daa77802eaa285894bfe4b811be66629c89" }
frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
futures = "0.3"
hex-literal = "0.4"
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
parity-scale-codec = "3.6.3"
parking_lot = "0.12"
pin-project = "1"
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1", default-features = false }
sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1", default-features = false }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
Expand All @@ -47,21 +47,21 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
tokio-stream = { version = "0.1", features = ["sync", "time"] }
tracing = "0.1"
Expand Down
13 changes: 9 additions & 4 deletions node/src/domains/builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use anyhow::{anyhow, Result};
use cross_domain_message_gossip::Message;
use derivative::Derivative;
use derive_builder::Builder;
use sp_runtime::traits::Block as BlockT;
use domain_client_operator::{BootstrapResult, Bootstrapper};
use domain_runtime_primitives::opaque::Block as DomainBlock;
use futures::future;
Expand All @@ -20,10 +19,11 @@ use sdk_utils::{DestructorSet, MultiaddrWithPeerId, TaskOutput};
use serde::{Deserialize, Serialize};
use sp_core::crypto::AccountId32;
use sp_domains::DomainId;
use sp_runtime::traits::Block as BlockT;
use subspace_runtime::RuntimeApi as CRuntimeApi;
use subspace_runtime_primitives::opaque::Block as CBlock;
use subspace_service::FullClient as CFullClient;
use subspace_service::transaction_pool::FullPool;
use subspace_service::FullClient as CFullClient;
use tokio::sync::{oneshot, RwLock};

use crate::domains::domain::{Domain, DomainBuildingProgress};
Expand All @@ -43,8 +43,13 @@ pub struct ConsensusNodeLink {
/// Reference to the consensus node's network sync service
pub consensus_sync_service: Arc<sc_network_sync::SyncingService<CBlock>>,
/// Consensus tx pool
pub consensus_transaction_pool:
Arc<FullPool<CFullClient<CRuntimeApi, CExecutorDispatch>, CBlock, <DomainBlock as BlockT>::Header>>,
pub consensus_transaction_pool: Arc<
FullPool<
CFullClient<CRuntimeApi, CExecutorDispatch>,
CBlock,
<DomainBlock as BlockT>::Header,
>,
>,
/// Cross domain message gossip worker's message sink
pub gossip_message_sink: TracingUnboundedSender<Message>,
/// Cross domain message receiver for the domain
Expand Down
6 changes: 3 additions & 3 deletions traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ async-trait = "0.1"
parking_lot = "0.12"
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "892bf8e938c6bd2b893d3827d1093cd81baa59a1" }
sdk-dsn = { path = "../dsn" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dd2a264b0b7747793765d5436b0df5cdcc0e12cd" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "2ba5de0bb6886b088f0b956b621d53ae05b5ad6d" }

[features]
default = []
Expand Down
Loading

0 comments on commit c76a536

Please sign in to comment.