Use BigInt where i32 and i64 is not enough

Author: ginnun

pallas-hardano/src/display/haskell_display.rs

@@ -1,6 +1,5 @@
 use std::{
     collections::{BTreeSet, HashMap},
-    fmt::format,
     net::Ipv6Addr,
     ops::Deref,
 };
@@ -20,11 +19,11 @@ use pallas_crypto::hash::{Hash, Hasher};
 use pallas_network::miniprotocols::{
     handshake::NetworkMagic,
     localstate::queries_v16::{
-        primitives::Bytes, Anchor, AssetName, BoundedBytes, Constitution, CostModel, CostModels,
-        DRep, DRepVotingThresholds, DatumHash, DatumOption, ExUnitPrices, FieldedRewardAccount,
-        GovAction, GovActionId, PParamsUpdate, PlutusData, PolicyId, PoolMetadata,
-        PoolVotingThresholds, ProposalProcedure, ProtocolVersion, RationalNumber, Relay,
-        ScriptHash, TransactionInput, TransactionOutput, Value, Vote,
+        primitives::Bytes, Anchor, AssetName, BigInt, BoundedBytes, Constitution, CostModel,
+        CostModels, DRep, DRepVotingThresholds, DatumHash, DatumOption, ExUnitPrices,
+        FieldedRewardAccount, GovAction, GovActionId, PParamsUpdate, PlutusData, PolicyId,
+        PoolMetadata, PoolVotingThresholds, ProposalProcedure, ProtocolVersion, RationalNumber,
+        Relay, ScriptHash, TransactionInput, TransactionOutput, Value, Vote,
     },
     localtxsubmission::{
         primitives::{
@@ -351,8 +350,8 @@ impl HaskellDisplay for UtxoFailure {
             ),
             MaxTxSizeUTxO(actual, max) => format!(
                 "(MaxTxSizeUTxO {} {})",
-                actual.to_haskell_str_p(),
-                max.to_haskell_str_p()
+                actual.to_haskell_str(),
+                max.to_haskell_str()
             ),
             InputSetEmptyUTxO => "InputSetEmptyUTxO".to_string(),
             FeeTooSmallUTxO(required, provided) => format!(
@@ -1076,6 +1075,20 @@ impl HaskellDisplay for i64 {
     }
 }
 
+impl HaskellDisplay for i128 {
+    fn to_haskell_str(&self) -> String {
+        self.to_string()
+    }
+
+    fn to_haskell_str_p(&self) -> String {
+        if *self >= 0 {
+            self.to_string()
+        } else {
+            format!("({})", self)
+        }
+    }
+}
+
 impl HaskellDisplay for u8 {
     fn to_haskell_str(&self) -> String {
         format!("{}", self)
@@ -1534,6 +1547,25 @@ impl HaskellDisplay for u64 {
     }
 }
 
+impl HaskellDisplay for BigInt {
+    fn to_haskell_str(&self) -> String {
+        use BigInt::*;
+
+        match self {
+            Int(i) => {
+                let value: i128 = i.0.into();
+                value.to_haskell_str_p()
+            },
+            BigNInt(bb) => {
+                format!("BigNInt {}", bb.to_haskell_str_p())
+            }
+            BigUInt(bb) => {
+                format!("BigUInt {}", bb.to_haskell_str_p())
+            }
+        }
+    }
+}
+
 impl HaskellDisplay for String {
     fn to_haskell_str(&self) -> String {
         self.as_text()
@@ -2093,21 +2125,12 @@ impl AsDatumHash for DatumHash {
 
 impl HaskellDisplay for PlutusData {
     fn to_haskell_str(&self) -> String {
-        use pallas_network::miniprotocols::localstate::queries_v16::BigInt as Big;
         use PlutusData::*;
 
         match self {
             Constr(constr) => constr.fields.to_haskell_str(),
             Map(key_value_pairs) => key_value_pairs.to_haskell_str().to_string(),
-            BigInt(big_int) => match big_int {
-                Big::Int(i) => format!("BigInt Int {}", i.to_haskell_str()),
-                Big::BigNInt(bb) => {
-                    format!("BigNInt {}", bb.to_haskell_str())
-                }
-                Big::BigUInt(bb) => {
-                    format!("BigUInt {}", bb.to_haskell_str())
-                }
-            },
+            BigInt(big_int) => big_int.to_haskell_str(),
             BoundedBytes(bb) => bb.to_haskell_str(),
             Array(arr) => format!("Array {}", arr.to_haskell_str()),
         }
@@ -2141,7 +2164,7 @@ where
 
 impl HaskellDisplay for Int {
     fn to_haskell_str(&self) -> String {
-        format!("Int {}", self.0)
+        format!("{}", self.0)
     }
 }
 

pallas-network/src/miniprotocols/localtxsubmission/protocol.rs

@@ -1,7 +1,7 @@
 use super::primitives::{Certificate, Credential, Language, StakeCredential, Voter};
 use crate::miniprotocols::localstate::queries_v16::{
-    Anchor, GovAction, GovActionId, PolicyId, ProposalProcedure, ProtocolVersion, ScriptHash,
-    TransactionInput, TransactionOutput, Value, Vote, FieldedRewardAccount};
+    Anchor, BigInt, FieldedRewardAccount, GovAction, GovActionId, PolicyId, ProposalProcedure, ProtocolVersion, ScriptHash,
+    TransactionInput, TransactionOutput, Value, Vote, };
 pub use crate::miniprotocols::localstate::queries_v16::{Coin, ExUnits, TaggedSet};
 use pallas_codec::minicbor::{self, Decode, Encode};
 use pallas_codec::utils::{AnyUInt, Bytes, NonEmptyKeyValuePairs, Nullable, Set};
@@ -259,9 +259,7 @@ impl From<Network> for u8 {
 }
 #[derive(Debug, Decode, Encode, Clone, Eq, PartialEq)]
 #[cbor(transparent)]
-pub struct DeltaCoin(#[n(0)] pub i32);
-
-
+pub struct DeltaCoin(#[n(0)] pub BigInt);
 
 pub type Slot = u64;
 
@@ -285,7 +283,7 @@ pub enum UtxoFailure {
     #[n(2)]
     OutsideValidityIntervalUTxO(#[n(0)] ValidityInterval, #[n(1)] Slot),
     #[n(3)]
-    MaxTxSizeUTxO(#[n(0)] i64, #[n(1)] i64),
+    MaxTxSizeUTxO(#[n(0)] BigInt, #[n(1)] BigInt),
     #[n(4)]
     InputSetEmptyUTxO,
     #[n(5)]
@@ -315,7 +313,7 @@ pub enum UtxoFailure {
     #[n(17)]
     OutsideForecast(#[n(0)] Slot),
     #[n(18)]
-    TooManyCollateralInputs(#[n(0)] u16, #[n(1)] u16),
+    TooManyCollateralInputs(#[n(0)] u64, #[n(1)] u64),
     #[n(19)]
     NoCollateralInputs,
     #[n(20)]
@@ -440,11 +438,7 @@ pub enum ConwayLedgerFailure {
 #[cbor(flat)]
 pub enum ConwayCertsPredFailure {
     #[n(0)]
-<<<<<<< HEAD
-    WithdrawalsNotInRewardsCERTS(#[n(0)] OHashMap<DisplayRewardAccount, DisplayCoin>),
-=======
     WithdrawalsNotInRewardsCERTS(#[n(0)] OHashMap<FieldedRewardAccount, DisplayCoin>),  
->>>>>>> ff7db11 (Match ProposalProcedure ordering with Haskell implementation)
     #[n(1)]
     CertFailure(#[n(0)] ConwayCertPredFailure),
 }