@bsv/overlay 0.1.7 → 0.1.9

package/dist/cjs/src/storage/knex/KnexStorage.js

@@ -5,77 +5,147 @@ class KnexStorage {
     constructor(knex) {
         this.knex = knex;
     }
-    async findOutput(txid, outputIndex, topic, spent) {
+    async findOutput(txid, outputIndex, topic, spent, includeBEEF = false) {
         const search = {
-            txid,
-            outputIndex
+            'outputs.txid': txid,
+            'outputs.outputIndex': outputIndex
         };
         if (topic !== undefined)
-            search.topic = topic;
+            search['outputs.topic'] = topic;
         if (spent !== undefined)
-            search.spent = spent;
-        const [output] = await this.knex('outputs').where(search).select('txid', 'outputIndex', 'outputScript', 'topic', 'satoshis', 'beef', 'outputsConsumed', 'spent', 'consumedBy');
+            search['outputs.spent'] = spent;
+        // Base query to get the output
+        const query = this.knex('outputs').where(search);
+        // Select necessary fields from outputs and conditionally include beef from transactions
+        const selectFields = [
+            'outputs.txid',
+            'outputs.outputIndex',
+            'outputs.outputScript',
+            'outputs.topic',
+            'outputs.satoshis',
+            'outputs.outputsConsumed',
+            'outputs.spent',
+            'outputs.consumedBy'
+        ];
+        if (includeBEEF) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            query.leftJoin('transactions', 'outputs.txid', 'transactions.txid');
+            selectFields.push('transactions.beef');
+        }
+        const output = await query.select(selectFields).first();
         if (output === undefined || output === null) {
             return null;
         }
         return {
             ...output,
             outputScript: [...output.outputScript],
-            beef: [...output.beef],
+            beef: includeBEEF ? (output.beef !== undefined ? [...output.beef] : undefined) : undefined,
             spent: Boolean(output.spent),
             outputsConsumed: JSON.parse(output.outputsConsumed),
             consumedBy: JSON.parse(output.consumedBy)
         };
     }
-    async findOutputsForTransaction(txid) {
-        const outputs = await this.knex('outputs').where({ txid }).select('txid', 'outputIndex', 'outputScript', 'topic', 'satoshis', 'beef', 'outputsConsumed', 'spent', 'consumedBy');
+    async findOutputsForTransaction(txid, includeBEEF = false) {
+        // Base query to get outputs
+        const query = this.knex('outputs').where({ 'outputs.txid': txid });
+        // Select necessary fields from outputs and conditionally include beef from transactions
+        const selectFields = [
+            'outputs.txid',
+            'outputs.outputIndex',
+            'outputs.outputScript',
+            'outputs.topic',
+            'outputs.satoshis',
+            'outputs.outputsConsumed',
+            'outputs.spent',
+            'outputs.consumedBy'
+        ];
+        if (includeBEEF) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            query.leftJoin('transactions', 'outputs.txid', 'transactions.txid');
+            selectFields.push('transactions.beef');
+        }
+        const outputs = await query.select(selectFields);
         if (outputs === undefined || outputs.length === 0) {
             return [];
         }
         return outputs.map(output => ({
             ...output,
             outputScript: [...output.outputScript],
-            beef: [...output.beef],
+            beef: includeBEEF ? (output.beef !== undefined ? [...output.beef] : undefined) : undefined,
             spent: Boolean(output.spent),
             outputsConsumed: JSON.parse(output.outputsConsumed),
             consumedBy: JSON.parse(output.consumedBy)
         }));
     }
-    async findUTXOsForTopic(topic, since) {
-        const query = this.knex('outputs').where({ topic, spent: false });
+    async findUTXOsForTopic(topic, since, includeBEEF = false) {
+        // Base query to get outputs
+        const query = this.knex('outputs').where({ 'outputs.topic': topic, 'outputs.spent': false });
         // If provided, additionally filters UTXOs by block height
         if (since !== undefined && since > 0) {
-            await query.andWhere('blockHeight', '>=', since);
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            query.andWhere('outputs.blockHeight', '>=', since);
+        }
+        // Select necessary fields from outputs and conditionally include beef from transactions
+        const selectFields = [
+            'outputs.txid',
+            'outputs.outputIndex',
+            'outputs.outputScript',
+            'outputs.topic',
+            'outputs.satoshis',
+            'outputs.outputsConsumed',
+            'outputs.spent',
+            'outputs.consumedBy'
+        ];
+        if (includeBEEF) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            query.leftJoin('transactions', 'outputs.txid', 'transactions.txid');
+            selectFields.push('transactions.beef');
         }
-        const outputs = await query.select('txid', 'outputIndex', 'outputScript', 'topic', 'satoshis', 'beef', 'outputsConsumed', 'spent', 'consumedBy');
+        const outputs = await query.select(selectFields);
         if (outputs === undefined || outputs.length === 0) {
             return [];
         }
         return outputs.map(output => ({
             ...output,
             outputScript: [...output.outputScript],
-            beef: [...output.beef],
+            beef: includeBEEF ? (output.beef !== undefined ? [...output.beef] : undefined) : undefined,
             spent: Boolean(output.spent),
             outputsConsumed: JSON.parse(output.outputsConsumed),
             consumedBy: JSON.parse(output.consumedBy)
         }));
     }
     async deleteOutput(txid, outputIndex, topic) {
-        await this.knex('outputs').where({
-            txid, outputIndex, topic
-        }).del();
+        await this.knex.transaction(async (trx) => {
+            // Delete the specific output
+            await trx('outputs').where({ txid, outputIndex }).del();
+            // Check how many outputs reference the same transaction
+            const remainingOutputs = await trx('outputs').where({ txid }).count('* as count').first();
+            if (remainingOutputs !== undefined && Number(remainingOutputs.count) === 0) {
+                // If no more outputs reference the transaction, delete the beef
+                await trx('transactions').where({ txid }).del();
+            }
+        });
     }
     async insertOutput(output) {
-        await this.knex('outputs').insert({
-            txid: output.txid,
-            outputIndex: Number(output.outputIndex),
-            outputScript: Buffer.from(output.outputScript),
-            topic: output.topic,
-            satoshis: Number(output.satoshis),
-            beef: Buffer.from(output.beef),
-            outputsConsumed: JSON.stringify(output.outputsConsumed),
-            consumedBy: JSON.stringify(output.consumedBy),
-            spent: output.spent
+        const insertPromises = [this.knex('outputs').insert({
+                txid: output.txid,
+                outputIndex: Number(output.outputIndex),
+                outputScript: Buffer.from(output.outputScript),
+                topic: output.topic,
+                satoshis: Number(output.satoshis),
+                outputsConsumed: JSON.stringify(output.outputsConsumed),
+                consumedBy: JSON.stringify(output.consumedBy),
+                spent: output.spent
+            })];
+        if (output.beef !== undefined) {
+            const insertTransactionPromise = this.knex('transactions').insert({
+                txid: output.txid,
+                beef: Buffer.from(output.beef)
+            }).onConflict('txid').ignore();
+            insertPromises.push(insertTransactionPromise);
+        }
+        await this.knex.transaction(async (trx) => {
+            await Promise.all(insertPromises.map(promise => promise.transacting(trx)));
         });
     }
     async markUTXOAsSpent(txid, outputIndex, topic) {
@@ -92,11 +162,9 @@ class KnexStorage {
             topic
         }).update('consumedBy', consumedBy);
     }
-    async updateOutputBeef(txid, outputIndex, topic, beef) {
-        await this.knex('outputs').where({
-            txid,
-            outputIndex,
-            topic
+    async updateTransactionBEEF(txid, beef) {
+        await this.knex('transactions').where({
+            txid
         }).update('beef', Buffer.from(beef));
     }
     async updateOutputBlockHeight(txid, outputIndex, topic, blockHeight) {
@@ -113,11 +181,11 @@ class KnexStorage {
         });
     }
     async doesAppliedTransactionExist(tx) {
-        const appliedTransactions = await this.knex('applied_transactions').where({
-            txid: tx.txid,
-            topic: tx.topic
-        }).select('txid', 'topic');
-        return appliedTransactions.length > 0;
+        const result = await this.knex('applied_transactions')
+            .where({ txid: tx.txid, topic: tx.topic })
+            .select(this.knex.raw('1'))
+            .first();
+        return !!result;
     }
 }
 exports.KnexStorage = KnexStorage;

package/dist/cjs/src/storage/knex/KnexStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"KnexStorage.js","sourceRoot":"","sources":["../../../../../src/storage/knex/KnexStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"KnexStorage.js","sourceRoot":"","sources":["../../../../../src/storage/knex/KnexStorage.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/storage/knex/all-migrations.js

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const _2024_05_18_001_initial_js_1 = require("./migrations/2024-05-18-001-initial.js");
 const _2024_07_10_001_block_height_js_1 = require("./migrations/2024-07-10-001-block-height.js");
+const _2024_07_17_001_transactions_js_1 = require("./migrations/2024-07-17-001-transactions.js");
+const _2024_07_18_001_indexes_js_1 = require("./migrations/2024-07-18-001-indexes.js");
 const allMigrations = [
     { up: _2024_05_18_001_initial_js_1.up, down: _2024_05_18_001_initial_js_1.down },
-    { up: _2024_07_10_001_block_height_js_1.up, down: _2024_07_10_001_block_height_js_1.down }
+    { up: _2024_07_10_001_block_height_js_1.up, down: _2024_07_10_001_block_height_js_1.down },
+    { up: _2024_07_17_001_transactions_js_1.up, down: _2024_07_17_001_transactions_js_1.down },
+    { up: _2024_07_18_001_indexes_js_1.up, down: _2024_07_18_001_indexes_js_1.down }
 ];
 exports.default = allMigrations;
 //# sourceMappingURL=all-migrations.js.map

package/dist/cjs/src/storage/knex/all-migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"all-migrations.js","sourceRoot":"","sources":["../../../../../src/storage/knex/all-migrations.ts"],"names":[],"mappings":";;AACA,uFAAyG;AACzG,iGAA4H;AAU5H,MAAM,aAAa,GAAgB;IACjC,EAAE,EAAE,EAAE,+BAAe,EAAE,IAAI,EAAE,iCAAiB,EAAE;IAChD,EAAE,EAAE,EAAE,oCAAsB,EAAE,IAAI,EAAE,sCAAwB,EAAE;CAC/D,CAAC;AACF,kBAAe,aAAa,CAAA"}
+{"version":3,"file":"all-migrations.js","sourceRoot":"","sources":["../../../../../src/storage/knex/all-migrations.ts"],"names":[],"mappings":";;AACA,uFAAyG;AACzG,iGAA4H;AAC5H,iGAA4H;AAC5H,uFAAuG;AAUvG,MAAM,aAAa,GAAgB;IACjC,EAAE,EAAE,EAAE,+BAAe,EAAE,IAAI,EAAE,iCAAiB,EAAE;IAChD,EAAE,EAAE,EAAE,oCAAsB,EAAE,IAAI,EAAE,sCAAwB,EAAE;IAC9D,EAAE,EAAE,EAAE,oCAAsB,EAAE,IAAI,EAAE,sCAAwB,EAAE;IAC9D,EAAE,EAAE,EAAE,+BAAc,EAAE,IAAI,EAAE,iCAAgB,EAAE;CAC/C,CAAA;AACD,kBAAe,aAAa,CAAA"}

package/dist/cjs/src/storage/knex/migrations/2024-07-17-001-transactions.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    // Create the new transactions table
+    await knex.schema.createTable('transactions', table => {
+        table.increments();
+        table.specificType('beef', 'longblob');
+        table.string('txid', 64).unique();
+    });
+    // Move data from outputs table to the new transactions table and ensure deduplication
+    await knex.raw(`
+    INSERT IGNORE INTO transactions (txid, beef)
+    SELECT txid, beef
+    FROM outputs
+    WHERE beef IS NOT NULL
+  `);
+    // Drop the beef column from the outputs table
+    await knex.schema.table('outputs', table => {
+        table.dropColumn('beef');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    // Add the beef column back to the outputs table
+    await knex.schema.table('outputs', table => {
+        table.binary('beef');
+    });
+    // Move data back from the transactions table to the outputs table using a JOIN
+    await knex.raw(`
+    UPDATE outputs
+    JOIN transactions ON outputs.txid = transactions.txid
+    SET outputs.beef = transactions.beef
+  `);
+    // Drop the transactions table
+    await knex.schema.dropTable('transactions');
+}
+exports.down = down;
+//# sourceMappingURL=2024-07-17-001-transactions.js.map

package/dist/cjs/src/storage/knex/migrations/2024-07-17-001-transactions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"2024-07-17-001-transactions.js","sourceRoot":"","sources":["../../../../../../src/storage/knex/migrations/2024-07-17-001-transactions.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,oCAAoC;IACpC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE;QACpD,KAAK,CAAC,UAAU,EAAE,CAAA;QAClB,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QACtC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAA;IACnC,CAAC,CAAC,CAAA;IAEF,sFAAsF;IACtF,MAAM,IAAI,CAAC,GAAG,CAAC;;;;;GAKd,CAAC,CAAA;IAEF,8CAA8C;IAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;QACzC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAC1B,CAAC,CAAC,CAAA;AACJ,CAAC;AApBD,gBAoBC;AAEM,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,gDAAgD;IAChD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;QACzC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,+EAA+E;IAC/E,MAAM,IAAI,CAAC,GAAG,CAAC;;;;GAId,CAAC,CAAA;IAEF,8BAA8B;IAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;AAC7C,CAAC;AAfD,oBAeC"}

package/dist/cjs/src/storage/knex/migrations/2024-07-18-001-indexes.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    // Add index for applied_transactions table
+    await knex.schema.table('applied_transactions', function (table) {
+        table.index(['txid', 'topic'], 'idx_applied_transactions_txid_topic');
+    });
+    // Add index for transactions table
+    await knex.schema.table('transactions', function (table) {
+        table.index('txid', 'idx_transactions_txid');
+    });
+    // Add index for outputs table
+    await knex.schema.table('outputs', function (table) {
+        table.index(['txid', 'outputIndex', 'topic'], 'idx_outputs_txid_outputIndex_topic');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    // Drop index for applied_transactions table
+    await knex.schema.table('applied_transactions', function (table) {
+        table.dropIndex(['txid', 'topic'], 'idx_applied_transactions_txid_topic');
+    });
+    // Drop index for transactions table
+    await knex.schema.table('transactions', function (table) {
+        table.dropIndex('txid', 'idx_transactions_txid');
+    });
+    // Drop index for outputs table
+    await knex.schema.table('outputs', function (table) {
+        table.dropIndex(['txid', 'outputIndex', 'topic'], 'idx_outputs_txid_outputIndex_topic');
+    });
+}
+exports.down = down;
+//# sourceMappingURL=2024-07-18-001-indexes.js.map

package/dist/cjs/src/storage/knex/migrations/2024-07-18-001-indexes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"2024-07-18-001-indexes.js","sourceRoot":"","sources":["../../../../../../src/storage/knex/migrations/2024-07-18-001-indexes.ts"],"names":[],"mappings":";;;AACO,KAAK,UAAU,EAAE,CAAC,IAAU;IACjC,2CAA2C;IAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,UAAU,KAAK;QAC7D,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,qCAAqC,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;IACF,mCAAmC;IACnC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,KAAK;QACrD,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IAC9C,CAAC,CAAC,CAAA;IACF,8BAA8B;IAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,KAAK;QAChD,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,oCAAoC,CAAC,CAAA;IACrF,CAAC,CAAC,CAAA;AACJ,CAAC;AAbD,gBAaC;AAEM,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,4CAA4C;IAC5C,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,UAAU,KAAK;QAC7D,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,qCAAqC,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;IACF,oCAAoC;IACpC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,KAAK;QACrD,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IACF,+BAA+B;IAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,KAAK;QAChD,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,oCAAoC,CAAC,CAAA;IACzF,CAAC,CAAC,CAAA;AACJ,CAAC;AAbD,oBAaC"}