From d7d3f08a5e91b087378a33e414d9f4fcceb09e99 Mon Sep 17 00:00:00 2001 From: Jordan Sexton Date: Wed, 15 Dec 2021 19:29:58 -0600 Subject: [PATCH] AccountInfo::data should already be a Buffer --- token/ts/src/state/account.ts | 2 +- token/ts/src/state/mint.ts | 2 +- token/ts/src/state/multisig.ts | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/token/ts/src/state/account.ts b/token/ts/src/state/account.ts index fdb498eb..d420af4a 100644 --- a/token/ts/src/state/account.ts +++ b/token/ts/src/state/account.ts @@ -94,7 +94,7 @@ export async function getAccountInfo( if (!info.owner.equals(programId)) throw new TokenInvalidAccountOwnerError(); if (info.data.length != ACCOUNT_SIZE) throw new TokenInvalidAccountSizeError(); - const rawAccount = AccountLayout.decode(Buffer.from(info.data)); + const rawAccount = AccountLayout.decode(info.data); return { address, diff --git a/token/ts/src/state/mint.ts b/token/ts/src/state/mint.ts index 14331235..86756c54 100644 --- a/token/ts/src/state/mint.ts +++ b/token/ts/src/state/mint.ts @@ -74,7 +74,7 @@ export async function getMintInfo( if (!info.owner.equals(programId)) throw new TokenInvalidAccountOwnerError(); if (info.data.length != MINT_SIZE) throw new TokenInvalidAccountSizeError(); - const rawMint = MintLayout.decode(Buffer.from(info.data)); + const rawMint = MintLayout.decode(info.data); return { address, diff --git a/token/ts/src/state/multisig.ts b/token/ts/src/state/multisig.ts index 42563f9d..93112f39 100644 --- a/token/ts/src/state/multisig.ts +++ b/token/ts/src/state/multisig.ts @@ -1,7 +1,6 @@ import { struct, u8 } from '@solana/buffer-layout'; import { bool, publicKey } from '@solana/buffer-layout-utils'; import { Commitment, Connection, PublicKey } from '@solana/web3.js'; -import { Buffer } from 'buffer'; import { TOKEN_PROGRAM_ID } from '../constants'; import { TokenAccountNotFoundError, TokenInvalidAccountOwnerError, TokenInvalidAccountSizeError } from '../errors'; @@ -74,7 +73,7 @@ export async function getMultisigInfo( if (!info.owner.equals(programId)) throw new TokenInvalidAccountOwnerError(); if (info.data.length != MULTISIG_SIZE) throw new TokenInvalidAccountSizeError(); - return { address, ...MultisigLayout.decode(Buffer.from(info.data)) }; + return { address, ...MultisigLayout.decode(info.data) }; } /** Get the minimum lamport balance for a multisig to be rent exempt