@wireio/stake 0.1.2 → 0.2.0

package/src/networks/solana/utils.ts

@@ -38,19 +38,30 @@ import {
     deriveStakeControllerVaultPda,
     deriveEphemeralStakeAddress,
     DEFAULT_PAY_RATE_LOOKBACK,
+    deriveOutpostGlobalStatePda,
+    deriveOutpostPoolAuthorityPda,
+    deriveSolBucketPda,
+    deriveTrancheStatePda,
+    deriveWireReceiptPda,
+    derivePoolUserRecordPda,
+    deriveUserUserRecordPda,
+    deriveUserWarrantRecordPda,
+    CHAINLINK_FEED,
+    CHAINLINK_PROGRAM,
 } from './constants';
 
 import liqsolCoreIDL from '../../assets/solana/idl/liqsol_core.json';
+import { LiqsolCore } from '../../assets/solana/types/liqsol_core';
 
 // -----------------------------------------------------------------------------
 // Read-only liqsol_core Program helper
 // -----------------------------------------------------------------------------
 
-let _liqsolCoreProgram: Program | null = null;
+let _liqsolCoreProgram: Program<LiqsolCore> | null = null;
 
 export function getLiqsolCoreProgram(
     connection: Connection,
-): Program {
+): Program<LiqsolCore> {
     if (_liqsolCoreProgram && _liqsolCoreProgram.provider.connection === connection) {
         return _liqsolCoreProgram;
     }
@@ -66,102 +77,12 @@ export function getLiqsolCoreProgram(
     const program = new Program(
         liqsolCoreIDL,
         provider,
-    ) as Program;
+    ) as Program<LiqsolCore>;
 
     _liqsolCoreProgram = program;
     return program;
 }
 
-// -----------------------------------------------------------------------------
-// Deposit accounts bundle
-// -----------------------------------------------------------------------------
-
-export interface DepositAccounts {
-    user: PublicKey;
-    depositAuthority: PublicKey;
-    liqsolMint: PublicKey;
-    liqsolMintAuthority: PublicKey;
-    userAta: PublicKey;
-    stakeControllerVault: PublicKey;
-    stakeControllerReservePool: PublicKey;
-    stakeControllerState: PublicKey;
-    payoutState: PublicKey;
-    bucketAuthority: PublicKey;
-    bucketTokenAccount: PublicKey;
-    distributionState: PublicKey;
-    userRecord: PublicKey;
-    payRateHistory: PublicKey;
-    ephemeralStake: PublicKey;
-    ephemeralSeed: string;
-}
-
-/**
- * Build a complete DepositAccounts set for a given user, matching the
- * on-chain PDAs used by the liqSOL core program.
- *
- * The optional `seed` lets you make deposit flows replayable/deterministic.
- * If omitted, a random u32 seed is generated.
- */
-export async function buildDepositAccounts(
-    connection: Connection,
-    user: PublicKey,
-): Promise<DepositAccounts> {
-    const depositAuthority = deriveDepositAuthorityPda();
-    const liqsolMint = deriveLiqsolMintPda();
-    const liqsolMintAuthority = deriveLiqsolMintAuthorityPda();
-    const stakeControllerVault = deriveStakeControllerVaultPda();
-    const stakeControllerReservePool = deriveReservePoolPda();
-    const stakeControllerState = deriveStakeControllerStatePda();
-    const payoutState = derivePayoutStatePda();
-    const bucketAuthority = deriveBucketAuthorityPda();
-    const distributionState = deriveDistributionStatePda();
-    const userRecord = deriveUserRecordPda(user);
-    const payRateHistory = derivePayRateHistoryPda();
-
-    const userAta = await getAssociatedTokenAddress(
-        liqsolMint,
-        user,
-        false,
-        TOKEN_2022_PROGRAM_ID,
-    );
-
-    const bucketTokenAccount = await getAssociatedTokenAddress(
-        liqsolMint,
-        bucketAuthority,
-        true,
-        TOKEN_2022_PROGRAM_ID,
-    );
-
-    // -------------------------------------------------------------
-    // Ephemeral stake
-    // -------------------------------------------------------------
-    const seed = Math.floor(Math.random() * 2 ** 32);
-    const ephemeralSeed = `ephemeral_${seed}`;
-    const ephemeralStake = await deriveEphemeralStakeAddress(user, ephemeralSeed);
-
-    // `connection` is currently unused, but we keep it in the signature
-    // so this helper can evolve to preflight/validate accounts if needed.
-    void connection;
-
-    return {
-        user,
-        depositAuthority,
-        liqsolMint,
-        liqsolMintAuthority,
-        userAta,
-        stakeControllerVault,
-        stakeControllerReservePool,
-        stakeControllerState,
-        payoutState,
-        bucketAuthority,
-        bucketTokenAccount,
-        distributionState,
-        userRecord,
-        payRateHistory,
-        ephemeralStake,
-        ephemeralSeed,
-    };
-}
 
 // -----------------------------------------------------------------------------
 // Balance + state getters (UI-friendly)
@@ -374,6 +295,102 @@ export function previewDepositEffects(params: {
     };
 }
 
