fix

Author: AmbientTea

toolkit/smart-contracts/offchain/src/reserve/handover.rs

@@ -41,7 +41,9 @@ use ogmios_client::{
 	transactions::Transactions,
 	types::OgmiosUtxo,
 };
-use partner_chains_plutus_data::{bridge::TokenTransferMetadatumV1, reserve::ReserveRedeemer};
+use partner_chains_plutus_data::{
+	VersionedMetadatum, bridge::TokenTransferMetadatum, reserve::ReserveRedeemer,
+};
 use sidechain_domain::UtxoId;
 
 /// Spends current UTXO at validator address to illiquid supply validator and burn reserve auth policy token, preventing further operations.
@@ -93,7 +95,7 @@ fn build_tx(
 
 	let reserve_auth_policy_spend_cost = costs.get_one_spend();
 
-	tx_builder.add_metadatum(&0u64.into(), &TokenTransferMetadatumV1::ReserveTransfer.try_into()?);
+	tx_builder.add_metadatum(&0u64.into(), &TokenTransferMetadatum::reserve_v1().encode()?);
 
 	// mint goveranance token
 	tx_builder.add_mint_one_script_token_using_reference_script(

toolkit/smart-contracts/offchain/src/reserve/release.rs

@@ -39,7 +39,9 @@ use ogmios_client::{
 	query_ledger_state::*, query_network::QueryNetwork, transactions::Transactions,
 	types::OgmiosUtxo,
 };
-use partner_chains_plutus_data::{bridge::TokenTransferMetadatumV1, reserve::ReserveRedeemer};
+use partner_chains_plutus_data::{
+	VersionedMetadatum, bridge::TokenTransferMetadatum, reserve::ReserveRedeemer,
+};
 use sidechain_domain::{McTxHash, UtxoId};
 use std::num::NonZero;
 
@@ -129,7 +131,7 @@ fn reserve_release_tx(
 	let left_in_reserve = reserve_balance.checked_sub(amount_to_transfer)
 		.ok_or_else(||anyhow!("Not enough funds in the reserve to transfer {amount_to_transfer} tokens (reserve balance: {reserve_balance})"))?;
 
-	tx_builder.add_metadatum(&0u64.into(), &TokenTransferMetadatumV1::ReserveTransfer.try_into()?);
+	tx_builder.add_metadatum(&0u64.into(), &TokenTransferMetadatum::reserve_v1().encode()?);
 
 	// Additional reference scripts
 	tx_builder.add_script_reference_input(

toolkit/smart-contracts/plutus-data/src/bridge.rs

@@ -11,10 +11,22 @@ pub enum TokenTransferMetadatum {
 	V1(TokenTransferMetadatumV1),
 }
 
+impl TokenTransferMetadatum {
+	/// Creates v1 reserve transfer metadatum
+	pub fn reserve_v1() -> Self {
+		Self::V1(TokenTransferMetadatumV1::ReserveTransfer)
+	}
+
+	/// Creates v1 user transfer metadatum
+	pub fn user_v1(receiver: ByteString) -> Self {
+		Self::V1(TokenTransferMetadatumV1::UserTransfer { receiver })
+	}
+}
+
 impl VersionedMetadatum for TokenTransferMetadatum {
 	fn decode_version(version: i32, payload: TransactionMetadatum) -> Result<Self, JsError> {
 		match version {
-			1 => Ok(Self::V1(payload.try_into()?)),
+			1 => Ok(Self::V1(TokenTransferMetadatumV1::decode_payload(payload)?)),
 			_ => Err(JsError::from_str(&format!(
 				"Unsupported TokenTransferMetadatum version {version}"
 			))),
@@ -29,7 +41,7 @@ impl VersionedMetadatum for TokenTransferMetadatum {
 
 	fn encode_payload(&self) -> Result<TransactionMetadatum, JsError> {
 		match self {
-			Self::V1(v1) => v1.clone().try_into(),
+			Self::V1(v1) => v1.encode_payload(),
 		}
 	}
 }
@@ -46,10 +58,8 @@ pub enum TokenTransferMetadatumV1 {
 	ReserveTransfer,
 }
 
-impl TryFrom<TransactionMetadatum> for TokenTransferMetadatumV1 {
-	type Error = JsError;
-
-	fn try_from(value: TransactionMetadatum) -> Result<Self, Self::Error> {
+impl TokenTransferMetadatumV1 {
+	fn decode_payload(value: TransactionMetadatum) -> Result<Self, JsError> {
 		if let Ok("reserve") = value.as_text().as_deref() {
 			return Ok(Self::ReserveTransfer);
 		}
@@ -58,22 +68,20 @@ impl TryFrom<TransactionMetadatum> for TokenTransferMetadatumV1 {
 			receiver: ByteString(value.as_map()?.get_str("receiver")?.as_bytes()?),
 		})
 	}
-}
-
-impl TryFrom<TokenTransferMetadatumV1> for TransactionMetadatum {
-	type Error = JsError;
 
-	fn try_from(value: TokenTransferMetadatumV1) -> Result<Self, Self::Error> {
-		match value {
+	fn encode_payload(&self) -> Result<TransactionMetadatum, JsError> {
+		match self {
+			TokenTransferMetadatumV1::ReserveTransfer => {
+				Ok(TransactionMetadatum::new_text("reserve".to_string())?)
+			},
 			TokenTransferMetadatumV1::UserTransfer { receiver } => {
 				let receiver_label = TransactionMetadatum::new_text("receiver".to_string())?;
 				let receiver_bytes = TransactionMetadatum::new_bytes(receiver.to_vec())?;
 
 				let mut map = MetadataMap::new();
 				map.insert(&receiver_label, &receiver_bytes);
-				Ok(Self::new_map(&map))
+				Ok(TransactionMetadatum::new_map(&map))
 			},
-			TokenTransferMetadatumV1::ReserveTransfer => Ok(Self::new_text("reserve".to_string())?),
 		}
 	}
 }