pvc-fork 1.0.0 → 1.0.1

package/dist/deposit.d.ts

@@ -1,3 +1,4 @@
+import "dotenv/config";
 import { Connection, PublicKey } from '@solana/web3.js';
 import * as hasher from '@lightprotocol/hasher.rs';
 import { EncryptionService } from './utils/encryption.js';

package/dist/deposit.js

@@ -1,4 +1,5 @@
-import { PublicKey, TransactionInstruction, SystemProgram, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, LAMPORTS_PER_SOL } from '@solana/web3.js';
+import "dotenv/config";
+import { Keypair, PublicKey, TransactionInstruction, SystemProgram, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, LAMPORTS_PER_SOL } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Utxo } from './models/utxo.js';
 import { fetchMerkleProof, findNullifierPDAs, getExtDataHash, getProgramAccounts, queryRemoteTreeState, findCrossCheckNullifierPDAs } from './utils/utils.js';
@@ -10,9 +11,23 @@ import { getUtxos } from './getUtxos.js';
 import { FIELD_SIZE, FEE_RECIPIENT, MERKLE_TREE_DEPTH, RELAYER_API_URL, PROGRAM_ID, ALT_ADDRESS } from './utils/constants.js';
 import { useExistingALT } from './utils/address_lookup_table.js';
 import { logger } from './utils/logger.js';
+import { bs58 } from '@coral-xyz/anchor/dist/cjs/utils/bytes/index.js';
+async function relayDepositDevnet(connection, signedTransaction) {
+    const payer = Keypair.fromSecretKey(bs58.decode(process.env.SOLANA_PRIVATE_KEY));
+    const transaction = VersionedTransaction.deserialize(Buffer.from(signedTransaction, 'base64'));
+    transaction.sign([payer]);
+    const signature = await connection.sendRawTransaction(Buffer.from(transaction.serialize()), {
+        skipPreflight: true,
+    });
+    logger.info(`Relayed deposit transaction successfully. Signature: ${signature}`);
+    return signature;
+}
 // Function to relay pre-signed deposit transaction to indexer backend
