@aintivirus-ai/mixer-sdk 1.0.8 → 1.0.9

package/dist/evm/index.d.ts

@@ -96,29 +96,54 @@ export declare class AintiVirusEVM {
      * Withdraw via relayer (fee from proof).
      */
     withdrawRelayed(proof: WithdrawalProof, amount: bigint, assetAddress: string): Promise<TransactionResult>;
+    /**
+     * Stake any asset deployed as a mixer pool.
+     * For WETH with gateway configured: uses native ETH (msg.value).
+     * For ERC20: approves factory and calls factory.stake(asset, amount).
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     * @param amount Amount in asset's smallest unit
+     */
+    stake(assetAddress: string, amount: bigint): Promise<TransactionResult>;
+    /**
+     * Unstake any asset.
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    unstake(assetAddress: string): Promise<TransactionResult>;
+    /**
+     * Claim rewards for any asset and season.
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     * @param seasonId Season ID to claim
+     */
+    claim(assetAddress: string, seasonId: bigint): Promise<TransactionResult>;
     /**
      * Stake native ETH via WETHGateway. Requires wethGatewayAddress in config.
-     * Falls back to stakeToken (config token) if no gateway.
+     * Falls back to stake(config token) if no gateway.
+     * @deprecated Use stake(wethAddress, amount) instead.
      */
     stakeEther(amount: bigint): Promise<TransactionResult>;
     /**
-     * Stake tokens
+     * Stake config token.
+     * @deprecated Use stake(tokenAddress, amount) instead.
      */
     stakeToken(amount: bigint): Promise<TransactionResult>;
     /**
-     * Claim ETH rewards (WETH asset)
+     * Claim ETH rewards (WETH asset).
+     * @deprecated Use claim(wethAddress, seasonId) instead.
      */
     claimEth(seasonId: bigint): Promise<TransactionResult>;
     /**
-     * Claim token rewards
+     * Claim config token rewards.
+     * @deprecated Use claim(tokenAddress, seasonId) instead.
      */
     claimToken(seasonId: bigint): Promise<TransactionResult>;
     /**
-     * Unstake ETH (WETH asset)
+     * Unstake ETH (WETH asset).
+     * @deprecated Use unstake(wethAddress) instead.
      */
     unstakeEth(): Promise<TransactionResult>;
     /**
-     * Unstake tokens
+     * Unstake config token.
+     * @deprecated Use unstake(tokenAddress) instead.
      */
     unstakeToken(): Promise<TransactionResult>;
     /**
@@ -276,11 +301,45 @@ export declare class AintiVirusEVM {
      */
     getStakerRecord(address: string): Promise<EVMStakerRecord>;
     /**
-     * Check if user has claimed rewards for a season
+     * Check if user has claimed rewards for a season and asset.
+     * @param address Staker address
+     * @param seasonId Season ID
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    hasClaimed(address: string, seasonId: bigint, assetAddress: string): Promise<boolean>;
+    /**
+     * Get staker record for a specific asset.
+     * @param address Staker address
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    getStakerRecordForAsset(address: string, assetAddress: string): Promise<{
+        seasonId: bigint;
+        stakedAt: bigint;
+        staked: bigint;
+        weight: bigint;
+    }>;
+    /**
+     * Get stake season totals for a specific asset.
+     * @param seasonId Season ID
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    getStakeSeasonForAsset(seasonId: bigint, assetAddress: string): Promise<{
+        seasonId: bigint;
+        start: bigint;
+        end: bigint;
+        duration: bigint;
+        totalStaked: bigint;
+        totalReward: bigint;
+        totalWeight: bigint;
+    }>;
+    /**
+     * Check if user has claimed ETH rewards for a season.
+     * @deprecated Use hasClaimed(address, seasonId, wethAddress) instead.
      */
     hasClaimedEth(address: string, seasonId: bigint): Promise<boolean>;
     /**
-     * Check if user has claimed token rewards for a season
+     * Check if user has claimed token rewards for a season.
+     * @deprecated Use hasClaimed(address, seasonId, tokenAddress) instead.
      */
     hasClaimedToken(address: string, seasonId: bigint): Promise<boolean>;
     /**

package/dist/evm/index.js

@@ -299,72 +299,116 @@ class AintiVirusEVM {
         return this.withdraw(proof, fee, amount, assetAddress);
     }
     /**
-     * Stake native ETH via WETHGateway. Requires wethGatewayAddress in config.
-     * Falls back to stakeToken (config token) if no gateway.
+     * Stake any asset deployed as a mixer pool.
+     * For WETH with gateway configured: uses native ETH (msg.value).
+     * For ERC20: approves factory and calls factory.stake(asset, amount).
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     * @param amount Amount in asset's smallest unit
      */
-    async stakeEther(amount) {
+    async stake(assetAddress, amount) {
         this.assertSigner();
-        if (this.wethGateway) {
-            const tx = await this.wethGateway.stake({ value: amount });
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        const gateway = this.wethGateway;
+        const isWeth = gateway && (await this.isWethAsset(asset));
+        if (isWeth && gateway) {
+            const tx = await gateway.stake({ value: amount });
             return this.sendAndWait(tx);
         }
-        return this.stakeToken(amount);
-    }
-    /**
-     * Stake tokens
-     */
-    async stakeToken(amount) {
-        this.assertSigner();
         const factoryAddress = await this.factory.getAddress();
-        const allowance = await this.token.allowance(await this.signer.getAddress(), factoryAddress);
+        const assetContract = asset.toLowerCase() === this.token.target.toLowerCase()
+            ? this.token
+            : new ethers_1.Contract(asset, ERC20_ABI, this.signer);
+        const allowanceRaw = await assetContract.allowance(await this.signer.getAddress(), factoryAddress);
+        const allowance = toBigint(allowanceRaw);
         if (allowance < amount) {
-            const approveTx = await this.token.approve(factoryAddress, amount);
+            const approveTx = await assetContract.approve(factoryAddress, amount);
             const approveHash = typeof approveTx.hash === "string"
                 ? approveTx.hash
                 : approveTx.hash;
             if (approveHash)
-                await this.sendAndWait(approveTx);
+                await this.waitForTransactionReceipt(approveHash);
         }
-        const tx = await this.factory.stake(this.token.target, amount);
+        const tx = await this.factory.stake(asset, amount);
         return this.sendAndWait(tx);
     }
     /**
-     * Claim ETH rewards (WETH asset)
+     * Unstake any asset.
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
      */
-    async claimEth(seasonId) {
+    async unstake(assetAddress) {
         this.assertSigner();
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        const tx = await this.factory.unstake(asset);
+        return this.sendAndWait(tx);
+    }
+    /**
+     * Claim rewards for any asset and season.
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     * @param seasonId Season ID to claim
+     */
+    async claim(assetAddress, seasonId) {
+        this.assertSigner();
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        const tx = await this.factory.claim(asset, seasonId);
+        return this.sendAndWait(tx);
+    }
+    /**
+     * Stake native ETH via WETHGateway. Requires wethGatewayAddress in config.
+     * Falls back to stake(config token) if no gateway.
+     * @deprecated Use stake(wethAddress, amount) instead.
+     */
+    async stakeEther(amount) {
+        const weth = await this.getWethAddress();
+        if (weth)
+            return this.stake(weth, amount);
+        return this.stake(this.token.target, amount);
+    }
+    /**
+     * Stake config token.
+     * @deprecated Use stake(tokenAddress, amount) instead.
+     */
+    async stakeToken(amount) {
+        return this.stake(this.token.target, amount);
+    }
+    /**
+     * Claim ETH rewards (WETH asset).
+     * @deprecated Use claim(wethAddress, seasonId) instead.
+     */
+    async claimEth(seasonId) {
         const weth = await this.getWethAddress();
         if (!weth)
             throw new Error("WETH address not available (config or factory.weth())");
-        const tx = await this.factory.claim(weth, seasonId);
-        return this.sendAndWait(tx);
+        return this.claim(weth, seasonId);
     }
     /**
-     * Claim token rewards
+     * Claim config token rewards.
+     * @deprecated Use claim(tokenAddress, seasonId) instead.
      */
     async claimToken(seasonId) {
-        this.assertSigner();
-        const tx = await this.factory.claim(this.token.target, seasonId);
-        return this.sendAndWait(tx);
+        return this.claim(this.token.target, seasonId);
     }
     /**
-     * Unstake ETH (WETH asset)
+     * Unstake ETH (WETH asset).
+     * @deprecated Use unstake(wethAddress) instead.
      */
     async unstakeEth() {
-        this.assertSigner();
         const weth = await this.getWethAddress();
         if (!weth)
             throw new Error("WETH address not available (config or factory.weth())");
-        const tx = await this.factory.unstake(weth);
-        return this.sendAndWait(tx);
+        return this.unstake(weth);
     }
     /**
-     * Unstake tokens
+     * Unstake config token.
+     * @deprecated Use unstake(tokenAddress) instead.
      */
     async unstakeToken() {
-        this.assertSigner();
-        const tx = await this.factory.unstake(this.token.target);
-        return this.sendAndWait(tx);
+        return this.unstake(this.token.target);
     }
     /**
      * Get current stake season
@@ -722,22 +766,75 @@ class AintiVirusEVM {
         };
     }
     /**
-     * Check if user has claimed rewards for a season
+     * Check if user has claimed rewards for a season and asset.
+     * @param address Staker address
+     * @param seasonId Season ID
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
      */
-    async hasClaimedEth(address, seasonId) {
+    async hasClaimed(address, seasonId, assetAddress) {
+        const stakingAddress = await this.getStakingAddress();
+        const staking = new ethers_1.Contract(stakingAddress, STAKING_ABI, this.provider);
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        return await staking.wasSeasonClaimed(address, seasonId, asset);
+    }
+    /**
+     * Get staker record for a specific asset.
+     * @param address Staker address
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    async getStakerRecordForAsset(address, assetAddress) {
+        const stakingAddress = await this.getStakingAddress();
+        const staking = new ethers_1.Contract(stakingAddress, STAKING_ABI, this.provider);
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        const r = await staking.records(address, asset);
+        return {
+            seasonId: BigInt(r.seasonId.toString()),
+            stakedAt: BigInt(r.stakedAt.toString()),
+            staked: BigInt(r.staked.toString()),
+            weight: BigInt(r.weight.toString()),
+        };
+    }
+    /**
+     * Get stake season totals for a specific asset.
+     * @param seasonId Season ID
+     * @param assetAddress Asset address (WETH or any ERC20 deployed as mixer)
+     */
+    async getStakeSeasonForAsset(seasonId, assetAddress) {
         const stakingAddress = await this.getStakingAddress();
         const staking = new ethers_1.Contract(stakingAddress, STAKING_ABI, this.provider);
+        const asset = assetAddress.toLowerCase().startsWith("0x")
+            ? assetAddress
+            : assetAddress;
+        const s = await staking.seasonAndTotals(seasonId, asset);
+        return {
+            seasonId: BigInt(s.seasonId.toString()),
+            start: BigInt(s.start.toString()),
+            end: BigInt(s.end.toString()),
+            duration: BigInt(s.duration.toString()),
+            totalStaked: BigInt(s.totalStaked.toString()),
+            totalReward: BigInt(s.totalReward.toString()),
+            totalWeight: BigInt(s.totalWeight.toString()),
+        };
+    }
+    /**
+     * Check if user has claimed ETH rewards for a season.
+     * @deprecated Use hasClaimed(address, seasonId, wethAddress) instead.
+     */
+    async hasClaimedEth(address, seasonId) {
         const weth = await this.getWethAddress();
         const ethAsset = weth ?? this.token.target;
-        return await staking.wasSeasonClaimed(address, seasonId, ethAsset);
+        return this.hasClaimed(address, seasonId, ethAsset);
     }
     /**
-     * Check if user has claimed token rewards for a season
+     * Check if user has claimed token rewards for a season.
+     * @deprecated Use hasClaimed(address, seasonId, tokenAddress) instead.
      */
     async hasClaimedToken(address, seasonId) {
-        const stakingAddress = await this.getStakingAddress();
-        const staking = new ethers_1.Contract(stakingAddress, STAKING_ABI, this.provider);
-        return await staking.wasSeasonClaimed(address, seasonId, this.token.target);
+        return this.hasClaimed(address, seasonId, this.token.target);
     }
     /**
      * Get token balance of an address

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aintivirus-ai/mixer-sdk",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "TypeScript SDK for AintiVirus Mixer - Easy web3 integration for privacy-preserving transactions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",