@solana/web3.js 2.0.0-experimental.860959f → 2.0.0-experimental.8618508

package/dist/index.development.js

@@ -125,304 +125,203 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // ../addresses/dist/index.browser.js
   init_env_shim();
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/index.mjs
+  // ../codecs-core/dist/index.browser.js
   init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.2/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.2/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/bytes.mjs
-  init_env_shim();
-  var mergeBytes = (bytesArr) => {
-    const totalLength = bytesArr.reduce((total, arr) => total + arr.length, 0);
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    bytesArr.forEach((arr) => {
-      result.set(arr, offset);
-      offset += arr.length;
-    });
-    return result;
-  };
-  var padBytes = (bytes2, length) => {
-    if (bytes2.length >= length)
-      return bytes2;
+  function assertByteArrayIsNotEmptyForCodec(codecDescription, bytes, offset = 0) {
+    if (bytes.length - offset <= 0) {
+      throw new Error(`Codec [${codecDescription}] cannot decode empty byte arrays.`);
+    }
+  }
+  function assertByteArrayHasEnoughBytesForCodec(codecDescription, expected, bytes, offset = 0) {
+    const bytesLength = bytes.length - offset;
+    if (bytesLength < expected) {
+      throw new Error(`Codec [${codecDescription}] expected ${expected} bytes, got ${bytesLength}.`);
+    }
+  }
+  var padBytes = (bytes, length) => {
+    if (bytes.length >= length)
+      return bytes;
     const paddedBytes = new Uint8Array(length).fill(0);
-    paddedBytes.set(bytes2);
+    paddedBytes.set(bytes);
     return paddedBytes;
   };
-  var fixBytes = (bytes2, length) => padBytes(bytes2.slice(0, length), length);
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.2/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/errors.mjs
-  init_env_shim();
-  var DeserializingEmptyBufferError = class extends Error {
-    constructor(serializer) {
-      super(`Serializer [${serializer}] cannot deserialize empty buffers.`);
-      __publicField(this, "name", "DeserializingEmptyBufferError");
+  var fixBytes = (bytes, length) => padBytes(bytes.length <= length ? bytes : bytes.slice(0, length), length);
+  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.");
     }
-  };
-  var NotEnoughBytesError = class extends Error {
-    constructor(serializer, expected, actual) {
-      super(`Serializer [${serializer}] expected ${expected} bytes, got ${actual}.`);
-      __publicField(this, "name", "NotEnoughBytesError");
+  }
+  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.`);
     }
-  };
-  var ExpectedFixedSizeSerializerError = class extends Error {
-    constructor(message) {
-      message ?? (message = "Expected a fixed-size serializer, got a variable-size one.");
-      super(message);
-      __publicField(this, "name", "ExpectedFixedSizeSerializerError");
+    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 (!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}].`
+      );
     }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.2/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/fixSerializer.mjs
