@solana/web3.js 2.0.0-experimental.58b1699 → 2.0.0-experimental.5b8e43b

package/dist/index.development.js

@@ -138,23 +138,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error(`Codec [${codecDescription}] expected ${expected} bytes, got ${bytesLength}.`);
     }
   }
-  var mergeBytes = (byteArrays) => {
-    const nonEmptyByteArrays = byteArrays.filter((arr) => arr.length);
-    if (nonEmptyByteArrays.length === 0) {
-      return byteArrays.length ? byteArrays[0] : new Uint8Array();
-    }
-    if (nonEmptyByteArrays.length === 1) {
-      return nonEmptyByteArrays[0];
-    }
-    const totalLength = nonEmptyByteArrays.reduce((total, arr) => total + arr.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    nonEmptyByteArrays.forEach((arr) => {
-      result.set(arr, offset);
-      offset += arr.length;
-    });
-    return result;
-  };
   var padBytes = (bytes, length) => {
     if (bytes.length >= length)
       return bytes;
@@ -163,66 +146,100 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return paddedBytes;
   };
   var fixBytes = (bytes, length) => padBytes(bytes.length <= length ? bytes : bytes.slice(0, length), length);
-  function combineCodec(encoder, decoder, description) {
-    if (encoder.fixedSize !== decoder.fixedSize) {
+  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;
+      }
+    });
+  }
+  function createDecoder(decoder) {
+    return Object.freeze({
+      ...decoder,
+      decode: (bytes, offset = 0) => decoder.read(bytes, offset)[0]
+    });
+  }
+  function isFixedSize(codec) {
+    return "fixedSize" in codec && typeof codec.fixedSize === "number";
+  }
+  function assertIsFixedSize(codec, message) {
+    if (!isFixedSize(codec)) {
+      throw new Error(message != null ? message : "Expected a fixed-size codec, got a variable-size one.");
+    }
+  }
+  function isVariableSize(codec) {
+    return !isFixedSize(codec);
+  }
+  function combineCodec(encoder, decoder) {
+    if (isFixedSize(encoder) !== isFixedSize(decoder)) {
+      throw new Error(`Encoder and decoder must either both be fixed-size or variable-size.`);
+    }
+    if (isFixedSize(encoder) && isFixedSize(decoder) && encoder.fixedSize !== decoder.fixedSize) {
       throw new Error(
         `Encoder and decoder must have the same fixed size, got [${encoder.fixedSize}] and [${decoder.fixedSize}].`
       );
     }
-    if (encoder.maxSize !== decoder.maxSize) {
+    if (!isFixedSize(encoder) && !isFixedSize(decoder) && encoder.maxSize !== decoder.maxSize) {
       throw new Error(
         `Encoder and decoder must have the same max size, got [${encoder.maxSize}] and [${decoder.maxSize}].`
       );
     }
-    if (description === void 0 && encoder.description !== decoder.description) {
-      throw new Error(
-        `Encoder and decoder must have the same description, got [${encoder.description}] and [${decoder.description}]. Pass a custom description as a third argument if you want to override the description and bypass this error.`
-      );
-    }
     return {
+      ...decoder,
+      ...encoder,
       decode: decoder.decode,
-      description: description ?? encoder.description,
       encode: encoder.encode,
-      fixedSize: encoder.fixedSize,
-      maxSize: encoder.maxSize
+      read: decoder.read,
+      write: encoder.write
     };
   }
-  function fixCodecHelper(data, fixedBytes, description) {
-    return {
-      description: description ?? `fixed(${fixedBytes}, ${data.description})`,
+  function fixEncoder(encoder, fixedBytes) {
+    return createEncoder({
       fixedSize: fixedBytes,
-      maxSize: fixedBytes
-    };
-  }
-  function fixEncoder(encoder, fixedBytes, description) {
-    return {
-      ...fixCodecHelper(encoder, fixedBytes, description),
-      encode: (value) => fixBytes(encoder.encode(value), fixedBytes)
-    };
+      write: (value, bytes, offset) => {
+        const variableByteArray = encoder.encode(value);
+        const fixedByteArray = variableByteArray.length > fixedBytes ? variableByteArray.slice(0, fixedBytes) : variableByteArray;
+        bytes.set(fixedByteArray, offset);
+        return offset + fixedBytes;
+      }
+    });
   }
-  function fixDecoder(decoder, fixedBytes, description) {
-    return {
-      ...fixCodecHelper(decoder, fixedBytes, description),
-      decode: (bytes, offset = 0) => {
+  function fixDecoder(decoder, fixedBytes) {
+    return createDecoder({
+      fixedSize: fixedBytes,
+      read: (bytes, offset) => {
         assertByteArrayHasEnoughBytesForCodec("fixCodec", fixedBytes, bytes, offset);
         if (offset > 0 || bytes.length > fixedBytes) {
           bytes = bytes.slice(offset, offset + fixedBytes);
         }
-        if (decoder.fixedSize !== null) {
+        if (isFixedSize(decoder)) {
           bytes = fixBytes(bytes, decoder.fixedSize);
         }
-        const [value] = decoder.decode(bytes, 0);
+        const [value] = decoder.read(bytes, 0);
         return [value, offset + fixedBytes];
       }
-    };
+    });
   }
   function mapEncoder(encoder, unmap) {
-    return {
-      description: encoder.description,
-      encode: (value) => encoder.encode(unmap(value)),
-      fixedSize: encoder.fixedSize,
-      maxSize: encoder.maxSize
-    };
+    return createEncoder({
+      ...isVariableSize(encoder) ? { ...encoder, getSizeFromValue: (value) => encoder.getSizeFromValue(unmap(value)) } : encoder,
+      write: (value, bytes, offset) => encoder.write(unmap(value), bytes, offset)
+    });
+  }
+  function mapDecoder(decoder, map) {
+    return createDecoder({
+      ...decoder,
+      read: (bytes, offset) => {
+        const [value, newOffset] = decoder.read(bytes, offset);
+        return [map(value, bytes, offset), newOffset];
+      }
+    });
   }
 
   // ../codecs-strings/dist/index.browser.js
@@ -237,96 +254,107 @@ this.globalThis.solanaWeb3 = (function (exports) {
       );
     }
   }
-  function sharedNumberFactory(input) {
-    let littleEndian;
-    let defaultDescription = input.name;
-    if (input.size > 1) {
-      littleEndian = !("endian" in input.options) || input.options.endian === 0;
-      defaultDescription += littleEndian ? "(le)" : "(be)";
-    }
-    return {
-      description: input.options.description ?? defaultDescription,
-      fixedSize: input.size,
-      littleEndian,
-      maxSize: input.size
-    };
+  function isLittleEndian(config) {
+    return (config == null ? void 0 : config.endian) === 1 ? false : true;
   }
   function numberEncoderFactory(input) {
-    const codecData = sharedNumberFactory(input);
-    return {
-      description: codecData.description,
-      encode(value) {
+    return createEncoder({
+      fixedSize: input.size,
+      write(value, bytes, offset) {
         if (input.range) {
           assertNumberIsBetweenForCodec(input.name, input.range[0], input.range[1], value);
         }
         const arrayBuffer = new ArrayBuffer(input.size);
-        input.set(new DataView(arrayBuffer), value, codecData.littleEndian);
-        return new Uint8Array(arrayBuffer);
-      },
-      fixedSize: codecData.fixedSize,
-      maxSize: codecData.maxSize
-    };
+        input.set(new DataView(arrayBuffer), value, isLittleEndian(input.config));
+        bytes.set(new Uint8Array(arrayBuffer), offset);
+        return offset + input.size;
+      }
+    });
   }
   function numberDecoderFactory(input) {
-    const codecData = sharedNumberFactory(input);
-    return {
-      decode(bytes, offset = 0) {
-        assertByteArrayIsNotEmptyForCodec(codecData.description, bytes, offset);
-        assertByteArrayHasEnoughBytesForCodec(codecData.description, input.size, bytes, offset);
+    return createDecoder({
+      fixedSize: input.size,
+      read(bytes, offset = 0) {
+        assertByteArrayIsNotEmptyForCodec(input.name, bytes, offset);
+        assertByteArrayHasEnoughBytesForCodec(input.name, input.size, bytes, offset);
         const view = new DataView(toArrayBuffer(bytes, offset, input.size));
-        return [input.get(view, codecData.littleEndian), offset + input.size];
-      },
-      description: codecData.description,
-      fixedSize: codecData.fixedSize,
-      maxSize: codecData.maxSize
-    };
+        return [input.get(view, isLittleEndian(input.config)), offset + input.size];
+      }
+    });
   }
   function toArrayBuffer(bytes, offset, length) {
-    const bytesOffset = bytes.byteOffset + (offset ?? 0);
-    const bytesLength = length ?? bytes.byteLength;
+    const bytesOffset = bytes.byteOffset + (offset != null ? offset : 0);
+    const bytesLength = length != null ? length : bytes.byteLength;
     return bytes.buffer.slice(bytesOffset, bytesOffset + bytesLength);
   }
-  var getShortU16Encoder = (options = {}) => ({
-    description: options.description ?? "shortU16",
-    encode: (value) => {
+  var getShortU16Encoder = () => createEncoder({
+    getSizeFromValue: (value) => {
+      if (value <= 127)
+        return 1;
+      if (value <= 16383)
+        return 2;
+      return 3;
+    },
+    maxSize: 3,
+    write: (value, bytes, offset) => {
       assertNumberIsBetweenForCodec("shortU16", 0, 65535, value);
-      const bytes = [0];
+      const shortU16Bytes = [0];
       for (let ii = 0; ; ii += 1) {
         const alignedValue = value >> ii * 7;
         if (alignedValue === 0) {
           break;
         }
         const nextSevenBits = 127 & alignedValue;
-        bytes[ii] = nextSevenBits;
+        shortU16Bytes[ii] = nextSevenBits;
         if (ii > 0) {
-          bytes[ii - 1] |= 128;
+          shortU16Bytes[ii - 1] |= 128;
         }
       }
-      return new Uint8Array(bytes);
-    },
-    fixedSize: null,
-    maxSize: 3
+      bytes.set(shortU16Bytes, offset);
+      return offset + shortU16Bytes.length;
+    }
   });
-  var getU32Encoder = (options = {}) => numberEncoderFactory({
+  var getShortU16Decoder = () => createDecoder({
+    maxSize: 3,
+    read: (bytes, offset) => {
+      let value = 0;
+      let byteCount = 0;
+      while (++byteCount) {
+        const byteIndex = byteCount - 1;
+        const currentByte = bytes[offset + byteIndex];
+        const nextSevenBits = 127 & currentByte;
+        value |= nextSevenBits << byteIndex * 7;
+        if ((currentByte & 128) === 0) {
+          break;
+        }
+      }
+      return [value, offset + byteCount];
+    }
+  });
+  var getU32Encoder = (config = {}) => numberEncoderFactory({
+    config,
     name: "u32",
-    options,
     range: [0, Number("0xffffffff")],
     set: (view, value, le) => view.setUint32(0, value, le),
     size: 4
   });
-  var getU32Decoder = (options = {}) => numberDecoderFactory({
+  var getU32Decoder = (config = {}) => numberDecoderFactory({
+    config,
     get: (view, le) => view.getUint32(0, le),
     name: "u32",
-    options,
     size: 4
   });
-  var getU8Encoder = (options = {}) => numberEncoderFactory({
+  var getU8Encoder = () => numberEncoderFactory({
     name: "u8",
-    options,
     range: [0, Number("0xff")],
     set: (view, value) => view.setUint8(0, value),
     size: 1
   });
+  var getU8Decoder = () => numberDecoderFactory({
+    get: (view) => view.getUint8(0),
+    name: "u8",
+    size: 1
+  });
 
   // ../codecs-strings/dist/index.browser.js
   function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
@@ -335,43 +363,38 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
   }
   var getBaseXEncoder = (alphabet4) => {
-    const base = alphabet4.length;
-    const baseBigInt = BigInt(base);
-    return {
-      description: `base${base}`,
-      encode(value) {
+    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 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;
+          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;
         }
-        return Uint8Array.from(leadingZeroes.concat(tailBytes));
-      },
-      fixedSize: null,
-      maxSize: null
-    };
+        const bytesToAdd = [...Array(leadingZeroes.length).fill(0), ...tailBytes];
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
+      }
+    });
   };
   var getBaseXDecoder = (alphabet4) => {
-    const base = alphabet4.length;
-    const baseBigInt = BigInt(base);
-    return {
-      decode(rawBytes, offset = 0) {
+    return createDecoder({
+      read(rawBytes, offset) {
         const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);
         if (bytes.length === 0)
           return ["", 0];
@@ -380,22 +403,65 @@ this.globalThis.solanaWeb3 = (function (exports) {
         const leadingZeroes = alphabet4[0].repeat(trailIndex);
         if (trailIndex === bytes.length)
           return [leadingZeroes, rawBytes.length];
-        let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
-        const tailChars = [];
-        while (base10Number > 0n) {
-          tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);
-          base10Number /= baseBigInt;
-        }
-        return [leadingZeroes + tailChars.join(""), rawBytes.length];
-      },
-      description: `base${base}`,
-      fixedSize: null,
-      maxSize: null
-    };
+        const base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
+        const tailChars = getBaseXFromBigInt(base10Number, alphabet4);
+        return [leadingZeroes + tailChars, rawBytes.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);
+  }
+  function getBaseXFromBigInt(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    const tailChars = [];
+    while (value > 0n) {
+      tailChars.unshift(alphabet4[Number(value % base)]);
+      value /= base;
+    }
+    return tailChars.join("");
+  }
   var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
   var getBase58Encoder = () => getBaseXEncoder(alphabet2);
   var getBase58Decoder = () => getBaseXDecoder(alphabet2);
+  var getBase64Encoder = () => {
+    {
+      return createEncoder({
+        getSizeFromValue: (value) => {
+          try {
+            return atob(value).length;
+          } catch (e23) {
+            throw new Error(`Expected a string of base 64, got [${value}].`);
+          }
+        },
+        write(value, bytes, offset) {
+          try {
+            const bytesToAdd = atob(value).split("").map((c) => c.charCodeAt(0));
+            bytes.set(bytesToAdd, offset);
+            return bytesToAdd.length + offset;
+          } catch (e23) {
+            throw new Error(`Expected a string of base 64, got [${value}].`);
+          }
+        }
+      });
+    }
+  };
+  var getBase64Decoder = () => {
+    {
+      return createDecoder({
+        read(bytes, offset = 0) {
+          const slice = bytes.slice(offset);
+          const value = btoa(String.fromCharCode(...slice));
+          return [value, bytes.length];
+        }
+      });
+    }
+  };
   var removeNullCharacters = (value) => (
     // eslint-disable-next-line no-control-regex
     value.replace(/\u0000/g, "")
@@ -404,75 +470,69 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var o = globalThis.TextEncoder;
   var getUtf8Encoder = () => {
     let textEncoder;
-    return {
-      description: "utf8",
-      encode: (value) => new Uint8Array((textEncoder || (textEncoder = new o())).encode(value)),
-      fixedSize: null,
-      maxSize: null
-    };
+    return createEncoder({
+      getSizeFromValue: (value) => (textEncoder || (textEncoder = new o())).encode(value).length,
+      write: (value, bytes, offset) => {
+        const bytesToAdd = (textEncoder || (textEncoder = new o())).encode(value);
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
+      }
+    });
   };
   var getUtf8Decoder = () => {
     let textDecoder;
-    return {
-      decode(bytes, offset = 0) {
+    return createDecoder({
+      read(bytes, offset) {
         const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));
         return [removeNullCharacters(value), bytes.length];
-      },
-      description: "utf8",
-      fixedSize: null,
-      maxSize: null
-    };
+      }
+    });
   };
-  var getStringEncoder = (options = {}) => {
-    const size = options.size ?? getU32Encoder();
-    const encoding = options.encoding ?? getUtf8Encoder();
-    const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;
+  function getStringEncoder(config = {}) {
+    var _a, _b;
+    const size = (_a = config.size) != null ? _a : getU32Encoder();
+    const encoding = (_b = config.encoding) != null ? _b : getUtf8Encoder();
     if (size === "variable") {
-      return { ...encoding, description };
+      return encoding;
     }
     if (typeof size === "number") {
-      return fixEncoder(encoding, size, description);
+      return fixEncoder(encoding, size);
     }
-    return {
-      description,
-      encode: (value) => {
-        const contentBytes = encoding.encode(value);
-        const lengthBytes = size.encode(contentBytes.length);
-        return mergeBytes([lengthBytes, contentBytes]);
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const contentSize = getEncodedSize(value, encoding);
+        return getEncodedSize(contentSize, size) + contentSize;
       },
-      fixedSize: null,
-      maxSize: null
-    };
-  };
-  var getStringDecoder = (options = {}) => {
-    const size = options.size ?? getU32Decoder();
-    const encoding = options.encoding ?? getUtf8Decoder();
-    const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;
+      write: (value, bytes, offset) => {
+        const contentSize = getEncodedSize(value, encoding);
+        offset = size.write(contentSize, bytes, offset);
+        return encoding.write(value, bytes, offset);
+      }
+    });
+  }
+  function getStringDecoder(config = {}) {
+    var _a, _b;
+    const size = (_a = config.size) != null ? _a : getU32Decoder();
+    const encoding = (_b = config.encoding) != null ? _b : getUtf8Decoder();
     if (size === "variable") {
-      return { ...encoding, description };
+      return encoding;
     }
     if (typeof size === "number") {
-      return fixDecoder(encoding, size, description);
+      return fixDecoder(encoding, size);
     }
-    return {
-      decode: (bytes, offset = 0) => {
+    return createDecoder({
+      read: (bytes, offset = 0) => {
         assertByteArrayIsNotEmptyForCodec("string", bytes, offset);
-        const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.read(bytes, offset);
         const length = Number(lengthBigInt);
         offset = lengthOffset;
         const contentBytes = bytes.slice(offset, offset + length);
         assertByteArrayHasEnoughBytesForCodec("string", length, contentBytes);
-        const [value, contentOffset] = encoding.decode(contentBytes);
+        const [value, contentOffset] = encoding.read(contentBytes, 0);
         offset += contentOffset;
         return [value, offset];
-      },
-      description,
-      fixedSize: null,
-      maxSize: null
-    };
-  };
-  function getSizeDescription(size) {
-    return typeof size === "object" ? size.description : `${size}`;
+      }
+    });
   }
 
   // ../assertions/dist/index.browser.js
@@ -507,14 +567,16 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
   }
   async function assertDigestCapabilityIsAvailable() {
+    var _a;
     assertIsSecureContext();
-    if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.digest !== "function") {
+    if (typeof globalThis.crypto === "undefined" || typeof ((_a = globalThis.crypto.subtle) == null ? void 0 : _a.digest) !== "function") {
       throw new Error("No digest implementation could be found");
     }
   }
   async function assertKeyGenerationIsAvailable() {
+    var _a;
     assertIsSecureContext();
-    if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.generateKey !== "function") {
+    if (typeof globalThis.crypto === "undefined" || typeof ((_a = globalThis.crypto.subtle) == null ? void 0 : _a.generateKey) !== "function") {
       throw new Error("No key generation implementation could be found");
     }
     if (!await isEd25519CurveSupported(globalThis.crypto.subtle)) {
@@ -524,20 +586,23 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
   }
   async function assertKeyExporterIsAvailable() {
+    var _a;
     assertIsSecureContext();
-    if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.exportKey !== "function") {
+    if (typeof globalThis.crypto === "undefined" || typeof ((_a = globalThis.crypto.subtle) == null ? void 0 : _a.exportKey) !== "function") {
       throw new Error("No key export implementation could be found");
     }
   }
   async function assertSigningCapabilityIsAvailable() {
+    var _a;
     assertIsSecureContext();
-    if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.sign !== "function") {
+    if (typeof globalThis.crypto === "undefined" || typeof ((_a = globalThis.crypto.subtle) == null ? void 0 : _a.sign) !== "function") {
       throw new Error("No signing implementation could be found");
     }
   }
   async function assertVerificationCapabilityIsAvailable() {
+    var _a;
     assertIsSecureContext();
-    if (typeof globalThis.crypto === "undefined" || typeof globalThis.crypto.subtle?.verify !== "function") {
+    if (typeof globalThis.crypto === "undefined" || typeof ((_a = globalThis.crypto.subtle) == null ? void 0 : _a.verify) !== "function") {
       throw new Error("No signature verification implementation could be found");
     }
   }
@@ -555,66 +620,58 @@ this.globalThis.solanaWeb3 = (function (exports) {
       memoizedBase58Decoder = getBase58Decoder();
     return memoizedBase58Decoder;
   }
-  function isAddress(putativeBase58EncodedAddress) {
+  function isAddress(putativeAddress) {
     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
     ) {
       return false;
     }
-    const base58Encoder = getMemoizedBase58Encoder();
-    const bytes = base58Encoder.encode(putativeBase58EncodedAddress);
+    const base58Encoder3 = getMemoizedBase58Encoder();
+    const bytes = base58Encoder3.encode(putativeAddress);
     const numBytes = bytes.byteLength;
     if (numBytes !== 32) {
       return false;
     }
     return true;
   }
-  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 base58Encoder3 = getMemoizedBase58Encoder();
+      const bytes = base58Encoder3.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 (e3) {
-      throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
+      throw new Error(`\`${putativeAddress}\` is not a base-58 encoded address`, {
         cause: e3
       });
     }
   }
-  function address(putativeBase58EncodedAddress) {
-    assertIsAddress(putativeBase58EncodedAddress);
-    return putativeBase58EncodedAddress;
+  function address(putativeAddress) {
+    assertIsAddress(putativeAddress);
+    return putativeAddress;
   }
-  function getAddressEncoder(config) {
+  function getAddressEncoder() {
     return mapEncoder(
-      getStringEncoder({
-        description: config?.description ?? "Base58EncodedAddress",
-        encoding: getMemoizedBase58Encoder(),
-        size: 32
-      }),
+      getStringEncoder({ encoding: getMemoizedBase58Encoder(), size: 32 }),
       (putativeAddress) => address(putativeAddress)
     );
   }
-  function getAddressDecoder(config) {
-    return getStringDecoder({
-      description: config?.description ?? "Base58EncodedAddress",
-      encoding: getMemoizedBase58Decoder(),
-      size: 32
-    });
+  function getAddressDecoder() {
+    return getStringDecoder({ encoding: getMemoizedBase58Decoder(), size: 32 });
   }
-  function getAddressCodec(config) {
-    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));
+  function getAddressCodec() {
+    return combineCodec(getAddressEncoder(), getAddressDecoder());
   }
   function getAddressComparator() {
     return new Intl.Collator("en", {
@@ -719,7 +776,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     const validFormat = Array.isArray(value) && value.length === 2 && typeof value[0] === "string" && typeof value[1] === "number";
     if (!validFormat) {
       throw new Error(
-        `Expected given program derived address to have the following format: [Base58EncodedAddress, ProgramDerivedAddressBump].`
+        `Expected given program derived address to have the following format: [Address, ProgramDerivedAddressBump].`
       );
     }
     if (value[1] < 0 || value[1] > 255) {
@@ -755,10 +812,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   ];
   var PointOnCurveError = class extends Error {
   };
-  async function createProgramDerivedAddress({
-    programAddress,
-    seeds
-  }) {
+  async function createProgramDerivedAddress({ programAddress, seeds }) {
     await assertDigestCapabilityIsAvailable();
     if (seeds.length > MAX_SEEDS) {
       throw new Error(`A maximum of ${MAX_SEEDS} seeds may be supplied when creating an address`);
@@ -782,7 +836,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     if (await compressedPointBytesAreOnCurve(addressBytes)) {
       throw new PointOnCurveError("Invalid seeds; point must fall off the Ed25519 curve");
     }
-    return base58EncodedAddressCodec.decode(addressBytes)[0];
+    return base58EncodedAddressCodec.decode(addressBytes);
   }
   async function getProgramDerivedAddress({
     programAddress,
@@ -806,26 +860,22 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     throw new Error("Unable to find a viable program address bump seed");
   }
-  async function createAddressWithSeed({
-    baseAddress,
-    programAddress,
-    seed
-  }) {
-    const { encode: encode2, decode } = getAddressCodec();
+  async function createAddressWithSeed({ baseAddress, programAddress, seed }) {
+    const { encode, decode } = getAddressCodec();
     const seedBytes = typeof seed === "string" ? new TextEncoder().encode(seed) : seed;
     if (seedBytes.byteLength > MAX_SEED_LENGTH) {
       throw new Error(`The seed exceeds the maximum length of 32 bytes`);
     }
-    const programAddressBytes = encode2(programAddress);
+    const programAddressBytes = encode(programAddress);
     if (programAddressBytes.length >= PDA_MARKER_BYTES.length && programAddressBytes.slice(-PDA_MARKER_BYTES.length).every((byte, index) => byte === PDA_MARKER_BYTES[index])) {
       throw new Error(`programAddress cannot end with the PDA marker`);
     }
     const addressBytesBuffer = await crypto.subtle.digest(
       "SHA-256",
-      new Uint8Array([...encode2(baseAddress), ...seedBytes, ...programAddressBytes])
+      new Uint8Array([...encode(baseAddress), ...seedBytes, ...programAddressBytes])
     );
     const addressBytes = new Uint8Array(addressBytesBuffer);
-    return decode(addressBytes)[0];
+    return decode(addressBytes);
   }
   async function getAddressFromPublicKey(publicKey) {
     await assertKeyExporterIsAvailable();
@@ -833,8 +883,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("The `CryptoKey` must be an `Ed25519` public key");
     }
     const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-    const [base58EncodedAddress] = getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
-    return base58EncodedAddress;
+    return getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
   }
 
   // ../instructions/dist/index.browser.js
@@ -890,14 +939,111 @@ this.globalThis.solanaWeb3 = (function (exports) {
     );
     return keyPair;
   }
+  function addPkcs8Header(bytes) {
+    return new Uint8Array([
+      /**
+       * PKCS#8 header
+       */
+      48,
+      // ASN.1 sequence tag
+      46,
+      // Length of sequence (46 more bytes)
+      2,
+      // ASN.1 integer tag
+      1,
+      // Length of integer
+      0,
+      // Version number
+      48,
+      // ASN.1 sequence tag
+      5,
+      // Length of sequence
+      6,
+      // ASN.1 object identifier tag
+      3,
+      // Length of object identifier
+      // Edwards curve algorithms identifier https://oid-rep.orange-labs.fr/get/1.3.101.112
+      43,
+      // 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)
+      101,
+      // thawte(101)
+      // Ed25519 identifier
+      112,
+      // id-Ed25519(112)
+      /**
+       * Private key payload
+       */
+      4,
+      // ASN.1 octet string tag
+      34,
+      // String length (34 more bytes)
+      // Private key bytes as octet string
+      4,
+      // ASN.1 octet string tag
+      32,
+      // String length (32 bytes)
+      ...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"]);
+  }
+  var base58Encoder;
+  function assertIsSignature(putativeSignature) {
+    if (!base58Encoder)
+      base58Encoder = getBase58Encoder();
+    try {
+      if (
+        // Lowest value (64 bytes of zeroes)
+        putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+        putativeSignature.length > 88
+      ) {
+        throw new Error("Expected input string to decode to a byte array of length 64.");
+      }
+      const bytes = base58Encoder.encode(putativeSignature);
+      const numBytes = bytes.byteLength;
+      if (numBytes !== 64) {
+        throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
+      }
+    } catch (e3) {
+      throw new Error(`\`${putativeSignature}\` is not a signature`, {
+        cause: e3
+      });
+    }
+  }
+  function isSignature(putativeSignature) {
+    if (!base58Encoder)
+      base58Encoder = getBase58Encoder();
+    if (
+      // Lowest value (64 bytes of zeroes)
+      putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+      putativeSignature.length > 88
+    ) {
+      return false;
+    }
+    const bytes = base58Encoder.encode(putativeSignature);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 64) {
+      return false;
+    }
+    return true;
+  }
   async function signBytes(key, data) {
     await assertSigningCapabilityIsAvailable();
     const signedData = await crypto.subtle.sign("Ed25519", key, data);
     return new Uint8Array(signedData);
   }
-  async function verifySignature(key, signature, data) {
+  function signature(putativeSignature) {
+    assertIsSignature(putativeSignature);
+    return putativeSignature;
+  }
+  async function verifySignature(key, signature2, data) {
     await assertVerificationCapabilityIsAvailable();
-    return await crypto.subtle.verify("Ed25519", key, signature, data);
+    return await crypto.subtle.verify("Ed25519", key, signature2, data);
   }
 
   // ../rpc-types/dist/index.browser.js
@@ -996,239 +1142,205 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // ../transactions/dist/index.browser.js
   init_env_shim();
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/mapSerializer.mjs
+  // ../codecs-data-structures/dist/index.browser.js
   init_env_shim();
-  function mapSerializer(serializer, unmap, map) {
-    return {
-      description: serializer.description,
-      fixedSize: serializer.fixedSize,
-      maxSize: serializer.maxSize,
-      serialize: (value) => serializer.serialize(unmap(value)),
-      deserialize: (buffer, offset = 0) => {
-        const [value, length] = serializer.deserialize(buffer, offset);
-        return map ? [map(value, buffer, offset), length] : [value, length];
-      }
-    };
+  function assertValidNumberOfItemsForCodec(codecDescription, expected, actual) {
+    if (expected !== actual) {
+      throw new Error(`Expected [${codecDescription}] to have ${expected} items, got ${actual}.`);
+    }
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/errors.mjs
-  init_env_shim();
-  var InvalidBaseStringError = class extends Error {
-    constructor(value, base, cause) {
-      const message = `Expected a string of base ${base}, got [${value}].`;
-      super(message);
-      __publicField(this, "name", "InvalidBaseStringError");
-      this.cause = cause;
+  function sumCodecSizes(sizes) {
+    return sizes.reduce((all, size) => all === null || size === null ? null : all + size, 0);
+  }
+  function getFixedSize(codec) {
+    return isFixedSize(codec) ? codec.fixedSize : null;
+  }
+  function getMaxSize(codec) {
+    var _a;
+    return isFixedSize(codec) ? codec.fixedSize : (_a = codec.maxSize) != null ? _a : null;
+  }
+  function getArrayEncoder(item, config = {}) {
+    var _a, _b;
+    const size = (_a = config.size) != null ? _a : getU32Encoder();
+    if (size === "remainder") {
+      assertIsFixedSize(item, 'Codecs of "remainder" size must have fixed-size items.');
     }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
-  var baseX = (alphabet) => {
-    const base = alphabet.length;
-    const baseBigInt = BigInt(base);
-    return {
-      description: `base${base}`,
-      fixedSize: null,
-      maxSize: null,
-      serialize(value) {
-        if (!value.match(new RegExp(`^[${alphabet}]*$`))) {
-          throw new InvalidBaseStringError(value, base);
-        }
-        if (value === "")
-          return new Uint8Array();
-        const chars = [...value];
-        let trailIndex = chars.findIndex((c) => c !== alphabet[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(alphabet.indexOf(tailChars[i]));
-          baseXPower *= baseBigInt;
-        }
-        const tailBytes = [];
-        while (base10Number > 0n) {
-          tailBytes.unshift(Number(base10Number % 256n));
-          base10Number /= 256n;
-        }
-        return Uint8Array.from(leadingZeroes.concat(tailBytes));
+    const fixedSize = computeArrayLikeCodecSize(size, getFixedSize(item));
+    const maxSize = (_b = computeArrayLikeCodecSize(size, getMaxSize(item))) != null ? _b : void 0;
+    return createEncoder({
+      ...fixedSize !== null ? { fixedSize } : {
+        getSizeFromValue: (array) => {
+          const prefixSize = typeof size === "object" ? getEncodedSize(array.length, size) : 0;
+          return prefixSize + [...array].reduce((all, value) => all + getEncodedSize(value, item), 0);
+        },
+        maxSize
       },
-      deserialize(buffer, offset = 0) {
-        if (buffer.length === 0)
-          return ["", 0];
-        const bytes = buffer.slice(offset);
-        let trailIndex = bytes.findIndex((n) => n !== 0);
-        trailIndex = trailIndex === -1 ? bytes.length : trailIndex;
-        const leadingZeroes = alphabet[0].repeat(trailIndex);
-        if (trailIndex === bytes.length)
-          return [leadingZeroes, buffer.length];
-        let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
-        const tailChars = [];
-        while (base10Number > 0n) {
-          tailChars.unshift(alphabet[Number(base10Number % baseBigInt)]);
-          base10Number /= baseBigInt;
+      write: (array, bytes, offset) => {
+        if (typeof size === "number") {
+          assertValidNumberOfItemsForCodec("array", size, array.length);
         }
-        return [leadingZeroes + tailChars.join(""), buffer.length];
-      }
-    };
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base58.mjs
-  init_env_shim();
-  var base58 = baseX("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base64.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseXReslice.mjs
-  init_env_shim();
-  var baseXReslice = (alphabet, bits) => {
-    const base = alphabet.length;
-    const reslice = (input, inputBits, outputBits, useRemainder) => {
-      const output = [];
-      let accumulator = 0;
-      let bitsInAccumulator = 0;
-      const mask = (1 << outputBits) - 1;
-      for (const value of input) {
-        accumulator = accumulator << inputBits | value;
-        bitsInAccumulator += inputBits;
-        while (bitsInAccumulator >= outputBits) {
-          bitsInAccumulator -= outputBits;
-          output.push(accumulator >> bitsInAccumulator & mask);
+        if (typeof size === "object") {
+          offset = size.write(array.length, bytes, offset);
         }
+        array.forEach((value) => {
+          offset = item.write(value, bytes, offset);
+        });
+        return offset;
       }
-      if (useRemainder && bitsInAccumulator > 0) {
-        output.push(accumulator << outputBits - bitsInAccumulator & mask);
-      }
-      return output;
-    };
-    return {
-      description: `base${base}`,
-      fixedSize: null,
-      maxSize: null,
-      serialize(value) {
-        if (!value.match(new RegExp(`^[${alphabet}]*$`))) {
-          throw new InvalidBaseStringError(value, base);
+    });
+  }
+  function getArrayDecoder(item, config = {}) {
+    var _a, _b;
+    const size = (_a = config.size) != null ? _a : getU32Decoder();
+    if (size === "remainder") {
+      assertIsFixedSize(item, 'Codecs of "remainder" size must have fixed-size items.');
+    }
+    const itemSize = getFixedSize(item);
+    const fixedSize = computeArrayLikeCodecSize(size, itemSize);
+    const maxSize = (_b = computeArrayLikeCodecSize(size, getMaxSize(item))) != null ? _b : void 0;
+    return createDecoder({
+      ...fixedSize !== null ? { fixedSize } : { maxSize },
+      read: (bytes, offset) => {
+        const array = [];
+        if (typeof size === "object" && bytes.slice(offset).length === 0) {
+          return [array, offset];
         }
-        if (value === "")
-          return new Uint8Array();
-        const charIndices = [...value].map((c) => alphabet.indexOf(c));
-        const bytes = reslice(charIndices, bits, 8, false);
-        return Uint8Array.from(bytes);
-      },
-      deserialize(buffer, offset = 0) {
-        if (buffer.length === 0)
-          return ["", 0];
-        const bytes = [...buffer.slice(offset)];
-        const charIndices = reslice(bytes, 8, bits, true);
-        return [charIndices.map((i) => alphabet[i]).join(""), buffer.length];
+        const [resolvedSize, newOffset] = readArrayLikeCodecSize(size, itemSize, bytes, offset);
+        offset = newOffset;
+        for (let i = 0; i < resolvedSize; i += 1) {
+          const [value, newOffset2] = item.read(bytes, offset);
+          offset = newOffset2;
+          array.push(value);
+        }
+        return [array, offset];
       }
-    };
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base64.mjs
-  var base64 = mapSerializer(baseXReslice("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 6), (value) => value.replace(/=/g, ""), (value) => value.padEnd(Math.ceil(value.length / 4) * 4, "="));
-
-  // ../codecs-data-structures/dist/index.browser.js
-  init_env_shim();
-  function sumCodecSizes(sizes) {
-    return sizes.reduce((all, size) => all === null || size === null ? null : all + size, 0);
+    });
   }
-  function getArrayLikeCodecSizeDescription(size) {
-    return typeof size === "object" ? size.description : `${size}`;
+  function readArrayLikeCodecSize(size, itemSize, bytes, offset) {
+    if (typeof size === "number") {
+      return [size, offset];
+    }
+    if (typeof size === "object") {
+      return size.read(bytes, offset);
+    }
+    if (size === "remainder") {
+      if (itemSize === null) {
+        throw new Error('Codecs of "remainder" size must have fixed-size items.');
+      }
+      const remainder = Math.max(0, bytes.length - offset);
+      if (remainder % itemSize !== 0) {
+        throw new Error(
+          `The remainder of the byte array (${remainder} bytes) cannot be split into chunks of ${itemSize} bytes. Codecs of "remainder" size must have a remainder that is a multiple of its item size. In other words, ${remainder} modulo ${itemSize} should be equal to zero.`
+        );
+      }
+      return [remainder / itemSize, offset];
+    }
+    throw new Error(`Unrecognized array-like codec size: ${JSON.stringify(size)}`);
   }
-  function getArrayLikeCodecSizeFromChildren(size, childrenSizes) {
+  function computeArrayLikeCodecSize(size, itemSize) {
     if (typeof size !== "number")
       return null;
     if (size === 0)
       return 0;
-    const childrenSize = sumCodecSizes(childrenSizes);
-    return childrenSize === null ? null : childrenSize * size;
-  }
-  function getArrayLikeCodecSizePrefix(size, realSize) {
-    return typeof size === "object" ? size.encode(realSize) : new Uint8Array();
+    return itemSize === null ? null : itemSize * size;
   }
-  function assertValidNumberOfItemsForCodec(codecDescription, expected, actual) {
-    if (expected !== actual) {
-      throw new Error(`Expected [${codecDescription}] to have ${expected} items, got ${actual}.`);
+  function getBytesEncoder(config = {}) {
+    var _a;
+    const size = (_a = config.size) != null ? _a : "variable";
+    const byteEncoder = createEncoder({
+      getSizeFromValue: (value) => value.length,
+      write: (value, bytes, offset) => {
+        bytes.set(value, offset);
+        return offset + value.length;
+      }
+    });
+    if (size === "variable") {
+      return byteEncoder;
     }
-  }
-  function arrayCodecHelper(item, size, description) {
-    if (size === "remainder" && item.fixedSize === null) {
-      throw new Error('Codecs of "remainder" size must have fixed-size items.');
+    if (typeof size === "number") {
+      return fixEncoder(byteEncoder, size);
     }
-    return {
-      description: description ?? `array(${item.description}; ${getArrayLikeCodecSizeDescription(size)})`,
-      fixedSize: getArrayLikeCodecSizeFromChildren(size, [item.fixedSize]),
-      maxSize: getArrayLikeCodecSizeFromChildren(size, [item.maxSize])
-    };
-  }
-  function getArrayEncoder(item, options = {}) {
-    const size = options.size ?? getU32Encoder();
-    return {
-      ...arrayCodecHelper(item, size, options.description),
-      encode: (value) => {
-        if (typeof size === "number") {
-          assertValidNumberOfItemsForCodec("array", size, value.length);
-        }
-        return mergeBytes([getArrayLikeCodecSizePrefix(size, value.length), ...value.map((v) => item.encode(v))]);
+    return createEncoder({
+      getSizeFromValue: (value) => getEncodedSize(value.length, size) + value.length,
+      write: (value, bytes, offset) => {
+        offset = size.write(value.length, bytes, offset);
+        return byteEncoder.write(value, bytes, offset);
       }
-    };
+    });
   }
-  function getBytesEncoder(options = {}) {
-    const size = options.size ?? "variable";
-    const sizeDescription = typeof size === "object" ? size.description : `${size}`;
-    const description = options.description ?? `bytes(${sizeDescription})`;
-    const byteEncoder = {
-      description,
-      encode: (value) => value,
-      fixedSize: null,
-      maxSize: null
-    };
+  function getBytesDecoder(config = {}) {
+    var _a;
+    const size = (_a = config.size) != null ? _a : "variable";
+    const byteDecoder = createDecoder({
+      read: (bytes, offset) => {
+        const slice = bytes.slice(offset);
+        return [slice, offset + slice.length];
+      }
+    });
     if (size === "variable") {
-      return byteEncoder;
+      return byteDecoder;
     }
     if (typeof size === "number") {
-      return fixEncoder(byteEncoder, size, description);
+      return fixDecoder(byteDecoder, size);
     }
-    return {
-      ...byteEncoder,
-      encode: (value) => {
-        const contentBytes = byteEncoder.encode(value);
-        const lengthBytes = size.encode(contentBytes.length);
-        return mergeBytes([lengthBytes, contentBytes]);
+    return createDecoder({
+      read: (bytes, offset) => {
+        assertByteArrayIsNotEmptyForCodec("bytes", bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.read(bytes, offset);
+        const length = Number(lengthBigInt);
+        offset = lengthOffset;
+        const contentBytes = bytes.slice(offset, offset + length);
+        assertByteArrayHasEnoughBytesForCodec("bytes", length, contentBytes);
+        const [value, contentOffset] = byteDecoder.read(contentBytes, 0);
+        offset += contentOffset;
+        return [value, offset];
       }
-    };
+    });
   }
-  function structCodecHelper(fields, description) {
-    const fieldDescriptions = fields.map(([name, codec]) => `${String(name)}: ${codec.description}`).join(", ");
-    return {
-      description: description ?? `struct(${fieldDescriptions})`,
-      fixedSize: sumCodecSizes(fields.map(([, field]) => field.fixedSize)),
-      maxSize: sumCodecSizes(fields.map(([, field]) => field.maxSize))
-    };
+  function getStructEncoder(fields) {
+    var _a;
+    const fieldCodecs = fields.map(([, codec]) => codec);
+    const fixedSize = sumCodecSizes(fieldCodecs.map(getFixedSize));
+    const maxSize = (_a = sumCodecSizes(fieldCodecs.map(getMaxSize))) != null ? _a : void 0;
+    return createEncoder({
+      ...fixedSize === null ? {
+        getSizeFromValue: (value) => fields.map(([key, codec]) => getEncodedSize(value[key], codec)).reduce((all, one) => all + one, 0),
+        maxSize
+      } : { fixedSize },
+      write: (struct, bytes, offset) => {
+        fields.forEach(([key, codec]) => {
+          offset = codec.write(struct[key], bytes, offset);
+        });
+        return offset;
+      }
+    });
   }
-  function getStructEncoder(fields, options = {}) {
-    return {
-      ...structCodecHelper(fields, options.description),
-      encode: (struct) => {
-        const fieldBytes = fields.map(([key, codec]) => codec.encode(struct[key]));
-        return mergeBytes(fieldBytes);
+  function getStructDecoder(fields) {
+    var _a;
+    const fieldCodecs = fields.map(([, codec]) => codec);
+    const fixedSize = sumCodecSizes(fieldCodecs.map(getFixedSize));
+    const maxSize = (_a = sumCodecSizes(fieldCodecs.map(getMaxSize))) != null ? _a : void 0;
+    return createDecoder({
+      ...fixedSize === null ? { maxSize } : { fixedSize },
+      read: (bytes, offset) => {
+        const struct = {};
+        fields.forEach(([key, codec]) => {
+          const [value, newOffset] = codec.read(bytes, offset);
+          offset = newOffset;
+          struct[key] = value;
+        });
+        return [struct, offset];
       }
-    };
+    });
+  }
+
+  // ../functional/dist/index.browser.js
+  init_env_shim();
+  function pipe(init, ...fns) {
+    return fns.reduce((acc, fn) => fn(acc), init);
   }
+
+  // ../transactions/dist/index.browser.js
   function getUnsignedTransaction(transaction) {
     if ("signatures" in transaction) {
       const {
@@ -1241,7 +1353,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return transaction;
     }
   }
+  var base58Encoder2;
   function assertIsBlockhash(putativeBlockhash) {
+    if (!base58Encoder2)
+      base58Encoder2 = getBase58Encoder();
     try {
       if (
         // Lowest value (32 bytes of zeroes)
@@ -1250,7 +1365,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       ) {
         throw new Error("Expected input string to decode to a byte array of length 32.");
       }
-      const bytes = base58.serialize(putativeBlockhash);
+      const bytes = base58Encoder2.encode(putativeBlockhash);
       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}`);
@@ -1261,6 +1376,22 @@ this.globalThis.solanaWeb3 = (function (exports) {
       });
     }
   }
+  function isTransactionWithBlockhashLifetime(transaction) {
+    const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
+    if (!lifetimeConstraintShapeMatches)
+      return false;
+    try {
+      assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  function assertIsTransactionWithBlockhashLifetime(transaction) {
+    if (!isTransactionWithBlockhashLifetime(transaction)) {
+      throw new Error("Transaction does not have a blockhash lifetime");
+    }
+  }
   function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
     if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
       return transaction;
@@ -1325,12 +1456,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 && isSignerRole2(instruction.accounts[2].role);
   }
   function isAdvanceNonceAccountInstructionData(data) {
     return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -1338,21 +1470,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
       }
@@ -1388,7 +1537,8 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return out;
   }
   function upsert(addressMap, address2, update) {
-    addressMap[address2] = update(addressMap[address2] ?? { role: AccountRole2.READONLY });
+    var _a;
+    addressMap[address2] = update((_a = addressMap[address2]) != null ? _a : { role: AccountRole2.READONLY });
   }
   var TYPE = Symbol("AddressMapTypeProperty");
   function getAddressMapFromInstructions(feePayer, instructions) {
@@ -1645,140 +1795,141 @@ this.globalThis.solanaWeb3 = (function (exports) {
       version: transaction.version
     };
   }
-  function getCompiledTransaction(transaction) {
-    const compiledMessage = compileMessage(transaction);
-    let signatures;
-    if ("signatures" in transaction) {
-      signatures = [];
-      for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
-        signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
-      }
-    } else {
-      signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
-    }
-    return {
-      compiledMessage,
-      signatures
-    };
-  }
-  var lookupTableAddressDescription = "The address of the address lookup table account from which instruction addresses should be looked up" ;
-  var writableIndicesDescription = "The indices of the accounts in the lookup table that should be loaded as writeable" ;
-  var readableIndicesDescription = "The indices of the accounts in the lookup table that should be loaded as read-only" ;
-  var addressTableLookupDescription = "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it" ;
   var memoizedAddressTableLookupEncoder;
   function getAddressTableLookupEncoder() {
     if (!memoizedAddressTableLookupEncoder) {
-      memoizedAddressTableLookupEncoder = getStructEncoder(
+      memoizedAddressTableLookupEncoder = getStructEncoder([
+        ["lookupTableAddress", getAddressEncoder()],
         [
-          ["lookupTableAddress", getAddressEncoder({ description: lookupTableAddressDescription })],
-          [
-            "writableIndices",
-            getArrayEncoder(getU8Encoder(), {
-              description: writableIndicesDescription,
-              size: getShortU16Encoder()
-            })
-          ],
-          [
-            "readableIndices",
-            getArrayEncoder(getU8Encoder(), {
-              description: readableIndicesDescription,
-              size: getShortU16Encoder()
-            })
-          ]
+          "writableIndices",
+          getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
         ],
-        { description: addressTableLookupDescription }
-      );
+        [
+          "readableIndices",
+          getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
+        ]
+      ]);
     }
     return memoizedAddressTableLookupEncoder;
   }
+  var memoizedAddressTableLookupDecoder;
+  function getAddressTableLookupDecoder() {
+    if (!memoizedAddressTableLookupDecoder) {
+      memoizedAddressTableLookupDecoder = getStructDecoder([
+        ["lookupTableAddress", getAddressDecoder()],
+        ["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
+        ["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
+      ]);
+    }
+    return memoizedAddressTableLookupDecoder;
+  }
   var memoizedU8Encoder;
   function getMemoizedU8Encoder() {
     if (!memoizedU8Encoder)
       memoizedU8Encoder = getU8Encoder();
     return memoizedU8Encoder;
   }
-  function getMemoizedU8EncoderDescription(description) {
-    const encoder = getMemoizedU8Encoder();
-    return {
-      ...encoder,
-      description: description ?? encoder.description
-    };
+  var memoizedU8Decoder;
+  function getMemoizedU8Decoder() {
+    if (!memoizedU8Decoder)
+      memoizedU8Decoder = getU8Decoder();
+    return memoizedU8Decoder;
   }
-  var numSignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" ;
-  var numReadonlySignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable" ;
-  var numReadonlyNonSignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" ;
-  var messageHeaderDescription = "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" ;
   function getMessageHeaderEncoder() {
-    return getStructEncoder(
-      [
-        ["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
-        ["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
-        ["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
-      ],
-      {
-        description: messageHeaderDescription
-      }
-    );
+    return getStructEncoder([
+      ["numSignerAccounts", getMemoizedU8Encoder()],
+      ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
+    ]);
+  }
+  function getMessageHeaderDecoder() {
+    return getStructDecoder([
+      ["numSignerAccounts", getMemoizedU8Decoder()],
+      ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
+    ]);
   }
-  var programAddressIndexDescription = "The index of the program being called, according to the well-ordered accounts list for this transaction" ;
-  var accountIndexDescription = "The index of an account, according to the well-ordered accounts list for this transaction" ;
-  var accountIndicesDescription = "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" ;
-  var dataDescription = "An optional buffer of data passed to the instruction" ;
   var memoizedGetInstructionEncoder;
   function getInstructionEncoder() {
     if (!memoizedGetInstructionEncoder) {
       memoizedGetInstructionEncoder = mapEncoder(
         getStructEncoder([
-          ["programAddressIndex", getU8Encoder({ description: programAddressIndexDescription })],
-          [
-            "accountIndices",
-            getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
-              description: accountIndicesDescription,
-              size: getShortU16Encoder()
-            })
-          ],
-          ["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
+          ["programAddressIndex", getU8Encoder()],
+          ["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
+          ["data", getBytesEncoder({ size: getShortU16Encoder() })]
         ]),
         // Convert an instruction to have all fields defined
         (instruction) => {
+          var _a, _b;
           if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
             return instruction;
           }
           return {
             ...instruction,
-            accountIndices: instruction.accountIndices ?? [],
-            data: instruction.data ?? new Uint8Array(0)
+            accountIndices: (_a = instruction.accountIndices) != null ? _a : [],
+            data: (_b = instruction.data) != null ? _b : new Uint8Array(0)
           };
         }
       );
     }
     return memoizedGetInstructionEncoder;
   }
-  var VERSION_FLAG_MASK = 128;
-  var BASE_CONFIG = {
-    description: "A single byte that encodes the version of the transaction" ,
-    fixedSize: null,
-    maxSize: 1
-  };
-  function encode(value) {
-    if (value === "legacy") {
-      return new Uint8Array();
-    }
-    if (value < 0 || value > 127) {
-      throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+  var memoizedGetInstructionDecoder;
+  function getInstructionDecoder() {
+    if (!memoizedGetInstructionDecoder) {
+      memoizedGetInstructionDecoder = mapDecoder(
+        getStructDecoder([
+          ["programAddressIndex", getU8Decoder()],
+          ["accountIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
+          ["data", getBytesDecoder({ size: getShortU16Decoder() })]
+        ]),
+        // Convert an instruction to exclude optional fields if they are empty
+        (instruction) => {
+          if (instruction.accountIndices.length && instruction.data.byteLength) {
+            return instruction;
+          }
+          const { accountIndices, data, ...rest } = instruction;
+          return {
+            ...rest,
+            ...accountIndices.length ? { accountIndices } : null,
+            ...data.byteLength ? { data } : null
+          };
+        }
+      );
     }
-    return new Uint8Array([value | VERSION_FLAG_MASK]);
+    return memoizedGetInstructionDecoder;
   }
+  var VERSION_FLAG_MASK = 128;
   function getTransactionVersionEncoder() {
-    return {
-      ...BASE_CONFIG,
-      encode
-    };
+    return createEncoder({
+      getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
+      maxSize: 1,
+      write: (value, bytes, offset) => {
+        if (value === "legacy") {
+          return offset;
+        }
+        if (value < 0 || value > 127) {
+          throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+        }
+        bytes.set([value | VERSION_FLAG_MASK], offset);
+        return offset + 1;
+      }
+    });
+  }
+  function getTransactionVersionDecoder() {
+    return createDecoder({
+      maxSize: 1,
+      read: (bytes, offset) => {
+        const firstByte = bytes[offset];
+        if ((firstByte & VERSION_FLAG_MASK) === 0) {
+          return ["legacy", offset];
+        } else {
+          const version = firstByte ^ VERSION_FLAG_MASK;
+          return [version, offset + 1];
+        }
+      }
+    });
   }
-  var staticAccountsDescription = "A compact-array of static account addresses belonging to this transaction" ;
-  var lifetimeTokenDescription = "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" ;
-  var instructionsDescription = "A compact-array of instructions belonging to this transaction" ;
-  var addressTableLookupsDescription = "A compact array of address table lookups belonging to this transaction" ;
   function getCompiledMessageLegacyEncoder() {
     return getStructEncoder(getPreludeStructEncoderTuple());
   }
@@ -1789,12 +1940,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
         ["addressTableLookups", getAddressTableLookupArrayEncoder()]
       ]),
       (value) => {
+        var _a;
         if (value.version === "legacy") {
           return value;
         }
         return {
           ...value,
-          addressTableLookups: value.addressTableLookups ?? []
+          addressTableLookups: (_a = value.addressTableLookups) != null ? _a : []
         };
       }
     );
@@ -1803,136 +1955,237 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return [
       ["version", getTransactionVersionEncoder()],
       ["header", getMessageHeaderEncoder()],
-      [
-        "staticAccounts",
-        getArrayEncoder(getAddressEncoder(), {
-          description: staticAccountsDescription,
-          size: getShortU16Encoder()
-        })
-      ],
-      [
-        "lifetimeToken",
-        getStringEncoder({
-          description: lifetimeTokenDescription,
-          encoding: getBase58Encoder(),
-          size: 32
-        })
-      ],
-      [
-        "instructions",
-        getArrayEncoder(getInstructionEncoder(), {
-          description: instructionsDescription,
-          size: getShortU16Encoder()
-        })
-      ]
+      ["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
+      ["lifetimeToken", getStringEncoder({ encoding: getBase58Encoder(), size: 32 })],
+      ["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
+    ];
+  }
+  function getPreludeStructDecoderTuple() {
+    return [
+      ["version", getTransactionVersionDecoder()],
+      ["header", getMessageHeaderDecoder()],
+      ["staticAccounts", getArrayDecoder(getAddressDecoder(), { size: getShortU16Decoder() })],
+      ["lifetimeToken", getStringDecoder({ encoding: getBase58Decoder(), size: 32 })],
+      ["instructions", getArrayDecoder(getInstructionDecoder(), { size: getShortU16Decoder() })],
+      ["addressTableLookups", getAddressTableLookupArrayDecoder()]
     ];
   }
   function getAddressTableLookupArrayEncoder() {
-    return getArrayEncoder(getAddressTableLookupEncoder(), {
-      description: addressTableLookupsDescription,
-      size: getShortU16Encoder()
-    });
+    return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
+  }
+  function getAddressTableLookupArrayDecoder() {
+    return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
   }
-  var messageDescription = "The wire format of a Solana transaction message" ;
   function getCompiledMessageEncoder() {
-    return {
-      description: messageDescription,
-      encode: (compiledMessage) => {
+    return createEncoder({
+      getSizeFromValue: (compiledMessage) => {
         if (compiledMessage.version === "legacy") {
-          return getCompiledMessageLegacyEncoder().encode(compiledMessage);
+          return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
         } else {
-          return getCompiledMessageVersionedEncoder().encode(compiledMessage);
+          return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
         }
       },
-      fixedSize: null,
-      maxSize: null
-    };
+      write: (compiledMessage, bytes, offset) => {
+        if (compiledMessage.version === "legacy") {
+          return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
+        } else {
+          return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
+        }
+      }
+    });
   }
-  var transactionDescription = "The wire format of a Solana transaction" ;
-  var signaturesDescription = "A compact array of 64-byte, base-64 encoded Ed25519 signatures" ;
-  function getCompiledTransactionEncoder() {
-    return getStructEncoder(
-      [
-        [
-          "signatures",
-          getArrayEncoder(getBytesEncoder({ size: 64 }), {
-            description: signaturesDescription,
-            size: getShortU16Encoder()
-          })
-        ],
-        ["compiledMessage", getCompiledMessageEncoder()]
-      ],
-      {
-        description: transactionDescription
+  function getCompiledMessageDecoder() {
+    return mapDecoder(getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
+      if (restOfMessage.version === "legacy" || !(addressTableLookups == null ? void 0 : addressTableLookups.length)) {
+        return restOfMessage;
       }
-    );
+      return { ...restOfMessage, addressTableLookups };
+    });
   }
-  function getTransactionEncoder() {
-    return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
+  function getCompiledMessageCodec() {
+    return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
   }
-  function assertIsTransactionSignature(putativeTransactionSignature) {
-    try {
-      if (
-        // Lowest value (64 bytes of zeroes)
-        putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
-        putativeTransactionSignature.length > 88
-      ) {
-        throw new Error("Expected input string to decode to a byte array of length 64.");
-      }
-      const bytes = base58.serialize(putativeTransactionSignature);
-      const numBytes = bytes.byteLength;
-      if (numBytes !== 64) {
-        throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
+  function getCompiledTransaction(transaction) {
+    var _a;
+    const compiledMessage = compileMessage(transaction);
+    let signatures;
+    if ("signatures" in transaction) {
+      signatures = [];
+      for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
+        signatures[ii] = (_a = transaction.signatures[compiledMessage.staticAccounts[ii]]) != null ? _a : new Uint8Array(Array(64).fill(0));
       }
-    } catch (e3) {
-      throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
-        cause: e3
+    } else {
+      signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
+    }
+    return {
+      compiledMessage,
+      signatures
+    };
+  }
+  function getAccountMetas(message) {
+    const { header } = message;
+    const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
+    const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
+    const accountMetas = [];
+    let accountIndex = 0;
+    for (let i = 0; i < numWritableSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.WRITABLE_SIGNER
       });
+      accountIndex++;
     }
+    for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.READONLY_SIGNER
+      });
+      accountIndex++;
+    }
+    for (let i = 0; i < numWritableNonSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.WRITABLE
+      });
+      accountIndex++;
+    }
+    for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.READONLY
+      });
+      accountIndex++;
+    }
+    return accountMetas;
   }
-  function isTransactionSignature(putativeTransactionSignature) {
-    if (
-      // Lowest value (64 bytes of zeroes)
-      putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
-      putativeTransactionSignature.length > 88
-    ) {
-      return false;
+  function convertInstruction(instruction, accountMetas) {
+    var _a, _b;
+    const programAddress = (_a = accountMetas[instruction.programAddressIndex]) == null ? void 0 : _a.address;
+    if (!programAddress) {
+      throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
     }
-    const bytes = base58.serialize(putativeTransactionSignature);
-    const numBytes = bytes.byteLength;
-    if (numBytes !== 64) {
-      return false;
+    const accounts = (_b = instruction.accountIndices) == null ? void 0 : _b.map((accountIndex) => accountMetas[accountIndex]);
+    const { data } = instruction;
+    return {
+      programAddress,
+      ...accounts && accounts.length ? { accounts } : {},
+      ...data && data.length ? { data } : {}
+    };
+  }
+  function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
+    if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
+      return {
+        blockhash: messageLifetimeToken,
+        lastValidBlockHeight: lastValidBlockHeight != null ? lastValidBlockHeight : 2n ** 64n - 1n
+        // U64 MAX
+      };
+    } else {
+      const nonceAccountAddress = firstInstruction.accounts[0].address;
+      assertIsAddress(nonceAccountAddress);
+      const nonceAuthorityAddress = firstInstruction.accounts[2].address;
+      assertIsAddress(nonceAuthorityAddress);
+      return {
+        nonce: messageLifetimeToken,
+        nonceAccountAddress,
+        nonceAuthorityAddress
+      };
     }
-    return true;
   }
-  async function getCompiledMessageSignature(message, secretKey) {
-    const wireMessageBytes = getCompiledMessageEncoder().encode(message);
-    const signature = await signBytes(secretKey, wireMessageBytes);
-    return signature;
+  function convertSignatures(compiledTransaction) {
+    const {
+      compiledMessage: { staticAccounts },
+      signatures
+    } = compiledTransaction;
+    return signatures.reduce((acc, sig, index) => {
+      const allZeros = sig.every((byte) => byte === 0);
+      if (allZeros)
+        return acc;
+      const address2 = staticAccounts[index];
+      return { ...acc, [address2]: sig };
+    }, {});
+  }
+  function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
+    const { compiledMessage } = compiledTransaction;
+    if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
+      throw new Error("Cannot convert transaction with addressTableLookups");
+    }
+    const feePayer = compiledMessage.staticAccounts[0];
+    if (!feePayer)
+      throw new Error("No fee payer set in CompiledTransaction");
+    const accountMetas = getAccountMetas(compiledMessage);
+    const instructions = compiledMessage.instructions.map(
+      (compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
+    );
+    const firstInstruction = instructions[0];
+    const lifetimeConstraint = getLifetimeConstraint(
+      compiledMessage.lifetimeToken,
+      firstInstruction,
+      lastValidBlockHeight
+    );
+    const signatures = convertSignatures(compiledTransaction);
+    return pipe(
+      createTransaction({ version: compiledMessage.version }),
+      (tx) => setTransactionFeePayer(feePayer, tx),
+      (tx) => instructions.reduce((acc, instruction) => {
+        return appendTransactionInstruction(instruction, acc);
+      }, tx),
+      (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
+      (tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
+    );
+  }
+  function getCompiledTransactionEncoder() {
+    return getStructEncoder([
+      ["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
+      ["compiledMessage", getCompiledMessageEncoder()]
+    ]);
+  }
+  function getCompiledTransactionDecoder() {
+    return getStructDecoder([
+      [
+        "signatures",
+        getArrayDecoder(getBytesDecoder({ size: 64 }), {
+          size: getShortU16Decoder()
+        })
+      ],
+      ["compiledMessage", getCompiledMessageDecoder()]
+    ]);
+  }
+  function getTransactionEncoder() {
+    return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
   }
+  function getTransactionDecoder(lastValidBlockHeight) {
+    return mapDecoder(
+      getCompiledTransactionDecoder(),
+      (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+    );
+  }
+  function getTransactionCodec(lastValidBlockHeight) {
+    return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
+  }
+  var base58Decoder;
   function getSignatureFromTransaction(transaction) {
+    if (!base58Decoder)
+      base58Decoder = getBase58Decoder();
     const signatureBytes = transaction.signatures[transaction.feePayer];
     if (!signatureBytes) {
       throw new Error(
         "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
       );
     }
-    const transactionSignature2 = base58.deserialize(signatureBytes)[0];
-    return transactionSignature2;
+    const transactionSignature = base58Decoder.decode(signatureBytes);
+    return transactionSignature;
   }
-  async function signTransaction(keyPairs, transaction) {
+  async function partiallySignTransaction(keyPairs, transaction) {
     const compiledMessage = compileMessage(transaction);
     const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
+    const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
     const publicKeySignaturePairs = await Promise.all(
       keyPairs.map(
-        (keyPair) => Promise.all([
-          getAddressFromPublicKey(keyPair.publicKey),
-          getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
-        ])
+        (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
       )
     );
-    for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
-      nextSignatures[signerPublicKey] = signature;
+    for (const [signerPublicKey, signature2] of publicKeySignaturePairs) {
+      nextSignatures[signerPublicKey] = signature2;
     }
     const out = {
       ...transaction,
@@ -1941,15 +2194,27 @@ this.globalThis.solanaWeb3 = (function (exports) {
     Object.freeze(out);
     return out;
   }
-  function transactionSignature(putativeTransactionSignature) {
-    assertIsTransactionSignature(putativeTransactionSignature);
-    return putativeTransactionSignature;
+  async function signTransaction(keyPairs, transaction) {
+    const out = await partiallySignTransaction(keyPairs, transaction);
+    assertTransactionIsFullySigned(out);
+    Object.freeze(out);
+    return out;
+  }
+  function assertTransactionIsFullySigned(transaction) {
+    const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => {
+      var _a, _b;
+      return (_b = (_a = i.accounts) == null ? void 0 : _a.filter((a) => isSignerRole2(a.role))) != null ? _b : [];
+    }).map((a) => a.address);
+    const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
+    requiredSigners.forEach((address2) => {
+      if (!transaction.signatures[address2]) {
+        throw new Error(`Transaction is missing signature for address \`${address2}\``);
+      }
+    });
   }
   function getBase64EncodedWireTransaction(transaction) {
     const wireTransactionBytes = getTransactionEncoder().encode(transaction);
-    {
-      return btoa(String.fromCharCode(...wireTransactionBytes));
-    }
+    return getBase64Decoder().decode(wireTransactionBytes);
   }
 
   // src/airdrop.ts
@@ -1960,9 +2225,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // src/transaction-confirmation-strategy-racer.ts
   init_env_shim();
-  async function raceStrategies(signature, config, getSpecificStrategiesForRace) {
+  async function raceStrategies(signature2, config, getSpecificStrategiesForRace) {
     const { abortSignal: callerAbortSignal, commitment, getRecentSignatureConfirmationPromise } = config;
-    callerAbortSignal?.throwIfAborted();
+    callerAbortSignal == null ? void 0 : callerAbortSignal.throwIfAborted();
     const abortController = new AbortController();
     if (callerAbortSignal) {
       const handleAbort = () => {
@@ -1979,7 +2244,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         getRecentSignatureConfirmationPromise({
           abortSignal: abortController.signal,
           commitment,
-          signature
+          signature: signature2
         }),
         ...specificStrategies
       ]);
@@ -1994,18 +2259,18 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return async function getRecentSignatureConfirmationPromise({
       abortSignal: callerAbortSignal,
       commitment,
-      signature
+      signature: signature2
     }) {
       const abortController = new AbortController();
       function handleAbort() {
         abortController.abort();
       }
       callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
-      const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature, { commitment }).subscribe({ abortSignal: abortController.signal });
+      const signatureStatusNotifications = await rpcSubscriptions.signatureNotifications(signature2, { commitment }).subscribe({ abortSignal: abortController.signal });
       const signatureDidCommitPromise = (async () => {
         for await (const signatureStatusNotification of signatureStatusNotifications) {
           if (signatureStatusNotification.value.err) {
-            throw new Error(`The transaction with signature \`${signature}\` failed.`, {
+            throw new Error(`The transaction with signature \`${signature2}\` failed.`, {
               cause: signatureStatusNotification.value.err
             });
           } else {
@@ -2014,7 +2279,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         }
       })();
       const signatureStatusLookupPromise = (async () => {
-        const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature]).send({ abortSignal: abortController.signal });
+        const { value: signatureStatusResults } = await rpc.getSignatureStatuses([signature2]).send({ abortSignal: abortController.signal });
         const signatureStatus = signatureStatusResults[0];
         if (signatureStatus && signatureStatus.confirmationStatus && commitmentComparator(signatureStatus.confirmationStatus, commitment) >= 0) {
           return;
@@ -2121,12 +2386,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // src/rpc.ts
   init_env_shim();
 
-  // ../functional/dist/index.browser.js
-  init_env_shim();
-  function pipe(init, ...fns) {
-    return fns.reduce((acc, fn) => fn(acc), init);
-  }
-
   // ../rpc-core/dist/index.browser.js
   init_env_shim();
   function visitNode(value, keyPath, onIntegerOverflow) {
@@ -2569,11 +2828,11 @@ this.globalThis.solanaWeb3 = (function (exports) {
   }
   function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
     const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
-    return visitNode2(rawResponse, allowedKeypaths ?? []);
+    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
   }
   function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
     const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
-    return visitNode2(rawResponse, allowedKeypaths ?? []);
+    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
   }
   function createSolanaRpcApi(config) {
     return new Proxy({}, {
@@ -2587,7 +2846,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         const [_, p] = args;
         const methodName = p.toString();
         return function(...rawParams) {
-          const handleIntegerOverflow = config?.onIntegerOverflow;
+          const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
           const params = patchParamsForSolanaLabsRpc(
             rawParams,
             handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(methodName, keyPath, value) : void 0
@@ -2613,7 +2872,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         const [_, p] = args;
         const notificationName = p.toString();
         return function(...rawParams) {
-          const handleIntegerOverflow = config?.onIntegerOverflow;
+          const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
           const params = patchParamsForSolanaLabsRpc(
             rawParams,
             handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
@@ -2637,6 +2896,8 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var SolanaJsonRpcError = class extends Error {
     constructor(details) {
       super(`JSON-RPC 2.0 error (${details.code}): ${details.message}`);
+      __publicField(this, "code");
+      __publicField(this, "data");
       Error.captureStackTrace(this, this.constructor);
       this.code = details.code;
       this.data = details.data;
@@ -2666,7 +2927,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         const payload = createJsonRpcMessage(methodName, params);
         const response = await rpcConfig.transport({
           payload,
-          signal: options?.abortSignal
+          signal: options == null ? void 0 : options.abortSignal
         });
         if ("error" in response) {
           throw new SolanaJsonRpcError(response.error);
@@ -2795,6 +3056,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var SolanaHttpError = class extends Error {
     constructor(details) {
       super(`HTTP error (${details.statusCode}): ${details.message}`);
+      __publicField(this, "statusCode");
       Error.captureStackTrace(this, this.constructor);
       this.statusCode = details.statusCode;
     }
@@ -2850,16 +3112,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     return out;
   }
-  function createHttpTransport({ httpAgentNodeOnly, headers, url }) {
+  function createHttpTransport({ headers, url }) {
     if (headers) {
       assertIsAllowedHttpRequestHeaders(headers);
     }
-    const agent = void 0;
-    if (httpAgentNodeOnly != null) {
-      console.warn(
-        "createHttpTransport(): The `httpAgentNodeOnly` config you supplied has been ignored; HTTP agents are only usable in Node environments."
-      );
-    }
     const customHeaders = headers && normalizeHeaders(headers);
     return async function makeHttpRequest({
       payload,
@@ -2867,7 +3123,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }) {
       const body = JSON.stringify(payload);
       const requestInfo = {
-        agent,
         body,
         headers: {
           ...customHeaders,
@@ -2891,7 +3146,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   }
   var e22 = globalThis.WebSocket;
   var EXPLICIT_ABORT_TOKEN = Symbol(
-    "This symbol is thrown from a socket's iterator when the connection is explicity aborted by the user" 
+    "This symbol is thrown from a socket's iterator when the connection is explicitly aborted by the user" 
   );
   async function createWebSocketConnection({
     sendBufferHighWatermark,
@@ -2918,7 +3173,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         }
       }
       function handleClose(ev) {
-        bufferDrainWatcher?.onCancel();
+        bufferDrainWatcher == null ? void 0 : bufferDrainWatcher.onCancel();
         signal.removeEventListener("abort", handleAbort);
         webSocket.removeEventListener("close", handleClose);
         webSocket.removeEventListener("error", handleError);
@@ -3041,13 +3296,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
       );
     }
     return async function sendWebSocketMessage({ payload, signal }) {
-      signal?.throwIfAborted();
+      signal == null ? void 0 : signal.throwIfAborted();
       const connection = await createWebSocketConnection({
         sendBufferHighWatermark,
         signal,
         url
       });
-      signal?.throwIfAborted();
+      signal == null ? void 0 : signal.throwIfAborted();
       await connection.send(payload);
       return {
         [Symbol.asyncIterator]: connection[Symbol.asyncIterator].bind(connection),
@@ -3083,6 +3338,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
       super(
         `The ${ordinal} argument to the \`${methodName}\` RPC method${path ? ` at path \`${path}\`` : ""} was \`${value}\`. This number is unsafe for use with the Solana JSON-RPC because it exceeds \`Number.MAX_SAFE_INTEGER\`.`
       );
+      __publicField(this, "methodName");
+      __publicField(this, "keyPath");
+      __publicField(this, "value");
       this.keyPath = keyPath;
       this.methodName = methodName;
       this.value = value;
@@ -3229,7 +3487,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
             getAbortSignalFromInputArgs: ({ abortSignal }) => abortSignal,
             getCacheEntryMissingError(deduplicationKey2) {
               return new Error(
-                `Found no cache entry for subscription with deduplication key \`${deduplicationKey2?.toString()}\``
+                `Found no cache entry for subscription with deduplication key \`${deduplicationKey2 == null ? void 0 : deduplicationKey2.toString()}\``
               );
             },
             getCacheKeyFromInputArgs: () => deduplicationKey,
@@ -3394,6 +3652,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return out;
   }
   function createDefaultRpcTransport(config) {
+    var _a;
     return pipe(
       createHttpTransport({
         ...config,
@@ -3401,7 +3660,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
           ...config.headers ? normalizeHeaders2(config.headers) : void 0,
           ...{
             // Keep these headers lowercase so they will override any user-supplied headers above.
-            "solana-client": `js/${"2.0.0-development"}` ?? "UNKNOWN"
+            "solana-client": (_a = `js/${"2.0.0-development"}`) != null ? _a : "UNKNOWN"
           }
         }
       }),
@@ -3485,7 +3744,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return getCachedAbortableIterableFactory({
       getAbortSignalFromInputArgs: ({ signal }) => signal,
       getCacheEntryMissingError(shardKey) {
-        return new Error(`Found no cache entry for connection with shard key \`${shardKey?.toString()}\``);
+        return new Error(`Found no cache entry for connection with shard key \`${shardKey == null ? void 0 : shardKey.toString()}\``);
       },
       getCacheKeyFromInputArgs: ({ payload }) => getShard ? getShard(payload) : NULL_SHARD_CACHE_KEY,
       onCacheHit: (connection, { payload }) => connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(payload),
@@ -3498,15 +3757,18 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // src/rpc-websocket-transport.ts
   function createDefaultRpcSubscriptionsTransport(config) {
+    var _a;
     const { getShard, intervalMs, ...rest } = config;
     return pipe(
       createWebSocketTransport({
         ...rest,
-        sendBufferHighWatermark: config.sendBufferHighWatermark ?? // Let 128KB of data into the WebSocket buffer before buffering it in the app.
-        131072
+        sendBufferHighWatermark: (_a = config.sendBufferHighWatermark) != null ? _a : (
+          // Let 128KB of data into the WebSocket buffer before buffering it in the app.
+          131072
+        )
       }),
       (transport) => getWebSocketTransportWithAutoping({
-        intervalMs: intervalMs ?? 5e3,
+        intervalMs: intervalMs != null ? intervalMs : 5e3,
         transport
       }),
       (transport) => getWebSocketTransportWithConnectionSharding({
@@ -3564,10 +3826,12 @@ this.globalThis.solanaWeb3 = (function (exports) {
       }
       callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
       const accountNotifications = await rpcSubscriptions.accountNotifications(nonceAccountAddress, { commitment, encoding: "base64" }).subscribe({ abortSignal: abortController.signal });
+      const base58Decoder2 = getBase58Decoder();
+      const base64Encoder = getBase64Encoder();
       function getNonceFromAccountData([base64EncodedBytes]) {
-        const data = base64.serialize(base64EncodedBytes);
+        const data = base64Encoder.encode(base64EncodedBytes);
         const nonceValueBytes = data.slice(NONCE_VALUE_OFFSET, NONCE_VALUE_OFFSET + 32);
-        return base58.deserialize(nonceValueBytes)[0];
+        return base58Decoder2.decode(nonceValueBytes);
       }
       const nonceAccountDidAdvancePromise = (async () => {
         for await (const accountNotification of accountNotifications) {
@@ -3680,7 +3944,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
     if (
       // The developer has supplied no value for `preflightCommitment`.
-      !config?.preflightCommitment && // The value of `commitment` is lower than the server default of `preflightCommitment`.
+      !(config == null ? void 0 : config.preflightCommitment) && // The value of `commitment` is lower than the server default of `preflightCommitment`.
       commitmentComparator(
         commitment,
         "finalized"
@@ -3753,7 +4017,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     transaction,
     ...sendTransactionConfig
   }) {
-    const transactionSignature2 = await sendTransaction_INTERNAL({
+    const transactionSignature = await sendTransaction_INTERNAL({
       ...sendTransactionConfig,
       abortSignal,
       commitment,
@@ -3765,7 +4029,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       commitment,
       transaction
     });
-    return transactionSignature2;
+    return transactionSignature;
   }
   async function sendAndConfirmTransaction({
     abortSignal,
@@ -3775,7 +4039,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     transaction,
     ...sendTransactionConfig
   }) {
-    const transactionSignature2 = await sendTransaction_INTERNAL({
+    const transactionSignature = await sendTransaction_INTERNAL({
       ...sendTransactionConfig,
       abortSignal,
       commitment,
@@ -3787,7 +4051,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       commitment,
       transaction
     });
-    return transactionSignature2;
+    return transactionSignature;
   }
 
   exports.AccountRole = AccountRole;
@@ -3798,11 +4062,14 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
   exports.assertIsLamports = assertIsLamports;
   exports.assertIsProgramDerivedAddress = assertIsProgramDerivedAddress;
+  exports.assertIsSignature = assertIsSignature;
   exports.assertIsStringifiedBigInt = assertIsStringifiedBigInt;
   exports.assertIsStringifiedNumber = assertIsStringifiedNumber;
-  exports.assertIsTransactionSignature = assertIsTransactionSignature;
+  exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
   exports.assertIsUnixTimestamp = assertIsUnixTimestamp;
+  exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
   exports.commitmentComparator = commitmentComparator;
+  exports.compileMessage = compileMessage;
   exports.createAddressWithSeed = createAddressWithSeed;
   exports.createBlockHeightExceedencePromiseFactory = createBlockHeightExceedencePromiseFactory;
   exports.createDefaultAirdropRequester = createDefaultAirdropRequester;
@@ -3813,6 +4080,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.createDefaultRpcTransport = createDefaultRpcTransport;
   exports.createDefaultTransactionSender = createDefaultTransactionSender;
   exports.createNonceInvalidationPromiseFactory = createNonceInvalidationPromiseFactory;
+  exports.createPrivateKeyFromBytes = createPrivateKeyFromBytes;
   exports.createRecentSignatureConfirmationPromiseFactory = createRecentSignatureConfirmationPromiseFactory;
   exports.createSolanaRpc = createSolanaRpc;
   exports.createSolanaRpcSubscriptions = createSolanaRpcSubscriptions;
@@ -3827,21 +4095,27 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.getAddressEncoder = getAddressEncoder;
   exports.getAddressFromPublicKey = getAddressFromPublicKey;
   exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
+  exports.getCompiledMessageCodec = getCompiledMessageCodec;
+  exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
+  exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
   exports.getProgramDerivedAddress = getProgramDerivedAddress;
   exports.getSignatureFromTransaction = getSignatureFromTransaction;
+  exports.getTransactionCodec = getTransactionCodec;
+  exports.getTransactionDecoder = getTransactionDecoder;
   exports.getTransactionEncoder = getTransactionEncoder;
   exports.isAddress = isAddress;
   exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
   exports.isLamports = isLamports;
   exports.isProgramDerivedAddress = isProgramDerivedAddress;
+  exports.isSignature = isSignature;
   exports.isSignerRole = isSignerRole;
   exports.isStringifiedBigInt = isStringifiedBigInt;
   exports.isStringifiedNumber = isStringifiedNumber;
-  exports.isTransactionSignature = isTransactionSignature;
   exports.isUnixTimestamp = isUnixTimestamp;
   exports.isWritableRole = isWritableRole;
   exports.lamports = lamports;
   exports.mergeRoles = mergeRoles;
+  exports.partiallySignTransaction = partiallySignTransaction;
   exports.prependTransactionInstruction = prependTransactionInstruction;
   exports.requestAndConfirmAirdrop = requestAndConfirmAirdrop;
   exports.sendAndConfirmDurableNonceTransaction = sendAndConfirmDurableNonceTransaction;
@@ -3851,9 +4125,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
   exports.signBytes = signBytes;
   exports.signTransaction = signTransaction;
+  exports.signature = signature;
   exports.stringifiedBigInt = stringifiedBigInt;
   exports.stringifiedNumber = stringifiedNumber;
-  exports.transactionSignature = transactionSignature;
   exports.unixTimestamp = unixTimestamp;
   exports.upgradeRoleToSigner = upgradeRoleToSigner;
   exports.upgradeRoleToWritable = upgradeRoleToWritable;