+/**
+ * ---------------------------------------------------------------------------
+ * Outpost-specific helpers
+ * ---------------------------------------------------------------------------
+ */
+export interface OutpostAccounts {
+    user: PublicKey;
+
+    // Warrant / outpost
+    globalState: PublicKey;
+    poolAuthority: PublicKey;
+    liqsolMint: PublicKey;
+    liqsolPoolAta: PublicKey;
+    userAta: PublicKey;
+    wireReceipt: PublicKey;
+    poolUserRecord: PublicKey;
+    userUserRecord: PublicKey;
+    distributionState: PublicKey;
+    payRateHistory: PublicKey;
+    bucketAuthority: PublicKey;
+    bucketTokenAccount: PublicKey;
+    solBucket: PublicKey;
+    trancheState: PublicKey;
+    userWarrantRecord: PublicKey;
+
+    // Chainlink
+    chainLinkFeed: PublicKey;
+    chainLinkProgram: PublicKey;
+}
+
+export async function buildOutpostAccounts(
+    connection: Connection,
+    user: PublicKey,
+): Promise<OutpostAccounts> {
+    const globalState = deriveOutpostGlobalStatePda();
+    const poolAuthority = deriveOutpostPoolAuthorityPda();
+    const liqsolMint = deriveLiqsolMintPda();
+    const distributionState = deriveDistributionStatePda();
+    const payRateHistory = derivePayRateHistoryPda();
+    const bucketAuthority = deriveBucketAuthorityPda();
+    const solBucket = deriveSolBucketPda();
+    const trancheState = deriveTrancheStatePda();
+    const wireReceipt = deriveWireReceiptPda(user);
+    const poolUserRecord = derivePoolUserRecordPda(poolAuthority);
+    const userUserRecord = deriveUserUserRecordPda(user);
+    const userWarrantRecord = deriveUserWarrantRecordPda(user);
+
+    const liqsolPoolAta = await getAssociatedTokenAddress(
+        liqsolMint,
+        poolAuthority,
+        true,
+        TOKEN_2022_PROGRAM_ID,
+    );
+
+    const bucketTokenAccount = await getAssociatedTokenAddress(
+        liqsolMint,
+        bucketAuthority,
+        true,
+        TOKEN_2022_PROGRAM_ID,
+    );
+
+    const userAta = await getAssociatedTokenAddress(
+        liqsolMint,
+        user,
+        false,
+        TOKEN_2022_PROGRAM_ID,
+    );
+
+    // Chainlink program feeds
+    const chainLinkFeed = CHAINLINK_FEED;
+    const chainLinkProgram = CHAINLINK_PROGRAM
+
+    void connection; // reserved for future extra validation
+
+    return {
+        user,
+        globalState,
+        poolAuthority,
+        liqsolMint,
+        liqsolPoolAta,
+        userAta,
+        wireReceipt,
+        poolUserRecord,
+        userUserRecord,
+        distributionState,
+        payRateHistory,
+        bucketAuthority,
+        bucketTokenAccount,
+        solBucket,
+        trancheState,
+        userWarrantRecord,
+        chainLinkFeed,
+        chainLinkProgram,
+    };
+}
+
 // -----------------------------------------------------------------------------
 // Epoch / scheduling helpers
 // -----------------------------------------------------------------------------
@@ -516,7 +533,7 @@ export async function airdropSol(
     amountSol: number,
 ): Promise<void> {
     const lamports = solToLamports(amountSol);
-    const sig = await connection.requestAirdrop(publicKey, lamports);
+    const sig = await connection.requestAirdrop(publicKey, Number(lamports));
     await connection.confirmTransaction(sig, 'confirmed');
 }
 

package/src/staker/staker.ts

@@ -52,7 +52,7 @@ export class Staker {
 
         this.selectedChainID = selectedChainID;
     }
-
+    
     /**
      * Select a chain. Returns true if a client exists for it, false otherwise.
      * (We still record the selectedChainID so the UI can reflect the chosen chain.)

package/src/staker/types.ts

@@ -1,17 +1,19 @@
-// types.ts
-
 import { BaseSignerWalletAdapter } from '@solana/wallet-adapter-base';
 import { PublicKey as SolPubKey } from '@solana/web3.js';
 import { ChainID, ExternalNetwork, PublicKey } from '@wireio/core';
-import { BigNumberish, ethers } from 'ethers';
+import { ethers } from 'ethers';
 
 export interface IStakingClient {
     pubKey: PublicKey;
     network: ExternalNetwork;
 
     /** Amount is in the chain's smallest unit (lamports/wei, etc.) */
-    deposit(amount: number): Promise<string>;
+    deposit(amount: bigint): Promise<string>;
+    withdraw(amount: bigint): Promise<string>;
+    stake(amount: bigint): Promise<string>;
+    unstake(amount: bigint): Promise<string>;
 
+    // REMOVED from shared client, SOLANA ONLY
     /** Register any untracked LIQ staked tokens */
     // register(): Promise<string>;
 
@@ -42,7 +44,7 @@ export interface Portfolio {
 }
 
 export type BalanceView = {
-    amount: BigNumberish; // raw on-chain integer value
+    amount: bigint; // raw on-chain integer value
     decimals: number; // number of decimal places
     symbol?: string; // optional token symbol identifier
     ata?: SolPubKey; // associated token account address