-  init_env_shim();
-  function fixSerializer(serializer, fixedBytes, description) {
     return {
-      description: description ?? `fixed(${fixedBytes}, ${serializer.description})`,
+      ...decoder,
+      ...encoder,
+      decode: decoder.decode,
+      encode: encoder.encode,
+      read: decoder.read,
+      write: encoder.write
+    };
+  }
+  function fixEncoder(encoder, fixedBytes) {
+    return createEncoder({
+      fixedSize: 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) {
+    return createDecoder({
       fixedSize: fixedBytes,
-      maxSize: fixedBytes,
-      serialize: (value) => fixBytes(serializer.serialize(value), fixedBytes),
-      deserialize: (buffer, offset = 0) => {
-        buffer = buffer.slice(offset, offset + fixedBytes);
-        if (buffer.length < fixedBytes) {
-          throw new NotEnoughBytesError("fixSerializer", fixedBytes, buffer.length);
+      read: (bytes, offset) => {
+        assertByteArrayHasEnoughBytesForCodec("fixCodec", fixedBytes, bytes, offset);
+        if (offset > 0 || bytes.length > fixedBytes) {
+          bytes = bytes.slice(offset, offset + fixedBytes);
         }
-        if (serializer.fixedSize !== null) {
-          buffer = fixBytes(buffer, serializer.fixedSize);
+        if (isFixedSize(decoder)) {
+          bytes = fixBytes(bytes, decoder.fixedSize);
         }
-        const [value] = serializer.deserialize(buffer, 0);
+        const [value] = decoder.read(bytes, 0);
         return [value, offset + fixedBytes];
       }
-    };
+    });
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.2/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/mapSerializer.mjs
-  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 mapEncoder(encoder, unmap) {
+    return createEncoder({
+      ...isVariableSize(encoder) ? { ...encoder, getSizeFromValue: (value) => encoder.getSizeFromValue(unmap(value)) } : encoder,
+      write: (value, bytes, offset) => encoder.write(unmap(value), bytes, offset)
+    });
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/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;
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/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));
-      },
-      deserialize(buffer, offset = 0) {
-        if (buffer.length === 0)
-          return ["", 0];
-        const bytes2 = buffer.slice(offset);
-        let trailIndex = bytes2.findIndex((n) => n !== 0);
-        trailIndex = trailIndex === -1 ? bytes2.length : trailIndex;
-        const leadingZeroes = alphabet[0].repeat(trailIndex);
-        if (trailIndex === bytes2.length)
-          return [leadingZeroes, buffer.length];
-        let base10Number = bytes2.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
-        const tailChars = [];
-        while (base10Number > 0n) {
-          tailChars.unshift(alphabet[Number(base10Number % baseBigInt)]);
-          base10Number /= baseBigInt;
-        }
-        return [leadingZeroes + tailChars.join(""), buffer.length];
+  function mapDecoder(decoder, map) {
+    return createDecoder({
+      ...decoder,
+      read: (bytes, offset) => {
+        const [value, newOffset] = decoder.read(bytes, offset);
+        return [map(value, bytes, offset), newOffset];
       }
-    };
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/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.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/nullCharacters.mjs
-  init_env_shim();
-  var removeNullCharacters = (value) => (
-    // eslint-disable-next-line no-control-regex
-    value.replace(/\u0000/g, "")
-  );
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/utf8.mjs
-  init_env_shim();
-  var utf8 = {
-    description: "utf8",
-    fixedSize: null,
-    maxSize: null,
-    serialize(value) {
-      return new TextEncoder().encode(value);
-    },
-    deserialize(buffer, offset = 0) {
-      const value = new TextDecoder().decode(buffer.slice(offset));
-      return [removeNullCharacters(value), buffer.length];
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/index.mjs
-  init_env_shim();
+    });
+  }
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/common.mjs
+  // ../codecs-strings/dist/index.browser.js
   init_env_shim();
-  var Endian;
-  (function(Endian2) {
-    Endian2["Little"] = "le";
-    Endian2["Big"] = "be";
-  })(Endian || (Endian = {}));
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/errors.mjs
+  // ../codecs-numbers/dist/index.browser.js
   init_env_shim();
-  var NumberOutOfRangeError = class extends RangeError {
-    constructor(serializer, min, max, actual) {
-      super(`Serializer [${serializer}] expected number to be between ${min} and ${max}, got ${actual}.`);
-      __publicField(this, "name", "NumberOutOfRangeError");
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/utils.mjs
-  init_env_shim();
-  function numberFactory(input) {
-    let littleEndian;
-    let defaultDescription = input.name;
-    if (input.size > 1) {
-      littleEndian = !("endian" in input.options) || input.options.endian === Endian.Little;
-      defaultDescription += littleEndian ? "(le)" : "(be)";
+  function assertNumberIsBetweenForCodec(codecDescription, min, max, value) {
+    if (value < min || value > max) {
+      throw new Error(
+        `Codec [${codecDescription}] expected number to be in the range [${min}, ${max}], got ${value}.`
+      );
     }
-    return {
-      description: input.options.description ?? defaultDescription,
+  }
+  function isLittleEndian(config) {
+    return (config == null ? void 0 : config.endian) === 1 ? false : true;
+  }
+  function numberEncoderFactory(input) {
+    return createEncoder({
       fixedSize: input.size,
-      maxSize: input.size,
-      serialize(value) {
+      write(value, bytes, offset) {
         if (input.range) {
-          assertRange(input.name, input.range[0], input.range[1], value);
+          assertNumberIsBetweenForCodec(input.name, input.range[0], input.range[1], value);
         }
-        const buffer = new ArrayBuffer(input.size);
-        input.set(new DataView(buffer), value, littleEndian);
-        return new Uint8Array(buffer);
-      },
-      deserialize(bytes2, offset = 0) {
-        const slice = bytes2.slice(offset, offset + input.size);
-        assertEnoughBytes("i8", slice, input.size);
-        const view = toDataView(slice);
-        return [input.get(view, littleEndian), offset + input.size];
+        const arrayBuffer = new ArrayBuffer(input.size);
+        input.set(new DataView(arrayBuffer), value, isLittleEndian(input.config));
+        bytes.set(new Uint8Array(arrayBuffer), offset);
+        return offset + input.size;
       }
-    };
+    });
   }
-  var toArrayBuffer = (array2) => array2.buffer.slice(array2.byteOffset, array2.byteLength + array2.byteOffset);
-  var toDataView = (array2) => new DataView(toArrayBuffer(array2));
-  var assertRange = (serializer, min, max, value) => {
-    if (value < min || value > max) {
-      throw new NumberOutOfRangeError(serializer, min, max, value);
-    }
-  };
-  var assertEnoughBytes = (serializer, bytes2, expected) => {
-    if (bytes2.length === 0) {
-      throw new DeserializingEmptyBufferError(serializer);
-    }
-    if (bytes2.length < expected) {
-      throw new NotEnoughBytesError(serializer, expected, bytes2.length);
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/u8.mjs
-  init_env_shim();
-  var u8 = (options = {}) => numberFactory({
-    name: "u8",
-    size: 1,
-    range: [0, Number("0xff")],
-    set: (view, value) => view.setUint8(0, Number(value)),
-    get: (view) => view.getUint8(0),
-    options
-  });
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/u32.mjs
-  init_env_shim();
-  var u32 = (options = {}) => numberFactory({
-    name: "u32",
-    size: 4,
-    range: [0, Number("0xffffffff")],
-    set: (view, value, le) => view.setUint32(0, Number(value), le),
-    get: (view, le) => view.getUint32(0, le),
-    options
-  });
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.2/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/shortU16.mjs
-  init_env_shim();
-  var shortU16 = (options = {}) => ({
-    description: options.description ?? "shortU16",
-    fixedSize: null,
+  function numberDecoderFactory(input) {
+    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, isLittleEndian(input.config)), offset + input.size];
+      }
+    });
+  }
+  function toArrayBuffer(bytes, offset, length) {
+    const bytesOffset = bytes.byteOffset + (offset != null ? offset : 0);
+    const bytesLength = length != null ? length : bytes.byteLength;
+    return bytes.buffer.slice(bytesOffset, bytesOffset + bytesLength);
+  }
+  var getShortU16Encoder = () => createEncoder({
+    getSizeFromValue: (value) => {
+      if (value <= 127)
+        return 1;
+      if (value <= 16383)
+        return 2;
+      return 3;
+    },
     maxSize: 3,
-    serialize: (value) => {
-      assertRange("shortU16", 0, 65535, value);
-      const bytes2 = [0];
+    write: (value, bytes, offset) => {
+      assertNumberIsBetweenForCodec("shortU16", 0, 65535, value);
+      const shortU16Bytes = [0];
       for (let ii = 0; ; ii += 1) {
         const alignedValue = value >> ii * 7;
         if (alignedValue === 0) {
           break;
         }
         const nextSevenBits = 127 & alignedValue;
-        bytes2[ii] = nextSevenBits;
+        shortU16Bytes[ii] = nextSevenBits;
         if (ii > 0) {
-          bytes2[ii - 1] |= 128;
+          shortU16Bytes[ii - 1] |= 128;
         }
       }
-      return new Uint8Array(bytes2);
-    },
-    deserialize: (bytes2, offset = 0) => {
+      bytes.set(shortU16Bytes, offset);
+      return offset + shortU16Bytes.length;
+    }
+  });
+  var getShortU16Decoder = () => createDecoder({
+    maxSize: 3,
+    read: (bytes, offset) => {
       let value = 0;
       let byteCount = 0;
       while (++byteCount) {
         const byteIndex = byteCount - 1;
-        const currentByte = bytes2[offset + byteIndex];
+        const currentByte = bytes[offset + byteIndex];
         const nextSevenBits = 127 & currentByte;
         value |= nextSevenBits << byteIndex * 7;
         if ((currentByte & 128) === 0) {
@@ -432,221 +331,208 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return [value, offset + byteCount];
     }
   });
+  var getU32Encoder = (config = {}) => numberEncoderFactory({
+    config,
+    name: "u32",
+    range: [0, Number("0xffffffff")],
+    set: (view, value, le) => view.setUint32(0, value, le),
+    size: 4
+  });
+  var getU32Decoder = (config = {}) => numberDecoderFactory({
+    config,
+    get: (view, le) => view.getUint32(0, le),
+    name: "u32",
+    size: 4
+  });
+  var getU8Encoder = () => numberEncoderFactory({
+    name: "u8",
+    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
+  });
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/array.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/errors.mjs
-  init_env_shim();
-  var InvalidNumberOfItemsError = class extends Error {
-    constructor(serializer, expected, actual) {
-      super(`Expected [${serializer}] to have ${expected} items, got ${actual}.`);
-      __publicField(this, "name", "InvalidNumberOfItemsError");
-    }
-  };
-  var InvalidArrayLikeRemainderSizeError = class extends Error {
-    constructor(remainderSize, itemSize) {
-      super(`The remainder of the buffer (${remainderSize} bytes) cannot be split into chunks of ${itemSize} bytes. Serializers of "remainder" size must have a remainder that is a multiple of its item size. In other words, ${remainderSize} modulo ${itemSize} should be equal to zero.`);
-      __publicField(this, "name", "InvalidArrayLikeRemainderSizeError");
+  // ../codecs-strings/dist/index.browser.js
+  function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+    if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+      throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
     }
-  };
-  var UnrecognizedArrayLikeSerializerSizeError = class extends Error {
-    constructor(size) {
-      super(`Unrecognized array-like serializer size: ${JSON.stringify(size)}`);
-      __publicField(this, "name", "UnrecognizedArrayLikeSerializerSizeError");
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/utils.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/sumSerializerSizes.mjs
-  init_env_shim();
-  function sumSerializerSizes(sizes) {
-    return sizes.reduce((all, size) => all === null || size === null ? null : all + size, 0);
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/utils.mjs
-  function getResolvedSize(size, childrenSizes, bytes2, offset) {
-    if (typeof size === "number") {
-      return [size, offset];
-    }
-    if (typeof size === "object") {
-      return size.deserialize(bytes2, offset);
-    }
-    if (size === "remainder") {
-      const childrenSize = sumSerializerSizes(childrenSizes);
-      if (childrenSize === null) {
-        throw new ExpectedFixedSizeSerializerError('Serializers of "remainder" size must have fixed-size items.');
+  var getBaseXEncoder = (alphabet4) => {
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "")
+          return value.length;
+        const base10Number = getBigIntFromBaseX(tailChars, alphabet4);
+        return leadingZeroes.length + Math.ceil(base10Number.toString(16).length / 2);
+      },
+      write(value, bytes, offset) {
+        assertValidBaseString(alphabet4, value);
+        if (value === "")
+          return offset;
+        const [leadingZeroes, tailChars] = partitionLeadingZeroes(value, alphabet4[0]);
+        if (tailChars === "") {
+          bytes.set(new Uint8Array(leadingZeroes.length).fill(0), offset);
+          return offset + leadingZeroes.length;
+        }
+        let base10Number = getBigIntFromBaseX(tailChars, alphabet4);
+        const tailBytes = [];
+        while (base10Number > 0n) {
+          tailBytes.unshift(Number(base10Number % 256n));
+          base10Number /= 256n;
+        }
+        const bytesToAdd = [...Array(leadingZeroes.length).fill(0), ...tailBytes];
+        bytes.set(bytesToAdd, offset);
+        return offset + bytesToAdd.length;
       }
-      const remainder = bytes2.slice(offset).length;
-      if (remainder % childrenSize !== 0) {
-        throw new InvalidArrayLikeRemainderSizeError(remainder, childrenSize);
+    });
+  };
+  var getBaseXDecoder = (alphabet4) => {
+    return createDecoder({
+      read(rawBytes, offset) {
+        const bytes = offset === 0 ? rawBytes : rawBytes.slice(offset);
+        if (bytes.length === 0)
+          return ["", 0];
+        let trailIndex = bytes.findIndex((n) => n !== 0);
+        trailIndex = trailIndex === -1 ? bytes.length : trailIndex;
+        const leadingZeroes = alphabet4[0].repeat(trailIndex);
+        if (trailIndex === bytes.length)
+          return [leadingZeroes, rawBytes.length];
+        const base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
+        const tailChars = getBaseXFromBigInt(base10Number, alphabet4);
+        return [leadingZeroes + tailChars, rawBytes.length];
       }
-      return [remainder / childrenSize, offset];
-    }
-    throw new UnrecognizedArrayLikeSerializerSizeError(size);
-  }
-  function getSizeDescription(size) {
-    return typeof size === "object" ? size.description : `${size}`;
-  }
-  function getSizeFromChildren(size, childrenSizes) {
-    if (typeof size !== "number")
-      return null;
-    if (size === 0)
-      return 0;
-    const childrenSize = sumSerializerSizes(childrenSizes);
-    return childrenSize === null ? null : childrenSize * size;
+    });
+  };
+  function partitionLeadingZeroes(value, zeroCharacter) {
+    const leadingZeroIndex = [...value].findIndex((c) => c !== zeroCharacter);
+    return leadingZeroIndex === -1 ? [value, ""] : [value.slice(0, leadingZeroIndex), value.slice(leadingZeroIndex)];
   }
-  function getSizePrefix(size, realSize) {
-    return typeof size === "object" ? size.serialize(realSize) : new Uint8Array();
+  function getBigIntFromBaseX(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    return [...value].reduce((sum, char) => sum * base + BigInt(alphabet4.indexOf(char)), 0n);
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/array.mjs
-  function array(item, options = {}) {
-    const size = options.size ?? u32();
-    if (size === "remainder" && item.fixedSize === null) {
-      throw new ExpectedFixedSizeSerializerError('Serializers of "remainder" size must have fixed-size items.');
+  function getBaseXFromBigInt(value, alphabet4) {
+    const base = BigInt(alphabet4.length);
+    const tailChars = [];
+    while (value > 0n) {
+      tailChars.unshift(alphabet4[Number(value % base)]);
+      value /= base;
     }
-    return {
-      description: options.description ?? `array(${item.description}; ${getSizeDescription(size)})`,
-      fixedSize: getSizeFromChildren(size, [item.fixedSize]),
-      maxSize: getSizeFromChildren(size, [item.maxSize]),
-      serialize: (value) => {
-        if (typeof size === "number" && value.length !== size) {
-          throw new InvalidNumberOfItemsError("array", size, value.length);
-        }
-        return mergeBytes([getSizePrefix(size, value.length), ...value.map((v) => item.serialize(v))]);
-      },
-      deserialize: (bytes2, offset = 0) => {
-        if (typeof size === "object" && bytes2.slice(offset).length === 0) {
-          return [[], offset];
+    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}].`);
+          }
         }
-        const [resolvedSize, newOffset] = getResolvedSize(size, [item.fixedSize], bytes2, offset);
-        offset = newOffset;
-        const values = [];
-        for (let i = 0; i < resolvedSize; i += 1) {
-          const [value, newOffset2] = item.deserialize(bytes2, offset);
-          values.push(value);
-          offset = newOffset2;
+      });
+    }
+  };
+  var getBase64Decoder = () => {
+    {
+      return createDecoder({
+        read(bytes, offset = 0) {
+          const slice = bytes.slice(offset);
+          const value = btoa(String.fromCharCode(...slice));
+          return [value, bytes.length];
         }
-        return [values, offset];
+      });
+    }
+  };
+  var removeNullCharacters = (value) => (
+    // eslint-disable-next-line no-control-regex
+    value.replace(/\u0000/g, "")
+  );
+  var e = globalThis.TextDecoder;
+  var o = globalThis.TextEncoder;
+  var getUtf8Encoder = () => {
+    let textEncoder;
+    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;
       }
-    };
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/bytes.mjs
-  init_env_shim();
-  function bytes(options = {}) {
-    const size = options.size ?? "variable";
-    const description = options.description ?? `bytes(${getSizeDescription(size)})`;
-    const byteSerializer = {
-      description,
-      fixedSize: null,
-      maxSize: null,
-      serialize: (value) => new Uint8Array(value),
-      deserialize: (bytes2, offset = 0) => {
-        const slice = bytes2.slice(offset);
-        return [slice, offset + slice.length];
+    });
+  };
+  var getUtf8Decoder = () => {
+    let textDecoder;
+    return createDecoder({
+      read(bytes, offset) {
+        const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));
+        return [removeNullCharacters(value), bytes.length];
       }
-    };
+    });
+  };
+  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 byteSerializer;
+      return encoding;
     }
     if (typeof size === "number") {
-      return fixSerializer(byteSerializer, size, description);
+      return fixEncoder(encoding, size);
     }
-    return {
-      description,
-      fixedSize: null,
-      maxSize: null,
-      serialize: (value) => {
-        const contentBytes = byteSerializer.serialize(value);
-        const lengthBytes = size.serialize(contentBytes.length);
-        return mergeBytes([lengthBytes, contentBytes]);
+    return createEncoder({
+      getSizeFromValue: (value) => {
+        const contentSize = getEncodedSize(value, encoding);
+        return getEncodedSize(contentSize, size) + contentSize;
       },
-      deserialize: (buffer, offset = 0) => {
-        if (buffer.slice(offset).length === 0) {
-          throw new DeserializingEmptyBufferError("bytes");
-        }
-        const [lengthBigInt, lengthOffset] = size.deserialize(buffer, offset);
-        const length = Number(lengthBigInt);
-        offset = lengthOffset;
-        const contentBuffer = buffer.slice(offset, offset + length);
-        if (contentBuffer.length < length) {
-          throw new NotEnoughBytesError("bytes", length, contentBuffer.length);
-        }
-        const [value, contentOffset] = byteSerializer.deserialize(contentBuffer);
-        offset += contentOffset;
-        return [value, offset];
+      write: (value, bytes, offset) => {
+        const contentSize = getEncodedSize(value, encoding);
+        offset = size.write(contentSize, bytes, offset);
+        return encoding.write(value, bytes, offset);
       }
-    };
+    });
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/string.mjs
-  init_env_shim();
-  function string(options = {}) {
-    const size = options.size ?? u32();
-    const encoding = options.encoding ?? utf8;
-    const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;
+  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 fixSerializer(encoding, size, description);
+      return fixDecoder(encoding, size);
     }
-    return {
-      description,
-      fixedSize: null,
-      maxSize: null,
-      serialize: (value) => {
-        const contentBytes = encoding.serialize(value);
-        const lengthBytes = size.serialize(contentBytes.length);
-        return mergeBytes([lengthBytes, contentBytes]);
-      },
-      deserialize: (buffer, offset = 0) => {
-        if (buffer.slice(offset).length === 0) {
-          throw new DeserializingEmptyBufferError("string");
-        }
-        const [lengthBigInt, lengthOffset] = size.deserialize(buffer, offset);
+    return createDecoder({
+      read: (bytes, offset = 0) => {
+        assertByteArrayIsNotEmptyForCodec("string", bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.read(bytes, offset);
         const length = Number(lengthBigInt);
         offset = lengthOffset;
-        const contentBuffer = buffer.slice(offset, offset + length);
-        if (contentBuffer.length < length) {
-          throw new NotEnoughBytesError("string", length, contentBuffer.length);
-        }
-        const [value, contentOffset] = encoding.deserialize(contentBuffer);
+        const contentBytes = bytes.slice(offset, offset + length);
+        assertByteArrayHasEnoughBytesForCodec("string", length, contentBytes);
+        const [value, contentOffset] = encoding.read(contentBytes, 0);
         offset += contentOffset;
         return [value, offset];
       }
-    };
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.5/node_modules/@metaplex-foundation/umi-serializers/dist/esm/struct.mjs
-  init_env_shim();
-  function struct(fields, options = {}) {
-    const fieldDescriptions = fields.map(([name, serializer]) => `${String(name)}: ${serializer.description}`).join(", ");
-    return {
-      description: options.description ?? `struct(${fieldDescriptions})`,
-      fixedSize: sumSerializerSizes(fields.map(([, field]) => field.fixedSize)),
-      maxSize: sumSerializerSizes(fields.map(([, field]) => field.maxSize)),
-      serialize: (struct2) => {
-        const fieldBytes = fields.map(([key, serializer]) => serializer.serialize(struct2[key]));
-        return mergeBytes(fieldBytes);
-      },
-      deserialize: (bytes2, offset = 0) => {
-        const struct2 = {};
-        fields.forEach(([key, serializer]) => {
-          const [value, newOffset] = serializer.deserialize(bytes2, offset);
-          offset = newOffset;
-          struct2[key] = value;
-        });
-        return [struct2, offset];
-      }
-    };
+    });
   }
 
   // ../assertions/dist/index.browser.js
@@ -681,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)) {
@@ -698,51 +586,94 @@ 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");
     }
   }
-  function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
+
+  // ../addresses/dist/index.browser.js
+  var memoizedBase58Encoder;
+  var memoizedBase58Decoder;
+  function getMemoizedBase58Encoder() {
+    if (!memoizedBase58Encoder)
+      memoizedBase58Encoder = getBase58Encoder();
+    return memoizedBase58Encoder;
+  }
+  function getMemoizedBase58Decoder() {
+    if (!memoizedBase58Decoder)
+      memoizedBase58Decoder = getBase58Decoder();
+    return memoizedBase58Decoder;
+  }
+  function isAddress(putativeAddress) {
+    if (
+      // Lowest address (32 bytes of zeroes)
+      putativeAddress.length < 32 || // Highest address (32 bytes of 255)
+      putativeAddress.length > 44
+    ) {
+      return false;
+    }
+    const base58Encoder3 = getMemoizedBase58Encoder();
+    const bytes = base58Encoder3.encode(putativeAddress);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 32) {
+      return false;
+    }
+    return true;
+  }
+  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 bytes2 = base58.serialize(putativeBase58EncodedAddress);
-      const numBytes = bytes2.byteLength;
+      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 getBase58EncodedAddressCodec(config) {
-    return string({
-      description: config?.description ?? ("A 32-byte account address" ),
-      encoding: base58,
-      size: 32
-    });
+  function address(putativeAddress) {
+    assertIsAddress(putativeAddress);
+    return putativeAddress;
+  }
+  function getAddressEncoder() {
+    return mapEncoder(
+      getStringEncoder({ encoding: getMemoizedBase58Encoder(), size: 32 }),
+      (putativeAddress) => address(putativeAddress)
+    );
+  }
+  function getAddressDecoder() {
+    return getStringDecoder({ encoding: getMemoizedBase58Decoder(), size: 32 });
+  }
+  function getAddressCodec() {
+    return combineCodec(getAddressEncoder(), getAddressDecoder());
   }
-  function getBase58EncodedAddressComparator() {
+  function getAddressComparator() {
     return new Intl.Collator("en", {
       caseFirst: "lower",
       ignorePunctuation: false,
@@ -826,17 +757,32 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return hexString;
     }
   }
-  function decompressPointBytes(bytes2) {
-    const hexString = bytes2.reduce((acc, byte, ii) => `${byteToHex(ii === 31 ? byte & ~128 : byte)}${acc}`, "");
+  function decompressPointBytes(bytes) {
+    const hexString = bytes.reduce((acc, byte, ii) => `${byteToHex(ii === 31 ? byte & ~128 : byte)}${acc}`, "");
     const integerLiteralString = `0x${hexString}`;
     return BigInt(integerLiteralString);
   }
-  async function compressedPointBytesAreOnCurve(bytes2) {
-    if (bytes2.byteLength !== 32) {
+  async function compressedPointBytesAreOnCurve(bytes) {
+    if (bytes.byteLength !== 32) {
       return false;
     }
-    const y = decompressPointBytes(bytes2);
-    return pointIsOnCurve(y, bytes2[31]);
+    const y = decompressPointBytes(bytes);
+    return pointIsOnCurve(y, bytes[31]);
+  }
+  function isProgramDerivedAddress(value) {
+    return Array.isArray(value) && value.length === 2 && typeof value[0] === "string" && typeof value[1] === "number" && value[1] >= 0 && value[1] <= 255 && isAddress(value[0]);
+  }
+  function assertIsProgramDerivedAddress(value) {
+    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: [Address, ProgramDerivedAddressBump].`
+      );
+    }
+    if (value[1] < 0 || value[1] > 255) {
+      throw new Error(`Expected program derived address bump to be in the range [0, 255], got: ${value[1]}.`);
+    }
+    assertIsAddress(value[0]);
   }
   var MAX_SEED_LENGTH = 32;
   var MAX_SEEDS = 16;
@@ -873,15 +819,15 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     let textEncoder;
     const seedBytes = seeds.reduce((acc, seed, ii) => {
-      const bytes2 = typeof seed === "string" ? (textEncoder || (textEncoder = new TextEncoder())).encode(seed) : seed;
-      if (bytes2.byteLength > MAX_SEED_LENGTH) {
+      const bytes = typeof seed === "string" ? (textEncoder || (textEncoder = new TextEncoder())).encode(seed) : seed;
+      if (bytes.byteLength > MAX_SEED_LENGTH) {
         throw new Error(`The seed at index ${ii} exceeds the maximum length of 32 bytes`);
       }
-      acc.push(...bytes2);
+      acc.push(...bytes);
       return acc;
     }, []);
-    const base58EncodedAddressCodec = getBase58EncodedAddressCodec();
-    const programAddressBytes = base58EncodedAddressCodec.serialize(programAddress);
+    const base58EncodedAddressCodec = getAddressCodec();
+    const programAddressBytes = base58EncodedAddressCodec.encode(programAddress);
     const addressBytesBuffer = await crypto.subtle.digest(
       "SHA-256",
       new Uint8Array([...seedBytes, ...programAddressBytes, ...PDA_MARKER_BYTES])
@@ -890,19 +836,20 @@ this.globalThis.solanaWeb3 = (function (exports) {
     if (await compressedPointBytesAreOnCurve(addressBytes)) {
       throw new PointOnCurveError("Invalid seeds; point must fall off the Ed25519 curve");
     }
-    return base58EncodedAddressCodec.deserialize(addressBytes)[0];
+    return base58EncodedAddressCodec.decode(addressBytes);
   }
-  async function getProgramDerivedAddress({ programAddress, seeds }) {
+  async function getProgramDerivedAddress({
+    programAddress,
+    seeds
+  }) {
     let bumpSeed = 255;
     while (bumpSeed > 0) {
       try {
-        return {
-          bumpSeed,
-          pda: await createProgramDerivedAddress({
-            programAddress,
-            seeds: [...seeds, new Uint8Array([bumpSeed])]
-          })
-        };
+        const address2 = await createProgramDerivedAddress({
+          programAddress,
+          seeds: [...seeds, new Uint8Array([bumpSeed])]
+        });
+        return [address2, bumpSeed];
       } catch (e3) {
         if (e3 instanceof PointOnCurveError) {
           bumpSeed--;
@@ -913,14 +860,30 @@ 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, 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 = 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([...encode(baseAddress), ...seedBytes, ...programAddressBytes])
+    );
+    const addressBytes = new Uint8Array(addressBytesBuffer);
+    return decode(addressBytes);
+  }
   async function getAddressFromPublicKey(publicKey) {
     await assertKeyExporterIsAvailable();
     if (publicKey.type !== "public" || publicKey.algorithm.name !== "Ed25519") {
       throw new Error("The `CryptoKey` must be an `Ed25519` public key");
     }
     const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-    const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
-    return base58EncodedAddress;
+    return getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
   }
 
   // ../instructions/dist/index.browser.js
@@ -953,41 +916,431 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function mergeRoles(roleA, roleB) {
     return roleA | roleB;
   }
-  function upgradeRoleToSigner(role) {
-    return role | IS_SIGNER_BITMASK;
+  function upgradeRoleToSigner(role) {
+    return role | IS_SIGNER_BITMASK;
+  }
+  function upgradeRoleToWritable(role) {
+    return role | IS_WRITABLE_BITMASK;
+  }
+
+  // ../keys/dist/index.browser.js
+  init_env_shim();
+  async function generateKeyPair() {
+    await assertKeyGenerationIsAvailable();
+    const keyPair = await crypto.subtle.generateKey(
+      /* algorithm */
+      "Ed25519",
+      // Native implementation status: https://github.com/WICG/webcrypto-secure-curves/issues/20
+      /* extractable */
+      false,
+      // Prevents the bytes of the private key from being visible to JS.
+      /* allowed uses */
+      ["sign", "verify"]
+    );
+    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);
+  }
+  function signature(putativeSignature) {
+    assertIsSignature(putativeSignature);
+    return putativeSignature;
+  }
+  async function verifySignature(key, signature2, data) {
+    await assertVerificationCapabilityIsAvailable();
+    return await crypto.subtle.verify("Ed25519", key, signature2, data);
+  }
+
+  // ../rpc-types/dist/index.browser.js
+  init_env_shim();
+  function getCommitmentScore(commitment) {
+    switch (commitment) {
+      case "finalized":
+        return 2;
+      case "confirmed":
+        return 1;
+      case "processed":
+        return 0;
+      default:
+        return ((_) => {
+          throw new Error(`Unrecognized commitment \`${commitment}\`.`);
+        })();
+    }
+  }
+  function commitmentComparator(a, b) {
+    if (a === b) {
+      return 0;
+    }
+    return getCommitmentScore(a) < getCommitmentScore(b) ? -1 : 1;
+  }
+  var maxU64Value = 18446744073709551615n;
+  function isLamports(putativeLamports) {
+    return putativeLamports >= 0 && putativeLamports <= maxU64Value;
+  }
+  function assertIsLamports(putativeLamports) {
+    if (putativeLamports < 0) {
+      throw new Error("Input for 64-bit unsigned integer cannot be negative");
+    }
+    if (putativeLamports > maxU64Value) {
+      throw new Error("Input number is too large to be represented as a 64-bit unsigned integer");
+    }
+  }
+  function lamports(putativeLamports) {
+    assertIsLamports(putativeLamports);
+    return putativeLamports;
+  }
+  function isStringifiedBigInt(putativeBigInt) {
+    try {
+      BigInt(putativeBigInt);
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
+  function assertIsStringifiedBigInt(putativeBigInt) {
+    try {
+      BigInt(putativeBigInt);
+    } catch (e3) {
+      throw new Error(`\`${putativeBigInt}\` cannot be parsed as a BigInt`, {
+        cause: e3
+      });
+    }
+  }
+  function stringifiedBigInt(putativeBigInt) {
+    assertIsStringifiedBigInt(putativeBigInt);
+    return putativeBigInt;
+  }
+  function isStringifiedNumber(putativeNumber) {
+    return !Number.isNaN(Number(putativeNumber));
+  }
+  function assertIsStringifiedNumber(putativeNumber) {
+    if (Number.isNaN(Number(putativeNumber))) {
+      throw new Error(`\`${putativeNumber}\` cannot be parsed as a Number`);
+    }
+  }
+  function stringifiedNumber(putativeNumber) {
+    assertIsStringifiedNumber(putativeNumber);
+    return putativeNumber;
+  }
+  function isUnixTimestamp(putativeTimestamp) {
+    if (putativeTimestamp > 864e13 || putativeTimestamp < -864e13) {
+      return false;
+    }
+    return true;
+  }
+  function assertIsUnixTimestamp(putativeTimestamp) {
+    try {
+      if (putativeTimestamp > 864e13 || putativeTimestamp < -864e13) {
+        throw new Error("Expected input number to be in the range [-8.64e15, 8.64e15]");
+      }
+    } catch (e3) {
+      throw new Error(`\`${putativeTimestamp}\` is not a timestamp`, {
+        cause: e3
+      });
+    }
+  }
+  function unixTimestamp(putativeTimestamp) {
+    assertIsUnixTimestamp(putativeTimestamp);
+    return putativeTimestamp;
+  }
+
+  // ../transactions/dist/index.browser.js
+  init_env_shim();
+
+  // ../codecs-data-structures/dist/index.browser.js
+  init_env_shim();
+  function assertValidNumberOfItemsForCodec(codecDescription, expected, actual) {
+    if (expected !== actual) {
+      throw new Error(`Expected [${codecDescription}] to have ${expected} items, got ${actual}.`);
+    }
+  }
+  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.');
+    }
+    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
+      },
+      write: (array, bytes, offset) => {
+        if (typeof size === "number") {
+          assertValidNumberOfItemsForCodec("array", size, array.length);
+        }
+        if (typeof size === "object") {
+          offset = size.write(array.length, bytes, offset);
+        }
+        array.forEach((value) => {
+          offset = item.write(value, bytes, offset);
+        });
+        return offset;
+      }
+    });
+  }
+  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];
+        }
+        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];
+      }
+    });
+  }
+  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 computeArrayLikeCodecSize(size, itemSize) {
+    if (typeof size !== "number")
+      return null;
+    if (size === 0)
+      return 0;
+    return itemSize === null ? null : itemSize * size;
+  }
+  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;
+    }
+    if (typeof size === "number") {
+      return fixEncoder(byteEncoder, size);
+    }
+    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 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 byteDecoder;
+    }
+    if (typeof size === "number") {
+      return fixDecoder(byteDecoder, size);
+    }
+    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 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 upgradeRoleToWritable(role) {
-    return role | IS_WRITABLE_BITMASK;
+  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];
+      }
+    });
   }
 
-  // ../keys/dist/index.browser.js
+  // ../functional/dist/index.browser.js
   init_env_shim();
-  async function generateKeyPair() {
-    await assertKeyGenerationIsAvailable();
-    const keyPair = await crypto.subtle.generateKey(
-      /* algorithm */
-      "Ed25519",
-      // Native implementation status: https://github.com/WICG/webcrypto-secure-curves/issues/20
-      /* extractable */
-      false,
-      // Prevents the bytes of the private key from being visible to JS.
-      /* allowed uses */
-      ["sign", "verify"]
-    );
-    return keyPair;
-  }
-  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) {
-    await assertVerificationCapabilityIsAvailable();
-    return await crypto.subtle.verify("Ed25519", key, signature, data);
+  function pipe(init, ...fns) {
+    return fns.reduce((acc, fn) => fn(acc), init);
   }
 
   // ../transactions/dist/index.browser.js
-  init_env_shim();
   function getUnsignedTransaction(transaction) {
     if ("signatures" in transaction) {
       const {
@@ -1000,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)
@@ -1009,8 +1365,8 @@ this.globalThis.solanaWeb3 = (function (exports) {
       ) {
         throw new Error("Expected input string to decode to a byte array of length 32.");
       }
-      const bytes3 = base58.serialize(putativeBlockhash);
-      const numBytes = bytes3.byteLength;
+      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}`);
       }
@@ -1020,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;
@@ -1084,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;
@@ -1097,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
       }
@@ -1146,8 +1536,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
     Object.freeze(out);
     return out;
   }
-  function upsert(addressMap, address, update) {
-    addressMap[address] = update(addressMap[address] ?? { role: AccountRole2.READONLY });
+  function upsert(addressMap, address2, update) {
+    var _a;
+    addressMap[address2] = update((_a = addressMap[address2]) != null ? _a : { role: AccountRole2.READONLY });
   }
   var TYPE = Symbol("AddressMapTypeProperty");
   function getAddressMapFromInstructions(feePayer, instructions) {
@@ -1198,7 +1589,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
                   const shouldReplaceEntry = (
                     // Consider using the new LOOKUP_TABLE if its address is different...
                     entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
-                    (addressComparator || (addressComparator = getBase58EncodedAddressComparator()))(
+                    (addressComparator || (addressComparator = getAddressComparator()))(
                       accountMeta.lookupTableAddress,
                       entry.lookupTableAddress
                     ) < 0
@@ -1306,14 +1697,14 @@ this.globalThis.solanaWeb3 = (function (exports) {
       if (leftIsWritable !== isWritableRole2(rightEntry.role)) {
         return leftIsWritable ? -1 : 1;
       }
-      addressComparator || (addressComparator = getBase58EncodedAddressComparator());
+      addressComparator || (addressComparator = getAddressComparator());
       if (leftEntry[TYPE] === 1 && rightEntry[TYPE] === 1 && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
         return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
       } else {
         return addressComparator(leftAddress, rightAddress);
       }
-    }).map(([address, addressMeta]) => ({
-      address,
+    }).map(([address2, addressMeta]) => ({
+      address: address2,
       ...addressMeta
     }));
     return orderedAccounts;
@@ -1335,7 +1726,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         entry.readableIndices.push(account.addressIndex);
       }
     }
-    return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
+    return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
       lookupTableAddress,
       ...index[lookupTableAddress]
     }));
@@ -1376,7 +1767,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return instructions.map(({ accounts, data, programAddress }) => {
       return {
         programAddressIndex: accountIndex[programAddress],
-        ...accounts ? { accountIndices: accounts.map(({ address }) => accountIndex[address]) } : null,
+        ...accounts ? { accountIndices: accounts.map(({ address: address2 }) => accountIndex[address2]) } : null,
         ...data ? { data } : null
       };
     });
@@ -1390,7 +1781,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function getCompiledStaticAccounts(orderedAccounts) {
     const firstLookupTableAccountIndex = orderedAccounts.findIndex((account) => "lookupTableAddress" in account);
     const orderedStaticAccounts = firstLookupTableAccountIndex === -1 ? orderedAccounts : orderedAccounts.slice(0, firstLookupTableAccountIndex);
-    return orderedStaticAccounts.map(({ address }) => address);
+    return orderedStaticAccounts.map(({ address: address2 }) => address2);
   }
   function compileMessage(transaction) {
     const addressMap = getAddressMapFromInstructions(transaction.feePayer, transaction.instructions);
@@ -1404,252 +1795,398 @@ this.globalThis.solanaWeb3 = (function (exports) {
       version: transaction.version
     };
   }
-  function getAddressTableLookupCodec() {
-    return struct(
-      [
-        [
-          "lookupTableAddress",
-          getBase58EncodedAddressCodec(
-            {
-              description: "The address of the address lookup table account from which instruction addresses should be looked up"
-            } 
-          )
-        ],
+  var memoizedAddressTableLookupEncoder;
+  function getAddressTableLookupEncoder() {
+    if (!memoizedAddressTableLookupEncoder) {
+      memoizedAddressTableLookupEncoder = getStructEncoder([
+        ["lookupTableAddress", getAddressEncoder()],
         [
           "writableIndices",
-          array(u8(), {
-            ...{
-              description: "The indices of the accounts in the lookup table that should be loaded as writeable"
-            } ,
-            size: shortU16()
-          })
+          getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
         ],
         [
           "readableIndices",
-          array(u8(), {
-            ...{
-              description: "The indices of the accounts in the lookup table that should be loaded as read-only"
-            } ,
-            size: shortU16()
-          })
+          getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
         ]
-      ],
-      {
-        description: "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"
-      } 
-    );
+      ]);
+    }
+    return memoizedAddressTableLookupEncoder;
   }
-  function getMessageHeaderCodec() {
-    return struct(
-      [
-        [
-          "numSignerAccounts",
-          u8(
-            {
-              description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
-            } 
-          )
-        ],
-        [
-          "numReadonlySignerAccounts",
-          u8(
-            {
-              description: "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"
-            } 
-          )
-        ],
-        [
-          "numReadonlyNonSignerAccounts",
-          u8(
-            {
-              description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
-            } 
-          )
-        ]
-      ],
-      {
-        description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
-      } 
-    );
+  var memoizedAddressTableLookupDecoder;
+  function getAddressTableLookupDecoder() {
+    if (!memoizedAddressTableLookupDecoder) {
+      memoizedAddressTableLookupDecoder = getStructDecoder([
+        ["lookupTableAddress", getAddressDecoder()],
+        ["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
+        ["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
+      ]);
+    }
+    return memoizedAddressTableLookupDecoder;
   }
-  function getInstructionCodec() {
-    return mapSerializer(
-      struct([
-        [
-          "programAddressIndex",
-          u8(
-            {
-              description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
-            } 
-          )
-        ],
-        [
-          "accountIndices",
-          array(
-            u8({
-              description: "The index of an account, according to the well-ordered accounts list for this transaction" 
-            }),
-            {
-              description: "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" ,
-              size: shortU16()
-            }
-          )
-        ],
-        [
-          "data",
-          bytes({
-            description: "An optional buffer of data passed to the instruction" ,
-            size: shortU16()
-          })
-        ]
+  var memoizedU8Encoder;
+  function getMemoizedU8Encoder() {
+    if (!memoizedU8Encoder)
+      memoizedU8Encoder = getU8Encoder();
+    return memoizedU8Encoder;
+  }
+  var memoizedU8Decoder;
+  function getMemoizedU8Decoder() {
+    if (!memoizedU8Decoder)
+      memoizedU8Decoder = getU8Decoder();
+    return memoizedU8Decoder;
+  }
+  function getMessageHeaderEncoder() {
+    return getStructEncoder([
+      ["numSignerAccounts", getMemoizedU8Encoder()],
+      ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
+    ]);
+  }
+  function getMessageHeaderDecoder() {
+    return getStructDecoder([
+      ["numSignerAccounts", getMemoizedU8Decoder()],
+      ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
+      ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
+    ]);
+  }
+  var memoizedGetInstructionEncoder;
+  function getInstructionEncoder() {
+    if (!memoizedGetInstructionEncoder) {
+      memoizedGetInstructionEncoder = mapEncoder(
+        getStructEncoder([
+          ["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: (_a = instruction.accountIndices) != null ? _a : [],
+            data: (_b = instruction.data) != null ? _b : new Uint8Array(0)
+          };
+        }
+      );
+    }
+    return memoizedGetInstructionEncoder;
+  }
+  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 memoizedGetInstructionDecoder;
+  }
+  var VERSION_FLAG_MASK = 128;
+  function getTransactionVersionEncoder() {
+    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];
+        }
+      }
+    });
+  }
+  function getCompiledMessageLegacyEncoder() {
+    return getStructEncoder(getPreludeStructEncoderTuple());
+  }
+  function getCompiledMessageVersionedEncoder() {
+    return mapEncoder(
+      getStructEncoder([
+        ...getPreludeStructEncoderTuple(),
+        ["addressTableLookups", getAddressTableLookupArrayEncoder()]
       ]),
       (value) => {
-        if (value.accountIndices !== void 0 && value.data !== void 0) {
+        var _a;
+        if (value.version === "legacy") {
           return value;
         }
         return {
           ...value,
-          accountIndices: value.accountIndices ?? [],
-          data: value.data ?? new Uint8Array(0)
+          addressTableLookups: (_a = value.addressTableLookups) != null ? _a : []
         };
+      }
+    );
+  }
+  function getPreludeStructEncoderTuple() {
+    return [
+      ["version", getTransactionVersionEncoder()],
+      ["header", getMessageHeaderEncoder()],
+      ["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(), { size: getShortU16Encoder() });
+  }
+  function getAddressTableLookupArrayDecoder() {
+    return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
+  }
+  function getCompiledMessageEncoder() {
+    return createEncoder({
+      getSizeFromValue: (compiledMessage) => {
+        if (compiledMessage.version === "legacy") {
+          return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
+        } else {
+          return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
+        }
       },
-      (value) => {
-        if (value.accountIndices.length && value.data.byteLength) {
-          return value;
+      write: (compiledMessage, bytes, offset) => {
+        if (compiledMessage.version === "legacy") {
+          return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
+        } else {
+          return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
         }
-        const { accountIndices, data, ...rest } = value;
-        return {
-          ...rest,
-          ...accountIndices.length ? { accountIndices } : null,
-          ...data.byteLength ? { data } : null
-        };
       }
-    );
+    });
   }
-  function getError(type, name) {
-    const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
-    return new Error(
-      `No ${type} exists for ${name}. Use \`get${functionSuffix}()\` if you need a ${type}, and \`get${name}Codec()\` if you need to both encode and decode ${name}`
-    );
+  function getCompiledMessageDecoder() {
+    return mapDecoder(getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
+      if (restOfMessage.version === "legacy" || !(addressTableLookups == null ? void 0 : addressTableLookups.length)) {
+        return restOfMessage;
+      }
+      return { ...restOfMessage, addressTableLookups };
+    });
   }
-  function getUnimplementedDecoder(name) {
-    return () => {
-      throw getError("decoder", name);
-    };
+  function getCompiledMessageCodec() {
+    return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
   }
-  var VERSION_FLAG_MASK = 128;
-  var BASE_CONFIG = {
-    description: "A single byte that encodes the version of the transaction" ,
-    fixedSize: null,
-    maxSize: 1
-  };
-  function deserialize(bytes3, offset = 0) {
-    const firstByte = bytes3[offset];
-    if ((firstByte & VERSION_FLAG_MASK) === 0) {
-      return ["legacy", offset];
+  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));
+      }
     } else {
-      const version = firstByte ^ VERSION_FLAG_MASK;
-      return [version, offset + 1];
+      signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
     }
+    return {
+      compiledMessage,
+      signatures
+    };
   }
-  function serialize(value) {
-    if (value === "legacy") {
-      return new Uint8Array();
+  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++;
     }
-    if (value < 0 || value > 127) {
-      throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
+    for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.READONLY
+      });
+      accountIndex++;
     }
-    return new Uint8Array([value | VERSION_FLAG_MASK]);
+    return accountMetas;
   }
-  function getTransactionVersionCodec() {
+  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 accounts = (_b = instruction.accountIndices) == null ? void 0 : _b.map((accountIndex) => accountMetas[accountIndex]);
+    const { data } = instruction;
     return {
-      ...BASE_CONFIG,
-      deserialize,
-      serialize
+      programAddress,
+      ...accounts && accounts.length ? { accounts } : {},
+      ...data && data.length ? { data } : {}
     };
   }
-  var BASE_CONFIG2 = {
-    description: "The wire format of a Solana transaction message" ,
-    fixedSize: null,
-    maxSize: null
-  };
-  function serialize2(compiledMessage) {
-    if (compiledMessage.version === "legacy") {
-      return struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
+  function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
+    if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
+      return {
+        blockhash: messageLifetimeToken,
+        lastValidBlockHeight: lastValidBlockHeight != null ? lastValidBlockHeight : 2n ** 64n - 1n
+        // U64 MAX
+      };
     } else {
-      return mapSerializer(
-        struct([
-          ...getPreludeStructSerializerTuple(),
-          ["addressTableLookups", getAddressTableLookupsSerializer()]
-        ]),
-        (value) => {
-          if (value.version === "legacy") {
-            return value;
-          }
-          return {
-            ...value,
-            addressTableLookups: value.addressTableLookups ?? []
-          };
-        }
-      ).serialize(compiledMessage);
+      const nonceAccountAddress = firstInstruction.accounts[0].address;
+      assertIsAddress(nonceAccountAddress);
+      const nonceAuthorityAddress = firstInstruction.accounts[2].address;
+      assertIsAddress(nonceAuthorityAddress);
+      return {
+        nonce: messageLifetimeToken,
+        nonceAccountAddress,
+        nonceAuthorityAddress
+      };
     }
   }
-  function getPreludeStructSerializerTuple() {
-    return [
-      ["version", getTransactionVersionCodec()],
-      ["header", getMessageHeaderCodec()],
-      [
-        "staticAccounts",
-        array(getBase58EncodedAddressCodec(), {
-          description: "A compact-array of static account addresses belonging to this transaction" ,
-          size: shortU16()
-        })
-      ],
+  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([
       [
-        "lifetimeToken",
-        string({
-          description: "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" ,
-          encoding: base58,
-          size: 32
+        "signatures",
+        getArrayDecoder(getBytesDecoder({ size: 64 }), {
+          size: getShortU16Decoder()
         })
       ],
-      [
-        "instructions",
-        array(getInstructionCodec(), {
-          description: "A compact-array of instructions belonging to this transaction" ,
-          size: shortU16()
-        })
-      ]
-    ];
+      ["compiledMessage", getCompiledMessageDecoder()]
+    ]);
   }
-  function getAddressTableLookupsSerializer() {
-    return array(getAddressTableLookupCodec(), {
-      ...{ description: "A compact array of address table lookups belonging to this transaction" } ,
-      size: shortU16()
-    });
+  function getTransactionEncoder() {
+    return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
   }
-  function getCompiledMessageEncoder() {
-    return {
-      ...BASE_CONFIG2,
-      deserialize: getUnimplementedDecoder("CompiledMessage"),
-      serialize: serialize2
-    };
+  function getTransactionDecoder(lastValidBlockHeight) {
+    return mapDecoder(
+      getCompiledTransactionDecoder(),
+      (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+    );
   }
-  async function getCompiledMessageSignature(message, secretKey) {
-    const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
-    const signature = await signBytes(secretKey, wireMessageBytes);
-    return signature;
+  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 transactionSignature = base58Decoder.decode(signatureBytes);
+    return transactionSignature;
   }
-  async function signTransaction(keyPair, transaction) {
+  async function partiallySignTransaction(keyPairs, transaction) {
     const compiledMessage = compileMessage(transaction);
-    const [signerPublicKey, signature] = await Promise.all([
-      getAddressFromPublicKey(keyPair.publicKey),
-      getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
-    ]);
-    const nextSignatures = {
-      ..."signatures" in transaction ? transaction.signatures : null,
-      ...{ [signerPublicKey]: signature }
-    };
+    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), signBytes(keyPair.privateKey, wireMessageBytes)])
+      )
+    );
+    for (const [signerPublicKey, signature2] of publicKeySignaturePairs) {
+      nextSignatures[signerPublicKey] = signature2;
+    }
     const out = {
       ...transaction,
       signatures: nextSignatures
@@ -1657,52 +2194,193 @@ this.globalThis.solanaWeb3 = (function (exports) {
     Object.freeze(out);
     return out;
   }
-  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));
+  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}\``);
       }
-    } else {
-      signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
+    });
+  }
+  function getBase64EncodedWireTransaction(transaction) {
+    const wireTransactionBytes = getTransactionEncoder().encode(transaction);
+    return getBase64Decoder().decode(wireTransactionBytes);
+  }
+
+  // src/airdrop.ts
+  init_env_shim();
+
+  // src/airdrop-confirmer.ts
+  init_env_shim();
+
+  // src/transaction-confirmation-strategy-racer.ts
+  init_env_shim();
+  async function raceStrategies(signature2, config, getSpecificStrategiesForRace) {
+    const { abortSignal: callerAbortSignal, commitment, getRecentSignatureConfirmationPromise } = config;
+    callerAbortSignal == null ? void 0 : callerAbortSignal.throwIfAborted();
+    const abortController = new AbortController();
+    if (callerAbortSignal) {
+      const handleAbort = () => {
+        abortController.abort();
+      };
+      callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
     }
-    return {
-      compiledMessage,
-      signatures
+    try {
+      const specificStrategies = getSpecificStrategiesForRace({
+        ...config,
+        abortSignal: abortController.signal
+      });
+      return await Promise.race([
+        getRecentSignatureConfirmationPromise({
+          abortSignal: abortController.signal,
+          commitment,
+          signature: signature2
+        }),
+        ...specificStrategies
+      ]);
+    } finally {
+      abortController.abort();
+    }
+  }
+
+  // src/transaction-confirmation-strategy-recent-signature.ts
+  init_env_shim();
+  function createRecentSignatureConfirmationPromiseFactory(rpc, rpcSubscriptions) {
+    return async function getRecentSignatureConfirmationPromise({
+      abortSignal: callerAbortSignal,
+      commitment,
+      signature: signature2
+    }) {
+      const abortController = new AbortController();
+      function handleAbort() {
+        abortController.abort();
+      }
+      callerAbortSignal.addEventListener("abort", handleAbort, { signal: 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 \`${signature2}\` failed.`, {
+              cause: signatureStatusNotification.value.err
+            });
+          } else {
+            return;
+          }
+        }
+      })();
+      const signatureStatusLookupPromise = (async () => {
+        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;
+        } else {
+          await new Promise(() => {
+          });
+        }
+      })();
+      try {
+        return await Promise.race([signatureDidCommitPromise, signatureStatusLookupPromise]);
+      } finally {
+        abortController.abort();
+      }
+    };
+  }
+
+  // src/transaction-confirmation-strategy-timeout.ts
+  init_env_shim();
+  async function getTimeoutPromise({ abortSignal: callerAbortSignal, commitment }) {
+    return await new Promise((_, reject) => {
+      const handleAbort = (e3) => {
+        clearTimeout(timeoutId);
+        const abortError = new DOMException(e3.target.reason, "AbortError");
+        reject(abortError);
+      };
+      callerAbortSignal.addEventListener("abort", handleAbort);
+      const timeoutMs = commitment === "processed" ? 3e4 : 6e4;
+      const startMs = performance.now();
+      const timeoutId = (
+        // We use `setTimeout` instead of `AbortSignal.timeout()` because we want to measure
+        // elapsed time instead of active time.
+        // See https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static
+        setTimeout(() => {
+          const elapsedMs = performance.now() - startMs;
+          reject(new DOMException(`Timeout elapsed after ${elapsedMs} ms`, "TimeoutError"));
+        }, timeoutMs)
+      );
+    });
+  }
+
+  // src/airdrop-confirmer.ts
+  function createDefaultSignatureOnlyRecentTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+      rpc,
+      rpcSubscriptions
+    );
+    return async function confirmSignatureOnlyRecentTransaction(config) {
+      await waitForRecentTransactionConfirmationUntilTimeout({
+        ...config,
+        getRecentSignatureConfirmationPromise,
+        getTimeoutPromise
+      });
     };
   }
