Skip to content

js: fix initialize to deposit 1sol #43

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

Merged
2501babe merged 1 commit into from
Jan 15, 2025
Merged

js: fix initialize to deposit 1sol #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions clients/js-legacy/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const voteAccount = {
};

const SLOTS_PER_EPOCH: bigint = 432000n;
const LAMPORTS_PER_SOL: number = 1_000_000_000;

class BanksConnection {
constructor(client: BanksClient, payer: Keypair) {
Expand Down Expand Up @@ -109,6 +110,10 @@ async function startWithContext(authorizedWithdrawer?: PublicKey) {
},
},
],
undefined,
undefined,
// stake_raise_minimum_delegation_to_1_sol::id()
[new PublicKey('9onWzzvCzNC2jfhxxeqRgs5q7nFAAKpCUvkj6T6GJK9i')],
);
}

Expand Down Expand Up @@ -245,7 +250,11 @@ test('deposit', async (t) => {
const stakeRent = await connection.getMinimumBalanceForRentExemption(StakeProgram.space);
const minimumDelegation = (await connection.getStakeMinimumDelegation()).value;
const poolStakeAccount = await client.getAccount(poolStakeAddress);
t.is(poolStakeAccount.lamports, minimumDelegation * 2 + stakeRent, 'stake has been deposited');
t.is(
poolStakeAccount.lamports,
LAMPORTS_PER_SOL + minimumDelegation + stakeRent,
'stake has been deposited',
);
});

test('deposit from default', async (t) => {
Expand Down Expand Up @@ -286,7 +295,11 @@ test('deposit from default', async (t) => {

const stakeRent = await connection.getMinimumBalanceForRentExemption(StakeProgram.space);
const poolStakeAccount = await client.getAccount(poolStakeAddress);
t.is(poolStakeAccount.lamports, minimumDelegation * 2 + stakeRent, 'stake has been deposited');
t.is(
poolStakeAccount.lamports,
LAMPORTS_PER_SOL + minimumDelegation + stakeRent,
'stake has been deposited',
);
});

test('withdraw', async (t) => {
Expand Down
6 changes: 4 additions & 2 deletions clients/js/src/transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ export async function initializeTransaction(
rpc.getMinimumBalanceForRentExemption(MINT_SIZE).send(),
rpc.getStakeMinimumDelegation().send(),
]);
const minimumDelegation = minimumDelegationObj.value;
const lamportsPerSol = 1_000_000_000n;
const minimumPoolBalance =
minimumDelegationObj.value > lamportsPerSol ? minimumDelegationObj.value : lamportsPerSol;

transaction = appendTransactionMessageInstruction(
SystemInstruction.transfer({
Expand All @@ -106,7 +108,7 @@ export async function initializeTransaction(
SystemInstruction.transfer({
from: payer,
to: stake,
lamports: stakeRent + minimumDelegation,
lamports: stakeRent + minimumPoolBalance,
}),
transaction,
);
Expand Down
Loading