@aintivirus-ai/mixer-sdk 1.0.0 → 1.0.1

package/dist/solana/index.js

@@ -32,28 +32,71 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AintiVirusSolana = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
+const aintivirus_factory_json_1 = __importDefault(require("./idl/aintivirus_factory.json"));
+const aintivirus_mixer_json_1 = __importDefault(require("./idl/aintivirus_mixer.json"));
+const aintivirus_staking_json_1 = __importDefault(require("./idl/aintivirus_staking.json"));
 /**
  * Solana SDK for AintiVirus Mixer
  */
 class AintiVirusSolana {
-    constructor(factoryProgramId, mixerProgramId, stakingProgramId, wallet, connection, tokenMint) {
+    constructor(wallet, connection, tokenMint) {
         this.connection = connection;
         this.wallet = wallet;
-        // Initialize programs (using any type for IDL flexibility)
-        this.factoryProgram = new anchor.Program({}, // IDL should be loaded separately
-        new web3_js_1.PublicKey(factoryProgramId), new anchor.AnchorProvider(connection, wallet, {}));
-        this.mixerProgram = new anchor.Program({}, new web3_js_1.PublicKey(mixerProgramId), new anchor.AnchorProvider(connection, wallet, {}));
-        this.stakingProgram = new anchor.Program({}, new web3_js_1.PublicKey(stakingProgramId), new anchor.AnchorProvider(connection, wallet, {}));
+        const provider = new anchor.AnchorProvider(connection, wallet, {
+            commitment: "confirmed",
+        });
+        // Set the provider on Anchor so it's available globally
+        anchor.setProvider(provider);
+        // Import IDL files directly
+        // Ensure metadata.address is set for Anchor 0.32.1
+        const factoryIdl = this.ensureIdlAddress(aintivirus_factory_json_1.default);
+        const mixerIdl = this.ensureIdlAddress(aintivirus_mixer_json_1.default);
+        const stakingIdl = this.ensureIdlAddress(aintivirus_staking_json_1.default);
+        // Initialize programs with IDLs
+        this.factoryProgram = new anchor.Program(factoryIdl, provider);
+        this.mixerProgram = new anchor.Program(mixerIdl, provider);
+        this.stakingProgram = new anchor.Program(stakingIdl, provider);
         if (tokenMint) {
             this.tokenMint = new web3_js_1.PublicKey(tokenMint);
         }
     }
+    /**
+     * Ensure IDL has address in metadata.address for Anchor 0.32.1
+     */
+    ensureIdlAddress(idlJson) {
+        // If metadata.address already exists, return as-is
+        if (idlJson.metadata?.address) {
+            return idlJson;
+        }
+        // Get address from top level or metadata
+        const programAddress = idlJson.address || idlJson.metadata?.address;
+        if (!programAddress) {
+            throw new Error(`IDL missing program address. Expected 'address' field at top level or in metadata.`);
+        }
+        // Ensure metadata.address is set
+        return {
+            ...idlJson,
+            metadata: {
+                ...(idlJson.metadata || {}),
+                address: programAddress,
+            },
+        };
+    }
+    /**
+     * Set token mint address (can be called after initialization)
+     */
+    setTokenMint(tokenMint) {
+        this.tokenMint = tokenMint;
+    }
     /**
      * Get factory PDA
      */
@@ -82,6 +125,75 @@ class AintiVirusSolana {
     getMerkleTreePda(mixerConfigPda) {
         return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("merkle_tree"), mixerConfigPda.toBuffer()], this.mixerProgram.programId);
     }
+    /**
+     * Get vault SOL PDA
+     */
+    getVaultSolPda() {
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("vault"), Buffer.from("sol")], this.factoryProgram.programId);
+    }
+    /**
+     * Get staking PDA
+     */
+    getStakingPda() {
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staking")], this.stakingProgram.programId);
+    }
+    /**
+     * Get stake season PDA
+     */
+    getStakeSeasonPda(seasonId) {
+        const seasonIdBuffer = Buffer.allocUnsafe(8);
+        seasonIdBuffer.writeBigUInt64LE(seasonId, 0);
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake_season"), seasonIdBuffer], this.stakingProgram.programId);
+    }
+    /**
+     * Get staker record PDA
+     */
+    getStakerRecordPda(staker) {
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staker_record"), staker.toBuffer()], this.stakingProgram.programId);
+    }
+    /**
+     * Get season claimed PDA
+     */
+    getSeasonClaimedPda(staker, seasonId, mode = types_1.AssetMode.SOL) {
+        const seasonIdBuffer = Buffer.allocUnsafe(8);
+        seasonIdBuffer.writeBigUInt64LE(seasonId, 0);
+        return web3_js_1.PublicKey.findProgramAddressSync([
+            Buffer.from("season_claimed"),
+            staker.toBuffer(),
+            seasonIdBuffer,
+            Buffer.from([mode]),
+        ], this.stakingProgram.programId);
+    }
+    /**
+     * Check if an address has claimed rewards for a season
+     * @param address - Staker's public key
+     * @param seasonId - Season ID to check
+     * @param mode - Asset mode (SOL or TOKEN)
+     * @returns true if the address has claimed rewards for the season
+     */
+    async hasClaimed(address, seasonId, mode) {
+        const stakerPubkey = new web3_js_1.PublicKey(address);
+        const [claimPda] = this.getSeasonClaimedPda(stakerPubkey, seasonId, mode);
+        try {
+            await this.stakingProgram.account.seasonClaimed.fetch(claimPda);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Get commitment checker PDA
+     */
+    getCommitmentCheckerPda(commitment) {
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("commitment"), commitment], this.mixerProgram.programId);
+    }
+    /**
+     * Get nullifier hash checker PDA
+     */
+    getNullifierHashCheckerPda(nullifierHash) {
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("nullifier_hash"), nullifierHash], this.mixerProgram.programId);
+    }
     /**
      * Get mixer address for a specific mode and amount
      */
