lukechilds
/
itchysats
mirror of https://github.com/lukechilds/itchysats.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #42 from comit-network/nonce-pk-in-payout 

Move `nonce_pk` to `Payout` type
integrate-protocol-maker-side
Thomas Eizinger 4 years ago
committed by GitHub
parent
1670a1f3ac 585d000694
commit
788c6e1db7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      cfd_protocol/src/lib.rs
  2. 35
      cfd_protocol/tests/cfds.rs

37
cfd_protocol/src/lib.rs
View File

@ -58,7 +58,7 @@ where
pub fn create_cfd_transactions( pub fn create_cfd_transactions(
(maker, maker_punish_params): (PartyParams, PunishParams), (maker, maker_punish_params): (PartyParams, PunishParams),
(taker, taker_punish_params): (PartyParams, PunishParams), (taker, taker_punish_params): (PartyParams, PunishParams),
oracle_params: OracleParams, oracle_pk: schnorrsig::PublicKey,
refund_timelock: u32, refund_timelock: u32,
payouts: Vec<Payout>, payouts: Vec<Payout>,
identity_sk: SecretKey, identity_sk: SecretKey,
@ -85,7 +85,7 @@ pub fn create_cfd_transactions(
taker.address, taker.address,
taker_punish_params, taker_punish_params,
), ),
oracle_params, oracle_pk,
refund_timelock, refund_timelock,
payouts, payouts,
identity_sk, identity_sk,
@ -106,7 +106,7 @@ pub fn renew_cfd_transactions(
Address, Address,
PunishParams, PunishParams,
), ),
oracle_params: OracleParams, oracle_pk: schnorrsig::PublicKey,
refund_timelock: u32, refund_timelock: u32,
payouts: Vec<Payout>, payouts: Vec<Payout>,
identity_sk: SecretKey, identity_sk: SecretKey,
@ -125,7 +125,7 @@ pub fn renew_cfd_transactions(
taker_address, taker_address,
taker_punish_params, taker_punish_params,
), ),
oracle_params, oracle_pk,
refund_timelock, refund_timelock,
payouts, payouts,
identity_sk, identity_sk,
@ -146,7 +146,7 @@ fn build_cfds(
Address, Address,
PunishParams, PunishParams,
), ),
oracle_params: OracleParams, oracle_pk: schnorrsig::PublicKey,
refund_timelock: u32, refund_timelock: u32,
payouts: Vec<Payout>, payouts: Vec<Payout>,
identity_sk: SecretKey, identity_sk: SecretKey,
@ -201,6 +201,7 @@ fn build_cfds(
let cets = payouts let cets = payouts
.into_iter() .into_iter()
.map(|payout| { .map(|payout| {
let nonce_pk = payout.nonce_pk;
let message = payout.message.clone(); let message = payout.message.clone();
let cet = ContractExecutionTransaction::new( let cet = ContractExecutionTransaction::new(
&commit_tx, &commit_tx,
@ -210,7 +211,7 @@ fn build_cfds(
CET_TIMELOCK, CET_TIMELOCK,
)?; )?;
let encsig = cet.encsign(identity_sk, &oracle_params.pk, &oracle_params.nonce_pk)?; let encsig = cet.encsign(identity_sk, &oracle_pk, &nonce_pk)?;
Ok((cet.inner, encsig, message)) Ok((cet.inner, encsig, message))
}) })
@ -420,11 +421,6 @@ pub struct PunishParams {
pub publish_pk: PublicKey, pub publish_pk: PublicKey,
} }
pub struct OracleParams {
pub pk: schnorrsig::PublicKey,
pub nonce_pk: schnorrsig::PublicKey,
}
pub struct CfdTransactions { pub struct CfdTransactions {
pub lock: PartiallySignedTransaction, pub lock: PartiallySignedTransaction,
pub commit: (Transaction, EcdsaAdaptorSignature), pub commit: (Transaction, EcdsaAdaptorSignature),
@ -432,17 +428,26 @@ pub struct CfdTransactions {
pub refund: (Transaction, Signature), pub refund: (Transaction, Signature),
} }
// TODO: We will very likely have multiple `(message, nonce_pk)` pairs
// per payout in the future
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Payout { pub struct Payout {
message: Vec<u8>, message: Vec<u8>,
nonce_pk: schnorrsig::PublicKey,
maker_amount: Amount, maker_amount: Amount,
taker_amount: Amount, taker_amount: Amount,
} }
impl Payout { impl Payout {
pub fn new(message: Vec<u8>, maker_amount: Amount, taker_amount: Amount) -> Self { pub fn new(
message: Vec<u8>,
nonce_pk: schnorrsig::PublicKey,
maker_amount: Amount,
taker_amount: Amount,
) -> Self {
Self { Self {
message, message,
nonce_pk,
maker_amount, maker_amount,
taker_amount, taker_amount,
} }
@ -907,6 +912,9 @@ mod tests {
#[test] #[test]
fn test_fee_subtraction_bigger_than_dust() { fn test_fee_subtraction_bigger_than_dust() {
let nonce_pk = "18845781f631c48f1c9709e23092067d06837f30aa0cd0544ac887fe91ddd166"
.parse()
.unwrap();
let key = "032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af" let key = "032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af"
.parse() .parse()
.unwrap(); .unwrap();
@ -917,6 +925,7 @@ mod tests {
let orig_taker_amount = 1000; let orig_taker_amount = 1000;
let payout = Payout::new( let payout = Payout::new(
b"win".to_vec(), b"win".to_vec(),
nonce_pk,
Amount::from_sat(orig_maker_amount), Amount::from_sat(orig_maker_amount),
Amount::from_sat(orig_taker_amount), Amount::from_sat(orig_taker_amount),
); );
@ -937,6 +946,9 @@ mod tests {
#[test] #[test]
fn test_fee_subtraction_smaller_than_dust() { fn test_fee_subtraction_smaller_than_dust() {
let nonce_pk = "18845781f631c48f1c9709e23092067d06837f30aa0cd0544ac887fe91ddd166"
.parse()
.unwrap();
let key = "032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af" let key = "032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1af"
.parse() .parse()
.unwrap(); .unwrap();
@ -947,6 +959,7 @@ mod tests {
let orig_taker_amount = 1000; let orig_taker_amount = 1000;
let payout = Payout::new( let payout = Payout::new(
b"win".to_vec(), b"win".to_vec(),
nonce_pk,
Amount::from_sat(orig_maker_amount), Amount::from_sat(orig_maker_amount),
Amount::from_sat(orig_taker_amount), Amount::from_sat(orig_taker_amount),
); );

35
cfd_protocol/tests/cfds.rs
View File

@ -10,8 +10,7 @@ use bitcoin::Txid;
use cfd_protocol::{ use cfd_protocol::{
commit_descriptor, compute_signature_point, create_cfd_transactions, commit_descriptor, compute_signature_point, create_cfd_transactions,
finalize_spend_transaction, lock_descriptor, punish_transaction, renew_cfd_transactions, finalize_spend_transaction, lock_descriptor, punish_transaction, renew_cfd_transactions,
spending_tx_sighash, CfdTransactions, OracleParams, Payout, PunishParams, TransactionExt, spending_tx_sighash, CfdTransactions, Payout, PunishParams, TransactionExt, WalletExt,
WalletExt,
}; };
use rand::{CryptoRng, RngCore, SeedableRng}; use rand::{CryptoRng, RngCore, SeedableRng};
use rand_chacha::ChaChaRng; use rand_chacha::ChaChaRng;
@ -34,11 +33,13 @@ fn create_cfd() {
let payouts = vec![ let payouts = vec![
Payout::new( Payout::new(
b"win".to_vec(), b"win".to_vec(),
announcement.nonce_pk(),
Amount::from_btc(1.5).unwrap(), Amount::from_btc(1.5).unwrap(),
Amount::from_btc(0.5).unwrap(), Amount::from_btc(0.5).unwrap(),
), ),
Payout::new( Payout::new(
b"lose".to_vec(), b"lose".to_vec(),
announcement.nonce_pk(),
Amount::ZERO, Amount::ZERO,
Amount::from_btc(2.0).unwrap(), Amount::from_btc(2.0).unwrap(),
), ),
@ -50,7 +51,7 @@ fn create_cfd() {
&mut rng, &mut rng,
(&maker_wallet, maker_lock_amount), (&maker_wallet, maker_lock_amount),
(&taker_wallet, taker_lock_amount), (&taker_wallet, taker_lock_amount),
(&oracle, announcement), oracle.public_key(),
payouts, payouts,
refund_timelock, refund_timelock,
); );
@ -115,11 +116,13 @@ fn renew_cfd() {
let payouts = vec![ let payouts = vec![
Payout::new( Payout::new(
b"win".to_vec(), b"win".to_vec(),
announcement.nonce_pk(),
Amount::from_btc(2.0).unwrap(), Amount::from_btc(2.0).unwrap(),
Amount::ZERO, Amount::ZERO,
), ),
Payout::new( Payout::new(
b"lose".to_vec(), b"lose".to_vec(),
announcement.nonce_pk(),
Amount::ZERO, Amount::ZERO,
Amount::from_btc(2.0).unwrap(), Amount::from_btc(2.0).unwrap(),
), ),
@ -131,7 +134,7 @@ fn renew_cfd() {
&mut rng, &mut rng,
(&maker_wallet, maker_lock_amount), (&maker_wallet, maker_lock_amount),
(&taker_wallet, taker_lock_amount), (&taker_wallet, taker_lock_amount),
(&oracle, announcement), oracle.public_key(),
payouts, payouts,
refund_timelock, refund_timelock,
); );
@ -149,11 +152,13 @@ fn renew_cfd() {
let payouts = vec![ let payouts = vec![
Payout::new( Payout::new(
b"win".to_vec(), b"win".to_vec(),
announcement.nonce_pk(),
Amount::from_btc(1.5).unwrap(), Amount::from_btc(1.5).unwrap(),
Amount::from_btc(0.5).unwrap(), Amount::from_btc(0.5).unwrap(),
), ),
Payout::new( Payout::new(
b"lose".to_vec(), b"lose".to_vec(),
announcement.nonce_pk(),
Amount::from_btc(0.5).unwrap(), Amount::from_btc(0.5).unwrap(),
Amount::from_btc(1.5).unwrap(), Amount::from_btc(1.5).unwrap(),
), ),
@ -179,10 +184,7 @@ fn renew_cfd() {
publish_pk: taker_pub_pk, publish_pk: taker_pub_pk,
}, },
), ),
OracleParams { oracle.public_key(),
pk: oracle.public_key(),
nonce_pk: announcement.nonce_pk(),
},
refund_timelock, refund_timelock,
payouts.clone(), payouts.clone(),
maker.sk, maker.sk,
@ -209,10 +211,7 @@ fn renew_cfd() {
publish_pk: taker_pub_pk, publish_pk: taker_pub_pk,
}, },
), ),
OracleParams { oracle.public_key(),
pk: oracle.public_key(),
nonce_pk: announcement.nonce_pk(),
},
refund_timelock, refund_timelock,
payouts, payouts,
taker.sk, taker.sk,
@ -267,7 +266,7 @@ fn create_cfd_txs(
rng: &mut ChaChaRng, rng: &mut ChaChaRng,
(maker_wallet, maker_lock_amount): (&bdk::Wallet<(), bdk::database::MemoryDatabase>, Amount), (maker_wallet, maker_lock_amount): (&bdk::Wallet<(), bdk::database::MemoryDatabase>, Amount),
(taker_wallet, taker_lock_amount): (&bdk::Wallet<(), bdk::database::MemoryDatabase>, Amount), (taker_wallet, taker_lock_amount): (&bdk::Wallet<(), bdk::database::MemoryDatabase>, Amount),
(oracle, announcement): (&Oracle, Announcement), oracle_pk: schnorrsig::PublicKey,
payouts: Vec<Payout>, payouts: Vec<Payout>,
refund_timelock: u32, refund_timelock: u32,
) -> ( ) -> (
@ -309,10 +308,7 @@ fn create_cfd_txs(
publish_pk: taker_pub_pk, publish_pk: taker_pub_pk,
}, },
), ),
OracleParams { oracle_pk,
pk: oracle.public_key(),
nonce_pk: announcement.nonce_pk(),
},
refund_timelock, refund_timelock,
payouts.clone(), payouts.clone(),
maker_sk, maker_sk,
@ -333,10 +329,7 @@ fn create_cfd_txs(
publish_pk: taker_pub_pk, publish_pk: taker_pub_pk,
}, },
), ),
OracleParams { oracle_pk,
pk: oracle.public_key(),
nonce_pk: announcement.nonce_pk(),
},
refund_timelock, refund_timelock,
payouts, payouts,
taker_sk, taker_sk,

Write Preview
Loading…
Cancel
Save