temp

scripts/build.csp.mjs

@@ -155,7 +155,7 @@ const updateCSP = (indexHtml) => {
 	const onramperConnectFrameSrc = 'https://buy.onramper.dev https://buy.onramper.com';
 
 	const solanaRpcApiConnectSrc =
-		'https://api.mainnet-beta.solana.com wss://api.mainnet-beta.solana.com https://api.testnet.solana.com wss://api.testnet.solana.com https://api.devnet.solana.com wss://api.devnet.solana.com';
+		'https://api.mainnet-beta.solana.com wss://burned-little-dinghy.solana-mainnet.quiknode.pro ws://api.mainnet-beta.solana.com wss://mainnet.helius-rpc.com/ https://api.testnet.solana.com wss://api.testnet.solana.com https://api.devnet.solana.com wss://api.devnet.solana.com';
 	const solanaAlchemyApiConnectSrc =
 		'https://solana-mainnet.g.alchemy.com wss://solana-mainnet.g.alchemy.com https://solana-testnet.g.alchemy.com wss://solana-testnet.g.alchemy.com https://solana-devnet.g.alchemy.com wss://solana-devnet.g.alchemy.com';
 	const solanaQuicknodeApiConnectSrc =

src/frontend/src/sol/services/sol-send.services.ts

@@ -19,6 +19,7 @@
 import { getTransferSolInstruction } from '@solana-program/system';
 import { getTransferInstruction } from '@solana-program/token';
 import { address as solAddress } from '@solana/addresses';
+import { getBase64Decoder } from '@solana/codecs';
 import { pipe } from '@solana/functional';
 import type { Signature } from '@solana/keys';
 import type { Rpc, SolanaRpcApi } from '@solana/rpc';
@@ -37,8 +38,11 @@
 	type TransactionMessage,
 	type TransactionVersion
 } from '@solana/transaction-messages';
-import { assertTransactionIsFullySigned } from '@solana/transactions';
-import { sendAndConfirmTransactionFactory } from '@solana/web3.js';
+import {
+	assertTransactionIsFullySigned,
+	type Base64EncodedWireTransaction
+} from '@solana/transactions';
+import { getTransactionEncoder, sendAndConfirmTransactionFactory } from '@solana/web3.js';
 import { get } from 'svelte/store';
 
 const setFeePayerToTransaction = ({
@@ -65,7 +69,11 @@
 	return pipe(
 		transactionMessage,
 		(tx) => setFeePayerToTransaction({ transactionMessage: tx, feePayer }),
-		(tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)
+		(tx) =>
+			setTransactionMessageLifetimeUsingBlockhash(
+				{ ...latestBlockhash, lastValidBlockHeight: latestBlockhash.lastValidBlockHeight + 100n },
+				tx
+			)
 	);
 };
 
@@ -259,12 +267,21 @@
 
 	const { signedTransaction, signature } = await signTransaction(transactionMessage);
 
+	const { simulateTransaction } = rpc;
+
+	const enc = getBase64Decoder().decode(getTransactionEncoder().encode(signedTransaction));
+
+	const simulation = await simulateTransaction(enc as Base64EncodedWireTransaction, {
+		commitment: 'confirmed',
+		encoding: 'base64'
+	}).send();
+
+	console.log('simulation', simulation);
+
 	// Explicitly do not await to proceed in the background and allow the UI to continue
-	sendSignedTransaction({
-		rpc,
-		rpcSubscriptions,
-		signedTransaction
-	});
+	sendSignedTransaction({ rpc, rpcSubscriptions, signedTransaction });
+
+	console.log(111111111);
 
 	onProgress?.();
 

src/frontend/src/sol/services/worker.sol-wallet.services.ts

@@ -33,7 +33,7 @@
 	const WalletWorker = await import('$lib/workers/workers?worker');
 	const worker: Worker = new WalletWorker.default();
 
 	const isMainnetNetwork = isNetworkIdSOLMainnet(networkId);
 	const isTestnetNetwork = isNetworkIdSOLTestnet(networkId);
 	const isDevnetNetwork = isNetworkIdSOLDevnet(networkId);
 	const isLocalNetwork = isNetworkIdSOLLocal(networkId);
@@ -54,7 +54,7 @@
 					tokenId,
 					error: (data.data as PostMessageDataResponseError).error,
 					// TODO: Remove "isMainnetNetwork" after the issue with SOL wallet is investigated and fixed
-					hideToast: isTestnetNetwork || isDevnetNetwork || isLocalNetwork || isMainnetNetwork
+					hideToast: isTestnetNetwork || isDevnetNetwork || isLocalNetwork
 				});
 				return;
 		}