Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Rewrite the legacy token tests without @solana/spl-token #2821

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Rewrite the legacy token tests without @solana/spl-token #2821

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
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"@solana/web3.js": "workspace:*",
"@wallet-standard/base": "pre",
"conventional-changelog-conventionalcommits": ">= 8.0.0",
"jsdom": "^22",
Expand Down
1 change: 0 additions & 1 deletion packages/library-legacy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.7",
"@rollup/plugin-terser": "^0.4.4",
"@solana/spl-token": "^0.4.6",
"@types/bn.js": "^5.1.5",
"@types/bs58": "^4.0.1",
"@types/chai-as-promised": "^7.1.8",
Expand Down
154 changes: 66 additions & 88 deletions packages/library-legacy/test/connection.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import bs58 from 'bs58';
import {Buffer} from 'buffer';
import * as splToken from '@solana/spl-token';
import {expect, use} from 'chai';
import chaiAsPromised from 'chai-as-promised';
import {Agent as HttpAgent} from 'http';
Expand Down Expand Up @@ -4919,90 +4918,68 @@ describe('Connection', function () {
const connection = new Connection(url, 'confirmed');
const newAccount = PublicKey.unique();

let payerKeypair = new Keypair();
let testTokenMintPubkey: PublicKey;
let testOwnerKeypair: Keypair;
let testTokenAccountPubkey: PublicKey;
let testSignature: TransactionSignature;
// See scripts/fixtures/legacy-token-test-mint-account.json
const testTokenMintPubkey = new PublicKey(
'7MbpdfJa5xqwexkp6WUvkYHTPo4VgxYACDBNFWYLwCdo',
);
// See scripts/fixtures/legacy-token-test-token-owner.json
const testOwnerKeypair = Keypair.fromSecretKey(
// Public key: `AVGuygVeBmbYiJ47V7tgBNLSukNqW7pWZYJsKUNWhHpc`
new Uint8Array([
153, 120, 247, 45, 160, 119, 144, 219, 220, 209, 73, 91, 210, 102, 31,
136, 155, 12, 68, 27, 226, 215, 61, 214, 10, 245, 247, 180, 236, 63,
100, 202, 140, 247, 112, 54, 120, 32, 168, 118, 72, 115, 190, 34, 171,
126, 15, 119, 252, 173, 50, 173, 8, 10, 96, 239, 21, 32, 94, 67, 37,
43, 145, 249,
]),
Comment on lines +4928 to +4934
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if this should be a fixture somewhere, like scripts/keypairs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I at least wrote a comment to note what the pubkey is and where to find the fixture.

);
// See scripts/fixtures/legacy-token-test-token-account.json
const testTokenAccountPubkey = new PublicKey(
'EryTMgfSEabo5Fc7dN5z3nBQKzfHUJRpHAMnXdCrTq4S',
);
let selfTransferSignature: TransactionSignature;

// Setup token mints and accounts for token tests
before(async function () {
this.timeout(30 * 1000);

await connection.confirmTransaction(
await connection.requestAirdrop(payerKeypair.publicKey, 100000000000),
);

const mintOwnerKeypair = new Keypair();
const accountOwnerKeypair = new Keypair();
const mintPubkey = await splToken.createMint(
connection as any,
payerKeypair,
mintOwnerKeypair.publicKey,
null, // freeze authority
2, // decimals
);

const tokenAccountPubkey = await splToken.createAccount(
connection as any,
payerKeypair,
mintPubkey,
accountOwnerKeypair.publicKey,
);

await splToken.mintTo(
connection as any,
payerKeypair,
mintPubkey,
tokenAccountPubkey,
mintOwnerKeypair,
11111,
);

const mintPubkey2 = await splToken.createMint(
connection as any,
payerKeypair,
mintOwnerKeypair.publicKey,
null, // freeze authority
2, // decimals
);

const tokenAccountPubkey2 = await splToken.createAccount(
connection as any,
payerKeypair,
mintPubkey2,
accountOwnerKeypair.publicKey,
);

await splToken.mintTo(
connection as any,
payerKeypair,
mintPubkey2,
tokenAccountPubkey2,
mintOwnerKeypair,
100,
);

const tokenAccountDestPubkey = await splToken.createAccount(
connection as any,
payerKeypair,
mintPubkey,
accountOwnerKeypair.publicKey,
new Keypair() as any,
const selfTransferTransaction = new Transaction().add(
new TransactionInstruction({
keys: [
{
pubkey: testTokenAccountPubkey,
isSigner: false,
isWritable: true,
},
{
pubkey: testTokenAccountPubkey,
isSigner: false,
isWritable: true,
},
{
pubkey: testOwnerKeypair.publicKey,
isSigner: true,
isWritable: false,
},
],
programId: new PublicKey(
'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
),
data: Buffer.from(
// prettier-ignore
[
3, // TRANSFER instruction
1, 0, 0, 0, 0, 0, 0, 0, // 1 Lamport
],
),
}),
);

testSignature = await splToken.transfer(
connection as any,
payerKeypair,
tokenAccountPubkey,
tokenAccountDestPubkey,
accountOwnerKeypair,
1,
selfTransferSignature = await sendAndConfirmTransaction(
connection,
selfTransferTransaction,
[testOwnerKeypair],
);

testTokenMintPubkey = mintPubkey as PublicKey;
testOwnerKeypair = accountOwnerKeypair;
testTokenAccountPubkey = tokenAccountPubkey as PublicKey;
});

it('get token supply', async () => {
Expand All @@ -5020,7 +4997,7 @@ describe('Connection', function () {
await connection.getTokenLargestAccounts(testTokenMintPubkey)
).value;

expect(largestAccounts).to.have.length(2);
expect(largestAccounts).to.have.length(1);
const largestAccount = largestAccounts[0];
expect(largestAccount.address.equals(testTokenAccountPubkey)).to.be
.true;
Expand All @@ -5033,14 +5010,15 @@ describe('Connection', function () {
});

it('get confirmed token transaction', async () => {
const parsedTx =
await connection.getParsedConfirmedTransaction(testSignature);
const parsedTx = await connection.getParsedConfirmedTransaction(
selfTransferSignature,
);
if (parsedTx === null) {
expect(parsedTx).not.to.be.null;
return;
}
const {signatures, message} = parsedTx.transaction;
expect(signatures[0]).to.eq(testSignature);
expect(signatures[0]).to.eq(selfTransferSignature);
const ix = message.instructions[0];
if ('parsed' in ix) {
expect(ix.program).to.eq('spl-token');
Expand Down Expand Up @@ -5089,7 +5067,7 @@ describe('Connection', function () {
await connection.getMultipleParsedAccounts([
testTokenAccountPubkey,
testTokenMintPubkey,
payerKeypair.publicKey,
testOwnerKeypair.publicKey,
newAccount,
])
).value;
Expand Down Expand Up @@ -5121,12 +5099,12 @@ describe('Connection', function () {
expect(parsedTokenMint).to.be.ok;
}

const unparsedPayerAccount = accounts[2];
if (unparsedPayerAccount) {
const data = unparsedPayerAccount.data;
const unparsedOwnerAccount = accounts[2];
if (unparsedOwnerAccount) {
const data = unparsedOwnerAccount.data;
expect(Buffer.isBuffer(data)).to.be.true;
} else {
expect(unparsedPayerAccount).to.be.ok;
expect(unparsedOwnerAccount).to.be.ok;
}

const unknownAccount = accounts[3];
Expand Down Expand Up @@ -5175,14 +5153,14 @@ describe('Connection', function () {
mint: testTokenMintPubkey,
})
).value;
expect(accountsWithMintFilter).to.have.length(2);
expect(accountsWithMintFilter).to.have.length(1);

const accountsWithProgramFilter = (
await connection.getTokenAccountsByOwner(testOwnerKeypair.publicKey, {
programId: TOKEN_PROGRAM_ID,
})
).value;
expect(accountsWithProgramFilter).to.have.length(3);
expect(accountsWithProgramFilter).to.have.length(1);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not exactly the same as the prior test, but it's close enough. We're not meant to be testing the underlying RPC here.


const noAccounts = (
await connection.getTokenAccountsByOwner(newAccount, {
Expand Down
Loading
Loading