@@ -118,35 +230,51 @@ class AintiVirusSolana {
      */
     async depositSol(amount, commitment) {
         const [factoryPda] = this.getFactoryPda();
-        const [mixerPoolPda] = this.getMixerPoolPda(types_1.AssetMode.ETH, amount);
-        const [mixerConfigPda] = this.getMixerConfigPda(types_1.AssetMode.ETH, amount);
+        const [mixerPoolPda] = this.getMixerPoolPda(types_1.AssetMode.SOL, amount);
+        const [mixerConfigPda] = this.getMixerConfigPda(types_1.AssetMode.SOL, amount);
         const [merkleTreePda] = this.getMerkleTreePda(mixerConfigPda);
-        const commitmentBytes = Buffer.allocUnsafe(32);
-        const commitmentBigInt = commitment;
-        commitmentBytes.writeBigUInt64LE(commitmentBigInt & BigInt("0xFFFFFFFFFFFFFFFF"), 0);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 64n) & BigInt("0xFFFFFFFFFFFFFFFF"), 8);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 128n) & BigInt("0xFFFFFFFFFFFFFFFF"), 16);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 192n) & BigInt("0xFFFFFFFFFFFFFFFF"), 24);
-        const tx = await this.factoryProgram.methods
-            .deposit(types_1.AssetMode.ETH, new anchor.BN(amount.toString()), Array.from(commitmentBytes))
-            .accounts({
-            factory: factoryPda,
-            payer: this.wallet.publicKey,
-            mixerProgram: this.mixerProgram.programId,
-            mixerPool: mixerPoolPda,
-            mixerConfig: mixerConfigPda,
-            merkleTree: merkleTreePda,
-            systemProgram: web3_js_1.SystemProgram.programId,
-        })
-            .rpc();
-        const signature = tx;
-        const txDetails = await this.connection.getTransaction(signature, {
-            commitment: "confirmed",
-        });
-        return {
-            txHash: signature,
-            blockTime: txDetails?.blockTime ?? undefined,
-        };
+        // Convert commitment bigint to 32-byte buffer (same as reference implementation)
+        const commitmentHex = commitment.toString(16).padStart(64, "0");
+        const commitmentBytes = Buffer.from(commitmentHex, "hex");
+        const [commitmentCheckerPda] = this.getCommitmentCheckerPda(commitmentBytes);
+        // Get token mint from factory account
+        const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
+        const tokenMint = new web3_js_1.PublicKey(factoryAccount.mint);
+        const vaultTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, factoryPda, true);
+        try {
+            const commitmentArray = Array.from(commitmentBytes);
+            const tx = await this.factoryProgram.methods
+                .deposit(types_1.AssetMode.SOL, new anchor.BN(amount.toString()), commitmentArray)
+                .accounts({
+                commitmentChecker: commitmentCheckerPda,
+                merkleTree: merkleTreePda,
+                mixerConfig: mixerConfigPda,
+                mixerPool: mixerPoolPda,
+                userTokenAccount: null,
+                vaultTokenAccount: vaultTokenAccount,
+                user: this.wallet.publicKey,
+            })
+                .rpc();
+            const signature = tx;
+            const txDetails = await this.connection.getTransaction(signature, {
+                commitment: "confirmed",
+            });
+            return {
+                txHash: signature,
+                blockTime: txDetails?.blockTime ?? undefined,
+            };
+        }
+        catch (error) {
+            const errorMsg = error?.message || String(error);
+            console.error("[depositSol] ✗ Error preparing/sending transaction:", errorMsg);
+            if (error?.stack) {
+                console.error("[depositSol] Stack trace:", error.stack);
+            }
+            if (error?.logs) {
+                console.error("[depositSol] Error logs:", error.logs);
+            }
+            throw error;
+        }
     }
     /**
      * Deposit tokens into the mixer
@@ -160,28 +288,22 @@ class AintiVirusSolana {
         const [mixerConfigPda] = this.getMixerConfigPda(types_1.AssetMode.TOKEN, amount);
         const [merkleTreePda] = this.getMerkleTreePda(mixerConfigPda);
         const userTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
-        const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true // allowOwnerOffCurve
+        const vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true // allowOwnerOffCurve
         );
-        const commitmentBytes = Buffer.allocUnsafe(32);
-        const commitmentBigInt = commitment;
-        commitmentBytes.writeBigUInt64LE(commitmentBigInt & BigInt("0xFFFFFFFFFFFFFFFF"), 0);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 64n) & BigInt("0xFFFFFFFFFFFFFFFF"), 8);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 128n) & BigInt("0xFFFFFFFFFFFFFFFF"), 16);
-        commitmentBytes.writeBigUInt64LE((commitmentBigInt >> 192n) & BigInt("0xFFFFFFFFFFFFFFFF"), 24);
+        // Convert commitment bigint to 32-byte buffer (same as reference implementation)
+        const commitmentHex = commitment.toString(16).padStart(64, "0");
+        const commitmentBytes = Buffer.from(commitmentHex, "hex");
+        const [commitmentCheckerPda] = this.getCommitmentCheckerPda(commitmentBytes);
         const tx = await this.factoryProgram.methods
             .deposit(types_1.AssetMode.TOKEN, new anchor.BN(amount.toString()), Array.from(commitmentBytes))
             .accounts({
-            factory: factoryPda,
-            payer: this.wallet.publicKey,
-            mixerProgram: this.mixerProgram.programId,
+            vaultTokenAccount: vaultTokenAccount,
             mixerPool: mixerPoolPda,
             mixerConfig: mixerConfigPda,
             merkleTree: merkleTreePda,
-            tokenMint: this.tokenMint,
+            commitmentChecker: commitmentCheckerPda,
+            user: this.wallet.publicKey,
             userTokenAccount: userTokenAccount,
-            factoryTokenAccount: factoryTokenAccount,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            systemProgram: web3_js_1.SystemProgram.programId,
         })
             .rpc();
         const signature = tx;
@@ -196,37 +318,36 @@ class AintiVirusSolana {
     /**
      * Withdraw from the mixer
      */
