map fix

Cargo.toml

@@ -12,9 +12,9 @@ authors = ["Santiago Carmuega <santiago@carmuega.me>"]
 
 
 [dependencies]
-pallas = { git = "https://github.com/lisicky/pallas", branch = "hotfix/v0.18" }
+pallas = { git = "https://github.com/Emurgo/pallas", tag = "conway_2" }
 # pallas = { git = "https://github.com/txpipe/pallas" }
-# pallas = { path = "../pallas/pallas" }
+# pallas = { path = "../../pallas/pallas" }
 hex = "0.4.3"
 net2 = "0.2.37"
 bech32 = "0.9.1"

src/mapper/babbage.rs

@@ -81,7 +81,7 @@ impl EventWriter {
         }
 
         // Add Collateral Stuff
-        let collateral_inputs = &body.collateral.as_deref();
+        let collateral_inputs = &body.collateral;
         record.collateral_input_count = collateral_inputs.iter().count();
         record.has_collateral_output = body.collateral_return.is_some();
 
@@ -92,7 +92,7 @@ impl EventWriter {
         }
 
         if let Some(req_signers) = &body.required_signers {
-            let req_signers = self.collect_required_signers_records(req_signers)?;
+            let req_signers = self.collect_required_signers_records(req_signers.into())?;
             record.required_signers_count = req_signers.len();
 
             if self.config.include_transaction_details {
@@ -110,7 +110,7 @@ impl EventWriter {
 
             // transaction_details collateral stuff
             record.collateral_inputs =
-                collateral_inputs.map(|inputs| self.collect_input_records(inputs));
+                collateral_inputs.as_ref().map(|inputs| self.collect_input_records(inputs));
 
             record.collateral_output = body.collateral_return.as_ref().map(|output| match output {
                 MintedTransactionOutput::Legacy(x) => self.to_legacy_output_record(x).unwrap(),
@@ -126,23 +126,23 @@ impl EventWriter {
 
             if let Some(witnesses) = witness_set {
                 record.vkey_witnesses = self
-                    .collect_vkey_witness_records(&witnesses.vkeywitness)?
+                    .collect_vkey_witness_records_babbage(&witnesses.vkeywitness)?
                     .into();
 
                 record.native_witnesses = self
-                    .collect_native_witness_records(&witnesses.native_script)?
+                    .collect_native_witness_records_babbage(&witnesses.native_script)?
                     .into();
 
                 record.plutus_witnesses = self
-                    .collect_plutus_v1_witness_records(&witnesses.plutus_v1_script)?
+                    .collect_plutus_v1_witness_records_babbage(&witnesses.plutus_v1_script)?
                     .into();
 
                 record.plutus_redeemers = self
                     .collect_plutus_redeemer_records(&witnesses.redeemer)?
                     .into();
 
                 record.plutus_data = self
-                    .collect_witness_plutus_datum_records(&witnesses.plutus_data)?
+                    .collect_witness_plutus_datum_records_babbage(&witnesses.plutus_data)?
                     .into();
             }
 
@@ -278,7 +278,7 @@ impl EventWriter {
         }
 
         if let Some(datums) = &witness_set.plutus_data {
-            for datum in datums.iter() {
+            for datum in datums {
                 self.append_from(self.to_plutus_datum_record(datum)?)?;
             }
         }

src/mapper/collect.rs

@@ -1,4 +1,5 @@
-use pallas::ledger::primitives::alonzo::{Certificate, RequiredSigners};
+use std::option::IntoIter;
+use pallas::ledger::primitives::alonzo::{AddrKeyhash, AddrKeyhashes, Certificates, RequiredSigners, TransactionInputs};
 use pallas::{
     codec::utils::{KeepRaw, KeyValuePairs, MaybeIndefArray},
     ledger::{
@@ -15,6 +16,7 @@ use pallas::{
         traverse::OriginalHash,
     },
 };
+use pallas::ledger::primitives::babbage::{KeepRawPlutusDatas, NativeScripts, PlutusV1Scripts, VKeyWitnesses};
 
 use crate::model::{CertificateRecord, RequiredSignerRecord};
 use crate::{
@@ -29,7 +31,7 @@ use crate::{
 use super::{map::ToHex, EventWriter};
 
 impl EventWriter {
-    pub fn collect_input_records(&self, source: &[TransactionInput]) -> Vec<TxInputRecord> {
+    pub fn collect_input_records(&self, source: &TransactionInputs) -> Vec<TxInputRecord> {
         source
             .iter()
             .map(|i| self.to_transaction_input_record(i))
@@ -148,6 +150,16 @@ impl EventWriter {
         }
     }
 
+    pub fn collect_vkey_witness_records_babbage(
+        &self,
+        witness_set: &Option<VKeyWitnesses>,
+    ) -> Result<Vec<VKeyWitnessRecord>, Error> {
+        match witness_set {
+            Some(all) => all.iter().map(|i| self.to_vkey_witness_record(i)).collect(),
+            None => Ok(vec![]),
+        }
+    }
+
     pub fn collect_native_witness_records(
         &self,
         witness_set: &Option<Vec<NativeScript>>,
@@ -161,6 +173,19 @@ impl EventWriter {
         }
     }
 
+    pub fn collect_native_witness_records_babbage(
+        &self,
+        witness_set: &Option<NativeScripts>,
+    ) -> Result<Vec<NativeWitnessRecord>, Error> {
+        match witness_set {
+            Some(all) => all
+                .iter()
+                .map(|i| self.to_native_witness_record(i))
+                .collect(),
+            None => Ok(vec![]),
+        }
+    }
+
     pub fn collect_plutus_v1_witness_records(
         &self,
         witness_set: &Option<Vec<PlutusScript>>,
@@ -174,6 +199,19 @@ impl EventWriter {
         }
     }
 
+    pub fn collect_plutus_v1_witness_records_babbage(
+        &self,
+        witness_set: &Option<PlutusV1Scripts>,
+    ) -> Result<Vec<PlutusWitnessRecord>, Error> {
+        match &witness_set {
+            Some(all) => all
+                .iter()
+                .map(|i| self.to_plutus_v1_witness_record(i))
+                .collect(),
+            None => Ok(vec![]),
+        }
+    }
+
     pub fn collect_plutus_v2_witness_records(
         &self,
         witness_set: &Option<MaybeIndefArray<PlutusV2Script>>,
@@ -210,6 +248,16 @@ impl EventWriter {
         }
     }
 
+    pub fn collect_witness_plutus_datum_records_babbage(
+        &self,
+        witness_set: &Option<KeepRawPlutusDatas>,
+    ) -> Result<Vec<PlutusDatumRecord>, Error> {
+        match &witness_set {
+            Some(all) => all.into_iter().map(|i| self.to_plutus_datum_record(i)).collect(),
+            None => Ok(vec![]),
+        }
+    }
+
     pub fn collect_shelley_tx_records(
         &self,
         block: &MintedBlock,
@@ -236,7 +284,7 @@ impl EventWriter {
 
     pub fn collect_required_signers_records(
         &self,
-        req_signers: &RequiredSigners,
+        req_signers: &Vec<AddrKeyhash>,
     ) -> Result<Vec<RequiredSignerRecord>, Error> {
         let mut signers = vec![];
         for req_sign in req_signers {