@lightprotocol/compressed-token 0.11.1 → 0.13.0

package/dist/cjs/node/index.cjs

@@ -6,7 +6,7 @@ var anchor = require('@coral-xyz/anchor');
 var require$$0 = require('buffer');
 
 const IDL = {
-    version: '0.6.2',
+    version: '1.2.0',
     name: 'light_compressed_token',
     instructions: [
         {
@@ -1062,7 +1062,8 @@ const IDL = {
                         name: 'inputCompressedAccountsWithMerkleContext',
                         type: {
                             vec: {
-                                defined: 'PackedCompressedAccountWithMerkleContext',
+                                defined:
+                                    'PackedCompressedAccountWithMerkleContext',
                             },
                         },
                     },
@@ -1070,7 +1071,8 @@ const IDL = {
                         name: 'outputCompressedAccounts',
                         type: {
                             vec: {
-                                defined: 'OutputCompressedAccountWithPackedContext',
+                                defined:
+                                    'OutputCompressedAccountWithPackedContext',
                             },
                         },
                     },
@@ -1126,7 +1128,8 @@ const IDL = {
                         name: 'inputCompressedAccountsWithMerkleContext',
                         type: {
                             vec: {
-                                defined: 'PackedCompressedAccountWithMerkleContext',
+                                defined:
+                                    'PackedCompressedAccountWithMerkleContext',
                             },
                         },
                     },
@@ -1134,7 +1137,8 @@ const IDL = {
                         name: 'outputCompressedAccounts',
                         type: {
                             vec: {
-                                defined: 'OutputCompressedAccountWithPackedContext',
+                                defined:
+                                    'OutputCompressedAccountWithPackedContext',
                             },
                         },
                     },
@@ -1154,12 +1158,6 @@ const IDL = {
                         name: 'isCompress',
                         type: 'bool',
                     },
-                    {
-                        name: 'signerSeeds',
-                        type: {
-                            vec: 'bytes',
-                        },
-                    },
                     {
                         name: 'cpiContext',
                         type: {
@@ -1385,7 +1383,8 @@ const IDL = {
                         name: 'outputCompressedAccounts',
                         type: {
                             vec: {
-                                defined: 'OutputCompressedAccountWithPackedContext',
+                                defined:
+                                    'OutputCompressedAccountWithPackedContext',
                             },
                         },
                     },
@@ -1562,128 +1561,23 @@ const IDL = {
     errors: [
         {
             code: 6000,
-            name: 'PublicKeyAmountMissmatch',
-            msg: 'public keys and amounts must be of same length',
+            name: 'SignerCheckFailed',
+            msg: 'Signer check failed',
         },
         {
             code: 6001,
-            name: 'ComputeInputSumFailed',
-            msg: 'ComputeInputSumFailed',
+            name: 'CreateTransferInstructionFailed',
+            msg: 'Create transfer instruction failed',
         },
         {
             code: 6002,
-            name: 'ComputeOutputSumFailed',
-            msg: 'ComputeOutputSumFailed',
+            name: 'AccountNotFound',
+            msg: 'Account not found',
         },
         {
             code: 6003,
-            name: 'ComputeCompressSumFailed',
-            msg: 'ComputeCompressSumFailed',
-        },
-        {
-            code: 6004,
-            name: 'ComputeDecompressSumFailed',
-            msg: 'ComputeDecompressSumFailed',
-        },
-        {
-            code: 6005,
-            name: 'SumCheckFailed',
-            msg: 'SumCheckFailed',
-        },
-        {
-            code: 6006,
-            name: 'DecompressRecipientUndefinedForDecompress',
-            msg: 'DecompressRecipientUndefinedForDecompress',
-        },
-        {
-            code: 6007,
-            name: 'CompressedPdaUndefinedForDecompress',
-            msg: 'CompressedPdaUndefinedForDecompress',
-        },
-        {
-            code: 6008,
-            name: 'DeCompressAmountUndefinedForDecompress',
-            msg: 'DeCompressAmountUndefinedForDecompress',
-        },
-        {
-            code: 6009,
-            name: 'CompressedPdaUndefinedForCompress',
-            msg: 'CompressedPdaUndefinedForCompress',
-        },
-        {
-            code: 6010,
-            name: 'DeCompressAmountUndefinedForCompress',
-            msg: 'DeCompressAmountUndefinedForCompress',
-        },
-        {
-            code: 6011,
-            name: 'DelegateSignerCheckFailed',
-            msg: 'DelegateSignerCheckFailed',
-        },
-        {
-            code: 6012,
-            name: 'MintTooLarge',
-            msg: 'Minted amount greater than u64::MAX',
-        },
-        {
-            code: 6013,
-            name: 'SplTokenSupplyMismatch',
-            msg: 'SplTokenSupplyMismatch',
-        },
-        {
-            code: 6014,
-            name: 'HeapMemoryCheckFailed',
-            msg: 'HeapMemoryCheckFailed',
-        },
-        {
-            code: 6015,
-            name: 'InstructionNotCallable',
-            msg: 'The instruction is not callable',
-        },
-        {
-            code: 6016,
-            name: 'ArithmeticUnderflow',
-            msg: 'ArithmeticUnderflow',
-        },
-        {
-            code: 6017,
-            name: 'HashToFieldError',
-            msg: 'HashToFieldError',
-        },
-        {
-            code: 6018,
-            name: 'InvalidAuthorityMint',
-            msg: 'Expected the authority to be also a mint authority',
-        },
-        {
-            code: 6019,
-            name: 'InvalidFreezeAuthority',
-            msg: 'Provided authority is not the freeze authority',
-        },
-        {
-            code: 6020,
-            name: 'InvalidDelegateIndex',
-        },
-        {
-            code: 6021,
-            name: 'TokenPoolPdaUndefined',
-        },
-        {
-            code: 6022,
-            name: 'IsTokenPoolPda',
-            msg: 'Compress or decompress recipient is the same account as the token pool pda.',
-        },
-        {
-            code: 6023,
-            name: 'InvalidTokenPoolPda',
-        },
-        {
-            code: 6024,
-            name: 'NoInputTokenAccountsProvided',
-        },
-        {
-            code: 6025,
-            name: 'NoInputsProvided',
+            name: 'SerializationError',
+            msg: 'Serialization error',
         },
     ],
 };
@@ -1693,20 +1587,37 @@ const IDL = {
  * Packs Compressed Token Accounts.
  */
 function packCompressedTokenAccounts(params) {
-    const { inputCompressedTokenAccounts, outputStateTrees, remainingAccounts = [], rootIndices, tokenTransferOutputs, } = params;
+    const {
+        inputCompressedTokenAccounts,
+        outputStateTrees,
+        remainingAccounts = [],
+        rootIndices,
+        tokenTransferOutputs,
+    } = params;
     const _remainingAccounts = remainingAccounts.slice();
     let delegateIndex = null;
-    if (inputCompressedTokenAccounts.length > 0 &&
-        inputCompressedTokenAccounts[0].parsed.delegate) {
-        delegateIndex = stateless_js.getIndexOrAdd(_remainingAccounts, inputCompressedTokenAccounts[0].parsed.delegate);
+    if (
+        inputCompressedTokenAccounts.length > 0 &&
+        inputCompressedTokenAccounts[0].parsed.delegate
+    ) {
+        delegateIndex = stateless_js.getIndexOrAdd(
+            _remainingAccounts,
+            inputCompressedTokenAccounts[0].parsed.delegate,
+        );
     }
     /// TODO: move pubkeyArray to remainingAccounts
     /// Currently just packs 'delegate' to pubkeyArray
     const packedInputTokenData = [];
     /// pack inputs
     inputCompressedTokenAccounts.forEach((account, index) => {
-        const merkleTreePubkeyIndex = stateless_js.getIndexOrAdd(_remainingAccounts, account.compressedAccount.merkleTree);
-        const nullifierQueuePubkeyIndex = stateless_js.getIndexOrAdd(_remainingAccounts, account.compressedAccount.nullifierQueue);
+        const merkleTreePubkeyIndex = stateless_js.getIndexOrAdd(
+            _remainingAccounts,
+            account.compressedAccount.merkleTree,
+        );
+        const nullifierQueuePubkeyIndex = stateless_js.getIndexOrAdd(
+            _remainingAccounts,
+            account.compressedAccount.nullifierQueue,
+        );
         packedInputTokenData.push({
             amount: account.parsed.amount,
             delegateIndex,
@@ -1724,15 +1635,27 @@ function packCompressedTokenAccounts(params) {
         });
     });
     /// pack output state trees
-    const paddedOutputStateMerkleTrees = stateless_js.padOutputStateMerkleTrees(outputStateTrees, tokenTransferOutputs.length, inputCompressedTokenAccounts.map(acc => acc.compressedAccount));
+    const paddedOutputStateMerkleTrees = stateless_js.padOutputStateMerkleTrees(
+        outputStateTrees,
+        tokenTransferOutputs.length,
+        inputCompressedTokenAccounts.map(acc => acc.compressedAccount),
+    );
     const packedOutputTokenData = [];
     paddedOutputStateMerkleTrees.forEach((account, index) => {
         var _a;
-        const merkleTreeIndex = stateless_js.getIndexOrAdd(_remainingAccounts, account);
+        const merkleTreeIndex = stateless_js.getIndexOrAdd(
+            _remainingAccounts,
+            account,
+        );
         packedOutputTokenData.push({
             owner: tokenTransferOutputs[index].owner,
             amount: tokenTransferOutputs[index].amount,
-            lamports: ((_a = tokenTransferOutputs[index].lamports) === null || _a === void 0 ? void 0 : _a.eq(stateless_js.bn(0)))
+            lamports: (
+                (_a = tokenTransferOutputs[index].lamports) === null ||
+                _a === void 0
+                    ? void 0
+                    : _a.eq(stateless_js.bn(0))
+            )
                 ? null
                 : tokenTransferOutputs[index].lamports,
             merkleTreeIndex,
@@ -1740,7 +1663,7 @@ function packCompressedTokenAccounts(params) {
         });
     });
     // to meta
-    const remainingAccountMetas = _remainingAccounts.map((account) => ({
+    const remainingAccountMetas = _remainingAccounts.map(account => ({
         pubkey: account,
         isWritable: true,
         isSigner: false,
@@ -1757,11 +1680,15 @@ const CPI_AUTHORITY_SEED = Buffer.from('cpi_authority');
 const SPL_TOKEN_MINT_RENT_EXEMPT_BALANCE = 1461600;
 
 /** Address of the SPL Token program */
-const TOKEN_PROGRAM_ID = new web3_js.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+const TOKEN_PROGRAM_ID = new web3_js.PublicKey(
+    'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
+);
 /** Address of the SPL Token 2022 program */
 new web3_js.PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb');
 /** Address of the SPL Associated Token Account program */
-const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js.PublicKey(
+    'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
+);
 /** Address of the special mint for wrapped native SOL in spl-token */
 new web3_js.PublicKey('So11111111111111111111111111111111111111112');
 /** Address of the special mint for wrapped native SOL in spl-token-2022 */
@@ -1791,9 +1718,88 @@ var Layout$1 = {};
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-Object.defineProperty(Layout$1, "__esModule", { value: true });
-Layout$1.s16 = Layout$1.s8 = Layout$1.nu64be = Layout$1.u48be = Layout$1.u40be = Layout$1.u32be = Layout$1.u24be = Layout$1.u16be = Layout$1.nu64 = Layout$1.u48 = Layout$1.u40 = u32 = Layout$1.u32 = Layout$1.u24 = Layout$1.u16 = u8 = Layout$1.u8 = Layout$1.offset = Layout$1.greedy = Layout$1.Constant = Layout$1.UTF8 = Layout$1.CString = Layout$1.Blob = Layout$1.Boolean = Layout$1.BitField = Layout$1.BitStructure = Layout$1.VariantLayout = Layout$1.Union = Layout$1.UnionLayoutDiscriminator = Layout$1.UnionDiscriminator = Layout$1.Structure = Layout$1.Sequence = Layout$1.DoubleBE = Layout$1.Double = Layout$1.FloatBE = Layout$1.Float = Layout$1.NearInt64BE = Layout$1.NearInt64 = Layout$1.NearUInt64BE = Layout$1.NearUInt64 = Layout$1.IntBE = Layout$1.Int = Layout$1.UIntBE = Layout$1.UInt = Layout$1.OffsetLayout = Layout$1.GreedyCount = Layout$1.ExternalLayout = Layout$1.bindConstructorLayout = Layout$1.nameWithProperty = Layout$1.Layout = Layout$1.uint8ArrayToBuffer = Layout$1.checkUint8Array = void 0;
-Layout$1.constant = Layout$1.utf8 = Layout$1.cstr = blob = Layout$1.blob = Layout$1.unionLayoutDiscriminator = Layout$1.union = Layout$1.seq = Layout$1.bits = struct = Layout$1.struct = Layout$1.f64be = Layout$1.f64 = Layout$1.f32be = Layout$1.f32 = Layout$1.ns64be = Layout$1.s48be = Layout$1.s40be = Layout$1.s32be = Layout$1.s24be = Layout$1.s16be = Layout$1.ns64 = Layout$1.s48 = Layout$1.s40 = Layout$1.s32 = Layout$1.s24 = void 0;
+Object.defineProperty(Layout$1, '__esModule', { value: true });
+Layout$1.s16 =
+    Layout$1.s8 =
+    Layout$1.nu64be =
+    Layout$1.u48be =
+    Layout$1.u40be =
+    Layout$1.u32be =
+    Layout$1.u24be =
+    Layout$1.u16be =
+    Layout$1.nu64 =
+    Layout$1.u48 =
+    Layout$1.u40 =
+    u32 =
+    Layout$1.u32 =
+    Layout$1.u24 =
+    Layout$1.u16 =
+    u8 =
+    Layout$1.u8 =
+    Layout$1.offset =
+    Layout$1.greedy =
+    Layout$1.Constant =
+    Layout$1.UTF8 =
+    Layout$1.CString =
+    Layout$1.Blob =
+    Layout$1.Boolean =
+    Layout$1.BitField =
+    Layout$1.BitStructure =
+    Layout$1.VariantLayout =
+    Layout$1.Union =
+    Layout$1.UnionLayoutDiscriminator =
+    Layout$1.UnionDiscriminator =
+    Layout$1.Structure =
+    Layout$1.Sequence =
+    Layout$1.DoubleBE =
+    Layout$1.Double =
+    Layout$1.FloatBE =
+    Layout$1.Float =
+    Layout$1.NearInt64BE =
+    Layout$1.NearInt64 =
+    Layout$1.NearUInt64BE =
+    Layout$1.NearUInt64 =
+    Layout$1.IntBE =
+    Layout$1.Int =
+    Layout$1.UIntBE =
+    Layout$1.UInt =
+    Layout$1.OffsetLayout =
+    Layout$1.GreedyCount =
+    Layout$1.ExternalLayout =
+    Layout$1.bindConstructorLayout =
+    Layout$1.nameWithProperty =
+    Layout_2 =
+    Layout$1.Layout =
+    Layout$1.uint8ArrayToBuffer =
+    Layout$1.checkUint8Array =
+        void 0;
+Layout$1.constant =
+    Layout$1.utf8 =
+    Layout$1.cstr =
+    blob =
+    Layout$1.blob =
+    Layout$1.unionLayoutDiscriminator =
+    Layout$1.union =
+    Layout$1.seq =
+    Layout$1.bits =
+    struct =
+    Layout$1.struct =
+    Layout$1.f64be =
+    Layout$1.f64 =
+    Layout$1.f32be =
+    Layout$1.f32 =
+    Layout$1.ns64be =
+    Layout$1.s48be =
+    Layout$1.s40be =
+    Layout$1.s32be =
+    Layout$1.s24be =
+    Layout$1.s16be =
+    Layout$1.ns64 =
+    Layout$1.s48 =
+    Layout$1.s40 =
+    Layout$1.s32 =
+    Layout$1.s24 =
+        void 0;
 const buffer_1 = require$$0;
 /* Check if a value is a Uint8Array.
  *
@@ -1939,7 +1945,7 @@ class Layout {
         return undefined;
     }
 }
-Layout$1.Layout = Layout;
+var Layout_2 = (Layout$1.Layout = Layout);
 /* Provide text that carries a name (such as for a function that will
  * be throwing an error) annotated with the property of a given layout
  * (such as one for which the value was unacceptable).
@@ -1988,7 +1994,7 @@ function bindConstructorLayout(Class, layout) {
     if (Object.prototype.hasOwnProperty.call(Class, 'layout_')) {
         throw new Error('Class is already bound to a layout');
     }
-    if (!(layout && (layout instanceof Layout))) {
+    if (!(layout && layout instanceof Layout)) {
         throw new TypeError('layout must be a Layout');
     }
     if (Object.prototype.hasOwnProperty.call(layout, 'boundConstructor_')) {
@@ -1996,7 +2002,7 @@ function bindConstructorLayout(Class, layout) {
     }
     Class.layout_ = layout;
     layout.boundConstructor_ = Class;
-    layout.makeDestinationObject = (() => new Class());
+    layout.makeDestinationObject = () => new Class();
     Object.defineProperty(Class.prototype, 'encode', {
         value(b, offset) {
             return layout.encode(this, b, offset);
@@ -2066,7 +2072,7 @@ Layout$1.ExternalLayout = ExternalLayout;
  */
 class GreedyCount extends ExternalLayout {
     constructor(elementSpan = 1, property) {
-        if ((!Number.isInteger(elementSpan)) || (0 >= elementSpan)) {
+        if (!Number.isInteger(elementSpan) || 0 >= elementSpan) {
             throw new TypeError('elementSpan must be a (positive) integer');
         }
         super(-1, property);
@@ -2132,8 +2138,7 @@ class OffsetLayout extends ExternalLayout {
     }
     /** @override */
     isCount() {
-        return ((this.layout instanceof UInt)
-            || (this.layout instanceof UIntBE));
+        return this.layout instanceof UInt || this.layout instanceof UIntBE;
     }
     /** @override */
     decode(b, offset = 0) {
@@ -2286,7 +2291,7 @@ const V2E32 = Math.pow(2, 32);
  * non-negative. */
 function divmodInt64(src) {
     const hi32 = Math.floor(src / V2E32);
-    const lo32 = src - (hi32 * V2E32);
+    const lo32 = src - hi32 * V2E32;
     return { hi32, lo32 };
 }
 /* Reconstruct Number from quotient and non-negative remainder */
@@ -2543,14 +2548,19 @@ class Sequence extends Layout {
         if (!(elementLayout instanceof Layout)) {
             throw new TypeError('elementLayout must be a Layout');
         }
-        if (!(((count instanceof ExternalLayout) && count.isCount())
-            || (Number.isInteger(count) && (0 <= count)))) {
-            throw new TypeError('count must be non-negative integer '
-                + 'or an unsigned integer ExternalLayout');
+        if (
+            !(
+                (count instanceof ExternalLayout && count.isCount()) ||
+                (Number.isInteger(count) && 0 <= count)
+            )
+        ) {
+            throw new TypeError(
+                'count must be non-negative integer ' +
+                    'or an unsigned integer ExternalLayout',
+            );
         }
         let span = -1;
-        if ((!(count instanceof ExternalLayout))
-            && (0 < elementLayout.span)) {
+        if (!(count instanceof ExternalLayout) && 0 < elementLayout.span) {
             span = count * elementLayout.span;
         }
         super(span, property);
@@ -2575,8 +2585,7 @@ class Sequence extends Layout {
         }
         if (0 < this.elementLayout.span) {
             span = count * this.elementLayout.span;
-        }
-        else {
+        } else {
             let idx = 0;
             while (idx < count) {
                 span += this.elementLayout.getSpan(b, offset + span);
@@ -2656,27 +2665,30 @@ Layout$1.Sequence = Sequence;
  */
 class Structure extends Layout {
     constructor(fields, property, decodePrefixes) {
-        if (!(Array.isArray(fields)
-            && fields.reduce((acc, v) => acc && (v instanceof Layout), true))) {
+        if (
+            !(
+                Array.isArray(fields) &&
+                fields.reduce((acc, v) => acc && v instanceof Layout, true)
+            )
+        ) {
             throw new TypeError('fields must be array of Layout instances');
         }
-        if (('boolean' === typeof property)
-            && (undefined === decodePrefixes)) {
+        if ('boolean' === typeof property && undefined === decodePrefixes) {
             decodePrefixes = property;
             property = undefined;
         }
         /* Verify absence of unnamed variable-length fields. */
         for (const fd of fields) {
-            if ((0 > fd.span)
-                && (undefined === fd.property)) {
-                throw new Error('fields cannot contain unnamed variable-length layout');
+            if (0 > fd.span && undefined === fd.property) {
+                throw new Error(
+                    'fields cannot contain unnamed variable-length layout',
+                );
             }
         }
         let span = -1;
         try {
             span = fields.reduce((span, fd) => span + fd.getSpan(), 0);
-        }
-        catch (e) {
+        } catch (e) {
             // ignore error
         }
         super(span, property);
@@ -2714,8 +2726,7 @@ class Structure extends Layout {
                 offset += fsp;
                 return span + fsp;
             }, 0);
-        }
-        catch (e) {
+        } catch (e) {
             throw new RangeError('indeterminate span');
         }
         return span;
@@ -2729,8 +2740,7 @@ class Structure extends Layout {
                 dest[fd.property] = fd.decode(b, offset);
             }
             offset += fd.getSpan(b, offset);
-            if (this.decodePrefixes
-                && (b.length === offset)) {
+            if (this.decodePrefixes && b.length === offset) {
                 break;
             }
         }
@@ -2747,7 +2757,7 @@ class Structure extends Layout {
         let lastWrote = 0;
         for (const fd of this.fields) {
             let span = fd.span;
-            lastWrote = (0 < span) ? span : 0;
+            lastWrote = 0 < span ? span : 0;
             if (undefined !== fd.property) {
                 const fv = src[fd.property];
                 if (undefined !== fv) {
@@ -2766,14 +2776,13 @@ class Structure extends Layout {
          * item may have had a dynamic length and we don't want to include
          * the padding between it and the end of the space reserved for
          * it. */
-        return (lastOffset + lastWrote) - firstOffset;
+        return lastOffset + lastWrote - firstOffset;
     }
     /** @override */
     fromArray(values) {
         const dest = this.makeDestinationObject();
         for (const fd of this.fields) {
-            if ((undefined !== fd.property)
-                && (0 < values.length)) {
+            if (undefined !== fd.property && 0 < values.length) {
                 dest[fd.property] = values.shift();
             }
         }
@@ -2820,8 +2829,7 @@ class Structure extends Layout {
             }
             if (0 > fd.span) {
                 offset = -1;
-            }
-            else if (0 <= offset) {
+            } else if (0 <= offset) {
                 offset += fd.span;
             }
         }
@@ -2886,9 +2894,10 @@ Layout$1.UnionDiscriminator = UnionDiscriminator;
  */
 class UnionLayoutDiscriminator extends UnionDiscriminator {
     constructor(layout, property) {
-        if (!((layout instanceof ExternalLayout)
-            && layout.isCount())) {
-            throw new TypeError('layout must be an unsigned integer ExternalLayout');
+        if (!(layout instanceof ExternalLayout && layout.isCount())) {
+            throw new TypeError(
+                'layout must be an unsigned integer ExternalLayout',
+            );
         }
         super(property || layout.property || 'variant');
         /** The {@link ExternalLayout} used to access the discriminator
@@ -2967,26 +2976,24 @@ Layout$1.UnionLayoutDiscriminator = UnionLayoutDiscriminator;
 class Union extends Layout {
     constructor(discr, defaultLayout, property) {
         let discriminator;
-        if ((discr instanceof UInt)
-            || (discr instanceof UIntBE)) {
-            discriminator = new UnionLayoutDiscriminator(new OffsetLayout(discr));
-        }
-        else if ((discr instanceof ExternalLayout)
-            && discr.isCount()) {
+        if (discr instanceof UInt || discr instanceof UIntBE) {
+            discriminator = new UnionLayoutDiscriminator(
+                new OffsetLayout(discr),
+            );
+        } else if (discr instanceof ExternalLayout && discr.isCount()) {
             discriminator = new UnionLayoutDiscriminator(discr);
-        }
-        else if (!(discr instanceof UnionDiscriminator)) {
-            throw new TypeError('discr must be a UnionDiscriminator '
-                + 'or an unsigned integer layout');
-        }
-        else {
+        } else if (!(discr instanceof UnionDiscriminator)) {
+            throw new TypeError(
+                'discr must be a UnionDiscriminator ' +
+                    'or an unsigned integer layout',
+            );
+        } else {
             discriminator = discr;
         }
         if (undefined === defaultLayout) {
             defaultLayout = null;
         }
-        if (!((null === defaultLayout)
-            || (defaultLayout instanceof Layout))) {
+        if (!(null === defaultLayout || defaultLayout instanceof Layout)) {
             throw new TypeError('defaultLayout must be null or a Layout');
         }
         if (null !== defaultLayout) {
@@ -3004,8 +3011,10 @@ class Union extends Layout {
         let span = -1;
         if (defaultLayout) {
             span = defaultLayout.span;
-            if ((0 <= span) && ((discr instanceof UInt)
-                || (discr instanceof UIntBE))) {
+            if (
+                0 <= span &&
+                (discr instanceof UInt || discr instanceof UIntBE)
+            ) {
                 span += discriminator.layout.span;
             }
         }
@@ -3024,8 +3033,8 @@ class Union extends Layout {
          *
          * If `false` the discriminator is obtained from somewhere
          * else. */
-        this.usesPrefixDiscriminator = (discr instanceof UInt)
-            || (discr instanceof UIntBE);
+        this.usesPrefixDiscriminator =
+            discr instanceof UInt || discr instanceof UIntBE;
         /** The layout for non-discriminator content when the value of the
          * discriminator is not recognized.
          *
@@ -3090,7 +3099,9 @@ class Union extends Layout {
          * determine the span. */
         const vlo = this.getVariant(b, offset);
         if (!vlo) {
-            throw new Error('unable to determine span for unrecognized variant');
+            throw new Error(
+                'unable to determine span for unrecognized variant',
+            );
         }
         return vlo.getSpan(b, offset);
     }
@@ -3124,22 +3135,41 @@ class Union extends Layout {
      * registered variant.
      */
     defaultGetSourceVariant(src) {
-        if (Object.prototype.hasOwnProperty.call(src, this.discriminator.property)) {
-            if (this.defaultLayout && this.defaultLayout.property
-                && Object.prototype.hasOwnProperty.call(src, this.defaultLayout.property)) {
+        if (
+            Object.prototype.hasOwnProperty.call(
+                src,
+                this.discriminator.property,
+            )
+        ) {
+            if (
+                this.defaultLayout &&
+                this.defaultLayout.property &&
+                Object.prototype.hasOwnProperty.call(
+                    src,
+                    this.defaultLayout.property,
+                )
+            ) {
                 return undefined;
             }
             const vlo = this.registry[src[this.discriminator.property]];
-            if (vlo
-                && ((!vlo.layout)
-                    || (vlo.property && Object.prototype.hasOwnProperty.call(src, vlo.property)))) {
+            if (
+                vlo &&
+                (!vlo.layout ||
+                    (vlo.property &&
+                        Object.prototype.hasOwnProperty.call(
+                            src,
+                            vlo.property,
+                        )))
+            ) {
                 return vlo;
             }
-        }
-        else {
+        } else {
             for (const tag in this.registry) {
                 const vlo = this.registry[tag];
-                if (vlo.property && Object.prototype.hasOwnProperty.call(src, vlo.property)) {
+                if (
+                    vlo.property &&
+                    Object.prototype.hasOwnProperty.call(src, vlo.property)
+                ) {
                     return vlo;
                 }
             }
@@ -3167,9 +3197,11 @@ class Union extends Layout {
             dest[dlo.property] = discr;
             // defaultLayout.property can be undefined, but this is allowed by buffer-layout
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            dest[defaultLayout.property] = defaultLayout.decode(b, offset + contentOffset);
-        }
-        else {
+            dest[defaultLayout.property] = defaultLayout.decode(
+                b,
+                offset + contentOffset,
+            );
+        } else {
             dest = clo.decode(b, offset);
         }
         return dest;
@@ -3194,7 +3226,10 @@ class Union extends Layout {
             dlo.encode(src[dlo.property], b, offset);
             // clo.property is not undefined when vlo is undefined
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            return contentOffset + clo.encode(src[clo.property], b, offset + contentOffset);
+            return (
+                contentOffset +
+                clo.encode(src[clo.property], b, offset + contentOffset)
+            );
         }
         return vlo.encode(src, b, offset);
     }
@@ -3234,8 +3269,7 @@ class Union extends Layout {
         let variant;
         if (vb instanceof Uint8Array) {
             variant = this.discriminator.decode(vb, offset);
-        }
-        else {
+        } else {
             variant = vb;
         }
         return this.registry[variant];
@@ -3276,11 +3310,10 @@ class VariantLayout extends Layout {
         if (!(union instanceof Union)) {
             throw new TypeError('union must be a Union');
         }
-        if ((!Number.isInteger(variant)) || (0 > variant)) {
+        if (!Number.isInteger(variant) || 0 > variant) {
             throw new TypeError('variant must be a (non-negative) integer');
         }
-        if (('string' === typeof layout)
-            && (undefined === property)) {
+        if ('string' === typeof layout && undefined === property) {
             property = layout;
             layout = null;
         }
@@ -3288,10 +3321,14 @@ class VariantLayout extends Layout {
             if (!(layout instanceof Layout)) {
                 throw new TypeError('layout must be a Layout');
             }
-            if ((null !== union.defaultLayout)
-                && (0 <= layout.span)
-                && (layout.span > union.defaultLayout.span)) {
-                throw new Error('variant span exceeds span of containing union');
+            if (
+                null !== union.defaultLayout &&
+                0 <= layout.span &&
+                layout.span > union.defaultLayout.span
+            ) {
+                throw new Error(
+                    'variant span exceeds span of containing union',
+                );
             }
             if ('string' !== typeof property) {
                 throw new TypeError('variant must have a String property');
@@ -3300,7 +3337,7 @@ class VariantLayout extends Layout {
         let span = union.span;
         if (0 > union.span) {
             span = layout ? layout.span : 0;
-            if ((0 <= span) && union.usesPrefixDiscriminator) {
+            if (0 <= span && union.usesPrefixDiscriminator) {
                 span += union.discriminator.layout.span;
             }
         }
@@ -3347,11 +3384,9 @@ class VariantLayout extends Layout {
         }
         if (this.layout) {
             dest[this.property] = this.layout.decode(b, offset + contentOffset);
-        }
-        else if (this.property) {
+        } else if (this.property) {
             dest[this.property] = true;
-        }
-        else if (this.union.usesPrefixDiscriminator) {
+        } else if (this.union.usesPrefixDiscriminator) {
             dest[this.union.discriminator.property] = this.variant;
         }
         return dest;
@@ -3362,8 +3397,10 @@ class VariantLayout extends Layout {
         if (this.union.usesPrefixDiscriminator) {
             contentOffset = this.union.discriminator.layout.span;
         }
-        if (this.layout
-            && (!Object.prototype.hasOwnProperty.call(src, this.property))) {
+        if (
+            this.layout &&
+            !Object.prototype.hasOwnProperty.call(src, this.property)
+        ) {
             throw new TypeError('variant lacks property ' + this.property);
         }
         this.union.discriminator.encode(this.variant, b, offset);
@@ -3371,8 +3408,7 @@ class VariantLayout extends Layout {
         if (this.layout) {
             this.layout.encode(src[this.property], b, offset + contentOffset);
             span += this.layout.getSpan(b, offset + contentOffset);
-            if ((0 <= this.union.span)
-                && (span > this.union.span)) {
+            if (0 <= this.union.span && span > this.union.span) {
                 throw new Error('encoded variant overruns containing union');
             }
         }
@@ -3433,12 +3469,10 @@ function fixBitwiseResult(v) {
  */
 class BitStructure extends Layout {
     constructor(word, msb, property) {
-        if (!((word instanceof UInt)
-            || (word instanceof UIntBE))) {
+        if (!(word instanceof UInt || word instanceof UIntBE)) {
             throw new TypeError('word must be a UInt or UIntBE layout');
         }
-        if (('string' === typeof msb)
-            && (undefined === property)) {
+        if ('string' === typeof msb && undefined === property) {
             property = msb;
             msb = false;
         }
@@ -3582,15 +3616,19 @@ class BitField {
         if (!(container instanceof BitStructure)) {
             throw new TypeError('container must be a BitStructure');
         }
-        if ((!Number.isInteger(bits)) || (0 >= bits)) {
+        if (!Number.isInteger(bits) || 0 >= bits) {
             throw new TypeError('bits must be positive integer');
         }
         const totalBits = 8 * container.span;
         const usedBits = container.fields.reduce((sum, fd) => sum + fd.bits, 0);
-        if ((bits + usedBits) > totalBits) {
-            throw new Error('bits too long for span remainder ('
-                + (totalBits - usedBits) + ' of '
-                + totalBits + ' remain)');
+        if (bits + usedBits > totalBits) {
+            throw new Error(
+                'bits too long for span remainder (' +
+                    (totalBits - usedBits) +
+                    ' of ' +
+                    totalBits +
+                    ' remain)',
+            );
         }
         /** The {@link BitStructure} instance to which this bit field
          * belongs. */
@@ -3603,8 +3641,9 @@ class BitField {
          * That is, it masks a value that has not yet been shifted into
          * position within its containing packed integer. */
         this.valueMask = (1 << bits) - 1;
-        if (32 === bits) { // shifted value out of range
-            this.valueMask = 0xFFFFFFFF;
+        if (32 === bits) {
+            // shifted value out of range
+            this.valueMask = 0xffffffff;
         }
         /** The offset of the value within the containing packed unsigned
          * integer.  The least significant bit of the packed value is at
@@ -3642,16 +3681,22 @@ class BitField {
      * **NOTE** This is not a specialization of {@link
      * Layout#encode|Layout.encode} and there is no return value. */
     encode(value) {
-        if ('number' !== typeof value
-            || !Number.isInteger(value)
-            || (value !== fixBitwiseResult(value & this.valueMask))) {
-            throw new TypeError(nameWithProperty('BitField.encode', this)
-                + ' value must be integer not exceeding ' + this.valueMask);
+        if (
+            'number' !== typeof value ||
+            !Number.isInteger(value) ||
+            value !== fixBitwiseResult(value & this.valueMask)
+        ) {
+            throw new TypeError(
+                nameWithProperty('BitField.encode', this) +
+                    ' value must be integer not exceeding ' +
+                    this.valueMask,
+            );
         }
         const word = this.container._packedGetValue();
         const wordValue = fixBitwiseResult(value << this.start);
-        this.container._packedSetValue(fixBitwiseResult(word & ~this.wordMask)
-            | wordValue);
+        this.container._packedSetValue(
+            fixBitwiseResult(word & ~this.wordMask) | wordValue,
+        );
     }
 }
 Layout$1.BitField = BitField;
@@ -3709,10 +3754,16 @@ Layout$1.Boolean = Boolean;
  */
 class Blob extends Layout {
     constructor(length, property) {
-        if (!(((length instanceof ExternalLayout) && length.isCount())
-            || (Number.isInteger(length) && (0 <= length)))) {
-            throw new TypeError('length must be positive integer '
-                + 'or an unsigned integer ExternalLayout');
+        if (
+            !(
+                (length instanceof ExternalLayout && length.isCount()) ||
+                (Number.isInteger(length) && 0 <= length)
+            )
+        ) {
+            throw new TypeError(
+                'length must be positive integer ' +
+                    'or an unsigned integer ExternalLayout',
+            );
         }
         let span = -1;
         if (!(length instanceof ExternalLayout)) {
@@ -3753,14 +3804,23 @@ class Blob extends Layout {
             span = src.length;
         }
         if (!(src instanceof Uint8Array && span === src.length)) {
-            throw new TypeError(nameWithProperty('Blob.encode', this)
-                + ' requires (length ' + span + ') Uint8Array as src');
+            throw new TypeError(
+                nameWithProperty('Blob.encode', this) +
+                    ' requires (length ' +
+                    span +
+                    ') Uint8Array as src',
+            );
         }
-        if ((offset + span) > b.length) {
+        if (offset + span > b.length) {
             throw new RangeError('encoding overruns Uint8Array');
         }
         const srcBuffer = uint8ArrayToBuffer(src);
-        uint8ArrayToBuffer(b).write(srcBuffer.toString('hex'), offset, span, 'hex');
+        uint8ArrayToBuffer(b).write(
+            srcBuffer.toString('hex'),
+            offset,
+            span,
+            'hex',
+        );
         if (this.length instanceof ExternalLayout) {
             this.length.encode(span, b, offset);
         }
@@ -3789,7 +3849,7 @@ class CString extends Layout {
     getSpan(b, offset = 0) {
         checkUint8Array(b);
         let idx = offset;
-        while ((idx < b.length) && (0 !== b[idx])) {
+        while (idx < b.length && 0 !== b[idx]) {
             idx += 1;
         }
         return 1 + idx - offset;
@@ -3797,7 +3857,9 @@ class CString extends Layout {
     /** @override */
     decode(b, offset = 0) {
         const span = this.getSpan(b, offset);
-        return uint8ArrayToBuffer(b).slice(offset, offset + span - 1).toString('utf-8');
+        return uint8ArrayToBuffer(b)
+            .slice(offset, offset + span - 1)
+            .toString('utf-8');
     }
     /** @override */
     encode(src, b, offset = 0) {
@@ -3809,7 +3871,7 @@ class CString extends Layout {
         }
         const srcb = buffer_1.Buffer.from(src, 'utf8');
         const span = srcb.length;
-        if ((offset + span) > b.length) {
+        if (offset + span > b.length) {
             throw new RangeError('encoding overruns Buffer');
         }
         const buffer = uint8ArrayToBuffer(b);
@@ -3840,14 +3902,13 @@ Layout$1.CString = CString;
  */
 class UTF8 extends Layout {
     constructor(maxSpan, property) {
-        if (('string' === typeof maxSpan) && (undefined === property)) {
+        if ('string' === typeof maxSpan && undefined === property) {
             property = maxSpan;
             maxSpan = undefined;
         }
         if (undefined === maxSpan) {
             maxSpan = -1;
-        }
-        else if (!Number.isInteger(maxSpan)) {
+        } else if (!Number.isInteger(maxSpan)) {
             throw new TypeError('maxSpan must be an integer');
         }
         super(-1, property);
@@ -3869,11 +3930,12 @@ class UTF8 extends Layout {
     /** @override */
     decode(b, offset = 0) {
         const span = this.getSpan(b, offset);
-        if ((0 <= this.maxSpan)
-            && (this.maxSpan < span)) {
+        if (0 <= this.maxSpan && this.maxSpan < span) {
             throw new RangeError('text length exceeds maxSpan');
         }
-        return uint8ArrayToBuffer(b).slice(offset, offset + span).toString('utf-8');
+        return uint8ArrayToBuffer(b)
+            .slice(offset, offset + span)
+            .toString('utf-8');
     }
     /** @override */
     encode(src, b, offset = 0) {
@@ -3885,11 +3947,10 @@ class UTF8 extends Layout {
         }
         const srcb = buffer_1.Buffer.from(src, 'utf8');
         const span = srcb.length;
-        if ((0 <= this.maxSpan)
-            && (this.maxSpan < span)) {
+        if (0 <= this.maxSpan && this.maxSpan < span) {
             throw new RangeError('text length exceeds maxSpan');
         }
-        if ((offset + span) > b.length) {
+        if (offset + span > b.length) {
             throw new RangeError('encoding overruns Buffer');
         }
         srcb.copy(uint8ArrayToBuffer(b), offset);
@@ -3942,115 +4003,121 @@ class Constant extends Layout {
 }
 Layout$1.Constant = Constant;
 /** Factory for {@link GreedyCount}. */
-Layout$1.greedy = ((elementSpan, property) => new GreedyCount(elementSpan, property));
+Layout$1.greedy = (elementSpan, property) =>
+    new GreedyCount(elementSpan, property);
 /** Factory for {@link OffsetLayout}. */
-Layout$1.offset = ((layout, offset, property) => new OffsetLayout(layout, offset, property));
+Layout$1.offset = (layout, offset, property) =>
+    new OffsetLayout(layout, offset, property);
 /** Factory for {@link UInt|unsigned int layouts} spanning one
  * byte. */
-var u8 = Layout$1.u8 = ((property) => new UInt(1, property));
+var u8 = (Layout$1.u8 = property => new UInt(1, property));
 /** Factory for {@link UInt|little-endian unsigned int layouts}
  * spanning two bytes. */
-Layout$1.u16 = ((property) => new UInt(2, property));
+Layout$1.u16 = property => new UInt(2, property);
 /** Factory for {@link UInt|little-endian unsigned int layouts}
  * spanning three bytes. */
-Layout$1.u24 = ((property) => new UInt(3, property));
+Layout$1.u24 = property => new UInt(3, property);
 /** Factory for {@link UInt|little-endian unsigned int layouts}
  * spanning four bytes. */
-var u32 = Layout$1.u32 = ((property) => new UInt(4, property));
+var u32 = (Layout$1.u32 = property => new UInt(4, property));
 /** Factory for {@link UInt|little-endian unsigned int layouts}
  * spanning five bytes. */
-Layout$1.u40 = ((property) => new UInt(5, property));
+Layout$1.u40 = property => new UInt(5, property);
 /** Factory for {@link UInt|little-endian unsigned int layouts}
  * spanning six bytes. */
-Layout$1.u48 = ((property) => new UInt(6, property));
+Layout$1.u48 = property => new UInt(6, property);
 /** Factory for {@link NearUInt64|little-endian unsigned int
  * layouts} interpreted as Numbers. */
-Layout$1.nu64 = ((property) => new NearUInt64(property));
+Layout$1.nu64 = property => new NearUInt64(property);
 /** Factory for {@link UInt|big-endian unsigned int layouts}
  * spanning two bytes. */
-Layout$1.u16be = ((property) => new UIntBE(2, property));
+Layout$1.u16be = property => new UIntBE(2, property);
 /** Factory for {@link UInt|big-endian unsigned int layouts}
  * spanning three bytes. */
-Layout$1.u24be = ((property) => new UIntBE(3, property));
+Layout$1.u24be = property => new UIntBE(3, property);
 /** Factory for {@link UInt|big-endian unsigned int layouts}
  * spanning four bytes. */
-Layout$1.u32be = ((property) => new UIntBE(4, property));
+Layout$1.u32be = property => new UIntBE(4, property);
 /** Factory for {@link UInt|big-endian unsigned int layouts}
  * spanning five bytes. */
-Layout$1.u40be = ((property) => new UIntBE(5, property));
+Layout$1.u40be = property => new UIntBE(5, property);
 /** Factory for {@link UInt|big-endian unsigned int layouts}
  * spanning six bytes. */
-Layout$1.u48be = ((property) => new UIntBE(6, property));
+Layout$1.u48be = property => new UIntBE(6, property);
 /** Factory for {@link NearUInt64BE|big-endian unsigned int
  * layouts} interpreted as Numbers. */
-Layout$1.nu64be = ((property) => new NearUInt64BE(property));
+Layout$1.nu64be = property => new NearUInt64BE(property);
 /** Factory for {@link Int|signed int layouts} spanning one
  * byte. */
-Layout$1.s8 = ((property) => new Int(1, property));
+Layout$1.s8 = property => new Int(1, property);
 /** Factory for {@link Int|little-endian signed int layouts}
  * spanning two bytes. */
-Layout$1.s16 = ((property) => new Int(2, property));
+Layout$1.s16 = property => new Int(2, property);
 /** Factory for {@link Int|little-endian signed int layouts}
  * spanning three bytes. */
-Layout$1.s24 = ((property) => new Int(3, property));
+Layout$1.s24 = property => new Int(3, property);
 /** Factory for {@link Int|little-endian signed int layouts}
  * spanning four bytes. */
-Layout$1.s32 = ((property) => new Int(4, property));
+Layout$1.s32 = property => new Int(4, property);
 /** Factory for {@link Int|little-endian signed int layouts}
  * spanning five bytes. */
-Layout$1.s40 = ((property) => new Int(5, property));
+Layout$1.s40 = property => new Int(5, property);
 /** Factory for {@link Int|little-endian signed int layouts}
  * spanning six bytes. */
-Layout$1.s48 = ((property) => new Int(6, property));
+Layout$1.s48 = property => new Int(6, property);
 /** Factory for {@link NearInt64|little-endian signed int layouts}
  * interpreted as Numbers. */
-Layout$1.ns64 = ((property) => new NearInt64(property));
+Layout$1.ns64 = property => new NearInt64(property);
 /** Factory for {@link Int|big-endian signed int layouts}
  * spanning two bytes. */
-Layout$1.s16be = ((property) => new IntBE(2, property));
+Layout$1.s16be = property => new IntBE(2, property);
 /** Factory for {@link Int|big-endian signed int layouts}
  * spanning three bytes. */
-Layout$1.s24be = ((property) => new IntBE(3, property));
+Layout$1.s24be = property => new IntBE(3, property);
 /** Factory for {@link Int|big-endian signed int layouts}
  * spanning four bytes. */
-Layout$1.s32be = ((property) => new IntBE(4, property));
+Layout$1.s32be = property => new IntBE(4, property);
 /** Factory for {@link Int|big-endian signed int layouts}
  * spanning five bytes. */
-Layout$1.s40be = ((property) => new IntBE(5, property));
+Layout$1.s40be = property => new IntBE(5, property);
 /** Factory for {@link Int|big-endian signed int layouts}
  * spanning six bytes. */
-Layout$1.s48be = ((property) => new IntBE(6, property));
+Layout$1.s48be = property => new IntBE(6, property);
 /** Factory for {@link NearInt64BE|big-endian signed int layouts}
  * interpreted as Numbers. */
-Layout$1.ns64be = ((property) => new NearInt64BE(property));
+Layout$1.ns64be = property => new NearInt64BE(property);
 /** Factory for {@link Float|little-endian 32-bit floating point} values. */
-Layout$1.f32 = ((property) => new Float(property));
+Layout$1.f32 = property => new Float(property);
 /** Factory for {@link FloatBE|big-endian 32-bit floating point} values. */
-Layout$1.f32be = ((property) => new FloatBE(property));
+Layout$1.f32be = property => new FloatBE(property);
 /** Factory for {@link Double|little-endian 64-bit floating point} values. */
-Layout$1.f64 = ((property) => new Double(property));
+Layout$1.f64 = property => new Double(property);
 /** Factory for {@link DoubleBE|big-endian 64-bit floating point} values. */
-Layout$1.f64be = ((property) => new DoubleBE(property));
+Layout$1.f64be = property => new DoubleBE(property);
 /** Factory for {@link Structure} values. */
-var struct = Layout$1.struct = ((fields, property, decodePrefixes) => new Structure(fields, property, decodePrefixes));
+var struct = (Layout$1.struct = (fields, property, decodePrefixes) =>
+    new Structure(fields, property, decodePrefixes));
 /** Factory for {@link BitStructure} values. */
-Layout$1.bits = ((word, msb, property) => new BitStructure(word, msb, property));
+Layout$1.bits = (word, msb, property) => new BitStructure(word, msb, property);
 /** Factory for {@link Sequence} values. */
-Layout$1.seq = ((elementLayout, count, property) => new Sequence(elementLayout, count, property));
+Layout$1.seq = (elementLayout, count, property) =>
+    new Sequence(elementLayout, count, property);
 /** Factory for {@link Union} values. */
-Layout$1.union = ((discr, defaultLayout, property) => new Union(discr, defaultLayout, property));
+Layout$1.union = (discr, defaultLayout, property) =>
+    new Union(discr, defaultLayout, property);
 /** Factory for {@link UnionLayoutDiscriminator} values. */
-Layout$1.unionLayoutDiscriminator = ((layout, property) => new UnionLayoutDiscriminator(layout, property));
+Layout$1.unionLayoutDiscriminator = (layout, property) =>
+    new UnionLayoutDiscriminator(layout, property);
 /** Factory for {@link Blob} values. */
-var blob = Layout$1.blob = ((length, property) => new Blob(length, property));
+var blob = (Layout$1.blob = (length, property) => new Blob(length, property));
 /** Factory for {@link CString} values. */
-Layout$1.cstr = ((property) => new CString(property));
+Layout$1.cstr = property => new CString(property);
 /** Factory for {@link UTF8} values. */
-Layout$1.utf8 = ((maxSpan, property) => new UTF8(maxSpan, property));
+Layout$1.utf8 = (maxSpan, property) => new UTF8(maxSpan, property);
 /** Factory for {@link Constant} values. */
-Layout$1.constant = ((value, property) => new Constant(value, property));
+Layout$1.constant = (value, property) => new Constant(value, property);
 
-const encodeDecode = (layout) => {
+const encodeDecode = layout => {
     const decode = layout.decode.bind(layout);
     const encode = layout.encode.bind(layout);
     return { decode, encode };
@@ -4058,7 +4125,7 @@ const encodeDecode = (layout) => {
 
 var browser = {};
 
-Object.defineProperty(browser, "__esModule", { value: true });
+Object.defineProperty(browser, '__esModule', { value: true });
 /**
  * Convert a little-endian buffer into a BigInt.
  * @param buf The little-endian buffer to convert
@@ -4075,7 +4142,7 @@ function toBigIntLE(buf) {
         return BigInt(`0x${hex}`);
     }
 }
-var toBigIntLE_1 = browser.toBigIntLE = toBigIntLE;
+var toBigIntLE_1 = (browser.toBigIntLE = toBigIntLE);
 /**
  * Convert a big-endian buffer into a BigInt
  * @param buf The big-endian buffer to convert.
@@ -4100,12 +4167,15 @@ browser.toBigIntBE = toBigIntBE;
 function toBufferLE(num, width) {
     {
         const hex = num.toString(16);
-        const buffer = Buffer.from(hex.padStart(width * 2, '0').slice(0, width * 2), 'hex');
+        const buffer = Buffer.from(
+            hex.padStart(width * 2, '0').slice(0, width * 2),
+            'hex',
+        );
         buffer.reverse();
         return buffer;
     }
 }
-var toBufferLE_1 = browser.toBufferLE = toBufferLE;
+var toBufferLE_1 = (browser.toBufferLE = toBufferLE);
 /**
  * Convert a BigInt to a big-endian buffer.
  * @param num   The BigInt to convert.
@@ -4115,12 +4185,15 @@ var toBufferLE_1 = browser.toBufferLE = toBufferLE;
 function toBufferBE(num, width) {
     {
         const hex = num.toString(16);
-        return Buffer.from(hex.padStart(width * 2, '0').slice(0, width * 2), 'hex');
+        return Buffer.from(
+            hex.padStart(width * 2, '0').slice(0, width * 2),
+            'hex',
+        );
     }
 }
 browser.toBufferBE = toBufferBE;
 
-const bigInt = (length) => (property) => {
+const bigInt = length => property => {
     const layout = blob(length, property);
     const { encode, decode } = encodeDecode(layout);
     const bigIntLayout = layout;
@@ -4136,7 +4209,7 @@ const bigInt = (length) => (property) => {
 };
 const u64 = bigInt(8);
 
-const bool = (property) => {
+const bool = property => {
     const layout = u8(property);
     const { encode, decode } = encodeDecode(layout);
     const boolLayout = layout;
@@ -4151,7 +4224,7 @@ const bool = (property) => {
     return boolLayout;
 };
 
-const publicKey = (property) => {
+const publicKey = property => {
     const layout = blob(32, property);
     const { encode, decode } = encodeDecode(layout);
     const publicKeyLayout = layout;
@@ -4225,71 +4298,112 @@ class TokenOwnerOffCurveError extends TokenError {
 /** Instructions defined by the program */
 var TokenInstruction;
 (function (TokenInstruction) {
-    TokenInstruction[TokenInstruction["InitializeMint"] = 0] = "InitializeMint";
-    TokenInstruction[TokenInstruction["InitializeAccount"] = 1] = "InitializeAccount";
-    TokenInstruction[TokenInstruction["InitializeMultisig"] = 2] = "InitializeMultisig";
-    TokenInstruction[TokenInstruction["Transfer"] = 3] = "Transfer";
-    TokenInstruction[TokenInstruction["Approve"] = 4] = "Approve";
-    TokenInstruction[TokenInstruction["Revoke"] = 5] = "Revoke";
-    TokenInstruction[TokenInstruction["SetAuthority"] = 6] = "SetAuthority";
-    TokenInstruction[TokenInstruction["MintTo"] = 7] = "MintTo";
-    TokenInstruction[TokenInstruction["Burn"] = 8] = "Burn";
-    TokenInstruction[TokenInstruction["CloseAccount"] = 9] = "CloseAccount";
-    TokenInstruction[TokenInstruction["FreezeAccount"] = 10] = "FreezeAccount";
-    TokenInstruction[TokenInstruction["ThawAccount"] = 11] = "ThawAccount";
-    TokenInstruction[TokenInstruction["TransferChecked"] = 12] = "TransferChecked";
-    TokenInstruction[TokenInstruction["ApproveChecked"] = 13] = "ApproveChecked";
-    TokenInstruction[TokenInstruction["MintToChecked"] = 14] = "MintToChecked";
-    TokenInstruction[TokenInstruction["BurnChecked"] = 15] = "BurnChecked";
-    TokenInstruction[TokenInstruction["InitializeAccount2"] = 16] = "InitializeAccount2";
-    TokenInstruction[TokenInstruction["SyncNative"] = 17] = "SyncNative";
-    TokenInstruction[TokenInstruction["InitializeAccount3"] = 18] = "InitializeAccount3";
-    TokenInstruction[TokenInstruction["InitializeMultisig2"] = 19] = "InitializeMultisig2";
-    TokenInstruction[TokenInstruction["InitializeMint2"] = 20] = "InitializeMint2";
-    TokenInstruction[TokenInstruction["GetAccountDataSize"] = 21] = "GetAccountDataSize";
-    TokenInstruction[TokenInstruction["InitializeImmutableOwner"] = 22] = "InitializeImmutableOwner";
-    TokenInstruction[TokenInstruction["AmountToUiAmount"] = 23] = "AmountToUiAmount";
-    TokenInstruction[TokenInstruction["UiAmountToAmount"] = 24] = "UiAmountToAmount";
-    TokenInstruction[TokenInstruction["InitializeMintCloseAuthority"] = 25] = "InitializeMintCloseAuthority";
-    TokenInstruction[TokenInstruction["TransferFeeExtension"] = 26] = "TransferFeeExtension";
-    TokenInstruction[TokenInstruction["ConfidentialTransferExtension"] = 27] = "ConfidentialTransferExtension";
-    TokenInstruction[TokenInstruction["DefaultAccountStateExtension"] = 28] = "DefaultAccountStateExtension";
-    TokenInstruction[TokenInstruction["Reallocate"] = 29] = "Reallocate";
-    TokenInstruction[TokenInstruction["MemoTransferExtension"] = 30] = "MemoTransferExtension";
-    TokenInstruction[TokenInstruction["CreateNativeMint"] = 31] = "CreateNativeMint";
-    TokenInstruction[TokenInstruction["InitializeNonTransferableMint"] = 32] = "InitializeNonTransferableMint";
-    TokenInstruction[TokenInstruction["InterestBearingMintExtension"] = 33] = "InterestBearingMintExtension";
-    TokenInstruction[TokenInstruction["CpiGuardExtension"] = 34] = "CpiGuardExtension";
-    TokenInstruction[TokenInstruction["InitializePermanentDelegate"] = 35] = "InitializePermanentDelegate";
-    TokenInstruction[TokenInstruction["TransferHookExtension"] = 36] = "TransferHookExtension";
+    TokenInstruction[(TokenInstruction['InitializeMint'] = 0)] =
+        'InitializeMint';
+    TokenInstruction[(TokenInstruction['InitializeAccount'] = 1)] =
+        'InitializeAccount';
+    TokenInstruction[(TokenInstruction['InitializeMultisig'] = 2)] =
+        'InitializeMultisig';
+    TokenInstruction[(TokenInstruction['Transfer'] = 3)] = 'Transfer';
+    TokenInstruction[(TokenInstruction['Approve'] = 4)] = 'Approve';
+    TokenInstruction[(TokenInstruction['Revoke'] = 5)] = 'Revoke';
+    TokenInstruction[(TokenInstruction['SetAuthority'] = 6)] = 'SetAuthority';
+    TokenInstruction[(TokenInstruction['MintTo'] = 7)] = 'MintTo';
+    TokenInstruction[(TokenInstruction['Burn'] = 8)] = 'Burn';
+    TokenInstruction[(TokenInstruction['CloseAccount'] = 9)] = 'CloseAccount';
+    TokenInstruction[(TokenInstruction['FreezeAccount'] = 10)] =
+        'FreezeAccount';
+    TokenInstruction[(TokenInstruction['ThawAccount'] = 11)] = 'ThawAccount';
+    TokenInstruction[(TokenInstruction['TransferChecked'] = 12)] =
+        'TransferChecked';
+    TokenInstruction[(TokenInstruction['ApproveChecked'] = 13)] =
+        'ApproveChecked';
+    TokenInstruction[(TokenInstruction['MintToChecked'] = 14)] =
+        'MintToChecked';
+    TokenInstruction[(TokenInstruction['BurnChecked'] = 15)] = 'BurnChecked';
+    TokenInstruction[(TokenInstruction['InitializeAccount2'] = 16)] =
+        'InitializeAccount2';
+    TokenInstruction[(TokenInstruction['SyncNative'] = 17)] = 'SyncNative';
+    TokenInstruction[(TokenInstruction['InitializeAccount3'] = 18)] =
+        'InitializeAccount3';
+    TokenInstruction[(TokenInstruction['InitializeMultisig2'] = 19)] =
+        'InitializeMultisig2';
+    TokenInstruction[(TokenInstruction['InitializeMint2'] = 20)] =
+        'InitializeMint2';
+    TokenInstruction[(TokenInstruction['GetAccountDataSize'] = 21)] =
+        'GetAccountDataSize';
+    TokenInstruction[(TokenInstruction['InitializeImmutableOwner'] = 22)] =
+        'InitializeImmutableOwner';
+    TokenInstruction[(TokenInstruction['AmountToUiAmount'] = 23)] =
+        'AmountToUiAmount';
+    TokenInstruction[(TokenInstruction['UiAmountToAmount'] = 24)] =
+        'UiAmountToAmount';
+    TokenInstruction[(TokenInstruction['InitializeMintCloseAuthority'] = 25)] =
+        'InitializeMintCloseAuthority';
+    TokenInstruction[(TokenInstruction['TransferFeeExtension'] = 26)] =
+        'TransferFeeExtension';
+    TokenInstruction[(TokenInstruction['ConfidentialTransferExtension'] = 27)] =
+        'ConfidentialTransferExtension';
+    TokenInstruction[(TokenInstruction['DefaultAccountStateExtension'] = 28)] =
+        'DefaultAccountStateExtension';
+    TokenInstruction[(TokenInstruction['Reallocate'] = 29)] = 'Reallocate';
+    TokenInstruction[(TokenInstruction['MemoTransferExtension'] = 30)] =
+        'MemoTransferExtension';
+    TokenInstruction[(TokenInstruction['CreateNativeMint'] = 31)] =
+        'CreateNativeMint';
+    TokenInstruction[(TokenInstruction['InitializeNonTransferableMint'] = 32)] =
+        'InitializeNonTransferableMint';
+    TokenInstruction[(TokenInstruction['InterestBearingMintExtension'] = 33)] =
+        'InterestBearingMintExtension';
+    TokenInstruction[(TokenInstruction['CpiGuardExtension'] = 34)] =
+        'CpiGuardExtension';
+    TokenInstruction[(TokenInstruction['InitializePermanentDelegate'] = 35)] =
+        'InitializePermanentDelegate';
+    TokenInstruction[(TokenInstruction['TransferHookExtension'] = 36)] =
+        'TransferHookExtension';
     // ConfidentialTransferFeeExtension = 37,
     // WithdrawalExcessLamports = 38,
-    TokenInstruction[TokenInstruction["MetadataPointerExtension"] = 39] = "MetadataPointerExtension";
+    TokenInstruction[(TokenInstruction['MetadataPointerExtension'] = 39)] =
+        'MetadataPointerExtension';
+    TokenInstruction[(TokenInstruction['GroupPointerExtension'] = 40)] =
+        'GroupPointerExtension';
+    TokenInstruction[(TokenInstruction['GroupMemberPointerExtension'] = 41)] =
+        'GroupMemberPointerExtension';
 })(TokenInstruction || (TokenInstruction = {}));
 
 /** @internal */
 function addSigners(keys, ownerOrAuthority, multiSigners) {
     if (multiSigners.length) {
-        keys.push({ pubkey: ownerOrAuthority, isSigner: false, isWritable: false });
+        keys.push({
+            pubkey: ownerOrAuthority,
+            isSigner: false,
+            isWritable: false,
+        });
         for (const signer of multiSigners) {
             keys.push({
-                pubkey: signer instanceof web3_js.PublicKey ? signer : signer.publicKey,
+                pubkey:
+                    signer instanceof web3_js.PublicKey
+                        ? signer
+                        : signer.publicKey,
                 isSigner: true,
                 isWritable: false,
             });
         }
-    }
-    else {
-        keys.push({ pubkey: ownerOrAuthority, isSigner: true, isWritable: false });
+    } else {
+        keys.push({
+            pubkey: ownerOrAuthority,
+            isSigner: true,
+            isWritable: false,
+        });
     }
     return keys;
 }
 
 var AccountType;
 (function (AccountType) {
-    AccountType[AccountType["Uninitialized"] = 0] = "Uninitialized";
-    AccountType[AccountType["Mint"] = 1] = "Mint";
-    AccountType[AccountType["Account"] = 2] = "Account";
+    AccountType[(AccountType['Uninitialized'] = 0)] = 'Uninitialized';
+    AccountType[(AccountType['Mint'] = 1)] = 'Mint';
+    AccountType[(AccountType['Account'] = 2)] = 'Account';
 })(AccountType || (AccountType = {}));
 const ACCOUNT_TYPE_SIZE = 1;
 
@@ -4316,9 +4430,9 @@ const MULTISIG_SIZE = MultisigLayout.span;
 /** Token account state as stored by the program */
 var AccountState;
 (function (AccountState) {
-    AccountState[AccountState["Uninitialized"] = 0] = "Uninitialized";
-    AccountState[AccountState["Initialized"] = 1] = "Initialized";
-    AccountState[AccountState["Frozen"] = 2] = "Frozen";
+    AccountState[(AccountState['Uninitialized'] = 0)] = 'Uninitialized';
+    AccountState[(AccountState['Initialized'] = 1)] = 'Initialized';
+    AccountState[(AccountState['Frozen'] = 2)] = 'Frozen';
 })(AccountState || (AccountState = {}));
 /** Buffer layout for de/serializing a token account */
 const AccountLayout = struct([
@@ -4346,7 +4460,12 @@ const ACCOUNT_SIZE = AccountLayout.span;
  *
  * @return Token account information
  */
-async function getAccount(connection, address, commitment, programId = TOKEN_PROGRAM_ID) {
+async function getAccount(
+    connection,
+    address,
+    commitment,
+    programId = TOKEN_PROGRAM_ID,
+) {
     const info = await connection.getAccountInfo(address, commitment);
     return unpackAccount(address, info, programId);
 }
@@ -4360,8 +4479,7 @@ async function getAccount(connection, address, commitment, programId = TOKEN_PRO
  * @return Unpacked token account
  */
 function unpackAccount(address, info, programId = TOKEN_PROGRAM_ID) {
-    if (!info)
-        throw new TokenAccountNotFoundError();
+    if (!info) throw new TokenAccountNotFoundError();
     if (!info.owner.equals(programId))
         throw new TokenInvalidAccountOwnerError();
     if (info.data.length < ACCOUNT_SIZE)
@@ -4385,8 +4503,12 @@ function unpackAccount(address, info, programId = TOKEN_PROGRAM_ID) {
         isInitialized: rawAccount.state !== AccountState.Uninitialized,
         isFrozen: rawAccount.state === AccountState.Frozen,
         isNative: !!rawAccount.isNativeOption,
-        rentExemptReserve: rawAccount.isNativeOption ? rawAccount.isNative : null,
-        closeAuthority: rawAccount.closeAuthorityOption ? rawAccount.closeAuthority : null,
+        rentExemptReserve: rawAccount.isNativeOption
+            ? rawAccount.isNative
+            : null,
+        closeAuthority: rawAccount.closeAuthorityOption
+            ? rawAccount.closeAuthority
+            : null,
         tlvData,
     };
 }
@@ -4414,13 +4536,53 @@ const MINT_SIZE = MintLayout.span;
  *
  * @return Address of the associated token account
  */
-function getAssociatedTokenAddressSync(mint, owner, allowOwnerOffCurve = false, programId = TOKEN_PROGRAM_ID, associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
+function getAssociatedTokenAddressSync(
+    mint,
+    owner,
+    allowOwnerOffCurve = false,
+    programId = TOKEN_PROGRAM_ID,
+    associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID,
+) {
     if (!allowOwnerOffCurve && !web3_js.PublicKey.isOnCurve(owner.toBuffer()))
         throw new TokenOwnerOffCurveError();
-    const [address] = web3_js.PublicKey.findProgramAddressSync([owner.toBuffer(), programId.toBuffer(), mint.toBuffer()], associatedTokenProgramId);
+    const [address] = web3_js.PublicKey.findProgramAddressSync(
+        [owner.toBuffer(), programId.toBuffer(), mint.toBuffer()],
+        associatedTokenProgramId,
+    );
     return address;
 }
 
+class COptionPublicKeyLayout extends Layout_2 {
+    constructor(property) {
+        super(-1, property);
+        this.publicKeyLayout = publicKey();
+    }
+    decode(buffer, offset = 0) {
+        const option = buffer[offset];
+        if (option === 0) {
+            return null;
+        }
+        return this.publicKeyLayout.decode(buffer, offset + 1);
+    }
+    encode(src, buffer, offset = 0) {
+        if (src === null) {
+            buffer[offset] = 0;
+            return 1;
+        } else {
+            buffer[offset] = 1;
+            this.publicKeyLayout.encode(src, buffer, offset + 1);
+            return 33;
+        }
+    }
+    getSpan(buffer, offset = 0) {
+        if (buffer) {
+            const option = buffer[offset];
+            return option === 0 ? 1 : 1 + this.publicKeyLayout.span;
+        }
+        return 1 + this.publicKeyLayout.span;
+    }
+}
+
 /**
  * Construct a CreateAssociatedTokenAccount instruction
  *
@@ -4433,16 +4595,43 @@ function getAssociatedTokenAddressSync(mint, owner, allowOwnerOffCurve = false,
  *
  * @return Instruction to add to a transaction
  */
-function createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, programId = TOKEN_PROGRAM_ID, associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
-    return buildAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, Buffer.alloc(0), programId, associatedTokenProgramId);
+function createAssociatedTokenAccountInstruction(
+    payer,
+    associatedToken,
+    owner,
+    mint,
+    programId = TOKEN_PROGRAM_ID,
+    associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID,
+) {
+    return buildAssociatedTokenAccountInstruction(
+        payer,
+        associatedToken,
+        owner,
+        mint,
+        Buffer.alloc(0),
+        programId,
+        associatedTokenProgramId,
+    );
 }
-function buildAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, instructionData, programId = TOKEN_PROGRAM_ID, associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
+function buildAssociatedTokenAccountInstruction(
+    payer,
+    associatedToken,
+    owner,
+    mint,
+    instructionData,
+    programId = TOKEN_PROGRAM_ID,
+    associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID,
+) {
     const keys = [
         { pubkey: payer, isSigner: true, isWritable: true },
         { pubkey: associatedToken, isSigner: false, isWritable: true },
         { pubkey: owner, isSigner: false, isWritable: false },
         { pubkey: mint, isSigner: false, isWritable: false },
-        { pubkey: web3_js.SystemProgram.programId, isSigner: false, isWritable: false },
+        {
+            pubkey: web3_js.SystemProgram.programId,
+            isSigner: false,
+            isWritable: false,
+        },
         { pubkey: programId, isSigner: false, isWritable: false },
     ];
     return new web3_js.TransactionInstruction({
@@ -4457,8 +4646,7 @@ const initializeMint2InstructionData = struct([
     u8('instruction'),
     u8('decimals'),
     publicKey('mintAuthority'),
-    u8('freezeAuthorityOption'),
-    publicKey('freezeAuthority'),
+    new COptionPublicKeyLayout('freezeAuthority'),
 ]);
 /**
  * Construct an InitializeMint2 instruction
@@ -4471,16 +4659,24 @@ const initializeMint2InstructionData = struct([
  *
  * @return Instruction to add to a transaction
  */
-function createInitializeMint2Instruction(mint, decimals, mintAuthority, freezeAuthority, programId = TOKEN_PROGRAM_ID) {
+function createInitializeMint2Instruction(
+    mint,
+    decimals,
+    mintAuthority,
+    freezeAuthority,
+    programId = TOKEN_PROGRAM_ID,
+) {
     const keys = [{ pubkey: mint, isSigner: false, isWritable: true }];
     const data = Buffer.alloc(initializeMint2InstructionData.span);
-    initializeMint2InstructionData.encode({
-        instruction: TokenInstruction.InitializeMint2,
-        decimals,
-        mintAuthority,
-        freezeAuthorityOption: freezeAuthority ? 1 : 0,
-        freezeAuthority: freezeAuthority || new web3_js.PublicKey(0),
-    }, data);
+    initializeMint2InstructionData.encode(
+        {
+            instruction: TokenInstruction.InitializeMint2,
+            decimals,
+            mintAuthority,
+            freezeAuthority,
+        },
+        data,
+    );
     return new web3_js.TransactionInstruction({ keys, programId, data });
 }
 
@@ -4499,39 +4695,77 @@ function createInitializeMint2Instruction(mint, decimals, mintAuthority, freezeA
  *
  * @return Address of the new associated token account
  */
-async function getOrCreateAssociatedTokenAccount(connection, payer, mint, owner, allowOwnerOffCurve = false, commitment, confirmOptions, programId = TOKEN_PROGRAM_ID, associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID) {
-    const associatedToken = getAssociatedTokenAddressSync(mint, owner, allowOwnerOffCurve, programId, associatedTokenProgramId);
+async function getOrCreateAssociatedTokenAccount(
+    connection,
+    payer,
+    mint,
+    owner,
+    allowOwnerOffCurve = false,
+    commitment,
+    confirmOptions,
+    programId = TOKEN_PROGRAM_ID,
+    associatedTokenProgramId = ASSOCIATED_TOKEN_PROGRAM_ID,
+) {
+    const associatedToken = getAssociatedTokenAddressSync(
+        mint,
+        owner,
+        allowOwnerOffCurve,
+        programId,
+        associatedTokenProgramId,
+    );
     // This is the optimal logic, considering TX fee, client-side computation, RPC roundtrips and guaranteed idempotent.
     // Sadly we can't do this atomically.
     let account;
     try {
-        account = await getAccount(connection, associatedToken, commitment, programId);
-    }
-    catch (error) {
+        account = await getAccount(
+            connection,
+            associatedToken,
+            commitment,
+            programId,
+        );
+    } catch (error) {
         // TokenAccountNotFoundError can be possible if the associated address has already received some lamports,
         // becoming a system account. Assuming program derived addressing is safe, this is the only case for the
         // TokenInvalidAccountOwnerError in this code path.
-        if (error instanceof TokenAccountNotFoundError || error instanceof TokenInvalidAccountOwnerError) {
+        if (
+            error instanceof TokenAccountNotFoundError ||
+            error instanceof TokenInvalidAccountOwnerError
+        ) {
             // As this isn't atomic, it's possible others can create associated accounts meanwhile.
             try {
-                const transaction = new web3_js.Transaction().add(createAssociatedTokenAccountInstruction(payer.publicKey, associatedToken, owner, mint, programId, associatedTokenProgramId));
-                await web3_js.sendAndConfirmTransaction(connection, transaction, [payer], confirmOptions);
-            }
-            catch (error) {
+                const transaction = new web3_js.Transaction().add(
+                    createAssociatedTokenAccountInstruction(
+                        payer.publicKey,
+                        associatedToken,
+                        owner,
+                        mint,
+                        programId,
+                        associatedTokenProgramId,
+                    ),
+                );
+                await web3_js.sendAndConfirmTransaction(
+                    connection,
+                    transaction,
+                    [payer],
+                    confirmOptions,
+                );
+            } catch (error) {
                 // Ignore all errors; for now there is no API-compatible way to selectively ignore the expected
                 // instruction error if the associated account exists already.
             }
             // Now this should always succeed
-            account = await getAccount(connection, associatedToken, commitment, programId);
-        }
-        else {
+            account = await getAccount(
+                connection,
+                associatedToken,
+                commitment,
+                programId,
+            );
+        } else {
             throw error;
         }
     }
-    if (!account.mint.equals(mint))
-        throw new TokenInvalidMintError();
-    if (!account.owner.equals(owner))
-        throw new TokenInvalidOwnerError();
+    if (!account.mint.equals(mint)) throw new TokenInvalidMintError();
+    if (!account.owner.equals(owner)) throw new TokenInvalidOwnerError();
     return account;
 }
 
@@ -4549,29 +4783,46 @@ const mintToInstructionData = struct([u8('instruction'), u64('amount')]);
  *
  * @return Instruction to add to a transaction
  */
-function createMintToInstruction(mint, destination, authority, amount, multiSigners = [], programId = TOKEN_PROGRAM_ID) {
-    const keys = addSigners([
-        { pubkey: mint, isSigner: false, isWritable: true },
-        { pubkey: destination, isSigner: false, isWritable: true },
-    ], authority, multiSigners);
+function createMintToInstruction(
+    mint,
+    destination,
+    authority,
+    amount,
+    multiSigners = [],
+    programId = TOKEN_PROGRAM_ID,
+) {
+    const keys = addSigners(
+        [
+            { pubkey: mint, isSigner: false, isWritable: true },
+            { pubkey: destination, isSigner: false, isWritable: true },
+        ],
+        authority,
+        multiSigners,
+    );
     const data = Buffer.alloc(mintToInstructionData.span);
-    mintToInstructionData.encode({
-        instruction: TokenInstruction.MintTo,
-        amount: BigInt(amount),
-    }, data);
+    mintToInstructionData.encode(
+        {
+            instruction: TokenInstruction.MintTo,
+            amount: BigInt(amount),
+        },
+        data,
+    );
     return new web3_js.TransactionInstruction({ keys, programId, data });
 }
 
 /**
  * Sum up the token amounts of the compressed token accounts
  */
-const sumUpTokenAmount = (accounts) => {
-    return accounts.reduce((acc, account) => acc.add(account.parsed.amount), stateless_js.bn(0));
+const sumUpTokenAmount = accounts => {
+    return accounts.reduce(
+        (acc, account) => acc.add(account.parsed.amount),
+        stateless_js.bn(0),
+    );
 };
 /**
  * Validate that all the compressed token accounts are owned by the same owner.
  */
-const validateSameTokenOwner = (accounts) => {
+const validateSameTokenOwner = accounts => {
     const owner = accounts[0].parsed.owner;
     accounts.forEach(acc => {
         if (!acc.parsed.owner.equals(owner)) {
@@ -4582,7 +4833,7 @@ const validateSameTokenOwner = (accounts) => {
 /**
  * Parse compressed token accounts to get the mint, current owner and delegate.
  */
-const parseTokenData = (compressedTokenAccounts) => {
+const parseTokenData = compressedTokenAccounts => {
     const mint = compressedTokenAccounts[0].parsed.mint;
     const currentOwner = compressedTokenAccounts[0].parsed.owner;
     const delegate = compressedTokenAccounts[0].parsed.delegate;
@@ -4596,13 +4847,22 @@ const parseTokenData = (compressedTokenAccounts) => {
  * @returns                             Output token data for the transfer
  *                                      instruction
  */
-function createTransferOutputState(inputCompressedTokenAccounts, toAddress, amount) {
+function createTransferOutputState(
+    inputCompressedTokenAccounts,
+    toAddress,
+    amount,
+) {
     amount = stateless_js.bn(amount);
     const inputAmount = sumUpTokenAmount(inputCompressedTokenAccounts);
-    const inputLamports = stateless_js.sumUpLamports(inputCompressedTokenAccounts.map(acc => acc.compressedAccount));
+    const inputLamports = stateless_js.sumUpLamports(
+        inputCompressedTokenAccounts.map(acc => acc.compressedAccount),
+    );
     const changeAmount = inputAmount.sub(amount);
     stateless_js.validateSufficientBalance(changeAmount);
-    if (changeAmount.eq(stateless_js.bn(0)) && inputLamports.eq(stateless_js.bn(0))) {
+    if (
+        changeAmount.eq(stateless_js.bn(0)) &&
+        inputLamports.eq(stateless_js.bn(0))
+    ) {
         return [
             {
                 owner: toAddress,
@@ -4613,7 +4873,9 @@ function createTransferOutputState(inputCompressedTokenAccounts, toAddress, amou
         ];
     }
     /// validates token program
-    stateless_js.validateSameOwner(inputCompressedTokenAccounts.map(acc => acc.compressedAccount));
+    stateless_js.validateSameOwner(
+        inputCompressedTokenAccounts.map(acc => acc.compressedAccount),
+    );
     validateSameTokenOwner(inputCompressedTokenAccounts);
     const outputCompressedAccounts = [
         {
@@ -4640,15 +4902,22 @@ function createTransferOutputState(inputCompressedTokenAccounts, toAddress, amou
  */
 function createDecompressOutputState(inputCompressedTokenAccounts, amount) {
     amount = stateless_js.bn(amount);
-    const inputLamports = stateless_js.sumUpLamports(inputCompressedTokenAccounts.map(acc => acc.compressedAccount));
+    const inputLamports = stateless_js.sumUpLamports(
+        inputCompressedTokenAccounts.map(acc => acc.compressedAccount),
+    );
     const inputAmount = sumUpTokenAmount(inputCompressedTokenAccounts);
     const changeAmount = inputAmount.sub(amount);
     stateless_js.validateSufficientBalance(changeAmount);
     /// lamports gets decompressed
-    if (changeAmount.eq(stateless_js.bn(0)) && inputLamports.eq(stateless_js.bn(0))) {
+    if (
+        changeAmount.eq(stateless_js.bn(0)) &&
+        inputLamports.eq(stateless_js.bn(0))
+    ) {
         return [];
     }
-    stateless_js.validateSameOwner(inputCompressedTokenAccounts.map(acc => acc.compressedAccount));
+    stateless_js.validateSameOwner(
+        inputCompressedTokenAccounts.map(acc => acc.compressedAccount),
+    );
     validateSameTokenOwner(inputCompressedTokenAccounts);
     const tokenTransferOutputs = [
         {
@@ -4664,7 +4933,7 @@ class CompressedTokenProgram {
     /**
      * @internal
      */
-    constructor() { }
+    constructor() {}
     /** @internal */
     static get program() {
         if (!this._program) {
@@ -4682,21 +4951,38 @@ class CompressedTokenProgram {
             /// program only for serde and building instructions, not for
             /// interacting with the network.
             const mockKeypair = web3_js.Keypair.generate();
-            const mockConnection = new web3_js.Connection('http://127.0.0.1:8899', 'confirmed');
-            const mockProvider = new anchor.AnchorProvider(mockConnection, stateless_js.useWallet(mockKeypair), stateless_js.confirmConfig);
+            const mockConnection = new web3_js.Connection(
+                'http://127.0.0.1:8899',
+                'confirmed',
+            );
+            const mockProvider = new anchor.AnchorProvider(
+                mockConnection,
+                stateless_js.useWallet(mockKeypair),
+                stateless_js.confirmConfig,
+            );
             anchor.setProvider(mockProvider);
-            this._program = new anchor.Program(IDL, this.programId, mockProvider);
+            this._program = new anchor.Program(
+                IDL,
+                this.programId,
+                mockProvider,
+            );
         }
     }
     /** @internal */
     static deriveTokenPoolPda(mint) {
         const seeds = [POOL_SEED, mint.toBuffer()];
-        const [address, _] = web3_js.PublicKey.findProgramAddressSync(seeds, this.programId);
+        const [address, _] = web3_js.PublicKey.findProgramAddressSync(
+            seeds,
+            this.programId,
+        );
         return address;
     }
     /** @internal */
     static get deriveCpiAuthorityPda() {
-        const [address, _] = web3_js.PublicKey.findProgramAddressSync([CPI_AUTHORITY_SEED], this.programId);
+        const [address, _] = web3_js.PublicKey.findProgramAddressSync(
+            [CPI_AUTHORITY_SEED],
+            this.programId,
+        );
         return address;
     }
     /**
@@ -4705,14 +4991,21 @@ class CompressedTokenProgram {
     static async createMint(params) {
         const { mint, authority, feePayer, rentExemptBalance } = params;
         /// Create and initialize SPL Mint account
-        const createMintAccountInstruction = web3_js.SystemProgram.createAccount({
-            fromPubkey: feePayer,
-            lamports: rentExemptBalance,
-            newAccountPubkey: mint,
-            programId: TOKEN_PROGRAM_ID,
-            space: MINT_SIZE,
-        });
-        const initializeMintInstruction = createInitializeMint2Instruction(mint, params.decimals, authority, params.freezeAuthority, TOKEN_PROGRAM_ID);
+        const createMintAccountInstruction =
+            web3_js.SystemProgram.createAccount({
+                fromPubkey: feePayer,
+                lamports: rentExemptBalance,
+                newAccountPubkey: mint,
+                programId: TOKEN_PROGRAM_ID,
+                space: MINT_SIZE,
+            });
+        const initializeMintInstruction = createInitializeMint2Instruction(
+            mint,
+            params.decimals,
+            authority,
+            params.freezeAuthority,
+            TOKEN_PROGRAM_ID,
+        );
         const ix = await this.createTokenPool({
             feePayer,
             mint,
@@ -4729,13 +5022,13 @@ class CompressedTokenProgram {
         const ix = await this.program.methods
             .createTokenPool()
             .accounts({
-            mint,
-            feePayer,
-            tokenPoolPda,
-            systemProgram: web3_js.SystemProgram.programId,
-            tokenProgram: TOKEN_PROGRAM_ID,
-            cpiAuthorityPda: this.deriveCpiAuthorityPda,
-        })
+                mint,
+                feePayer,
+                tokenPoolPda,
+                systemProgram: web3_js.SystemProgram.programId,
+                tokenProgram: TOKEN_PROGRAM_ID,
+                cpiAuthorityPda: this.deriveCpiAuthorityPda,
+            })
             .instruction();
         return ix;
     }
@@ -4744,31 +5037,41 @@ class CompressedTokenProgram {
      */
     static async mintTo(params) {
         const systemKeys = stateless_js.defaultStaticAccountsStruct();
-        const { mint, feePayer, authority, merkleTree, toPubkey, amount } = params;
+        const { mint, feePayer, authority, merkleTree, toPubkey, amount } =
+            params;
         const tokenPoolPda = this.deriveTokenPoolPda(mint);
-        const amounts = stateless_js.toArray(amount).map(amount => stateless_js.bn(amount));
+        const amounts = stateless_js
+            .toArray(amount)
+            .map(amount => stateless_js.bn(amount));
         const toPubkeys = stateless_js.toArray(toPubkey);
         if (amounts.length !== toPubkeys.length) {
-            throw new Error('Amount and toPubkey arrays must have the same length');
+            throw new Error(
+                'Amount and toPubkey arrays must have the same length',
+            );
         }
         const instruction = await this.program.methods
             .mintTo(toPubkeys, amounts, null)
             .accounts({
-            feePayer,
-            authority,
-            cpiAuthorityPda: this.deriveCpiAuthorityPda,
-            mint,
-            tokenPoolPda,
-            tokenProgram: TOKEN_PROGRAM_ID,
-            lightSystemProgram: stateless_js.LightSystemProgram.programId,
-            registeredProgramPda: systemKeys.registeredProgramPda,
-            noopProgram: systemKeys.noopProgram,
-            accountCompressionAuthority: systemKeys.accountCompressionAuthority,
-            accountCompressionProgram: systemKeys.accountCompressionProgram,
-            merkleTree: merkleTree !== null && merkleTree !== void 0 ? merkleTree : stateless_js.defaultTestStateTreeAccounts().merkleTree,
-            selfProgram: this.programId,
-            solPoolPda: null,
-        })
+                feePayer,
+                authority,
+                cpiAuthorityPda: this.deriveCpiAuthorityPda,
+                mint,
+                tokenPoolPda,
+                tokenProgram: TOKEN_PROGRAM_ID,
+                lightSystemProgram: stateless_js.LightSystemProgram.programId,
+                registeredProgramPda: systemKeys.registeredProgramPda,
+                noopProgram: systemKeys.noopProgram,
+                accountCompressionAuthority:
+                    systemKeys.accountCompressionAuthority,
+                accountCompressionProgram: systemKeys.accountCompressionProgram,
+                merkleTree:
+                    merkleTree !== null && merkleTree !== void 0
+                        ? merkleTree
+                        : stateless_js.defaultTestStateTreeAccounts()
+                              .merkleTree,
+                selfProgram: this.programId,
+                solPoolPda: null,
+            })
             .instruction();
         return instruction;
     }
@@ -4777,10 +5080,22 @@ class CompressedTokenProgram {
      * Mint tokens from registed SPL mint account to a compressed account
      */
     static async approveAndMintTo(params) {
-        const { mint, feePayer, authorityTokenAccount, authority, merkleTree, toPubkey, } = params;
+        const {
+            mint,
+            feePayer,
+            authorityTokenAccount,
+            authority,
+            merkleTree,
+            toPubkey,
+        } = params;
         const amount = BigInt(params.amount.toString());
         /// 1. Mint to existing ATA of mintAuthority.
-        const splMintToInstruction = createMintToInstruction(mint, authorityTokenAccount, authority, amount);
+        const splMintToInstruction = createMintToInstruction(
+            mint,
+            authorityTokenAccount,
+            authority,
+            amount,
+        );
         /// 2. Compress from mint authority ATA to recipient compressed account
         const compressInstruction = await this.compress({
             payer: feePayer,
@@ -4797,15 +5112,33 @@ class CompressedTokenProgram {
      * Construct transfer instruction for compressed tokens
      */
     static async transfer(params) {
-        const { payer, inputCompressedTokenAccounts, recentInputStateRootIndices, recentValidityProof, amount, outputStateTrees, toAddress, } = params;
-        const tokenTransferOutputs = createTransferOutputState(inputCompressedTokenAccounts, toAddress, amount);
-        const { inputTokenDataWithContext, packedOutputTokenData, remainingAccountMetas, } = packCompressedTokenAccounts({
+        const {
+            payer,
+            inputCompressedTokenAccounts,
+            recentInputStateRootIndices,
+            recentValidityProof,
+            amount,
+            outputStateTrees,
+            toAddress,
+        } = params;
+        const tokenTransferOutputs = createTransferOutputState(
+            inputCompressedTokenAccounts,
+            toAddress,
+            amount,
+        );
+        const {
+            inputTokenDataWithContext,
+            packedOutputTokenData,
+            remainingAccountMetas,
+        } = packCompressedTokenAccounts({
             inputCompressedTokenAccounts,
             outputStateTrees,
             rootIndices: recentInputStateRootIndices,
             tokenTransferOutputs,
         });
-        const { mint, currentOwner } = parseTokenData(inputCompressedTokenAccounts);
+        const { mint, currentOwner } = parseTokenData(
+            inputCompressedTokenAccounts,
+        );
         const data = {
             proof: recentValidityProof,
             mint,
@@ -4817,24 +5150,32 @@ class CompressedTokenProgram {
             cpiContext: null,
             lamportsChangeAccountMerkleTreeIndex: null,
         };
-        const encodedData = this.program.coder.types.encode('CompressedTokenInstructionDataTransfer', data);
-        const { accountCompressionAuthority, noopProgram, registeredProgramPda, accountCompressionProgram, } = stateless_js.defaultStaticAccountsStruct();
+        const encodedData = this.program.coder.types.encode(
+            'CompressedTokenInstructionDataTransfer',
+            data,
+        );
+        const {
+            accountCompressionAuthority,
+            noopProgram,
+            registeredProgramPda,
+            accountCompressionProgram,
+        } = stateless_js.defaultStaticAccountsStruct();
         const instruction = await this.program.methods
             .transfer(encodedData)
             .accounts({
-            feePayer: payer,
-            authority: currentOwner,
-            cpiAuthorityPda: this.deriveCpiAuthorityPda,
-            lightSystemProgram: stateless_js.LightSystemProgram.programId,
-            registeredProgramPda: registeredProgramPda,
-            noopProgram: noopProgram,
-            accountCompressionAuthority: accountCompressionAuthority,
-            accountCompressionProgram: accountCompressionProgram,
-            selfProgram: this.programId,
-            tokenPoolPda: null,
-            compressOrDecompressTokenAccount: null,
-            tokenProgram: null,
-        })
+                feePayer: payer,
+                authority: currentOwner,
+                cpiAuthorityPda: this.deriveCpiAuthorityPda,
+                lightSystemProgram: stateless_js.LightSystemProgram.programId,
+                registeredProgramPda: registeredProgramPda,
+                noopProgram: noopProgram,
+                accountCompressionAuthority: accountCompressionAuthority,
+                accountCompressionProgram: accountCompressionProgram,
+                selfProgram: this.programId,
+                tokenPoolPda: null,
+                compressOrDecompressTokenAccount: null,
+                tokenProgram: null,
+            })
             .remainingAccounts(remainingAccountMetas)
             .instruction();
         return instruction;
@@ -4843,12 +5184,14 @@ class CompressedTokenProgram {
      * Create lookup table instructions for the token program's default accounts.
      */
     static async createTokenProgramLookupTable(params) {
-        const { authority, mints, recentSlot, payer, remainingAccounts } = params;
-        const [createInstruction, lookupTableAddress] = web3_js.AddressLookupTableProgram.createLookupTable({
-            authority,
-            payer: authority,
-            recentSlot,
-        });
+        const { authority, mints, recentSlot, payer, remainingAccounts } =
+            params;
+        const [createInstruction, lookupTableAddress] =
+            web3_js.AddressLookupTableProgram.createLookupTable({
+                authority,
+                payer: authority,
+                recentSlot,
+            });
         let optionalMintKeys = [];
         if (mints) {
             optionalMintKeys = [
@@ -4856,31 +5199,35 @@ class CompressedTokenProgram {
                 ...mints.map(mint => this.deriveTokenPoolPda(mint)),
             ];
         }
-        const extendInstruction = web3_js.AddressLookupTableProgram.extendLookupTable({
-            payer,
-            authority,
-            lookupTable: lookupTableAddress,
-            addresses: [
-                this.deriveCpiAuthorityPda,
-                stateless_js.LightSystemProgram.programId,
-                stateless_js.defaultStaticAccountsStruct().registeredProgramPda,
-                stateless_js.defaultStaticAccountsStruct().noopProgram,
-                stateless_js.defaultStaticAccountsStruct().accountCompressionAuthority,
-                stateless_js.defaultStaticAccountsStruct().accountCompressionProgram,
-                stateless_js.defaultTestStateTreeAccounts().merkleTree,
-                stateless_js.defaultTestStateTreeAccounts().nullifierQueue,
-                stateless_js.defaultTestStateTreeAccounts().addressTree,
-                stateless_js.defaultTestStateTreeAccounts().addressQueue,
-                this.programId,
-                TOKEN_PROGRAM_ID,
-                web3_js.SystemProgram.programId,
-                web3_js.ComputeBudgetProgram.programId,
-                ASSOCIATED_TOKEN_PROGRAM_ID,
+        const extendInstruction =
+            web3_js.AddressLookupTableProgram.extendLookupTable({
+                payer,
                 authority,
-                ...optionalMintKeys,
-                ...(remainingAccounts !== null && remainingAccounts !== void 0 ? remainingAccounts : []),
-            ],
-        });
+                lookupTable: lookupTableAddress,
+                addresses: [
+                    this.deriveCpiAuthorityPda,
+                    stateless_js.LightSystemProgram.programId,
+                    stateless_js.defaultStaticAccountsStruct()
+                        .registeredProgramPda,
+                    stateless_js.defaultStaticAccountsStruct().noopProgram,
+                    stateless_js.defaultStaticAccountsStruct()
+                        .accountCompressionAuthority,
+                    stateless_js.defaultStaticAccountsStruct()
+                        .accountCompressionProgram,
+                    stateless_js.defaultTestStateTreeAccounts().merkleTree,
+                    stateless_js.defaultTestStateTreeAccounts().nullifierQueue,
+                    stateless_js.defaultTestStateTreeAccounts().addressTree,
+                    stateless_js.defaultTestStateTreeAccounts().addressQueue,
+                    this.programId,
+                    TOKEN_PROGRAM_ID,
+                    authority,
+                    ...optionalMintKeys,
+                    ...(remainingAccounts !== null &&
+                    remainingAccounts !== void 0
+                        ? remainingAccounts
+                        : []),
+                ],
+            });
         return {
             instructions: [createInstruction, extendInstruction],
             address: lookupTableAddress,
@@ -4891,14 +5238,19 @@ class CompressedTokenProgram {
      * @returns compressInstruction
      */
     static async compress(params) {
-        const { payer, owner, source, toAddress, mint, outputStateTree } = params;
+        const { payer, owner, source, toAddress, mint, outputStateTree } =
+            params;
         if (Array.isArray(params.amount) !== Array.isArray(params.toAddress)) {
-            throw new Error('Both amount and toAddress must be arrays or both must be single values');
+            throw new Error(
+                'Both amount and toAddress must be arrays or both must be single values',
+            );
         }
         let tokenTransferOutputs;
         if (Array.isArray(params.amount) && Array.isArray(params.toAddress)) {
             if (params.amount.length !== params.toAddress.length) {
-                throw new Error('Amount and toAddress arrays must have the same length');
+                throw new Error(
+                    'Amount and toAddress arrays must have the same length',
+                );
             }
             tokenTransferOutputs = params.amount.map((amt, index) => {
                 const amount = stateless_js.bn(amt);
@@ -4909,8 +5261,7 @@ class CompressedTokenProgram {
                     tlv: null,
                 };
             });
-        }
-        else {
+        } else {
             tokenTransferOutputs = [
                 {
                     owner: toAddress,
@@ -4920,7 +5271,11 @@ class CompressedTokenProgram {
                 },
             ];
         }
-        const { inputTokenDataWithContext, packedOutputTokenData, remainingAccountMetas, } = packCompressedTokenAccounts({
+        const {
+            inputTokenDataWithContext,
+            packedOutputTokenData,
+            remainingAccountMetas,
+        } = packCompressedTokenAccounts({
             inputCompressedTokenAccounts: [],
             outputStateTrees: outputStateTree,
             rootIndices: [],
@@ -4934,30 +5289,40 @@ class CompressedTokenProgram {
             outputCompressedAccounts: packedOutputTokenData,
             compressOrDecompressAmount: Array.isArray(params.amount)
                 ? params.amount
-                    .map(amt => new anchor.BN(amt))
-                    .reduce((sum, amt) => sum.add(amt), new anchor.BN(0))
+                      .map(amt => new anchor.BN(amt))
+                      .reduce((sum, amt) => sum.add(amt), new anchor.BN(0))
                 : new anchor.BN(params.amount),
             isCompress: true,
             cpiContext: null,
             lamportsChangeAccountMerkleTreeIndex: null,
         };
-        const encodedData = this.program.coder.types.encode('CompressedTokenInstructionDataTransfer', data);
+        const encodedData = this.program.coder.types.encode(
+            'CompressedTokenInstructionDataTransfer',
+            data,
+        );
         const instruction = await this.program.methods
             .transfer(encodedData)
             .accounts({
-            feePayer: payer,
-            authority: owner,
-            cpiAuthorityPda: this.deriveCpiAuthorityPda,
-            lightSystemProgram: stateless_js.LightSystemProgram.programId,
-            registeredProgramPda: stateless_js.defaultStaticAccountsStruct().registeredProgramPda,
-            noopProgram: stateless_js.defaultStaticAccountsStruct().noopProgram,
-            accountCompressionAuthority: stateless_js.defaultStaticAccountsStruct().accountCompressionAuthority,
-            accountCompressionProgram: stateless_js.defaultStaticAccountsStruct().accountCompressionProgram,
-            selfProgram: this.programId,
-            tokenPoolPda: this.deriveTokenPoolPda(mint),
-            compressOrDecompressTokenAccount: source, // token
-            tokenProgram: TOKEN_PROGRAM_ID,
-        })
+                feePayer: payer,
+                authority: owner,
+                cpiAuthorityPda: this.deriveCpiAuthorityPda,
+                lightSystemProgram: stateless_js.LightSystemProgram.programId,
+                registeredProgramPda:
+                    stateless_js.defaultStaticAccountsStruct()
+                        .registeredProgramPda,
+                noopProgram:
+                    stateless_js.defaultStaticAccountsStruct().noopProgram,
+                accountCompressionAuthority:
+                    stateless_js.defaultStaticAccountsStruct()
+                        .accountCompressionAuthority,
+                accountCompressionProgram:
+                    stateless_js.defaultStaticAccountsStruct()
+                        .accountCompressionProgram,
+                selfProgram: this.programId,
+                tokenPoolPda: this.deriveTokenPoolPda(mint),
+                compressOrDecompressTokenAccount: source, // token
+                tokenProgram: TOKEN_PROGRAM_ID,
+            })
             .remainingAccounts(remainingAccountMetas)
             .instruction();
         return instruction;
@@ -4966,17 +5331,33 @@ class CompressedTokenProgram {
      * Construct decompress instruction
      */
     static async decompress(params) {
-        const { payer, inputCompressedTokenAccounts, toAddress, outputStateTree, recentValidityProof, recentInputStateRootIndices, } = params;
+        const {
+            payer,
+            inputCompressedTokenAccounts,
+            toAddress,
+            outputStateTree,
+            recentValidityProof,
+            recentInputStateRootIndices,
+        } = params;
         const amount = stateless_js.bn(params.amount);
-        const tokenTransferOutputs = createDecompressOutputState(inputCompressedTokenAccounts, amount);
+        const tokenTransferOutputs = createDecompressOutputState(
+            inputCompressedTokenAccounts,
+            amount,
+        );
         /// Pack
-        const { inputTokenDataWithContext, packedOutputTokenData, remainingAccountMetas, } = packCompressedTokenAccounts({
+        const {
+            inputTokenDataWithContext,
+            packedOutputTokenData,
+            remainingAccountMetas,
+        } = packCompressedTokenAccounts({
             inputCompressedTokenAccounts,
             outputStateTrees: outputStateTree,
             rootIndices: recentInputStateRootIndices,
             tokenTransferOutputs: tokenTransferOutputs,
         });
-        const { mint, currentOwner } = parseTokenData(inputCompressedTokenAccounts);
+        const { mint, currentOwner } = parseTokenData(
+            inputCompressedTokenAccounts,
+        );
         const data = {
             proof: recentValidityProof,
             mint,
@@ -4988,33 +5369,69 @@ class CompressedTokenProgram {
             cpiContext: null,
             lamportsChangeAccountMerkleTreeIndex: null,
         };
-        const encodedData = this.program.coder.types.encode('CompressedTokenInstructionDataTransfer', data);
-        const { accountCompressionAuthority, noopProgram, registeredProgramPda, accountCompressionProgram, } = stateless_js.defaultStaticAccountsStruct();
+        const encodedData = this.program.coder.types.encode(
+            'CompressedTokenInstructionDataTransfer',
+            data,
+        );
+        const {
+            accountCompressionAuthority,
+            noopProgram,
+            registeredProgramPda,
+            accountCompressionProgram,
+        } = stateless_js.defaultStaticAccountsStruct();
         const instruction = await this.program.methods
             .transfer(encodedData)
             .accounts({
-            feePayer: payer,
-            authority: currentOwner,
-            cpiAuthorityPda: this.deriveCpiAuthorityPda,
-            lightSystemProgram: stateless_js.LightSystemProgram.programId,
-            registeredProgramPda: registeredProgramPda,
-            noopProgram: noopProgram,
-            accountCompressionAuthority: accountCompressionAuthority,
-            accountCompressionProgram: accountCompressionProgram,
-            selfProgram: this.programId,
-            tokenPoolPda: this.deriveTokenPoolPda(mint),
-            compressOrDecompressTokenAccount: toAddress,
-            tokenProgram: TOKEN_PROGRAM_ID,
-        })
+                feePayer: payer,
+                authority: currentOwner,
+                cpiAuthorityPda: this.deriveCpiAuthorityPda,
+                lightSystemProgram: stateless_js.LightSystemProgram.programId,
+                registeredProgramPda: registeredProgramPda,
+                noopProgram: noopProgram,
+                accountCompressionAuthority: accountCompressionAuthority,
+                accountCompressionProgram: accountCompressionProgram,
+                selfProgram: this.programId,
+                tokenPoolPda: this.deriveTokenPoolPda(mint),
+                compressOrDecompressTokenAccount: toAddress,
+                tokenProgram: TOKEN_PROGRAM_ID,
+            })
             .remainingAccounts(remainingAccountMetas)
             .instruction();
         return instruction;
     }
+    static async mergeTokenAccounts(params) {
+        const {
+            payer,
+            owner,
+            inputCompressedTokenAccounts,
+            outputStateTree,
+            recentValidityProof,
+            recentInputStateRootIndices,
+        } = params;
+        if (inputCompressedTokenAccounts.length > 3) {
+            throw new Error('Cannot merge more than 3 token accounts at once');
+        }
+        const ix = await this.transfer({
+            payer,
+            inputCompressedTokenAccounts,
+            toAddress: owner,
+            amount: inputCompressedTokenAccounts.reduce(
+                (sum, account) => sum.add(account.parsed.amount),
+                new anchor.BN(0),
+            ),
+            outputStateTrees: outputStateTree,
+            recentInputStateRootIndices,
+            recentValidityProof,
+        });
+        return [ix];
+    }
 }
 /**
  * Public key that identifies the CompressedPda program
  */
-CompressedTokenProgram.programId = new web3_js.PublicKey('cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m');
+CompressedTokenProgram.programId = new web3_js.PublicKey(
+    'cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m',
+);
 CompressedTokenProgram._program = null;
 
 /**
@@ -5032,8 +5449,22 @@ CompressedTokenProgram._program = null;
  *
  * @return Signature of the confirmed transaction
  */
-async function approveAndMintTo(rpc, payer, mint, destination, authority, amount, merkleTree, confirmOptions) {
-    const authorityTokenAccount = await getOrCreateAssociatedTokenAccount(rpc, payer, mint, authority.publicKey);
+async function approveAndMintTo(
+    rpc,
+    payer,
+    mint,
+    destination,
+    authority,
+    amount,
+    merkleTree,
+    confirmOptions,
+) {
+    const authorityTokenAccount = await getOrCreateAssociatedTokenAccount(
+        rpc,
+        payer,
+        mint,
+        authority.publicKey,
+    );
     const ixs = await CompressedTokenProgram.approveAndMintTo({
         feePayer: payer.publicKey,
         mint,
@@ -5045,10 +5476,17 @@ async function approveAndMintTo(rpc, payer, mint, destination, authority, amount
     });
     const { blockhash } = await rpc.getLatestBlockhash();
     const additionalSigners = stateless_js.dedupeSigner(payer, [authority]);
-    const tx = stateless_js.buildAndSignTx([
-        web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }),
-        ...ixs,
-    ], payer, blockhash, additionalSigners);
+    const tx = stateless_js.buildAndSignTx(
+        [
+            web3_js.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 1000000,
+            }),
+            ...ixs,
+        ],
+        payer,
+        blockhash,
+        additionalSigners,
+    );
     const txId = await stateless_js.sendAndConfirmTx(rpc, tx, confirmOptions);
     return txId;
 }
@@ -5071,7 +5509,17 @@ async function approveAndMintTo(rpc, payer, mint, destination, authority, amount
  *
  * @return Signature of the confirmed transaction
  */
-async function compress(rpc, payer, mint, amount, owner, sourceTokenAccount, toAddress, merkleTree, confirmOptions) {
+async function compress(
+    rpc,
+    payer,
+    mint,
+    amount,
+    owner,
+    sourceTokenAccount,
+    toAddress,
+    merkleTree,
+    confirmOptions,
+) {
     const compressIx = await CompressedTokenProgram.compress({
         payer: payer.publicKey,
         owner: owner.publicKey,
@@ -5083,13 +5531,23 @@ async function compress(rpc, payer, mint, amount, owner, sourceTokenAccount, toA
     });
     const blockhashCtx = await rpc.getLatestBlockhash();
     const additionalSigners = stateless_js.dedupeSigner(payer, [owner]);
-    const signedTx = stateless_js.buildAndSignTx([
-        web3_js.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 1000000,
-        }),
-        compressIx,
-    ], payer, blockhashCtx.blockhash, additionalSigners);
-    const txId = await stateless_js.sendAndConfirmTx(rpc, signedTx, confirmOptions, blockhashCtx);
+    const signedTx = stateless_js.buildAndSignTx(
+        [
+            web3_js.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 1000000,
+            }),
+            compressIx,
+        ],
+        payer,
+        blockhashCtx.blockhash,
+        additionalSigners,
+    );
+    const txId = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx,
+        confirmOptions,
+        blockhashCtx,
+    );
     return txId;
 }
 
@@ -5110,15 +5568,33 @@ async function compress(rpc, payer, mint, amount, owner, sourceTokenAccount, toA
  *
  * @return Signature of the confirmed transaction
  */
-async function transfer(rpc, payer, mint, amount, owner, toAddress, 
-/// TODO: allow multiple
-merkleTree, confirmOptions) {
+async function transfer(
+    rpc,
+    payer,
+    mint,
+    amount,
+    owner,
+    toAddress,
+    /// TODO: allow multiple
+    merkleTree,
+    confirmOptions,
+) {
     amount = stateless_js.bn(amount);
-    const compressedTokenAccounts = await rpc.getCompressedTokenAccountsByOwner(owner.publicKey, {
-        mint,
-    });
-    const [inputAccounts] = selectMinCompressedTokenAccountsForTransfer(compressedTokenAccounts.items, amount);
-    const proof = await rpc.getValidityProof(inputAccounts.map(account => stateless_js.bn(account.compressedAccount.hash)));
+    const compressedTokenAccounts = await rpc.getCompressedTokenAccountsByOwner(
+        owner.publicKey,
+        {
+            mint,
+        },
+    );
+    const [inputAccounts] = selectMinCompressedTokenAccountsForTransfer(
+        compressedTokenAccounts.items,
+        amount,
+    );
+    const proof = await rpc.getValidityProof(
+        inputAccounts.map(account =>
+            stateless_js.bn(account.compressedAccount.hash),
+        ),
+    );
     const ix = await CompressedTokenProgram.transfer({
         payer: payer.publicKey,
         inputCompressedTokenAccounts: inputAccounts,
@@ -5130,8 +5606,22 @@ merkleTree, confirmOptions) {
     });
     const { blockhash } = await rpc.getLatestBlockhash();
     const additionalSigners = stateless_js.dedupeSigner(payer, [owner]);
-    const signedTx = stateless_js.buildAndSignTx([web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }), ix], payer, blockhash, additionalSigners);
-    const txId = await stateless_js.sendAndConfirmTx(rpc, signedTx, confirmOptions);
+    const signedTx = stateless_js.buildAndSignTx(
+        [
+            web3_js.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 1000000,
+            }),
+            ix,
+        ],
+        payer,
+        blockhash,
+        additionalSigners,
+    );
+    const txId = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx,
+        confirmOptions,
+    );
     return txId;
 }
 /**
@@ -5147,14 +5637,17 @@ function selectMinCompressedTokenAccountsForTransfer(accounts, transferAmount) {
     const selectedAccounts = [];
     accounts.sort((a, b) => b.parsed.amount.cmp(a.parsed.amount));
     for (const account of accounts) {
-        if (accumulatedAmount.gte(stateless_js.bn(transferAmount)))
-            break;
+        if (accumulatedAmount.gte(stateless_js.bn(transferAmount))) break;
         accumulatedAmount = accumulatedAmount.add(account.parsed.amount);
-        accumulatedLamports = accumulatedLamports.add(account.compressedAccount.lamports);
+        accumulatedLamports = accumulatedLamports.add(
+            account.compressedAccount.lamports,
+        );
         selectedAccounts.push(account);
     }
     if (accumulatedAmount.lt(stateless_js.bn(transferAmount))) {
-        throw new Error(`Not enough balance for transfer. Required: ${transferAmount.toString()}, available: ${accumulatedAmount.toString()}`);
+        throw new Error(
+            `Not enough balance for transfer. Required: ${transferAmount.toString()}, available: ${accumulatedAmount.toString()}`,
+        );
     }
     return [
         selectedAccounts,
@@ -5181,16 +5674,34 @@ function selectMinCompressedTokenAccountsForTransfer(accounts, transferAmount) {
  *
  * @return Signature of the confirmed transaction
  */
-async function decompress(rpc, payer, mint, amount, owner, toAddress, 
-/// TODO: allow multiple
-merkleTree, confirmOptions) {
+async function decompress(
+    rpc,
+    payer,
+    mint,
+    amount,
+    owner,
+    toAddress,
+    /// TODO: allow multiple
+    merkleTree,
+    confirmOptions,
+) {
     amount = stateless_js.bn(amount);
-    const compressedTokenAccounts = await rpc.getCompressedTokenAccountsByOwner(owner.publicKey, {
-        mint,
-    });
+    const compressedTokenAccounts = await rpc.getCompressedTokenAccountsByOwner(
+        owner.publicKey,
+        {
+            mint,
+        },
+    );
     /// TODO: consider using a different selection algorithm
-    const [inputAccounts] = selectMinCompressedTokenAccountsForTransfer(compressedTokenAccounts.items, amount);
-    const proof = await rpc.getValidityProof(inputAccounts.map(account => stateless_js.bn(account.compressedAccount.hash)));
+    const [inputAccounts] = selectMinCompressedTokenAccountsForTransfer(
+        compressedTokenAccounts.items,
+        amount,
+    );
+    const proof = await rpc.getValidityProof(
+        inputAccounts.map(account =>
+            stateless_js.bn(account.compressedAccount.hash),
+        ),
+    );
     const ix = await CompressedTokenProgram.decompress({
         payer: payer.publicKey,
         inputCompressedTokenAccounts: inputAccounts,
@@ -5202,8 +5713,22 @@ merkleTree, confirmOptions) {
     });
     const { blockhash } = await rpc.getLatestBlockhash();
     const additionalSigners = stateless_js.dedupeSigner(payer, [owner]);
-    const signedTx = stateless_js.buildAndSignTx([web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }), ix], payer, blockhash, additionalSigners);
-    const txId = await stateless_js.sendAndConfirmTx(rpc, signedTx, confirmOptions);
+    const signedTx = stateless_js.buildAndSignTx(
+        [
+            web3_js.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 1000000,
+            }),
+            ix,
+        ],
+        payer,
+        blockhash,
+        additionalSigners,
+    );
+    const txId = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx,
+        confirmOptions,
+    );
     return txId;
 }
 
@@ -5219,8 +5744,16 @@ merkleTree, confirmOptions) {
  *
  * @return Address of the new mint and the transaction signature
  */
-async function createMint(rpc, payer, mintAuthority, decimals, keypair = web3_js.Keypair.generate(), confirmOptions) {
-    const rentExemptBalance = await rpc.getMinimumBalanceForRentExemption(MINT_SIZE);
+async function createMint(
+    rpc,
+    payer,
+    mintAuthority,
+    decimals,
+    keypair = web3_js.Keypair.generate(),
+    confirmOptions,
+) {
+    const rentExemptBalance =
+        await rpc.getMinimumBalanceForRentExemption(MINT_SIZE);
     const ixs = await CompressedTokenProgram.createMint({
         feePayer: payer.publicKey,
         mint: keypair.publicKey,
@@ -5231,7 +5764,12 @@ async function createMint(rpc, payer, mintAuthority, decimals, keypair = web3_js
     });
     const { blockhash } = await rpc.getLatestBlockhash();
     const additionalSigners = stateless_js.dedupeSigner(payer, [keypair]);
-    const tx = stateless_js.buildAndSignTx(ixs, payer, blockhash, additionalSigners);
+    const tx = stateless_js.buildAndSignTx(
+        ixs,
+        payer,
+        blockhash,
+        additionalSigners,
+    );
     const txId = await stateless_js.sendAndConfirmTx(rpc, tx, confirmOptions);
     return { mint: keypair.publicKey, transactionSignature: txId };
 }
@@ -5253,7 +5791,16 @@ async function createMint(rpc, payer, mintAuthority, decimals, keypair = web3_js
  *
  * @return Signature of the confirmed transaction
  */
-async function mintTo(rpc, payer, mint, destination, authority, amount, merkleTree, confirmOptions) {
+async function mintTo(
+    rpc,
+    payer,
+    mint,
+    destination,
+    authority,
+    amount,
+    merkleTree,
+    confirmOptions,
+) {
     const additionalSigners = stateless_js.dedupeSigner(payer, [authority]);
     const ix = await CompressedTokenProgram.mintTo({
         feePayer: payer.publicKey,
@@ -5264,11 +5811,98 @@ async function mintTo(rpc, payer, mint, destination, authority, amount, merkleTr
         merkleTree,
     });
     const { blockhash } = await rpc.getLatestBlockhash();
-    const tx = stateless_js.buildAndSignTx([web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }), ix], payer, blockhash, additionalSigners);
+    const tx = stateless_js.buildAndSignTx(
+        [
+            web3_js.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 1000000,
+            }),
+            ix,
+        ],
+        payer,
+        blockhash,
+        additionalSigners,
+    );
     const txId = await stateless_js.sendAndConfirmTx(rpc, tx, confirmOptions);
     return txId;
 }
 
+/**
+ * Merge multiple compressed token accounts for a given mint into a single
+ * account
+ *
+ * @param rpc             RPC to use
+ * @param payer           Payer of the transaction fees
+ * @param mint            Public key of the token's mint
+ * @param owner           Owner of the token accounts to be merged
+ * @param merkleTree      Optional merkle tree for compressed tokens
+ * @param confirmOptions  Options for confirming the transaction
+ *
+ * @return Array of transaction signatures
+ */
+async function mergeTokenAccounts(
+    rpc,
+    payer,
+    mint,
+    owner,
+    merkleTree,
+    confirmOptions,
+) {
+    const compressedTokenAccounts = await rpc.getCompressedTokenAccountsByOwner(
+        owner.publicKey,
+        { mint },
+    );
+    if (compressedTokenAccounts.items.length === 0) {
+        throw new Error(
+            `No compressed token accounts found for mint ${mint.toBase58()}`,
+        );
+    }
+    if (compressedTokenAccounts.items.length >= 6) {
+        throw new Error(
+            `Too many compressed token accounts used for mint ${mint.toBase58()}`,
+        );
+    }
+    const instructions = [
+        web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 1000000 }),
+    ];
+    for (
+        let i = 0;
+        i < compressedTokenAccounts.items.slice(0, 6).length;
+        i += 3
+    ) {
+        const batch = compressedTokenAccounts.items.slice(i, i + 3);
+        const proof = await rpc.getValidityProof(
+            batch.map(account =>
+                stateless_js.bn(account.compressedAccount.hash),
+            ),
+        );
+        const batchInstructions =
+            await CompressedTokenProgram.mergeTokenAccounts({
+                payer: payer.publicKey,
+                owner: owner.publicKey,
+                mint,
+                inputCompressedTokenAccounts: batch,
+                outputStateTree: merkleTree,
+                recentValidityProof: proof.compressedProof,
+                recentInputStateRootIndices: proof.rootIndices,
+            });
+        instructions.push(...batchInstructions);
+    }
+    const { blockhash } = await rpc.getLatestBlockhash();
+    const additionalSigners = stateless_js.dedupeSigner(payer, [owner]);
+    const signedTx = stateless_js.buildAndSignTx(
+        instructions,
+        payer,
+        blockhash,
+        additionalSigners,
+    );
+    const txId = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx,
+        confirmOptions,
+    );
+    return txId;
+}
+
 /**
  * Register an existing mint with the CompressedToken program
  *
@@ -5304,23 +5938,50 @@ async function createTokenPool(rpc, payer, mintAddress, confirmOptions) {
  *
  * @return Transaction signatures and the address of the created lookup table
  */
-async function createTokenProgramLookupTable(rpc, payer, authority, mints, additionalAccounts) {
+async function createTokenProgramLookupTable(
+    rpc,
+    payer,
+    authority,
+    mints,
+    additionalAccounts,
+) {
     const recentSlot = await rpc.getSlot('finalized');
-    const { instructions, address } = await CompressedTokenProgram.createTokenProgramLookupTable({
-        payer: payer.publicKey,
-        authority: authority.publicKey,
-        mints,
-        remainingAccounts: additionalAccounts,
-        recentSlot,
-    });
+    const { instructions, address } =
+        await CompressedTokenProgram.createTokenProgramLookupTable({
+            payer: payer.publicKey,
+            authority: authority.publicKey,
+            mints,
+            remainingAccounts: additionalAccounts,
+            recentSlot,
+        });
     const additionalSigners = stateless_js.dedupeSigner(payer, [authority]);
     const blockhashCtx = await rpc.getLatestBlockhash();
-    const signedTx = stateless_js.buildAndSignTx([instructions[0]], payer, blockhashCtx.blockhash, additionalSigners);
+    const signedTx = stateless_js.buildAndSignTx(
+        [instructions[0]],
+        payer,
+        blockhashCtx.blockhash,
+        additionalSigners,
+    );
     /// Must wait for the first instruction to be finalized.
-    const txId = await stateless_js.sendAndConfirmTx(rpc, signedTx, { commitment: 'finalized' }, blockhashCtx);
+    const txId = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx,
+        { commitment: 'finalized' },
+        blockhashCtx,
+    );
     const blockhashCtx2 = await rpc.getLatestBlockhash();
-    const signedTx2 = stateless_js.buildAndSignTx([instructions[1]], payer, blockhashCtx2.blockhash, additionalSigners);
-    const txId2 = await stateless_js.sendAndConfirmTx(rpc, signedTx2, { commitment: 'finalized' }, blockhashCtx2);
+    const signedTx2 = stateless_js.buildAndSignTx(
+        [instructions[1]],
+        payer,
+        blockhashCtx2.blockhash,
+        additionalSigners,
+    );
+    const txId2 = await stateless_js.sendAndConfirmTx(
+        rpc,
+        signedTx2,
+        { commitment: 'finalized' },
+        blockhashCtx2,
+    );
     return { txIds: [txId, txId2], address };
 }
 
@@ -5337,10 +5998,12 @@ exports.createTokenPool = createTokenPool;
 exports.createTokenProgramLookupTable = createTokenProgramLookupTable;
 exports.createTransferOutputState = createTransferOutputState;
 exports.decompress = decompress;
+exports.mergeTokenAccounts = mergeTokenAccounts;
 exports.mintTo = mintTo;
 exports.packCompressedTokenAccounts = packCompressedTokenAccounts;
 exports.parseTokenData = parseTokenData;
-exports.selectMinCompressedTokenAccountsForTransfer = selectMinCompressedTokenAccountsForTransfer;
+exports.selectMinCompressedTokenAccountsForTransfer =
+    selectMinCompressedTokenAccountsForTransfer;
 exports.sumUpTokenAmount = sumUpTokenAmount;
 exports.transfer = transfer;
 exports.validateSameTokenOwner = validateSameTokenOwner;