1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
use crate::{
execution_correctness::ExecutionCorrectness,
local::{LocalClient, LocalService},
process::ProcessService,
remote_service::RemoteService,
serializer::{SerializerClient, SerializerService},
thread::ThreadService,
};
use diem_config::config::{ExecutionCorrectnessService, NodeConfig};
use diem_crypto::ed25519::Ed25519PrivateKey;
use diem_global_constants::EXECUTION_KEY;
use diem_secure_storage::{CryptoStorage, Storage};
use diem_vm::DiemVM;
use executor::Executor;
use std::{convert::TryInto, net::SocketAddr, sync::Arc};
use storage_client::StorageClient;
pub fn extract_execution_prikey(config: &NodeConfig) -> Option<Ed25519PrivateKey> {
let backend = &config.execution.backend;
let mut storage: Storage = backend.try_into().expect("Unable to initialize storage");
if let Some(test_config) = config.test.as_ref() {
let private_key = test_config
.execution_key
.as_ref()
.expect("Missing execution key in test config")
.private_key();
storage
.import_private_key(EXECUTION_KEY, private_key)
.expect("Unable to insert execution key");
}
if config.execution.sign_vote_proposal {
Some(
storage
.export_private_key(EXECUTION_KEY)
.expect("Missing execution_private_key in secure storage"),
)
} else {
None
}
}
enum ExecutionCorrectnessWrapper {
Local(Arc<LocalService>),
Process(ProcessService),
Serializer(Arc<SerializerService>),
Thread(ThreadService),
}
pub struct ExecutionCorrectnessManager {
internal_execution_correctness: ExecutionCorrectnessWrapper,
}
impl ExecutionCorrectnessManager {
pub fn new(config: &NodeConfig) -> Self {
if let ExecutionCorrectnessService::Process(remote_service) = &config.execution.service {
return Self::new_process(
remote_service.server_address,
config.execution.network_timeout_ms,
);
}
let execution_prikey = extract_execution_prikey(config);
let storage_address = config.storage.address;
let timeout_ms = config.storage.timeout_ms;
match &config.execution.service {
ExecutionCorrectnessService::Local => {
Self::new_local(storage_address, execution_prikey, timeout_ms)
}
ExecutionCorrectnessService::Serializer => {
Self::new_serializer(storage_address, execution_prikey, timeout_ms)
}
ExecutionCorrectnessService::Thread => {
Self::new_thread(storage_address, execution_prikey, timeout_ms)
}
_ => unreachable!(
"Unimplemented ExecutionCorrectnessService: {:?}",
config.execution.service
),
}
}
pub fn new_local(
storage_address: SocketAddr,
execution_prikey: Option<Ed25519PrivateKey>,
timeout: u64,
) -> Self {
let block_executor = Box::new(Executor::<DiemVM>::new(
StorageClient::new(&storage_address, timeout).into(),
));
Self {
internal_execution_correctness: ExecutionCorrectnessWrapper::Local(Arc::new(
LocalService::new(block_executor, execution_prikey),
)),
}
}
pub fn new_process(server_addr: SocketAddr, network_timeout: u64) -> Self {
let process_service = ProcessService::new(server_addr, network_timeout);
Self {
internal_execution_correctness: ExecutionCorrectnessWrapper::Process(process_service),
}
}
pub fn new_serializer(
storage_address: SocketAddr,
execution_prikey: Option<Ed25519PrivateKey>,
timeout: u64,
) -> Self {
let block_executor = Box::new(Executor::<DiemVM>::new(
StorageClient::new(&storage_address, timeout).into(),
));
let serializer_service = SerializerService::new(block_executor, execution_prikey);
Self {
internal_execution_correctness: ExecutionCorrectnessWrapper::Serializer(Arc::new(
serializer_service,
)),
}
}
pub fn new_thread(
storage_address: SocketAddr,
execution_prikey: Option<Ed25519PrivateKey>,
network_timeout: u64,
) -> Self {
let thread = ThreadService::new(storage_address, execution_prikey, network_timeout);
Self {
internal_execution_correctness: ExecutionCorrectnessWrapper::Thread(thread),
}
}
pub fn client(&self) -> Box<dyn ExecutionCorrectness + Send + Sync> {
match &self.internal_execution_correctness {
ExecutionCorrectnessWrapper::Local(local_service) => {
Box::new(LocalClient::new(local_service.clone()))
}
ExecutionCorrectnessWrapper::Process(process) => Box::new(process.client()),
ExecutionCorrectnessWrapper::Serializer(serializer_service) => {
Box::new(SerializerClient::new(serializer_service.clone()))
}
ExecutionCorrectnessWrapper::Thread(thread) => Box::new(thread.client()),
}
}
}