chore(deps): Upgrade Pallas to v0.7.0 (#198)

txpipe · Mar 16, 2022 · 7fd5a09 · 7fd5a09
1 parent 916b605
commit 7fd5a09
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Santiago Carmuega <[email protected]>"]
 
 
 [dependencies]
-pallas = "0.6.0"
+pallas = "0.7.0"
 # pallas = { path = "../pallas/pallas" }
 hex = "0.4.3"
 net2 = "0.2.37"
@@ -24,10 +24,9 @@ crossterm = "0.23"
 merge = "0.1.0"
 config = { version = "0.12.0", default-features = false, features = ["toml"] }
 serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1.0.79"
+serde_json = { version = "1.0.79", features = ["arbitrary_precision"] }
 strum = "0.24"
 strum_macros = "0.24"
-minicbor = "0.14.1"
 prometheus_exporter = { version = "0.8.4", default-features = false }
 
 # feature logs

diff --git a/src/mapper/map.rs b/src/mapper/map.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use minicbor::bytes::ByteVec;
+use pallas::codec::minicbor::bytes::ByteVec;
 use pallas::crypto::hash::Hash;
 use pallas::ledger::primitives::alonzo::{
     self as alonzo, AuxiliaryData, Block, Certificate, InstantaneousRewardSource,
@@ -102,7 +102,7 @@ impl EventWriter {
 
     pub fn to_metadatum_json(&self, source: &Metadatum) -> Result<JsonValue, Error> {
         match source {
-            Metadatum::Int(x) => Ok(json!(x)),
+            Metadatum::Int(x) => Ok(json!(i128::from(*x))),
             Metadatum::Bytes(x) => Ok(json!(hex::encode(x.as_slice()))),
             Metadatum::Text(x) => Ok(json!(x)),
             Metadatum::Array(x) => {
@@ -130,7 +130,7 @@ impl EventWriter {
         let data = MetadataRecord {
             label: metadatum_to_string_key(label),
             content: match value {
-                Metadatum::Int(x) => MetadatumRendition::IntScalar(*x),
+                Metadatum::Int(x) => MetadatumRendition::IntScalar(i128::from(*x)),
                 Metadatum::Bytes(x) => MetadatumRendition::BytesHex(hex::encode(x.as_slice())),
                 Metadatum::Text(x) => MetadatumRendition::TextScalar(x.clone()),
                 Metadatum::Array(_) => {

diff --git a/src/mapper/shelley.rs b/src/mapper/shelley.rs
@@ -21,7 +21,9 @@ impl EventWriter {
             self.append_from(record)?;
 
             match label {
-                Metadatum::Int(721) => self.crawl_metadata_label_721(content)?,
+                Metadatum::Int(i) if i128::from(*i) == 721i128 => {
+                    self.crawl_metadata_label_721(content)?
+                }
                 Metadatum::Text(x) if x == "721" => self.crawl_metadata_label_721(content)?,
                 _ => (),
             };

diff --git a/src/model.rs b/src/model.rs
@@ -27,7 +27,7 @@ pub enum Era {
 pub enum MetadatumRendition {
     MapJson(JsonValue),
     ArrayJson(JsonValue),
-    IntScalar(i64),
+    IntScalar(i128),
     TextScalar(String),
     BytesHex(String),
 }

diff --git a/src/sources/n2c/blocks.rs b/src/sources/n2c/blocks.rs
@@ -1,6 +1,7 @@
 use std::ops::Deref;
 
 use pallas::{
+    codec::minicbor::decode,
     ledger::primitives::{alonzo, byron, probing, Era},
     network::miniprotocols::{chainsync::BlockContent, Point},
 };
@@ -22,18 +23,18 @@ impl TryFrom<BlockContent> for MultiEraBlock {
         match probing::probe_block_cbor_era(bytes) {
             probing::Outcome::Matched(era) => match era {
                 pallas::ledger::primitives::Era::Byron => {
-                    let block = minicbor::decode(bytes)?;
+                    let block = decode(bytes)?;
                     Ok(MultiEraBlock::Byron(Box::new(block)))
                 }
                 _ => {
-                    let alonzo::BlockWrapper(_, block) = minicbor::decode(bytes)?;
+                    let alonzo::BlockWrapper(_, block) = decode(bytes)?;
                     Ok(MultiEraBlock::AlonzoCompatible(Box::new(block), era))
                 }
             },
             // TODO: we're assuming that the genesis block is Byron-compatible. Is this a safe
             // assumption?
             probing::Outcome::GenesisBlock => {
-                let block = minicbor::decode(bytes)?;
+                let block = decode(bytes)?;
                 Ok(MultiEraBlock::Byron(Box::new(block)))
             }
             probing::Outcome::Inconclusive => {

diff --git a/src/sources/n2n/headers.rs b/src/sources/n2n/headers.rs
@@ -1,4 +1,5 @@
 use pallas::{
+    codec::minicbor::decode,
     ledger::primitives::{alonzo, byron},
     network::miniprotocols::{chainsync::HeaderContent, Point},
 };
@@ -19,16 +20,16 @@ impl TryFrom<HeaderContent> for MultiEraHeader {
         match value.variant {
             0 => match value.byron_prefix {
                 Some((0, _)) => {
-                    let header = minicbor::decode(&value.cbor)?;
+                    let header = decode(&value.cbor)?;
                     Ok(MultiEraHeader::ByronBoundary(header))
                 }
                 _ => {
-                    let header = minicbor::decode(&value.cbor)?;
+                    let header = decode(&value.cbor)?;
                     Ok(MultiEraHeader::Byron(header))
                 }
             },
             _ => {
-                let header = minicbor::decode(&value.cbor)?;
+                let header = decode(&value.cbor)?;
                 Ok(MultiEraHeader::AlonzoCompatible(header))
             }
         }