Merge branch 'db' into on-chain-protocol

This commit is contained in:
Tobin C. Harding 2020-10-22 08:17:54 +11:00
commit 3e0b40c248
13 changed files with 1255 additions and 52 deletions

View file

@ -19,6 +19,7 @@ use ecdsa_fun::{
};
use miniscript::{Descriptor, Segwitv0};
use rand::{CryptoRng, RngCore};
use serde::{Deserialize, Serialize};
use sha2::Sha256;
use std::str::FromStr;
@ -28,7 +29,7 @@ pub use ecdsa_fun::{adaptor::EncryptedSignature, Signature};
pub const TX_FEE: u64 = 10_000;
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
pub struct SecretKey {
inner: Scalar,
public: Point,
@ -83,7 +84,7 @@ impl SecretKey {
}
}
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
pub struct PublicKey(Point);
impl From<PublicKey> for Point<Jacobian> {