Skip to content

Commit

Permalink
Merge pull request #272 from RGB-WG/fix/271
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr-orlovsky
dr-orlovsky authored Sep 19, 2024
2 parents 94aeb57 + fc20101 commit 670a7b6
Show file tree
Hide file tree
Showing 17 changed files with 781 additions and 1,853 deletions.
325 changes: 18 additions & 307 deletions src/containers/anchors.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,18 @@
// limitations under the License.

use std::cmp::Ordering;
use std::vec;

use amplify::ByteArray;
use bp::dbc::opret::OpretProof;
use bp::dbc::tapret::TapretProof;
use bp::dbc::{anchor, Anchor};
use bp::{Tx, Txid};
use commit_verify::{mpc, CommitId};
use rgb::validation::{DbcProof, EAnchor};
use rgb::{
BundleDisclosure, BundleId, ContractId, DiscloseHash, Operation, Transition, TransitionBundle,
XChain, XWitnessId,
};
use commit_verify::mpc;
use rgb::validation::DbcProof;
use rgb::{BundleId, DiscloseHash, TransitionBundle, XChain, XWitnessId};
use strict_encoding::StrictDumb;

use crate::{BundleExt, MergeReveal, MergeRevealError, RevealError, LIB_NAME_RGB_STD};
use crate::{MergeReveal, MergeRevealError, LIB_NAME_RGB_STD};

#[derive(Clone, Eq, PartialEq, Debug)]
#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
Expand Down Expand Up @@ -153,34 +149,6 @@ impl PubWitness {
}
}

#[derive(Clone, Eq, PartialEq, Debug)]
#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
#[strict_type(lib = LIB_NAME_RGB_STD)]
pub(crate) struct AnchoredBundleDisclosure {
pub anchor: EAnchor,
pub bundle: BundleDisclosure,
}

impl AnchoredBundleDisclosure {
pub fn new(anchor: EAnchor, bundle: &TransitionBundle) -> Self {
Self {
anchor,
bundle: bundle.disclose(),
}
}
}

#[derive(Clone, Eq, PartialEq, Debug)]
#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
#[strict_type(lib = LIB_NAME_RGB_STD)]
#[derive(CommitEncode)]
#[commit_encode(strategy = strict, id = DiscloseHash)]
pub(crate) struct BundledWitnessDisclosure {
pub pub_witness: XPubWitness,
pub first: AnchoredBundleDisclosure,
pub second: Option<AnchoredBundleDisclosure>,
}

