Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:some bug in podr2 business #294

Merged
merged 3 commits into from
Jan 30, 2024
Merged

fix:some bug in podr2 business #294

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c67a4c5
fix:bug of cuz miner commit compute tag fail
democ98 Jan 29, 2024
59c1429
fix:compute u sig problem
democ98 Jan 29, 2024
6f754e2
fix:some bug
democ98 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions crates/cestory/src/podr2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ impl Podr2Api for Podr2Server {
request.file_name,
request.file_name.as_bytes().len()
);
let file_hash: [u8; 64] = (*(request.file_name.as_bytes()))
.try_into()
.map_err(|_| Status::invalid_argument("file_name hash bytes length should be 64".to_string()))?;

let pool = self
.threadpool
Expand All @@ -166,21 +169,16 @@ impl Podr2Api for Podr2Server {
.podr2_keys
.sig_gen_with_data(request.fragment_data, self.block_num, &request.fragment_name, h, pool.clone())
.map_err(|e| Status::internal(format!("AlgorithmError: {}", e.error_code.to_string())))?;
let u_sig = self.podr2_keys.sign_data_with_sha256(tag.t.u.as_bytes()).map_err(|e| {
let u_sig = self.podr2_keys.sign_data(&calculate_hash(tag.t.u.as_bytes())).map_err(|e| {
Status::invalid_argument(format!("Failed to calculate u's signature {:?}", e.error_code.to_string()))
})?;

let mut tag_sig_info_history =
TagSigInfo {
miner: AccountId32::from_slice(&request.miner_id[..])
.map_err(|_| Status::internal("invalid miner account"))?,
digest: BoundedVec::new(),
file_hash: Hash(
request.file_name.as_bytes().try_into().map_err(|_| {
Status::invalid_argument("file_name hash bytes length should be 64".to_string())
})?,
),
};
let mut tag_sig_info_history = TagSigInfo {
miner: AccountId32::from_slice(&request.miner_id[..])
.map_err(|_| Status::internal("invalid miner account"))?,
digest: BoundedVec::new(),
file_hash: Hash(file_hash),
};
if !request.tee_digest_list.is_empty() {
for tdl in request.tee_digest_list {
let digest_info_history = DigestInfo {
Expand Down Expand Up @@ -212,7 +210,7 @@ impl Podr2Api for Podr2Server {

let new_tee_record = DigestInfo {
fragment: Hash(request.fragment_name.as_bytes().try_into().unwrap()),
tee_puk: self.master_key.public(),
tee_puk: sr25519::Public(self.ceseal_identity_key.clone()),
};
tag_sig_info_history.digest.try_push(new_tee_record).map_err(|_| {
Status::invalid_argument("Can not push the new tee record into tag_sig_info_history".to_string())
Expand Down Expand Up @@ -290,7 +288,7 @@ impl Podr2VerifierApi for Podr2VerifierServer {
let mut iterator = request
.u_sigs
.iter()
.zip(agg_proof.names.iter())
.zip(agg_proof.us.iter())
.take((request.u_sigs.len() as f64 * 0.049).ceil() as usize);
if !iterator.all(|(u_sig, u)| match self.podr2_keys.verify_data(&calculate_hash(u.as_bytes()), &u_sig) {
Ok(_) => true,
Expand Down