@nina-protocol/nina-db 0.0.102 → 0.0.104

package/dist/models/Account.js

@@ -37,8 +37,9 @@ export default class Account extends Model {
             this.verifications = verifications;
         }
         delete this.id;
-        const followers = await Subscription.query().where('to', this.publicKey).range(0, 0);
-        this.followers = followers.total;
+        // Use count() instead of range(0,0) to avoid temporary object creation
+        const followersCount = await Subscription.query().where('to', this.publicKey).count('* as count').first();
+        this.followers = parseInt(followersCount.count);
     };
     static relationMappings = () => ({
         published: {

package/dist/models/Hub.js

@@ -31,8 +31,9 @@ export default class Hub extends Model {
         delete this.authorityId;
         delete this.id;
         stripHtmlIfNeeded(this.data, 'description');
-        const followers = await Subscription.query().where('to', this.publicKey).range(0, 0);
-        this.followers = followers.total;
+        // Use count() instead of range(0,0) to avoid temporary object creation
+        const followersCount = await Subscription.query().where('to', this.publicKey).count('* as count').first();
+        this.followers = parseInt(followersCount.count);
     }
     static relationMappings = () => ({
         authority: {

package/dist/models/Release.js

@@ -1,5 +1,4 @@
-import * as anchorSerum from '@project-serum/anchor';
-import * as anchorCoral from '@coral-xyz/anchor';
+import anchor from '@project-serum/anchor';
 import { Metaplex } from '@metaplex-foundation/js';
 import { Model } from 'objection';
 import { stripHtmlIfNeeded, tweetNewRelease } from '../utils/index.js';
@@ -11,7 +10,6 @@ import Tag from './Tag.js';
 import axios from 'axios';
 import promiseRetry from 'promise-retry';
 import { customAlphabet } from 'nanoid';
-import { getTokenMetadata } from '@solana/spl-token';
 const ensureHttps = (uri) => {
     if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
         return `https://${uri}`;
@@ -54,25 +52,21 @@ export default class Release extends Model {
             archived: { type: 'boolean' },
         },
     };
-    static findOrCreate = async (publicKey, hubPublicKey = null, programId = process.env.NINA_PROGRAM_V2_ID) => {
+    static findOrCreate = async (publicKey, hubPublicKey = null) => {
         try {
-            console.log('Release.findOrCreate', publicKey, programId);
             let release = await Release.query().findOne({ publicKey });
             if (release) {
-                console.log('release found', release);
                 return release;
             }
-            let anchor = programId === process.env.NINA_PROGRAM_V2_ID ? anchorCoral : anchorSerum;
             const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
             const provider = new anchor.AnchorProvider(connection, {}, { commitment: 'confirmed' });
-            const program = await anchor.Program.at(programId, provider);
-            const programModelName = programId === process.env.NINA_PROGRAM_V2_ID ? 'releaseV2' : 'release';
+            const program = await anchor.Program.at(process.env.NINA_PROGRAM_ID, provider);
             const metaplex = new Metaplex(connection);
             let attempts = 0;
             const releaseAccount = await promiseRetry(async (retry) => {
                 try {
                     attempts += 1;
-                    const result = await program.account[programModelName].fetch(new anchor.web3.PublicKey(publicKey), 'confirmed');
+                    const result = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed');
                     return result;
                 }
                 catch (error) {
@@ -84,13 +78,7 @@ export default class Release extends Model {
                 minTimeout: 500,
                 maxTimeout: 1500,
             });
-            let metadataAccount;
-            if (programId === process.env.NINA_PROGRAM_V2_ID) {
-                metadataAccount = await getTokenMetadata(connection, releaseAccount.mint, 'confirmed');
-            }
-            else {
-                metadataAccount = (await metaplex.nfts().findAllByMintList({ mints: [releaseAccount.releaseMint] }, { commitment: 'confirmed' }))[0];
-            }
+            let metadataAccount = (await metaplex.nfts().findAllByMintList({ mints: [releaseAccount.releaseMint] }, { commitment: 'confirmed' }))[0];
             if (!metadataAccount) {
                 throw new Error('No metadata account found for release - is not a complete release');
             }
@@ -105,13 +93,12 @@ export default class Release extends Model {
             let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
             release = await this.createRelease({
                 publicKey,
-                mint: programId === process.env.NINA_PROGRAM_V2_ID ? releaseAccount.mint.toBase58() : releaseAccount.releaseMint.toBase58(),
+                mint: releaseAccount.releaseMint.toBase58(),
                 metadata: json,
-                datetime: programId === process.env.NINA_PROGRAM_V2_ID ? new Date().toISOString() : new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
+                datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
                 slug,
                 publisherId: publisher.id,
-                releaseAccount,
-                programId,
+                releaseAccount
             });
             if (hubPublicKey) {
                 const hub = await Hub.query().findOne({ publicKey: hubPublicKey });
@@ -127,7 +114,7 @@ export default class Release extends Model {
             return null;
         }
     };
-    static createRelease = async ({ publicKey, mint, metadata, datetime, publisherId, releaseAccount, programId }) => {
+    static createRelease = async ({ publicKey, mint, metadata, datetime, publisherId, releaseAccount }) => {
         const slug = await this.generateSlug(metadata);
         const price = releaseAccount.account?.price?.toNumber() || releaseAccount?.price?.toNumber() || 0;
         const paymentMint = releaseAccount.account?.paymentMint.toBase58() || releaseAccount?.paymentMint.toBase58();
@@ -140,8 +127,7 @@ export default class Release extends Model {
             publisherId,
             price: `${price}`,
             paymentMint,
-            archived: false,
-            programId,
+            archived: false
         });
         if (metadata.properties.tags) {
             for await (let tag of metadata.properties.tags) {
@@ -149,9 +135,7 @@ export default class Release extends Model {
                 await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id).onConflict(['tagId', 'releaseId']).ignore();
             }
         }
-        if (programId === process.env.NINA_PROGRAM_ID) {
-            await this.processRevenueShares(releaseAccount, release);
-        }
+        await this.processRevenueShares(releaseAccount, release);
         tweetNewRelease(metadata, publisherId, slug);
         return release;
     };

package/dist/models/Transaction.js

@@ -20,8 +20,6 @@ class Transaction extends Model {
                 type: {
                     type: 'string',
                     enum: [
-                        'ReleaseInitV2',
-                        'ReleaseUpdate',
                         'ExchangeAccept',
                         'ExchangeCancel',
                         'ExchangeInit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nina-protocol/nina-db",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "description": "",
   "source": "src/index.js",
   "main": "dist/index.js",
@@ -23,8 +23,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/preset-es2015": "^7.0.0-beta.53",
     "@metaplex-foundation/js": "^0.18.1",
-    "@coral-xyz/anchor": "^0.31.0",
-    "@solana/spl-token": "^0.4.9",
+    "@project-serum/anchor": "^0.25.0",
     "axios": "^0.27.2",
     "knex": "^2.2.0",
     "nanoid": "^4.0.2",
@@ -47,6 +46,6 @@
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "5.7.3"
+    "typescript": "4.3.5"
   }
 }

package/src/models/Account.js

@@ -42,8 +42,9 @@ export default class Account extends Model {
       this.verifications = verifications;
     }
     delete this.id
-    const followers = await Subscription.query().where('to', this.publicKey).range(0,0);
-    this.followers = followers.total;
+    // Use count() instead of range(0,0) to avoid temporary object creation
+    const followersCount = await Subscription.query().where('to', this.publicKey).count('* as count').first();
+    this.followers = parseInt(followersCount.count);
   }
 
   static relationMappings = () => ({    

package/src/models/Hub.js

@@ -35,8 +35,9 @@ export default class Hub extends Model {
 
     stripHtmlIfNeeded(this.data, 'description');
 
-    const followers = await Subscription.query().where('to', this.publicKey).range(0, 0);
-    this.followers = followers.total;
+    // Use count() instead of range(0,0) to avoid temporary object creation
+    const followersCount = await Subscription.query().where('to', this.publicKey).count('* as count').first();
+    this.followers = parseInt(followersCount.count);
   }
   
   static relationMappings = () => ({

package/src/models/Release.js

@@ -1,5 +1,4 @@
-import * as anchorSerum from '@project-serum/anchor';
-import * as anchorCoral from '@coral-xyz/anchor';
+import anchor from '@project-serum/anchor';
 import { Metaplex } from '@metaplex-foundation/js';
 import { Model } from 'objection';
 import { stripHtmlIfNeeded, tweetNewRelease }from '../utils/index.js';
@@ -11,7 +10,6 @@ import Tag from './Tag.js';
 import axios from 'axios';
 import promiseRetry from 'promise-retry';
 import { customAlphabet } from 'nanoid';
-import { getTokenMetadata } from '@solana/spl-token';
 
 const ensureHttps = (uri) => {
   if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
@@ -58,30 +56,27 @@ export default class Release extends Model {
     },
   }
   
-  static findOrCreate = async (publicKey, hubPublicKey=null, programId=process.env.NINA_PROGRAM_V2_ID) => {
+  static findOrCreate = async (publicKey, hubPublicKey=null) => {
     try {
-      console.log('Release.findOrCreate', publicKey, programId)
       let release = await Release.query().findOne({ publicKey });
       if (release) {
-        console.log('release found', release)
         return release;
       }
   
-      let anchor = programId === process.env.NINA_PROGRAM_V2_ID ? anchorCoral : anchorSerum;
       const connection = new anchor.web3.Connection(process.env.SOLANA_CLUSTER_URL);
       const provider = new anchor.AnchorProvider(connection, {}, {commitment: 'confirmed'})  
       const program = await anchor.Program.at(
-        programId,
+        process.env.NINA_PROGRAM_ID,
         provider,
       )
-      const programModelName = programId === process.env.NINA_PROGRAM_V2_ID ? 'releaseV2' : 'release';
       const metaplex = new Metaplex(connection);
       let attempts = 0;
+
       const releaseAccount = await promiseRetry(
         async (retry) => {
           try {
             attempts += 1
-            const result = await program.account[programModelName].fetch(new anchor.web3.PublicKey(publicKey), 'confirmed')
+            const result = await program.account.release.fetch(new anchor.web3.PublicKey(publicKey), 'confirmed')
             return result
           } catch (error) {
             console.log('error fetching release account', error)
@@ -94,12 +89,7 @@ export default class Release extends Model {
         }
       )
   
-      let metadataAccount
-      if (programId === process.env.NINA_PROGRAM_V2_ID) {
-        metadataAccount = await getTokenMetadata(connection, releaseAccount.mint, 'confirmed')
-      } else {
-        metadataAccount = (await metaplex.nfts().findAllByMintList({mints: [releaseAccount.releaseMint]}, { commitment: 'confirmed' }))[0];
-      }
+      let metadataAccount = (await metaplex.nfts().findAllByMintList({mints: [releaseAccount.releaseMint]}, { commitment: 'confirmed' }))[0];
       if (!metadataAccount) {
         throw new Error('No metadata account found for release - is not a complete release')
       }
@@ -114,13 +104,12 @@ export default class Release extends Model {
       let publisher = await Account.findOrCreate(releaseAccount.authority.toBase58());
       release = await this.createRelease({
         publicKey,
-        mint: programId === process.env.NINA_PROGRAM_V2_ID ? releaseAccount.mint.toBase58() : releaseAccount.releaseMint.toBase58(),
+        mint: releaseAccount.releaseMint.toBase58(),
         metadata: json,
-        datetime: programId === process.env.NINA_PROGRAM_V2_ID ? new Date().toISOString() : new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
+        datetime: new Date(releaseAccount.releaseDatetime.toNumber() * 1000).toISOString(),
         slug,
         publisherId: publisher.id,
-        releaseAccount,
-        programId,
+        releaseAccount
       });
   
       if (hubPublicKey) {
@@ -139,7 +128,7 @@ export default class Release extends Model {
     }
   }
 
-  static createRelease = async ({publicKey, mint, metadata, datetime, publisherId, releaseAccount, programId}) => {
+  static createRelease = async ({publicKey, mint, metadata, datetime, publisherId, releaseAccount}) => {
     const slug = await this.generateSlug(metadata);
     const price = releaseAccount.account?.price?.toNumber() || releaseAccount?.price?.toNumber() || 0;
     const paymentMint = releaseAccount.account?.paymentMint.toBase58() || releaseAccount?.paymentMint.toBase58();
@@ -152,8 +141,7 @@ export default class Release extends Model {
       publisherId,
       price: `${price}`,
       paymentMint,
-      archived: false,
-      programId,
+      archived: false
     })
     if (metadata.properties.tags) {
       for await (let tag of metadata.properties.tags) {
@@ -161,9 +149,7 @@ export default class Release extends Model {
         await Release.relatedQuery('tags').for(release.id).relate(tagRecord.id).onConflict(['tagId', 'releaseId']).ignore();
       }
     }
-    if (programId === process.env.NINA_PROGRAM_ID) {
-      await this.processRevenueShares(releaseAccount, release);
-    }
+    await this.processRevenueShares(releaseAccount, release);
     tweetNewRelease(metadata, publisherId, slug);
     return release;
   }

package/src/models/Transaction.js

@@ -21,8 +21,6 @@ class Transaction extends Model {
         type: {
           type: 'string',
           enum: [
-            'ReleaseInitV2',
-            'ReleaseUpdate',
             'ExchangeAccept',
             'ExchangeCancel',
             'ExchangeInit',

package/src/migrations/20250616215722_program_id.js

@@ -1,19 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const up = function(knex) {
-  return knex.schema.table('releases', table => {
-    table.string('programId').notNullable().defaultTo(process.env.NINA_PROGRAM_ID);
-  });
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const down = function(knex) {
-  return knex.schema.table('releases', table => {
-    table.dropColumn('programId');
-  });
-};

package/src/migrations/20250630215722_transaction_program_id.js

@@ -1,19 +0,0 @@
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const up = function(knex) {
-  return knex.schema.table('transactions', table => {
-    table.string('programId').notNullable().defaultTo(process.env.NINA_PROGRAM_ID);
-  });
-};
-
-/**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
- */
-export const down = function(knex) {
-  return knex.schema.table('transactions', table => {
-    table.dropColumn('programId');
-  });
-};