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
use crate::{block::Block, vote_data::VoteData};
use aptos_crypto::{
ed25519::Ed25519Signature,
hash::{TransactionAccumulatorHasher, ACCUMULATOR_PLACEHOLDER_HASH},
};
use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
use aptos_types::{
epoch_state::EpochState,
proof::{accumulator::InMemoryAccumulator, AccumulatorExtensionProof},
};
use serde::{Deserialize, Serialize};
use std::{
fmt::{Display, Formatter},
ops::Deref,
};
#[derive(Clone, Debug, CryptoHasher, Deserialize, BCSCryptoHash, Serialize)]
pub struct VoteProposal {
accumulator_extension_proof: AccumulatorExtensionProof<TransactionAccumulatorHasher>,
#[serde(bound(deserialize = "Block: Deserialize<'de>"))]
block: Block,
next_epoch_state: Option<EpochState>,
decoupled_execution: bool,
}
impl VoteProposal {
pub fn new(
accumulator_extension_proof: AccumulatorExtensionProof<TransactionAccumulatorHasher>,
block: Block,
next_epoch_state: Option<EpochState>,
decoupled_execution: bool,
) -> Self {
Self {
accumulator_extension_proof,
block,
next_epoch_state,
decoupled_execution,
}
}
pub fn accumulator_extension_proof(
&self,
) -> &AccumulatorExtensionProof<TransactionAccumulatorHasher> {
&self.accumulator_extension_proof
}
pub fn block(&self) -> &Block {
&self.block
}
pub fn next_epoch_state(&self) -> Option<&EpochState> {
self.next_epoch_state.as_ref()
}
fn vote_data_ordering_only(&self) -> VoteData {
VoteData::new(
self.block().gen_block_info(
*ACCUMULATOR_PLACEHOLDER_HASH,
0,
self.next_epoch_state().cloned(),
),
self.block().quorum_cert().certified_block().clone(),
)
}
fn vote_data_with_extension_proof(
&self,
new_tree: &InMemoryAccumulator<TransactionAccumulatorHasher>,
) -> VoteData {
VoteData::new(
self.block().gen_block_info(
new_tree.root_hash(),
new_tree.version(),
self.next_epoch_state().cloned(),
),
self.block().quorum_cert().certified_block().clone(),
)
}
pub fn gen_vote_data(&self) -> anyhow::Result<VoteData> {
if self.decoupled_execution {
Ok(self.vote_data_ordering_only())
} else {
let proposed_block = self.block();
let new_tree = self.accumulator_extension_proof().verify(
proposed_block
.quorum_cert()
.certified_block()
.executed_state_id(),
)?;
Ok(self.vote_data_with_extension_proof(&new_tree))
}
}
}
impl Display for VoteProposal {
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
write!(f, "VoteProposal[block: {}]", self.block,)
}
}
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct MaybeSignedVoteProposal {
pub vote_proposal: VoteProposal,
pub signature: Option<Ed25519Signature>,
}
impl Deref for MaybeSignedVoteProposal {
type Target = VoteProposal;
fn deref(&self) -> &VoteProposal {
&self.vote_proposal
}
}