@wireio/stake 1.4.69 → 1.6.69

package/lib/stake.m.js

@@ -1,7 +1,7 @@
 import { SolChainID, PublicKey as PublicKey$1, KeyType, EvmChainID } from '@wireio/core';
 import { PublicKey, StakeProgram, Keypair, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, ComputeBudgetProgram, Connection, TransactionMessage, VersionedTransaction, Transaction, SendTransactionError } from '@solana/web3.js';
 import { BN, Program, AnchorProvider } from '@coral-xyz/anchor';
-import { getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountInstruction } from '@solana/spl-token';
 import * as multisig from '@sqds/multisig';
 import bs58 from 'bs58';
 import { ethers, Contract, BigNumber } from 'ethers';
@@ -18318,7 +18318,7 @@ const DEVNET_PROGRAM_IDS = {
   LIQSOL_TOKEN: new PublicKey(liqsolTokenDevnetJson.address),
   VALIDATOR_LEADERBOARD: new PublicKey(validatorLeaderboardDevnetJson.address),
   TRANSFER_HOOK: new PublicKey(devnetTransferHookIDL.address),
-  ALT: new PublicKey("3dm6p83nqBTLnbJBFEfbHJ988y6cfKtrGSoKJbGD3hqp")
+  ALT: new PublicKey("EG5pouZneDQxfw5coaWkkv5qeoJkRsgyMiq4r6bw7K2F")
 };
 const PROGRAM_IDS_BY_CHAIN = {
   [SolChainID.Mainnet]: MAINNET_PROGRAM_IDS,
@@ -19666,8 +19666,21 @@ class OutpostClient {
     return buildOutpostAccounts(this.connection, userPk, this.pgs);
   }
   async getTokenBalance(ata) {
-    const bal = await this.connection.getTokenAccountBalance(ata);
-    return new BN(bal.value.amount);
+    try {
+      const bal = await this.connection.getTokenAccountBalance(ata);
+      return new BN(bal.value.amount);
+    } catch (error) {
+      if (this.isMissingTokenAccountError(error)) {
+        return new BN(0);
+      }
+      throw error;
+    }
+  }
+  isMissingTokenAccountError(error) {
+    const message = String(
+      error?.message ?? ""
+    ).toLowerCase();
+    return message.includes("failed to get token account balance") && message.includes("could not find account");
   }
   async fetchOutpostAccount(address) {
     const program = this.program;
@@ -20390,12 +20403,73 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       throw err;
     }
   }