-    async withdraw(instructionData, nullifierHash, amount, mode) {
+    async withdraw(instructionData, nullifierHash, amount, mode, recipient) {
         const [factoryPda] = this.getFactoryPda();
+        const [vaultSolPda] = this.getVaultSolPda();
         const [mixerPoolPda] = this.getMixerPoolPda(mode, amount);
         const [mixerConfigPda] = this.getMixerConfigPda(mode, amount);
         const [merkleTreePda] = this.getMerkleTreePda(mixerConfigPda);
-        const nullifierHashBytes = Buffer.allocUnsafe(32);
-        const nullifierHashBigInt = nullifierHash;
-        nullifierHashBytes.writeBigUInt64LE(nullifierHashBigInt & BigInt("0xFFFFFFFFFFFFFFFF"), 0);
-        nullifierHashBytes.writeBigUInt64LE((nullifierHashBigInt >> 64n) & BigInt("0xFFFFFFFFFFFFFFFF"), 8);
-        nullifierHashBytes.writeBigUInt64LE((nullifierHashBigInt >> 128n) & BigInt("0xFFFFFFFFFFFFFFFF"), 16);
-        nullifierHashBytes.writeBigUInt64LE((nullifierHashBigInt >> 192n) & BigInt("0xFFFFFFFFFFFFFFFF"), 24);
-        const accounts = {
-            factory: factoryPda,
-            payer: this.wallet.publicKey,
-            mixerProgram: this.mixerProgram.programId,
-            mixerPool: mixerPoolPda,
-            mixerConfig: mixerConfigPda,
-            merkleTree: merkleTreePda,
-            systemProgram: web3_js_1.SystemProgram.programId,
-        };
+        const recipientPubkey = recipient || this.wallet.publicKey;
+        // Convert nullifier hash bigint to 32-byte buffer (same as reference implementation)
+        const nullifierHashHex = nullifierHash.toString(16).padStart(64, "0");
+        const nullifierHashBytes = Buffer.from(nullifierHashHex, "hex");
+        const [nullifierHashCheckerPda] = this.getNullifierHashCheckerPda(nullifierHashBytes);
+        let recipientTokenAccount = null;
+        let vaultTokenAccount = null;
         if (mode === types_1.AssetMode.TOKEN && this.tokenMint) {
-            const userTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
-            const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
-            accounts.tokenMint = this.tokenMint;
-            accounts.userTokenAccount = userTokenAccount;
-            accounts.factoryTokenAccount = factoryTokenAccount;
-            accounts.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID;
+            recipientTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, recipientPubkey);
+            vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
         }
         const tx = await this.factoryProgram.methods
-            .withdraw(mode, new anchor.BN(amount.toString()), Array.from(instructionData), Array.from(nullifierHashBytes))
-            .accounts(accounts)
+            .withdraw(mode, new anchor.BN(amount.toString()), instructionData, // Buffer type
+        Array.from(nullifierHashBytes))
+            .accounts({
+            mixerPool: mixerPoolPda,
+            mixerConfig: mixerConfigPda,
+            merkleTree: merkleTreePda,
+            nullifierHashChecker: nullifierHashCheckerPda,
+            recipient: recipientPubkey,
+            payer: this.wallet.publicKey,
+            vaultTokenAccount: vaultTokenAccount,
+            recipientTokenAccount: recipientTokenAccount,
+        })
             .rpc();
         const signature = tx;
         const txDetails = await this.connection.getTransaction(signature, {
@@ -241,14 +362,12 @@ class AintiVirusSolana {
      * Stake SOL
      */
     async stakeSol(amount) {
-        const [factoryPda] = this.getFactoryPda();
+        const [stakerRecordPda] = this.getStakerRecordPda(this.wallet.publicKey);
         const tx = await this.factoryProgram.methods
-            .stakeEther(new anchor.BN(amount.toString()))
+            .stakeSol(new anchor.BN(amount.toString()))
             .accounts({
-            factory: factoryPda,
-            staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            stakerRecord: stakerRecordPda,
+            user: this.wallet.publicKey,
         })
             .rpc();
         const signature = tx;
@@ -268,19 +387,17 @@ class AintiVirusSolana {
             throw new Error("Token mint not configured");
         }
         const [factoryPda] = this.getFactoryPda();
+        const [stakerRecordPda] = this.getStakerRecordPda(this.wallet.publicKey);
         const userTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
-        const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
+        const vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
         const tx = await this.factoryProgram.methods
             .stakeToken(new anchor.BN(amount.toString()))
             .accounts({
-            factory: factoryPda,
-            staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            tokenMint: this.tokenMint,
+            // factory, staking, stake_season, staking_program, token_program, system_program are auto-populated
+            user: this.wallet.publicKey,
+            stakerRecord: stakerRecordPda,
             userTokenAccount: userTokenAccount,
-            factoryTokenAccount: factoryTokenAccount,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            vaultTokenAccount: vaultTokenAccount,
         })
             .rpc();
         const signature = tx;
@@ -296,14 +413,13 @@ class AintiVirusSolana {
      * Claim SOL rewards
      */
     async claimSol(seasonId) {
-        const [factoryPda] = this.getFactoryPda();
+        const [seasonClaimedPda] = this.getSeasonClaimedPda(this.wallet.publicKey, seasonId);
         const tx = await this.factoryProgram.methods
-            .claimEth(new anchor.BN(seasonId.toString()))
+            .claimSol(new anchor.BN(seasonId.toString()))
             .accounts({
-            factory: factoryPda,
+            // factory, vault_sol, staking, stake_season, staking_program, system_program are auto-populated
+            seasonClaimed: seasonClaimedPda,
             staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            systemProgram: web3_js_1.SystemProgram.programId,
         })
             .rpc();
         const signature = tx;
@@ -323,19 +439,18 @@ class AintiVirusSolana {
             throw new Error("Token mint not configured");
         }
         const [factoryPda] = this.getFactoryPda();
-        const userTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
-        const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
+        const [stakerRecordPda] = this.getStakerRecordPda(this.wallet.publicKey);
+        const [seasonClaimedPda] = this.getSeasonClaimedPda(this.wallet.publicKey, seasonId, types_1.AssetMode.TOKEN);
+        const stakerTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
+        const vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
         const tx = await this.factoryProgram.methods
             .claimToken(new anchor.BN(seasonId.toString()))
             .accounts({
-            factory: factoryPda,
+            // factory, staking, stake_season, staking_program, token_program, system_program are auto-populated
+            seasonClaimed: seasonClaimedPda,
             staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            tokenMint: this.tokenMint,
-            userTokenAccount: userTokenAccount,
-            factoryTokenAccount: factoryTokenAccount,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            vaultTokenAccount: vaultTokenAccount,
+            stakerTokenAccount: stakerTokenAccount,
         })
             .rpc();
         const signature = tx;
@@ -351,14 +466,10 @@ class AintiVirusSolana {
      * Unstake SOL
      */
     async unstakeSol() {
-        const [factoryPda] = this.getFactoryPda();
         const tx = await this.factoryProgram.methods
-            .unstakeEth()
+            .unstakeSol()
             .accounts({
-            factory: factoryPda,
             staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            systemProgram: web3_js_1.SystemProgram.programId,
         })
             .rpc();
         const signature = tx;
@@ -378,19 +489,14 @@ class AintiVirusSolana {
             throw new Error("Token mint not configured");
         }
         const [factoryPda] = this.getFactoryPda();
-        const userTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
-        const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
+        const recipientTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, this.wallet.publicKey);
+        const vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
         const tx = await this.factoryProgram.methods
             .unstakeToken()
             .accounts({
-            factory: factoryPda,
             staker: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-            tokenMint: this.tokenMint,
-            userTokenAccount: userTokenAccount,
-            factoryTokenAccount: factoryTokenAccount,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            systemProgram: web3_js_1.SystemProgram.programId,
+            recipientTokenAccount: recipientTokenAccount,
+            vaultTokenAccount: vaultTokenAccount,
         })
             .rpc();
         const signature = tx;
@@ -406,11 +512,15 @@ class AintiVirusSolana {
      * Get current stake season
      */
     async getCurrentStakeSeason() {
-        const [factoryPda] = this.getFactoryPda();
-        const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
-        // Assuming factory account has currentStakeSeason field
-        // This may need adjustment based on actual account structure
-        return BigInt(factoryAccount.currentStakeSeason?.toString() || "0");
+        const [stakingPda] = this.getStakingPda();
+        try {
+            const stakingAccount = await this.stakingProgram.account.staking.fetch(stakingPda);
+            return BigInt(stakingAccount.currentStakeSeason.toString());
+        }
+        catch {
+            // If staking account doesn't exist, return 0
+            return 0n;
+        }
     }
     /**
      * Get SOL balance
@@ -435,32 +545,43 @@ class AintiVirusSolana {
             return 0n;
         }
     }
+    /**
+     * Initialize factory account
+     * @param feeRate Fee rate in basis points (e.g., 250 = 0.25%)
+     * @param tokenMint Token mint address (required for vault_token_account)
+     */
+    async initializeFactory(feeRate, tokenMint) {
+        const [factoryPda] = this.getFactoryPda();
+        // Derive vault token account (factory PDA's associated token account)
+        const vaultTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(tokenMint, factoryPda, true);
+        const tx = await this.factoryProgram.methods
+            .initializeFactory(new anchor.BN(feeRate.toString()))
+            .accounts({
+            vaultTokenAccount: vaultTokenAccount,
+            mint: tokenMint,
+        })
+            .rpc();
+        const slot = await this.connection.getSlot();
+        const blockTime = await this.connection.getBlockTime(slot);
+        return {
+            txHash: tx,
+            blockTime: blockTime || undefined,
+        };
+    }
     /**
      * Deploy mixer instance
      */
     async deployMixer(mode, amount) {
-        const [factoryPda] = this.getFactoryPda();
         const [mixerPoolPda] = this.getMixerPoolPda(mode, amount);
         const [mixerConfigPda] = this.getMixerConfigPda(mode, amount);
         const [merkleTreePda] = this.getMerkleTreePda(mixerConfigPda);
-        const accounts = {
-            factory: factoryPda,
-            payer: this.wallet.publicKey,
-            mixerProgram: this.mixerProgram.programId,
+        const tx = await this.factoryProgram.methods
+            .deployMixer(mode, new anchor.BN(amount.toString()))
+            .accounts({
             mixerPool: mixerPoolPda,
             mixerConfig: mixerConfigPda,
             merkleTree: merkleTreePda,
-            systemProgram: web3_js_1.SystemProgram.programId,
-        };
-        if (mode === types_1.AssetMode.TOKEN && this.tokenMint) {
-            const factoryTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.tokenMint, factoryPda, true);
-            accounts.tokenMint = this.tokenMint;
-            accounts.factoryTokenAccount = factoryTokenAccount;
-            accounts.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID;
-        }
-        const tx = await this.factoryProgram.methods
-            .deployMixer(mode, new anchor.BN(amount.toString()))
-            .accounts(accounts)
+        })
             .rpc();
         const signature = tx;
         const txDetails = await this.connection.getTransaction(signature, {
@@ -475,11 +596,9 @@ class AintiVirusSolana {
      * Set fee rate (admin function)
      */
     async setFeeRate(feeRate) {
-        const [factoryPda] = this.getFactoryPda();
         const tx = await this.factoryProgram.methods
             .setFeeRate(new anchor.BN(feeRate.toString()))
             .accounts({
-            factory: factoryPda,
             authority: this.wallet.publicKey,
         })
             .rpc();
@@ -496,13 +615,9 @@ class AintiVirusSolana {
      * Set staking season period (admin function)
      */
     async setStakingSeasonPeriod(period) {
-        const [factoryPda] = this.getFactoryPda();
         const tx = await this.factoryProgram.methods
             .setStakingSeasonPeriod(new anchor.BN(period.toString()))
-            .accounts({
-            factory: factoryPda,
-            authority: this.wallet.publicKey,
-        })
+            .accounts({})
             .rpc();
         const signature = tx;
         const txDetails = await this.connection.getTransaction(signature, {
@@ -516,56 +631,12 @@ class AintiVirusSolana {
     /**
      * Start stake season (admin function)
      */
-    async startStakeSeason() {
-        const [factoryPda] = this.getFactoryPda();
-        const tx = await this.factoryProgram.methods
-            .startStakeSeason()
-            .accounts({
-            factory: factoryPda,
-            authority: this.wallet.publicKey,
-            stakingProgram: this.stakingProgram.programId,
-        })
-            .rpc();
-        const signature = tx;
-        const txDetails = await this.connection.getTransaction(signature, {
-            commitment: "confirmed",
-        });
-        return {
-            txHash: signature,
-            blockTime: txDetails?.blockTime ?? undefined,
-        };
-    }
-    /**
-     * Set verifier address (admin function)
-     */
-    async setVerifier(verifierAddress) {
-        const [factoryPda] = this.getFactoryPda();
+    async startStakeSeason(nextSeasonId) {
+        const [nextStakeSeasonPda] = this.getStakeSeasonPda(nextSeasonId);
         const tx = await this.factoryProgram.methods
-            .setVerifier(new web3_js_1.PublicKey(verifierAddress))
+            .startStakeSeason(new anchor.BN(nextSeasonId.toString()))
             .accounts({
-            factory: factoryPda,
-            authority: this.wallet.publicKey,
-        })
-            .rpc();
-        const signature = tx;
-        const txDetails = await this.connection.getTransaction(signature, {
-            commitment: "confirmed",
-        });
-        return {
-            txHash: signature,
-            blockTime: txDetails?.blockTime ?? undefined,
-        };
-    }
-    /**
-     * Set hasher address (admin function)
-     */
-    async setHasher(hasherAddress) {
-        const [factoryPda] = this.getFactoryPda();
-        const tx = await this.factoryProgram.methods
-            .setHasher(new web3_js_1.PublicKey(hasherAddress))
-            .accounts({
-            factory: factoryPda,
-            authority: this.wallet.publicKey,
+            nextStakeSeason: nextStakeSeasonPda,
         })
             .rpc();
         const signature = tx;
@@ -582,8 +653,20 @@ class AintiVirusSolana {
      */
     async calculateDepositAmount(amount) {
         const [factoryPda] = this.getFactoryPda();
-        const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
-        const feeRate = BigInt(factoryAccount.feeRate?.toString() || "0");
+        let factoryAccount;
+        try {
+            factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
+        }
+        catch (error) {
+            const errorMsg = error?.message || String(error);
+            if (errorMsg.includes("array")) {
+                throw new Error(`Failed to deserialize factory account. This may indicate an IDL type mismatch. ` +
+                    `Original error: ${errorMsg}`);
+            }
+            throw error;
+        }
+        const feeRateValue = factoryAccount.feeRate;
+        const feeRate = feeRateValue ? BigInt(feeRateValue.toString()) : 0n;
         // Calculate: amount + (amount * feeRate / 10000)
         return amount + (amount * feeRate) / 10000n;
     }
@@ -592,35 +675,51 @@ class AintiVirusSolana {
      */
     async getFeeRate() {
         const [factoryPda] = this.getFactoryPda();
-        const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
-        return BigInt(factoryAccount.feeRate?.toString() || "0");
+        try {
+            const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
+            return factoryAccount?.feeRate
+                ? BigInt(factoryAccount.feeRate.toString())
+                : 0n;
+        }
+        catch (error) {
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            if (errorMsg.includes("array")) {
+                throw new Error(`Failed to deserialize factory account. This may indicate an IDL type mismatch. ` +
+                    `Original error: ${errorMsg}`);
+            }
+            throw error;
+        }
+    }
+    /**
+     * Get factory account (includes mint address)
+     */
+    async getFactoryAccount() {
+        const [factoryPda] = this.getFactoryPda();
+        return await this.factoryProgram.account.factory.fetch(factoryPda);
     }
     /**
      * Get stake season information
      */
     async getStakeSeason(seasonId) {
-        const [factoryPda] = this.getFactoryPda();
         // Fetch stake season from staking program
-        const seasonPda = web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from("stake_season"),
-            new anchor.BN(seasonId.toString()).toArrayLike(Buffer, "be", 8),
-        ], this.stakingProgram.programId)[0];
+        const [seasonPda] = this.getStakeSeasonPda(seasonId);
         try {
             const seasonAccount = await this.stakingProgram.account.stakeSeason.fetch(seasonPda);
             return {
                 seasonId: BigInt(seasonAccount.seasonId?.toString() || "0"),
                 startTimestamp: BigInt(seasonAccount.startTimestamp?.toString() || "0"),
                 endTimestamp: BigInt(seasonAccount.endTimestamp?.toString() || "0"),
-                totalStakedEthAmount: BigInt(seasonAccount.totalStakedEthAmount?.toString() || "0"),
+                totalStakedSolAmount: BigInt(seasonAccount.totalStakedSolAmount?.toString() || "0"),
                 totalStakedTokenAmount: BigInt(seasonAccount.totalStakedTokenAmount?.toString() || "0"),
-                totalRewardEthAmount: BigInt(seasonAccount.totalRewardEthAmount?.toString() || "0"),
+                totalRewardSolAmount: BigInt(seasonAccount.totalRewardSolAmount?.toString() || "0"),
                 totalRewardTokenAmount: BigInt(seasonAccount.totalRewardTokenAmount?.toString() || "0"),
-                totalEthWeightValue: BigInt(seasonAccount.totalEthWeightValue?.toString() || "0"),
+                totalSolWeightValue: BigInt(seasonAccount.totalSolWeightValue?.toString() || "0"),
                 totalTokenWeightValue: BigInt(seasonAccount.totalTokenWeightValue?.toString() || "0"),
             };
         }
-        catch {
-            throw new Error(`Stake season ${seasonId} not found`);
+        catch (error) {
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            throw new Error(`Stake season ${seasonId} not found. Original error: ${errorMsg}`);
         }
     }
     /**
@@ -632,13 +731,13 @@ class AintiVirusSolana {
         try {
             const stakerRecord = await this.stakingProgram.account.stakerRecord.fetch(stakerRecordPda);
             return {
-                ethStakedSeasonId: BigInt(stakerRecord.ethStakedSeasonId?.toString() || "0"),
+                solStakedSeasonId: BigInt(stakerRecord.solStakedSeasonId?.toString() || "0"),
                 tokenStakedSeasonId: BigInt(stakerRecord.tokenStakedSeasonId?.toString() || "0"),
-                ethStakedTimestamp: BigInt(stakerRecord.ethStakedTimestamp?.toString() || "0"),
+                solStakedTimestamp: BigInt(stakerRecord.solStakedTimestamp?.toString() || "0"),
                 tokenStakedTimestamp: BigInt(stakerRecord.tokenStakedTimestamp?.toString() || "0"),
-                stakedEthAmount: BigInt(stakerRecord.stakedEthAmount?.toString() || "0"),
+                stakedSolAmount: BigInt(stakerRecord.stakedSolAmount?.toString() || "0"),
                 stakedTokenAmount: BigInt(stakerRecord.stakedTokenAmount?.toString() || "0"),
-                ethWeightValue: BigInt(stakerRecord.ethWeightValue?.toString() || "0"),
+                solWeightValue: BigInt(stakerRecord.solWeightValue?.toString() || "0"),
                 tokenWeightValue: BigInt(stakerRecord.tokenWeightValue?.toString() || "0"),
             };
         }
@@ -650,37 +749,13 @@ class AintiVirusSolana {
      * Check if address has claimed SOL for a season
      */
     async hasClaimedSol(address, seasonId) {
-        const stakerPubkey = new web3_js_1.PublicKey(address);
-        const claimPda = web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from("season_claimed_eth"),
-            stakerPubkey.toBuffer(),
-            new anchor.BN(seasonId.toString()).toArrayLike(Buffer, "be", 8),
-        ], this.stakingProgram.programId)[0];
-        try {
-            await this.stakingProgram.account.seasonClaimedEth.fetch(claimPda);
-            return true;
-        }
-        catch {
-            return false;
-        }
+        return this.hasClaimed(address, seasonId, types_1.AssetMode.SOL);
     }
     /**
      * Check if address has claimed tokens for a season
      */
     async hasClaimedToken(address, seasonId) {
-        const stakerPubkey = new web3_js_1.PublicKey(address);
-        const claimPda = web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from("season_claimed_token"),
-            stakerPubkey.toBuffer(),
-            new anchor.BN(seasonId.toString()).toArrayLike(Buffer, "be", 8),
-        ], this.stakingProgram.programId)[0];
-        try {
-            await this.stakingProgram.account.seasonClaimedToken.fetch(claimPda);
-            return true;
-        }
-        catch {
-            return false;
-        }
+        return this.hasClaimed(address, seasonId, types_1.AssetMode.TOKEN);
     }
     /**
      * Get staking address (PDA)
@@ -688,7 +763,7 @@ class AintiVirusSolana {
     async getStakingAddress() {
         const [factoryPda] = this.getFactoryPda();
         const factoryAccount = await this.factoryProgram.account.factory.fetch(factoryPda);
-        return factoryAccount.staking;
+        return factoryAccount.stakingProgram;
     }
 }
 exports.AintiVirusSolana = AintiVirusSolana;