-  var BASE_CONFIG3 = {
-    description: "The wire format of a Solana transaction" ,
-    fixedSize: null,
-    maxSize: null
-  };
-  function serialize3(transaction) {
-    const compiledTransaction = getCompiledTransaction(transaction);
-    return struct([
-      [
-        "signatures",
-        array(bytes({ size: 64 }), {
-          ...{ description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } ,
-          size: shortU16()
-        })
-      ],
-      ["compiledMessage", getCompiledMessageEncoder()]
-    ]).serialize(compiledTransaction);
+  async function waitForRecentTransactionConfirmationUntilTimeout(config) {
+    await raceStrategies(
+      config.signature,
+      config,
+      function getSpecificStrategiesForRace({ abortSignal, commitment, getTimeoutPromise: getTimeoutPromise2 }) {
+        return [
+          getTimeoutPromise2({
+            abortSignal,
+            commitment
+          })
+        ];
+      }
+    );
   }
-  function getTransactionEncoder() {
-    return {
-      ...BASE_CONFIG3,
-      deserialize: getUnimplementedDecoder("CompiledMessage"),
-      serialize: serialize3
+
+  // src/airdrop.ts
+  function createDefaultAirdropRequester({ rpc, rpcSubscriptions }) {
+    const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
+      rpc,
+      rpcSubscriptions
+    });
+    return async function requestAirdrop(config) {
+      return await requestAndConfirmAirdrop({
+        ...config,
+        confirmSignatureOnlyTransaction,
+        rpc
+      });
     };
   }
-  function getBase64EncodedWireTransaction(transaction) {
-    const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
-    {
-      return btoa(String.fromCharCode(...wireTransactionBytes));
-    }
+  async function requestAndConfirmAirdrop({
+    abortSignal,
+    commitment,
+    confirmSignatureOnlyTransaction,
+    lamports: lamports2,
+    recipientAddress,
+    rpc
+  }) {
+    const airdropTransactionSignature = await rpc.requestAirdrop(recipientAddress, lamports2, { commitment }).send({ abortSignal });
+    await confirmSignatureOnlyTransaction({
+      abortSignal,
+      commitment,
+      signature: airdropTransactionSignature
+    });
+    return airdropTransactionSignature;
   }
 
   // src/rpc.ts
@@ -1736,63 +2414,306 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return visitNode(params, [], onIntegerOverflow);
   }
   var KEYPATH_WILDCARD = {};
-  var memoizedKeypaths;
-  function getAllowedNumericKeypaths() {
-    if (!memoizedKeypaths) {
-      const jsonParsedTokenAccountsConfigs = [
-        // parsed Token/Token22 token account
-        ["data", "parsed", "info", "tokenAmount", "decimals"],
-        ["data", "parsed", "info", "tokenAmount", "uiAmount"],
-        ["data", "parsed", "info", "rentExemptReserve", "decimals"],
-        ["data", "parsed", "info", "rentExemptReserve", "uiAmount"],
-        ["data", "parsed", "info", "delegatedAmount", "decimals"],
-        ["data", "parsed", "info", "delegatedAmount", "uiAmount"],
-        [
-          "data",
-          "parsed",
-          "info",
-          "extensions",
-          KEYPATH_WILDCARD,
-          "state",
-          "olderTransferFee",
-          "transferFeeBasisPoints"
-        ],
-        [
-          "data",
-          "parsed",
-          "info",
-          "extensions",
-          KEYPATH_WILDCARD,
-          "state",
-          "newerTransferFee",
-          "transferFeeBasisPoints"
+  var jsonParsedTokenAccountsConfigs = [
+    // parsed Token/Token22 token account
+    ["data", "parsed", "info", "tokenAmount", "decimals"],
+    ["data", "parsed", "info", "tokenAmount", "uiAmount"],
+    ["data", "parsed", "info", "rentExemptReserve", "decimals"],
+    ["data", "parsed", "info", "rentExemptReserve", "uiAmount"],
+    ["data", "parsed", "info", "delegatedAmount", "decimals"],
+    ["data", "parsed", "info", "delegatedAmount", "uiAmount"],
+    ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "olderTransferFee", "transferFeeBasisPoints"],
+    ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "newerTransferFee", "transferFeeBasisPoints"],
+    ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "preUpdateAverageRate"],
+    ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "currentRate"]
+  ];
+  var jsonParsedAccountsConfigs = [
+    ...jsonParsedTokenAccountsConfigs,
+    // parsed AddressTableLookup account
+    ["data", "parsed", "info", "lastExtendedSlotStartIndex"],
+    // parsed Config account
+    ["data", "parsed", "info", "slashPenalty"],
+    ["data", "parsed", "info", "warmupCooldownRate"],
+    // parsed Token/Token22 mint account
+    ["data", "parsed", "info", "decimals"],
+    // parsed Token/Token22 multisig account
+    ["data", "parsed", "info", "numRequiredSigners"],
+    ["data", "parsed", "info", "numValidSigners"],
+    // parsed Stake account
+    ["data", "parsed", "info", "stake", "delegation", "warmupCooldownRate"],
+    // parsed Sysvar rent account
+    ["data", "parsed", "info", "exemptionThreshold"],
+    ["data", "parsed", "info", "burnPercent"],
+    // parsed Vote account
+    ["data", "parsed", "info", "commission"],
+    ["data", "parsed", "info", "votes", KEYPATH_WILDCARD, "confirmationCount"]
+  ];
+  var memoizedNotificationKeypaths;
+  var memoizedResponseKeypaths;
+  function getAllowedNumericKeypathsForNotification() {
+    if (!memoizedNotificationKeypaths) {
+      memoizedNotificationKeypaths = {
+        accountNotifications: jsonParsedAccountsConfigs.map((c) => ["value", ...c]),
+        blockNotifications: [
+          ["value", "block", "blockTime"],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "preTokenBalances",
+            KEYPATH_WILDCARD,
+            "accountIndex"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "preTokenBalances",
+            KEYPATH_WILDCARD,
+            "uiTokenAmount",
+            "decimals"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "postTokenBalances",
+            KEYPATH_WILDCARD,
+            "accountIndex"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "postTokenBalances",
+            KEYPATH_WILDCARD,
+            "uiTokenAmount",
+            "decimals"
+          ],
+          ["value", "block", "transactions", KEYPATH_WILDCARD, "meta", "rewards", KEYPATH_WILDCARD, "commission"],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "innerInstructions",
+            KEYPATH_WILDCARD,
+            "index"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "innerInstructions",
+            KEYPATH_WILDCARD,
+            "instructions",
+            KEYPATH_WILDCARD,
+            "programIdIndex"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "innerInstructions",
+            KEYPATH_WILDCARD,
+            "instructions",
+            KEYPATH_WILDCARD,
+            "accounts",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "addressTableLookups",
+            KEYPATH_WILDCARD,
+            "writableIndexes",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "addressTableLookups",
+            KEYPATH_WILDCARD,
+            "readonlyIndexes",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "instructions",
+            KEYPATH_WILDCARD,
+            "programIdIndex"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "instructions",
+            KEYPATH_WILDCARD,
+            "accounts",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "header",
+            "numReadonlySignedAccounts"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "header",
+            "numReadonlyUnsignedAccounts"
+          ],
+          [
+            "value",
+            "block",
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "header",
+            "numRequiredSignatures"
+          ],
+          ["value", "block", "rewards", KEYPATH_WILDCARD, "commission"]
         ],
-        ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "preUpdateAverageRate"],
-        ["data", "parsed", "info", "extensions", KEYPATH_WILDCARD, "state", "currentRate"]
-      ];
-      const jsonParsedAccountsConfigs = [
-        ...jsonParsedTokenAccountsConfigs,
-        // parsed AddressTableLookup account
-        ["data", "parsed", "info", "lastExtendedSlotStartIndex"],
-        // parsed Config account
-        ["data", "parsed", "info", "slashPenalty"],
-        ["data", "parsed", "info", "warmupCooldownRate"],
-        // parsed Token/Token22 mint account
-        ["data", "parsed", "info", "decimals"],
-        // parsed Token/Token22 multisig account
-        ["data", "parsed", "info", "numRequiredSigners"],
-        ["data", "parsed", "info", "numValidSigners"],
-        // parsed Stake account
-        ["data", "parsed", "info", "stake", "delegation", "warmupCooldownRate"],
-        // parsed Sysvar rent account
-        ["data", "parsed", "info", "exemptionThreshold"],
-        ["data", "parsed", "info", "burnPercent"],
-        // parsed Vote account
-        ["data", "parsed", "info", "commission"],
-        ["data", "parsed", "info", "votes", KEYPATH_WILDCARD, "confirmationCount"]
-      ];
-      memoizedKeypaths = {
+        programNotifications: jsonParsedAccountsConfigs.flatMap((c) => [
+          ["value", KEYPATH_WILDCARD, "account", ...c],
+          [KEYPATH_WILDCARD, "account", ...c]
+        ])
+      };
+    }
+    return memoizedNotificationKeypaths;
+  }
+  function getAllowedNumericKeypathsForResponse() {
+    if (!memoizedResponseKeypaths) {
+      memoizedResponseKeypaths = {
         getAccountInfo: jsonParsedAccountsConfigs.map((c) => ["value", ...c]),
+        getBlock: [
+          ["blockTime"],
+          ["transactions", KEYPATH_WILDCARD, "meta", "preTokenBalances", KEYPATH_WILDCARD, "accountIndex"],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "preTokenBalances",
+            KEYPATH_WILDCARD,
+            "uiTokenAmount",
+            "decimals"
+          ],
+          ["transactions", KEYPATH_WILDCARD, "meta", "postTokenBalances", KEYPATH_WILDCARD, "accountIndex"],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "postTokenBalances",
+            KEYPATH_WILDCARD,
+            "uiTokenAmount",
+            "decimals"
+          ],
+          ["transactions", KEYPATH_WILDCARD, "meta", "rewards", KEYPATH_WILDCARD, "commission"],
+          ["transactions", KEYPATH_WILDCARD, "meta", "innerInstructions", KEYPATH_WILDCARD, "index"],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "innerInstructions",
+            KEYPATH_WILDCARD,
+            "instructions",
+            KEYPATH_WILDCARD,
+            "programIdIndex"
+          ],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "meta",
+            "innerInstructions",
+            KEYPATH_WILDCARD,
+            "instructions",
+            KEYPATH_WILDCARD,
+            "accounts",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "addressTableLookups",
+            KEYPATH_WILDCARD,
+            "writableIndexes",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "addressTableLookups",
+            KEYPATH_WILDCARD,
+            "readonlyIndexes",
+            KEYPATH_WILDCARD
+          ],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "instructions",
+            KEYPATH_WILDCARD,
+            "programIdIndex"
+          ],
+          [
+            "transactions",
+            KEYPATH_WILDCARD,
+            "transaction",
+            "message",
+            "instructions",
+            KEYPATH_WILDCARD,
+            "accounts",
+            KEYPATH_WILDCARD
+          ],
+          ["transactions", KEYPATH_WILDCARD, "transaction", "message", "header", "numReadonlySignedAccounts"],
+          ["transactions", KEYPATH_WILDCARD, "transaction", "message", "header", "numReadonlyUnsignedAccounts"],
+          ["transactions", KEYPATH_WILDCARD, "transaction", "message", "header", "numRequiredSignatures"],
+          ["rewards", KEYPATH_WILDCARD, "commission"]
+        ],
         getBlockTime: [[]],
         getClusterNodes: [
           [KEYPATH_WILDCARD, "featureSet"],
@@ -1878,7 +2799,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         simulateTransaction: jsonParsedAccountsConfigs.map((c) => ["value", "accounts", KEYPATH_WILDCARD, ...c])
       };
     }
