@wireio/stake 0.9.0 → 0.9.2

package/src/networks/solana/solana.ts

@@ -7,17 +7,23 @@ import {
     PublicKey as SolPubKey,
     SystemProgram,
     Transaction,
+    TransactionInstruction,
+    TransactionMessage,
     TransactionSignature,
 } from '@solana/web3.js';
 import { AnchorProvider, BN } from '@coral-xyz/anchor';
 import { BaseSignerWalletAdapter } from '@solana/wallet-adapter-base';
 import {
     ASSOCIATED_TOKEN_PROGRAM_ID,
+    createAssociatedTokenAccountInstruction,
     getAssociatedTokenAddressSync,
     TOKEN_2022_PROGRAM_ID,
 } from '@solana/spl-token';
 
+import * as multisig from "@sqds/multisig";
+
 import {
+    Base58,
     ChainID,
     ExternalNetwork,
     KeyType,
@@ -28,6 +34,7 @@ import {
 import {
     IStakingClient,
     Portfolio,
+    SquadsXConfig,
     StakerConfig,
     TrancheSnapshot,
 } from '../../types';
@@ -50,6 +57,7 @@ import {
 import { buildSolanaTrancheSnapshot, ceilDiv } from './utils';
 import { GlobalConfig, PayRateEntry, SolanaTransaction } from './types';
 import { SolanaProgramService } from './program';
+import bs58 from 'bs58';
 
 const commitment: Commitment = 'confirmed';
 
@@ -78,6 +86,9 @@ export class SolanaStakingClient implements IStakingClient {
     public tokenClient: TokenClient;
     public program: SolanaProgramService
 
+    private smartAccount?: SolPubKey; // PDA (off-curve)
+    private signer?: SolPubKey;       // on-curve signer
+
     get solPubKey(): SolPubKey {
         if (!this.pubKey) throw new Error('pubKey is undefined');
         return new SolPubKey(this.pubKey.data.array);
@@ -87,6 +98,18 @@ export class SolanaStakingClient implements IStakingClient {
         return this.config.network;
     }
 
+    get feePayer(): SolPubKey {
+        if (this.signer) return this.signer;
+        // fallback for normal wallets
+        if (this.anchor.wallet.publicKey) return this.anchor.wallet.publicKey;
+        throw new Error('No signing authority available');
+    }
+
+    get squadsX(): SquadsXConfig | null {
+        const config = this.config.extras?.squadsX;
+        return config ?? null;
+    }
+
     constructor(private config: StakerConfig) {
         const adapter = config.provider as BaseSignerWalletAdapter | undefined;
 
@@ -197,6 +220,83 @@ export class SolanaStakingClient implements IStakingClient {
     // IStakingClient core methods
     // ---------------------------------------------------------------------
 
+
+    async createVaultLiqsolAtaOneShot(params: {
+        connection: Connection;
+        payer: SolPubKey;      // user's wallet pubkey (signer)
+        vaultPda: SolPubKey;   // squads vault PDA (off-curve owner)
+    }): Promise<{ tx: Transaction; vaultAta: SolPubKey } | null> {
+        const { connection, payer, vaultPda } = params;
+
+        const liqsolMint = deriveLiqsolMintPda();
+
+        const vaultAta = getAssociatedTokenAddressSync(
+            liqsolMint,
+            vaultPda,
+            true, // allowOwnerOffCurve
+            TOKEN_2022_PROGRAM_ID,
+            ASSOCIATED_TOKEN_PROGRAM_ID,
+        );
+
+        // If it already exists, just no-op
+        const info = await connection.getAccountInfo(vaultAta, "confirmed");
+        console.log('info?', info);
+
+        if (info) return null;
+
+        const ix = createAssociatedTokenAccountInstruction(
+            payer,      // payer = user
+            vaultAta,   // ata address
+            vaultPda,   // owner = vault
+            liqsolMint,
+            TOKEN_2022_PROGRAM_ID,
+            ASSOCIATED_TOKEN_PROGRAM_ID,
+        );
+
+        const tx = new Transaction().add(ix);
+        return { tx, vaultAta };
+    }
+
+    private async prepSquadsIxs(ix: TransactionInstruction): Promise<TransactionInstruction[]> {
+        if (!this.squadsX) throw new Error('Attempting to wrap Squads instruction without SquadsX config');
+
+        const multisigPda = this.squadsMultisigPDA!;
+        const vaultPda = this.squadsVaultPDA!;
+        const vaultIndex = this.squadsX?.vaultIndex ?? 0;
+        const creator = this.solPubKey;
+
+        // compute next transactionIndex 
+        const ms = await multisig.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
+        const current = BigInt(ms.transactionIndex?.toString() ?? 0);
+        const transactionIndex = current + BigInt(1);
+
+        // inner message uses vault as payer
+        // const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 });
+        const { blockhash } = await this.connection.getLatestBlockhash("confirmed");
+        const transactionMessage = new TransactionMessage({
+            payerKey: vaultPda,
+            recentBlockhash: blockhash,
+            instructions: [ix],
+        });
+
+        const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+            multisigPda,
+            transactionIndex,
+            creator,
+            vaultIndex,
+            transactionMessage,
+            ephemeralSigners: 0,
+        });
+
+        const createProposalIx = await multisig.instructions.proposalCreate({
+            multisigPda,
+            transactionIndex,
+            creator,
+        });
+
+        return [createVaultTxIx, createProposalIx];
+    }
+
     /**
      * Deposit native SOL into liqSOL (liqsol_core::deposit).
      * Handles tx build, sign, send, and confirmation.
@@ -208,18 +308,51 @@ export class SolanaStakingClient implements IStakingClient {
         }
 
         try {
-            // Build compute budget increase instruction
             const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+            // console.log('amountLamports', amountLamports);
+
+            if (!!this.squadsX) {
+
+                const createVaultTx = await this.createVaultLiqsolAtaOneShot({
+                    connection: this.connection,
+                    payer: this.solPubKey,
+                    vaultPda: this.squadsVaultPDA!,
+                })
+
+                if (createVaultTx !== null) {
+                    console.log('need to create vault ata first...');
+                    const tx0 = new Transaction().add(createVaultTx.tx);
+                    const prepared0 = await this.prepareTx(tx0);
+                    const signed0 = await this.signTransaction(prepared0.tx);
+                    const sent0 = await this.sendAndConfirmHttp(signed0, prepared0);
+                    console.log('create Vault ATA', sent0);
+                }
 
-            // Build the Outpost synd instruction
-            const ix = await this.depositClient.buildDepositTx(amountLamports);
+                const ix = await this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA!)
+                const squadIxs = await this.prepSquadsIxs(ix)
 
-            // Wrap in a transaction and send
-            const tx = new Transaction().add(cuIx, ix);
-            const prepared = await this.prepareTx(tx);
-            const signed = await this.signTransaction(prepared.tx);
+                const tx1 = new Transaction().add(cuIx, squadIxs[0]);
+                const prepared1 = await this.prepareTx(tx1);
+                const signed1 = await this.signTransaction(prepared1.tx);
+                const sent1 = await this.sendAndConfirmHttp(signed1, prepared1);
+                console.log('SENT 1', sent1);
 
-            return this.sendAndConfirmHttp(signed, prepared);
+                const tx2 = new Transaction().add(cuIx, squadIxs[1]);
+                const prepared2 = await this.prepareTx(tx2);
+                const signed2 = await this.signTransaction(prepared2.tx);
+                const sent2 = await this.sendAndConfirmHttp(signed2, prepared2);
+                console.log('SENT 2', sent2);
+
+                return sent2;
+            }
+            else {
+                const ix = await this.depositClient.buildDepositTx(amountLamports)
+                const tx = new Transaction().add(ix);
+                const prepared = await this.prepareTx(tx);
+                const signed = await this.signTransaction(prepared.tx);
+
+                return this.sendAndConfirmHttp(signed, prepared);
+            }
         } catch (err) {
             throw new Error(`Failed to deposit Solana: ${err}`);
         }
@@ -361,7 +494,9 @@ export class SolanaStakingClient implements IStakingClient {
         if (!this.pubKey) throw new Error('User pubKey is undefined');
 
         try {
-            const user = this.solPubKey;
+            const user = !!this.squadsX ? this.squadsVaultPDA! : this.solPubKey;
+
+            console.log('get portfolio for user', user.toBase58());
 
             const reservePoolPDA = deriveReservePoolPda();
             const vaultPDA = deriveVaultPda();
@@ -370,7 +505,7 @@ export class SolanaStakingClient implements IStakingClient {
             const userLiqsolAta = getAssociatedTokenAddressSync(
                 liqsolMint,
                 user,
-                false,
+                true,   //set to true to allow off curve (e.g. PDA for squadsx wallet)
                 TOKEN_2022_PROGRAM_ID,
                 ASSOCIATED_TOKEN_PROGRAM_ID,
             );
@@ -510,6 +645,21 @@ export class SolanaStakingClient implements IStakingClient {
         return this.distributionClient.getUserRecord(this.solPubKey);
     }
 
+    // ---------------------------------------------------------------------
+    // SquadsX Helpers
+    // ---------------------------------------------------------------------
+
+    get squadsMultisigPDA(): SolPubKey | null {
+        if (!this.squadsX) return null;
+        return new SolPubKey(this.squadsX.multisigPDA);
+    }
+    get squadsVaultPDA(): SolPubKey | null {
+        if (!this.squadsX || !this.squadsMultisigPDA) return null;
+        const multisigPda = this.squadsMultisigPDA;
+        const index = this.squadsX.vaultIndex ?? 0;
+        const pda = multisig.getVaultPda({ multisigPda, index });
+        return pda[0];
+    }
 
     // ---------------------------------------------------------------------
     // READ-ONLY Public Methods
@@ -690,7 +840,7 @@ export class SolanaStakingClient implements IStakingClient {
             return BigInt(0);
         }
 
-        const [avgPayRate, globalConfig]: [BN, GlobalConfig] = await Promise.all([
+        const [avgPayRate, globalConfig]: [BN, GlobalConfig | null] = await Promise.all([
             this.distributionClient.getAverageScaledPayRate(windowSize),
             this.distributionClient.getGlobalConfig(),
         ]);
@@ -741,14 +891,12 @@ export class SolanaStakingClient implements IStakingClient {
     }): Promise<bigint> {
         this.ensureUser();
 
-        const payer = this.solPubKey;
-
         // -------------------------------------------------------------
         // 1) Current wallet balance (prefer caller override)
         // -------------------------------------------------------------
         const balanceLamports: bigint =
             options?.balanceOverrideLamports ??
-            BigInt(await this.connection.getBalance(payer, commitment));
+            BigInt(await this.connection.getBalance(this.feePayer, commitment));
 
         if (balanceLamports <= BigInt(0)) {
             return BigInt(0);
@@ -859,7 +1007,7 @@ export class SolanaStakingClient implements IStakingClient {
             return this.cachedTxFee.value;
         }
 
-        const payer = this.solPubKey;
+        const payer = this.feePayer;
 
         const dummyIx = SystemProgram.transfer({
             fromPubkey: payer,
@@ -961,7 +1109,7 @@ export class SolanaStakingClient implements IStakingClient {
         const { blockhash, lastValidBlockHeight } =
             await this.connection.getLatestBlockhash('confirmed');
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.solPubKey;
+        tx.feePayer = this.feePayer;
         return { tx, blockhash, lastValidBlockHeight };
     }
 
@@ -970,17 +1118,27 @@ export class SolanaStakingClient implements IStakingClient {
      * Ensures we have a Wire pubKey and an Anchor wallet pubKey, and that they match.
      */
     ensureUser() {
-        if (!this.pubKey || !this.anchor.wallet.publicKey) {
-            throw new Error('User Authorization required: pubKey is undefined');
-        }
-        if (
-            this.solPubKey.toBase58() !==
-            this.anchor.wallet.publicKey.toBase58()
-        ) {
-            throw new Error(
-                'Write access requires connected wallet to match pubKey',
-            );
+        if (!this.pubKey) throw new Error('User pubKey is undefined');
+
+        const wallet = this.anchor?.wallet as any;
+        const pk = wallet?.publicKey as SolPubKey | undefined;
+
+        if (!pk) throw new Error('Wallet not connected');
+        if (typeof wallet.signTransaction !== 'function') {
+            throw new Error('Wallet does not support signTransaction');
         }
+
+        // if (!this.pubKey || !this.anchor.wallet.publicKey) {
+        //     throw new Error('User Authorization required: pubKey is undefined');
+        // }
+        // if (
+        //     this.solPubKey.toBase58() !==
+        //     this.anchor.wallet.publicKey.toBase58()
+        // ) {
+        //     throw new Error(
+        //         'Write access requires connected wallet to match pubKey',
+        //     );
+        // }
     }
 
 }

package/src/networks/solana/types.ts

@@ -262,7 +262,7 @@ export type GlobalState = {
     roleWarmupDuration: BN;
 
     /** Wire lifecycle state (preLaunch / postLaunch / refund) */
-    wireState: WireState;
+    wireState: WireState | any;
 
     /** PDA bump */
     bump: number;
@@ -615,7 +615,7 @@ export type LeaderboardState = {
      * Per-validator scores (i64 on-chain).
      * Index corresponds to `registryIndex` in ValidatorRecord.
      */
-    scores: BN[];
+    scores: number[];
 
     /**
      * Sorted indices into `scores[]` / `voteAccounts[]`,
@@ -628,7 +628,7 @@ export type LeaderboardState = {
      * `voteAccounts[i]` is the vote account for validator with
      * `registryIndex == i`.
      */
-    voteAccounts: PublicKey[];
+    voteAccounts: { bytes: number[]; }[];
 
     /**
      * Number of active validators currently tracked in the leaderboard.
@@ -643,7 +643,7 @@ export type LeaderboardState = {
      * Reserved padding / future-proofing on-chain (u64[8]).
      * Not used by client logic, but surfaced for completeness.
      */
-    padding: BN[];
+    padding: number[];
 };
 
 /**

package/src/staker.ts

@@ -36,12 +36,12 @@ export class Staker {
 
         config.forEach((cfg) => {
             switch (cfg.network.chainId) {
-                case SolChainID.Mainnet:
+                // case SolChainID.Mainnet:
                 case SolChainID.Devnet:
                     this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
                     break;
 
-                case EvmChainID.Ethereum:
+                // case EvmChainID.Ethereum:
                 case EvmChainID.Hoodi:
                     this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
                     break;

package/src/types.ts

@@ -7,8 +7,16 @@ export type StakerConfig = {
     network: ExternalNetwork;
     provider?: BaseSignerWalletAdapter | ethers.providers.Web3Provider;
     pubKey?: PublicKey;
+    extras?: {
+        squadsX?: SquadsXConfig;
+    }
 }
 
+export type SquadsXConfig = {
+    multisigPDA: string;        // REQUIRED, base58 multisig address string
+    vaultIndex?: number;        // default 0
+};
+
 export interface IStakingClient {
     pubKey?: PublicKey;
     network: ExternalNetwork;