chore: Update u5c to 0.18.1 (#97)

Author: gonzalezzfelipe

Cargo.lock

@@ -23,7 +23,7 @@ tracing = "0.1.40"
 hex = "0.4.3"
 itertools = "0.14.0"
 async-trait = "0.1.83"
-utxorpc = { version = "0.12.0" }
+utxorpc = { version = "0.13.0" }
 # utxorpc = { path = "../../../utxorpc/rust-sdk" }
 tokio-util = "0.7.12"
 prost = "0.13"

balius-runtime/Cargo.toml

@@ -290,6 +290,7 @@ impl Block {
                 slot: block.header.as_ref().unwrap().slot,
                 hash: block.header.as_ref().unwrap().hash.clone(),
                 height: block.header.as_ref().unwrap().height,
+                timestamp: block.timestamp,
             }),
         }
     }

balius-runtime/src/lib.rs

@@ -30,21 +30,18 @@ impl Submit {
     }
 
     pub async fn submit_tx(&mut self, tx: wit::Cbor) -> Result<(), wit::SubmitError> {
-        self.client
-            .submit_tx(vec![tx])
-            .await
-            .map_err(|err| match err {
-                utxorpc::Error::GrpcError(status) => {
-                    let code: i32 = status.code().into();
-                    if code == 3 {
-                        wit::SubmitError::Invalid(status.to_string())
-                    } else {
-                        wit::SubmitError::Internal(status.to_string())
-                    }
+        self.client.submit_tx(tx).await.map_err(|err| match err {
+            utxorpc::Error::GrpcError(status) => {
+                let code: i32 = status.code().into();
+                if code == 3 {
+                    wit::SubmitError::Invalid(status.to_string())
+                } else {
+                    wit::SubmitError::Internal(status.to_string())
                 }
-                utxorpc::Error::TransportError(err) => wit::SubmitError::Internal(err.to_string()),
-                utxorpc::Error::ParseError(err) => wit::SubmitError::Internal(err.to_string()),
-            })?;
+            }
+            utxorpc::Error::TransportError(err) => wit::SubmitError::Internal(err.to_string()),
+            utxorpc::Error::ParseError(err) => wit::SubmitError::Internal(err.to_string()),
+        })?;
         Ok(())
     }
 }

balius-runtime/src/submit/u5c.rs

