Skip to content

Swap: Derive strict encoding for Alice, Bob, and KeyManager #318

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

Merged
h4sh3d merged 2 commits into from
Dec 28, 2022
Merged

Swap: Derive strict encoding for Alice, Bob, and KeyManager #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7214a9
Swap: Derive strict encoding for Alice, Bob, and KeyManager
sedited Dec 27, 2022
38812b4
chore: update changelog
h4sh3d Dec 28, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Derive strict encoding for `Alice` (segwit v0), `Bob` (segwit v0), and `KeyManager` by @TheCharlatan ([#318](https://github.com/farcaster-project/farcaster-core/pull/318))

### Changed

- Fee strategy `range` support is now under the new crate feature `fee_range` and disable by default ([#314](https://github.com/farcaster-project/farcaster-core/pull/314))
Expand Down
4 changes: 4 additions & 0 deletions src/swap/btcxmr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ pub type Parameters = protocol::Parameters<

/// Fully defined type for Bitcoin-Monero atomic swap Alice protocol role.
pub type Alice = protocol::Alice<bitcoin::Address, BitcoinSegwitV0, Monero>;
impl_strict_encoding!(Alice);

/// Fully defined type for Bitcoin-Monero atomic swap Bob protocol role.
pub type Bob = protocol::Bob<bitcoin::Address, BitcoinSegwitV0, Monero>;
impl_strict_encoding!(Bob);

/// Fully defined type for Bitcoin-Monero atomic swap trade.
pub type DealParameters =
Expand Down Expand Up @@ -226,6 +228,8 @@ impl Decodable for KeyManager {
}
}

impl_strict_encoding!(KeyManager);

impl KeyManager {
/// Generate the derivation path of a key, computed as:
/// `m/44'/{blockchain}'/{swap_index}'/{key_type}'/{key_idx}'`.
Expand Down