Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub use prism_common::{
operation::{ServiceChallenge, ServiceChallengeInput, SignatureBundle},
transaction::{Transaction, TransactionError, UnsignedTransaction},
};
pub use prism_keys::{Signature, SigningKey, VerifyingKey};
pub use prism_keys::{CryptoAlgorithm, Signature, SigningKey, VerifyingKey};
pub use prism_serde::binary;

#[cfg(feature = "mockall")]
Expand Down
2 changes: 1 addition & 1 deletion crates/common/src/api/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl MockPrismPendingTransaction {
}

#[async_trait]
impl PendingTransaction for MockPrismPendingTransaction {
impl PendingTransaction<'_> for MockPrismPendingTransaction {
type Timer = MockPrismTimer;

async fn wait_with_interval(&self, _: Duration) -> Result<Account, PrismApiError> {
Expand Down
4 changes: 2 additions & 2 deletions crates/common/src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ pub trait PrismApiTimer {
const DEFAULT_POLLING_INTERVAL: Duration = Duration::from_secs(5);

#[async_trait]
pub trait PendingTransaction
pub trait PendingTransaction<'a>
where
Self: Send + Sync,
{
Expand Down Expand Up @@ -215,7 +215,7 @@ where
}

#[async_trait]
impl<P> PendingTransaction for PendingTransactionImpl<'_, P>
impl<'a, P> PendingTransaction<'a> for PendingTransactionImpl<'a, P>
where
P: PrismApi,
{
Expand Down
2 changes: 1 addition & 1 deletion crates/common/src/api/noop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl PrismApiTimer for NoopTimer {
pub struct NoopPendingTransaction;

#[async_trait]
impl PendingTransaction for NoopPendingTransaction {
impl PendingTransaction<'_> for NoopPendingTransaction {
type Timer = NoopTimer;

async fn wait_with_interval(&self, _: Duration) -> Result<Account, PrismApiError> {
Expand Down
2 changes: 1 addition & 1 deletion crates/common/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ where

pub async fn send(
self,
) -> Result<impl PendingTransaction<Timer = P::Timer> + 'a, PrismApiError> {
) -> Result<impl PendingTransaction<'a, Timer = P::Timer>, PrismApiError> {
let Some(prism) = self.prism else {
return Err(TransactionError::MissingSender.into());
};
Expand Down
13 changes: 6 additions & 7 deletions crates/common/src/transaction.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
use std::fmt::{Display, Formatter};
use std::{
error::Error,
fmt::{Display, Formatter},
};

use anyhow::{anyhow, Result};
use anyhow::Result;
use celestia_types::Blob;
use prism_keys::{Signature, SigningKey, VerifyingKey};
use prism_serde::binary::{FromBinary, ToBinary};
Expand Down Expand Up @@ -118,8 +121,4 @@ impl Display for TransactionError {
}
}

impl From<TransactionError> for anyhow::Error {
fn from(error: TransactionError) -> Self {
anyhow!(error.to_string())
}
}
impl Error for TransactionError {}
10 changes: 5 additions & 5 deletions crates/keys/src/verifying_keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ impl VerifyingKey {
/// Returns the byte representation of the public key.
pub fn to_bytes(&self) -> Vec<u8> {
match self {
VerifyingKey::Ed25519(vk) => vk.to_bytes().to_vec(),
VerifyingKey::Secp256k1(vk) => vk.to_sec1_bytes().to_vec(),
VerifyingKey::Secp256r1(vk) => vk.to_sec1_bytes().to_vec(),
VerifyingKey::Eip191(vk) => vk.to_sec1_bytes().to_vec(),
VerifyingKey::CosmosAdr36(vk) => vk.to_sec1_bytes().to_vec(),
VerifyingKey::Ed25519(vk) => vk.as_bytes().to_vec(),
VerifyingKey::Secp256k1(vk) => vk.to_encoded_point(true).as_bytes().to_vec(),
VerifyingKey::Secp256r1(vk) => vk.to_encoded_point(true).as_bytes().to_vec(),
VerifyingKey::Eip191(vk) => vk.to_encoded_point(true).as_bytes().to_vec(),
VerifyingKey::CosmosAdr36(vk) => vk.to_encoded_point(true).as_bytes().to_vec(),
}
}

Expand Down
Binary file modified elf/riscv32im-succinct-zkvm-elf
Binary file not shown.