Skip to content

Commit

Permalink
SPL: Updated test accounts to mainnet versions
Browse files Browse the repository at this point in the history
  • Loading branch information
dankelleher committed Feb 29, 2024
1 parent 24ea566 commit 985e38f
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 21 deletions.
8 changes: 4 additions & 4 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ filename = "packages/tests/fixtures/marinade/lp_mint.json"
address = "Du3Ysj1wKbxPKkuPPnvzQLQh8oMSVifs3jGZjJWXFmHN"
filename = "packages/tests/fixtures/marinade/reserve_pda.json"

# Spl accounts (blaze devnet accounts)
# Spl accounts (blaze mainnet accounts)
[[test.validator.account]] #stake-pool
address = "azFVdHtAJN8BX3sbGAYkXvtdjdrT5U6rj9rovvUFos9"
address = "stk9ApL5HeVAwPLr3TLhDXdZS8ptVu7zp6ov8HFDuMi"
filename = "packages/tests/fixtures/spl/pool.json"
[[test.validator.account]] #pool-token-mint
address = "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1"
filename = "packages/tests/fixtures/spl/b_sol_mint_address.json"
[[test.validator.account]] #validator-list
address = "aEP3DRe8ssFXDFokXiNMo4UXLhpL7LEPVbneUsfqeaJ"
address = "1istpXjy8BM7Vd5vPfA485frrV7SRJhgq5vs3sskWmc"
filename = "packages/tests/fixtures/spl/validator_list.json"
[[test.validator.account]] #reserve-account
address = "aRkys1kVHeysrcn9bJFat9FkvoyyYD8M1kK286X3Aro"
address = "rsrxDvYUXjH1RQj2Ke36LNZEVqGztATxFkqNukERqFT"
filename = "packages/tests/fixtures/spl/reserve_account.json"
[[test.validator.account]] #manager-fee-account
address = "Dpo148tVGewDPyh2FkGV18gouWctbdX2fHJopJGe9xv1"
Expand Down
2 changes: 2 additions & 0 deletions packages/sdks/spl/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ export class Utils {
beamProgramId,
stateAddress,
);
console.log("stake", stakePoolAddress.toBase58());
const stakePoolState = await getStakePoolAccount(
provider.connection,
stakePoolAddress,
);
console.log("stakePoolState", stakePoolState.account.data.poolMint.toBase58());

Check failure on line 81 in packages/sdks/spl/src/utils.ts

View workflow job for this annotation

GitHub Actions / yarn-lint

