Skip to content

Commit f9aeaac

Browse files
authored
Merge pull request #4860 from brave-intl/debug-solana-rpc-update
add logging statements and fix one found bug
2 parents 55320ed + c7ca4a4 commit f9aeaac

File tree

1 file changed

+29
-22
lines changed

1 file changed

+29
-22
lines changed

nextjs/src/app/[locale]/c/[public_identifier]/CryptoWidgetPaymentButton.jsx

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function CryptoWidgetPaymentButton({
3939
const solanaBatAddress = cryptoConstants.solana_bat_address;
4040
const solanaMainUrls = cryptoConstants.solana_main_urls;
4141
const rpcHost = solanaMainUrls.filter((url) =>
42-
url.toLowerCase().includes(window.location.host.toLowerCase()),
42+
url.toLowerCase().includes(window.location.origin.toLowerCase()),
4343
)[0];
4444
const ethUsdcAddress = cryptoConstants.eth_usdc_address;
4545
const solUsdcAddress = cryptoConstants.solana_usdc_address;
@@ -191,31 +191,36 @@ export default function CryptoWidgetPaymentButton({
191191
} else {
192192
const provider = await window.solana.connect();
193193
if (provider.publicKey) {
194-
const pub_key = provider.publicKey;
195-
const connection = new Connection(`${rpcHost}/rpc`);
196-
const amount = Math.round(currentAmount * LAMPORTS_PER_SOL);
197-
198-
const transaction = new Transaction().add(
199-
SystemProgram.transfer({
200-
fromPubkey: pub_key,
201-
toPubkey: addresses.SOL,
202-
lamports: amount,
203-
}),
204-
);
205-
transaction.feePayer = pub_key;
206-
const blockhashObj = await connection.getLatestBlockhash("confirmed");
207-
transaction.recentBlockhash = await blockhashObj.blockhash;
208-
209194
try {
210-
const result =
211-
await window.solana.signAndSendTransaction(transaction);
212-
if (result.signature) {
195+
const pub_key = provider.publicKey;
196+
const connection = new Connection(`${rpcHost}/rpc`);
197+
console.log(connection)
198+
const amount = Math.round(currentAmount * LAMPORTS_PER_SOL);
199+
200+
const transaction = new Transaction().add(
201+
SystemProgram.transfer({
202+
fromPubkey: pub_key,
203+
toPubkey: addresses.SOL,
204+
lamports: amount,
205+
}),
206+
);
207+
transaction.feePayer = pub_key;
208+
const blockhashObj = await connection.getLatestBlockhash("confirmed");
209+
transaction.recentBlockhash = await blockhashObj.blockhash;
210+
211+
try {
212+
const result =
213+
await window.solana.signAndSendTransaction(transaction);
214+
if (result.signature) {
215+
window.solana.disconnect();
216+
setIsSuccessView(true);
217+
}
218+
} catch (e) {
219+
setGenericError();
213220
window.solana.disconnect();
214-
setIsSuccessView(true);
215221
}
216222
} catch (e) {
217-
setGenericError();
218-
window.solana.disconnect();
223+
console.log(e)
219224
}
220225
} else {
221226
setGenericError();
@@ -241,6 +246,7 @@ export default function CryptoWidgetPaymentButton({
241246
// this is the account address that will receive bat
242247
const destinationAccountOwner = new PublicKey(addresses.SOL);
243248
const connection = new Connection(`${rpcHost}/rpc`);
249+
console.log(connection)
244250
const contract = new PublicKey(contractAddress);
245251
// Check to see if the sender has an associated token account
246252
const senderAccount = await connection.getParsedTokenAccountsByOwner(
@@ -313,6 +319,7 @@ export default function CryptoWidgetPaymentButton({
313319
return;
314320
}
315321
} catch (e) {
322+
console.log(e)
316323
setGenericError();
317324
window.solana.disconnect();
318325
}

0 commit comments

Comments
 (0)