@wireio/stake 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireio/stake",
-    "version": "0.2.1",
+    "version": "0.2.3",
     "description": "LIQ Staking Module for Wire Network",
     "homepage": "https://gitea.gitgo.app/Wire/sdk-stake",
     "license": "FSL-1.1-Apache-2.0",

package/src/assets/solana/idl/liqsol_core.json

@@ -1,5 +1,5 @@
 {
-  "address": "HR3t8mA25TdJpwLph2h2L7KhK7ynWoAByYYzgUAfd5rk",
+  "address": "BBkVcNWNQz1vZ6esv5US4QnNFWPRqxWbdpJHur9GVXSu",
   "metadata": {
     "name": "liqsol_core",
     "version": "0.1.0",
@@ -3151,58 +3151,8 @@
   "errors": [
     {
       "code": 6000,
-      "name": "NoRewardsToClaim",
-      "msg": "No rewards to claim"
-    },
-    {
-      "code": 6001,
-      "name": "InsufficientBalance",
-      "msg": "Insufficient balance"
-    },
-    {
-      "code": 6002,
-      "name": "InsufficientFunds",
-      "msg": "Insufficient funds"
-    },
-    {
-      "code": 6003,
-      "name": "Unauthorized",
-      "msg": "Unauthorized - caller is not the distribution authority"
-    },
-    {
-      "code": 6004,
-      "name": "InvalidMint",
-      "msg": "Invalid mint"
-    },
-    {
-      "code": 6005,
-      "name": "InvalidOwner",
-      "msg": "Invalid owner"
-    },
-    {
-      "code": 6006,
-      "name": "InvalidUserRecord",
-      "msg": "Invalid user record"
-    },
-    {
-      "code": 6007,
-      "name": "InvalidWithdrawal",
-      "msg": "Invalid withdrawal - balance increased instead of decreased"
-    },
-    {
-      "code": 6008,
-      "name": "InvalidProgramId",
-      "msg": "Invalid program ID"
-    },
-    {
-      "code": 6009,
-      "name": "InstructionIntrospectionFailed",
-      "msg": "Instruction introspection failed"
-    },
-    {
-      "code": 6010,
-      "name": "ReceiptFulfilled",
-      "msg": "Receipt already fulfilled"
+      "name": "AccountBorrowFailed",
+      "msg": "Util Acc borrow Failed"
     }
   ],
   "types": [

package/src/assets/solana/idl/liqsol_token.json

@@ -1,5 +1,5 @@
 {
-  "address": "HEAKvfg2X7K4zbGDiAbfuu5abxQyk1HbKVgskZZFXrUx",
+  "address": "6cDoerqdV6UQDsGvUEq5Qj5HRxxyDxSuUaB2J6iK8cio",
   "metadata": {
     "name": "liqsol_token",
     "version": "0.1.0",

package/src/assets/solana/idl/validator_leaderboard.json

@@ -1,5 +1,5 @@
 {
-  "address": "BcMW7wN54FexYaB7Xujvag5uUQ1WoDoGbzVg1VEXPBhV",
+  "address": "C4ddPrB1ALYpW4G1Qz4ffvETBA8YGUL7TVZaLiE6bb1q",
   "metadata": {
     "name": "validator_leaderboard",
     "version": "0.1.0",

package/src/assets/solana/types/liqsol_core.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/liqsol_core.json`.
  */
 export type LiqsolCore = {
-  "address": "HR3t8mA25TdJpwLph2h2L7KhK7ynWoAByYYzgUAfd5rk",
+  "address": "BBkVcNWNQz1vZ6esv5US4QnNFWPRqxWbdpJHur9GVXSu",
   "metadata": {
     "name": "liqsolCore",
     "version": "0.1.0",
@@ -3157,58 +3157,8 @@ export type LiqsolCore = {
   "errors": [
     {
       "code": 6000,
-      "name": "noRewardsToClaim",
-      "msg": "No rewards to claim"
-    },
-    {
-      "code": 6001,
-      "name": "insufficientBalance",
-      "msg": "Insufficient balance"
-    },
-    {
-      "code": 6002,
-      "name": "insufficientFunds",
-      "msg": "Insufficient funds"
-    },
-    {
-      "code": 6003,
-      "name": "unauthorized",
-      "msg": "Unauthorized - caller is not the distribution authority"
-    },
-    {
-      "code": 6004,
-      "name": "invalidMint",
-      "msg": "Invalid mint"
-    },
-    {
-      "code": 6005,
-      "name": "invalidOwner",
-      "msg": "Invalid owner"
-    },
-    {
-      "code": 6006,
-      "name": "invalidUserRecord",
-      "msg": "Invalid user record"
-    },
-    {
-      "code": 6007,
-      "name": "invalidWithdrawal",
-      "msg": "Invalid withdrawal - balance increased instead of decreased"
-    },
-    {
-      "code": 6008,
-      "name": "invalidProgramId",
-      "msg": "Invalid program ID"
-    },
-    {
-      "code": 6009,
-      "name": "instructionIntrospectionFailed",
-      "msg": "Instruction introspection failed"
-    },
-    {
-      "code": 6010,
-      "name": "receiptFulfilled",
-      "msg": "Receipt already fulfilled"
+      "name": "accountBorrowFailed",
+      "msg": "Util Acc borrow Failed"
     }
   ],
   "types": [

package/src/assets/solana/types/liqsol_token.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/liqsol_token.json`.
  */
 export type LiqsolToken = {
-  "address": "HEAKvfg2X7K4zbGDiAbfuu5abxQyk1HbKVgskZZFXrUx",
+  "address": "6cDoerqdV6UQDsGvUEq5Qj5HRxxyDxSuUaB2J6iK8cio",
   "metadata": {
     "name": "liqsolToken",
     "version": "0.1.0",

package/src/assets/solana/types/validator_leaderboard.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/validator_leaderboard.json`.
  */
 export type ValidatorLeaderboard = {
-  "address": "BcMW7wN54FexYaB7Xujvag5uUQ1WoDoGbzVg1VEXPBhV",
+  "address": "C4ddPrB1ALYpW4G1Qz4ffvETBA8YGUL7TVZaLiE6bb1q",
   "metadata": {
     "name": "validatorLeaderboard",
     "version": "0.1.0",

package/src/index.ts

@@ -1,6 +1,6 @@
 // Staker utilities
-export * from './staker/staker';
-export * from './staker/types';
+export * from './staker';
+export * from './types';
 
 // NETWORKS
 export * from './networks/ethereum/ethereum';
@@ -16,4 +16,5 @@ export * from './networks/solana/utils';
 export * from './networks/solana/clients/deposit.client';
 export * from './networks/solana/clients/distribution.client';
 export * from './networks/solana/clients/leaderboard.client';
-export * from './networks/solana/clients/outpost.client';
+export * from './networks/solana/clients/outpost.client';
+export * from './networks/solana/clients/token.client';

package/src/networks/ethereum/contract.ts

@@ -53,20 +53,17 @@ export const ADDRESSES: AddressBook = {
     StakingModule: "0xBd13C85fdefBBc63904e7301aCdeFE87c9C93234",
     WithdrawalQueue: "0xD9A1D38ae4A636DEf20B02F35387a6b126D73fAe", //aka "queue"
     WithdrawalVault: "0x150334D09a1d3d30EE93d5e6009EB897B5dDF5b2", //aka withdrawVault
-
-    //not in last set of deployments 12/18/25
-    // LiqEthMint: "0xdBAa1539eB7b80C29d825FCda76c0d7F8F0E6cFB",
-    // LiqEthBurn: "0x02e0A02fE2311FAd661677B7117FDdc801c1216b",
+    
 
     //Outpost contracts
-    Depositor: "0x0876f5f411651dFc67386Bc3D36315a3B2249F2e",
-    ReceiptNFT: "0x726c91fB3218A745Bfec0302B4cBaeBeaA023a6d",
-    OutpostManager: "0xB6Eb20f7916295853a318581eCB51Be4eeb107Fe",
-    BAR: "0x1936EB941361da83EE0E68FB7Bd0DF210f090B5C",
-    OPP: "0x2e4cc69D6F8CEC3eEec81F3051AD90fEa71e5D57",
-    OPPCommon: "0xA79fB9e563cF70190346D66eA20A1F2E09e0f732",
-    OPPInbound: "0xd63644d0e8c3610eEf9f0Fd5Ea884b962762c469",
-    Warrant: "0x8613F6Bb9ad883e81338EF97A06c53459250c625",
+    Depositor: "0x6aE1D7095B81970654Bd51bCAD42825C6E579088",
+    ReceiptNFT: "0x38eAEa05cB1FFD0c8426A3f9e77815a251DdC197",
+    OutpostManager: "0x6512bB8E7f8418A8e3bB73c49E33EcC30F53f221",
+    BAR: "0x00c128A37598d018Eb8ca4f516688695D83bD413",
+    OPP: "0x8C5710103Ec6a7608dAC539DC232d3822bA3d14C",
+    OPPCommon: "0x52C1d7F02B35176F79b03F6eF7E5b74b27d1dB8c",
+    OPPInbound: "0x39feC7536BaEd4E376b1B5cf2f2e8182ab203418",
+    Warrant: "0x9190bBcaB5cfeb4b7b6DE5Ae21105F3114753F10",
 };
 
 export type Contracts<T extends string = ContractName> = Record<T, ContractConfig>;

package/src/networks/ethereum/ethereum.ts

@@ -1,5 +1,5 @@
 import { BigNumber, ethers } from 'ethers';
-import { IStakingClient, Portfolio, StakerConfig } from '../../staker/types';
+import { IStakingClient, Portfolio, PurchaseAsset, PurchaseQuote, StakerConfig, TrancheSnapshot } from '../../types';
 import { PublicKey as WirePubKey } from '@wireio/core';
 import { EthereumContractService } from './contract';
 import { preLaunchReceipt, WithdrawRequestedEvent, WithdrawResult } from './types';
@@ -114,6 +114,16 @@ export class EthereumStakingClient implements IStakingClient {
         }
     }
 
+    // TODO
+    buy(amount: bigint, purchaseAsset: PurchaseAsset): Promise<string> {
+        throw new Error("Method not yet implemented.");
+    }
+
+    // TODO
+    getBuyQuote(amount: bigint, purchaseAsset: PurchaseAsset): Promise<PurchaseQuote> {
+        throw new Error("Method not yet implemented.");
+    }
+
     
     /**
      * Resolve the user's ETH + liqETH balances.
@@ -161,12 +171,26 @@ export class EthereumStakingClient implements IStakingClient {
                 decimals: nativeDecimals,
                 symbol: liqSymbol,
             },
+            wire: {
+                amount: BigInt(0), // TODO
+                decimals: 0,
+                symbol: '$WIRE',
+            },
             chainID: this.network.chainId
         }
         // console.log('ETH PORTFOLIO', portfolio);
         return portfolio;
     }
 
+    /**
+     * Program-level prelaunch WIRE / tranche snapshot for Solana.
+     * Uses the same OutpostWireStateSnapshot primitive as getPortfolio().
+     * TODO! for eth
+     */
+    async getTrancheSnapshot(): Promise<TrancheSnapshot | null> {
+        return null
+    }
+
     
     // ---------------------------------------------------------------------
     // Internal ETH Staking client helper functions

package/src/networks/ethereum/types.ts

@@ -1,5 +1,5 @@
 import { BigNumber, ethers } from 'ethers';
-import { BalanceView } from '../../staker/types';
+import { BalanceView } from '../../types';
 
 export const CONTRACT_NAMES = [
     'Accounting',

package/src/networks/solana/clients/token.client.ts

@@ -0,0 +1,251 @@
+import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
+import type { TransactionInstruction } from '@solana/web3.js';
+import { PublicKey, SystemProgram } from '@solana/web3.js';
+import {
+    TOKEN_2022_PROGRAM_ID,
+    ASSOCIATED_TOKEN_PROGRAM_ID,
+} from '@solana/spl-token';
+
+import { buildOutpostAccounts, type OutpostAccounts } from '../utils';
+import { SolanaProgramService } from '../program';
+import { LiqsolCore } from '../../../assets/solana/types/liqsol_core';
+import { GlobalState, PriceHistory, TrancheState, UserWarrantRecord, WalletLike, WireReceipt } from '../types';
+import { derivePriceHistoryPda } from '../constants';
+
+/**
+ * Client for interacting with the Pretoken (Outpost) program on Solana.
+ *
+ * Provides account fetching and instruction building for pretoken operations.
+ * Does NOT send or confirm transactions; keeps SDK composable.
+ * 
+ * TODO: Update to $WIRE Token implementation Post-Launch
+ */
+export class TokenClient {
+    private readonly program: Program<LiqsolCore>;
+
+    get wallet(): WalletLike { return this.provider.wallet; }
+
+    constructor(private readonly provider: AnchorProvider) {
+        const svc = new SolanaProgramService(provider);
+        this.program = svc.getProgram('liqsolCore');
+    }
+
+    /**
+     * Single source of truth for outpost/pretoken accounts.
+     * Uses your existing PDA + ATA derivations in buildOutpostAccounts().
+     */
+    async getAccounts(user: PublicKey): Promise<OutpostAccounts> {
+        return buildOutpostAccounts(this.provider.connection, user);
+    }
+
+    /**
+     * Lightweight, UI-friendly snapshot fetchers.
+     * (No decoding assumptions beyond what Anchor already provides.)
+     */
+    async fetchGlobalState(): Promise<GlobalState> {
+        const { globalState } = await this.getAccounts(this.provider.wallet.publicKey);
+        return this.program.account.globalState.fetch(globalState);
+    }
+
+    async fetchTrancheState(): Promise<TrancheState> {
+        const { trancheState } = await this.getAccounts(this.provider.wallet.publicKey);
+        return this.program.account.trancheState.fetch(trancheState);
+    }
+
+    async fetchWireReceipt(user: PublicKey): Promise<WireReceipt> {
+        const { wireReceipt } = await this.getAccounts(user);
+        return this.program.account.wireReceipt.fetch(wireReceipt);
+    }
+
+    async fetchUserWarrantRecord(user: PublicKey): Promise<UserWarrantRecord> {
+        const { userWarrantRecord } = await this.getAccounts(user);
+        return this.program.account.userWarrantRecord.fetch(userWarrantRecord);
+    }
+
+    // ---------------------------------------------------------------------------
+    // Instruction builders (no send, no confirmation: SDK stays composable)
+    // ---------------------------------------------------------------------------
+
+    /**
+     * purchase_with_sol(amount u64)
+     *
+     * amountLamports is bigint to match your SDK convention.
+     */
+    async buildPurchaseWithSolIx(amountLamports: bigint, user = this.wallet.publicKey): Promise<TransactionInstruction> {
+        const a = await this.getAccounts(user);
+
+        return this.program.methods
+            .purchaseWithSol(new BN(amountLamports.toString()))
+            .accounts({
+                // signer
+                user: a.user,
+
+                // core state
+                liqsolMint: a.liqsolMint,
+                globalState: a.globalState,
+
+                // liqSOL pool + distribution plumbing
+                poolAuthority: a.poolAuthority,
+                liqsolPoolAta: a.liqsolPoolAta,
+                liqsolPoolUserRecord: a.poolUserRecord,
+                distributionState: a.distributionState,
+                payRateHistory: a.payRateHistory,
+                bucketAuthority: a.bucketAuthority,
+                bucketTokenAccount: a.bucketTokenAccount,
+                solBucket: a.solBucket,
+
+                // IMPORTANT: IDL name (not wireReceipt)
+                warrantDepositRecord: a.wireReceipt,
+
+                // pretoken state
+                trancheState: a.trancheState,
+                userWarrantRecord: a.userWarrantRecord,
+
+                // Chainlink (IDL names are chainlinkFeed / chainlinkProgram in old utils)
+                chainlinkFeed: a.chainLinkFeed,
+                chainlinkProgram: a.chainLinkProgram,
+
+                // programs
+                tokenProgram: TOKEN_2022_PROGRAM_ID,
+                systemProgram: SystemProgram.programId,
+            })
+            .instruction();
+    }
+
+    /**
+     * purchase_with_liqsol(amount u64)
+     *
+     * amount is liqSOL *raw base units* (Token-2022 amount).
+     */
+    async buildPurchaseWithLiqsolIx(amountLamports: bigint, user = this.wallet.publicKey): Promise<TransactionInstruction> {
+        const a = await this.getAccounts(user);
+
+        return this.program.methods
+            .purchaseWithLiqsol(new BN(amountLamports.toString()))
+            .accounts({
+                // signer
+                user: a.user,
+
+                // core state
+                liqsolMint: a.liqsolMint,
+                globalState: a.globalState,
+
+                // token movement
+                buyerAta: a.userAta, // Token-2022 ATA for user
+                poolAuthority: a.poolAuthority,
+                liqsolPoolAta: a.liqsolPoolAta,
+
+                // IMPORTANT: IDL name (not wireReceipt)
+                warrantDepositRecord: a.wireReceipt,
+
+                // distribution plumbing (per old utils)
+                liqsolPoolUserRecord: a.poolUserRecord, // pool user_record PDA
+                distributionState: a.distributionState,
+                payRateHistory: a.payRateHistory,
+                bucketAuthority: a.bucketAuthority,
+                bucketTokenAccount: a.bucketTokenAccount,
+                solBucket: a.solBucket,
+
+                // pretoken state
+                trancheState: a.trancheState,
+                userWarrantRecord: a.userWarrantRecord,
+
+                // Chainlink
+                chainlinkFeed: a.chainLinkFeed,
+                chainlinkProgram: a.chainLinkProgram,
+
+                // programs
+                tokenProgram: TOKEN_2022_PROGRAM_ID,
+                associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+                systemProgram: SystemProgram.programId,
+            })
+            .instruction();
+    }
+
+    /**
+     * purchase_warrants_from_yield()
+     *
+     * No amount arg; it consumes tracked yield according to on-chain rules.
+     */
+    async buildPurchaseFromYieldIx(user = this.wallet.publicKey): Promise<TransactionInstruction> {
+        const a = await this.getAccounts(user);
+
+        return this.program.methods
+            .purchaseWarrantsFromYield()
+            .accounts({
+                // signer
+                user: a.user,
+
+                // core state
+                globalState: a.globalState,
+                liqsolMint: a.liqsolMint,
+                poolAuthority: a.poolAuthority,
+                liqsolPoolAta: a.liqsolPoolAta,
+                solBucket: a.solBucket,
+
+                liqsolPoolUserRecord: a.poolUserRecord,
+
+                distributionState: a.distributionState,
+                payRateHistory: a.payRateHistory,
+                bucketAuthority: a.bucketAuthority,
+                bucketTokenAccount: a.bucketTokenAccount,
+
+                // programs
+                tokenProgram: TOKEN_2022_PROGRAM_ID,
+                systemProgram: SystemProgram.programId,
+
+                // pretoken state + chainlink (per old utils)
+                trancheState: a.trancheState,
+                userWarrantRecord: a.userWarrantRecord,
+                chainlinkFeed: a.chainLinkFeed,
+                chainlinkProgram: a.chainLinkProgram,
+            })
+            .instruction();
+    }
+
+
+    // HELPERS
+
+    /**
+     * Fetch the SOL price in 1e8 USD units from liqsol_core.priceHistory.
+     *
+     * This uses the same ring-buffer semantics as the on-chain program:
+     * the latest price is the entry just before `nextIndex`.
+     */
+    async getSolPriceUsd(): Promise<BN> {
+        const priceHistoryPda = derivePriceHistoryPda();
+
+        const history : PriceHistory = await this.program.account.priceHistory.fetch(
+            priceHistoryPda
+        );
+
+        console.log('PRICE HISTORY', history);
+
+        const { windowSize, prices, nextIndex, count } = history;
+
+        if (!prices || prices.length === 0 || count === 0) {
+            throw new Error("Price history is empty – no SOL price available");
+        }
+
+        // Use the actual buffer length as capacity (should match windowSize)
+        const capacity = prices.length || windowSize;
+        if (capacity === 0) {
+            throw new Error("Price history capacity is zero – check account layout");
+        }
+
+        // Last written slot in the ring buffer
+        const lastIndex =
+            nextIndex === 0
+                ? capacity - 1
+                : nextIndex - 1;
+
+        const priceUsd = prices[lastIndex];
+
+        if (!BN.isBN(priceUsd)) {
+            throw new Error("Latest price entry is not a BN – check IDL/decoder");
+        }
+
+        // priceUsd is already 1e8-scaled USD (same scale used in warrant pricing)
+        return priceUsd;
+    }
+}

package/src/networks/solana/constants.ts

@@ -74,6 +74,9 @@ export const PDA_SEEDS = {
     BAR_STATE_SEED: 'bar_state',
     BONDED_ACTOR_SEED: 'bonded_actor',
     BOND_LEVEL_SEED: 'bond_level',
+
+    // Other?
+    PRICE_HISTORY: 'price_history',
 } as const;
 
 /**
@@ -232,6 +235,12 @@ export const deriveBondedActorPda = (actor: PublicKey) =>
         LIQSOL_CORE,
     )[0];
 
+export const derivePriceHistoryPda = () =>
+    PublicKey.findProgramAddressSync(
+        [Buffer.from(PDA_SEEDS.PRICE_HISTORY)],
+        LIQSOL_CORE,
+    )[0];
+
 /**
  * Ephemeral stake account address used per-deposit.
  * On-chain convention: seed = `ephemeral_<u32>` under StakeProgram.programId.