Replace `"stakePoolState",·stakePoolState.account.data.poolMint.toBase58()` with `⏎······"stakePoolState",⏎······stakePoolState.account.data.poolMint.toBase58(),⏎····`
const beamVault = getAssociatedTokenAddressSync(
stakePoolState.account.data.poolMint,
vaultAuthority[0],
Expand Down
7 changes: 4 additions & 3 deletions packages/tests/fixtures/spl/b_sol_mint_address.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"pubkey": "bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1",
"account": {
"lamports": 1461600,
"lamports": 98320394,
"data": [
"AQAAADo6Z6i6z5EXSYS27Rly44WE6/Q+8JD/IYZfCvlI0W0tCS1BdxAAAAAJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"AQAAAFHizqSInTp/j+QhNNWCPX3MTkkvv6xBmVL9eEN5S8mZwE59nUZECQAJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"base64"
],
"owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
"executable": false,
"rentEpoch": 371
"rentEpoch": 18446744073709551615,
"space": 82
}
}
5 changes: 3 additions & 2 deletions packages/tests/fixtures/spl/fees_depot.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
"account": {
"lamports": 2039280,
"data": [
"CNLpcPk8ez1QGR5hGs2TqoClRrReyWXhiwWHFVaZyKwItmkD5o/5MnNT7M6y2qrcgGEqSaG4+XeiMfoI5Jqo5KnefCkAAAAAAAAAAEF0KRFp14skNyrcg3uO6b3lFikW/ndVJPjcPRoCmXeOAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"CNLpcPk8ez1QGR5hGs2TqoClRrReyWXhiwWHFVaZyKwItmkD5o/5MnNT7M6y2qrcgGEqSaG4+XeiMfoI5Jqo5BUyB8VSAAAAAAAAAGVrxKbW5dK096Px543DDQELhrJ6H2udwsIRibdP1N2pAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"base64"
],
"owner": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
"executable": false,
"rentEpoch": 371
"rentEpoch": 18446744073709551615,
"space": 165
}
}
7 changes: 4 additions & 3 deletions packages/tests/fixtures/spl/pool.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"pubkey": "azFVdHtAJN8BX3sbGAYkXvtdjdrT5U6rj9rovvUFos9",
"pubkey": "stk9ApL5HeVAwPLr3TLhDXdZS8ptVu7zp6ov8HFDuMi",
"account": {
"lamports": 5143440,
"data": [
"AQi2aQPmj/kyc1PszrLaqtyAYSpJobj5d6Ix+gjkmqjkCLZpA+aP+TJzU+zOstqq3IBhKkmhuPl3ojH6COSaqOR0TlK3ODVp7q8xpWvvF7+QNZz/+Qxc/JYj8YXrjzH2C/wIg0ukdM5I0b2+7xzv1QkIWnhD3KHOW51k82GiSUI9HwiQKTXm+75i8/+yT5wnONmvFKIUMPYZ6vcHRhqy8CAcCNLpcPk8ez1QGR5hGs2TqoClRrReyWXhiwWHFVaZyKy+io330TRBlc2b9EScxWN+/9wvGEkjPl5KMq8RBlm3bgbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCp1QsvlBIAAADIq5cMEgAAALoBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECcAAAAAAAD0AQAAAAAAAAAAABAnAAAAAAAACAAAAAAAAAAQJwAAAAAAAAoAAAAAAAAAAGQAECcAAAAAAAAIAAAAAAAAAGQAECcAAAAAAAADAAAAAAAAAADIq5cMEgAAANULL5QSAAAAAwAAAAAAAAEAAAAAAAAAARAnAAAAAAAAAwAAAAAAAAAJLUF3EAAAANWF8/IQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"AQi2aQPmj/kyc1PszrLaqtyAYSpJobj5d6Ix+gjkmqjkCLZpA+aP+TJzU+zOstqq3IBhKkmhuPl3ojH6COSaqOSsWdCxZ0G4T26SnTPN7GITkbByZxt7sbCEvPtSmBc/J/0AL1nbxvMXKEsKoi2su/UkttOrNyiAe7UkaFF4p/kgxwzG9/iGU7dOPoVx+mwaSBsMayHszFAZ7TFzuZiDbDj2CNLpcPk8ez1QGR5hGs2TqoClRrReyWXhiwWHFVaZyKy+io330TRBlc2b9EScxWN+/9wvGEkjPl5KMq8RBlm3bgbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpeuF8dSxRCgDr+3+dRkQJAEUCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECcAAAAAAAD0AQAAAAAAAAAAABAnAAAAAAAACAAAAAAAAAAQJwAAAAAAAAoAAAAAAAAAAGQAECcAAAAAAAAIAAAAAAAAAGQAECcAAAAAAAAKAAAAAAAAAACUyJ3cYEMJACdjgCUjTwoAZjqZEMtZBwDnOPqGXh0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"base64"
],
"owner": "SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy",
"executable": false,
"rentEpoch": 371
"rentEpoch": 18446744073709551615,
"space": 611
}
}
9 changes: 5 additions & 4 deletions packages/tests/fixtures/spl/reserve_account.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"pubkey": "aRkys1kVHeysrcn9bJFat9FkvoyyYD8M1kK286X3Aro",
"pubkey": "rsrxDvYUXjH1RQj2Ke36LNZEVqGztATxFkqNukERqFT",
"account": {
"lamports": 72715067851,
"lamports": 244612575352362,
"data": [
"AQAAAIDVIgAAAAAAOjpnqLrPkRdJhLbtGXLjhYTr9D7wkP8hhl8K+UjRbS06Omeous+RF0mEtu0ZcuOFhOv0PvCQ/yGGXwr5SNFtLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"AQAAAIDVIgAAAAAAUeLOpIidOn+P5CE01YI9fcxOSS+/rEGZUv14Q3lLyZlR4s6kiJ06f4/kITTVgj19zE5JL7+sQZlS/XhDeUvJmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"base64"
],
"owner": "Stake11111111111111111111111111111111111111",
"executable": false,
"rentEpoch": 371
"rentEpoch": 18446744073709551615,
"space": 200
}
}
Binary file modified packages/tests/fixtures/spl/spl_stake_pool.so
Binary file not shown.
9 changes: 5 additions & 4 deletions packages/tests/fixtures/spl/validator_list.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/tests/src/functional/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const SPL_POOL_TOKEN_VAULT = new PublicKey(
/** SPL Stake Pool Accounts */

export const SPL_STAKE_POOL = new PublicKey(
"azFVdHtAJN8BX3sbGAYkXvtdjdrT5U6rj9rovvUFos9",
"stk9ApL5HeVAwPLr3TLhDXdZS8ptVu7zp6ov8HFDuMi",
);

export const TX_FEE = 5000;

0 comments on commit 985e38f

Please sign in to comment.