@@ -43,7 +43,7 @@ async fn faucet_claim() {
 
     let store = Store::open("tests/balius.db", None).unwrap();
 
-    let mut runtime = Runtime::builder(store)
+    let runtime = Runtime::builder(store)
         .with_ledger(ledgers::mock::Ledger.into())
         .build()
         .unwrap();

balius-runtime/tests/e2e.rs

@@ -1,5 +1,6 @@
 #![cfg(test)]
-#![cfg(feature = "utxorpc")]
+
+use std::collections::HashMap;
 
 use balius_runtime::{drivers, Runtime, Store};
 use serde_json::json;
@@ -8,21 +9,24 @@ use tokio_util::sync::CancellationToken;
 #[tokio::test]
 async fn wallet_balance() {
     let store = Store::open("tests/balius.db", None).unwrap();
-
-    let mut runtime = Runtime::builder(store).build().unwrap();
-
+    let runtime = Runtime::builder(store).build().unwrap();
     let config = json!({
         "address": "addr1qx2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgse35a3x"
     });
 
+    let wasm = std::fs::read("tests/wallet.wasm").unwrap();
     runtime
-        .register_worker("wallet", "tests/wallet.wasm", config)
+        .register_worker("wallet", &wasm, config)
         .await
         .unwrap();
 
     let chainsync_config = drivers::chainsync::Config {
         endpoint_url: "https://mainnet.utxorpc-v0.demeter.run".to_string(),
-        api_key: "dmtr_utxorpc1wgnnj0qcfj32zxsz2uc8d4g7uclm2s2w".to_string(),
+        headers: Some(HashMap::from([(
+            "api-key".to_string(),
+            "dmtr_utxorpc1wgnnj0qcfj32zxsz2uc8d4g7uclm2s2w".to_string(),
+        )])),
+        // api_key: "dmtr_utxorpc1wgnnj0qcfj32zxsz2uc8d4g7uclm2s2w".to_string(),
     };
 
     drivers::chainsync::run(chainsync_config, runtime, CancellationToken::new())

balius-runtime/tests/u5c-chainsync.rs

@@ -1,21 +1,22 @@
 #![cfg(test)]
-#![cfg(feature = "utxorpc")]
 
 use balius_runtime::{ledgers, Runtime, Store};
 use serde_json::json;
+use std::collections::HashMap;
 
 #[tokio::test]
 async fn faucet_claim() {
     let store = Store::open("tests/balius.db", None).unwrap();
-
-    let ledger = ledgers::u5c::Ledger::new(ledgers::u5c::Config {
+    let ledger = ledgers::u5c::Ledger::new(&ledgers::u5c::Config {
         endpoint_url: "https://mainnet.utxorpc-v0.demeter.run".to_string(),
-        api_key: "dmtr_utxorpc1wgnnj0qcfj32zxsz2uc8d4g7uclm2s2w".to_string(),
+        headers: Some(HashMap::from([
+            ("api-key".to_string(), "dmtr_utxorpc1wgnnj0qcfj32zxsz2uc8d4g7uclm2s2w".to_string()),
+        ])),
     })
     .await
     .unwrap();
 
-    let mut runtime = Runtime::builder(store)
+    let runtime = Runtime::builder(store)
         .with_ledger(ledger.into())
         .build()
         .unwrap();
@@ -31,8 +32,9 @@ async fn faucet_claim() {
       }
     });
 
+    let wasm = std::fs::read("tests/faucet.wasm").unwrap();
     runtime
-        .register_worker("faucet", "tests/faucet.wasm", config)
+        .register_worker("faucet", &wasm, config)
         .await
         .unwrap();
 

balius-runtime/tests/u5c-ledger.rs

@@ -9,7 +9,7 @@ repository = "https://github.com/txpipe/balius"
 readme = "README.md"
 
 [dependencies]
-utxorpc-spec = { version = "0.16.0", features = ["ledgers"], default-features = false }
+utxorpc-spec = { version = "0.18.1", features = ["ledgers"], default-features = false }
 balius-macros = { version = "0.5.2", path = "../balius-macros" }
 hex = "0.4.3"
 pallas-addresses = { version = "0.32.0" }

balius-sdk/Cargo.toml

@@ -281,6 +281,23 @@ pub struct Utxo<D> {
     pub datum: Option<D>,
 }
 
+impl<D> Utxo<D> {
+    pub fn coin(&self) -> u64 {
+        self.utxo
+            .coin
+            .as_ref()
+            .and_then(|x| {
+                x.big_int.as_ref().and_then(|y| match y {
+                    utxorpc_spec::utxorpc::v1alpha::cardano::big_int::BigInt::Int(z) => {
+                        Some(*z as u64)
+                    }
+                    _ => None,
+                })
+            })
+            .unwrap_or_default()
+    }
+}
+
 impl<D> TryFrom<wit::Event> for Utxo<D> {
     type Error = Error;
 

balius-sdk/src/qol.rs

@@ -340,7 +340,22 @@ impl ValueExpr for MinUtxoLovelace {
         };
 
         let serialized = pallas_codec::minicbor::to_vec(parent).unwrap();
-        let min_lovelace = (160u64 + serialized.len() as u64) * ctx.pparams.coins_per_utxo_byte;
+        let coins_per_utxo_byte = ctx
+            .pparams
+            .coins_per_utxo_byte
+            .as_ref()
+            .and_then(|x| {
+                x.big_int.as_ref().and_then(|y| match y {
+                    utxorpc_spec::utxorpc::v1alpha::cardano::big_int::BigInt::Int(z) => {
+                        Some(*z as u64)
+                    }
+                    _ => None,
+                })
+            })
+            .ok_or(BuildError::LedgerError(
+                "Missing coins_per_utxo_byte protocol parameter".to_string(),
+            ))?;
+        let min_lovelace = (160u64 + serialized.len() as u64) * coins_per_utxo_byte;
         let current_value = match parent {
             conway::PseudoTransactionOutput::PostAlonzo(x) => &x.value,
             _ => unimplemented!(),