Skip to content

Commit 2369d33

Browse files
committed
Merge branch 'devnet-ready' of https://github.com/opentensor/subtensor into devnet-ready
2 parents cd76892 + 220ab34 commit 2369d33

File tree

108 files changed

+2134
-2285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+2134
-2285
lines changed

Cargo.lock

Lines changed: 715 additions & 1122 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
description = "Implementation of the bittensor blockchain"
55
authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
66
homepage = "https://substrate.io/"
7-
edition = "2021"
7+
edition = "2024"
88
license = "Unlicense"
99
publish = false
1010
repository = "https://github.com/opentensor/subtensor"
@@ -46,6 +46,7 @@ arithmetic-side-effects = "deny"
4646
type_complexity = "allow"
4747
unwrap-used = "deny"
4848
manual_inspect = "allow"
49+
useless_conversion = "allow" # until polkadot is patched
4950

5051
[workspace.dependencies]
5152
async-trait = "0.1"

docker-compose.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ services:
4141
--chain raw_spec_finney.json \
4242
--rpc-external --rpc-cors all \
4343
--no-mdns \
44-
--in-peers 500 --out-peers 500 \
4544
--bootnodes /dns/bootnode.finney.chain.opentensor.ai/tcp/30333/ws/p2p/12D3KooWRwbMb85RWnT8DSXSYMWQtuDwh4LJzndoRrTDotTR5gDC \
4645
--sync warp
4746
@@ -59,7 +58,6 @@ services:
5958
--chain raw_spec_finney.json \
6059
--rpc-external --rpc-cors all \
6160
--no-mdns \
62-
--in-peers 500 --out-peers 500 \
6361
--bootnodes /dns/bootnode.finney.chain.opentensor.ai/tcp/30333/ws/p2p/12D3KooWRwbMb85RWnT8DSXSYMWQtuDwh4LJzndoRrTDotTR5gDC \
6462
--pruning=archive
6563
@@ -77,7 +75,6 @@ services:
7775
--chain raw_spec_testfinney.json \
7876
--rpc-external --rpc-cors all \
7977
--no-mdns \
80-
--in-peers 500 --out-peers 500 \
8178
--bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr \
8279
--sync warp
8380
--reserved-nodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr \
@@ -97,7 +94,6 @@ services:
9794
--chain raw_spec_testfinney.json \
9895
--rpc-external --rpc-cors all \
9996
--no-mdns \
100-
--in-peers 500 --out-peers 500 \
10197
--bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr \
10298
--pruning=archive
10399
--reserved-nodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr \

docs/rust-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Use a terminal shell to execute the following commands:
2424
```bash
2525
sudo apt update
2626
# May prompt for location information
27-
sudo apt install -y git clang curl libssl-dev llvm libudev-dev
27+
sudo apt install -y git clang curl libssl-dev llvm libudev-dev make pkg-config protobuf-compiler
2828
```
2929

3030
### Arch Linux

node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "4.0.0-dev"
44
description = "A fresh FRAME-based Substrate node, ready for hacking."
55
authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
66
homepage = "https://substrate.io/"
7-
edition = "2021"
7+
edition = "2024"
88
license = "Unlicense"
99
publish = false
1010
repository = "https://github.com/opentensor/subtensor"

node/src/chain_spec/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use sc_service::ChainType;
1212
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
1313
use sp_consensus_grandpa::AuthorityId as GrandpaId;
1414
use sp_core::crypto::Ss58Codec;
15-
use sp_core::{bounded_vec, sr25519, Pair, Public, H256};
16-
use sp_runtime::traits::{IdentifyAccount, Verify};
15+
use sp_core::{H256, Pair, Public, bounded_vec, sr25519};
1716
use sp_runtime::AccountId32;
17+
use sp_runtime::traits::{IdentifyAccount, Verify};
1818
use std::collections::HashSet;
1919
use std::env;
2020
use std::str::FromStr;

