From 8f765bfd526cc8824b0aa4606c020ac9016ef8b7 Mon Sep 17 00:00:00 2001 From: rvcas Date: Mon, 6 Mar 2023 13:17:14 -0500 Subject: [PATCH] fix: some breaking changes from pallas v0.18 --- crates/uplc/src/tx/eval.rs | 10 ++++++---- crates/uplc/src/tx/script_context.rs | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/uplc/src/tx/eval.rs b/crates/uplc/src/tx/eval.rs index ad9ccdcf..b62bbaf1 100644 --- a/crates/uplc/src/tx/eval.rs +++ b/crates/uplc/src/tx/eval.rs @@ -295,7 +295,8 @@ fn get_tx_info_v1( let outputs = body .outputs .iter() - .map(|output| TxOut::V1(sort_tx_out_value(output))) + .cloned() + .map(|output| TxOut::V1(sort_tx_out_value(&output.into()))) .collect(); let fee = Value::Coin(body.fee); @@ -341,7 +342,7 @@ fn get_tx_info_v1( .sorted() .collect(); - let id = tx.transaction_body.compute_hash(); + let id = tx.transaction_body.original_hash(); Ok(TxInfo::V1(TxInfoV1 { inputs, @@ -372,7 +373,8 @@ fn get_tx_info_v2( let outputs = body .outputs .iter() - .map(|output| TxOut::V2(sort_tx_out_value(output))) + .cloned() + .map(|output| TxOut::V2(sort_tx_out_value(&output.into()))) .collect(); let fee = Value::Coin(body.fee); @@ -443,7 +445,7 @@ fn get_tx_info_v2( .collect(), ); - let id = tx.transaction_body.compute_hash(); + let id = tx.transaction_body.original_hash(); Ok(TxInfo::V2(TxInfoV2 { inputs, diff --git a/crates/uplc/src/tx/script_context.rs b/crates/uplc/src/tx/script_context.rs index a5d82476..840480da 100644 --- a/crates/uplc/src/tx/script_context.rs +++ b/crates/uplc/src/tx/script_context.rs @@ -5,11 +5,10 @@ use pallas_primitives::babbage::{ AddrKeyhash, Certificate, Coin, DatumHash, PlutusData, PolicyId, Redeemer, StakeCredential, TransactionInput, TransactionOutput, Value, }; -use serde::Deserialize; use super::to_plutus_data::MintValue; -#[derive(Debug, PartialEq, Clone, Deserialize)] +#[derive(Debug, PartialEq, Clone)] pub struct ResolvedInput { pub input: TransactionInput, pub output: TransactionOutput,