Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDK: Fix the relay fee amount in Solana NTT #472

Merged
merged 2 commits into from
Jul 9, 2024
Merged

SDK: Fix the relay fee amount in Solana NTT #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b11a563
SDK: Fix the relay fee amount in Solana NTT
barnjamin Jul 9, 2024
6ea59aa
Request finalized blockhash in version fetch for Solana
barnjamin Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions solana/ts/lib/ntt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,11 @@ export namespace NTT {
const program = getNttProgram(connection, programId.toString(), "1.0.0");

const ix = await program.methods.version().accountsStrict({}).instruction();
const { blockhash } =
await program.provider.connection.getLatestBlockhash();
// Since we don't need the very very very latest blockhash, using finalized
// ensures the blockhash will be found when we immediately simulate the tx
const { blockhash } = await program.provider.connection.getLatestBlockhash(
"finalized"
);
const msg = new TransactionMessage({
payerKey: sender,
recentBlockhash: blockhash,
Expand Down
3 changes: 2 additions & 1 deletion solana/ts/sdk/ntt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
AddressLookupTableAccount,
Connection,
Keypair,
LAMPORTS_PER_SOL,
PublicKey,
SystemProgram,
Transaction,
Expand Down Expand Up @@ -391,7 +392,7 @@ export class SolanaNtt<N extends Network, C extends SolanaChains>
payerAddress,
outboxItem.publicKey,
destination.chain,
Number(fee),
Number(fee) / LAMPORTS_PER_SOL,
// Note: quoter expects gas dropoff to be in terms of gwei
Number(options.gasDropoff ?? 0n) / WEI_PER_GWEI
);
Expand Down
Loading