node/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use node_subtensor_runtime::{opaque::Block, RuntimeApi};
1+
use node_subtensor_runtime::{RuntimeApi, opaque::Block};
22
use sc_executor::WasmExecutor;
33

44
/// Full backend.

node/src/command.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use crate::{
44
ethereum::db_config_dir,
55
service,
66
};
7-
use fc_db::{kv::frontier_database_dir, DatabaseSource};
7+
use fc_db::{DatabaseSource, kv::frontier_database_dir};
88

99
use futures::TryFutureExt;
1010
use node_subtensor_runtime::Block;
1111
use sc_cli::SubstrateCli;
1212
use sc_service::{
13-
config::{ExecutorConfiguration, RpcConfiguration},
1413
Configuration,
14+
config::{ExecutorConfiguration, RpcConfiguration},
1515
};
1616

1717
impl SubstrateCli for Cli {
@@ -115,7 +115,7 @@ pub fn run() -> sc_cli::Result<()> {
115115
"Cannot purge `{:?}` database",
116116
config.database
117117
)
118-
.into())
118+
.into());
119119
}
120120
};
121121
cmd.run(frontier_database_config)?;
@@ -134,7 +134,7 @@ pub fn run() -> sc_cli::Result<()> {
134134
"Cannot purge `{:?}` database: {:?}",
135135
db_path, err,
136136
)
137-
.into())
137+
.into());
138138
}
139139
};
140140
}
@@ -157,7 +157,7 @@ pub fn run() -> sc_cli::Result<()> {
157157
#[cfg(feature = "runtime-benchmarks")]
158158
Some(Subcommand::Benchmark(cmd)) => {
159159
use crate::benchmarking::{
160-
inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder,
160+
RemarkBuilder, TransferKeepAliveBuilder, inherent_benchmark_data,
161161
};
162162
use frame_benchmarking_cli::{
163163
BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE,

node/src/ethereum.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
pub use fc_consensus::FrontierBlockImport;
22
use fc_rpc::{
3-
pending::AuraConsensusDataProvider, Debug, DebugApiServer, Eth, EthApiServer, EthConfig,
4-
EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, EthSigner, EthTask,
5-
Net, NetApiServer, Web3, Web3ApiServer,
3+
Debug, DebugApiServer, Eth, EthApiServer, EthConfig, EthDevSigner, EthFilter,
4+
EthFilterApiServer, EthPubSub, EthPubSubApiServer, EthSigner, EthTask, Net, NetApiServer, Web3,
5+
Web3ApiServer, pending::AuraConsensusDataProvider,
66
};
77
pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
88
/// Frontier DB backend type.
99
pub use fc_storage::{StorageOverride, StorageOverrideHandler};
1010
use fp_rpc::ConvertTransaction;
11-
use futures::future;
1211
use futures::StreamExt;
12+
use futures::future;
1313
use jsonrpsee::RpcModule;
1414
use node_subtensor_runtime::opaque::Block;
1515
use sc_client_api::client::BlockchainEvents;
1616
use sc_network_sync::SyncingService;
1717
use sc_rpc::SubscriptionTaskExecutor;
18-
use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
18+
use sc_service::{Configuration, TaskManager, error::Error as ServiceError};
1919
use sc_transaction_pool::ChainApi;
2020
use sc_transaction_pool_api::TransactionPool;
2121
use sp_inherents::CreateInherentDataProviders;

node/src/rpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub use fc_rpc::EthBlockDataCacheTask;
1313
pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
1414
use fc_storage::StorageOverride;
1515
use jsonrpsee::RpcModule;
16-
use node_subtensor_runtime::opaque::Block;
1716
use node_subtensor_runtime::Hash;
17+
use node_subtensor_runtime::opaque::Block;
1818
use sc_consensus_manual_seal::EngineCommand;
1919
use sc_network::service::traits::NetworkService;
2020
use sc_network_sync::SyncingService;

0 commit comments

Comments
 (0)