@wireio/stake 2.0.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireio/stake",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "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/devnet/idl/liqsol_core.json

@@ -518,7 +518,8 @@
           "writable": true
         },
         {
-          "name": "user"
+          "name": "user",
+          "writable": true
         },
         {
           "name": "outpost_account",
@@ -902,6 +903,9 @@
         {
           "name": "token_program"
         },
+        {
+          "name": "associated_token_program"
+        },
         {
           "name": "system_program"
         }
@@ -1539,7 +1543,7 @@
       ],
       "accounts": [
         {
-          "name": "payer",
+          "name": "admin",
           "writable": true,
           "signer": true
         },
@@ -1547,6 +1551,9 @@
           "name": "metadata",
           "writable": true
         },
+        {
+          "name": "global_config"
+        },
         {
           "name": "system_program"
         }
@@ -1993,6 +2000,7 @@
       "accounts": [
         {
           "name": "admin",
+          "writable": true,
           "signer": true
         },
         {
@@ -2230,7 +2238,7 @@
           "writable": true
         },
         {
-          "name": "user_pretoken_record",
+          "name": "pool_pretoken_record",
           "writable": true
         },
         {
@@ -4815,6 +4823,10 @@
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "receipt_id",
+            "type": "u64"
+          },
           {
             "name": "liqports",
             "type": "u64"

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

@@ -524,7 +524,8 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "user"
+          "name": "user",
+          "writable": true
         },
         {
           "name": "outpostAccount",
@@ -908,6 +909,9 @@ export type LiqsolCore = {
         {
           "name": "tokenProgram"
         },
+        {
+          "name": "associatedTokenProgram"
+        },
         {
           "name": "systemProgram"
         }
@@ -1545,7 +1549,7 @@ export type LiqsolCore = {
       ],
       "accounts": [
         {
-          "name": "payer",
+          "name": "admin",
           "writable": true,
           "signer": true
         },
@@ -1553,6 +1557,9 @@ export type LiqsolCore = {
           "name": "metadata",
           "writable": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "systemProgram"
         }
@@ -1999,6 +2006,7 @@ export type LiqsolCore = {
       "accounts": [
         {
           "name": "admin",
+          "writable": true,
           "signer": true
         },
         {
@@ -2236,7 +2244,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "userPretokenRecord",
+          "name": "poolPretokenRecord",
           "writable": true
         },
         {
@@ -4821,6 +4829,10 @@ export type LiqsolCore = {
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "receiptId",
+            "type": "u64"
+          },
           {
             "name": "liqports",
             "type": "u64"

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

@@ -518,7 +518,8 @@
           "writable": true
         },
         {
-          "name": "user"
+          "name": "user",
+          "writable": true
         },
         {
           "name": "outpost_account",
@@ -902,6 +903,9 @@
         {
           "name": "token_program"
         },
+        {
+          "name": "associated_token_program"
+        },
         {
           "name": "system_program"
         }
@@ -1539,7 +1543,7 @@
       ],
       "accounts": [
         {
-          "name": "payer",
+          "name": "admin",
           "writable": true,
           "signer": true
         },
@@ -1547,6 +1551,9 @@
           "name": "metadata",
           "writable": true
         },
+        {
+          "name": "global_config"
+        },
         {
           "name": "system_program"
         }
@@ -1993,6 +2000,7 @@
       "accounts": [
         {
           "name": "admin",
+          "writable": true,
           "signer": true
         },
         {
@@ -2230,7 +2238,7 @@
           "writable": true
         },
         {
-          "name": "user_pretoken_record",
+          "name": "pool_pretoken_record",
           "writable": true
         },
         {
@@ -4815,6 +4823,10 @@
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "receipt_id",
+            "type": "u64"
+          },
           {
             "name": "liqports",
             "type": "u64"

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

@@ -524,7 +524,8 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "user"
+          "name": "user",
+          "writable": true
         },
         {
           "name": "outpostAccount",
@@ -908,6 +909,9 @@ export type LiqsolCore = {
         {
           "name": "tokenProgram"
         },
+        {
+          "name": "associatedTokenProgram"
+        },
         {
           "name": "systemProgram"
         }
@@ -1545,7 +1549,7 @@ export type LiqsolCore = {
       ],
       "accounts": [
         {
-          "name": "payer",
+          "name": "admin",
           "writable": true,
           "signer": true
         },
@@ -1553,6 +1557,9 @@ export type LiqsolCore = {
           "name": "metadata",
           "writable": true
         },
+        {
+          "name": "globalConfig"
+        },
         {
           "name": "systemProgram"
         }
@@ -1999,6 +2006,7 @@ export type LiqsolCore = {
       "accounts": [
         {
           "name": "admin",
+          "writable": true,
           "signer": true
         },
         {
@@ -2236,7 +2244,7 @@ export type LiqsolCore = {
           "writable": true
         },
         {
-          "name": "userPretokenRecord",
+          "name": "poolPretokenRecord",
           "writable": true
         },
         {
@@ -4821,6 +4829,10 @@ export type LiqsolCore = {
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "receiptId",
+            "type": "u64"
+          },
           {
             "name": "liqports",
             "type": "u64"

package/src/networks/ethereum/ethereum.ts

@@ -366,9 +366,6 @@ export class EthereumStakingClient implements IStakingClient {
      * SUPPORTS READ-ONLY ACcESS
      */
     async getTrancheSnapshot(chainID: ChainID): Promise<TrancheSnapshot> {
-
-        console.log('getTrancheSnapshot', chainID);
-
         try {
             const blockNumber = await this.provider.getBlockNumber();
             const blockTag = { blockTag: blockNumber };

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

@@ -22,13 +22,12 @@ import {
 } from '@solana/spl-token';
 import * as multisig from "@sqds/multisig";
 
-import { SolanaProgramService } from '../program';
-import type { LiqsolCore } from '../../../assets/solana/devnet/types/liqsol_core';
+import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 
 import { GlobalAccount, WalletLike } from '../types';
 
 export class DepositClient {
-    private program: Program<LiqsolCore>;
+    private program: Program<LiqsolCoreClientIdl>;
 
     get connection() {
         return this.provider.connection;
@@ -142,125 +141,123 @@ export class DepositClient {
             .instruction();
     }
 
-
-
-    async buildSquadsDepositProposalTx(params: {
-        connection: Connection;
-        multisigPda: PublicKey;
-        amountLamports: bigint;
-        wallet: WalletLikeSigner;   // your WalletLikeSigner type
-        vaultIndex?: number;
-    }): Promise<{
-        tx: Transaction;
-        transactionIndex: bigint;
-        vaultPda: PublicKey;
-    }> {
-        const { connection, multisigPda, amountLamports, wallet } = params;
-        const vaultIndex = params.vaultIndex ?? 0;
-
-        if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
-        if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
-
-        // 1) vault PDA
-        const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
-
-        // 2) build deposit ix where `user` = vaultPda (off-curve OK)
-        const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
-
-        // 3) compute next transactionIndex (best-effort; see note below)
-        const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-        const current = BigInt((ms as any).transactionIndex?.toString?.() ?? 0);
-        const transactionIndex = current + BigInt(1);
-
-        // 4) inner message uses vault as payer
-        const { blockhash } = await connection.getLatestBlockhash("confirmed");
-        const message = new TransactionMessage({
-            payerKey: vaultPda,
-            recentBlockhash: blockhash,
-            instructions: [depositBuilt.ix],
-        });
-
-        // 5) squads instructions (no rpc.*)
-        const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
-            multisigPda,
-            transactionIndex,
-            creator: wallet.publicKey,
-            vaultIndex,
-            ephemeralSigners: 0,
-            transactionMessage: message,
-        });
-
-        // const createProposalIx = await multisig.instructions.proposalCreate({
-        //     multisigPda,
-        //     transactionIndex,
-        //     creator: wallet.publicKey,
-        // });
-        // console.log('createVaultTxIx', createVaultTxIx);
-
-
-        // 6) return a normal Transaction for your pipeline
-        const tx = new Transaction().add(createVaultTxIx);
-
-        return { tx, transactionIndex, vaultPda };
-    }
-
-    async buildSquadsDepositProposalTx2(params: {
-        connection: Connection;
-        multisigPda: PublicKey;
-        amountLamports: bigint;
-        wallet: WalletLikeSigner;   // your WalletLikeSigner type
-        vaultIndex?: number;
-    }): Promise<{
-        tx: Transaction;
-        transactionIndex: bigint;
-        vaultPda: PublicKey;
-    }> {
-        const { connection, multisigPda, amountLamports, wallet } = params;
-        const vaultIndex = params.vaultIndex ?? 0;
-
-        if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
-        if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
-
-        // 1) vault PDA
-        const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
-
-        // 2) build deposit ix where `user` = vaultPda (off-curve OK)
-        const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
-
-        // 3) compute next transactionIndex (best-effort; see note below)
-        const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-        const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
-        const transactionIndex = current + BigInt(1);
-
-        // 4) inner message uses vault as payer
-        const { blockhash } = await connection.getLatestBlockhash("confirmed");
-        const message = new TransactionMessage({
-            payerKey: vaultPda,
-            recentBlockhash: blockhash,
-            instructions: [depositBuilt.ix],
-        });
-
-        // 5) squads instructions (no rpc.*)
-        // const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
-        //     multisigPda,
-        //     transactionIndex,
-        //     creator: wallet.publicKey,
-        //     vaultIndex,
-        //     ephemeralSigners: 0,
-        //     transactionMessage: message,
-        // });
-
-        const createProposalIx = await multisig.instructions.proposalCreate({
-            multisigPda,
-            transactionIndex,
-            creator: wallet.publicKey,
-        });
-
-        // 6) return a normal Transaction for your pipeline
-        const tx = new Transaction().add(createProposalIx);
-
-        return { tx, transactionIndex, vaultPda };
-    }
+    // async buildSquadsDepositProposalTx(params: {
+    //     connection: Connection;
+    //     multisigPda: PublicKey;
+    //     amountLamports: bigint;
+    //     wallet: WalletLikeSigner;   // your WalletLikeSigner type
+    //     vaultIndex?: number;
+    // }): Promise<{
+    //     tx: Transaction;
+    //     transactionIndex: bigint;
+    //     vaultPda: PublicKey;
+    // }> {
+    //     const { connection, multisigPda, amountLamports, wallet } = params;
+    //     const vaultIndex = params.vaultIndex ?? 0;
+
+    //     if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
+    //     if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+
+    //     // 1) vault PDA
+    //     const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
+
+    //     // 2) build deposit ix where `user` = vaultPda (off-curve OK)
+    //     const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
+
+    //     // 3) compute next transactionIndex (best-effort; see note below)
+    //     const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+    //     const current = BigInt((ms as any).transactionIndex?.toString?.() ?? 0);
+    //     const transactionIndex = current + BigInt(1);
+
+    //     // 4) inner message uses vault as payer
+    //     const { blockhash } = await connection.getLatestBlockhash("confirmed");
+    //     const message = new TransactionMessage({
+    //         payerKey: vaultPda,
+    //         recentBlockhash: blockhash,
+    //         instructions: [depositBuilt.ix],
+    //     });
+
+    //     // 5) squads instructions (no rpc.*)
+    //     const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+    //         multisigPda,
+    //         transactionIndex,
+    //         creator: wallet.publicKey,
+    //         vaultIndex,
+    //         ephemeralSigners: 0,
+    //         transactionMessage: message,
+    //     });
+
+    //     // const createProposalIx = await multisig.instructions.proposalCreate({
+    //     //     multisigPda,
+    //     //     transactionIndex,
+    //     //     creator: wallet.publicKey,
+    //     // });
+    //     // console.log('createVaultTxIx', createVaultTxIx);
+
+
+    //     // 6) return a normal Transaction for your pipeline
+    //     const tx = new Transaction().add(createVaultTxIx);
+
+    //     return { tx, transactionIndex, vaultPda };
+    // }
+
+    // async buildSquadsDepositProposalTx2(params: {
+    //     connection: Connection;
+    //     multisigPda: PublicKey;
+    //     amountLamports: bigint;
+    //     wallet: WalletLikeSigner;   // your WalletLikeSigner type
+    //     vaultIndex?: number;
+    // }): Promise<{
+    //     tx: Transaction;
+    //     transactionIndex: bigint;
+    //     vaultPda: PublicKey;
+    // }> {
+    //     const { connection, multisigPda, amountLamports, wallet } = params;
+    //     const vaultIndex = params.vaultIndex ?? 0;
+
+    //     if (!wallet?.publicKey) throw new Error("wallet.publicKey missing");
+    //     if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+
+    //     // 1) vault PDA
+    //     const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
+
+    //     // 2) build deposit ix where `user` = vaultPda (off-curve OK)
+    //     const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
+
+    //     // 3) compute next transactionIndex (best-effort; see note below)
+    //     const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+    //     const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
+    //     const transactionIndex = current + BigInt(1);
+
+    //     // 4) inner message uses vault as payer
+    //     const { blockhash } = await connection.getLatestBlockhash("confirmed");
+    //     const message = new TransactionMessage({
+    //         payerKey: vaultPda,
+    //         recentBlockhash: blockhash,
+    //         instructions: [depositBuilt.ix],
+    //     });
+
+    //     // 5) squads instructions (no rpc.*)
+    //     // const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+    //     //     multisigPda,
+    //     //     transactionIndex,
+    //     //     creator: wallet.publicKey,
+    //     //     vaultIndex,
+    //     //     ephemeralSigners: 0,
+    //     //     transactionMessage: message,
+    //     // });
+
+    //     const createProposalIx = await multisig.instructions.proposalCreate({
+    //         multisigPda,
+    //         transactionIndex,
+    //         creator: wallet.publicKey,
+    //     });
+
+    //     // 6) return a normal Transaction for your pipeline
+    //     const tx = new Transaction().add(createProposalIx);
+
+    //     return { tx, transactionIndex, vaultPda };
+    // }
 
 
 

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

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program, BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 
-import { SolanaProgramService } from '../program';
+import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 import type { LiqsolCore } from '../../../assets/solana/devnet/types/liqsol_core';
 import type { DistributionState, DistributionUserRecord, GlobalConfig, PayRateEntry, PayRateHistory } from '../types';
 import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
@@ -26,7 +26,7 @@ import { ceilDiv } from '../utils';
  *  - DistributionState + UserRecord track *shares* for yield.
  */
 export class DistributionClient {
-    private program: Program<LiqsolCore>;
+    private program: Program<LiqsolCoreClientIdl>;
 
     constructor(
         private readonly provider: AnchorProvider,

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

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 
-import { SolanaProgramService } from '../program';
+import { SolanaProgramService, ValidatorLeaderboardClientIdl } from '../program';
 import type { ValidatorLeaderboard } from '../../../assets/solana/devnet/types/validator_leaderboard';
 import { LeaderboardState, ValidatorRecord } from '../types';
 
@@ -11,7 +11,7 @@ import { LeaderboardState, ValidatorRecord } from '../types';
  * Adjust account names/fields to match your IDL (state, validatorRecord, etc).
  */
 export class LeaderboardClient {
-    private program: Program<ValidatorLeaderboard>;
+    private program: Program<ValidatorLeaderboardClientIdl>;
 
     constructor(
         private readonly provider: AnchorProvider,

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

@@ -23,7 +23,7 @@ import {
     WalletLike,
 } from '../types';
 import { INDEX_SCALE } from '../constants';
-import { SolanaProgramService } from '../program';
+import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 
 /**
  * OutpostClient
@@ -41,7 +41,7 @@ import { SolanaProgramService } from '../program';
  * in sync with the on-chain PDAs and capital-staking Wire utils.
  */
 export class OutpostClient {
-    private readonly program: Program<LiqsolCore>;
+    private readonly program: Program<LiqsolCoreClientIdl>;
 
     constructor(
         private readonly provider: AnchorProvider,
@@ -58,14 +58,6 @@ export class OutpostClient {
         return this.provider.wallet as unknown as WalletLike;
     }
 
-    /**
-     * Expose the raw Program in case callers need to build custom
-     * instructions outside this client.
-     */
-    get liqsolCoreProgram(): Program<LiqsolCore> {
-        return this.program;
-    }
-
     /**
      * Build all outpost-related PDAs / ATAs for a given user.
      * Defaults to the connected wallet.
@@ -218,6 +210,7 @@ export class OutpostClient {
                 outpostAccount: a.outpostAccount,
                 tokenProgram: TOKEN_2022_PROGRAM_ID,
                 systemProgram: SystemProgram.programId,
+                associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
             })
             .instruction();
     }

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

@@ -11,7 +11,7 @@ import {
     type OutpostAccounts,
 } from '../utils';
 
-import { SolanaProgramService } from '../program';
+import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 import type { LiqsolCore } from '../../../assets/solana/devnet/types/liqsol_core';
 
 import {
@@ -29,7 +29,7 @@ import {
 } from '../constants';
 
 export class TokenClient {
-    private readonly program: Program<LiqsolCore>;
+    private readonly program: Program<LiqsolCoreClientIdl>;
 
     get wallet(): WalletLike {
         return this.provider.wallet;