@talismn/solana 0.0.0 → 0.0.2

package/dist/declarations/src/index.d.ts

@@ -1 +1,4 @@
-export * from "./utils";
+export * from "./utils/serialization";
+export * from "./utils/signing";
+export * from "./utils/chains";
+export * from "./utils/transaction";

package/dist/declarations/src/utils/chains.d.ts

@@ -0,0 +1,3 @@
+export declare const SOLANA_CHAINS: readonly ["solana:mainnet", "solana:devnet", "solana:testnet", "solana:localnet"];
+export type SolanaChainId = (typeof SOLANA_CHAINS)[number];
+export declare const getSolNetworkId: (chain: SolanaChainId) => "solana-mainnet" | "solana-devnet" | "solana-testnet" | "solana-localnet";

package/dist/declarations/src/utils/serialization.d.ts

@@ -1,12 +1,17 @@
-import { TransactionInstruction } from "@solana/web3.js";
-export declare const serializeInstruction: (instruction: TransactionInstruction) => {
-    programId: string;
-    keys: {
-        pubkey: string;
-        isSigner: boolean;
-        isWritable: boolean;
-    }[];
-    data: string;
+import { Transaction, TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
+export declare const solInstructionToJson: (instruction: TransactionInstruction) => {
+    type: "solana-instruction";
+    value: {
+        programId: string;
+        keys: {
+            pubkey: string;
+            isSigner: boolean;
+            isWritable: boolean;
+        }[];
+        data: string;
+    };
 };
-export type SerializedInstruction = ReturnType<typeof serializeInstruction>;
-export declare const deserializeInstruction: (serialized: SerializedInstruction) => TransactionInstruction;
+export type SolInstructionJson = ReturnType<typeof solInstructionToJson>;
+export declare const solInstructionFromJson: (serialized: SolInstructionJson) => TransactionInstruction;
+export declare const serializeTransaction: (transaction: Transaction | VersionedTransaction) => string;
+export declare const deserializeTransaction: (transaction: string) => Transaction | VersionedTransaction;

package/dist/declarations/src/utils/signing.d.ts

@@ -0,0 +1,2 @@
+import { Keypair } from "@solana/web3.js";
+export declare const getKeypair: (secretKey: Uint8Array) => Keypair;

package/dist/declarations/src/utils/transaction.d.ts

@@ -0,0 +1,7 @@
+import { Transaction, VersionedTransaction } from "@solana/web3.js";
+export declare const isVersionedTransaction: (transaction: Transaction | VersionedTransaction) => transaction is VersionedTransaction;
+export declare const parseTransactionInfo: (tx: Transaction | VersionedTransaction) => {
+    recentBlockhash: string | undefined;
+    address: string | undefined;
+    signature: string | null;
+};

package/dist/talismn-solana.cjs.dev.js

@@ -1,31 +1,112 @@
 'use strict';
 
 var web3_js = require('@solana/web3.js');
+var crypto = require('@talismn/crypto');
+
+const isVersionedTransaction = transaction => {
+  return "version" in transaction;
+};
+const parseTransactionInfo = tx => {
+  if (isVersionedTransaction(tx)) {
+    const recentBlockhash = tx.message.recentBlockhash;
+    const requiredSigners = tx.message.staticAccountKeys.filter((_, index) => tx.message.isAccountSigner(index));
+    const address = requiredSigners.length === 1 ? requiredSigners[0].toBase58() : undefined;
+    const sigBytes = tx.signatures.length ? tx.signatures[0] : null;
+
+    // signature might be an array of zeros, signature needs to be verified manually
+    const signature = sigBytes && address && crypto.ed25519.verify(sigBytes, tx.message.serialize(), crypto.base58.decode(address)) ? crypto.base58.encode(sigBytes) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  } else {
+    const recentBlockhash = tx.recentBlockhash;
+    const address = tx.feePayer ? tx.feePayer.toBase58() : undefined;
+    const signature = tx.verifySignatures() ? crypto.base58.encode(tx.signature) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  }
+};
 
 // Serialize TransactionInstruction to JSON
-const serializeInstruction = instruction => {
+const solInstructionToJson = instruction => {
   return {
-    programId: instruction.programId.toString(),
-    keys: instruction.keys.map(key => ({
-      pubkey: key.pubkey.toString(),
-      isSigner: key.isSigner,
-      isWritable: key.isWritable
-    })),
-    data: instruction.data.toString("base64")
+    type: "solana-instruction",
+    value: {
+      programId: instruction.programId.toString(),
+      keys: instruction.keys.map(key => ({
+        pubkey: key.pubkey.toString(),
+        isSigner: key.isSigner,
+        isWritable: key.isWritable
+      })),
+      data: instruction.data.toString("base64")
+    }
   };
 };
 // Deserialize JSON back to TransactionInstruction
-const deserializeInstruction = serialized => {
+const solInstructionFromJson = serialized => {
+  if (serialized.type !== "solana-instruction") throw new Error("Invalid serialized instruction type");
   return {
-    programId: new web3_js.PublicKey(serialized.programId),
-    keys: serialized.keys.map(key => ({
+    programId: new web3_js.PublicKey(serialized.value.programId),
+    keys: serialized.value.keys.map(key => ({
       pubkey: new web3_js.PublicKey(key.pubkey),
       isSigner: key.isSigner,
       isWritable: key.isWritable
     })),
-    data: Buffer.from(serialized.data, "base64")
+    data: Buffer.from(serialized.value.data, "base64")
   };
 };
+const serializeTransaction = transaction => {
+  if (isVersionedTransaction(transaction)) {
+    return crypto.base58.encode(transaction.serialize());
+  } else {
+    return crypto.base58.encode(transaction.serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    }));
+  }
+};
+const deserializeTransaction = transaction => {
+  const bytes = crypto.base58.decode(transaction);
+  try {
+    return web3_js.VersionedTransaction.deserialize(bytes);
+  } catch {
+    return web3_js.Transaction.from(bytes);
+  }
+};
+
+const getKeypair = secretKey => {
+  const publicKey = crypto.getPublicKeyFromSecret(secretKey, "solana");
+  const fullScretKey = new Uint8Array([...secretKey, ...publicKey]);
+  return web3_js.Keypair.fromSecretKey(fullScretKey);
+};
+
+const SOLANA_CHAINS = ["solana:mainnet", "solana:devnet", "solana:testnet", "solana:localnet"];
+const getSolNetworkId = chain => {
+  switch (chain) {
+    case "solana:mainnet":
+      return "solana-mainnet";
+    case "solana:devnet":
+      return "solana-devnet";
+    case "solana:testnet":
+      return "solana-testnet";
+    case "solana:localnet":
+      return "solana-localnet";
+    default:
+      throw new Error(`Unknown Solana chain: ${chain}`);
+  }
+};
 
-exports.deserializeInstruction = deserializeInstruction;
-exports.serializeInstruction = serializeInstruction;
+exports.SOLANA_CHAINS = SOLANA_CHAINS;
+exports.deserializeTransaction = deserializeTransaction;
+exports.getKeypair = getKeypair;
+exports.getSolNetworkId = getSolNetworkId;
+exports.isVersionedTransaction = isVersionedTransaction;
+exports.parseTransactionInfo = parseTransactionInfo;
+exports.serializeTransaction = serializeTransaction;
+exports.solInstructionFromJson = solInstructionFromJson;
+exports.solInstructionToJson = solInstructionToJson;

package/dist/talismn-solana.cjs.prod.js

@@ -1,31 +1,112 @@
 'use strict';
 
 var web3_js = require('@solana/web3.js');
+var crypto = require('@talismn/crypto');
+
+const isVersionedTransaction = transaction => {
+  return "version" in transaction;
+};
+const parseTransactionInfo = tx => {
+  if (isVersionedTransaction(tx)) {
+    const recentBlockhash = tx.message.recentBlockhash;
+    const requiredSigners = tx.message.staticAccountKeys.filter((_, index) => tx.message.isAccountSigner(index));
+    const address = requiredSigners.length === 1 ? requiredSigners[0].toBase58() : undefined;
+    const sigBytes = tx.signatures.length ? tx.signatures[0] : null;
+
+    // signature might be an array of zeros, signature needs to be verified manually
+    const signature = sigBytes && address && crypto.ed25519.verify(sigBytes, tx.message.serialize(), crypto.base58.decode(address)) ? crypto.base58.encode(sigBytes) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  } else {
+    const recentBlockhash = tx.recentBlockhash;
+    const address = tx.feePayer ? tx.feePayer.toBase58() : undefined;
+    const signature = tx.verifySignatures() ? crypto.base58.encode(tx.signature) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  }
+};
 
 // Serialize TransactionInstruction to JSON
-const serializeInstruction = instruction => {
+const solInstructionToJson = instruction => {
   return {
-    programId: instruction.programId.toString(),
-    keys: instruction.keys.map(key => ({
-      pubkey: key.pubkey.toString(),
-      isSigner: key.isSigner,
-      isWritable: key.isWritable
-    })),
-    data: instruction.data.toString("base64")
+    type: "solana-instruction",
+    value: {
+      programId: instruction.programId.toString(),
+      keys: instruction.keys.map(key => ({
+        pubkey: key.pubkey.toString(),
+        isSigner: key.isSigner,
+        isWritable: key.isWritable
+      })),
+      data: instruction.data.toString("base64")
+    }
   };
 };
 // Deserialize JSON back to TransactionInstruction
-const deserializeInstruction = serialized => {
+const solInstructionFromJson = serialized => {
+  if (serialized.type !== "solana-instruction") throw new Error("Invalid serialized instruction type");
   return {
-    programId: new web3_js.PublicKey(serialized.programId),
-    keys: serialized.keys.map(key => ({
+    programId: new web3_js.PublicKey(serialized.value.programId),
+    keys: serialized.value.keys.map(key => ({
       pubkey: new web3_js.PublicKey(key.pubkey),
       isSigner: key.isSigner,
       isWritable: key.isWritable
     })),
-    data: Buffer.from(serialized.data, "base64")
+    data: Buffer.from(serialized.value.data, "base64")
   };
 };
+const serializeTransaction = transaction => {
+  if (isVersionedTransaction(transaction)) {
+    return crypto.base58.encode(transaction.serialize());
+  } else {
+    return crypto.base58.encode(transaction.serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    }));
+  }
+};
+const deserializeTransaction = transaction => {
+  const bytes = crypto.base58.decode(transaction);
+  try {
+    return web3_js.VersionedTransaction.deserialize(bytes);
+  } catch {
+    return web3_js.Transaction.from(bytes);
+  }
+};
+
+const getKeypair = secretKey => {
+  const publicKey = crypto.getPublicKeyFromSecret(secretKey, "solana");
+  const fullScretKey = new Uint8Array([...secretKey, ...publicKey]);
+  return web3_js.Keypair.fromSecretKey(fullScretKey);
+};
+
+const SOLANA_CHAINS = ["solana:mainnet", "solana:devnet", "solana:testnet", "solana:localnet"];
+const getSolNetworkId = chain => {
+  switch (chain) {
+    case "solana:mainnet":
+      return "solana-mainnet";
+    case "solana:devnet":
+      return "solana-devnet";
+    case "solana:testnet":
+      return "solana-testnet";
+    case "solana:localnet":
+      return "solana-localnet";
+    default:
+      throw new Error(`Unknown Solana chain: ${chain}`);
+  }
+};
 
-exports.deserializeInstruction = deserializeInstruction;
-exports.serializeInstruction = serializeInstruction;
+exports.SOLANA_CHAINS = SOLANA_CHAINS;
+exports.deserializeTransaction = deserializeTransaction;
+exports.getKeypair = getKeypair;
+exports.getSolNetworkId = getSolNetworkId;
+exports.isVersionedTransaction = isVersionedTransaction;
+exports.parseTransactionInfo = parseTransactionInfo;
+exports.serializeTransaction = serializeTransaction;
+exports.solInstructionFromJson = solInstructionFromJson;
+exports.solInstructionToJson = solInstructionToJson;

package/dist/talismn-solana.esm.js

@@ -1,28 +1,102 @@
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction, Transaction, Keypair } from '@solana/web3.js';
+import { ed25519, base58, getPublicKeyFromSecret } from '@talismn/crypto';
+
+const isVersionedTransaction = transaction => {
+  return "version" in transaction;
+};
+const parseTransactionInfo = tx => {
+  if (isVersionedTransaction(tx)) {
+    const recentBlockhash = tx.message.recentBlockhash;
+    const requiredSigners = tx.message.staticAccountKeys.filter((_, index) => tx.message.isAccountSigner(index));
+    const address = requiredSigners.length === 1 ? requiredSigners[0].toBase58() : undefined;
+    const sigBytes = tx.signatures.length ? tx.signatures[0] : null;
+
+    // signature might be an array of zeros, signature needs to be verified manually
+    const signature = sigBytes && address && ed25519.verify(sigBytes, tx.message.serialize(), base58.decode(address)) ? base58.encode(sigBytes) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  } else {
+    const recentBlockhash = tx.recentBlockhash;
+    const address = tx.feePayer ? tx.feePayer.toBase58() : undefined;
+    const signature = tx.verifySignatures() ? base58.encode(tx.signature) : null;
+    return {
+      recentBlockhash,
+      address,
+      signature
+    };
+  }
+};
 
 // Serialize TransactionInstruction to JSON
-const serializeInstruction = instruction => {
+const solInstructionToJson = instruction => {
   return {
-    programId: instruction.programId.toString(),
-    keys: instruction.keys.map(key => ({
-      pubkey: key.pubkey.toString(),
-      isSigner: key.isSigner,
-      isWritable: key.isWritable
-    })),
-    data: instruction.data.toString("base64")
+    type: "solana-instruction",
+    value: {
+      programId: instruction.programId.toString(),
+      keys: instruction.keys.map(key => ({
+        pubkey: key.pubkey.toString(),
+        isSigner: key.isSigner,
+        isWritable: key.isWritable
+      })),
+      data: instruction.data.toString("base64")
+    }
   };
 };
 // Deserialize JSON back to TransactionInstruction
-const deserializeInstruction = serialized => {
+const solInstructionFromJson = serialized => {
+  if (serialized.type !== "solana-instruction") throw new Error("Invalid serialized instruction type");
   return {
-    programId: new PublicKey(serialized.programId),
-    keys: serialized.keys.map(key => ({
+    programId: new PublicKey(serialized.value.programId),
+    keys: serialized.value.keys.map(key => ({
       pubkey: new PublicKey(key.pubkey),
       isSigner: key.isSigner,
       isWritable: key.isWritable
     })),
-    data: Buffer.from(serialized.data, "base64")
+    data: Buffer.from(serialized.value.data, "base64")
   };
 };
+const serializeTransaction = transaction => {
+  if (isVersionedTransaction(transaction)) {
+    return base58.encode(transaction.serialize());
+  } else {
+    return base58.encode(transaction.serialize({
+      requireAllSignatures: false,
+      verifySignatures: false
+    }));
+  }
+};
+const deserializeTransaction = transaction => {
+  const bytes = base58.decode(transaction);
+  try {
+    return VersionedTransaction.deserialize(bytes);
+  } catch {
+    return Transaction.from(bytes);
+  }
+};
+
+const getKeypair = secretKey => {
+  const publicKey = getPublicKeyFromSecret(secretKey, "solana");
+  const fullScretKey = new Uint8Array([...secretKey, ...publicKey]);
+  return Keypair.fromSecretKey(fullScretKey);
+};
+
+const SOLANA_CHAINS = ["solana:mainnet", "solana:devnet", "solana:testnet", "solana:localnet"];
+const getSolNetworkId = chain => {
+  switch (chain) {
+    case "solana:mainnet":
+      return "solana-mainnet";
+    case "solana:devnet":
+      return "solana-devnet";
+    case "solana:testnet":
+      return "solana-testnet";
+    case "solana:localnet":
+      return "solana-localnet";
+    default:
+      throw new Error(`Unknown Solana chain: ${chain}`);
+  }
+};
 
-export { deserializeInstruction, serializeInstruction };
+export { SOLANA_CHAINS, deserializeTransaction, getKeypair, getSolNetworkId, isVersionedTransaction, parseTransactionInfo, serializeTransaction, solInstructionFromJson, solInstructionToJson };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/solana",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -18,11 +18,12 @@
     "/dist"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "@solana/web3.js": "^1.98.2",
-    "anylogger": "^1.0.11"
+    "anylogger": "^1.0.11",
+    "@talismn/crypto": "0.2.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/dist/declarations/src/utils/index.d.ts

@@ -1 +0,0 @@
-export * from "./serialization";