Skip to content

Commit c26f022

Browse files
volhovmvolhovm
committed
Bump TMP
1 parent 81f31ab commit c26f022

File tree

6 files changed

+93
-103
lines changed

6 files changed

+93
-103
lines changed

‎.github/workflows/test-docs-scripts.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ jobs:
9898
run: |
9999
nix develop
100100
101+
- name: Test Rust installation
102+
run: |
103+
nix develop --command ./website/docs/developers/scripts/setup/install-rust.sh
104+
101105
- name: Test specialised builds
102106
run: |
103107
nix develop --command ./website/docs/developers/scripts/setup/build-specialized.sh

‎flake.nix‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
pkg-config
2727
gcc
2828
gnumake
29+
30+
curl
31+
git
32+
sqlite
33+
nodejs
2934
];
3035

3136
# Fix for tikv-jemalloc-sys compilation error on GNU platforms:

‎node/src/action_kind.rs‎

Lines changed: 74 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -15,100 +15,81 @@ use num_enum::TryFromPrimitive;
1515
use serde::{Deserialize, Serialize};
1616
use strum_macros::VariantArray;
1717

18-
use crate::{
19-
block_producer::{vrf_evaluator::BlockProducerVrfEvaluatorAction, BlockProducerAction},
20-
block_producer_effectful::{
21-
vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction,
22-
BlockProducerEffectfulAction,
23-
},
24-
event_source::EventSourceAction,
25-
external_snark_worker::ExternalSnarkWorkerAction,
26-
external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction,
27-
ledger::{read::LedgerReadAction, write::LedgerWriteAction, LedgerAction},
28-
ledger_effectful::LedgerEffectfulAction,
29-
p2p::{
30-
callbacks::P2pCallbacksAction,
31-
channels::{
32-
best_tip::P2pChannelsBestTipAction,
33-
rpc::P2pChannelsRpcAction,
34-
signaling::{
35-
discovery::P2pChannelsSignalingDiscoveryAction,
36-
exchange::P2pChannelsSignalingExchangeAction,
37-
},
38-
snark::P2pChannelsSnarkAction,
39-
snark_job_commitment::P2pChannelsSnarkJobCommitmentAction,
40-
streaming_rpc::P2pChannelsStreamingRpcAction,
41-
transaction::P2pChannelsTransactionAction,
42-
P2pChannelsAction, P2pChannelsEffectfulAction, P2pChannelsMessageReceivedAction,
43-
},
44-
connection::{
45-
incoming::P2pConnectionIncomingAction,
46-
incoming_effectful::P2pConnectionIncomingEffectfulAction,
47-
outgoing::P2pConnectionOutgoingAction,
48-
outgoing_effectful::P2pConnectionOutgoingEffectfulAction, P2pConnectionAction,
49-
P2pConnectionEffectfulAction,
50-
},
51-
disconnection::P2pDisconnectionAction,
52-
disconnection_effectful::P2pDisconnectionEffectfulAction,
53-
identify::P2pIdentifyAction,
54-
network::{
55-
identify::{
56-
stream::P2pNetworkIdentifyStreamAction,
57-
stream_effectful::P2pNetworkIdentifyStreamEffectfulAction,
58-
P2pNetworkIdentifyAction, P2pNetworkIdentifyEffectfulAction,
59-
},
60-
kad::{
61-
bootstrap::P2pNetworkKadBootstrapAction,
62-
kad_effectful::P2pNetworkKadEffectfulAction, request::P2pNetworkKadRequestAction,
63-
stream::P2pNetworkKademliaStreamAction, P2pNetworkKadAction,
64-
P2pNetworkKademliaAction,
65-
},
66-
noise::P2pNetworkNoiseAction,
67-
pnet::P2pNetworkPnetAction,
68-
pnet_effectful::P2pNetworkPnetEffectfulAction,
69-
pubsub::{pubsub_effectful::P2pNetworkPubsubEffectfulAction, P2pNetworkPubsubAction},
70-
rpc::P2pNetworkRpcAction,
71-
scheduler::P2pNetworkSchedulerAction,
72-
scheduler_effectful::P2pNetworkSchedulerEffectfulAction,
73-
select::P2pNetworkSelectAction,
74-
yamux::P2pNetworkYamuxAction,
75-
P2pNetworkAction, P2pNetworkEffectfulAction,
76-
},
77-
peer::P2pPeerAction,
78-
P2pAction, P2pEffectfulAction, P2pInitializeAction,
79-
},
80-
rpc::RpcAction,
81-
rpc_effectful::RpcEffectfulAction,
82-
snark::{
83-
block_verify::SnarkBlockVerifyAction,
84-
block_verify_effectful::SnarkBlockVerifyEffectfulAction,
85-
user_command_verify::SnarkUserCommandVerifyAction,
86-
user_command_verify_effectful::SnarkUserCommandVerifyEffectfulAction,
87-
work_verify::SnarkWorkVerifyAction, work_verify_effectful::SnarkWorkVerifyEffectfulAction,
88-
SnarkAction,
89-
},
90-
snark_pool::{candidate::SnarkPoolCandidateAction, SnarkPoolAction, SnarkPoolEffectfulAction},
91-
transaction_pool::{
92-
candidate::TransactionPoolCandidateAction, TransactionPoolAction,
93-
TransactionPoolEffectfulAction,
94-
},
95-
transition_frontier::{
96-
candidate::TransitionFrontierCandidateAction,
97-
genesis::TransitionFrontierGenesisAction,
98-
genesis_effectful::TransitionFrontierGenesisEffectfulAction,
99-
sync::{
100-
ledger::{
101-
snarked::TransitionFrontierSyncLedgerSnarkedAction,
102-
staged::TransitionFrontierSyncLedgerStagedAction,
103-
TransitionFrontierSyncLedgerAction,
104-
},
105-
TransitionFrontierSyncAction,
106-
},
107-
TransitionFrontierAction,
108-
},
109-
watched_accounts::WatchedAccountsAction,
110-
Action, ActionKindGet, CheckTimeoutsAction,
18+
use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction;
19+
use crate::block_producer::BlockProducerAction;
20+
use crate::block_producer_effectful::vrf_evaluator_effectful::BlockProducerVrfEvaluatorEffectfulAction;
21+
use crate::block_producer_effectful::BlockProducerEffectfulAction;
22+
use crate::event_source::EventSourceAction;
23+
use crate::external_snark_worker::ExternalSnarkWorkerAction;
24+
use crate::external_snark_worker_effectful::ExternalSnarkWorkerEffectfulAction;
25+
use crate::ledger::read::LedgerReadAction;
26+
use crate::ledger::write::LedgerWriteAction;
27+
use crate::ledger::LedgerAction;
28+
use crate::ledger_effectful::LedgerEffectfulAction;
29+
use crate::p2p::callbacks::P2pCallbacksAction;
30+
use crate::p2p::channels::best_tip::P2pChannelsBestTipAction;
31+
use crate::p2p::channels::rpc::P2pChannelsRpcAction;
32+
use crate::p2p::channels::signaling::discovery::P2pChannelsSignalingDiscoveryAction;
33+
use crate::p2p::channels::signaling::exchange::P2pChannelsSignalingExchangeAction;
34+
use crate::p2p::channels::snark::P2pChannelsSnarkAction;
35+
use crate::p2p::channels::snark_job_commitment::P2pChannelsSnarkJobCommitmentAction;
36+
use crate::p2p::channels::streaming_rpc::P2pChannelsStreamingRpcAction;
37+
use crate::p2p::channels::transaction::P2pChannelsTransactionAction;
38+
use crate::p2p::channels::{
39+
P2pChannelsAction, P2pChannelsEffectfulAction, P2pChannelsMessageReceivedAction,
11140
};
41+
use crate::p2p::connection::incoming::P2pConnectionIncomingAction;
42+
use crate::p2p::connection::incoming_effectful::P2pConnectionIncomingEffectfulAction;
43+
use crate::p2p::connection::outgoing::P2pConnectionOutgoingAction;
44+
use crate::p2p::connection::outgoing_effectful::P2pConnectionOutgoingEffectfulAction;
45+
use crate::p2p::connection::{P2pConnectionAction, P2pConnectionEffectfulAction};
46+
use crate::p2p::disconnection::P2pDisconnectionAction;
47+
use crate::p2p::disconnection_effectful::P2pDisconnectionEffectfulAction;
48+
use crate::p2p::identify::P2pIdentifyAction;
49+
use crate::p2p::network::identify::stream::P2pNetworkIdentifyStreamAction;
50+
use crate::p2p::network::identify::stream_effectful::P2pNetworkIdentifyStreamEffectfulAction;
51+
use crate::p2p::network::identify::{P2pNetworkIdentifyAction, P2pNetworkIdentifyEffectfulAction};
52+
use crate::p2p::network::kad::bootstrap::P2pNetworkKadBootstrapAction;
53+
use crate::p2p::network::kad::kad_effectful::P2pNetworkKadEffectfulAction;
54+
use crate::p2p::network::kad::request::P2pNetworkKadRequestAction;
55+
use crate::p2p::network::kad::stream::P2pNetworkKademliaStreamAction;
56+
use crate::p2p::network::kad::{P2pNetworkKadAction, P2pNetworkKademliaAction};
57+
use crate::p2p::network::noise::P2pNetworkNoiseAction;
58+
use crate::p2p::network::pnet::P2pNetworkPnetAction;
59+
use crate::p2p::network::pnet_effectful::P2pNetworkPnetEffectfulAction;
60+
use crate::p2p::network::pubsub::pubsub_effectful::P2pNetworkPubsubEffectfulAction;
61+
use crate::p2p::network::pubsub::P2pNetworkPubsubAction;
62+
use crate::p2p::network::rpc::P2pNetworkRpcAction;
63+
use crate::p2p::network::scheduler::P2pNetworkSchedulerAction;
64+
use crate::p2p::network::scheduler_effectful::P2pNetworkSchedulerEffectfulAction;
65+
use crate::p2p::network::select::P2pNetworkSelectAction;
66+
use crate::p2p::network::yamux::P2pNetworkYamuxAction;
67+
use crate::p2p::network::{P2pNetworkAction, P2pNetworkEffectfulAction};
68+
use crate::p2p::peer::P2pPeerAction;
69+
use crate::p2p::{P2pAction, P2pEffectfulAction, P2pInitializeAction};
70+
use crate::rpc::RpcAction;
71+
use crate::rpc_effectful::RpcEffectfulAction;
72+
use crate::snark::block_verify::SnarkBlockVerifyAction;
73+
use crate::snark::block_verify_effectful::SnarkBlockVerifyEffectfulAction;
74+
use crate::snark::user_command_verify::SnarkUserCommandVerifyAction;
75+
use crate::snark::user_command_verify_effectful::SnarkUserCommandVerifyEffectfulAction;
76+
use crate::snark::work_verify::SnarkWorkVerifyAction;
77+
use crate::snark::work_verify_effectful::SnarkWorkVerifyEffectfulAction;
78+
use crate::snark::SnarkAction;
79+
use crate::snark_pool::candidate::SnarkPoolCandidateAction;
80+
use crate::snark_pool::{SnarkPoolAction, SnarkPoolEffectfulAction};
81+
use crate::transaction_pool::candidate::TransactionPoolCandidateAction;
82+
use crate::transaction_pool::{TransactionPoolAction, TransactionPoolEffectfulAction};
83+
use crate::transition_frontier::candidate::TransitionFrontierCandidateAction;
84+
use crate::transition_frontier::genesis::TransitionFrontierGenesisAction;
85+
use crate::transition_frontier::genesis_effectful::TransitionFrontierGenesisEffectfulAction;
86+
use crate::transition_frontier::sync::ledger::snarked::TransitionFrontierSyncLedgerSnarkedAction;
87+
use crate::transition_frontier::sync::ledger::staged::TransitionFrontierSyncLedgerStagedAction;
88+
use crate::transition_frontier::sync::ledger::TransitionFrontierSyncLedgerAction;
89+
use crate::transition_frontier::sync::TransitionFrontierSyncAction;
90+
use crate::transition_frontier::TransitionFrontierAction;
91+
use crate::watched_accounts::WatchedAccountsAction;
92+
use crate::{Action, ActionKindGet, CheckTimeoutsAction};
11293

11394
/// Unified kind enum for all action types
11495
#[derive(

‎website/docs/developers/getting-started.mdx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ development environment and build OpenMina from source.
3131

3232
### Required Tools
3333

34-
#### 1. Rust Toolchain
34+
#### 1. System Dependencies
3535

36-
OpenMina requires both stable and nightly Rust toolchains:
36+
<CodeBlock language="bash">{InstallSystemDepsSh}</CodeBlock>
3737

38-
<CodeBlock language="bash">{InstallRustSh}</CodeBlock>
38+
#### 2. Rust Toolchain
3939

40-
#### 2. System Dependencies
40+
OpenMina requires both stable and nightly Rust toolchains:
4141

42-
<CodeBlock language="bash">{InstallSystemDepsSh}</CodeBlock>
42+
<CodeBlock language="bash">{InstallRustSh}</CodeBlock>
4343

4444
#### 3. Additional Development Tools
4545

@@ -55,9 +55,9 @@ OpenMina requires both stable and nightly Rust toolchains:
5555

5656
<CodeBlock language="bash">{InstallWasmToolsSh}</CodeBlock>
5757

58-
#### 5. Using Nix to install dependencies automatically
58+
#### 5. Using Nix to install dependencies automatically (alternative)
5959

60-
If you're on NixOS or using nix, you can use nix flake provided in the repo to
60+
If you're on NixOS or using nix, you can use the nix-flake provided in the repo to
6161
install the dependencies automatically and enter the shell:
6262

6363
<CodeBlock language="bash">{NixDevelop}</CodeBlock>

‎website/docs/developers/scripts/setup/install-rust.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Install rustup (Rust toolchain installer)
2-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
3-
41
# Source cargo environment
52
source ~/.cargo/env
63

‎website/docs/developers/scripts/setup/install-system-deps.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ sudo apt install -y \
77
sqlite3 \
88
git \
99
curl
10+
11+
# Install rustup (Rust toolchain installer) from source
12+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

0 commit comments

Comments
 (0)