+  getLiqsolDestinationOwner(owner) {
+    return owner ?? this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
+  }
+  getLiqsolDestinationAta(owner) {
+    const destinationOwner = this.getLiqsolDestinationOwner(owner);
+    const mint = this.program.deriveLiqsolMintPda();
+    return getAssociatedTokenAddressSync(
+      mint,
+      destinationOwner,
+      true,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    );
+  }
+  async getLiqsolDestinationAtaState(owner) {
+    const destinationOwner = this.getLiqsolDestinationOwner(owner);
+    const mint = this.program.deriveLiqsolMintPda();
+    const ata = this.getLiqsolDestinationAta(destinationOwner);
+    const accountInfo = await this.connection.getAccountInfo(ata, "confirmed");
+    return {
+      owner: destinationOwner,
+      mint,
+      ata,
+      exists: !!accountInfo
+    };
+  }
+  async maybeBuildCreateLiqsolDestinationAtaIx(owner) {
+    const state = await this.getLiqsolDestinationAtaState(owner);
+    if (state.exists) {
+      return null;
+    }
+    return createAssociatedTokenAccountInstruction(
+      this.feePayer,
+      state.ata,
+      state.owner,
+      state.mint,
+      TOKEN_2022_PROGRAM_ID,
+      ASSOCIATED_TOKEN_PROGRAM_ID
+    );
+  }
+  async ensureLiqsolDestinationAta(owner) {
+    this.ensureUser();
+    const createAtaIx = await this.maybeBuildCreateLiqsolDestinationAtaIx(owner);
+    if (!createAtaIx) {
+      return null;
+    }
+    try {
+      return await this.buildAndSendIx(createAtaIx);
+    } catch (error) {
+      if (!this.isAtaAlreadyCreatedError(error)) {
+        throw error;
+      }
+      return null;
+    }
+  }
+  async prependLiqsolDestinationAtaIx(ix, owner) {
+    const ixs = Array.isArray(ix) ? [...ix] : [ix];
+    const createAtaIx = await this.maybeBuildCreateLiqsolDestinationAtaIx(owner);
+    return createAtaIx ? [createAtaIx, ...ixs] : ixs;
+  }
   async claimLiqsolRewards() {
     this.ensureUser();
     const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
     try {
       const ix = await this.distributionClient.buildClaimRewardsIx(owner);
-      return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
+      const ixs = await this.prependLiqsolDestinationAtaIx(ix, owner);
+      return !!this.squadsX ? await this.sendSquadsIxs(ixs) : await this.buildAndSendIx(ixs);
     } catch (err) {
       console.log(`Failed to claim liqSOL rewards on Solana: ${err}`);
       throw err;
@@ -20422,8 +20496,10 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     if (!amountLamports || amountLamports <= BigInt(0))
       throw new Error("Unstake amount must be greater than zero.");
     try {
+      const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
       const ix = await this.outpostClient.buildUnstakeIx(amountLamports, this.squadsVaultPDA);
-      return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
+      const ixs = await this.prependLiqsolDestinationAtaIx(ix, owner);
+      return !!this.squadsX ? await this.sendSquadsIxs(ixs) : await this.buildAndSendIx(ixs);
     } catch (err) {
       console.log(`Failed to unstake Solana: ${err}`);
       throw err;
@@ -20481,7 +20557,8 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const user = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
       const unstakeIx = await this.outpostClient.buildUnstakeIx(amountLamports, user);
       const withdrawIx = await this.convertClient.buildWithdrawTx(amountLamports, user);
-      return !!this.squadsX ? await this.sendSquadsIxs([unstakeIx, withdrawIx]) : await this.buildAndSendIx([unstakeIx, withdrawIx]);
+      const ixs = await this.prependLiqsolDestinationAtaIx([unstakeIx, withdrawIx], user);
+      return !!this.squadsX ? await this.sendSquadsIxs(ixs) : await this.buildAndSendIx(ixs);
     } catch (err) {
       console.log(`Failed to unstake and withdraw: ${err}`);
       throw err;
@@ -20713,6 +20790,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     const normalized = message.toLowerCase();
     return normalized.includes("legacyuserrecordmigrationrequired") || normalized.includes("legacy user record must be migrated") || normalized.includes("custom program error: 0x1784");
   }
+  isAtaAlreadyCreatedError(error) {
+    const message = error instanceof Error ? error.message : String(error ?? "");
+    const normalized = message.toLowerCase();
+    return normalized.includes("already in use") || normalized.includes("already exists");
+  }
   async getTrancheSnapshot(chainID) {
     try {
       const [globalState, trancheState] = await Promise.all([
@@ -71047,16 +71129,16 @@ const HOODI_ADDRESSES = {
   Base58: "0x1241F36ff30065deD52d51f0d6524EF971259A12",
   sysio_merkle: "0x172076E0166D1F9Cc711C77Adf8488051744980C",
   ReceiptNFT: "0x2B0d36FACD61B71CC05ab8F3D2355ec3631C0dd5",
-  EthUsdPriceConsumer: "0x5c74c94173F05dA1720953407cbb920F3DF9f887",
+  EthUsdPriceConsumer: "0xe8D2A1E88c91DCd5433208d4152Cc4F399a7e91d",
   Pool: "0x1c85638e118b37167e9298c2268758e058DdfDA0",
-  OutpostManager: "0xA4899D35897033b927acFCf422bc745916139776",
+  OutpostManager: "0xAA292E8611aDF267e563f334Ee42320aC96D0463",
   sysio_write: "0x0Ec4C1BaB772958aa3Db27459643bfbE7d92E305",
-  Pretoken: "0xe8D2A1E88c91DCd5433208d4152Cc4F399a7e91d",
+  Pretoken: "0x18E317A7D70d8fBfE6E893616b52390EbBdb629",
   BAR: "0x4631BCAbD6dF18D94796344963cB60d44a4136b6",
   OPPCommon: "0xf4B146FbA71F41E0592668ffbF264F1D186b2Ca8",
   OPP: "0xBEc49fA140aCaA83533fB00A2BB19bDdd0290f25",
-  Depositor: "0x18E317A7D70d8fBf8e6E893616b52390EbBdb629",
-  OPPInbound: "0xAA292E8611aDF267e563f334Ee42320aC96D0463"
+  Depositor: "0xCace1b78160AE76398F486c8a18044da0d66d86D",
+  OPPInbound: "0x720472c8ce72c2A2D711333e064ABD3E6BbEAdd3"
 };
 const ADDRESS_BOOK_BY_CHAIN = {
   [EvmChainID.Ethereum]: MAINNET_ADDRESSES,
@@ -74167,6 +74249,198 @@ class Staker {
   }
 }
 
+async function getEthereumTransactionStatus(source, txId) {
+  const provider = isEthereumStakingClient(source) ? getEthereumProvider(source) : source;
+  const tx = await provider.getTransaction(txId).catch(() => null);
+  const receipt = await provider.getTransactionReceipt(txId).catch(() => null);
+  if (!tx && !receipt) {
+    return {
+      chain: "eth",
+      txId,
+      state: "not_found",
+      timestampMs: null
+    };
+  }
+  if (!receipt) {
+    return {
+      chain: "eth",
+      txId,
+      state: "pending",
+      timestampMs: null,
+      confirmations: tx?.confirmations ?? null
+    };
+  }
+  const block = receipt.blockNumber != null ? await provider.getBlock(receipt.blockNumber).catch(() => null) : null;
+  return {
+    chain: "eth",
+    txId,
+    state: receipt.status === 0 ? "failed" : "confirmed",
+    timestampMs: block?.timestamp ? block.timestamp * 1e3 : null,
+    blockNumber: receipt.blockNumber,
+    confirmations: tx?.confirmations ?? null
+  };
+}
+async function getSolanaTransactionStatus(source, txId) {
+  const connection = isSolanaStakingClient(source) ? source.connection : source;
+  const statusResponse = await connection.getSignatureStatuses(
+    [txId],
+    { searchTransactionHistory: true }
+  ).catch(() => ({ value: [null] }));
+  const status = statusResponse.value[0];
+  const transaction = await connection.getTransaction(txId, {
+    commitment: "confirmed",
+    maxSupportedTransactionVersion: 0
+  }).catch(() => null);
+  if (!status && !transaction) {
+    return {
+      chain: "sol",
+      txId,
+      state: "not_found",
+      timestampMs: null
+    };
+  }
+  const errorMessage = status?.err ? JSON.stringify(status.err) : void 0;
+  const isConfirmed = !!transaction || status?.confirmationStatus === "confirmed" || status?.confirmationStatus === "finalized";
+  return {
+    chain: "sol",
+    txId,
+    state: status?.err ? "failed" : isConfirmed ? "confirmed" : "pending",
+    timestampMs: transaction?.blockTime ? transaction.blockTime * 1e3 : null,
+    slot: transaction?.slot ?? status?.slot,
+    confirmations: status?.confirmations ?? null,
+    errorMessage
+  };
+}
+async function getStakingClientTransactionStatus(client, txId) {
+  if (isEthereumStakingClient(client)) {
+    return getEthereumTransactionStatus(client, txId);
+  }
+  return getSolanaTransactionStatus(client, txId);
+}
+async function submitEthereumStakeToWireFlow(client, amount, wireAccount) {
+  ensureEthereumUser(client);
+  const amountWei = BigNumber.isBigNumber(amount) ? amount : BigNumber.from(amount);
+  const signerAddress = await client.address;
+  if (!signerAddress) {
+    throw new Error("Ethereum signer address is unavailable.");
+  }
+  const contractService = getEthereumContractService(client);
+  const depositor = client.contract.Depositor.address;
+  const liqRead = client.contract.LiqEthToken;
+  const liqWrite = contractService.getWrite("LiqEthToken");
+  const steps = [];
+  const [balance, allowance, paused] = await Promise.all([
+    liqRead.balanceOf(signerAddress),
+    liqRead.allowance(signerAddress, depositor),
+    client.contract.Depositor.paused()
+  ]);
+  if (paused) {
+    throw new Error("StakeClient.performStakeToWire: Depositor is in a paused state");
+  }
+  if (!wireAccount?.trim()) {
+    throw new Error("StakeClient.performStakeToWire: wireAccount is required");
+  }
+  if (balance.lt(amountWei)) {
+    throw new Error("StakeClient.performStakeToWire: Insufficient LiqETH balance");
+  }
+  if (allowance.lt(amountWei)) {
+    const approveTx = await liqWrite.approve(depositor, amountWei);
+    const approveReceipt = await approveTx.wait(1);
+    const updatedAllowance = await liqRead.allowance(signerAddress, depositor);
+    if (updatedAllowance.lt(amountWei)) {
+      throw new Error("StakeClient.performStakeToWire: Liq allowance approval failed or allowance still insufficient after approve");
+    }
+    steps.push({
+      stepId: "approve",
+      label: "Approve LIQETH spend",
+      txId: approveTx.hash,
+      timestampMs: approveReceipt?.blockNumber != null ? await getEthereumBlockTimestampMs(getEthereumProvider(client), approveReceipt.blockNumber) : null
+    });
+  }
+  try {
+    await client.contract.Depositor.callStatic.stakeLiqETHToWire(amountWei, wireAccount);
+  } catch (error) {
+    const formatted = formatContractErrors(error);
+    throw new Error(`StakeClient.performStakeToWire: ${formatted.name ?? formatted.raw}`);
+  }
+  const txOverrides = await resolveContractWriteOverrides(
+    client.contract.Depositor,
+    "stakeLiqETHToWire",
+    [amountWei, wireAccount]
+  );
+  const stakeTx = await client.contract.Depositor.stakeLiqETHToWire(
+    amountWei,
+    wireAccount,
+    txOverrides
+  );
+  const stakeReceipt = await stakeTx.wait(1);
+  steps.push({
+    stepId: "source",
+    label: "Stake LIQETH to Wire",
+    txId: stakeTx.hash,
+    timestampMs: stakeReceipt?.blockNumber != null ? await getEthereumBlockTimestampMs(getEthereumProvider(client), stakeReceipt.blockNumber) : null
+  });
+  return {
+    finalTxId: stakeTx.hash,
+    steps
+  };
+}
+async function submitEthereumDepositAndStakeToWireFlow(client, amount, wireAccount) {
+  ensureEthereumUser(client);
+  const amountWei = BigNumber.isBigNumber(amount) ? amount : BigNumber.from(amount);
+  if (amountWei.lte(0)) {
+    throw new Error("Amount must be greater than zero.");
+  }
+  const convertClient = getEthereumConvertClient(client);
+  const depositResult = await convertClient.performDeposit(amountWei);
+  const steps = [{
+    stepId: "deposit",
+    label: "Deposit native ETH",
+    txId: depositResult.txHash,
+    timestampMs: depositResult.receipt?.blockNumber != null ? await getEthereumBlockTimestampMs(getEthereumProvider(client), depositResult.receipt.blockNumber) : null
+  }];
+  const stake = await submitEthereumStakeToWireFlow(client, amountWei, wireAccount);
+  return {
+    finalTxId: stake.finalTxId,
+    steps: [...steps, ...stake.steps]
+  };
+}
+function isEthereumStakingClient(value) {
+  return value instanceof EthereumStakingClient;
+}
+function isSolanaStakingClient(value) {
+  return value instanceof SolanaStakingClient;
+}
+function getEthereumProvider(client) {
+  const provider = client.provider;
+  if (!provider) {
+    throw new Error("Ethereum provider is unavailable.");
+  }
+  return provider;
+}
+function getEthereumContractService(client) {
+  const contractService = client.contractService;
+  if (!contractService) {
+    throw new Error("Ethereum contract service is unavailable.");
+  }
+  return contractService;
+}
+function getEthereumConvertClient(client) {
+  const convertClient = client.convertClient;
+  if (!convertClient?.performDeposit) {
+    throw new Error("Ethereum convert client is unavailable.");
+  }
+  return convertClient;
+}
+function ensureEthereumUser(client) {
+  const ensureUser = client.ensureUser;
+  ensureUser?.call(client);
+}
+async function getEthereumBlockTimestampMs(provider, blockNumber) {
+  const block = await provider.getBlock(blockNumber).catch(() => null);
+  return block?.timestamp ? block.timestamp * 1e3 : null;
+}
+
 const CONTRACT_NAMES = [
   "LiqEthAuthority",
   "BeaconState",
@@ -74202,5 +74476,5 @@ var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, ConvertClient$1 as ConvertClient, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DistributionClient, EPHEMERAL_RENT_EXEMPTION, ERC1155Abi, ERC20Abi, ERC721Abi, types$1 as ETH, EthereumContractService, EthereumInstaswapClient, EthereumStakingClient, HOODI_ADDRESSES, INDEX_SCALE$1 as INDEX_SCALE, INITIAL_TRANCHE_SUPPLY, LAMPORTS_PER_SOL, LeaderboardClient, MAINNET_ADDRESSES, OutpostClient, PAY_RATE_SCALE_FACTOR, PDA_SEEDS, PROGRAM_IDS_BY_CHAIN, PurchaseAsset, ReceiptNFTKind, SCALE, types as SOL, SolanaInstaswapClient, SolanaStakingClient, Staker, SupportedEvmChainID, SupportedSolChainID, TokenClient, airdropSol, buildOutpostAccounts, buildSolanaInstaswapCrossChainAccounts, buildSolanaSyndicateAccounts, buildSolanaTrancheLadder, buildSolanaTrancheSnapshot, ceilDiv, deriveEphemeralStakeAddress, generateRandomDepositAmount, generateTestKeypair, getEpochSnapshot, getErrorMessage, getProgramIds, lamportsToSol, msToEpochEnd, normalizeToBigInt, safeFetch, scheduledInstruction, sleep, solToLamports, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };
+export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, ConvertClient$1 as ConvertClient, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DistributionClient, EPHEMERAL_RENT_EXEMPTION, ERC1155Abi, ERC20Abi, ERC721Abi, types$1 as ETH, EthereumContractService, EthereumInstaswapClient, EthereumStakingClient, HOODI_ADDRESSES, INDEX_SCALE$1 as INDEX_SCALE, INITIAL_TRANCHE_SUPPLY, LAMPORTS_PER_SOL, LeaderboardClient, MAINNET_ADDRESSES, OutpostClient, PAY_RATE_SCALE_FACTOR, PDA_SEEDS, PROGRAM_IDS_BY_CHAIN, PurchaseAsset, ReceiptNFTKind, SCALE, types as SOL, SolanaInstaswapClient, SolanaStakingClient, Staker, SupportedEvmChainID, SupportedSolChainID, TokenClient, airdropSol, buildOutpostAccounts, buildSolanaInstaswapCrossChainAccounts, buildSolanaSyndicateAccounts, buildSolanaTrancheLadder, buildSolanaTrancheSnapshot, ceilDiv, deriveEphemeralStakeAddress, generateRandomDepositAmount, generateTestKeypair, getEpochSnapshot, getErrorMessage, getEthereumTransactionStatus, getProgramIds, getSolanaTransactionStatus, getStakingClientTransactionStatus, lamportsToSol, msToEpochEnd, normalizeToBigInt, safeFetch, scheduledInstruction, sleep, solToLamports, submitEthereumDepositAndStakeToWireFlow, submitEthereumStakeToWireFlow, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };
 //# sourceMappingURL=stake.m.js.map