Merge pull request #100 from mlabs-haskell/szg251/minor

Minor update

Author: szg251

plutus-ledger-api/CHANGELOG.md

@@ -5,6 +5,21 @@
 This changelog is based on [Keep A
 Changelog](https://keepachangelog.com/en/1.1.0).
 
+## 3.1.0
+
+### Added
+
+- Add `insert_ada_mut` to `Value`
+- Add `insert_token_mut` to `Value`
+- Add `Copy` derive macro to `Extended<T>` and `Vote`
+- Update all dependencies (including cardano-serialization-lib 15.0.1)
+
+## v3.0.4
+
+### Changed
+
+- Updating all dependencies to latest minor versions
+
 ## v3.0.3
 
 ### Changed

plutus-ledger-api/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "plutus-ledger-api"
-version = "3.0.4"
+version = "3.1.0"
 edition = "2021"
 license = "Apache-2.0"
 description = "Plutus Ledger types and utilities implemented in Rust"
@@ -9,20 +9,20 @@ repository = "https://github.com/mlabs-haskell/plutus-ledger-api-rust"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proptest = "^1.7.0"
+proptest = "^1.8.0"
 lbr-prelude = { version = "0.1.3", optional = true }
-serde_json = { version = "1.0.142", optional = true }
+serde_json = { version = "1.0.145", optional = true }
 num-bigint = "~0.4"
-serde = { version = "^1.0.219", features = ["derive"], optional = true }
+serde = { version = "^1.0.228", features = ["derive"], optional = true }
 data-encoding = "^2.9.0"
 thiserror = "^1.0.69"
 linked-hash-map = "~0.5.6"
 num-traits = "~0.2.19"
 impl_ops = "0.1.1"
-chrono = { version = "0.4.41", optional = true }
-cardano-serialization-lib = "14.1.2"
+chrono = { version = "0.4.42", optional = true }
+cardano-serialization-lib = "15.0.1"
 is-plutus-data-derive = { version = "1.0.0", path = ".extras/is-plutus-data-derive-0" }
-anyhow = "1.0.98"
+anyhow = "1.0.100"
 nom = "7.1.3"
 
 [features]

plutus-ledger-api/Cargo.toml

@@ -356,7 +356,7 @@ where
 //////////////
 
 /// A set extended with a positive and negative infinity.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "lbf", derive(Json))]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Extended<T>
@@ -416,11 +416,11 @@ where
 {
     fn to_plutus_data(&self) -> PlutusData {
         match self {
-            Extended::NegInf => PlutusData::Constr(BigInt::from(0), Vec::with_capacity(0)),
+            Extended::NegInf => PlutusData::Constr(BigInt::from(0), Vec::new()),
             Extended::Finite(value) => {
                 PlutusData::Constr(BigInt::from(1), vec![value.to_plutus_data()])
             }
-            Extended::PosInf => PlutusData::Constr(BigInt::from(2), Vec::with_capacity(0)),
+            Extended::PosInf => PlutusData::Constr(BigInt::from(2), Vec::new()),
         }
     }
 

plutus-ledger-api/src/v1/interval.rs

@@ -112,7 +112,7 @@ impl IsPlutusData for CurrencySymbol {
     fn to_plutus_data(&self) -> PlutusData {
         match self {
             CurrencySymbol::NativeToken(policy_hash) => policy_hash.to_plutus_data(),
-            CurrencySymbol::Ada => PlutusData::Bytes(Vec::with_capacity(0)),
+            CurrencySymbol::Ada => PlutusData::Bytes(Vec::new()),
         }
     }
 
@@ -262,23 +262,51 @@ impl Value {
         self.get_token_amount(&CurrencySymbol::Ada, &TokenName::ada())
     }
 
-    /// Insert a new token into the value, or replace the existing quantity.
-    pub fn insert_token(&self, cs: &CurrencySymbol, tn: &TokenName, a: &BigInt) -> Self {
-        let mut result_map = self.0.clone();
+    /// Insert ada into a value by inserting or replacing old value
+    pub fn insert_ada_mut(&mut self, amount: BigInt) {
+        self.0.insert(
+            CurrencySymbol::Ada,
+            BTreeMap::from([(TokenName::ada(), amount)]),
+        );
+    }
 
-        result_map
-            .entry(cs.clone())
-            .and_modify(|tn_map| {
-                tn_map
-                    .entry(tn.clone())
-                    .and_modify(|old_a| {
-                        old_a.clone_from(a);
-                    })
-                    .or_insert_with(|| a.clone());
-            })
-            .or_insert_with(|| singleton((tn.clone(), a.clone())));
+    /// Create a new value by inserting a new token or replacing the existing quantity.
+    pub fn insert_token(
+        &self,
+        currency_symbol: &CurrencySymbol,
+        token_name: &TokenName,
+        amount: &BigInt,
+    ) -> Self {
+        let mut result_map = self.clone();
 
-        Self(result_map)
+        result_map.insert_token_mut(currency_symbol.clone(), token_name.clone(), amount.clone());
+
+        result_map
+    }
+    /// Insert a new token into the value, or replace the existing quantity.
+    pub fn insert_token_mut(
+        &mut self,
+        currency_symbol: CurrencySymbol,
+        token_name: TokenName,
+        amount: BigInt,
+    ) {
+        let tn_map = self.0.get_mut(&currency_symbol);
+
+        match tn_map {
+            None => {
+                self.0
+                    .insert(currency_symbol, singleton((token_name, amount)));
+            }
+            Some(tn_map) => {
+                let val = tn_map.get_mut(&token_name);
+                match val {
+                    None => {
+                        tn_map.insert(token_name, amount);
+                    }
+                    Some(old_amount) => *old_amount = amount,
+                }
+            }
+        }
     }
 
     /// Return true if the value don't have any entries.
@@ -698,7 +726,7 @@ pub struct TokenName(pub LedgerBytes);
 impl TokenName {
     /// Ada tokenname (empty bytestring)
     pub fn ada() -> TokenName {
-        TokenName(LedgerBytes(Vec::with_capacity(0)))
+        TokenName(LedgerBytes(Vec::new()))
     }
 
     pub fn is_empty(&self) -> bool {

plutus-ledger-api/src/v1/value.rs

@@ -40,7 +40,7 @@ pub enum OutputDatum {
 impl Json for OutputDatum {
     fn to_json(&self) -> serde_json::Value {
         match self {
-            OutputDatum::None => json::json_constructor("NoOutputDatum", Vec::with_capacity(0)),
+            OutputDatum::None => json::json_constructor("NoOutputDatum", Vec::new()),
             OutputDatum::DatumHash(dat_hash) => {
                 json::json_constructor("OutputDatumHash", vec![dat_hash.to_json()])
             }

plutus-ledger-api/src/v2/datum.rs

@@ -326,7 +326,7 @@ pub enum Voter {
 // Voter //
 ///////////
 
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, IsPlutusData)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, IsPlutusData)]
 #[is_plutus_data_derive_strategy = "Constr"]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "lbf", derive(Json))]