diff --git a/ts-sdk/bun.lockb b/ts-sdk/bun.lockb new file mode 100755 index 0000000..b6d46a1 Binary files /dev/null and b/ts-sdk/bun.lockb differ diff --git a/ts-sdk/package.json b/ts-sdk/package.json index 5b1a108..f73503f 100644 --- a/ts-sdk/package.json +++ b/ts-sdk/package.json @@ -22,14 +22,14 @@ "license": "MIT", "dependencies": { "@coral-xyz/anchor": "^0.29.0", - "@solana/spl-token": "0.1.8", + "@solana/spl-token": "^0.4.9", "@solana/web3.js": "~1.87.6", "prettier": "^3.2.5", "ts-node": "^10.9.2" }, "devDependencies": { "@tsconfig/recommended": "^1.0.1", - "typescript": "^4.7.2" + "typescript": "^5.0.0" }, "directories": { "test": "tests" diff --git a/ts-sdk/src/index.ts b/ts-sdk/src/index.ts index 8c195fe..47d9ca2 100644 --- a/ts-sdk/src/index.ts +++ b/ts-sdk/src/index.ts @@ -1,5 +1,9 @@ import { AnchorProvider, BN, Program, Wallet } from '@coral-xyz/anchor'; -import { ASSOCIATED_TOKEN_PROGRAM_ID, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token'; +import { + createAssociatedTokenAccountInstruction, + getAssociatedTokenAddress, + TOKEN_PROGRAM_ID, +} from '@solana/spl-token'; import { Connection, PublicKey, SystemProgram, TransactionInstruction } from '@solana/web3.js'; import { MerkleDistributor, IDL } from '../../target/types/merkle_distributor'; @@ -69,23 +73,10 @@ export const getOrCreateATAInstruction = async ( ): Promise<[PublicKey, TransactionInstruction?]> => { let toAccount; try { - toAccount = await Token.getAssociatedTokenAddress( - ASSOCIATED_TOKEN_PROGRAM_ID, - TOKEN_PROGRAM_ID, - tokenMint, - owner, - allowOwnerOffCurve, - ); + toAccount = await getAssociatedTokenAddress(tokenMint, owner, allowOwnerOffCurve); const account = await connection.getAccountInfo(toAccount); if (!account) { - const ix = Token.createAssociatedTokenAccountInstruction( - ASSOCIATED_TOKEN_PROGRAM_ID, - TOKEN_PROGRAM_ID, - tokenMint, - toAccount, - owner, - payer, - ); + const ix = createAssociatedTokenAccountInstruction(payer, toAccount, owner, tokenMint); return [toAccount, ix]; } return [toAccount, undefined];