npm - @nina-protocol/nina-db - Versions diffs - 0.0.103 → 0.0.105 - Mend

@nina-protocol/nina-db 0.0.103 → 0.0.105

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/models/Release.js +27 -12
package/dist/models/Transaction.js +2 -0
package/package.json +4 -3
package/src/migrations/20250616215722_program_id.js +19 -0
package/src/migrations/20250630215722_transaction_program_id.js +19 -0
package/src/models/Release.js +26 -13
package/src/models/Transaction.js +2 -0

package/dist/models/Release.js CHANGED Viewed

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

package/dist/models/Transaction.js CHANGED Viewed

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

package/package.json CHANGED Viewed

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

package/src/migrations/20250616215722_program_id.js ADDED Viewed

@@ -0,0 +1,19 @@
+/**
+ * @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 ADDED Viewed

@@ -0,0 +1,19 @@
+/**
+ * @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');
+  });
+};

package/src/models/Release.js CHANGED Viewed

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

package/src/models/Transaction.js CHANGED Viewed

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