-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #460 from Chia-Network/owned-conditions
Move `PySpend` and `PySpendBundleConditions` to `chia-consensus` and rename to `Owned*`
- Loading branch information
Showing
4 changed files
with
162 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| use chia_protocol::{Bytes, Bytes32, Bytes48}; | ||
| use chia_streamable_macro::Streamable; | ||
| use clvmr::{Allocator, NodePtr}; | ||
|
|
||
| use super::conditions::{Spend, SpendBundleConditions}; | ||
|
|
||
| #[cfg(feature = "py-bindings")] | ||
| use chia_py_streamable_macro::{PyJsonDict, PyStreamable}; | ||
|
|
||
| #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)] | ||
| #[cfg_attr( | ||
| feature = "py-bindings", | ||
| pyo3::pyclass(name = "Spend", get_all, frozen), | ||
| derive(PyJsonDict, PyStreamable) | ||
| )] | ||
| pub struct OwnedSpend { | ||
| pub coin_id: Bytes32, | ||
| pub parent_id: Bytes32, | ||
| pub puzzle_hash: Bytes32, | ||
| pub coin_amount: u64, | ||
| pub height_relative: Option<u32>, | ||
| pub seconds_relative: Option<u64>, | ||
| pub before_height_relative: Option<u32>, | ||
| pub before_seconds_relative: Option<u64>, | ||
| pub birth_height: Option<u32>, | ||
| pub birth_seconds: Option<u64>, | ||
| pub create_coin: Vec<(Bytes32, u64, Option<Bytes>)>, | ||
| pub agg_sig_me: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_parent: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_puzzle: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_amount: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_puzzle_amount: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_parent_amount: Vec<(Bytes48, Bytes)>, | ||
| pub agg_sig_parent_puzzle: Vec<(Bytes48, Bytes)>, | ||
| pub flags: u32, | ||
| } | ||
|
|
||
| #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)] | ||
| #[cfg_attr( | ||
| feature = "py-bindings", | ||
| pyo3::pyclass(name = "SpendBundleConditions", get_all, frozen), | ||
| derive(PyJsonDict, PyStreamable) | ||
| )] | ||
| pub struct OwnedSpendBundleConditions { | ||
| pub spends: Vec<OwnedSpend>, | ||
| pub reserve_fee: u64, | ||
| // the highest height/time conditions (i.e. most strict) | ||
| pub height_absolute: u32, | ||
| pub seconds_absolute: u64, | ||
| // when set, this is the lowest (i.e. most restrictive) of all | ||
| // ASSERT_BEFORE_HEIGHT_ABSOLUTE conditions | ||
| pub before_height_absolute: Option<u32>, | ||
| // ASSERT_BEFORE_SECONDS_ABSOLUTE conditions | ||
| pub before_seconds_absolute: Option<u64>, | ||
| // Unsafe Agg Sig conditions (i.e. not tied to the spend generating it) | ||
| pub agg_sig_unsafe: Vec<(Bytes48, Bytes)>, | ||
| pub cost: u64, | ||
| // the sum of all values of all spent coins | ||
| pub removal_amount: u128, | ||
| // the sum of all amounts of CREATE_COIN conditions | ||
| pub addition_amount: u128, | ||
| } | ||
|
|
||
| impl OwnedSpend { | ||
| pub fn from(a: &Allocator, spend: Spend) -> Self { | ||
| let mut create_coin = | ||
| Vec::<(Bytes32, u64, Option<Bytes>)>::with_capacity(spend.create_coin.len()); | ||
| for c in spend.create_coin { | ||
| create_coin.push(( | ||
| c.puzzle_hash, | ||
| c.amount, | ||
| if c.hint != a.nil() { | ||
| Some(a.atom(c.hint).as_ref().into()) | ||
| } else { | ||
| None | ||
| }, | ||
| )); | ||
| } | ||
|
|
||
| Self { | ||
| coin_id: *spend.coin_id, | ||
| parent_id: a.atom(spend.parent_id).as_ref().try_into().unwrap(), | ||
| puzzle_hash: a.atom(spend.puzzle_hash).as_ref().try_into().unwrap(), | ||
| coin_amount: spend.coin_amount, | ||
| height_relative: spend.height_relative, | ||
| seconds_relative: spend.seconds_relative, | ||
| before_height_relative: spend.before_height_relative, | ||
| before_seconds_relative: spend.before_seconds_relative, | ||
| birth_height: spend.birth_height, | ||
| birth_seconds: spend.birth_seconds, | ||
| create_coin, | ||
| agg_sig_me: convert_agg_sigs(a, &spend.agg_sig_me), | ||
| agg_sig_parent: convert_agg_sigs(a, &spend.agg_sig_parent), | ||
| agg_sig_puzzle: convert_agg_sigs(a, &spend.agg_sig_puzzle), | ||
| agg_sig_amount: convert_agg_sigs(a, &spend.agg_sig_amount), | ||
| agg_sig_puzzle_amount: convert_agg_sigs(a, &spend.agg_sig_puzzle_amount), | ||
| agg_sig_parent_amount: convert_agg_sigs(a, &spend.agg_sig_parent_amount), | ||
| agg_sig_parent_puzzle: convert_agg_sigs(a, &spend.agg_sig_parent_puzzle), | ||
| flags: spend.flags, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl OwnedSpendBundleConditions { | ||
| pub fn from(a: &Allocator, sb: SpendBundleConditions) -> Self { | ||
| let mut spends = Vec::<OwnedSpend>::new(); | ||
| for s in sb.spends { | ||
| spends.push(OwnedSpend::from(a, s)); | ||
| } | ||
|
|
||
| let mut agg_sigs = Vec::<(Bytes48, Bytes)>::with_capacity(sb.agg_sig_unsafe.len()); | ||
| for (pk, msg) in sb.agg_sig_unsafe { | ||
| agg_sigs.push(( | ||
| a.atom(pk).as_ref().try_into().unwrap(), | ||
| a.atom(msg).as_ref().into(), | ||
| )); | ||
| } | ||
|
|
||
| Self { | ||
| spends, | ||
| reserve_fee: sb.reserve_fee, | ||
| height_absolute: sb.height_absolute, | ||
| seconds_absolute: sb.seconds_absolute, | ||
| before_height_absolute: sb.before_height_absolute, | ||
| before_seconds_absolute: sb.before_seconds_absolute, | ||
| agg_sig_unsafe: agg_sigs, | ||
| cost: sb.cost, | ||
| removal_amount: sb.removal_amount, | ||
| addition_amount: sb.addition_amount, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn convert_agg_sigs(a: &Allocator, agg_sigs: &[(NodePtr, NodePtr)]) -> Vec<(Bytes48, Bytes)> { | ||
| let mut ret = Vec::<(Bytes48, Bytes)>::new(); | ||
| for (pk, msg) in agg_sigs { | ||
| ret.push(( | ||
| a.atom(*pk).as_ref().try_into().unwrap(), | ||
| a.atom(*msg).as_ref().into(), | ||
| )); | ||
| } | ||
| ret | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters