added missing data from read only utxos

spacebudz · Jan 20, 2025 · 64e5b64 · 64e5b64
1 parent 6184ce1
commit 64e5b64
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/core/libs/lucid_core/pkg/lucid_core_bg.wasm b/src/core/libs/lucid_core/pkg/lucid_core_bg.wasm
diff --git a/src/core/libs/lucid_core/src/instruction_builder.rs b/src/core/libs/lucid_core/src/instruction_builder.rs
@@ -236,6 +236,10 @@ impl InstructionBuilder {
                 }
                 Instruction::ReadFrom { utxos } => {
                     for utxo in utxos {
+                        match (&utxo.datum_hash, &utxo.datum) {
+                            (Some(_), Some(data)) => self.add_data(data)?,
+                            _ => (),
+                        };
                         match &utxo.script_ref {
                             Some(script) => {
                                 self.add_language_or_keys(script)?;
@@ -592,12 +596,10 @@ impl InstructionBuilder {
     }
 
     fn add_input(&mut self, utxo: Utxo, redeemer: Option<String>) -> CoreResult<()> {
-        if let Some(_) = redeemer {
-            match (&utxo.datum_hash, &utxo.datum) {
-                (Some(_), Some(data)) => self.add_data(data)?,
-                _ => (),
-            };
-        }
+        match (&utxo.datum_hash, &utxo.datum) {
+            (Some(_), Some(data)) => self.add_data(data)?,
+            _ => (),
+        };
         match &utxo.script_ref {
             Some(script) => {
                 self.add_language_or_keys(script)?;

diff --git a/src/lucid/tx.ts b/src/lucid/tx.ts
@@ -36,10 +36,10 @@ export class Tx {
 
   /** Read data from utxos. These utxos are only referenced and not spent. */
   readFrom(utxos: Utxo[]): Tx {
-    this.tasks.push(async (that) => {
+    this.tasks.push(async ({ lucid }) => {
       for (const utxo of utxos) {
-        if (utxo.datumHash) {
-          utxo.datum = Data.to(await that.lucid.datumOf(utxo));
+        if (utxo.datumHash && !utxo.datum) {
+          utxo.datum = Data.to(await lucid.datumOf(utxo));
         }
       }
       return { type: "ReadFrom", utxos };
@@ -52,10 +52,10 @@ export class Tx {
    * With redeemer it's a plutus script input.
    */
   collectFrom(utxos: Utxo[], redeemer?: string): Tx {
-    this.tasks.push(async (that) => {
+    this.tasks.push(async ({ lucid }) => {
       for (const utxo of utxos) {
         if (utxo.datumHash && !utxo.datum) {
-          utxo.datum = Data.to(await that.lucid.datumOf(utxo));
+          utxo.datum = Data.to(await lucid.datumOf(utxo));
         }
       }
       return { type: "CollectFrom", utxos, redeemer };