From 72a41d4a22cc206c390cd959e760155e3203f44c Mon Sep 17 00:00:00 2001 From: hanako mumei <81144685+2501babe@users.noreply.github.com> Date: Tue, 13 Dec 2022 17:37:18 -0800 Subject: [PATCH] token-js: minor memo transfer fixes --- token/js/src/extensions/memoTransfer/instructions.ts | 8 ++++---- token/js/src/extensions/memoTransfer/state.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/token/js/src/extensions/memoTransfer/instructions.ts b/token/js/src/extensions/memoTransfer/instructions.ts index 0d229d89..eec6e304 100644 --- a/token/js/src/extensions/memoTransfer/instructions.ts +++ b/token/js/src/extensions/memoTransfer/instructions.ts @@ -38,7 +38,7 @@ export function createEnableRequiredMemoTransfersInstruction( multiSigners: Signer[] = [], programId = TOKEN_2022_PROGRAM_ID ): TransactionInstruction { - return createMemoTransferInstruction(/* enable */ true, account, authority, multiSigners, programId); + return createMemoTransferInstruction(MemoTransferInstruction.Enable, account, authority, multiSigners, programId); } /** @@ -57,11 +57,11 @@ export function createDisableRequiredMemoTransfersInstruction( multiSigners: Signer[] = [], programId = TOKEN_2022_PROGRAM_ID ): TransactionInstruction { - return createMemoTransferInstruction(/* enable */ false, account, authority, multiSigners, programId); + return createMemoTransferInstruction(MemoTransferInstruction.Disable, account, authority, multiSigners, programId); } function createMemoTransferInstruction( - enable: boolean, + memoTransferInstruction: MemoTransferInstruction, account: PublicKey, authority: PublicKey, multiSigners: Signer[], @@ -80,7 +80,7 @@ function createMemoTransferInstruction( memoTransferInstructionData.encode( { instruction: TokenInstruction.MemoTransferExtension, - memoTransferInstruction: enable ? MemoTransferInstruction.Enable : MemoTransferInstruction.Disable, + memoTransferInstruction, }, data ); diff --git a/token/js/src/extensions/memoTransfer/state.ts b/token/js/src/extensions/memoTransfer/state.ts index dc0e1bec..0f8a7260 100644 --- a/token/js/src/extensions/memoTransfer/state.ts +++ b/token/js/src/extensions/memoTransfer/state.ts @@ -9,7 +9,7 @@ export interface MemoTransfer { requireIncomingTransferMemos: boolean; } -/** Buffer layout for de/serializing a transfer fee config extension */ +/** Buffer layout for de/serializing a memo transfer extension */ export const MemoTransferLayout = struct([bool('requireIncomingTransferMemos')]); export const MEMO_TRANSFER_SIZE = MemoTransferLayout.span;