@solana/compat 2.0.0-experimental.df45965 → 2.0.0-experimental.e1ca396

package/dist/index.browser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/address.ts","../src/keypair.ts","../../codecs-strings/src/assertions.ts","../../codecs-strings/src/baseX.ts","../../codecs-strings/src/base16.ts","../../codecs-strings/src/base64.ts","../../addresses/src/address.ts","../src/transaction.ts"],"names":["alphabet","e"],"mappings":"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","sourcesContent":["import { Base58EncodedAddress } from '@solana/addresses';\nimport { PublicKey } from '@solana/web3.js';\n\n/**\n * Convert from a Legacy Web3 JS PublicKey to a base58 encoded address\n * @param publicKey The PublicKey to convert\n * @returns         A Base58EncodedAddress\n */\nexport function fromLegacyPublicKey<TAddress extends string>(publicKey: PublicKey): Base58EncodedAddress<TAddress> {\n    return publicKey.toBase58() as Base58EncodedAddress<TAddress>;\n}\n","import { Keypair } from '@solana/web3.js';\n\nfunction addPkcs8Header(bytes: Uint8Array): Uint8Array {\n    // prettier-ignore\n    return new Uint8Array([\n        /**\n         * PKCS#8 header\n         */\n        0x30, // ASN.1 sequence tag\n        0x2e, // Length of sequence (46 more bytes)\n\n            0x02, // ASN.1 integer tag\n            0x01, // Length of integer\n                0x00, // Version number\n\n            0x30, // ASN.1 sequence tag\n            0x05, // Length of sequence\n                0x06, // ASN.1 object identifier tag\n                0x03, // Length of object identifier\n                    // Edwards curve algorithms identifier https://oid-rep.orange-labs.fr/get/1.3.101.112\n                        0x2b, // iso(1) / identified-organization(3) (The first node is multiplied by the decimal 40 and the result is added to the value of the second node)\n                        0x65, // thawte(101)\n                    // Ed25519 identifier\n                        0x70, // id-Ed25519(112)\n\n        /**\n         * Private key payload\n         */\n        0x04, // ASN.1 octet string tag\n        0x22, // String length (34 more bytes)\n\n            // Private key bytes as octet string\n            0x04, // ASN.1 octet string tag\n            0x20, // String length (32 bytes)\n\n        ...bytes\n    ]);\n}\n\n/**\n * Convert from a Legacy Web3 JS Keypair to a CryptoKeyPair\n * @param keypair   The Keypair to convert\n * @returns         A CryptoKeyPair\n */\nexport async function fromLegacyKeypair(keypair: Keypair, extractable?: boolean): Promise<CryptoKeyPair> {\n    const publicKey: CryptoKey = await crypto.subtle.importKey('raw', keypair.publicKey.toBytes(), 'Ed25519', true, [\n        'verify',\n    ]);\n    const privateKeyBytesPkcs8 = addPkcs8Header(keypair.secretKey.slice(0, 32));\n    const privateKey: CryptoKey = await crypto.subtle.importKey(\n        'pkcs8',\n        privateKeyBytesPkcs8,\n        'Ed25519',\n        extractable ?? false,\n        ['sign']\n    );\n    return {\n        privateKey,\n        publicKey,\n    } as CryptoKeyPair;\n}\n","/**\n * Asserts that a given string matches a given alphabet.\n */\nexport function assertValidBaseString(alphabet: string, testValue: string, givenValue = testValue) {\n    if (!testValue.match(new RegExp(`^[${alphabet}]*$`))) {\n        // TODO: Coded error.\n        throw new Error(`Expected a string of base ${alphabet.length}, got [${givenValue}].`);\n    }\n}\n","import { Codec, combineCodec, Decoder, Encoder } from '@solana/codecs-core';\n\nimport { assertValidBaseString } from './assertions';\n\n/**\n * Encodes a string using a custom alphabet by dividing\n * by the base and handling leading zeroes.\n * @see {@link getBaseXCodec} for a more detailed description.\n */\nexport const getBaseXEncoder = (alphabet: string): Encoder<string> => {\n    const base = alphabet.length;\n    const baseBigInt = BigInt(base);\n    return {\n        description: `base${base}`,\n        encode(value: string): Uint8Array {\n            // Check if the value is valid.\n            assertValidBaseString(alphabet, value);\n            if (value === '') return new Uint8Array();\n\n            // Handle leading zeroes.\n            const chars = [...value];\n            let trailIndex = chars.findIndex(c => c !== alphabet[0]);\n            trailIndex = trailIndex === -1 ? chars.length : trailIndex;\n            const leadingZeroes = Array(trailIndex).fill(0);\n            if (trailIndex === chars.length) return Uint8Array.from(leadingZeroes);\n\n            // From baseX to base10.\n            const tailChars = chars.slice(trailIndex);\n            let base10Number = 0n;\n            let baseXPower = 1n;\n            for (let i = tailChars.length - 1; i >= 0; i -= 1) {\n                base10Number += baseXPower * BigInt(alphabet.indexOf(tailChars[i]));\n                baseXPower *= baseBigInt;\n            }\n\n            // From base10 to bytes.\n            const tailBytes = [];\n            while (base10Number > 0n) {\n                tailBytes.unshift(Number(base10Number % 256n));\n                base10Number /= 256n;\n            }\n            return Uint8Array.from(leadingZeroes.concat(tailBytes));\n        },\n        fixedSize: null,\n        maxSize: null,\n    };\n};\n\n/**\n * Decodes a string using a custom alphabet by dividing\n * by the base and handling leading zeroes.\n * @see {@link getBaseXCodec} for a more detailed description.\n */\nexport const getBaseXDecoder = (alphabet: string): Decoder<string> => {\n    const base = alphabet.length;\n    const baseBigInt = BigInt(base);\n    return {\n        decode(rawBytes, offset = 0): [string, number] {\n            const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n            if (bytes.length === 0) return ['', 0];\n\n            // Handle leading zeroes.\n            let trailIndex = bytes.findIndex(n => n !== 0);\n            trailIndex = trailIndex === -1 ? bytes.length : trailIndex;\n            const leadingZeroes = alphabet[0].repeat(trailIndex);\n            if (trailIndex === bytes.length) return [leadingZeroes, rawBytes.length];\n\n            // From bytes to base10.\n            let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);\n\n            // From base10 to baseX.\n            const tailChars = [];\n            while (base10Number > 0n) {\n                tailChars.unshift(alphabet[Number(base10Number % baseBigInt)]);\n                base10Number /= baseBigInt;\n            }\n\n            return [leadingZeroes + tailChars.join(''), rawBytes.length];\n        },\n        description: `base${base}`,\n        fixedSize: null,\n        maxSize: null,\n    };\n};\n\n/**\n * A string codec that requires a custom alphabet and uses\n * the length of that alphabet as the base. It then divides\n * the input by the base as many times as necessary to get\n * the output. It also supports leading zeroes by using the\n * first character of the alphabet as the zero character.\n *\n * This can be used to create codecs such as base10 or base58.\n */\nexport const getBaseXCodec = (alphabet: string): Codec<string> =>\n    combineCodec(getBaseXEncoder(alphabet), getBaseXDecoder(alphabet));\n","import { Codec, combineCodec, Decoder, Encoder } from '@solana/codecs-core';\n\nimport { assertValidBaseString } from './assertions';\n\n/** Encodes strings in base16. */\nexport const getBase16Encoder = (): Encoder<string> => ({\n    description: 'base16',\n    encode(value: string) {\n        const lowercaseValue = value.toLowerCase();\n        assertValidBaseString('0123456789abcdef', lowercaseValue, value);\n        const matches = lowercaseValue.match(/.{1,2}/g);\n        return Uint8Array.from(matches ? matches.map((byte: string) => parseInt(byte, 16)) : []);\n    },\n    fixedSize: null,\n    maxSize: null,\n});\n\n/** Decodes strings in base16. */\nexport const getBase16Decoder = (): Decoder<string> => ({\n    decode(bytes, offset = 0) {\n        const value = bytes.slice(offset).reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), '');\n        return [value, bytes.length];\n    },\n    description: 'base16',\n    fixedSize: null,\n    maxSize: null,\n});\n\n/** Encodes and decodes strings in base16. */\nexport const getBase16Codec = (): Codec<string> => combineCodec(getBase16Encoder(), getBase16Decoder());\n","import { combineCodec, Decoder, Encoder, mapDecoder, mapEncoder } from '@solana/codecs-core';\n\nimport { assertValidBaseString } from './assertions';\nimport { getBaseXResliceDecoder, getBaseXResliceEncoder } from './baseX-reslice';\n\nconst alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';\n\n/** Encodes strings in base64. */\nexport const getBase64Encoder = (): Encoder<string> => {\n    if (__BROWSER__) {\n        return {\n            description: `base64`,\n            encode(value: string): Uint8Array {\n                try {\n                    const bytes = (atob as Window['atob'])(value)\n                        .split('')\n                        .map(c => c.charCodeAt(0));\n                    return new Uint8Array(bytes);\n                } catch (e) {\n                    // TODO: Coded error.\n                    throw new Error(`Expected a string of base 64, got [${value}].`);\n                }\n            },\n            fixedSize: null,\n            maxSize: null,\n        };\n    }\n\n    if (__NODEJS__) {\n        return {\n            description: `base64`,\n            encode(value: string): Uint8Array {\n                assertValidBaseString(alphabet, value.replace(/=/g, ''));\n                return new Uint8Array(Buffer.from(value, 'base64'));\n            },\n            fixedSize: null,\n            maxSize: null,\n        };\n    }\n\n    return mapEncoder(getBaseXResliceEncoder(alphabet, 6), (value: string): string => value.replace(/=/g, ''));\n};\n\n/** Decodes strings in base64. */\nexport const getBase64Decoder = (): Decoder<string> => {\n    if (__BROWSER__) {\n        return {\n            decode(bytes, offset = 0) {\n                const slice = bytes.slice(offset);\n                const value = (btoa as Window['btoa'])(String.fromCharCode(...slice));\n                return [value, bytes.length];\n            },\n            description: `base64`,\n            fixedSize: null,\n            maxSize: null,\n        };\n    }\n\n    if (__NODEJS__) {\n        return {\n            decode: (bytes, offset = 0) => [Buffer.from(bytes, offset).toString('base64'), bytes.length],\n            description: `base64`,\n            fixedSize: null,\n            maxSize: null,\n        };\n    }\n\n    return mapDecoder(getBaseXResliceDecoder(alphabet, 6), (value: string): string =>\n        value.padEnd(Math.ceil(value.length / 4) * 4, '=')\n    );\n};\n\n/** Encodes and decodes strings in base64. */\nexport const getBase64Codec = () => combineCodec(getBase64Encoder(), getBase64Decoder());\n","import { Codec, combineCodec, Decoder, Encoder, mapEncoder } from '@solana/codecs-core';\nimport { getBase58Decoder, getBase58Encoder, getStringDecoder, getStringEncoder } from '@solana/codecs-strings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __brand: unique symbol;\n};\n\nlet memoizedBase58Encoder: Encoder<string> | undefined;\nlet memoizedBase58Decoder: Decoder<string> | undefined;\n\nfunction getMemoizedBase58Encoder(): Encoder<string> {\n    if (!memoizedBase58Encoder) memoizedBase58Encoder = getBase58Encoder();\n    return memoizedBase58Encoder;\n}\n\nfunction getMemoizedBase58Decoder(): Decoder<string> {\n    if (!memoizedBase58Decoder) memoizedBase58Decoder = getBase58Decoder();\n    return memoizedBase58Decoder;\n}\n\nexport function isAddress(\n    putativeBase58EncodedAddress: string\n): putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    // Fast-path; see if the input string is of an acceptable length.\n    if (\n        // Lowest address (32 bytes of zeroes)\n        putativeBase58EncodedAddress.length < 32 ||\n        // Highest address (32 bytes of 255)\n        putativeBase58EncodedAddress.length > 44\n    ) {\n        return false;\n    }\n    // Slow-path; actually attempt to decode the input string.\n    const base58Encoder = getMemoizedBase58Encoder();\n    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n    const numBytes = bytes.byteLength;\n    if (numBytes !== 32) {\n        return false;\n    }\n    return true;\n}\n\nexport function assertIsAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const base58Encoder = getMemoizedBase58Encoder();\n        const bytes = base58Encoder.encode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function address<TAddress extends string = string>(\n    putativeBase58EncodedAddress: TAddress\n): Base58EncodedAddress<TAddress> {\n    assertIsAddress(putativeBase58EncodedAddress);\n    return putativeBase58EncodedAddress as Base58EncodedAddress<TAddress>;\n}\n\nexport function getAddressEncoder(config?: Readonly<{ description: string }>): Encoder<Base58EncodedAddress> {\n    return mapEncoder(\n        getStringEncoder({\n            description: config?.description ?? 'Base58EncodedAddress',\n            encoding: getMemoizedBase58Encoder(),\n            size: 32,\n        }),\n        putativeAddress => address(putativeAddress)\n    );\n}\n\nexport function getAddressDecoder(config?: Readonly<{ description: string }>): Decoder<Base58EncodedAddress> {\n    return getStringDecoder({\n        description: config?.description ?? 'Base58EncodedAddress',\n        encoding: getMemoizedBase58Decoder(),\n        size: 32,\n    }) as Decoder<Base58EncodedAddress>;\n}\n\nexport function getAddressCodec(config?: Readonly<{ description: string }>): Codec<Base58EncodedAddress> {\n    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));\n}\n\nexport function getAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n","import { assertIsAddress, type Base58EncodedAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { Ed25519Signature } from '@solana/keys';\nimport {\n    appendTransactionInstruction,\n    type Blockhash,\n    createTransaction,\n    type IDurableNonceTransaction,\n    isAdvanceNonceAccountInstruction,\n    type ITransactionWithBlockhashLifetime,\n    type ITransactionWithFeePayer,\n    type ITransactionWithSignatures,\n    type Nonce,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n    setTransactionLifetimeUsingDurableNonce,\n    type Transaction,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n        ? AccountRole.WRITABLE\n        : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Base58EncodedAddress,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex)\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Base58EncodedAddress,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[]\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Base58EncodedAddress;\n        return { ...acc, [address]: sig as Ed25519Signature };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    // TOOD: add support for durable nonce transactions\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n\nexport function fromVersionedTransactionWithDurableNonce(\n    transaction: VersionedTransaction\n): Transaction & ITransactionWithFeePayer & IDurableNonceTransaction {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction)\n    );\n\n    // Check first instruction is durable nonce + extract params\n    if (instructions.length === 0) {\n        // TODO: coded error\n        throw new Error('transaction with no instructions cannot be durable nonce transaction');\n    }\n\n    if (!isAdvanceNonceAccountInstruction(instructions[0])) {\n        // TODO: coded error\n        throw new Error('transaction first instruction is not advance nonce account instruction');\n    }\n\n    // We know these accounts are defined because we checked `isAdvanceNonceAccountInstruction`\n    const nonceAccountAddress = instructions[0].accounts![0].address;\n    assertIsAddress(nonceAccountAddress);\n\n    const nonceAuthorityAddress = instructions[0].accounts![2].address;\n    assertIsAddress(nonceAuthorityAddress);\n\n    const durableNonceLifetime = {\n        nonce: transaction.message.recentBlockhash as Nonce,\n        nonceAccountAddress,\n        nonceAuthorityAddress,\n    };\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Base58EncodedAddress, tx),\n        tx => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),\n        tx =>\n            instructions.slice(1).reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx)\n    );\n}\n"]}
+{"version":3,"sources":["../src/address.ts","../src/keypair.ts","../../codecs-core/dist/index.browser.js","../../codecs-strings/dist/index.browser.js","../../addresses/dist/index.browser.js","../src/transaction.ts"],"names":["e"],"mappings":"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","sourcesContent":["import { Address } from '@solana/addresses';\nimport { PublicKey } from '@solana/web3.js';\n\n/**\n * Convert from a Legacy Web3 JS PublicKey to a base58 encoded address\n * @param publicKey The PublicKey to convert\n * @returns         An Address\n */\nexport function fromLegacyPublicKey<TAddress extends string>(publicKey: PublicKey): Address<TAddress> {\n    return publicKey.toBase58() as Address<TAddress>;\n}\n","import { createPrivateKeyFromBytes } from '@solana/keys';\nimport { Keypair } from '@solana/web3.js';\n\n/**\n * Convert from a Legacy Web3 JS Keypair to a CryptoKeyPair\n * @param keypair   The Keypair to convert\n * @returns         A CryptoKeyPair\n */\nexport async function fromLegacyKeypair(keypair: Keypair, extractable?: boolean): Promise<CryptoKeyPair> {\n    const [publicKey, privateKey] = await Promise.all([\n        crypto.subtle.importKey('raw', keypair.publicKey.toBytes(), 'Ed25519', true, ['verify']),\n        createPrivateKeyFromBytes(keypair.secretKey.slice(0, 32), extractable),\n    ]);\n    return {\n        privateKey,\n        publicKey,\n    } as CryptoKeyPair;\n}\n","// src/assertions.ts\nfunction assertByteArrayIsNotEmptyForCodec(codecDescription, bytes, offset = 0) {\n  if (bytes.length - offset <= 0) {\n    throw new Error(`Codec [${codecDescription}] cannot decode empty byte arrays.`);\n  }\n}\nfunction assertByteArrayHasEnoughBytesForCodec(codecDescription, expected, bytes, offset = 0) {\n  const bytesLength = bytes.length - offset;\n  if (bytesLength < expected) {\n    throw new Error(`Codec [${codecDescription}] expected ${expected} bytes, got ${bytesLength}.`);\n  }\n}\n\n// src/bytes.ts\nvar mergeBytes = (byteArrays) => {\n  const nonEmptyByteArrays = byteArrays.filter((arr) => arr.length);\n  if (nonEmptyByteArrays.length === 0) {\n    return byteArrays.length ? byteArrays[0] : new Uint8Array();\n  }\n  if (nonEmptyByteArrays.length === 1) {\n    return nonEmptyByteArrays[0];\n  }\n  const totalLength = nonEmptyByteArrays.reduce((total, arr) => total + arr.length, 0);\n  const result = new Uint8Array(totalLength);\n  let offset = 0;\n  nonEmptyByteArrays.forEach((arr) => {\n    result.set(arr, offset);\n    offset += arr.length;\n  });\n  return result;\n};\nvar padBytes = (bytes, length) => {\n  if (bytes.length >= length)\n    return bytes;\n  const paddedBytes = new Uint8Array(length).fill(0);\n  paddedBytes.set(bytes);\n  return paddedBytes;\n};\nvar fixBytes = (bytes, length) => padBytes(bytes.length <= length ? bytes : bytes.slice(0, length), length);\n\n// src/codec.ts\nfunction getEncodedSize(value, encoder) {\n  return \"fixedSize\" in encoder ? encoder.fixedSize : encoder.getSizeFromValue(value);\n}\nfunction createEncoder(encoder) {\n  return Object.freeze({\n    ...encoder,\n    encode: (value) => {\n      const bytes = new Uint8Array(getEncodedSize(value, encoder));\n      encoder.write(value, bytes, 0);\n      return bytes;\n    }\n  });\n}\nfunction createDecoder(decoder) {\n  return Object.freeze({\n    ...decoder,\n    decode: (bytes, offset = 0) => decoder.read(bytes, offset)[0]\n  });\n}\nfunction createCodec(codec) {\n  return Object.freeze({\n    ...codec,\n    decode: (bytes, offset = 0) => codec.read(bytes, offset)[0],\n    encode: (value) => {\n      const bytes = new Uint8Array(getEncodedSize(value, codec));\n      codec.write(value, bytes, 0);\n      return bytes;\n    }\n  });\n}\nfunction isFixedSize(codec) {\n  return \"fixedSize\" in codec && typeof codec.fixedSize === \"number\";\n}\nfunction assertIsFixedSize(codec, message) {\n  if (!isFixedSize(codec)) {\n    throw new Error(message ?? \"Expected a fixed-size codec, got a variable-size one.\");\n  }\n}\nfunction isVariableSize(codec) {\n  return !isFixedSize(codec);\n}\nfunction assertIsVariableSize(codec, message) {\n  if (!isVariableSize(codec)) {\n    throw new Error(message ?? \"Expected a variable-size codec, got a fixed-size one.\");\n  }\n}\n\n// src/combine-codec.ts\nfunction combineCodec(encoder, decoder) {\n  if (isFixedSize(encoder) !== isFixedSize(decoder)) {\n    throw new Error(`Encoder and decoder must either both be fixed-size or variable-size.`);\n  }\n  if (isFixedSize(encoder) && isFixedSize(decoder) && encoder.fixedSize !== decoder.fixedSize) {\n    throw new Error(\n      `Encoder and decoder must have the same fixed size, got [${encoder.fixedSize}] and [${decoder.fixedSize}].`\n    );\n  }\n  if (!isFixedSize(encoder) && !isFixedSize(decoder) && encoder.maxSize !== decoder.maxSize) {\n    throw new Error(\n      `Encoder and decoder must have the same max size, got [${encoder.maxSize}] and [${decoder.maxSize}].`\n    );\n  }\n  return {\n    ...decoder,\n    ...encoder,\n    decode: decoder.decode,\n    encode: encoder.encode,\n    read: decoder.read,\n    write: encoder.write\n  };\n}\n\n// src/fix-codec.ts\nfunction fixEncoder(encoder, fixedBytes) {\n  return createEncoder({\n    fixedSize: fixedBytes,\n    write: (value, bytes, offset) => {\n      const variableByteArray = encoder.encode(value);\n      const fixedByteArray = variableByteArray.length > fixedBytes ? variableByteArray.slice(0, fixedBytes) : variableByteArray;\n      bytes.set(fixedByteArray, offset);\n      return offset + fixedBytes;\n    }\n  });\n}\nfunction fixDecoder(decoder, fixedBytes) {\n  return createDecoder({\n    fixedSize: fixedBytes,\n    read: (bytes, offset) => {\n      assertByteArrayHasEnoughBytesForCodec(\"fixCodec\", fixedBytes, bytes, offset);\n      if (offset > 0 || bytes.length > fixedBytes) {\n        bytes = bytes.slice(offset, offset + fixedBytes);\n      }\n      if (isFixedSize(decoder)) {\n        bytes = fixBytes(bytes, decoder.fixedSize);\n      }\n      const [value] = decoder.read(bytes, 0);\n      return [value, offset + fixedBytes];\n    }\n  });\n}\nfunction fixCodec(codec, fixedBytes) {\n  return combineCodec(fixEncoder(codec, fixedBytes), fixDecoder(codec, fixedBytes));\n}\n\n// src/map-codec.ts\nfunction mapEncoder(encoder, unmap) {\n  return createEncoder({\n    ...isVariableSize(encoder) ? { ...encoder, getSizeFromValue: (value) => encoder.getSizeFromValue(unmap(value)) } : encoder,\n    write: (value, bytes, offset) => encoder.write(unmap(value), bytes, offset)\n  });\n}\nfunction mapDecoder(decoder, map) {\n  return createDecoder({\n    ...decoder,\n    read: (bytes, offset) => {\n      const [value, newOffset] = decoder.read(bytes, offset);\n      return [map(value, bytes, offset), newOffset];\n    }\n  });\n}\nfunction mapCodec(codec, unmap, map) {\n  return createCodec({\n    ...mapEncoder(codec, unmap),\n    read: map ? mapDecoder(codec, map).read : codec.read\n  });\n}\n\n// src/reverse-codec.ts\nfunction reverseEncoder(encoder) {\n  assertIsFixedSize(encoder, \"Cannot reverse a codec of variable size.\");\n  return createEncoder({\n    ...encoder,\n    write: (value, bytes, offset) => {\n      const newOffset = encoder.write(value, bytes, offset);\n      const slice = bytes.slice(offset, offset + encoder.fixedSize).reverse();\n      bytes.set(slice, offset);\n      return newOffset;\n    }\n  });\n}\nfunction reverseDecoder(decoder) {\n  assertIsFixedSize(decoder, \"Cannot reverse a codec of variable size.\");\n  return createDecoder({\n    ...decoder,\n    read: (bytes, offset) => {\n      const reverseEnd = offset + decoder.fixedSize;\n      if (offset === 0 && bytes.length === reverseEnd) {\n        return decoder.read(bytes.reverse(), offset);\n      }\n      const reversedBytes = bytes.slice();\n      reversedBytes.set(bytes.slice(offset, reverseEnd).reverse(), offset);\n      return decoder.read(reversedBytes, offset);\n    }\n  });\n}\nfunction reverseCodec(codec) {\n  return combineCodec(reverseEncoder(codec), reverseDecoder(codec));\n}\n\nexport { assertByteArrayHasEnoughBytesForCodec, assertByteArrayIsNotEmptyForCodec, assertIsFixedSize, assertIsVariableSize, combineCodec, createCodec, createDecoder, createEncoder, fixBytes, fixCodec, fixDecoder, fixEncoder, getEncodedSize, isFixedSize, isVariableSize, mapCodec, mapDecoder, mapEncoder, mergeBytes, padBytes, reverseCodec, reverseDecoder, reverseEncoder };\n","import { createEncoder, createDecoder, combineCodec, fixEncoder, getEncodedSize, fixDecoder, assertByteArrayIsNotEmptyForCodec, assertByteArrayHasEnoughBytesForCodec } from '@solana/codecs-core';\nimport { getU32Encoder, getU32Decoder } from '@solana/codecs-numbers';\n\n// src/assertions.ts\nfunction assertValidBaseString(alphabet4, testValue, givenValue = testValue) {\n  if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {\n    throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);\n  }\n}\nvar getBaseXEncoder = (alphabet4) => {\n  return createEncoder({\n    getSizeFromValue: (value) => {\n      const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);\n      if (tailChars === \"\")\n        return value.length;\n      const base10Number = getBigIntFromBaseX(tailChars, alphabet4);\n      return leadingZeroes.length + Math.ceil(base10Number.toString(16).length / 2);\n    },\n    write(value, bytes, offset) {\n      assertValidBaseString(alphabet4, value);\n      if (value === \"\")\n        return offset;\n      const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);\n      if (tailChars === \"\") {\n        bytes.set(new Uint8Array(leadingZeroes.length).fill(0), offset);\n        return offset + leadingZeroes.length;\n      }\n      let base10Number = getBigIntFromBaseX(tailChars, alphabet4);\n      const tailBytes = [];\n      while (base10Number > 0n) {\n        tailBytes.unshift(Number(base10Number % 256n));\n        base10Number /= 256n;\n      }\n      const bytesToAdd = [...Array(leadingZeroes.length).fill(0), ...tailBytes];\n      bytes.set(bytesToAdd, offset);\n      return offset + bytesToAdd.length;\n    }\n  });\n};\nvar getBaseXDecoder = (alphabet4) => {\n  return createDecoder({\n    read(rawBytes, offset) {\n      const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n      if (bytes.length === 0)\n        return [\"\", 0];\n      let trailIndex = bytes.findIndex((n) => n !== 0);\n      trailIndex = trailIndex === -1 ? bytes.length : trailIndex;\n      const leadingZeroes = alphabet4[0].repeat(trailIndex);\n      if (trailIndex === bytes.length)\n        return [leadingZeroes, rawBytes.length];\n      const base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);\n      const tailChars = getBaseXFromBigInt(base10Number, alphabet4);\n      return [leadingZeroes + tailChars, rawBytes.length];\n    }\n  });\n};\nvar getBaseXCodec = (alphabet4) => combineCodec(getBaseXEncoder(alphabet4), getBaseXDecoder(alphabet4));\nfunction partitionLeadingZeroes(value, zeroCharacter) {\n  const leadingZeroIndex = [...value].findIndex((c) => c !== zeroCharacter);\n  return leadingZeroIndex === -1 ? [value, \"\"] : [value.slice(0, leadingZeroIndex), value.slice(leadingZeroIndex)];\n}\nfunction getBigIntFromBaseX(value, alphabet4) {\n  const base = BigInt(alphabet4.length);\n  return [...value].reduce((sum, char) => sum * base + BigInt(alphabet4.indexOf(char)), 0n);\n}\nfunction getBaseXFromBigInt(value, alphabet4) {\n  const base = BigInt(alphabet4.length);\n  const tailChars = [];\n  while (value > 0n) {\n    tailChars.unshift(alphabet4[Number(value % base)]);\n    value /= base;\n  }\n  return tailChars.join(\"\");\n}\n\n// src/base10.ts\nvar alphabet = \"0123456789\";\nvar getBase10Encoder = () => getBaseXEncoder(alphabet);\nvar getBase10Decoder = () => getBaseXDecoder(alphabet);\nvar getBase10Codec = () => getBaseXCodec(alphabet);\nvar getBase16Encoder = () => createEncoder({\n  getSizeFromValue: (value) => Math.ceil(value.length / 2),\n  write(value, bytes, offset) {\n    const lowercaseValue = value.toLowerCase();\n    assertValidBaseString(\"0123456789abcdef\", lowercaseValue, value);\n    const matches = lowercaseValue.match(/.{1,2}/g);\n    const hexBytes = matches ? matches.map((byte) => parseInt(byte, 16)) : [];\n    bytes.set(hexBytes, offset);\n    return hexBytes.length + offset;\n  }\n});\nvar getBase16Decoder = () => createDecoder({\n  read(bytes, offset) {\n    const value = bytes.slice(offset).reduce((str, byte) => str + byte.toString(16).padStart(2, \"0\"), \"\");\n    return [value, bytes.length];\n  }\n});\nvar getBase16Codec = () => combineCodec(getBase16Encoder(), getBase16Decoder());\n\n// src/base58.ts\nvar alphabet2 = \"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\";\nvar getBase58Encoder = () => getBaseXEncoder(alphabet2);\nvar getBase58Decoder = () => getBaseXDecoder(alphabet2);\nvar getBase58Codec = () => getBaseXCodec(alphabet2);\nvar getBaseXResliceEncoder = (alphabet4, bits) => createEncoder({\n  getSizeFromValue: (value) => Math.floor(value.length * bits / 8),\n  write(value, bytes, offset) {\n    assertValidBaseString(alphabet4, value);\n    if (value === \"\")\n      return offset;\n    const charIndices = [...value].map((c) => alphabet4.indexOf(c));\n    const reslicedBytes = reslice(charIndices, bits, 8, false);\n    bytes.set(reslicedBytes, offset);\n    return reslicedBytes.length + offset;\n  }\n});\nvar getBaseXResliceDecoder = (alphabet4, bits) => createDecoder({\n  read(rawBytes, offset = 0) {\n    const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);\n    if (bytes.length === 0)\n      return [\"\", rawBytes.length];\n    const charIndices = reslice([...bytes], 8, bits, true);\n    return [charIndices.map((i) => alphabet4[i]).join(\"\"), rawBytes.length];\n  }\n});\nvar getBaseXResliceCodec = (alphabet4, bits) => combineCodec(getBaseXResliceEncoder(alphabet4, bits), getBaseXResliceDecoder(alphabet4, bits));\nfunction reslice(input, inputBits, outputBits, useRemainder) {\n  const output = [];\n  let accumulator = 0;\n  let bitsInAccumulator = 0;\n  const mask = (1 << outputBits) - 1;\n  for (const value of input) {\n    accumulator = accumulator << inputBits | value;\n    bitsInAccumulator += inputBits;\n    while (bitsInAccumulator >= outputBits) {\n      bitsInAccumulator -= outputBits;\n      output.push(accumulator >> bitsInAccumulator & mask);\n    }\n  }\n  if (useRemainder && bitsInAccumulator > 0) {\n    output.push(accumulator << outputBits - bitsInAccumulator & mask);\n  }\n  return output;\n}\nvar getBase64Encoder = () => {\n  {\n    return createEncoder({\n      getSizeFromValue: (value) => {\n        try {\n          return atob(value).length;\n        } catch (e2) {\n          throw new Error(`Expected a string of base 64, got [${value}].`);\n        }\n      },\n      write(value, bytes, offset) {\n        try {\n          const bytesToAdd = atob(value).split(\"\").map((c) => c.charCodeAt(0));\n          bytes.set(bytesToAdd, offset);\n          return bytesToAdd.length + offset;\n        } catch (e2) {\n          throw new Error(`Expected a string of base 64, got [${value}].`);\n        }\n      }\n    });\n  }\n};\nvar getBase64Decoder = () => {\n  {\n    return createDecoder({\n      read(bytes, offset = 0) {\n        const slice = bytes.slice(offset);\n        const value = btoa(String.fromCharCode(...slice));\n        return [value, bytes.length];\n      }\n    });\n  }\n};\nvar getBase64Codec = () => combineCodec(getBase64Encoder(), getBase64Decoder());\n\n// src/null-characters.ts\nvar removeNullCharacters = (value) => (\n  // eslint-disable-next-line no-control-regex\n  value.replace(/\\u0000/g, \"\")\n);\nvar padNullCharacters = (value, chars) => value.padEnd(chars, \"\\0\");\n\n// ../text-encoding-impl/dist/index.browser.js\nvar e = globalThis.TextDecoder;\nvar o = globalThis.TextEncoder;\n\n// src/utf8.ts\nvar getUtf8Encoder = () => {\n  let textEncoder;\n  return createEncoder({\n    getSizeFromValue: (value) => (textEncoder ||= new o()).encode(value).length,\n    write: (value, bytes, offset) => {\n      const bytesToAdd = (textEncoder ||= new o()).encode(value);\n      bytes.set(bytesToAdd, offset);\n      return offset + bytesToAdd.length;\n    }\n  });\n};\nvar getUtf8Decoder = () => {\n  let textDecoder;\n  return createDecoder({\n    read(bytes, offset) {\n      const value = (textDecoder ||= new e()).decode(bytes.slice(offset));\n      return [removeNullCharacters(value), bytes.length];\n    }\n  });\n};\nvar getUtf8Codec = () => combineCodec(getUtf8Encoder(), getUtf8Decoder());\n\n// src/string.ts\nfunction getStringEncoder(config = {}) {\n  const size = config.size ?? getU32Encoder();\n  const encoding = config.encoding ?? getUtf8Encoder();\n  if (size === \"variable\") {\n    return encoding;\n  }\n  if (typeof size === \"number\") {\n    return fixEncoder(encoding, size);\n  }\n  return createEncoder({\n    getSizeFromValue: (value) => {\n      const contentSize = getEncodedSize(value, encoding);\n      return getEncodedSize(contentSize, size) + contentSize;\n    },\n    write: (value, bytes, offset) => {\n      const contentSize = getEncodedSize(value, encoding);\n      offset = size.write(contentSize, bytes, offset);\n      return encoding.write(value, bytes, offset);\n    }\n  });\n}\nfunction getStringDecoder(config = {}) {\n  const size = config.size ?? getU32Decoder();\n  const encoding = config.encoding ?? getUtf8Decoder();\n  if (size === \"variable\") {\n    return encoding;\n  }\n  if (typeof size === \"number\") {\n    return fixDecoder(encoding, size);\n  }\n  return createDecoder({\n    read: (bytes, offset = 0) => {\n      assertByteArrayIsNotEmptyForCodec(\"string\", bytes, offset);\n      const [lengthBigInt, lengthOffset] = size.read(bytes, offset);\n      const length = Number(lengthBigInt);\n      offset = lengthOffset;\n      const contentBytes = bytes.slice(offset, offset + length);\n      assertByteArrayHasEnoughBytesForCodec(\"string\", length, contentBytes);\n      const [value, contentOffset] = encoding.read(contentBytes, 0);\n      offset += contentOffset;\n      return [value, offset];\n    }\n  });\n}\nfunction getStringCodec(config = {}) {\n  return combineCodec(getStringEncoder(config), getStringDecoder(config));\n}\n\nexport { assertValidBaseString, getBase10Codec, getBase10Decoder, getBase10Encoder, getBase16Codec, getBase16Decoder, getBase16Encoder, getBase58Codec, getBase58Decoder, getBase58Encoder, getBase64Codec, getBase64Decoder, getBase64Encoder, getBaseXCodec, getBaseXDecoder, getBaseXEncoder, getBaseXResliceCodec, getBaseXResliceDecoder, getBaseXResliceEncoder, getStringCodec, getStringDecoder, getStringEncoder, getUtf8Codec, getUtf8Decoder, getUtf8Encoder, padNullCharacters, removeNullCharacters };\n","import { mapEncoder, combineCodec } from '@solana/codecs-core';\nimport { getStringEncoder, getStringDecoder, getBase58Encoder, getBase58Decoder } from '@solana/codecs-strings';\nimport { assertKeyExporterIsAvailable, assertDigestCapabilityIsAvailable } from '@solana/assertions';\n\n// src/address.ts\nvar memoizedBase58Encoder;\nvar memoizedBase58Decoder;\nfunction getMemoizedBase58Encoder() {\n  if (!memoizedBase58Encoder)\n    memoizedBase58Encoder = getBase58Encoder();\n  return memoizedBase58Encoder;\n}\nfunction getMemoizedBase58Decoder() {\n  if (!memoizedBase58Decoder)\n    memoizedBase58Decoder = getBase58Decoder();\n  return memoizedBase58Decoder;\n}\nfunction isAddress(putativeAddress) {\n  if (\n    // Lowest address (32 bytes of zeroes)\n    putativeAddress.length < 32 || // Highest address (32 bytes of 255)\n    putativeAddress.length > 44\n  ) {\n    return false;\n  }\n  const base58Encoder = getMemoizedBase58Encoder();\n  const bytes = base58Encoder.encode(putativeAddress);\n  const numBytes = bytes.byteLength;\n  if (numBytes !== 32) {\n    return false;\n  }\n  return true;\n}\nfunction assertIsAddress(putativeAddress) {\n  try {\n    if (\n      // Lowest address (32 bytes of zeroes)\n      putativeAddress.length < 32 || // Highest address (32 bytes of 255)\n      putativeAddress.length > 44\n    ) {\n      throw new Error(\"Expected input string to decode to a byte array of length 32.\");\n    }\n    const base58Encoder = getMemoizedBase58Encoder();\n    const bytes = base58Encoder.encode(putativeAddress);\n    const numBytes = bytes.byteLength;\n    if (numBytes !== 32) {\n      throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n    }\n  } catch (e) {\n    throw new Error(`\\`${putativeAddress}\\` is not a base-58 encoded address`, {\n      cause: e\n    });\n  }\n}\nfunction address(putativeAddress) {\n  assertIsAddress(putativeAddress);\n  return putativeAddress;\n}\nfunction getAddressEncoder() {\n  return mapEncoder(\n    getStringEncoder({ encoding: getMemoizedBase58Encoder(), size: 32 }),\n    (putativeAddress) => address(putativeAddress)\n  );\n}\nfunction getAddressDecoder() {\n  return getStringDecoder({ encoding: getMemoizedBase58Decoder(), size: 32 });\n}\nfunction getAddressCodec() {\n  return combineCodec(getAddressEncoder(), getAddressDecoder());\n}\nfunction getAddressComparator() {\n  return new Intl.Collator(\"en\", {\n    caseFirst: \"lower\",\n    ignorePunctuation: false,\n    localeMatcher: \"best fit\",\n    numeric: false,\n    sensitivity: \"variant\",\n    usage: \"sort\"\n  }).compare;\n}\n\n// src/vendor/noble/ed25519.ts\nvar D = 37095705934669439343138083508754565189542113879843219016388785533085940283555n;\nvar P = 57896044618658097711785492504343953926634992332820282019728792003956564819949n;\nvar RM1 = 19681161376707505956807079304988542015446066515923890162744021073123829784752n;\nfunction mod(a) {\n  const r = a % P;\n  return r >= 0n ? r : P + r;\n}\nfunction pow2(x, power) {\n  let r = x;\n  while (power-- > 0n) {\n    r *= r;\n    r %= P;\n  }\n  return r;\n}\nfunction pow_2_252_3(x) {\n  const x2 = x * x % P;\n  const b2 = x2 * x % P;\n  const b4 = pow2(b2, 2n) * b2 % P;\n  const b5 = pow2(b4, 1n) * x % P;\n  const b10 = pow2(b5, 5n) * b5 % P;\n  const b20 = pow2(b10, 10n) * b10 % P;\n  const b40 = pow2(b20, 20n) * b20 % P;\n  const b80 = pow2(b40, 40n) * b40 % P;\n  const b160 = pow2(b80, 80n) * b80 % P;\n  const b240 = pow2(b160, 80n) * b80 % P;\n  const b250 = pow2(b240, 10n) * b10 % P;\n  const pow_p_5_8 = pow2(b250, 2n) * x % P;\n  return pow_p_5_8;\n}\nfunction uvRatio(u, v) {\n  const v3 = mod(v * v * v);\n  const v7 = mod(v3 * v3 * v);\n  const pow = pow_2_252_3(u * v7);\n  let x = mod(u * v3 * pow);\n  const vx2 = mod(v * x * x);\n  const root1 = x;\n  const root2 = mod(x * RM1);\n  const useRoot1 = vx2 === u;\n  const useRoot2 = vx2 === mod(-u);\n  const noRoot = vx2 === mod(-u * RM1);\n  if (useRoot1)\n    x = root1;\n  if (useRoot2 || noRoot)\n    x = root2;\n  if ((mod(x) & 1n) === 1n)\n    x = mod(-x);\n  if (!useRoot1 && !useRoot2) {\n    return null;\n  }\n  return x;\n}\nfunction pointIsOnCurve(y, lastByte) {\n  const y2 = mod(y * y);\n  const u = mod(y2 - 1n);\n  const v = mod(D * y2 + 1n);\n  const x = uvRatio(u, v);\n  if (x === null) {\n    return false;\n  }\n  const isLastByteOdd = (lastByte & 128) !== 0;\n  if (x === 0n && isLastByteOdd) {\n    return false;\n  }\n  return true;\n}\n\n// src/curve.ts\nfunction byteToHex(byte) {\n  const hexString = byte.toString(16);\n  if (hexString.length === 1) {\n    return `0${hexString}`;\n  } else {\n    return hexString;\n  }\n}\nfunction decompressPointBytes(bytes) {\n  const hexString = bytes.reduce((acc, byte, ii) => `${byteToHex(ii === 31 ? byte & ~128 : byte)}${acc}`, \"\");\n  const integerLiteralString = `0x${hexString}`;\n  return BigInt(integerLiteralString);\n}\nasync function compressedPointBytesAreOnCurve(bytes) {\n  if (bytes.byteLength !== 32) {\n    return false;\n  }\n  const y = decompressPointBytes(bytes);\n  return pointIsOnCurve(y, bytes[31]);\n}\n\n// src/program-derived-address.ts\nfunction isProgramDerivedAddress(value) {\n  return Array.isArray(value) && value.length === 2 && typeof value[0] === \"string\" && typeof value[1] === \"number\" && value[1] >= 0 && value[1] <= 255 && isAddress(value[0]);\n}\nfunction assertIsProgramDerivedAddress(value) {\n  const validFormat = Array.isArray(value) && value.length === 2 && typeof value[0] === \"string\" && typeof value[1] === \"number\";\n  if (!validFormat) {\n    throw new Error(\n      `Expected given program derived address to have the following format: [Address, ProgramDerivedAddressBump].`\n    );\n  }\n  if (value[1] < 0 || value[1] > 255) {\n    throw new Error(`Expected program derived address bump to be in the range [0, 255], got: ${value[1]}.`);\n  }\n  assertIsAddress(value[0]);\n}\nvar MAX_SEED_LENGTH = 32;\nvar MAX_SEEDS = 16;\nvar PDA_MARKER_BYTES = [\n  // The string 'ProgramDerivedAddress'\n  80,\n  114,\n  111,\n  103,\n  114,\n  97,\n  109,\n  68,\n  101,\n  114,\n  105,\n  118,\n  101,\n  100,\n  65,\n  100,\n  100,\n  114,\n  101,\n  115,\n  115\n];\nvar PointOnCurveError = class extends Error {\n};\nasync function createProgramDerivedAddress({ programAddress, seeds }) {\n  await assertDigestCapabilityIsAvailable();\n  if (seeds.length > MAX_SEEDS) {\n    throw new Error(`A maximum of ${MAX_SEEDS} seeds may be supplied when creating an address`);\n  }\n  let textEncoder;\n  const seedBytes = seeds.reduce((acc, seed, ii) => {\n    const bytes = typeof seed === \"string\" ? (textEncoder ||= new TextEncoder()).encode(seed) : seed;\n    if (bytes.byteLength > MAX_SEED_LENGTH) {\n      throw new Error(`The seed at index ${ii} exceeds the maximum length of 32 bytes`);\n    }\n    acc.push(...bytes);\n    return acc;\n  }, []);\n  const base58EncodedAddressCodec = getAddressCodec();\n  const programAddressBytes = base58EncodedAddressCodec.encode(programAddress);\n  const addressBytesBuffer = await crypto.subtle.digest(\n    \"SHA-256\",\n    new Uint8Array([...seedBytes, ...programAddressBytes, ...PDA_MARKER_BYTES])\n  );\n  const addressBytes = new Uint8Array(addressBytesBuffer);\n  if (await compressedPointBytesAreOnCurve(addressBytes)) {\n    throw new PointOnCurveError(\"Invalid seeds; point must fall off the Ed25519 curve\");\n  }\n  return base58EncodedAddressCodec.decode(addressBytes);\n}\nasync function getProgramDerivedAddress({\n  programAddress,\n  seeds\n}) {\n  let bumpSeed = 255;\n  while (bumpSeed > 0) {\n    try {\n      const address2 = await createProgramDerivedAddress({\n        programAddress,\n        seeds: [...seeds, new Uint8Array([bumpSeed])]\n      });\n      return [address2, bumpSeed];\n    } catch (e) {\n      if (e instanceof PointOnCurveError) {\n        bumpSeed--;\n      } else {\n        throw e;\n      }\n    }\n  }\n  throw new Error(\"Unable to find a viable program address bump seed\");\n}\nasync function createAddressWithSeed({ baseAddress, programAddress, seed }) {\n  const { encode, decode } = getAddressCodec();\n  const seedBytes = typeof seed === \"string\" ? new TextEncoder().encode(seed) : seed;\n  if (seedBytes.byteLength > MAX_SEED_LENGTH) {\n    throw new Error(`The seed exceeds the maximum length of 32 bytes`);\n  }\n  const programAddressBytes = encode(programAddress);\n  if (programAddressBytes.length >= PDA_MARKER_BYTES.length && programAddressBytes.slice(-PDA_MARKER_BYTES.length).every((byte, index) => byte === PDA_MARKER_BYTES[index])) {\n    throw new Error(`programAddress cannot end with the PDA marker`);\n  }\n  const addressBytesBuffer = await crypto.subtle.digest(\n    \"SHA-256\",\n    new Uint8Array([...encode(baseAddress), ...seedBytes, ...programAddressBytes])\n  );\n  const addressBytes = new Uint8Array(addressBytesBuffer);\n  return decode(addressBytes);\n}\nasync function getAddressFromPublicKey(publicKey) {\n  await assertKeyExporterIsAvailable();\n  if (publicKey.type !== \"public\" || publicKey.algorithm.name !== \"Ed25519\") {\n    throw new Error(\"The `CryptoKey` must be an `Ed25519` public key\");\n  }\n  const publicKeyBytes = await crypto.subtle.exportKey(\"raw\", publicKey);\n  return getAddressDecoder().decode(new Uint8Array(publicKeyBytes));\n}\n\nexport { address, assertIsAddress, assertIsProgramDerivedAddress, createAddressWithSeed, getAddressCodec, getAddressComparator, getAddressDecoder, getAddressEncoder, getAddressFromPublicKey, getProgramDerivedAddress, isAddress, isProgramDerivedAddress };\n","import { type Address, assertIsAddress } from '@solana/addresses';\nimport { pipe } from '@solana/functional';\nimport type { IAccountMeta, IInstruction } from '@solana/instructions';\nimport { AccountRole } from '@solana/instructions';\nimport type { SignatureBytes } from '@solana/keys';\nimport {\n    appendTransactionInstruction,\n    type Blockhash,\n    createTransaction,\n    type IDurableNonceTransaction,\n    isAdvanceNonceAccountInstruction,\n    type ITransactionWithBlockhashLifetime,\n    type ITransactionWithFeePayer,\n    type ITransactionWithSignatures,\n    type Nonce,\n    setTransactionFeePayer,\n    setTransactionLifetimeUsingBlockhash,\n    setTransactionLifetimeUsingDurableNonce,\n    type Transaction,\n} from '@solana/transactions';\nimport type {\n    MessageAccountKeys,\n    MessageCompiledInstruction,\n    PublicKey,\n    VersionedMessage,\n    VersionedTransaction,\n} from '@solana/web3.js';\n\nfunction convertAccount(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    accountIndex: number,\n): IAccountMeta {\n    const accountPublicKey = accountKeys.get(accountIndex);\n    if (!accountPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find account address at index ${accountIndex}`);\n    }\n    const isSigner = message.isAccountSigner(accountIndex);\n    const isWritable = message.isAccountWritable(accountIndex);\n\n    const role = isSigner\n        ? isWritable\n            ? AccountRole.WRITABLE_SIGNER\n            : AccountRole.READONLY_SIGNER\n        : isWritable\n          ? AccountRole.WRITABLE\n          : AccountRole.READONLY;\n\n    return {\n        address: accountPublicKey.toBase58() as Address,\n        role,\n    };\n}\n\nfunction convertInstruction(\n    message: VersionedMessage,\n    accountKeys: MessageAccountKeys,\n    instruction: MessageCompiledInstruction,\n): IInstruction {\n    const programAddressPublicKey = accountKeys.get(instruction.programIdIndex);\n    if (!programAddressPublicKey) {\n        // TODO coded error\n        throw new Error(`Could not find program address at index ${instruction.programIdIndex}`);\n    }\n\n    const accounts = instruction.accountKeyIndexes.map(accountIndex =>\n        convertAccount(message, accountKeys, accountIndex),\n    );\n\n    return {\n        programAddress: programAddressPublicKey.toBase58() as Address,\n        ...(accounts.length ? { accounts } : {}),\n        ...(instruction.data.length ? { data: instruction.data } : {}),\n    };\n}\n\nfunction convertSignatures(\n    transaction: VersionedTransaction,\n    staticAccountKeys: PublicKey[],\n): ITransactionWithSignatures['signatures'] {\n    return transaction.signatures.reduce((acc, sig, index) => {\n        // legacy web3js includes a fake all 0 signature if it hasn't been signed\n        // we don't do that for the new tx model. So just skip if it's all 0s\n        const allZeros = sig.every(byte => byte === 0);\n        if (allZeros) return acc;\n\n        const address = staticAccountKeys[index].toBase58() as Address;\n        return { ...acc, [address]: sig as SignatureBytes };\n    }, {});\n}\n\nexport function fromVersionedTransactionWithBlockhash(\n    transaction: VersionedTransaction,\n    lastValidBlockHeight?: bigint,\n): Transaction & ITransactionWithFeePayer & ITransactionWithBlockhashLifetime {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    const blockhashLifetime = {\n        blockhash: transaction.message.recentBlockhash as Blockhash,\n        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n, // U64 MAX\n    };\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction),\n    );\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Address, tx),\n        tx => setTransactionLifetimeUsingBlockhash(blockhashLifetime, tx),\n        tx =>\n            instructions.reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx),\n    );\n}\n\nexport function fromVersionedTransactionWithDurableNonce(\n    transaction: VersionedTransaction,\n): Transaction & ITransactionWithFeePayer & IDurableNonceTransaction {\n    // TODO: add support for address table lookups\n    // - will need to take `AddressLookupTableAccounts[]` as input\n    // - will need to convert account instructions to `IAccountLookupMeta` when appropriate\n    if (transaction.message.addressTableLookups.length > 0) {\n        // TODO coded error\n        throw new Error('Cannot convert transaction with addressTableLookups');\n    }\n\n    const accountKeys = transaction.message.getAccountKeys();\n\n    // Fee payer is first account\n    const feePayer = accountKeys.staticAccountKeys[0];\n    // TODO: coded error\n    if (!feePayer) throw new Error('No fee payer set in VersionedTransaction');\n\n    const instructions = transaction.message.compiledInstructions.map(instruction =>\n        convertInstruction(transaction.message, accountKeys, instruction),\n    );\n\n    // Check first instruction is durable nonce + extract params\n    if (instructions.length === 0) {\n        // TODO: coded error\n        throw new Error('transaction with no instructions cannot be durable nonce transaction');\n    }\n\n    if (!isAdvanceNonceAccountInstruction(instructions[0])) {\n        // TODO: coded error\n        throw new Error('transaction first instruction is not advance nonce account instruction');\n    }\n\n    // We know these accounts are defined because we checked `isAdvanceNonceAccountInstruction`\n    const nonceAccountAddress = instructions[0].accounts![0].address;\n    assertIsAddress(nonceAccountAddress);\n\n    const nonceAuthorityAddress = instructions[0].accounts![2].address;\n    assertIsAddress(nonceAuthorityAddress);\n\n    const durableNonceLifetime = {\n        nonce: transaction.message.recentBlockhash as Nonce,\n        nonceAccountAddress,\n        nonceAuthorityAddress,\n    };\n\n    const signatures = convertSignatures(transaction, accountKeys.staticAccountKeys);\n\n    return pipe(\n        createTransaction({ version: transaction.version }),\n        tx => setTransactionFeePayer(feePayer.toBase58() as Address, tx),\n        tx => setTransactionLifetimeUsingDurableNonce(durableNonceLifetime, tx),\n        tx =>\n            instructions.slice(1).reduce((acc, instruction) => {\n                return appendTransactionInstruction(instruction, acc);\n            }, tx),\n        tx => (transaction.signatures.length ? { ...tx, signatures } : tx),\n    );\n}\n"]}

package/dist/index.development.js

@@ -7,7 +7,69 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return publicKey.toBase58();
   }
 
