Merge branch 'main' into add-coverage-report

Cargo.toml

@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
   "kairos-cli",
+  "kairos-crypto",
   "kairos-server",
   "kairos-tx",
   "kairos-test-utils",

kairos-cli/Cargo.toml

@@ -18,6 +18,7 @@ casper-types = { version = "4.0.1", features = ["std"] } # TODO: Change `std` ->
 clap = { version = "4.5", features = ["derive", "deprecated"] }
 hex = "0.4"
 thiserror = "1"
+kairos-crypto = { path = "../kairos-crypto" }
 
 [dev-dependencies]
 assert_cmd = "2"

kairos-cli/src/commands/deposit.rs

@@ -1,8 +1,10 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser, Debug)]
@@ -16,7 +18,7 @@ pub struct Args {
 pub fn run(args: Args) -> Result<String, CliError> {
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/commands/transfer.rs

@@ -1,10 +1,11 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::public_key::CasperPublicKey;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 use crate::utils::parse_hex_string;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser)]
@@ -18,10 +19,10 @@ pub struct Args {
 }
 
 pub fn run(args: Args) -> Result<String, CliError> {
-    let _recipient = CasperPublicKey::from_bytes(args.recipient.as_ref())?;
+    let _recipient = Signer::from_public_key(args.recipient)?.to_public_key()?;
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/commands/withdraw.rs

@@ -1,8 +1,10 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser)]
@@ -16,7 +18,7 @@ pub struct Args {
 pub fn run(args: Args) -> Result<String, CliError> {
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/error.rs

@@ -1,7 +1,7 @@
 use hex::FromHexError;
 use thiserror::Error;
 
-use crate::crypto::error::CryptoError;
+use kairos_crypto::error::CryptoError;
 
 #[derive(Error, Debug)]
 pub enum CliError {

kairos-cli/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod commands;
 pub mod common;
-pub mod crypto;
 pub mod error;
 pub mod utils;

kairos-crypto/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "kairos-crypto"
+version.workspace = true
+edition.workspace = true
+
+[features]
+default = ["crypto-casper"]
+crypto-casper = ["casper-types"]
+
+[lib]
+
+[dependencies]
+hex = "0.4"
+thiserror = "1"
+
+# Casper signer implementation.
+casper-types = { version = "4", optional = true, features = ["std"] } # TODO: Change `std` -> `std-fs-io` in the future version.

kairos-crypto/src/error.rs

@@ -0,0 +1,20 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum CryptoError {
+    /// Failed to parse a public key from a raw data.
+    #[error("failed to parse private key: {error}")]
+    FailedToParseKey { error: String },
+    /// Encoding related error.
+    #[error("failed to serialize '{context}'")]
+    Serialization { context: &'static str },
+    /// Invalid public key (hexdigest) or other decoding related error.
+    #[error("failed to deserialize '{context}'")]
+    Deserialization { context: &'static str },
+    /// Signature verification failure.
+    #[error("signature verification failed")]
+    InvalidSignature,
+    /// Private key is not provided.
+    #[error("private key is not provided")]
+    MissingPrivateKey,
+}