@wireio/stake 2.0.0 → 2.1.0

package/lib/stake.browser.js

@@ -1,8 +1,9 @@
 import { SolChainID, PublicKey as PublicKey$1, KeyType, EvmChainID } from '@wireio/core';
-import { SystemProgram, StakeProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, TransactionMessage, Transaction, PublicKey, Keypair, Connection, ComputeBudgetProgram } from '@solana/web3.js';
+import { SystemProgram, StakeProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, Transaction, PublicKey, Keypair, Connection, TransactionMessage, ComputeBudgetProgram, SendTransactionError } from '@solana/web3.js';
 import { BN, Program, AnchorProvider } from '@coral-xyz/anchor';
 import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
 import * as multisig from '@sqds/multisig';
+import bs58 from 'bs58';
 import { ethers, Contract, BigNumber } from 'ethers';
 
 class DepositClient {
@@ -82,57 +83,6 @@ class DepositClient {
       globalConfig
     }).instruction();
   }
-  async buildSquadsDepositProposalTx(params) {
-    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");
-    const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
-    const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
-    const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-    const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
-    const transactionIndex = current + BigInt(1);
-    const { blockhash } = await connection.getLatestBlockhash("confirmed");
-    const message = new TransactionMessage({
-      payerKey: vaultPda,
-      recentBlockhash: blockhash,
-      instructions: [depositBuilt.ix]
-    });
-    const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
-      multisigPda,
-      transactionIndex,
-      creator: wallet.publicKey,
-      vaultIndex,
-      ephemeralSigners: 0,
-      transactionMessage: message
-    });
-    const tx = new Transaction().add(createVaultTxIx);
-    return { tx, transactionIndex, vaultPda };
-  }
-  async buildSquadsDepositProposalTx2(params) {
-    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");
-    const [vaultPda] = multisig.getVaultPda({ multisigPda, index: vaultIndex });
-    const depositBuilt = await this.buildDepositIxForUser(amountLamports, vaultPda);
-    const ms = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
-    const current = BigInt(ms.transactionIndex?.toString?.() ?? 0);
-    const transactionIndex = current + BigInt(1);
-    const { blockhash } = await connection.getLatestBlockhash("confirmed");
-    new TransactionMessage({
-      payerKey: vaultPda,
-      recentBlockhash: blockhash,
-      instructions: [depositBuilt.ix]
-    });
-    const createProposalIx = await multisig.instructions.proposalCreate({
-      multisigPda,
-      transactionIndex,
-      creator: wallet.publicKey
-    });
-    const tx = new Transaction().add(createProposalIx);
-    return { tx, transactionIndex, vaultPda };
-  }
   async buildWithdrawTx(amount, user = this.wallet.publicKey) {
     if (!user) {
       throw new Error(
@@ -809,7 +759,8 @@ var instructions$7 = [
 				writable: true
 			},
 			{
-				name: "user"
+				name: "user",
+				writable: true
 			},
 			{
 				name: "outpost_account",
@@ -1196,6 +1147,9 @@ var instructions$7 = [
 			{
 				name: "token_program"
 			},
+			{
+				name: "associated_token_program"
+			},
 			{
 				name: "system_program"
 			}
@@ -1851,7 +1805,7 @@ var instructions$7 = [
 		],
 		accounts: [
 			{
-				name: "payer",
+				name: "admin",
 				writable: true,
 				signer: true
 			},
@@ -1859,6 +1813,9 @@ var instructions$7 = [
 				name: "metadata",
 				writable: true
 			},
+			{
+				name: "global_config"
+			},
 			{
 				name: "system_program"
 			}
@@ -2308,6 +2265,7 @@ var instructions$7 = [
 		accounts: [
 			{
 				name: "admin",
+				writable: true,
 				signer: true
 			},
 			{
@@ -2546,7 +2504,7 @@ var instructions$7 = [
 				writable: true
 			},
 			{
-				name: "user_pretoken_record",
+				name: "pool_pretoken_record",
 				writable: true
 			},
 			{
@@ -5145,6 +5103,10 @@ var types$9 = [
 		type: {
 			kind: "struct",
 			fields: [
+				{
+					name: "receipt_id",
+					type: "u64"
+				},
 				{
 					name: "liqports",
 					type: "u64"
@@ -8008,7 +7970,8 @@ var instructions$3 = [
 				writable: true
 			},
 			{
-				name: "user"
+				name: "user",
+				writable: true
 			},
 			{
 				name: "outpost_account",
@@ -8395,6 +8358,9 @@ var instructions$3 = [
 			{
 				name: "token_program"
 			},
+			{
+				name: "associated_token_program"
+			},
 			{
 				name: "system_program"
 			}
@@ -9050,7 +9016,7 @@ var instructions$3 = [
 		],
 		accounts: [
 			{
-				name: "payer",
+				name: "admin",
 				writable: true,
 				signer: true
 			},
@@ -9058,6 +9024,9 @@ var instructions$3 = [
 				name: "metadata",
 				writable: true
 			},
+			{
+				name: "global_config"
+			},
 			{
 				name: "system_program"
 			}
@@ -9507,6 +9476,7 @@ var instructions$3 = [
 		accounts: [
 			{
 				name: "admin",
+				writable: true,
 				signer: true
 			},
 			{
@@ -9745,7 +9715,7 @@ var instructions$3 = [
 				writable: true
 			},
 			{
-				name: "user_pretoken_record",
+				name: "pool_pretoken_record",
 				writable: true
 			},
 			{
@@ -12344,6 +12314,10 @@ var types$5 = [
 		type: {
 			kind: "struct",
 			fields: [
+				{
+					name: "receipt_id",
+					type: "u64"
+				},
 				{
 					name: "liqports",
 					type: "u64"
@@ -15242,9 +15216,6 @@ class OutpostClient {
   get wallet() {
     return this.provider.wallet;
   }
-  get liqsolCoreProgram() {
-    return this.program;
-  }
   async buildAccounts(user) {
     const userPk = user ?? this.wallet.publicKey;
     if (!userPk) {
@@ -15350,7 +15321,8 @@ class OutpostClient {
       liqsolPoolAta: a.liqsolPoolAta,
       outpostAccount: a.outpostAccount,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
-      systemProgram: SystemProgram.programId
+      systemProgram: SystemProgram.programId,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
     }).instruction();
   }
   previewPretokens(params) {
@@ -15906,7 +15878,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const signed = await 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;
     }
   }
   async withdraw(amountLamports) {
@@ -15922,7 +15895,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const signed = await 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;
     }
   }
   async stake(amountLamports) {
@@ -15939,7 +15913,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const signed = await 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;
     }
   }
   async unstake(amountLamports) {
@@ -15956,7 +15931,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const signed = await 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;
     }
   }
   async buy(amountLamports) {
@@ -15973,7 +15949,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const signed = await 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;
     }
   }
   async getPortfolio() {
@@ -16060,7 +16037,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;
     }
   }
   async getUserRecord() {
@@ -16093,7 +16071,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;
     }
   }
   async getSystemAPY() {
@@ -16104,7 +16083,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;
     }
   }
   async getEpochRateDecimalFromProgram() {
@@ -16255,30 +16235,63 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     };
     return singleTxFeeLamports;
   }
-  async sendAndConfirmHttp(signed, ctx) {
+  async sendAndConfirmHttp(signed, _ctx) {
     this.ensureUser();
-    const signature = await this.connection.sendRawTransaction(
-      signed.serialize(),
-      {
+    const rawTx = signed.serialize();
+    let signature;
+    try {
+      signature = await this.connection.sendRawTransaction(rawTx, {
         skipPreflight: false,
         preflightCommitment: commitment,
         maxRetries: 3
+      });
+    } catch (e) {
+      const msg = e?.message ?? "";
+      const isSendTxError = e instanceof SendTransactionError || 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 = legacy.signatures?.[0]?.signature;
+        if (!first) {
+          throw e;
+        }
+        signature = bs58.encode(first);
+      } else {
+        throw e;
       }
-    );
-    const conf = await 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 } = await 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 ?? 0) > 0;
+        if (satisfied) {
+          return signature;
+        }
+      }
+      if (Date.now() - start > timeoutMs) {
+        throw new Error(
+          `Transaction confirmation timed out for ${signature}`
+        );
+      }
+      await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
     }
-    return signature;
   }
   async signTransaction(tx) {
     this.ensureUser();
@@ -41662,7 +41675,6 @@ class EthereumStakingClient {
     };
   }
   async getTrancheSnapshot(chainID) {
-    console.log("getTrancheSnapshot", chainID);
     try {
       const blockNumber = await this.provider.getBlockNumber();
       const blockTag = { blockTag: blockNumber };