Skip to content

Commit

Permalink
chore: bump Pallas to v0.30.1 (#811)
Browse files Browse the repository at this point in the history
  • Loading branch information
scarmuega authored Aug 27, 2024
1 parent e408e06 commit dc2a079
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 29 deletions.
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ authors = ["Santiago Carmuega <[email protected]>"]
[dependencies]
pallas-multiplexer = "0.18.2"
pallas-miniprotocols = "0.18.2"
pallas-primitives = "0.29.0"
pallas-traverse = "0.29.0"
pallas-addresses = "0.29.0"
pallas-codec = "0.29.0"
pallas-crypto = "0.29.0"
pallas-primitives = "0.30.1"
pallas-traverse = "0.30.1"
pallas-addresses = "0.30.1"
pallas-codec = "0.30.1"
pallas-crypto = "0.30.1"
# pallas = { git = "https://github.com/txpipe/pallas" }
# pallas = { path = "../pallas/pallas" }
hex = "0.4.3"
Expand Down
73 changes: 64 additions & 9 deletions src/mapper/conway.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
use pallas_codec::utils::{KeepRaw, NonZeroInt};
use pallas_codec::utils::{KeepRaw, NonEmptyKeyValuePairs, NonZeroInt};

use pallas_primitives::conway::{
AuxiliaryData, Certificate, MintedBlock, MintedDatumOption, MintedPostAlonzoTransactionOutput,
MintedTransactionBody, MintedTransactionOutput, MintedWitnessSet, Multiasset, NetworkId,
RedeemerTag, RedeemersKey, RedeemersValue,
AuxiliaryData, Certificate, Coin, MintedBlock, MintedDatumOption,
MintedPostAlonzoTransactionOutput, MintedTransactionBody, MintedTransactionOutput,
MintedWitnessSet, Multiasset, NetworkId, RedeemerTag, RedeemersKey, RedeemersValue,
RewardAccount, Value,
};

use pallas_crypto::hash::Hash;
use pallas_primitives::ToCanonicalJson as _;
use pallas_traverse::OriginalHash;

use crate::model::{
BlockRecord, Era, MintRecord, PlutusRedeemerRecord, TransactionRecord, TxOutputRecord,
BlockRecord, Era, MintRecord, OutputAssetRecord, PlutusRedeemerRecord, TransactionRecord,
TxOutputRecord, WithdrawalRecord,
};
use crate::utils::time::TimeProvider;
use crate::{
Expand All @@ -22,6 +24,27 @@ use crate::{
use super::{map::ToHex, EventWriter};

impl EventWriter {
pub fn collect_conway_coin_value(&self, amount: &Value) -> u64 {
match amount {
Value::Coin(x) => *x,
Value::Multiasset(x, _) => *x,
}
}

pub fn collect_conway_asset_records(&self, amount: &Value) -> Vec<OutputAssetRecord> {
match amount {
Value::Coin(_) => vec![],
Value::Multiasset(_, policies) => policies
.iter()
.flat_map(|(policy, assets)| {
assets.iter().map(|(asset, amount)| {
self.to_transaction_output_asset_record(policy, asset, u64::from(amount))
})
})
.collect(),
}
}

pub fn collect_conway_mint_records(&self, mint: &Multiasset<NonZeroInt>) -> Vec<MintRecord> {
mint.iter()
.flat_map(|(policy, assets)| {
Expand Down Expand Up @@ -50,8 +73,8 @@ impl EventWriter {

Ok(TxOutputRecord {
address: address.to_string(),
amount: super::map::get_tx_output_coin_value(&output.value),
assets: self.collect_asset_records(&output.value).into(),
amount: self.collect_conway_coin_value(&output.value),
assets: self.collect_conway_asset_records(&output.value).into(),
datum_hash: match &output.datum_option {
Some(MintedDatumOption::Hash(x)) => Some(x.to_string()),
Some(MintedDatumOption::Data(x)) => Some(x.original_hash().to_hex()),
Expand Down Expand Up @@ -98,6 +121,22 @@ impl EventWriter {
.collect()
}

pub fn collect_conway_withdrawal_records(
&self,
withdrawls: &NonEmptyKeyValuePairs<RewardAccount, Coin>,
) -> Vec<WithdrawalRecord> {
withdrawls
.iter()
.map(|(reward_account, coin)| WithdrawalRecord {
reward_account: {
let hex = reward_account.to_hex();
hex.strip_prefix("e1").map(|x| x.to_string()).unwrap_or(hex)
},
coin: *coin,
})
.collect()
}

pub fn to_conway_tx_size(
&self,
body: &KeepRaw<MintedTransactionBody>,
Expand Down Expand Up @@ -243,7 +282,7 @@ impl EventWriter {
}

if let Some(withdrawals) = &body.withdrawals {
record.withdrawals = self.collect_withdrawal_records(withdrawals).into();
record.withdrawals = self.collect_conway_withdrawal_records(withdrawals).into();
}
}

Expand Down Expand Up @@ -317,6 +356,22 @@ impl EventWriter {
.collect()
}

pub fn crawl_conway_transaction_output_amount(&self, amount: &Value) -> Result<(), Error> {
if let Value::Multiasset(_, policies) = amount {
for (policy, assets) in policies.iter() {
for (asset, amount) in assets.iter() {
self.append_from(self.to_transaction_output_asset_record(
policy,
asset,
u64::from(amount),
))?;
}
}
}

Ok(())
}

fn crawl_conway_output(&self, output: &MintedPostAlonzoTransactionOutput) -> Result<(), Error> {
let record = self.to_conway_output_record(output)?;
self.append(record.into())?;
Expand All @@ -328,7 +383,7 @@ impl EventWriter {
..EventContext::default()
});

child.crawl_transaction_output_amount(&output.value)?;
child.crawl_conway_transaction_output_amount(&output.value)?;

if let Some(MintedDatumOption::Data(datum)) = &output.datum_option {
let record = self.to_plutus_datum_record(datum)?;
Expand Down

0 comments on commit dc2a079

Please sign in to comment.