-async function relayDepositToIndexer(signedTransaction, publicKey, referrer) {
+async function relayDepositToIndexer(connection, signedTransaction, publicKey, referrer) {
     try {
+        if (connection.rpcEndpoint.includes('devnet')) {
+            return await relayDepositDevnet(connection, signedTransaction);
+        }
         logger.debug('Relaying pre-signed deposit transaction to indexer backend...');
         const params = {
             signedTransaction,
@@ -45,10 +60,10 @@ async function relayDepositToIndexer(signedTransaction, publicKey, referrer) {
     }
 }
 async function finalizeDepositFlow(params) {
-    const { serializedTransaction, publicKey, referrer, encryptedOutputHex } = params;
+    const { connection, serializedTransaction, publicKey, referrer, encryptedOutputHex } = params;
     // Relay the pre-signed transaction to indexer backend
     logger.info('submitting transaction to relayer...');
-    const signature = await relayDepositToIndexer(serializedTransaction, publicKey, referrer);
+    const signature = await relayDepositToIndexer(connection, serializedTransaction, publicKey, referrer);
     logger.debug('Transaction signature:', signature);
     logger.debug(`Transaction link: https://explorer.solana.com/tx/${signature}`);
     logger.info('Waiting for transaction confirmation...');
@@ -358,6 +373,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
         unsignedTransaction,
         resume: async (signedTransaction) => {
             return finalizeDepositFlow({
+                connection,
                 serializedTransaction: signedTransaction,
                 publicKey,
                 referrer,

package/dist/utils/constants.d.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
+import "dotenv/config";
 export declare const FIELD_SIZE: BN;
 export declare const PROGRAM_ID: PublicKey;
 export declare const FEE_RECIPIENT: PublicKey;

package/dist/utils/constants.js

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
+import "dotenv/config";
 export const FIELD_SIZE = new BN('21888242871839275222246405745257275088548364400416034343698204186575808495617');
 export const PROGRAM_ID = process.env.NEXT_PUBLIC_PROGRAM_ID ? new PublicKey(process.env.NEXT_PUBLIC_PROGRAM_ID) : new PublicKey('9fhQBbumKEFuXtMBDw8AaQyAjCorLGJQiS3skWZdQyQD');
 export const FEE_RECIPIENT = new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pvc-fork",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "dist/index.js",
   "repository": "",
@@ -14,7 +14,8 @@
     "build": "tsc",
     "test": "vitest run --exclude \"**/__tests__/e2e.test.ts,**/__tests__/e2espl.test.ts\"",
     "teste2e": "vitest run e2e.test.ts",
-    "teste2espl": "vitest run e2espl.test.ts"
+    "teste2espl": "vitest run e2espl.test.ts",
+    "example": "npm run build && tsx ./example/index.ts"
   },
   "keywords": [],
   "author": "",
@@ -45,7 +46,8 @@
     "@types/node-localstorage": "^1.3.3",
     "@types/snarkjs": "^0.7.9",
     "@types/tmp": "^0.2.6",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
-}
+}

package/src/deposit.ts

@@ -1,3 +1,5 @@
+
+import "dotenv/config";
 import { Connection, Keypair, PublicKey, TransactionInstruction, SystemProgram, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, LAMPORTS_PER_SOL } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Utxo } from './models/utxo.js';
@@ -11,13 +13,32 @@ import { getUtxos, isUtxoSpent } from './getUtxos.js';
 import { FIELD_SIZE, FEE_RECIPIENT, MERKLE_TREE_DEPTH, RELAYER_API_URL, PROGRAM_ID, ALT_ADDRESS } from './utils/constants.js';
 import { useExistingALT } from './utils/address_lookup_table.js';
 import { logger } from './utils/logger.js';
-
+import { bs58 } from '@coral-xyz/anchor/dist/cjs/utils/bytes/index.js';
+
+async function relayDepositDevnet(connection: Connection, signedTransaction: string): Promise<string> {
+    const payer = Keypair.fromSecretKey(bs58.decode(process.env.SOLANA_PRIVATE_KEY!));
+
+    const transaction = VersionedTransaction.deserialize(
+        Buffer.from(signedTransaction, 'base64')
+    );
+    transaction.sign([payer]);
+    const signature = await connection.sendRawTransaction(
+        Buffer.from(transaction.serialize()),
+        {
+            skipPreflight: true,
+        }
+    );
+    logger.info(`Relayed deposit transaction successfully. Signature: ${signature}`);
+    return signature;
+}
 
 // Function to relay pre-signed deposit transaction to indexer backend
-async function relayDepositToIndexer(signedTransaction: string, publicKey: PublicKey, referrer?: string): Promise<string> {
+async function relayDepositToIndexer(connection: Connection, signedTransaction: string, publicKey: PublicKey, referrer?: string): Promise<string> {
     try {
+        if (connection.rpcEndpoint.includes('devnet')) {
+            return await relayDepositDevnet(connection, signedTransaction);
+        }
         logger.debug('Relaying pre-signed deposit transaction to indexer backend...');
-
         const params: any = {
             signedTransaction,
             senderAddress: publicKey.toString()
@@ -54,16 +75,17 @@ async function relayDepositToIndexer(signedTransaction: string, publicKey: Publi
 }
 
 async function finalizeDepositFlow(params: {
+    connection: Connection,
     serializedTransaction: string,
     publicKey: PublicKey,
     referrer?: string,
     encryptedOutputHex: string
 }) {
-    const { serializedTransaction, publicKey, referrer, encryptedOutputHex } = params;
+    const { connection, serializedTransaction, publicKey, referrer, encryptedOutputHex } = params;
 
     // Relay the pre-signed transaction to indexer backend
     logger.info('submitting transaction to relayer...')
-    const signature = await relayDepositToIndexer(serializedTransaction, publicKey, referrer);
+    const signature = await relayDepositToIndexer(connection, serializedTransaction, publicKey, referrer);
     logger.debug('Transaction signature:', signature);
     logger.debug(`Transaction link: https://explorer.solana.com/tx/${signature}`);
 
@@ -449,6 +471,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
         unsignedTransaction,
         resume: async (signedTransaction: string) => {
             return finalizeDepositFlow({
+                connection,
                 serializedTransaction: signedTransaction,
                 publicKey,
                 referrer,

package/src/utils/constants.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
+import "dotenv/config";
 
 export const FIELD_SIZE = new BN('21888242871839275222246405745257275088548364400416034343698204186575808495617')