@bsv/overlay 0.1.0-alpha.8 → 0.1.0

package/src/storage/knex/KnexStorage.ts

@@ -38,20 +38,49 @@ export class KnexStorage implements Storage {
   }
 
   async findOutputsForTransaction(txid: string): Promise<Output[]> {
-    const [output] = await this.knex('outputs').where({ txid }).select(
+    const outputs = await this.knex('outputs').where({ txid }).select(
       'txid', 'outputIndex', 'outputScript', 'topic', 'satoshis', 'beef', 'outputsConsumed', 'spent', 'consumedBy'
     )
-    if (output === undefined || output === null) {
+
+    if (outputs === undefined || outputs.length === 0) {
       return []
     }
-    return {
+
+    return outputs.map(output => ({
       ...output,
       outputScript: [...output.outputScript],
       beef: [...output.beef],
       spent: Boolean(output.spent),
       outputsConsumed: JSON.parse(output.outputsConsumed),
       consumedBy: JSON.parse(output.consumedBy)
+    }))
+  }
+
+  async findUTXOsForTopic(topic: string, since?: number): Promise<Output[]> {
+    const query = this.knex('outputs').where({ topic, spent: false })
+
+    // TODO: Create new migration for outputs that adds either created_at or block height tagging for proven outpoints if necessary.
+    // if (since !== undefined) {
+    //   const sinceDate = new Date(since).toISOString()
+    //   await query.andWhere('created_at', '>=', sinceDate)
+    // }
+
+    const outputs = await query.select(
+      'txid', 'outputIndex', 'outputScript', 'topic', 'satoshis', 'beef', 'outputsConsumed', 'spent', 'consumedBy'
+    )
+
+    if (outputs === undefined || outputs.length === 0) {
+      return []
     }
+
+    return outputs.map(output => ({
+      ...output,
+      outputScript: [...output.outputScript],
+      beef: [...output.beef],
+      spent: Boolean(output.spent),
+      outputsConsumed: JSON.parse(output.outputsConsumed),
+      consumedBy: JSON.parse(output.consumedBy)
+    }))
   }
 
   async deleteOutput(txid: string, outputIndex: number, topic: string): Promise<void> {
@@ -67,7 +96,7 @@ export class KnexStorage implements Storage {
       outputScript: Buffer.from(output.outputScript),
       topic: output.topic,
       satoshis: Number(output.satoshis),
-      beef: Buffer.from(new Uint8Array(output.beef)),
+      beef: Buffer.from(output.beef),
       outputsConsumed: JSON.stringify(output.outputsConsumed),
       consumedBy: JSON.stringify(output.consumedBy),
       spent: output.spent
@@ -95,7 +124,7 @@ export class KnexStorage implements Storage {
       txid,
       outputIndex,
       topic
-    }).update('beef', beef)
+    }).update('beef', Buffer.from(beef))
   }
 
   async insertAppliedTransaction(tx: { txid: string, topic: string }): Promise<void> {