@wireio/stake 2.0.0 → 2.1.0

package/lib/stake.d.ts

@@ -1917,6 +1917,7 @@ type LiqsolCore$1 = {
                 },
                 {
                     "name": "user";
+                    "writable": true;
                 },
                 {
                     "name": "outpostAccount";
@@ -2300,6 +2301,9 @@ type LiqsolCore$1 = {
                 {
                     "name": "tokenProgram";
                 },
+                {
+                    "name": "associatedTokenProgram";
+                },
                 {
                     "name": "systemProgram";
                 }
@@ -2937,7 +2941,7 @@ type LiqsolCore$1 = {
             ];
             "accounts": [
                 {
-                    "name": "payer";
+                    "name": "admin";
                     "writable": true;
                     "signer": true;
                 },
@@ -2945,6 +2949,9 @@ type LiqsolCore$1 = {
                     "name": "metadata";
                     "writable": true;
                 },
+                {
+                    "name": "globalConfig";
+                },
                 {
                     "name": "systemProgram";
                 }
@@ -3391,6 +3398,7 @@ type LiqsolCore$1 = {
             "accounts": [
                 {
                     "name": "admin";
+                    "writable": true;
                     "signer": true;
                 },
                 {
@@ -3628,7 +3636,7 @@ type LiqsolCore$1 = {
                     "writable": true;
                 },
                 {
-                    "name": "userPretokenRecord";
+                    "name": "poolPretokenRecord";
                     "writable": true;
                 },
                 {
@@ -6213,6 +6221,10 @@ type LiqsolCore$1 = {
             "type": {
                 "kind": "struct";
                 "fields": [
+                    {
+                        "name": "receiptId";
+                        "type": "u64";
+                    },
                     {
                         "name": "liqports";
                         "type": "u64";
@@ -8861,6 +8873,7 @@ type LiqsolCore = {
                 },
                 {
                     "name": "user";
+                    "writable": true;
                 },
                 {
                     "name": "outpostAccount";
@@ -9244,6 +9257,9 @@ type LiqsolCore = {
                 {
                     "name": "tokenProgram";
                 },
+                {
+                    "name": "associatedTokenProgram";
+                },
                 {
                     "name": "systemProgram";
                 }
@@ -9881,7 +9897,7 @@ type LiqsolCore = {
             ];
             "accounts": [
                 {
-                    "name": "payer";
+                    "name": "admin";
                     "writable": true;
                     "signer": true;
                 },
@@ -9889,6 +9905,9 @@ type LiqsolCore = {
                     "name": "metadata";
                     "writable": true;
                 },
+                {
+                    "name": "globalConfig";
+                },
                 {
                     "name": "systemProgram";
                 }
@@ -10335,6 +10354,7 @@ type LiqsolCore = {
             "accounts": [
                 {
                     "name": "admin";
+                    "writable": true;
                     "signer": true;
                 },
                 {
@@ -10572,7 +10592,7 @@ type LiqsolCore = {
                     "writable": true;
                 },
                 {
-                    "name": "userPretokenRecord";
+                    "name": "poolPretokenRecord";
                     "writable": true;
                 },
                 {
@@ -13157,6 +13177,10 @@ type LiqsolCore = {
             "type": {
                 "kind": "struct";
                 "fields": [
+                    {
+                        "name": "receiptId";
+                        "type": "u64";
+                    },
                     {
                         "name": "liqports";
                         "type": "u64";
@@ -15278,25 +15302,21 @@ type ValidatorLeaderboard = {
     ];
 };
 
-type Entry<IDL> = {
-    idl: IDL & {
-        address: string;
-    };
+type LiqsolCoreClientIdl = (LiqsolCore$1 | LiqsolCore) & {
     address: string;
 };
-declare const PROGRAMS_BY_CHAIN: {
-    readonly "mainnet-beta": {
-        readonly liqsolCore: Entry<LiqsolCore$1>;
-        readonly liqsolToken: Entry<LiqsolToken$1>;
-        readonly validatorLeaderboard: Entry<ValidatorLeaderboard$1>;
-    };
-    readonly devnet: {
-        readonly liqsolCore: Entry<LiqsolCore>;
-        readonly liqsolToken: Entry<LiqsolToken>;
-        readonly validatorLeaderboard: Entry<ValidatorLeaderboard>;
-    };
+type LiqsolTokenClientIdl = (LiqsolToken$1 | LiqsolToken) & {
+    address: string;
 };
-type SolanaProgramName = keyof (typeof PROGRAMS_BY_CHAIN)[SolChainID.Mainnet];
+type ValidatorLeaderboardClientIdl = (ValidatorLeaderboard$1 | ValidatorLeaderboard) & {
+    address: string;
+};
+type SolanaProgramIdlMap = {
+    liqsolCore: LiqsolCoreClientIdl;
+    liqsolToken: LiqsolTokenClientIdl;
+    validatorLeaderboard: ValidatorLeaderboardClientIdl;
+};
+type SolanaProgramName = keyof SolanaProgramIdlMap;
 declare class SolanaProgramService {
     private provider;
     private chainId;
@@ -15305,8 +15325,7 @@ declare class SolanaProgramService {
     constructor(provider: AnchorProvider, chainId: ChainID);
     /** Expose per-chain program IDs */
     get programIds(): SolanaProgramIds;
-    /** Anchor Program getter */
-    getProgram<K extends SolanaProgramName>(name: K): Program<(typeof this.programs)[K]['idl']>;
+    getProgram<K extends SolanaProgramName>(name: K): Program<SolanaProgramIdlMap[K]>;
     listProgramNames(): SolanaProgramName[];
     get PROGRAM_IDS(): SolanaProgramIds;
     deriveGlobalConfigPda(): PublicKey$1;
@@ -15367,28 +15386,6 @@ declare class DepositClient {
      *   SOL -> liqSOL via liqsol_core::deposit.
      */
     buildDepositTx(amount: bigint, user?: PublicKey$1): Promise<TransactionInstruction>;
-    buildSquadsDepositProposalTx(params: {
-        connection: Connection;
-        multisigPda: PublicKey$1;
-        amountLamports: bigint;
-        wallet: WalletLikeSigner;
-        vaultIndex?: number;
-    }): Promise<{
-        tx: Transaction;
-        transactionIndex: bigint;
-        vaultPda: PublicKey$1;
-    }>;
-    buildSquadsDepositProposalTx2(params: {
-        connection: Connection;
-        multisigPda: PublicKey$1;
-        amountLamports: bigint;
-        wallet: WalletLikeSigner;
-        vaultIndex?: number;
-    }): Promise<{
-        tx: Transaction;
-        transactionIndex: bigint;
-        vaultPda: PublicKey$1;
-    }>;
     /**
      * Build a withdraw-request transaction:
      *   liqSOL -> SOL via liqsol_core::requestWithdraw.
@@ -15406,10 +15403,6 @@ declare class DepositClient {
      */
     private buildDepositIxForUser;
 }
-type WalletLikeSigner = {
-    publicKey: PublicKey$1;
-    signTransaction: (tx: Transaction) => Promise<Transaction>;
-};
 
 /**
  * Distribution client – wraps the distribution portion of the liqsol_core
@@ -15640,11 +15633,6 @@ declare class OutpostClient {
     constructor(provider: AnchorProvider, pgs: SolanaProgramService);
     get connection(): _solana_web3_js.Connection;
     get wallet(): WalletLike;
-    /**
-     * Expose the raw Program in case callers need to build custom
-     * instructions outside this client.
-     */
-    get liqsolCoreProgram(): Program<LiqsolCore>;
     /**
      * Build all outpost-related PDAs / ATAs for a given user.
      * Defaults to the connected wallet.
@@ -15903,6 +15891,10 @@ declare class SolanaStakingClient implements IStakingClient {
     /**
      * Send a signed transaction over HTTP RPC and wait for confirmation.
      * Throws if the transaction fails.
+     *
+     * - Handles benign "already processed" preflight errors.
+     * - Uses getSignatureStatuses() instead of confirmTransaction()
+     *   so we don't care about blockheight expiry.
      */
     private sendAndConfirmHttp;
     /**

package/lib/stake.js

@@ -5,6 +5,7 @@ var web3_js = require('@solana/web3.js');
 var anchor = require('@coral-xyz/anchor');
 var splToken = require('@solana/spl-token');
 var multisig = require('@sqds/multisig');
+var bs58 = require('bs58');
 var ethers = require('ethers');
 
 function _interopNamespaceDefault(e) {
@@ -126,63 +127,6 @@ class DepositClient {
       }).instruction();
     });
   }
-  buildSquadsDepositProposalTx(params) {
-    return __async$g(this, null, function* () {
-      var _a, _b, _c, _d;
-      const { connection, multisigPda, amountLamports, wallet } = params;
-      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
-      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
-      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
-      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
-      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
-      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
-      const transactionIndex = current + BigInt(1);
-      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
-      const message = new web3_js.TransactionMessage({
-        payerKey: vaultPda,
-        recentBlockhash: blockhash,
-        instructions: [depositBuilt.ix]
-      });
-      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
-        multisigPda,
-        transactionIndex,
-        creator: wallet.publicKey,
-        vaultIndex,
-        ephemeralSigners: 0,
-        transactionMessage: message
-      });
-      const tx = new web3_js.Transaction().add(createVaultTxIx);
-      return { tx, transactionIndex, vaultPda };
-    });
-  }
-  buildSquadsDepositProposalTx2(params) {
-    return __async$g(this, null, function* () {
-      var _a, _b, _c, _d;
-      const { connection, multisigPda, amountLamports, wallet } = params;
-      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
-      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
-      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
-      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
-      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
-      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
-      const transactionIndex = current + BigInt(1);
-      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
-      new web3_js.TransactionMessage({
-        payerKey: vaultPda,
-        recentBlockhash: blockhash,
-        instructions: [depositBuilt.ix]
-      });
-      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
-        multisigPda,
-        transactionIndex,
-        creator: wallet.publicKey
-      });
-      const tx = new web3_js.Transaction().add(createProposalIx);
-      return { tx, transactionIndex, vaultPda };
-    });
-  }
   buildWithdrawTx(_0) {
     return __async$g(this, arguments, function* (amount, user = this.wallet.publicKey) {
       if (!user) {
@@ -863,7 +807,8 @@ var instructions$7 = [
 				writable: true
 			},
 			{
-				name: "user"
+				name: "user",
+				writable: true
 			},
 			{
 				name: "outpost_account",
@@ -1250,6 +1195,9 @@ var instructions$7 = [
 			{
 				name: "token_program"
 			},
+			{
+				name: "associated_token_program"
+			},
 			{
 				name: "system_program"
 			}
@@ -1905,7 +1853,7 @@ var instructions$7 = [
 		],
 		accounts: [
 			{
-				name: "payer",
+				name: "admin",
 				writable: true,
 				signer: true
 			},
@@ -1913,6 +1861,9 @@ var instructions$7 = [
 				name: "metadata",
 				writable: true
 			},
+			{
+				name: "global_config"
+			},
 			{
 				name: "system_program"
 			}
@@ -2362,6 +2313,7 @@ var instructions$7 = [
 		accounts: [
 			{
 				name: "admin",
+				writable: true,
 				signer: true
 			},
 			{
@@ -2600,7 +2552,7 @@ var instructions$7 = [
 				writable: true
 			},
 			{
-				name: "user_pretoken_record",
+				name: "pool_pretoken_record",
 				writable: true
 			},
 			{
@@ -5199,6 +5151,10 @@ var types$9 = [
 		type: {
 			kind: "struct",
 			fields: [
+				{
+					name: "receipt_id",
+					type: "u64"
+				},
 				{
 					name: "liqports",
 					type: "u64"
@@ -8062,7 +8018,8 @@ var instructions$3 = [
 				writable: true
 			},
 			{
-				name: "user"
+				name: "user",
+				writable: true
 			},
 			{
 				name: "outpost_account",
@@ -8449,6 +8406,9 @@ var instructions$3 = [
 			{
 				name: "token_program"
 			},
+			{
+				name: "associated_token_program"
+			},
 			{
 				name: "system_program"
 			}
@@ -9104,7 +9064,7 @@ var instructions$3 = [
 		],
 		accounts: [
 			{
-				name: "payer",
+				name: "admin",
 				writable: true,
 				signer: true
 			},
@@ -9112,6 +9072,9 @@ var instructions$3 = [
 				name: "metadata",
 				writable: true
 			},
+			{
+				name: "global_config"
+			},
 			{
 				name: "system_program"
 			}
@@ -9561,6 +9524,7 @@ var instructions$3 = [
 		accounts: [
 			{
 				name: "admin",
+				writable: true,
 				signer: true
 			},
 			{
@@ -9799,7 +9763,7 @@ var instructions$3 = [
 				writable: true
 			},
 			{
-				name: "user_pretoken_record",
+				name: "pool_pretoken_record",
 				writable: true
 			},
 			{
@@ -12398,6 +12362,10 @@ var types$5 = [
 		type: {
 			kind: "struct",
 			fields: [
+				{
+					name: "receipt_id",
+					type: "u64"
+				},
 				{
 					name: "liqports",
 					type: "u64"
@@ -15432,9 +15400,6 @@ class OutpostClient {
   get wallet() {
     return this.provider.wallet;
   }
-  get liqsolCoreProgram() {
-    return this.program;
-  }
   buildAccounts(user) {
     return __async$b(this, null, function* () {
       const userPk = user != null ? user : this.wallet.publicKey;
@@ -15549,7 +15514,8 @@ class OutpostClient {
         liqsolPoolAta: a.liqsolPoolAta,
         outpostAccount: a.outpostAccount,
         tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
-        systemProgram: web3_js.SystemProgram.programId
+        systemProgram: web3_js.SystemProgram.programId,
+        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID
       }).instruction();
     });
   }
@@ -16219,7 +16185,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const signed = yield this.signTransaction(prepared.tx);
         return this.sendAndConfirmHttp(signed, prepared);
       } catch (err) {
-        throw new Error(`Failed to deposit Solana: ${err}`);
+        console.log(`Failed to deposit Solana: ${err}`);
+        throw err;
       }
     });
   }
@@ -16237,7 +16204,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const signed = yield this.signTransaction(prepared.tx);
         return this.sendAndConfirmHttp(signed, prepared);
       } catch (err) {
-        throw new Error(`Failed to withdraw Solana: ${err}`);
+        console.log(`Failed to withdraw Solana: ${err}`);
+        throw err;
       }
     });
   }
@@ -16256,7 +16224,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const signed = yield this.signTransaction(prepared.tx);
         return this.sendAndConfirmHttp(signed, prepared);
       } catch (err) {
-        throw new Error(`Failed to stake Solana: ${err}`);
+        console.log(`Failed to stake Solana: ${err}`);
+        throw err;
       }
     });
   }
@@ -16275,7 +16244,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const signed = yield this.signTransaction(prepared.tx);
         return this.sendAndConfirmHttp(signed, prepared);
       } catch (err) {
-        throw new Error(`Failed to unstake Solana: ${err}`);
+        console.log(`Failed to unstake Solana: ${err}`);
+        throw err;
       }
     });
   }
@@ -16294,7 +16264,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const signed = yield this.signTransaction(prepared.tx);
         return this.sendAndConfirmHttp(signed, prepared);
       } catch (err) {
-        throw new Error(`Failed to buy liqSOL pretokens: ${err}`);
+        console.log(`Failed to buy liqSOL pretokens: ${err}`);
+        throw err;
       }
     });
   }
@@ -16384,7 +16355,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
           chainID: this.network.chainId
         };
       } catch (err) {
-        throw new Error(`Failed to get Solana portfolio: ${err}`);
+        console.log(`Failed to get Solana portfolio: ${err}`);
+        throw err;
       }
     });
   }
@@ -16422,7 +16394,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
           nativePriceTimestamp: timestamp
         });
       } catch (err) {
-        throw new Error(`Failed to build Solana tranche snapshot: ${err}`);
+        console.log(`Failed to build Solana tranche snapshot: ${err}`);
+        throw err;
       }
     });
   }
@@ -16435,7 +16408,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const apyPercent = apyDecimal * 100;
         return apyPercent;
       } catch (err) {
-        throw new Error(`Failed to compute Solana system APY: ${err}`);
+        console.log(`Failed to compute Solana system APY: ${err}`);
+        throw err;
       }
     });
   }
@@ -16600,31 +16574,65 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       return singleTxFeeLamports;
     });
   }
-  sendAndConfirmHttp(signed, ctx) {
+  sendAndConfirmHttp(signed, _ctx) {
     return __async$8(this, null, function* () {
+      var _a, _b, _c;
       this.ensureUser();
-      const signature = yield this.connection.sendRawTransaction(
-        signed.serialize(),
-        {
+      const rawTx = signed.serialize();
+      let signature;
+      try {
+        signature = yield this.connection.sendRawTransaction(rawTx, {
           skipPreflight: false,
           preflightCommitment: commitment,
           maxRetries: 3
+        });
+      } catch (e) {
+        const msg = (_a = e == null ? void 0 : e.message) != null ? _a : "";
+        const isSendTxError = e instanceof web3_js.SendTransactionError || (e == null ? void 0 : e.name) === "SendTransactionError";
+        if (isSendTxError && msg.includes("already been processed")) {
+          console.warn(
+            'sendRawTransaction preflight says "already been processed"; treating as success and deriving signature from signed tx.'
+          );
+          const legacy = signed;
+          const first = (_c = (_b = legacy.signatures) == null ? void 0 : _b[0]) == null ? void 0 : _c.signature;
+          if (!first) {
+            throw e;
+          }
+          signature = bs58.encode(first);
+        } else {
+          throw e;
         }
-      );
-      const conf = yield this.connection.confirmTransaction(
-        {
-          signature,
-          blockhash: ctx.blockhash,
-          lastValidBlockHeight: ctx.lastValidBlockHeight
-        },
-        commitment
-      );
-      if (conf.value.err) {
-        throw new Error(
-          `Transaction failed: ${JSON.stringify(conf.value.err)}`
+      }
+      const start = Date.now();
+      const timeoutMs = 3e4;
+      const pollIntervalMs = 500;
+      while (true) {
+        const { value } = yield this.connection.getSignatureStatuses(
+          [signature],
+          { searchTransactionHistory: true }
         );
+        const status = value[0];
+        if (status) {
+          if (status.err) {
+            throw new Error(
+              `Transaction failed: ${JSON.stringify(status.err)}`
+            );
+          }
+          const confirmations = status.confirmations;
+          const confirmationStatus = status.confirmationStatus;
+          const satisfied = confirmationStatus === "confirmed" || confirmationStatus === "finalized" || confirmations === null ||
+          (confirmations != null ? confirmations : 0) > 0;
+          if (satisfied) {
+            return signature;
+          }
+        }
+        if (Date.now() - start > timeoutMs) {
+          throw new Error(
+            `Transaction confirmation timed out for ${signature}`
+          );
+        }
+        yield new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
       }
-      return signature;
     });
   }
   signTransaction(tx) {
@@ -42263,7 +42271,6 @@ class EthereumStakingClient {
   }
   getTrancheSnapshot(chainID) {
     return __async(this, null, function* () {
-      console.log("getTrancheSnapshot", chainID);
       try {
         const blockNumber = yield this.provider.getBlockNumber();
         const blockTag = { blockTag: blockNumber };