-    return memoizedKeypaths;
+    return memoizedResponseKeypaths;
   }
   function getNextAllowedKeypaths(keyPaths, property) {
     return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
@@ -1906,8 +2827,12 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
   }
   function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
-    const allowedKeypaths = methodName ? getAllowedNumericKeypaths()[methodName] : void 0;
-    return visitNode2(rawResponse, allowedKeypaths ?? []);
+    const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
+    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
+  }
+  function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
+    const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
+    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
   }
   function createSolanaRpcApi(config) {
     return new Proxy({}, {
@@ -1921,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
@@ -1935,12 +2860,44 @@ this.globalThis.solanaWeb3 = (function (exports) {
       }
     });
   }
+  function createSolanaRpcSubscriptionsApi(config) {
+    return new Proxy({}, {
+      defineProperty() {
+        return false;
+      },
+      deleteProperty() {
+        return false;
+      },
+      get(...args) {
+        const [_, p] = args;
+        const notificationName = p.toString();
+        return function(...rawParams) {
+          const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
+          const params = patchParamsForSolanaLabsRpc(
+            rawParams,
+            handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
+          );
+          return {
+            params,
+            responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName),
+            subscribeMethodName: notificationName.replace(/Notifications$/, "Subscribe"),
+            unsubscribeMethodName: notificationName.replace(/Notifications$/, "Unsubscribe")
+          };
+        };
+      }
+    });
+  }
+  function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
+    return createSolanaRpcSubscriptionsApi(config);
+  }
 
   // ../rpc-transport/dist/index.browser.js
   init_env_shim();
   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;