#[derive(Clone, Eq, Debug)]
#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
#[strict_type(lib = LIB_NAME_RGB_STD)]
Expand All @@ -189,50 +157,37 @@ pub(crate) struct BundledWitnessDisclosure {
derive(Serialize, Deserialize),
serde(crate = "serde_crate", rename_all = "camelCase")
)]
pub struct BundledWitness<P: mpc::Proof + StrictDumb = mpc::MerkleProof> {
#[derive(CommitEncode)]
#[commit_encode(strategy = strict, id = DiscloseHash)]
pub struct WitnessBundle<P: mpc::Proof + StrictDumb = mpc::MerkleProof> {
pub pub_witness: XPubWitness,
pub anchored_bundles: AnchoredBundles<P>,
pub anchor: Anchor<P, DbcProof>,
pub bundle: TransitionBundle,
}

impl<P: mpc::Proof + StrictDumb> PartialEq for BundledWitness<P> {
impl<P: mpc::Proof + StrictDumb> PartialEq for WitnessBundle<P> {
fn eq(&self, other: &Self) -> bool { self.pub_witness == other.pub_witness }
}

impl<P: mpc::Proof + StrictDumb> Ord for BundledWitness<P> {
impl<P: mpc::Proof + StrictDumb> Ord for WitnessBundle<P> {
fn cmp(&self, other: &Self) -> Ordering { self.pub_witness.cmp(&other.pub_witness) }
}

impl<P: mpc::Proof + StrictDumb> PartialOrd for BundledWitness<P> {
impl<P: mpc::Proof + StrictDumb> PartialOrd for WitnessBundle<P> {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> { Some(self.cmp(other)) }
}

impl<P: mpc::Proof + StrictDumb> BundledWitness<P> {
pub fn bundles(&self) -> vec::IntoIter<&TransitionBundle> { self.anchored_bundles.bundles() }
}

impl BundledWitness<mpc::MerkleProof> {
impl WitnessBundle<mpc::MerkleProof> {
pub fn witness_id(&self) -> XWitnessId { self.pub_witness.to_witness_id() }

pub(crate) fn disclose(&self) -> BundledWitnessDisclosure {
let mut pairs = self.anchored_bundles.pairs();
let (a1, b1) = pairs.next().expect("there always at least one bundle");
let second = pairs
.next()
.map(|(a, b)| AnchoredBundleDisclosure::new(a, b));
BundledWitnessDisclosure {
pub_witness: self.pub_witness.clone(),
first: AnchoredBundleDisclosure::new(a1, b1),
second,
}
}

pub fn disclose_hash(&self) -> DiscloseHash { self.disclose().commit_id() }
}

impl BundledWitness {
impl WitnessBundle {
pub fn merge_reveal(mut self, other: Self) -> Result<Self, MergeRevealError> {
self.pub_witness = self.pub_witness.merge_reveal(other.pub_witness)?;
self.anchored_bundles = self.anchored_bundles.merge_reveal(other.anchored_bundles)?;
if self.anchor != other.anchor {
return Err(MergeRevealError::AnchorsNonEqual(self.bundle.bundle_id()));
}
self.bundle = self.bundle.merge_reveal(other.bundle)?;
Ok(self)
}
}
Expand Down Expand Up @@ -311,247 +266,3 @@ impl AnchorSet {
}
}
}

#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(StrictType, StrictEncode, StrictDecode)]
#[strict_type(lib = LIB_NAME_RGB_STD, tags = custom)]
#[cfg_attr(
feature = "serde",
derive(Serialize, Deserialize),
serde(crate = "serde_crate", rename_all = "camelCase")
)]
pub enum AnchoredBundles<P: mpc::Proof + StrictDumb = mpc::MerkleProof> {
#[strict_type(tag = 0x01)]
Tapret(Anchor<P, TapretProof>, TransitionBundle),
#[strict_type(tag = 0x02)]
Opret(Anchor<P, OpretProof>, TransitionBundle),
#[strict_type(tag = 0x03)]
Double {
tapret_anchor: Anchor<P, TapretProof>,
tapret_bundle: TransitionBundle,
opret_anchor: Anchor<P, OpretProof>,
opret_bundle: TransitionBundle,
},
}

impl<P: mpc::Proof + StrictDumb> StrictDumb for AnchoredBundles<P> {
fn strict_dumb() -> Self { Self::Opret(strict_dumb!(), strict_dumb!()) }
}

impl<P: mpc::Proof + StrictDumb> AnchoredBundles<P> {
pub fn with(anchor: EAnchor<P>, bundle: TransitionBundle) -> Self {
match anchor.dbc_proof {
DbcProof::Tapret(tapret) => Self::Tapret(Anchor::new(anchor.mpc_proof, tapret), bundle),
DbcProof::Opret(opret) => Self::Opret(Anchor::new(anchor.mpc_proof, opret), bundle),
}
}

pub fn has_tapret(&self) -> bool { matches!(self, Self::Tapret(..) | Self::Double { .. }) }

pub fn has_opret(&self) -> bool { matches!(self, Self::Opret(..) | Self::Double { .. }) }

pub fn pairs(&self) -> vec::IntoIter<(EAnchor<P>, &TransitionBundle)>
where P: Clone {
match self {
AnchoredBundles::Tapret(anchor, bundle) => {
let anchor = anchor.clone();
vec![(EAnchor::new(anchor.mpc_proof, anchor.dbc_proof.into()), bundle)]
}
AnchoredBundles::Opret(anchor, bundle) => {
let anchor = anchor.clone();
vec![(EAnchor::new(anchor.mpc_proof, anchor.dbc_proof.into()), bundle)]
}
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
} => {
let tapret_anchor = tapret_anchor.clone();
let opret_anchor = opret_anchor.clone();
vec![
(
EAnchor::new(tapret_anchor.mpc_proof, tapret_anchor.dbc_proof.into()),
tapret_bundle,
),
(
EAnchor::new(opret_anchor.mpc_proof, opret_anchor.dbc_proof.into()),
opret_bundle,
),
]
}
}
.into_iter()
}

pub fn bundles(&self) -> vec::IntoIter<&TransitionBundle> {
match self {
AnchoredBundles::Tapret(_, bundle) | AnchoredBundles::Opret(_, bundle) => vec![bundle],
AnchoredBundles::Double {
tapret_bundle,
opret_bundle,
..
} => vec![tapret_bundle, opret_bundle],
}
.into_iter()
}

pub fn bundles_mut(&mut self) -> vec::IntoIter<&mut TransitionBundle> {
match self {
AnchoredBundles::Tapret(_, bundle) | AnchoredBundles::Opret(_, bundle) => vec![bundle],
AnchoredBundles::Double {
tapret_bundle,
opret_bundle,
..
} => vec![tapret_bundle, opret_bundle],
}
.into_iter()
}

/// Ensures that the transition is revealed inside the anchored bundle.
///
/// # Returns
///
/// `true` if the transition was previously concealed; `false` if it was
/// already revealed; error if the transition is unrelated to the bundle.
pub fn reveal_transition(&mut self, mut transition: Transition) -> Result<bool, RevealError> {
for bundle in self.bundles_mut() {
match bundle.reveal_transition(transition) {
Ok(known) => return Ok(known),
Err(RevealError::UnrelatedTransition(_, t)) => transition = t,
}
}
Err(RevealError::UnrelatedTransition(transition.id(), transition))
}
}

impl AnchoredBundles {
pub fn to_anchor_set(
&self,
contract_id: ContractId,
bundle_id: BundleId,
) -> Result<AnchorSet, mpc::InvalidProof> {
let proto = mpc::ProtocolId::from_byte_array(contract_id.to_byte_array());
let msg = mpc::Message::from_byte_array(bundle_id.to_byte_array());
match self.clone() {
Self::Tapret(anchor, _) => anchor.to_merkle_block(proto, msg).map(AnchorSet::Tapret),
Self::Opret(anchor, _) => anchor.to_merkle_block(proto, msg).map(AnchorSet::Opret),
Self::Double {
tapret_anchor,
opret_anchor,
..
} => Ok(AnchorSet::Double {
tapret: tapret_anchor.to_merkle_block(proto, msg)?,
opret: opret_anchor.to_merkle_block(proto, msg)?,
}),
}
}
}

impl AnchoredBundles {
pub fn merge_reveal(self, other: Self) -> Result<Self, MergeRevealError> {
match (self, other) {
(AnchoredBundles::Tapret(anchor, bundle1), AnchoredBundles::Tapret(a, bundle2))
if a == anchor =>
{
Ok(AnchoredBundles::Tapret(anchor, bundle1.merge_reveal(bundle2)?))
}

(AnchoredBundles::Opret(anchor, bundle1), AnchoredBundles::Opret(a, bundle2))
if a == anchor =>
{
Ok(AnchoredBundles::Opret(anchor, bundle1.merge_reveal(bundle2)?))
}

(
AnchoredBundles::Tapret(tapret_anchor, tapret_bundle),
AnchoredBundles::Opret(opret_anchor, opret_bundle),
)
| (
AnchoredBundles::Opret(opret_anchor, opret_bundle),
AnchoredBundles::Tapret(tapret_anchor, tapret_bundle),
) => Ok(AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
}),

(
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
},
AnchoredBundles::Tapret(t, bundle),
)
| (
AnchoredBundles::Tapret(t, bundle),
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
},
) if tapret_anchor == t => Ok(AnchoredBundles::Double {
tapret_anchor,
opret_anchor,
tapret_bundle: tapret_bundle.merge_reveal(bundle)?,
opret_bundle,
}),

(
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
},
AnchoredBundles::Opret(o, bundle),
)
| (
AnchoredBundles::Opret(o, bundle),
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle,
opret_anchor,
opret_bundle,
},
) if opret_anchor == o => Ok(AnchoredBundles::Double {
tapret_anchor,
opret_anchor,
tapret_bundle: tapret_bundle.merge_reveal(bundle)?,
opret_bundle,
}),

(
AnchoredBundles::Double {
tapret_anchor,
tapret_bundle: tapret1,
opret_anchor,
opret_bundle: opret1,
},
AnchoredBundles::Double {
tapret_anchor: t,
opret_anchor: o,
tapret_bundle: tapret2,
opret_bundle: opret2,
..
},
) if tapret_anchor == t && opret_anchor == o => Ok(AnchoredBundles::Double {
tapret_anchor,
opret_anchor,
tapret_bundle: tapret1.merge_reveal(tapret2)?,
opret_bundle: opret1.merge_reveal(opret2)?,
}),

(me, _) => Err(MergeRevealError::AnchorsNonEqual(
me.bundles()
.next()
.expect("at least one bundle")
.bundle_id(),
)),
}
}
}
Loading

0 comments on commit 670a7b6

Please sign in to comment.