-  // src/keypair.ts
+  // ../codecs-core/dist/index.browser.js
+  function getEncodedSize(value, encoder) {
+    return "fixedSize" in encoder ? encoder.fixedSize : encoder.getSizeFromValue(value);
+  }
+  function createEncoder(encoder) {
+    return Object.freeze({
+      ...encoder,
+      encode: (value) => {
+        const bytes = new Uint8Array(getEncodedSize(value, encoder));
+        encoder.write(value, bytes, 0);
+        return bytes;
+      }
+    });
+  }
+
+  // ../codecs-strings/dist/index.browser.js
+  function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+    if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+      throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
+    }
+  }
+  var getBaseXEncoder = (alphabet4) => {
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "")
+          return value.length;
+        const base10Number = getBigIntFromBaseX(tailChars, alphabet4);
+        return leadingZeroes.length + Math.ceil(base10Number.toString(16).length / 2);
+      },
+      write(value, bytes, offset) {
+        assertValidBaseString(alphabet4, value);
+        if (value === "")
+          return offset;
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "") {
+          bytes.set(new Uint8Array(leadingZeroes.length).fill(0), offset);
+          return offset + leadingZeroes.length;
+        }
+        let base10Number = getBigIntFromBaseX(tailChars, alphabet4);
+        const tailBytes = [];
+        while (base10Number > 0n) {
+          tailBytes.unshift(Number(base10Number % 256n));
+          base10Number /= 256n;
+        }
+        const bytesToAdd = [...Array(leadingZeroes.length).fill(0), ...tailBytes];
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
+      }
+    });
+  };
+  function partitionLeadingZeroes(value, zeroCharacter) {
+    const leadingZeroIndex = [...value].findIndex((c) => c !== zeroCharacter);
+    return leadingZeroIndex === -1 ? [value, ""] : [value.slice(0, leadingZeroIndex), value.slice(leadingZeroIndex)];
+  }
+  function getBigIntFromBaseX(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    return [...value].reduce((sum, char) => sum * base + BigInt(alphabet4.indexOf(char)), 0n);
+  }
+  var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+  var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+
+  // ../keys/dist/index.browser.js
   function addPkcs8Header(bytes) {
     return new Uint8Array([
       /**
@@ -54,66 +116,26 @@ this.globalThis.solanaWeb3 = (function (exports) {
       ...bytes
     ]);
   }
+  async function createPrivateKeyFromBytes(bytes, extractable) {
+    if (bytes.byteLength !== 32) {
+      throw new Error("Private key bytes must be of length 32");
+    }
+    const privateKeyBytesPkcs8 = addPkcs8Header(bytes);
+    return await crypto.subtle.importKey("pkcs8", privateKeyBytesPkcs8, "Ed25519", extractable != null ? extractable : false, ["sign"]);
+  }
+
+  // src/keypair.ts
   async function fromLegacyKeypair(keypair, extractable) {
-    const publicKey = await crypto.subtle.importKey("raw", keypair.publicKey.toBytes(), "Ed25519", true, [
-      "verify"
+    const [publicKey, privateKey] = await Promise.all([
+      crypto.subtle.importKey("raw", keypair.publicKey.toBytes(), "Ed25519", true, ["verify"]),
+      createPrivateKeyFromBytes(keypair.secretKey.slice(0, 32), extractable)
     ]);
-    const privateKeyBytesPkcs8 = addPkcs8Header(keypair.secretKey.slice(0, 32));
-    const privateKey = await crypto.subtle.importKey(
-      "pkcs8",
-      privateKeyBytesPkcs8,
-      "Ed25519",
-      extractable ?? false,
-      ["sign"]
-    );
     return {
       privateKey,
       publicKey
     };
   }
 
-  // ../codecs-strings/dist/index.browser.js
-  function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
-    if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
-      throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
-    }
-  }
-  var getBaseXEncoder = (alphabet4) => {
-    const base = alphabet4.length;
-    const baseBigInt = BigInt(base);
-    return {
-      description: `base${base}`,
-      encode(value) {
-        assertValidBaseString(alphabet4, value);
-        if (value === "")
-          return new Uint8Array();
-        const chars = [...value];
-        let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
-        trailIndex = trailIndex === -1 ? chars.length : trailIndex;
-        const leadingZeroes = Array(trailIndex).fill(0);
-        if (trailIndex === chars.length)
-          return Uint8Array.from(leadingZeroes);
-        const tailChars = chars.slice(trailIndex);
-        let base10Number = 0n;
-        let baseXPower = 1n;
-        for (let i = tailChars.length - 1; i >= 0; i -= 1) {
-          base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
-          baseXPower *= baseBigInt;
-        }
-        const tailBytes = [];
-        while (base10Number > 0n) {
-          tailBytes.unshift(Number(base10Number % 256n));
-          base10Number /= 256n;
-        }
-        return Uint8Array.from(leadingZeroes.concat(tailBytes));
-      },
-      fixedSize: null,
-      maxSize: null
-    };
-  };
-  var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-  var getBase58Encoder = () => getBaseXEncoder(alphabet2);
-
   // ../addresses/dist/index.browser.js
   var memoizedBase58Encoder;
   function getMemoizedBase58Encoder() {
@@ -121,23 +143,23 @@ this.globalThis.solanaWeb3 = (function (exports) {
       memoizedBase58Encoder = getBase58Encoder();
     return memoizedBase58Encoder;
   }
-  function assertIsAddress(putativeBase58EncodedAddress) {
+  function assertIsAddress(putativeAddress) {
     try {
       if (
         // Lowest address (32 bytes of zeroes)
-        putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
-        putativeBase58EncodedAddress.length > 44
+        putativeAddress.length < 32 || // Highest address (32 bytes of 255)
+        putativeAddress.length > 44
       ) {
         throw new Error("Expected input string to decode to a byte array of length 32.");
       }
       const base58Encoder = getMemoizedBase58Encoder();
-      const bytes = base58Encoder.encode(putativeBase58EncodedAddress);
+      const bytes = base58Encoder.encode(putativeAddress);
       const numBytes = bytes.byteLength;
       if (numBytes !== 32) {
         throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
       }
     } catch (e2) {
-      throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
+      throw new Error(`\`${putativeAddress}\` is not a base-58 encoded address`, {
         cause: e2
       });
     }
@@ -206,6 +228,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
     0] = "READONLY";
     return AccountRole22;
   })(AccountRole2 || {});
+  function isSignerRole(role) {
+    return role >= 2;
+  }
   var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
   var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
   function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
@@ -223,12 +248,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
   function isAdvanceNonceAccountInstruction(instruction) {
+    var _a;
     return instruction.programAddress === SYSTEM_PROGRAM_ADDRESS && // Test for `AdvanceNonceAccount` instruction data
     instruction.data != null && isAdvanceNonceAccountInstructionData(instruction.data) && // Test for exactly 3 accounts
-    instruction.accounts?.length === 3 && // First account is nonce account address
+    ((_a = instruction.accounts) == null ? void 0 : _a.length) === 3 && // First account is nonce account address
     instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole2.WRITABLE && // Second account is recent blockhashes sysvar
     instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole2.READONLY && // Third account is nonce authority account
-    instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole2.READONLY_SIGNER;
+    instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
   }
   function isAdvanceNonceAccountInstructionData(data) {
     return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -236,21 +262,38 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function isDurableNonceTransaction(transaction) {
     return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
   }
+  function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
+    return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
+  }
   function setTransactionLifetimeUsingDurableNonce({
     nonce,
     nonceAccountAddress,
     nonceAuthorityAddress
   }, transaction) {
-    const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
-    if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
-      return transaction;
+    let newInstructions;
+    const firstInstruction = transaction.instructions[0];
+    if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
+      if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
+        if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
+          return transaction;
+        } else {
+          newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
+        }
+      } else {
+        newInstructions = [
+          createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+          ...transaction.instructions.slice(1)
+        ];
+      }
+    } else {
+      newInstructions = [
+        createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
+        ...transaction.instructions
+      ];
     }
     const out = {
       ...getUnsignedTransaction(transaction),
-      instructions: [
-        createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
-        ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
-      ],
+      instructions: newInstructions,
       lifetimeConstraint: {
         nonce
       }
@@ -325,7 +368,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("No fee payer set in VersionedTransaction");
     const blockhashLifetime = {
       blockhash: transaction.message.recentBlockhash,
-      lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+      lastValidBlockHeight: lastValidBlockHeight != null ? lastValidBlockHeight : 2n ** 64n - 1n
       // U64 MAX
     };
     const instructions = transaction.message.compiledInstructions.map(