@@ -1963,24 +2920,109 @@ this.globalThis.solanaWeb3 = (function (exports) {
       params
     };
   }
-  function createPendingRpcRequest(rpcConfig, pendingRequest) {
+  function createPendingRpcRequest(rpcConfig, pendingRequest) {
+    return {
+      async send(options) {
+        const { methodName, params, responseProcessor } = pendingRequest;
+        const payload = createJsonRpcMessage(methodName, params);
+        const response = await rpcConfig.transport({
+          payload,
+          signal: options == null ? void 0 : options.abortSignal
+        });
+        if ("error" in response) {
+          throw new SolanaJsonRpcError(response.error);
+        } else {
+          return responseProcessor ? responseProcessor(response.result) : response.result;
+        }
+      }
+    };
+  }
+  function makeProxy(rpcConfig) {
+    return new Proxy(rpcConfig.api, {
+      defineProperty() {
+        return false;
+      },
+      deleteProperty() {
+        return false;
+      },
+      get(target, p, receiver) {
+        return function(...rawParams) {
+          const methodName = p.toString();
+          const createRpcRequest = Reflect.get(target, methodName, receiver);
+          const newRequest = createRpcRequest ? createRpcRequest(...rawParams) : { methodName, params: rawParams };
+          return createPendingRpcRequest(rpcConfig, newRequest);
+        };
+      }
+    });
+  }
+  function createJsonRpc(rpcConfig) {
+    return makeProxy(rpcConfig);
+  }
+  function registerIterableCleanup(iterable, cleanupFn) {
+    (async () => {
+      try {
+        for await (const _ of iterable)
+          ;
+      } catch {
+      } finally {
+        cleanupFn();
+      }
+    })();
+  }
+  function createPendingRpcSubscription(rpcConfig, { params, subscribeMethodName, unsubscribeMethodName, responseProcessor }) {
     return {
-      async send(options) {
-        const { methodName, params, responseProcessor } = pendingRequest;
-        const payload = createJsonRpcMessage(methodName, params);
-        const response = await rpcConfig.transport({
-          payload,
-          signal: options?.abortSignal
+      async subscribe({ abortSignal }) {
+        abortSignal.throwIfAborted();
+        let subscriptionId;
+        function handleCleanup() {
+          if (subscriptionId !== void 0) {
+            const payload = createJsonRpcMessage(unsubscribeMethodName, [subscriptionId]);
+            connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(payload).finally(() => {
+              connectionAbortController.abort();
+            });
+          } else {
+            connectionAbortController.abort();
+          }
+        }
+        abortSignal.addEventListener("abort", handleCleanup);
+        const connectionAbortController = new AbortController();
+        const subscribeMessage = createJsonRpcMessage(subscribeMethodName, params);
+        const connection = await rpcConfig.transport({
+          payload: subscribeMessage,
+          signal: connectionAbortController.signal
         });
-        if ("error" in response) {
-          throw new SolanaJsonRpcError(response.error);
-        } else {
-          return responseProcessor ? responseProcessor(response.result) : response.result;
+        function handleConnectionCleanup() {
+          abortSignal.removeEventListener("abort", handleCleanup);
+        }
+        registerIterableCleanup(connection, handleConnectionCleanup);
+        for await (const message of connection) {
+          if ("id" in message && message.id === subscribeMessage.id) {
+            if ("error" in message) {
+              throw new SolanaJsonRpcError(message.error);
+            } else {
+              subscriptionId = message.result;
+              break;
+            }
+          }
         }
+        if (subscriptionId == null) {
+          throw new Error("Failed to obtain a subscription id from the server");
+        }
+        return {
+          async *[Symbol.asyncIterator]() {
+            for await (const message of connection) {
+              if (!("params" in message) || message.params.subscription !== subscriptionId) {
+                continue;
+              }
+              const notification = message.params.result;
+              yield responseProcessor ? responseProcessor(notification) : notification;
+            }
+          }
+        };
       }
     };
   }
-  function makeProxy(rpcConfig) {
+  function makeProxy2(rpcConfig) {
     return new Proxy(rpcConfig.api, {
       defineProperty() {
         return false;
@@ -1991,20 +3033,30 @@ this.globalThis.solanaWeb3 = (function (exports) {
       get(target, p, receiver) {
         return function(...rawParams) {
           const methodName = p.toString();
-          const createRpcRequest = Reflect.get(target, methodName, receiver);
-          const newRequest = createRpcRequest ? createRpcRequest(...rawParams) : { methodName, params: rawParams };
-          return createPendingRpcRequest(rpcConfig, newRequest);
+          const createRpcSubscription = Reflect.get(target, methodName, receiver);
+          if (p.toString().endsWith("Notifications") === false && !createRpcSubscription) {
+            throw new Error(
+              "Either the notification name must end in 'Notifications' or the API must supply a subscription creator function to map between the notification name and the subscribe/unsubscribe method names."
+            );
+          }
+          const newRequest = createRpcSubscription ? createRpcSubscription(...rawParams) : {
+            params: rawParams,
+            subscribeMethodName: methodName.replace(/Notifications$/, "Subscribe"),
+            unsubscribeMethodName: methodName.replace(/Notifications$/, "Unsubscribe")
+          };
+          return createPendingRpcSubscription(rpcConfig, newRequest);
         };
       }
     });
   }
-  function createJsonRpc(rpcConfig) {
-    return makeProxy(rpcConfig);
+  function createJsonSubscriptionRpc(rpcConfig) {
+    return makeProxy2(rpcConfig);
   }
-  var e = globalThis.fetch;
+  var e2 = globalThis.fetch;
   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;
     }
@@ -2060,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,
@@ -2077,7 +3123,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }) {
       const body = JSON.stringify(payload);
       const requestInfo = {
-        agent,
         body,
         headers: {
           ...customHeaders,
@@ -2089,7 +3134,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         method: "POST",
         signal
       };
-      const response = await e(url, requestInfo);
+      const response = await e2(url, requestInfo);
       if (!response.ok) {
         throw new SolanaHttpError({
           message: response.statusText,
@@ -2099,6 +3144,175 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return await response.json();
     };
   }
+  var e22 = globalThis.WebSocket;
+  var EXPLICIT_ABORT_TOKEN = Symbol(
+    "This symbol is thrown from a socket's iterator when the connection is explicitly aborted by the user" 
+  );
+  async function createWebSocketConnection({
+    sendBufferHighWatermark,
+    signal,
+    url
+  }) {
+    return new Promise((resolve, reject) => {
+      signal.addEventListener("abort", handleAbort, { once: true });
+      const iteratorState = /* @__PURE__ */ new Map();
+      function errorAndClearAllIteratorStates(reason) {
+        const errorCallbacks = [...iteratorState.values()].filter((state) => state.__hasPolled).map(({ onError }) => onError);
+        iteratorState.clear();
+        errorCallbacks.forEach((cb) => {
+          try {
+            cb(reason);
+          } catch {
+          }
+        });
+      }
+      function handleAbort() {
+        errorAndClearAllIteratorStates(EXPLICIT_ABORT_TOKEN);
+        if (webSocket.readyState !== e22.CLOSED && webSocket.readyState !== e22.CLOSING) {
+          webSocket.close(1e3);
+        }
+      }
+      function handleClose(ev) {
+        bufferDrainWatcher == null ? void 0 : bufferDrainWatcher.onCancel();
+        signal.removeEventListener("abort", handleAbort);
+        webSocket.removeEventListener("close", handleClose);
+        webSocket.removeEventListener("error", handleError);
+        webSocket.removeEventListener("open", handleOpen);
+        webSocket.removeEventListener("message", handleMessage);
+        errorAndClearAllIteratorStates(ev);
+      }
+      function handleError(ev) {
+        if (!hasConnected) {
+          reject(
+            // TODO: Coded error
+            new Error("WebSocket failed to connect", { cause: ev })
+          );
+        }
+      }
+      let hasConnected = false;
+      let bufferDrainWatcher;
+      function handleOpen() {
+        hasConnected = true;
+        resolve({
+          async send(payload) {
+            const message = JSON.stringify(payload);
+            if (!bufferDrainWatcher && webSocket.readyState === e22.OPEN && webSocket.bufferedAmount > sendBufferHighWatermark) {
+              let onCancel;
+              const promise = new Promise((resolve2, reject2) => {
+                const intervalId = setInterval(() => {
+                  if (webSocket.readyState !== e22.OPEN || !(webSocket.bufferedAmount > sendBufferHighWatermark)) {
+                    clearInterval(intervalId);
+                    bufferDrainWatcher = void 0;
+                    resolve2();
+                  }
+                }, 16);
+                onCancel = () => {
+                  bufferDrainWatcher = void 0;
+                  clearInterval(intervalId);
+                  reject2(
+                    // TODO: Coded error
+                    new Error("WebSocket was closed before payload could be sent")
+                  );
+                };
+              });
+              bufferDrainWatcher = {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                onCancel,
+                promise
+              };
+            }
+            if (bufferDrainWatcher) {
+              await bufferDrainWatcher.promise;
+            }
+            webSocket.send(message);
+          },
+          async *[Symbol.asyncIterator]() {
+            const iteratorKey = Symbol();
+            iteratorState.set(iteratorKey, { __hasPolled: false, queuedMessages: [] });
+            try {
+              while (true) {
+                const state = iteratorState.get(iteratorKey);
+                if (!state) {
+                  throw new Error("Invariant: WebSocket message iterator is missing state storage");
+                }
+                if (state.__hasPolled) {
+                  throw new Error(
+                    "Invariant: WebSocket message iterator state is corrupt; iterated without first resolving existing message promise"
+                  );
+                }
+                const queuedMessages = state.queuedMessages;
+                if (queuedMessages.length) {
+                  state.queuedMessages = [];
+                  yield* queuedMessages;
+                } else {
+                  try {
+                    yield await new Promise((resolve2, reject2) => {
+                      iteratorState.set(iteratorKey, {
+                        __hasPolled: true,
+                        onError: reject2,
+                        onMessage: resolve2
+                      });
+                    });
+                  } catch (e3) {
+                    if (e3 === EXPLICIT_ABORT_TOKEN) {
+                      return;
+                    } else {
+                      throw new Error("WebSocket connection closed", { cause: e3 });
+                    }
+                  }
+                }
+              }
+            } finally {
+              iteratorState.delete(iteratorKey);
+            }
+          }
+        });
+      }
+      function handleMessage({ data }) {
+        const message = JSON.parse(data);
+        iteratorState.forEach((state, iteratorKey) => {
+          if (state.__hasPolled) {
+            const { onMessage } = state;
+            iteratorState.set(iteratorKey, { __hasPolled: false, queuedMessages: [] });
+            onMessage(message);
+          } else {
+            state.queuedMessages.push(message);
+          }
+        });
+      }
+      const webSocket = new e22(url);
+      webSocket.addEventListener("close", handleClose);
+      webSocket.addEventListener("error", handleError);
+      webSocket.addEventListener("open", handleOpen);
+      webSocket.addEventListener("message", handleMessage);
+    });
+  }
+  function createWebSocketTransport({ sendBufferHighWatermark, url }) {
+    if (/^wss?:/i.test(url) === false) {
+      const protocolMatch = url.match(/^([^:]+):/);
+      throw new DOMException(
+        protocolMatch ? `Failed to construct 'WebSocket': The URL's scheme must be either 'ws' or 'wss'. '${protocolMatch[1]}:' is not allowed.` : `Failed to construct 'WebSocket': The URL '${url}' is invalid.`
+      );
+    }
+    return async function sendWebSocketMessage({ payload, signal }) {
+      signal == null ? void 0 : signal.throwIfAborted();
+      const connection = await createWebSocketConnection({
+        sendBufferHighWatermark,
+        signal,
+        url
+      });
+      signal == null ? void 0 : signal.throwIfAborted();
+      await connection.send(payload);
+      return {
+        [Symbol.asyncIterator]: connection[Symbol.asyncIterator].bind(connection),
+        send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: connection.send.bind(connection)
+      };
+    };
+  }
+
+  // src/rpc.ts
+  var import_fast_stable_stringify = __toESM(require_fast_stable_stringify(), 1);
 
   // src/rpc-default-config.ts
   init_env_shim();
@@ -2124,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;
@@ -2140,6 +3357,197 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
   };
 
+  // src/rpc-subscription-coalescer.ts
+  init_env_shim();
+
+  // src/cached-abortable-iterable.ts
+  init_env_shim();
+  function registerIterableCleanup2(iterable, cleanupFn) {
+    (async () => {
+      try {
+        for await (const _ of iterable)
+          ;
+      } catch {
+      } finally {
+        cleanupFn();
+      }
+    })();
+  }
+  function getCachedAbortableIterableFactory({
+    getAbortSignalFromInputArgs,
+    getCacheEntryMissingError,
+    getCacheKeyFromInputArgs,
+    onCacheHit,
+    onCreateIterable
+  }) {
+    const cache = /* @__PURE__ */ new Map();
+    function getCacheEntryOrThrow(cacheKey) {
+      const currentCacheEntry = cache.get(cacheKey);
+      if (!currentCacheEntry) {
+        throw getCacheEntryMissingError(cacheKey);
+      }
+      return currentCacheEntry;
+    }
+    return async (...args) => {
+      const cacheKey = getCacheKeyFromInputArgs(...args);
+      const signal = getAbortSignalFromInputArgs(...args);
+      if (cacheKey === void 0) {
+        return await onCreateIterable(signal, ...args);
+      }
+      const cleanup = () => {
+        cache.delete(cacheKey);
+        signal.removeEventListener("abort", handleAbort);
+      };
+      const handleAbort = () => {
+        const cacheEntry = getCacheEntryOrThrow(cacheKey);
+        if (cacheEntry.purgeScheduled !== true) {
+          cacheEntry.purgeScheduled = true;
+          globalThis.queueMicrotask(() => {
+            cacheEntry.purgeScheduled = false;
+            if (cacheEntry.referenceCount === 0) {
+              cacheEntry.abortController.abort();
+              cleanup();
+            }
+          });
+        }
+        cacheEntry.referenceCount--;
+      };
+      signal.addEventListener("abort", handleAbort);
+      try {
+        const cacheEntry = cache.get(cacheKey);
+        if (!cacheEntry) {
+          const singletonAbortController = new AbortController();
+          const newIterablePromise = onCreateIterable(singletonAbortController.signal, ...args);
+          const newCacheEntry = {
+            abortController: singletonAbortController,
+            iterable: newIterablePromise,
+            purgeScheduled: false,
+            referenceCount: 1
+          };
+          cache.set(cacheKey, newCacheEntry);
+          const newIterable = await newIterablePromise;
+          registerIterableCleanup2(newIterable, cleanup);
+          newCacheEntry.iterable = newIterable;
+          return newIterable;
+        } else {
+          cacheEntry.referenceCount++;
+          const iterableOrIterablePromise = cacheEntry.iterable;
+          const cachedIterable = "then" in iterableOrIterablePromise ? await iterableOrIterablePromise : iterableOrIterablePromise;
+          await onCacheHit(cachedIterable, ...args);
+          return cachedIterable;
+        }
+      } catch (e3) {
+        cleanup();
+        throw e3;
+      }
+    };
+  }
+
+  // src/rpc-subscription-coalescer.ts
+  var EXPLICIT_ABORT_TOKEN2 = Symbol(
+    "This symbol is thrown from a subscription's iterator when the subscription is explicitly aborted by the user" 
+  );
+  function registerIterableCleanup3(iterable, cleanupFn) {
+    (async () => {
+      try {
+        for await (const _ of iterable)
+          ;
+      } catch {
+      } finally {
+        cleanupFn();
+      }
+    })();
+  }
+  function getRpcSubscriptionsWithSubscriptionCoalescing({
+    getDeduplicationKey,
+    rpcSubscriptions
+  }) {
+    const cache = /* @__PURE__ */ new Map();
+    return new Proxy(rpcSubscriptions, {
+      defineProperty() {
+        return false;
+      },
+      deleteProperty() {
+        return false;
+      },
+      get(target, p, receiver) {
+        const subscriptionMethod = Reflect.get(target, p, receiver);
+        if (typeof subscriptionMethod !== "function") {
+          return subscriptionMethod;
+        }
+        return function(...rawParams) {
+          const deduplicationKey = getDeduplicationKey(p, rawParams);
+          if (deduplicationKey === void 0) {
+            return subscriptionMethod(...rawParams);
+          }
+          if (cache.has(deduplicationKey)) {
+            return cache.get(deduplicationKey);
+          }
+          const iterableFactory = getCachedAbortableIterableFactory({
+            getAbortSignalFromInputArgs: ({ abortSignal }) => abortSignal,
+            getCacheEntryMissingError(deduplicationKey2) {
+              return new Error(
+                `Found no cache entry for subscription with deduplication key \`${deduplicationKey2 == null ? void 0 : deduplicationKey2.toString()}\``
+              );
+            },
+            getCacheKeyFromInputArgs: () => deduplicationKey,
+            async onCacheHit(_iterable, _config) {
+            },
+            async onCreateIterable(abortSignal, config) {
+              const pendingSubscription2 = subscriptionMethod(
+                ...rawParams
+              );
+              const iterable = await pendingSubscription2.subscribe({
+                ...config,
+                abortSignal
+              });
+              registerIterableCleanup3(iterable, () => {
+                cache.delete(deduplicationKey);
+              });
+              return iterable;
+            }
+          });
+          const pendingSubscription = {
+            async subscribe(...args) {
+              const iterable = await iterableFactory(...args);
+              const { abortSignal } = args[0];
+              let abortPromise;
+              return {
+                ...iterable,
+                async *[Symbol.asyncIterator]() {
+                  abortPromise || (abortPromise = abortSignal.aborted ? Promise.reject(EXPLICIT_ABORT_TOKEN2) : new Promise((_, reject) => {
+                    abortSignal.addEventListener("abort", () => {
+                      reject(EXPLICIT_ABORT_TOKEN2);
+                    });
+                  }));
+                  try {
+                    const iterator = iterable[Symbol.asyncIterator]();
+                    while (true) {
+                      const iteratorResult = await Promise.race([iterator.next(), abortPromise]);
+                      if (iteratorResult.done) {
+                        return;
+                      } else {
+                        yield iteratorResult.value;
+                      }
+                    }
+                  } catch (e3) {
+                    if (e3 === EXPLICIT_ABORT_TOKEN2) {
+                      return;
+                    }
+                    cache.delete(deduplicationKey);
+                    throw e3;
+                  }
+                }
+              };
+            }
+          };
+          cache.set(deduplicationKey, pendingSubscription);
+          return pendingSubscription;
+        };
+      }
+    });
+  }
+
   // src/rpc.ts
   function createSolanaRpc(config) {
     return createJsonRpc({
@@ -2147,6 +3555,24 @@ this.globalThis.solanaWeb3 = (function (exports) {
       api: createSolanaRpcApi(DEFAULT_RPC_CONFIG)
     });
   }
+  function createSolanaRpcSubscriptions(config) {
+    return pipe(
+      createJsonSubscriptionRpc({
+        ...config,
+        api: createSolanaRpcSubscriptionsApi(DEFAULT_RPC_CONFIG)
+      }),
+      (rpcSubscriptions) => getRpcSubscriptionsWithSubscriptionCoalescing({
+        getDeduplicationKey: (...args) => (0, import_fast_stable_stringify.default)(args),
+        rpcSubscriptions
+      })
+    );
+  }
+  function createSolanaRpcSubscriptions_UNSTABLE(config) {
+    return createJsonSubscriptionRpc({
+      ...config,
+      api: createSolanaRpcSubscriptionsApi_UNSTABLE(DEFAULT_RPC_CONFIG)
+    });
+  }
 
   // src/rpc-transport.ts
   init_env_shim();
@@ -2206,14 +3632,15 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // src/rpc-request-deduplication.ts
   init_env_shim();
-  var import_fast_stable_stringify = __toESM(require_fast_stable_stringify(), 1);
-  function getSolanaRpcPayloadDeduplicationKey(payload) {
+  var import_fast_stable_stringify2 = __toESM(require_fast_stable_stringify(), 1);
+  function isJsonRpcPayload(payload) {
     if (payload == null || typeof payload !== "object" || Array.isArray(payload)) {
-      return;
-    }
-    if ("jsonrpc" in payload && payload.jsonrpc === "2.0" && "method" in payload && "params" in payload) {
-      return (0, import_fast_stable_stringify.default)([payload.method, payload.params]);
+      return false;
     }
+    return "jsonrpc" in payload && payload.jsonrpc === "2.0" && "method" in payload && typeof payload.method === "string" && "params" in payload;
+  }
+  function getSolanaRpcPayloadDeduplicationKey(payload) {
+    return isJsonRpcPayload(payload) ? (0, import_fast_stable_stringify2.default)([payload.method, payload.params]) : void 0;
   }
 
   // src/rpc-transport.ts
@@ -2225,49 +3652,488 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return out;
   }
   function createDefaultRpcTransport(config) {
-    return getRpcTransportWithRequestCoalescing(
+    var _a;
+    return pipe(
       createHttpTransport({
         ...config,
         headers: {
           ...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"
+          }
+        }
+      }),
+      (transport) => getRpcTransportWithRequestCoalescing(transport, getSolanaRpcPayloadDeduplicationKey)
+    );
+  }
+
+  // src/rpc-websocket-transport.ts
+  init_env_shim();
+
+  // src/rpc-websocket-autopinger.ts
+  init_env_shim();
+  var PING_PAYLOAD = {
+    jsonrpc: "2.0",
+    method: "ping"
+  };
+  function getWebSocketTransportWithAutoping({ intervalMs, transport }) {
+    const pingableConnections = /* @__PURE__ */ new Map();
+    return async (...args) => {
+      const connection = await transport(...args);
+      let intervalId;
+      function sendPing() {
+        connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(PING_PAYLOAD);
+      }
+      function restartPingTimer() {
+        clearInterval(intervalId);
+        intervalId = setInterval(sendPing, intervalMs);
+      }
+      if (pingableConnections.has(connection) === false) {
+        pingableConnections.set(connection, {
+          [Symbol.asyncIterator]: connection[Symbol.asyncIterator].bind(connection),
+          send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: (...args2) => {
+            restartPingTimer();
+            return connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(...args2);
+          }
+        });
+        (async () => {
+          try {
+            for await (const _ of connection) {
+              restartPingTimer();
+            }
+          } catch {
+          } finally {
+            pingableConnections.delete(connection);
+            clearInterval(intervalId);
+            if (handleOffline) {
+              globalThis.window.removeEventListener("offline", handleOffline);
+            }
+            if (handleOnline) {
+              globalThis.window.removeEventListener("online", handleOnline);
+            }
           }
+        })();
+        if (globalThis.navigator.onLine) {
+          restartPingTimer();
+        }
+        let handleOffline;
+        let handleOnline;
+        {
+          handleOffline = () => {
+            clearInterval(intervalId);
+          };
+          handleOnline = () => {
+            sendPing();
+            restartPingTimer();
+          };
+          globalThis.window.addEventListener("offline", handleOffline);
+          globalThis.window.addEventListener("online", handleOnline);
         }
+      }
+      return pingableConnections.get(connection);
+    };
+  }
+
+  // src/rpc-websocket-connection-sharding.ts
+  init_env_shim();
+  var NULL_SHARD_CACHE_KEY = Symbol(
+    "Cache key to use when there is no connection sharding strategy" 
+  );
+  function getWebSocketTransportWithConnectionSharding({ getShard, transport }) {
+    return getCachedAbortableIterableFactory({
+      getAbortSignalFromInputArgs: ({ signal }) => signal,
+      getCacheEntryMissingError(shardKey) {
+        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),
+      onCreateIterable: (abortSignal, config) => transport({
+        ...config,
+        signal: abortSignal
+      })
+    });
+  }
+
+  // src/rpc-websocket-transport.ts
+  function createDefaultRpcSubscriptionsTransport(config) {
+    var _a;
+    const { getShard, intervalMs, ...rest } = config;
+    return pipe(
+      createWebSocketTransport({
+        ...rest,
+        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 != null ? intervalMs : 5e3,
+        transport
       }),
-      getSolanaRpcPayloadDeduplicationKey
+      (transport) => getWebSocketTransportWithConnectionSharding({
+        getShard,
+        transport
+      })
+    );
+  }
+
+  // src/send-transaction.ts
+  init_env_shim();
+
+  // src/transaction-confirmation.ts
+  init_env_shim();
+
+  // src/transaction-confirmation-strategy-blockheight.ts
+  init_env_shim();
+  function createBlockHeightExceedencePromiseFactory(rpcSubscriptions) {
+    return async function getBlockHeightExceedencePromise({ abortSignal: callerAbortSignal, lastValidBlockHeight }) {
+      const abortController = new AbortController();
+      function handleAbort() {
+        abortController.abort();
+      }
+      callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
+      const slotNotifications = await rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal });
+      try {
+        for await (const slotNotification of slotNotifications) {
+          if (slotNotification.slot > lastValidBlockHeight) {
+            throw new Error(
+              "The network has progressed past the last block for which this transaction could have committed."
+            );
+          }
+        }
+      } finally {
+        abortController.abort();
+      }
+    };
+  }
+
+  // src/transaction-confirmation-strategy-nonce.ts
+  init_env_shim();
+  var NONCE_VALUE_OFFSET = 4 + // version(u32)
+  4 + // state(u32)
+  32;
+  function createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions) {
+    return async function getNonceInvalidationPromise({
+      abortSignal: callerAbortSignal,
+      commitment,
+      currentNonceValue,
+      nonceAccountAddress
+    }) {
+      const abortController = new AbortController();
+      function handleAbort() {
+        abortController.abort();
+      }
+      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 = base64Encoder.encode(base64EncodedBytes);
+        const nonceValueBytes = data.slice(NONCE_VALUE_OFFSET, NONCE_VALUE_OFFSET + 32);
+        return base58Decoder2.decode(nonceValueBytes);
+      }
+      const nonceAccountDidAdvancePromise = (async () => {
+        for await (const accountNotification of accountNotifications) {
+          const nonceValue = getNonceFromAccountData(accountNotification.value.data);
+          if (nonceValue !== currentNonceValue) {
+            throw new Error(
+              `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
+            );
+          }
+        }
+      })();
+      const nonceIsAlreadyInvalidPromise = (async () => {
+        const { value: nonceAccount } = await rpc.getAccountInfo(nonceAccountAddress, {
+          commitment,
+          dataSlice: { length: 32, offset: NONCE_VALUE_OFFSET },
+          encoding: "base58"
+        }).send({ abortSignal: abortController.signal });
+        if (!nonceAccount) {
+          throw new Error(`No nonce account could be found at address \`${nonceAccountAddress}\`.`);
+        }
+        const nonceValue = (
+          // This works because we asked for the exact slice of data representing the nonce
+          // value, and furthermore asked for it in `base58` encoding.
+          nonceAccount.data[0]
+        );
+        if (nonceValue !== currentNonceValue) {
+          throw new Error(
+            `The nonce \`${currentNonceValue}\` is no longer valid. It has advanced to \`${nonceValue}\`.`
+          );
+        } else {
+          await new Promise(() => {
+          });
+        }
+      })();
+      try {
+        return await Promise.race([nonceAccountDidAdvancePromise, nonceIsAlreadyInvalidPromise]);
+      } finally {
+        abortController.abort();
+      }
+    };
+  }
+
+  // src/transaction-confirmation.ts
+  function createDefaultDurableNonceTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const getNonceInvalidationPromise = createNonceInvalidationPromiseFactory(rpc, rpcSubscriptions);
+    const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+      rpc,
+      rpcSubscriptions
+    );
+    return async function confirmDurableNonceTransaction(config) {
+      await waitForDurableNonceTransactionConfirmation({
+        ...config,
+        getNonceInvalidationPromise,
+        getRecentSignatureConfirmationPromise
+      });
+    };
+  }
+  function createDefaultRecentTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
+    const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+      rpc,
+      rpcSubscriptions
+    );
+    return async function confirmRecentTransaction(config) {
+      await waitForRecentTransactionConfirmation({
+        ...config,
+        getBlockHeightExceedencePromise,
+        getRecentSignatureConfirmationPromise
+      });
+    };
+  }
+  async function waitForDurableNonceTransactionConfirmation(config) {
+    await raceStrategies(
+      getSignatureFromTransaction(config.transaction),
+      config,
+      function getSpecificStrategiesForRace({ abortSignal, commitment, getNonceInvalidationPromise, transaction }) {
+        return [
+          getNonceInvalidationPromise({
+            abortSignal,
+            commitment,
+            currentNonceValue: transaction.lifetimeConstraint.nonce,
+            nonceAccountAddress: transaction.instructions[0].accounts[0].address
+          })
+        ];
+      }
     );
   }
+  async function waitForRecentTransactionConfirmation(config) {
+    await raceStrategies(
+      getSignatureFromTransaction(config.transaction),
+      config,
+      function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
+        return [
+          getBlockHeightExceedencePromise({
+            abortSignal,
+            lastValidBlockHeight: transaction.lifetimeConstraint.lastValidBlockHeight
+          })
+        ];
+      }
+    );
+  }
+
+  // src/send-transaction.ts
+  function getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, config) {
+    if (
+      // The developer has supplied no value for `preflightCommitment`.
+      !(config == null ? void 0 : config.preflightCommitment) && // The value of `commitment` is lower than the server default of `preflightCommitment`.
+      commitmentComparator(
+        commitment,
+        "finalized"
+        /* default value of `preflightCommitment` */
+      ) < 0
+    ) {
+      return {
+        ...config,
+        // In the common case, it is unlikely that you want to simulate a transaction at
+        // `finalized` commitment when your standard of commitment for confirming the
+        // transaction is lower. Cap the simulation commitment level to the level of the
+        // confirmation commitment.
+        preflightCommitment: commitment
+      };
+    }
+    return config;
+  }
+  async function sendTransaction_INTERNAL({
+    abortSignal,
+    commitment,
+    rpc,
+    transaction,
+    ...sendTransactionConfig
+  }) {
+    const base64EncodedWireTransaction = getBase64EncodedWireTransaction(transaction);
+    return await rpc.sendTransaction(base64EncodedWireTransaction, {
+      ...getSendTransactionConfigWithAdjustedPreflightCommitment(commitment, sendTransactionConfig),
+      encoding: "base64"
+    }).send({ abortSignal });
+  }
+  function createDefaultDurableNonceTransactionSender({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const confirmDurableNonceTransaction = createDefaultDurableNonceTransactionConfirmer({
+      rpc,
+      rpcSubscriptions
+    });
+    return async function sendDurableNonceTransaction(transaction, config) {
+      await sendAndConfirmDurableNonceTransaction({
+        ...config,
+        confirmDurableNonceTransaction,
+        rpc,
+        transaction
+      });
+    };
+  }
+  function createDefaultTransactionSender({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const confirmRecentTransaction = createDefaultRecentTransactionConfirmer({
+      rpc,
+      rpcSubscriptions
+    });
+    return async function sendTransaction(transaction, config) {
+      await sendAndConfirmTransaction({
+        ...config,
+        confirmRecentTransaction,
+        rpc,
+        transaction
+      });
+    };
+  }
+  async function sendAndConfirmDurableNonceTransaction({
+    abortSignal,
+    commitment,
+    confirmDurableNonceTransaction,
+    rpc,
+    transaction,
+    ...sendTransactionConfig
+  }) {
+    const transactionSignature = await sendTransaction_INTERNAL({
+      ...sendTransactionConfig,
+      abortSignal,
+      commitment,
+      rpc,
+      transaction
+    });
+    await confirmDurableNonceTransaction({
+      abortSignal,
+      commitment,
+      transaction
+    });
+    return transactionSignature;
+  }
+  async function sendAndConfirmTransaction({
+    abortSignal,
+    commitment,
+    confirmRecentTransaction,
+    rpc,
+    transaction,
+    ...sendTransactionConfig
+  }) {
+    const transactionSignature = await sendTransaction_INTERNAL({
+      ...sendTransactionConfig,
+      abortSignal,
+      commitment,
+      rpc,
+      transaction
+    });
+    await confirmRecentTransaction({
+      abortSignal,
+      commitment,
+      transaction
+    });
+    return transactionSignature;
+  }
 
   exports.AccountRole = AccountRole;
+  exports.address = address;
   exports.appendTransactionInstruction = appendTransactionInstruction;
-  exports.assertIsBase58EncodedAddress = assertIsBase58EncodedAddress;
+  exports.assertIsAddress = assertIsAddress;
   exports.assertIsBlockhash = assertIsBlockhash;
   exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
+  exports.assertIsLamports = assertIsLamports;
+  exports.assertIsProgramDerivedAddress = assertIsProgramDerivedAddress;
+  exports.assertIsSignature = assertIsSignature;
+  exports.assertIsStringifiedBigInt = assertIsStringifiedBigInt;
+  exports.assertIsStringifiedNumber = assertIsStringifiedNumber;
+  exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
+  exports.assertIsUnixTimestamp = assertIsUnixTimestamp;
+  exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
+  exports.commitmentComparator = commitmentComparator;
+  exports.compileMessage = compileMessage;
+  exports.createAddressWithSeed = createAddressWithSeed;
+  exports.createBlockHeightExceedencePromiseFactory = createBlockHeightExceedencePromiseFactory;
+  exports.createDefaultAirdropRequester = createDefaultAirdropRequester;
+  exports.createDefaultDurableNonceTransactionConfirmer = createDefaultDurableNonceTransactionConfirmer;
+  exports.createDefaultDurableNonceTransactionSender = createDefaultDurableNonceTransactionSender;
+  exports.createDefaultRecentTransactionConfirmer = createDefaultRecentTransactionConfirmer;
+  exports.createDefaultRpcSubscriptionsTransport = createDefaultRpcSubscriptionsTransport;
   exports.createDefaultRpcTransport = createDefaultRpcTransport;
+  exports.createDefaultTransactionSender = createDefaultTransactionSender;
+  exports.createNonceInvalidationPromiseFactory = createNonceInvalidationPromiseFactory;
+  exports.createPrivateKeyFromBytes = createPrivateKeyFromBytes;
+  exports.createRecentSignatureConfirmationPromiseFactory = createRecentSignatureConfirmationPromiseFactory;
   exports.createSolanaRpc = createSolanaRpc;
+  exports.createSolanaRpcSubscriptions = createSolanaRpcSubscriptions;
+  exports.createSolanaRpcSubscriptions_UNSTABLE = createSolanaRpcSubscriptions_UNSTABLE;
   exports.createTransaction = createTransaction;
   exports.downgradeRoleToNonSigner = downgradeRoleToNonSigner;
   exports.downgradeRoleToReadonly = downgradeRoleToReadonly;
   exports.generateKeyPair = generateKeyPair;
+  exports.getAddressCodec = getAddressCodec;
+  exports.getAddressComparator = getAddressComparator;
+  exports.getAddressDecoder = getAddressDecoder;
+  exports.getAddressEncoder = getAddressEncoder;
   exports.getAddressFromPublicKey = getAddressFromPublicKey;
-  exports.getBase58EncodedAddressCodec = getBase58EncodedAddressCodec;
-  exports.getBase58EncodedAddressComparator = getBase58EncodedAddressComparator;
   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.isUnixTimestamp = isUnixTimestamp;
   exports.isWritableRole = isWritableRole;
+  exports.lamports = lamports;
   exports.mergeRoles = mergeRoles;
+  exports.partiallySignTransaction = partiallySignTransaction;
   exports.prependTransactionInstruction = prependTransactionInstruction;
+  exports.requestAndConfirmAirdrop = requestAndConfirmAirdrop;
+  exports.sendAndConfirmDurableNonceTransaction = sendAndConfirmDurableNonceTransaction;
+  exports.sendAndConfirmTransaction = sendAndConfirmTransaction;
   exports.setTransactionFeePayer = setTransactionFeePayer;
   exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
   exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
   exports.signBytes = signBytes;
   exports.signTransaction = signTransaction;
+  exports.signature = signature;
+  exports.stringifiedBigInt = stringifiedBigInt;
+  exports.stringifiedNumber = stringifiedNumber;
+  exports.unixTimestamp = unixTimestamp;
   exports.upgradeRoleToSigner = upgradeRoleToSigner;
   exports.upgradeRoleToWritable = upgradeRoleToWritable;
   exports.verifySignature = verifySignature;
+  exports.waitForDurableNonceTransactionConfirmation = waitForDurableNonceTransactionConfirmation;
+  exports.waitForRecentTransactionConfirmation = waitForRecentTransactionConfirmation;
 
   return exports;