@solana/web3.js 2.0.0-experimental.a8f1f88 → 2.0.0-experimental.aa4a701

package/dist/index.development.js

@@ -8,7 +8,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
   var __getOwnPropNames = Object.getOwnPropertyNames;
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __esm = (fn, res) => function __init() {
     return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
   };
@@ -31,10 +30,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
     mod2
   ));
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
 
   // ../build-scripts/env-shim.ts
   var init_env_shim = __esm({
@@ -125,304 +120,206 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // ../addresses/dist/index.browser.js
   init_env_shim();
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/bytes.mjs
+  // ../codecs-core/dist/index.browser.js
   init_env_shim();
-  var mergeBytes = (bytesArr) => {
-    const totalLength = bytesArr.reduce((total, arr) => total + arr.length, 0);
+  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 mergeBytes = (byteArrays) => {
+    const nonEmptyByteArrays = byteArrays.filter((arr) => arr.length);
+    if (nonEmptyByteArrays.length === 0) {
+      return byteArrays.length ? byteArrays[0] : new Uint8Array();
+    }
+    if (nonEmptyByteArrays.length === 1) {
+      return nonEmptyByteArrays[0];
+    }
+    const totalLength = nonEmptyByteArrays.reduce((total, arr) => total + arr.length, 0);
     const result = new Uint8Array(totalLength);
     let offset = 0;
-    bytesArr.forEach((arr) => {
+    nonEmptyByteArrays.forEach((arr) => {
       result.set(arr, offset);
       offset += arr.length;
     });
     return result;
   };
-  var padBytes = (bytes2, length) => {
-    if (bytes2.length >= length)
-      return bytes2;
+  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.9/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 combineCodec(encoder, decoder, description) {
+    if (encoder.fixedSize !== decoder.fixedSize) {
+      throw new Error(
+        `Encoder and decoder must have the same fixed size, got [${encoder.fixedSize}] and [${decoder.fixedSize}].`
+      );
     }
-  };
-  var NotEnoughBytesError = class extends Error {
-    constructor(serializer, expected, actual) {
-      super(`Serializer [${serializer}] expected ${expected} bytes, got ${actual}.`);
-      __publicField(this, "name", "NotEnoughBytesError");
+    if (encoder.maxSize !== decoder.maxSize) {
+      throw new Error(
+        `Encoder and decoder must have the same max size, got [${encoder.maxSize}] and [${decoder.maxSize}].`
+      );
     }
-  };
-  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 (description === void 0 && encoder.description !== decoder.description) {
+      throw new Error(
+        `Encoder and decoder must have the same description, got [${encoder.description}] and [${decoder.description}]. Pass a custom description as a third argument if you want to override the description and bypass this error.`
+      );
     }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/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})`,
+      decode: decoder.decode,
+      description: description ?? encoder.description,
+      encode: encoder.encode,
+      fixedSize: encoder.fixedSize,
+      maxSize: encoder.maxSize
+    };
+  }
+  function fixCodecHelper(data, fixedBytes, description) {
+    return {
+      description: description ?? `fixed(${fixedBytes}, ${data.description})`,
       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);
+      maxSize: fixedBytes
+    };
+  }
+  function fixEncoder(encoder, fixedBytes, description) {
+    return {
+      ...fixCodecHelper(encoder, fixedBytes, description),
+      encode: (value) => fixBytes(encoder.encode(value), fixedBytes)
+    };
+  }
+  function fixDecoder(decoder, fixedBytes, description) {
+    return {
+      ...fixCodecHelper(decoder, fixedBytes, description),
+      decode: (bytes, offset = 0) => {
+        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 (decoder.fixedSize !== null) {
+          bytes = fixBytes(bytes, decoder.fixedSize);
         }
-        const [value] = serializer.deserialize(buffer, 0);
+        const [value] = decoder.decode(bytes, 0);
         return [value, offset + fixedBytes];
       }
     };
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/mapSerializer.mjs
-  init_env_shim();
-  function mapSerializer(serializer, unmap, map) {
+  function mapEncoder(encoder, unmap) {
     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];
-      }
+      description: encoder.description,
+      encode: (value) => encoder.encode(unmap(value)),
+      fixedSize: encoder.fixedSize,
+      maxSize: encoder.maxSize
     };
   }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/index.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/errors.mjs
-  init_env_shim();
-  var InvalidBaseStringError = class extends Error {
-    constructor(value, base, cause) {
-      const message = `Expected a string of base ${base}, got [${value}].`;
-      super(message);
-      __publicField(this, "name", "InvalidBaseStringError");
-      this.cause = cause;
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
-  var baseX = (alphabet) => {
-    const base = alphabet.length;
-    const baseBigInt = BigInt(base);
+  function mapDecoder(decoder, map) {
     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));
+      decode: (bytes, offset = 0) => {
+        const [value, length] = decoder.decode(bytes, offset);
+        return [map(value, bytes, offset), length];
       },
-      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];
-      }
+      description: decoder.description,
+      fixedSize: decoder.fixedSize,
+      maxSize: decoder.maxSize
     };
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base58.mjs
-  init_env_shim();
-  var base58 = baseX("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/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.9/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.9/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/index.mjs
-  init_env_shim();
+  }
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.9/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.9/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");
+  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}.`
+      );
     }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.9/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/utils.mjs
-  init_env_shim();
-  function numberFactory(input) {
+  }
+  function sharedNumberFactory(input) {
     let littleEndian;
     let defaultDescription = input.name;
     if (input.size > 1) {
-      littleEndian = !("endian" in input.options) || input.options.endian === Endian.Little;
+      littleEndian = !("endian" in input.options) || input.options.endian === 0;
       defaultDescription += littleEndian ? "(le)" : "(be)";
     }
     return {
       description: input.options.description ?? defaultDescription,
       fixedSize: input.size,
-      maxSize: input.size,
-      serialize(value) {
+      littleEndian,
+      maxSize: input.size
+    };
+  }
+  function numberEncoderFactory(input) {
+    const codecData = sharedNumberFactory(input);
+    return {
+      description: codecData.description,
+      encode(value) {
         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);
+        const arrayBuffer = new ArrayBuffer(input.size);
+        input.set(new DataView(arrayBuffer), value, codecData.littleEndian);
+        return new Uint8Array(arrayBuffer);
       },
-      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];
-      }
+      fixedSize: codecData.fixedSize,
+      maxSize: codecData.maxSize
     };
   }
-  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.9/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.9/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.9/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/shortU16.mjs
-  init_env_shim();
-  var shortU16 = (options = {}) => ({
+  function numberDecoderFactory(input) {
+    const codecData = sharedNumberFactory(input);
+    return {
+      decode(bytes, offset = 0) {
+        assertByteArrayIsNotEmptyForCodec(codecData.description, bytes, offset);
+        assertByteArrayHasEnoughBytesForCodec(codecData.description, input.size, bytes, offset);
+        const view = new DataView(toArrayBuffer(bytes, offset, input.size));
+        return [input.get(view, codecData.littleEndian), offset + input.size];
+      },
+      description: codecData.description,
+      fixedSize: codecData.fixedSize,
+      maxSize: codecData.maxSize
+    };
+  }
+  function toArrayBuffer(bytes, offset, length) {
+    const bytesOffset = bytes.byteOffset + (offset ?? 0);
+    const bytesLength = length ?? bytes.byteLength;
+    return bytes.buffer.slice(bytesOffset, bytesOffset + bytesLength);
+  }
+  var getShortU16Encoder = (options = {}) => ({
     description: options.description ?? "shortU16",
-    fixedSize: null,
-    maxSize: 3,
-    serialize: (value) => {
-      assertRange("shortU16", 0, 65535, value);
-      const bytes2 = [0];
+    encode: (value) => {
+      assertNumberIsBetweenForCodec("shortU16", 0, 65535, value);
+      const bytes = [0];
       for (let ii = 0; ; ii += 1) {
         const alignedValue = value >> ii * 7;
         if (alignedValue === 0) {
           break;
         }
         const nextSevenBits = 127 & alignedValue;
-        bytes2[ii] = nextSevenBits;
+        bytes[ii] = nextSevenBits;
         if (ii > 0) {
-          bytes2[ii - 1] |= 128;
+          bytes[ii - 1] |= 128;
         }
       }
-      return new Uint8Array(bytes2);
+      return new Uint8Array(bytes);
     },
-    deserialize: (bytes2, offset = 0) => {
+    fixedSize: null,
+    maxSize: 3
+  });
+  var getShortU16Decoder = (options = {}) => ({
+    decode: (bytes, offset = 0) => {
       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) {
@@ -430,224 +327,201 @@ this.globalThis.solanaWeb3 = (function (exports) {
         }
       }
       return [value, offset + byteCount];
-    }
+    },
+    description: options.description ?? "shortU16",
+    fixedSize: null,
+    maxSize: 3
+  });
+  var getU32Encoder = (options = {}) => numberEncoderFactory({
+    name: "u32",
+    options,
+    range: [0, Number("0xffffffff")],
+    set: (view, value, le) => view.setUint32(0, value, le),
+    size: 4
+  });
+  var getU32Decoder = (options = {}) => numberDecoderFactory({
+    get: (view, le) => view.getUint32(0, le),
+    name: "u32",
+    options,
+    size: 4
+  });
+  var getU8Encoder = (options = {}) => numberEncoderFactory({
+    name: "u8",
+    options,
+    range: [0, Number("0xff")],
+    set: (view, value) => view.setUint8(0, value),
+    size: 1
+  });
+  var getU8Decoder = (options = {}) => numberDecoderFactory({
+    get: (view) => view.getUint8(0),
+    name: "u8",
+    options,
+    size: 1
   });
 
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/array.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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");
+  // ../codecs-strings/dist/index.browser.js
+  function assertValidBaseString(alphabet4, testValue, givenValue = testValue) {
+    if (!testValue.match(new RegExp(`^[${alphabet4}]*$`))) {
+      throw new Error(`Expected a string of base ${alphabet4.length}, got [${givenValue}].`);
     }
+  }
+  var getBaseXEncoder = (alphabet4) => {
+    const base = alphabet4.length;
+    const baseBigInt = BigInt(base);
+    return {
+      description: `base${base}`,
+      encode(value) {
+        assertValidBaseString(alphabet4, value);
+        if (value === "")
+          return new Uint8Array();
+        const chars = [...value];
+        let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
+        trailIndex = trailIndex === -1 ? chars.length : trailIndex;
+        const leadingZeroes = Array(trailIndex).fill(0);
+        if (trailIndex === chars.length)
+          return Uint8Array.from(leadingZeroes);
+        const tailChars = chars.slice(trailIndex);
+        let base10Number = 0n;
+        let baseXPower = 1n;
+        for (let i = tailChars.length - 1; i >= 0; i -= 1) {
+          base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
+          baseXPower *= baseBigInt;
+        }
+        const tailBytes = [];
+        while (base10Number > 0n) {
+          tailBytes.unshift(Number(base10Number % 256n));
+          base10Number /= 256n;
+        }
+        return Uint8Array.from(leadingZeroes.concat(tailBytes));
+      },
+      fixedSize: null,
+      maxSize: null
+    };
   };
-  var 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");
-    }
+  var getBaseXDecoder = (alphabet4) => {
+    const base = alphabet4.length;
+    const baseBigInt = BigInt(base);
+    return {
+      decode(rawBytes, offset = 0) {
+        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];
+        let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
+        const tailChars = [];
+        while (base10Number > 0n) {
+          tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);
+          base10Number /= baseBigInt;
+        }
+        return [leadingZeroes + tailChars.join(""), rawBytes.length];
+      },
+      description: `base${base}`,
+      fixedSize: null,
+      maxSize: null
+    };
   };
-  var UnrecognizedArrayLikeSerializerSizeError = class extends Error {
-    constructor(size) {
-      super(`Unrecognized array-like serializer size: ${JSON.stringify(size)}`);
-      __publicField(this, "name", "UnrecognizedArrayLikeSerializerSizeError");
+  var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+  var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+  var getBase58Decoder = () => getBaseXDecoder(alphabet2);
+  var getBase64Encoder = () => {
+    {
+      return {
+        description: `base64`,
+        encode(value) {
+          try {
+            const bytes = atob(value).split("").map((c) => c.charCodeAt(0));
+            return new Uint8Array(bytes);
+          } catch (e23) {
+            throw new Error(`Expected a string of base 64, got [${value}].`);
+          }
+        },
+        fixedSize: null,
+        maxSize: null
+      };
     }
   };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/utils.mjs
-  init_env_shim();
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/utils.mjs
-  function getResolvedSize(size, childrenSizes, bytes2, 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 {
+      description: "utf8",
+      encode: (value) => new Uint8Array((textEncoder || (textEncoder = new o())).encode(value)),
+      fixedSize: null,
+      maxSize: null
+    };
+  };
+  var getUtf8Decoder = () => {
+    let textDecoder;
+    return {
+      decode(bytes, offset = 0) {
+        const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));
+        return [removeNullCharacters(value), bytes.length];
+      },
+      description: "utf8",
+      fixedSize: null,
+      maxSize: null
+    };
+  };
+  var getStringEncoder = (options = {}) => {
+    const size = options.size ?? getU32Encoder();
+    const encoding = options.encoding ?? getUtf8Encoder();
+    const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;
+    if (size === "variable") {
+      return { ...encoding, description };
+    }
     if (typeof size === "number") {
-      return [size, offset];
+      return fixEncoder(encoding, size, description);
     }
-    if (typeof size === "object") {
-      return size.deserialize(bytes2, offset);
+    return {
+      description,
+      encode: (value) => {
+        const contentBytes = encoding.encode(value);
+        const lengthBytes = size.encode(contentBytes.length);
+        return mergeBytes([lengthBytes, contentBytes]);
+      },
+      fixedSize: null,
+      maxSize: null
+    };
+  };
+  var getStringDecoder = (options = {}) => {
+    const size = options.size ?? getU32Decoder();
+    const encoding = options.encoding ?? getUtf8Decoder();
+    const description = options.description ?? `string(${encoding.description}; ${getSizeDescription(size)})`;
+    if (size === "variable") {
+      return { ...encoding, description };
     }
-    if (size === "remainder") {
-      const childrenSize = sumSerializerSizes(childrenSizes);
-      if (childrenSize === null) {
-        throw new ExpectedFixedSizeSerializerError('Serializers of "remainder" size must have fixed-size items.');
-      }
-      const remainder = bytes2.slice(offset).length;
-      if (remainder % childrenSize !== 0) {
-        throw new InvalidArrayLikeRemainderSizeError(remainder, childrenSize);
-      }
-      return [remainder / childrenSize, offset];
+    if (typeof size === "number") {
+      return fixDecoder(encoding, size, description);
     }
-    throw new UnrecognizedArrayLikeSerializerSizeError(size);
-  }
+    return {
+      decode: (bytes, offset = 0) => {
+        assertByteArrayIsNotEmptyForCodec("string", bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);
+        const length = Number(lengthBigInt);
+        offset = lengthOffset;
+        const contentBytes = bytes.slice(offset, offset + length);
+        assertByteArrayHasEnoughBytesForCodec("string", length, contentBytes);
+        const [value, contentOffset] = encoding.decode(contentBytes);
+        offset += contentOffset;
+        return [value, offset];
+      },
+      description,
+      fixedSize: null,
+      maxSize: null
+    };
+  };
   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 getSizePrefix(size, realSize) {
-    return typeof size === "object" ? size.serialize(realSize) : new Uint8Array();
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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.');
-    }
-    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];
-        }
-        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;
-        }
-        return [values, offset];
-      }
-    };
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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];
-      }
-    };
-    if (size === "variable") {
-      return byteSerializer;
-    }
-    if (typeof size === "number") {
-      return fixSerializer(byteSerializer, size, description);
-    }
-    return {
-      description,
-      fixedSize: null,
-      maxSize: null,
-      serialize: (value) => {
-        const contentBytes = byteSerializer.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("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];
-      }
-    };
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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)})`;
-    if (size === "variable") {
-      return {
-        ...encoding,
-        description
-      };
-    }
-    if (typeof size === "number") {
-      return fixSerializer(encoding, size, description);
-    }
-    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);
-        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);
-        offset += contentOffset;
-        return [value, offset];
-      }
-    };
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/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
   init_env_shim();
@@ -715,34 +589,82 @@ this.globalThis.solanaWeb3 = (function (exports) {
       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,
+  function address(putativeAddress) {
+    assertIsAddress(putativeAddress);
+    return putativeAddress;
+  }
+  function getAddressEncoder(config) {
+    return mapEncoder(
+      getStringEncoder({
+        description: config?.description ?? "Address",
+        encoding: getMemoizedBase58Encoder(),
+        size: 32
+      }),
+      (putativeAddress) => address(putativeAddress)
+    );
+  }
+  function getAddressDecoder(config) {
+    return getStringDecoder({
+      description: config?.description ?? "Address",
+      encoding: getMemoizedBase58Decoder(),
       size: 32
     });
   }
-  function getBase58EncodedAddressComparator() {
+  function getAddressCodec(config) {
+    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));
+  }
+  function getAddressComparator() {
     return new Intl.Collator("en", {
       caseFirst: "lower",
       ignorePunctuation: false,
@@ -826,17 +748,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 +810,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 +827,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)[0];
   }
-  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,26 +851,22 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     throw new Error("Unable to find a viable program address bump seed");
   }
-  async function createAddressWithSeed({
-    baseAddress,
-    programAddress,
-    seed
-  }) {
-    const { serialize: serialize4, deserialize: deserialize2 } = getBase58EncodedAddressCodec();
+  async function createAddressWithSeed({ baseAddress, programAddress, seed }) {
+    const { encode: encode2, decode: decode2 } = 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 = serialize4(programAddress);
+    const programAddressBytes = encode2(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([...serialize4(baseAddress), ...seedBytes, ...programAddressBytes])
+      new Uint8Array([...encode2(baseAddress), ...seedBytes, ...programAddressBytes])
     );
     const addressBytes = new Uint8Array(addressBytesBuffer);
-    return deserialize2(addressBytes)[0];
+    return decode2(addressBytes)[0];
   }
   async function getAddressFromPublicKey(publicKey) {
     await assertKeyExporterIsAvailable();
@@ -940,7 +874,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       throw new Error("The `CryptoKey` must be an `Ed25519` public key");
     }
     const publicKeyBytes = await crypto.subtle.exportKey("raw", publicKey);
-    const [base58EncodedAddress] = getBase58EncodedAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
+    const [base58EncodedAddress] = getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
     return base58EncodedAddress;
   }
 
@@ -997,120 +931,445 @@ this.globalThis.solanaWeb3 = (function (exports) {
     );
     return keyPair;
   }
+  var base58Encoder;
+  function assertIsSignature(putativeSignature) {
+    if (!base58Encoder)
+      base58Encoder = getBase58Encoder();
+    try {
+      if (
+        // Lowest value (64 bytes of zeroes)
+        putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+        putativeSignature.length > 88
+      ) {
+        throw new Error("Expected input string to decode to a byte array of length 64.");
+      }
+      const bytes = base58Encoder.encode(putativeSignature);
+      const numBytes = bytes.byteLength;
+      if (numBytes !== 64) {
+        throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
+      }
+    } catch (e3) {
+      throw new Error(`\`${putativeSignature}\` is not a signature`, {
+        cause: e3
+      });
+    }
+  }
+  function isSignature(putativeSignature) {
+    if (!base58Encoder)
+      base58Encoder = getBase58Encoder();
+    if (
+      // Lowest value (64 bytes of zeroes)
+      putativeSignature.length < 64 || // Highest value (64 bytes of 255)
+      putativeSignature.length > 88
+    ) {
+      return false;
+    }
+    const bytes = base58Encoder.encode(putativeSignature);
+    const numBytes = bytes.byteLength;
+    if (numBytes !== 64) {
+      return false;
+    }
+    return true;
+  }
   async function signBytes(key, data) {
     await assertSigningCapabilityIsAvailable();
     const signedData = await crypto.subtle.sign("Ed25519", key, data);
     return new Uint8Array(signedData);
   }
-  async function verifySignature(key, signature, data) {
+  function signature(putativeSignature) {
+    assertIsSignature(putativeSignature);
+    return putativeSignature;
+  }
+  async function verifySignature(key, signature2, data) {
     await assertVerificationCapabilityIsAvailable();
-    return await crypto.subtle.verify("Ed25519", key, signature, data);
+    return await crypto.subtle.verify("Ed25519", key, signature2, data);
   }
 
-  // ../transactions/dist/index.browser.js
+  // ../rpc-types/dist/index.browser.js
   init_env_shim();
-  function getUnsignedTransaction(transaction) {
-    if ("signatures" in transaction) {
-      const {
-        signatures: _,
-        // eslint-disable-line @typescript-eslint/no-unused-vars
-        ...unsignedTransaction
-      } = transaction;
-      return unsignedTransaction;
-    } else {
-      return transaction;
+  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 assertIsBlockhash(putativeBlockhash) {
+  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 {
-      if (
-        // Lowest value (32 bytes of zeroes)
-        putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
-        putativeBlockhash.length > 44
-      ) {
-        throw new Error("Expected input string to decode to a byte array of length 32.");
-      }
-      const bytes3 = base58.serialize(putativeBlockhash);
-      const numBytes = bytes3.byteLength;
-      if (numBytes !== 32) {
-        throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
+      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(`\`${putativeBlockhash}\` is not a blockhash`, {
+      throw new Error(`\`${putativeTimestamp}\` is not a timestamp`, {
         cause: e3
       });
     }
   }
-  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
-    if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
-      return transaction;
+  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 sumCodecSizes(sizes) {
+    return sizes.reduce((all, size) => all === null || size === null ? null : all + size, 0);
+  }
+  function decodeArrayLikeCodecSize(size, childrenSizes, bytes, offset) {
+    if (typeof size === "number") {
+      return [size, offset];
     }
-    const out = {
-      ...getUnsignedTransaction(transaction),
-      lifetimeConstraint: blockhashLifetimeConstraint
-    };
-    Object.freeze(out);
-    return out;
+    if (typeof size === "object") {
+      return size.decode(bytes, offset);
+    }
+    if (size === "remainder") {
+      const childrenSize = sumCodecSizes(childrenSizes);
+      if (childrenSize === null) {
+        throw new Error('Codecs of "remainder" size must have fixed-size items.');
+      }
+      const remainder = bytes.slice(offset).length;
+      if (remainder % childrenSize !== 0) {
+        throw new Error(
+          `The remainder of the byte array (${remainder} bytes) cannot be split into chunks of ${childrenSize} bytes. Codecs of "remainder" size must have a remainder that is a multiple of its item size. In other words, ${remainder} modulo ${childrenSize} should be equal to zero.`
+        );
+      }
+      return [remainder / childrenSize, offset];
+    }
+    throw new Error(`Unrecognized array-like codec size: ${JSON.stringify(size)}`);
   }
-  function createTransaction({
-    version
-  }) {
-    const out = {
-      instructions: [],
-      version
-    };
-    Object.freeze(out);
-    return out;
+  function getArrayLikeCodecSizeDescription(size) {
+    return typeof size === "object" ? size.description : `${size}`;
   }
-  var AccountRole2 = /* @__PURE__ */ ((AccountRole22) => {
-    AccountRole22[AccountRole22["WRITABLE_SIGNER"] = /* 3 */
-    3] = "WRITABLE_SIGNER";
-    AccountRole22[AccountRole22["READONLY_SIGNER"] = /* 2 */
-    2] = "READONLY_SIGNER";
-    AccountRole22[AccountRole22["WRITABLE"] = /* 1 */
-    1] = "WRITABLE";
-    AccountRole22[AccountRole22["READONLY"] = /* 0 */
-    0] = "READONLY";
-    return AccountRole22;
-  })(AccountRole2 || {});
-  var IS_WRITABLE_BITMASK2 = 1;
-  function isSignerRole2(role) {
-    return role >= 2;
+  function getArrayLikeCodecSizeFromChildren(size, childrenSizes) {
+    if (typeof size !== "number")
+      return null;
+    if (size === 0)
+      return 0;
+    const childrenSize = sumCodecSizes(childrenSizes);
+    return childrenSize === null ? null : childrenSize * size;
   }
-  function isWritableRole2(role) {
-    return (role & IS_WRITABLE_BITMASK2) !== 0;
+  function getArrayLikeCodecSizePrefix(size, realSize) {
+    return typeof size === "object" ? size.encode(realSize) : new Uint8Array();
   }
-  function mergeRoles2(roleA, roleB) {
-    return roleA | roleB;
+  function assertValidNumberOfItemsForCodec(codecDescription, expected, actual) {
+    if (expected !== actual) {
+      throw new Error(`Expected [${codecDescription}] to have ${expected} items, got ${actual}.`);
+    }
   }
-  var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
-  var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
-  function assertIsDurableNonceTransaction(transaction) {
-    if (!isDurableNonceTransaction(transaction)) {
-      throw new Error("Transaction is not a durable nonce transaction");
+  function arrayCodecHelper(item, size, description) {
+    if (size === "remainder" && item.fixedSize === null) {
+      throw new Error('Codecs of "remainder" size must have fixed-size items.');
     }
+    return {
+      description: description ?? `array(${item.description}; ${getArrayLikeCodecSizeDescription(size)})`,
+      fixedSize: getArrayLikeCodecSizeFromChildren(size, [item.fixedSize]),
+      maxSize: getArrayLikeCodecSizeFromChildren(size, [item.maxSize])
+    };
   }
-  function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
+  function getArrayEncoder(item, options = {}) {
+    const size = options.size ?? getU32Encoder();
     return {
-      accounts: [
-        { address: nonceAccountAddress, role: AccountRole2.WRITABLE },
-        {
-          address: RECENT_BLOCKHASHES_SYSVAR_ADDRESS,
-          role: AccountRole2.READONLY
-        },
-        { address: nonceAuthorityAddress, role: AccountRole2.READONLY_SIGNER }
-      ],
-      data: new Uint8Array([4, 0, 0, 0]),
-      programAddress: SYSTEM_PROGRAM_ADDRESS
+      ...arrayCodecHelper(item, size, options.description),
+      encode: (value) => {
+        if (typeof size === "number") {
+          assertValidNumberOfItemsForCodec("array", size, value.length);
+        }
+        return mergeBytes([getArrayLikeCodecSizePrefix(size, value.length), ...value.map((v) => item.encode(v))]);
+      }
     };
   }
-  function isAdvanceNonceAccountInstruction(instruction) {
-    return instruction.programAddress === SYSTEM_PROGRAM_ADDRESS && // Test for `AdvanceNonceAccount` instruction data
+  function getArrayDecoder(item, options = {}) {
+    const size = options.size ?? getU32Decoder();
+    return {
+      ...arrayCodecHelper(item, size, options.description),
+      decode: (bytes, offset = 0) => {
+        if (typeof size === "object" && bytes.slice(offset).length === 0) {
+          return [[], offset];
+        }
+        const [resolvedSize, newOffset] = decodeArrayLikeCodecSize(size, [item.fixedSize], bytes, offset);
+        offset = newOffset;
+        const values = [];
+        for (let i = 0; i < resolvedSize; i += 1) {
+          const [value, newOffset2] = item.decode(bytes, offset);
+          values.push(value);
+          offset = newOffset2;
+        }
+        return [values, offset];
+      }
+    };
+  }
+  function getBytesEncoder(options = {}) {
+    const size = options.size ?? "variable";
+    const sizeDescription = typeof size === "object" ? size.description : `${size}`;
+    const description = options.description ?? `bytes(${sizeDescription})`;
+    const byteEncoder = {
+      description,
+      encode: (value) => value,
+      fixedSize: null,
+      maxSize: null
+    };
+    if (size === "variable") {
+      return byteEncoder;
+    }
+    if (typeof size === "number") {
+      return fixEncoder(byteEncoder, size, description);
+    }
+    return {
+      ...byteEncoder,
+      encode: (value) => {
+        const contentBytes = byteEncoder.encode(value);
+        const lengthBytes = size.encode(contentBytes.length);
+        return mergeBytes([lengthBytes, contentBytes]);
+      }
+    };
+  }
+  function getBytesDecoder(options = {}) {
+    const size = options.size ?? "variable";
+    const sizeDescription = typeof size === "object" ? size.description : `${size}`;
+    const description = options.description ?? `bytes(${sizeDescription})`;
+    const byteDecoder = {
+      decode: (bytes, offset = 0) => {
+        const slice = bytes.slice(offset);
+        return [slice, offset + slice.length];
+      },
+      description,
+      fixedSize: null,
+      maxSize: null
+    };
+    if (size === "variable") {
+      return byteDecoder;
+    }
+    if (typeof size === "number") {
+      return fixDecoder(byteDecoder, size, description);
+    }
+    return {
+      ...byteDecoder,
+      decode: (bytes, offset = 0) => {
+        assertByteArrayIsNotEmptyForCodec("bytes", bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);
+        const length = Number(lengthBigInt);
+        offset = lengthOffset;
+        const contentBytes = bytes.slice(offset, offset + length);
+        assertByteArrayHasEnoughBytesForCodec("bytes", length, contentBytes);
+        const [value, contentOffset] = byteDecoder.decode(contentBytes);
+        offset += contentOffset;
+        return [value, offset];
+      }
+    };
+  }
+  function structCodecHelper(fields, description) {
+    const fieldDescriptions = fields.map(([name, codec]) => `${String(name)}: ${codec.description}`).join(", ");
+    return {
+      description: description ?? `struct(${fieldDescriptions})`,
+      fixedSize: sumCodecSizes(fields.map(([, field]) => field.fixedSize)),
+      maxSize: sumCodecSizes(fields.map(([, field]) => field.maxSize))
+    };
+  }
+  function getStructEncoder(fields, options = {}) {
+    return {
+      ...structCodecHelper(fields, options.description),
+      encode: (struct) => {
+        const fieldBytes = fields.map(([key, codec]) => codec.encode(struct[key]));
+        return mergeBytes(fieldBytes);
+      }
+    };
+  }
+  function getStructDecoder(fields, options = {}) {
+    return {
+      ...structCodecHelper(fields, options.description),
+      decode: (bytes, offset = 0) => {
+        const struct = {};
+        fields.forEach(([key, codec]) => {
+          const [value, newOffset] = codec.decode(bytes, offset);
+          offset = newOffset;
+          struct[key] = value;
+        });
+        return [struct, offset];
+      }
+    };
+  }
+
+  // ../functional/dist/index.browser.js
+  init_env_shim();
+  function pipe(init, ...fns) {
+    return fns.reduce((acc, fn) => fn(acc), init);
+  }
+  function getUnsignedTransaction(transaction) {
+    if ("signatures" in transaction) {
+      const {
+        signatures: _,
+        // eslint-disable-line @typescript-eslint/no-unused-vars
+        ...unsignedTransaction
+      } = transaction;
+      return unsignedTransaction;
+    } else {
+      return transaction;
+    }
+  }
+  var base58Encoder2;
+  function assertIsBlockhash(putativeBlockhash) {
+    if (!base58Encoder2)
+      base58Encoder2 = getBase58Encoder();
+    try {
+      if (
+        // Lowest value (32 bytes of zeroes)
+        putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
+        putativeBlockhash.length > 44
+      ) {
+        throw new Error("Expected input string to decode to a byte array of length 32.");
+      }
+      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}`);
+      }
+    } catch (e3) {
+      throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
+        cause: e3
+      });
+    }
+  }
+  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
+    if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
+      return transaction;
+    }
+    const out = {
+      ...getUnsignedTransaction(transaction),
+      lifetimeConstraint: blockhashLifetimeConstraint
+    };
+    Object.freeze(out);
+    return out;
+  }
+  function createTransaction({
+    version
+  }) {
+    const out = {
+      instructions: [],
+      version
+    };
+    Object.freeze(out);
+    return out;
+  }
+  var AccountRole2 = /* @__PURE__ */ ((AccountRole22) => {
+    AccountRole22[AccountRole22["WRITABLE_SIGNER"] = /* 3 */
+    3] = "WRITABLE_SIGNER";
+    AccountRole22[AccountRole22["READONLY_SIGNER"] = /* 2 */
+    2] = "READONLY_SIGNER";
+    AccountRole22[AccountRole22["WRITABLE"] = /* 1 */
+    1] = "WRITABLE";
+    AccountRole22[AccountRole22["READONLY"] = /* 0 */
+    0] = "READONLY";
+    return AccountRole22;
+  })(AccountRole2 || {});
+  var IS_WRITABLE_BITMASK2 = 1;
+  function isSignerRole2(role) {
+    return role >= 2;
+  }
+  function isWritableRole2(role) {
+    return (role & IS_WRITABLE_BITMASK2) !== 0;
+  }
+  function mergeRoles2(roleA, roleB) {
+    return roleA | roleB;
+  }
+  var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
+  var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
+  function assertIsDurableNonceTransaction(transaction) {
+    if (!isDurableNonceTransaction(transaction)) {
+      throw new Error("Transaction is not a durable nonce transaction");
+    }
+  }
+  function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
+    return {
+      accounts: [
+        { address: nonceAccountAddress, role: AccountRole2.WRITABLE },
+        {
+          address: RECENT_BLOCKHASHES_SYSVAR_ADDRESS,
+          role: AccountRole2.READONLY
+        },
+        { address: nonceAuthorityAddress, role: AccountRole2.READONLY_SIGNER }
+      ],
+      data: new Uint8Array([4, 0, 0, 0]),
+      programAddress: SYSTEM_PROGRAM_ADDRESS
+    };
+  }
+  function isAdvanceNonceAccountInstruction(instruction) {
+    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
     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;
@@ -1118,21 +1377,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
       }
@@ -1167,8 +1443,8 @@ 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) {
+    addressMap[address2] = update(addressMap[address2] ?? { role: AccountRole2.READONLY });
   }
   var TYPE = Symbol("AddressMapTypeProperty");
   function getAddressMapFromInstructions(feePayer, instructions) {
@@ -1219,7 +1495,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
@@ -1327,14 +1603,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;
@@ -1356,7 +1632,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]
     }));
@@ -1397,7 +1673,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
       };
     });
@@ -1411,7 +1687,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);
@@ -1425,138 +1701,306 @@ this.globalThis.solanaWeb3 = (function (exports) {
       version: transaction.version
     };
   }
-  function getAddressTableLookupCodec() {
-    return struct(
-      [
+  function getCompiledTransaction(transaction) {
+    const compiledMessage = compileMessage(transaction);
+    let signatures;
+    if ("signatures" in transaction) {
+      signatures = [];
+      for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
+        signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
+      }
+    } else {
+      signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
+    }
+    return {
+      compiledMessage,
+      signatures
+    };
+  }
+  function getAccountMetas(message) {
+    const { header } = message;
+    const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
+    const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
+    const accountMetas = [];
+    let accountIndex = 0;
+    for (let i = 0; i < numWritableSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.WRITABLE_SIGNER
+      });
+      accountIndex++;
+    }
+    for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.READONLY_SIGNER
+      });
+      accountIndex++;
+    }
+    for (let i = 0; i < numWritableNonSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.WRITABLE
+      });
+      accountIndex++;
+    }
+    for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
+      accountMetas.push({
+        address: message.staticAccounts[accountIndex],
+        role: AccountRole2.READONLY
+      });
+      accountIndex++;
+    }
+    return accountMetas;
+  }
+  function convertInstruction(instruction, accountMetas) {
+    const programAddress = accountMetas[instruction.programAddressIndex]?.address;
+    if (!programAddress) {
+      throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
+    }
+    const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
+    const { data } = instruction;
+    return {
+      programAddress,
+      ...accounts && accounts.length ? { accounts } : {},
+      ...data && data.length ? { data } : {}
+    };
+  }
+  function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
+    if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
+      return {
+        blockhash: messageLifetimeToken,
+        lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
+        // U64 MAX
+      };
+    } else {
+      const nonceAccountAddress = firstInstruction.accounts[0].address;
+      assertIsAddress(nonceAccountAddress);
+      const nonceAuthorityAddress = firstInstruction.accounts[2].address;
+      assertIsAddress(nonceAuthorityAddress);
+      return {
+        nonce: messageLifetimeToken,
+        nonceAccountAddress,
+        nonceAuthorityAddress
+      };
+    }
+  }
+  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
+    );
+  }
+  var lookupTableAddressDescription = "The address of the address lookup table account from which instruction addresses should be looked up" ;
+  var writableIndicesDescription = "The indices of the accounts in the lookup table that should be loaded as writeable" ;
+  var readableIndicesDescription = "The indices of the accounts in the lookup table that should be loaded as read-only" ;
+  var addressTableLookupDescription = "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it" ;
+  var memoizedAddressTableLookupEncoder;
+  function getAddressTableLookupEncoder() {
+    if (!memoizedAddressTableLookupEncoder) {
+      memoizedAddressTableLookupEncoder = getStructEncoder(
         [
-          "lookupTableAddress",
-          getBase58EncodedAddressCodec(
-            {
-              description: "The address of the address lookup table account from which instruction addresses should be looked up"
-            } 
-          )
+          ["lookupTableAddress", getAddressEncoder({ description: lookupTableAddressDescription })],
+          [
+            "writableIndices",
+            getArrayEncoder(getU8Encoder(), {
+              description: writableIndicesDescription,
+              size: getShortU16Encoder()
+            })
+          ],
+          [
+            "readableIndices",
+            getArrayEncoder(getU8Encoder(), {
+              description: readableIndicesDescription,
+              size: getShortU16Encoder()
+            })
+          ]
         ],
+        { description: addressTableLookupDescription }
+      );
+    }
+    return memoizedAddressTableLookupEncoder;
+  }
+  var memoizedAddressTableLookupDecoder;
+  function getAddressTableLookupDecoder() {
+    if (!memoizedAddressTableLookupDecoder) {
+      memoizedAddressTableLookupDecoder = getStructDecoder(
         [
-          "writableIndices",
-          array(u8(), {
-            ...{
-              description: "The indices of the accounts in the lookup table that should be loaded as writeable"
-            } ,
-            size: shortU16()
-          })
+          ["lookupTableAddress", getAddressDecoder({ description: lookupTableAddressDescription })],
+          [
+            "writableIndices",
+            getArrayDecoder(getU8Decoder(), {
+              description: writableIndicesDescription,
+              size: getShortU16Decoder()
+            })
+          ],
+          [
+            "readableIndices",
+            getArrayDecoder(getU8Decoder(), {
+              description: readableIndicesDescription,
+              size: getShortU16Decoder()
+            })
+          ]
         ],
-        [
-          "readableIndices",
-          array(u8(), {
-            ...{
-              description: "The indices of the accounts in the lookup table that should be loaded as read-only"
-            } ,
-            size: shortU16()
-          })
-        ]
+        { description: addressTableLookupDescription }
+      );
+    }
+    return memoizedAddressTableLookupDecoder;
+  }
+  var memoizedU8Encoder;
+  function getMemoizedU8Encoder() {
+    if (!memoizedU8Encoder)
+      memoizedU8Encoder = getU8Encoder();
+    return memoizedU8Encoder;
+  }
+  function getMemoizedU8EncoderDescription(description) {
+    const encoder = getMemoizedU8Encoder();
+    return {
+      ...encoder,
+      description: description ?? encoder.description
+    };
+  }
+  var memoizedU8Decoder;
+  function getMemoizedU8Decoder() {
+    if (!memoizedU8Decoder)
+      memoizedU8Decoder = getU8Decoder();
+    return memoizedU8Decoder;
+  }
+  function getMemoizedU8DecoderDescription(description) {
+    const decoder = getMemoizedU8Decoder();
+    return {
+      ...decoder,
+      description: description ?? decoder.description
+    };
+  }
+  var numSignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" ;
+  var numReadonlySignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable" ;
+  var numReadonlyNonSignerAccountsDescription = "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" ;
+  var messageHeaderDescription = "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" ;
+  function getMessageHeaderEncoder() {
+    return getStructEncoder(
+      [
+        ["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
+        ["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
+        ["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
       ],
       {
-        description: "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"
-      } 
+        description: messageHeaderDescription
+      }
     );
   }
-  function getMessageHeaderCodec() {
-    return struct(
+  function getMessageHeaderDecoder() {
+    return getStructDecoder(
       [
-        [
-          "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"
-            } 
-          )
-        ]
+        ["numSignerAccounts", getMemoizedU8DecoderDescription(numSignerAccountsDescription)],
+        ["numReadonlySignerAccounts", getMemoizedU8DecoderDescription(numReadonlySignerAccountsDescription)],
+        ["numReadonlyNonSignerAccounts", getMemoizedU8DecoderDescription(numReadonlyNonSignerAccountsDescription)]
       ],
       {
-        description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
-      } 
+        description: messageHeaderDescription
+      }
     );
   }
-  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()
-          })
-        ]
-      ]),
-      (value) => {
-        if (value.accountIndices !== void 0 && value.data !== void 0) {
-          return value;
-        }
-        return {
-          ...value,
-          accountIndices: value.accountIndices ?? [],
-          data: value.data ?? new Uint8Array(0)
-        };
-      },
-      (value) => {
-        if (value.accountIndices.length && value.data.byteLength) {
-          return value;
+  var programAddressIndexDescription = "The index of the program being called, according to the well-ordered accounts list for this transaction" ;
+  var accountIndexDescription = "The index of an account, according to the well-ordered accounts list for this transaction" ;
+  var accountIndicesDescription = "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" ;
+  var dataDescription = "An optional buffer of data passed to the instruction" ;
+  var memoizedGetInstructionEncoder;
+  function getInstructionEncoder() {
+    if (!memoizedGetInstructionEncoder) {
+      memoizedGetInstructionEncoder = mapEncoder(
+        getStructEncoder([
+          ["programAddressIndex", getU8Encoder({ description: programAddressIndexDescription })],
+          [
+            "accountIndices",
+            getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
+              description: accountIndicesDescription,
+              size: getShortU16Encoder()
+            })
+          ],
+          ["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
+        ]),
+        // Convert an instruction to have all fields defined
+        (instruction) => {
+          if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
+            return instruction;
+          }
+          return {
+            ...instruction,
+            accountIndices: instruction.accountIndices ?? [],
+            data: instruction.data ?? new Uint8Array(0)
+          };
         }
-        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}`
-    );
+      );
+    }
+    return memoizedGetInstructionEncoder;
   }
-  function getUnimplementedDecoder(name) {
-    return () => {
-      throw getError("decoder", name);
-    };
+  var memoizedGetInstructionDecoder;
+  function getInstructionDecoder() {
+    if (!memoizedGetInstructionDecoder) {
+      memoizedGetInstructionDecoder = mapDecoder(
+        getStructDecoder([
+          ["programAddressIndex", getU8Decoder({ description: programAddressIndexDescription })],
+          [
+            "accountIndices",
+            getArrayDecoder(getU8Decoder({ description: accountIndexDescription }), {
+              description: accountIndicesDescription,
+              size: getShortU16Decoder()
+            })
+          ],
+          ["data", getBytesDecoder({ description: dataDescription, 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;
   var BASE_CONFIG = {
@@ -1564,8 +2008,8 @@ this.globalThis.solanaWeb3 = (function (exports) {
     fixedSize: null,
     maxSize: 1
   };
-  function deserialize(bytes3, offset = 0) {
-    const firstByte = bytes3[offset];
+  function decode(bytes, offset = 0) {
+    const firstByte = bytes[offset];
     if ((firstByte & VERSION_FLAG_MASK) === 0) {
       return ["legacy", offset];
     } else {
@@ -1573,7 +2017,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return [version, offset + 1];
     }
   }
-  function serialize(value) {
+  function encode(value) {
     if (value === "legacy") {
       return new Uint8Array();
     }
@@ -1582,95 +2026,215 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     return new Uint8Array([value | VERSION_FLAG_MASK]);
   }
-  function getTransactionVersionCodec() {
+  function getTransactionVersionDecoder() {
     return {
       ...BASE_CONFIG,
-      deserialize,
-      serialize
+      decode
     };
   }
-  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);
-    } else {
-      return mapSerializer(
-        struct([
-          ...getPreludeStructSerializerTuple(),
-          ["addressTableLookups", getAddressTableLookupsSerializer()]
-        ]),
-        (value) => {
-          if (value.version === "legacy") {
-            return value;
-          }
-          return {
-            ...value,
-            addressTableLookups: value.addressTableLookups ?? []
-          };
+  function getTransactionVersionEncoder() {
+    return {
+      ...BASE_CONFIG,
+      encode
+    };
+  }
+  var staticAccountsDescription = "A compact-array of static account addresses belonging to this transaction" ;
+  var lifetimeTokenDescription = "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" ;
+  var instructionsDescription = "A compact-array of instructions belonging to this transaction" ;
+  var addressTableLookupsDescription = "A compact array of address table lookups belonging to this transaction" ;
+  function getCompiledMessageLegacyEncoder() {
+    return getStructEncoder(getPreludeStructEncoderTuple());
+  }
+  function getCompiledMessageVersionedEncoder() {
+    return mapEncoder(
+      getStructEncoder([
+        ...getPreludeStructEncoderTuple(),
+        ["addressTableLookups", getAddressTableLookupArrayEncoder()]
+      ]),
+      (value) => {
+        if (value.version === "legacy") {
+          return value;
         }
-      ).serialize(compiledMessage);
-    }
+        return {
+          ...value,
+          addressTableLookups: value.addressTableLookups ?? []
+        };
+      }
+    );
   }
-  function getPreludeStructSerializerTuple() {
+  function getPreludeStructEncoderTuple() {
     return [
-      ["version", getTransactionVersionCodec()],
-      ["header", getMessageHeaderCodec()],
+      ["version", getTransactionVersionEncoder()],
+      ["header", getMessageHeaderEncoder()],
       [
         "staticAccounts",
-        array(getBase58EncodedAddressCodec(), {
-          description: "A compact-array of static account addresses belonging to this transaction" ,
-          size: shortU16()
+        getArrayEncoder(getAddressEncoder(), {
+          description: staticAccountsDescription,
+          size: getShortU16Encoder()
         })
       ],
       [
         "lifetimeToken",
-        string({
-          description: "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" ,
-          encoding: base58,
+        getStringEncoder({
+          description: lifetimeTokenDescription,
+          encoding: getBase58Encoder(),
           size: 32
         })
       ],
       [
         "instructions",
-        array(getInstructionCodec(), {
-          description: "A compact-array of instructions belonging to this transaction" ,
-          size: shortU16()
+        getArrayEncoder(getInstructionEncoder(), {
+          description: instructionsDescription,
+          size: getShortU16Encoder()
         })
       ]
     ];
   }
-  function getAddressTableLookupsSerializer() {
-    return array(getAddressTableLookupCodec(), {
-      ...{ description: "A compact array of address table lookups belonging to this transaction" } ,
-      size: shortU16()
+  function getPreludeStructDecoderTuple() {
+    return [
+      ["version", getTransactionVersionDecoder()],
+      ["header", getMessageHeaderDecoder()],
+      [
+        "staticAccounts",
+        getArrayDecoder(getAddressDecoder(), {
+          description: staticAccountsDescription,
+          size: getShortU16Decoder()
+        })
+      ],
+      [
+        "lifetimeToken",
+        getStringDecoder({
+          description: lifetimeTokenDescription,
+          encoding: getBase58Decoder(),
+          size: 32
+        })
+      ],
+      [
+        "instructions",
+        getArrayDecoder(getInstructionDecoder(), {
+          description: instructionsDescription,
+          size: getShortU16Decoder()
+        })
+      ],
+      ["addressTableLookups", getAddressTableLookupArrayDecoder()]
+    ];
+  }
+  function getAddressTableLookupArrayEncoder() {
+    return getArrayEncoder(getAddressTableLookupEncoder(), {
+      description: addressTableLookupsDescription,
+      size: getShortU16Encoder()
+    });
+  }
+  function getAddressTableLookupArrayDecoder() {
+    return getArrayDecoder(getAddressTableLookupDecoder(), {
+      description: addressTableLookupsDescription,
+      size: getShortU16Decoder()
     });
   }
+  var messageDescription = "The wire format of a Solana transaction message" ;
   function getCompiledMessageEncoder() {
     return {
-      ...BASE_CONFIG2,
-      deserialize: getUnimplementedDecoder("CompiledMessage"),
-      serialize: serialize2
+      description: messageDescription,
+      encode: (compiledMessage) => {
+        if (compiledMessage.version === "legacy") {
+          return getCompiledMessageLegacyEncoder().encode(compiledMessage);
+        } else {
+          return getCompiledMessageVersionedEncoder().encode(compiledMessage);
+        }
+      },
+      fixedSize: null,
+      maxSize: null
     };
   }
-  async function getCompiledMessageSignature(message, secretKey) {
-    const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
-    const signature = await signBytes(secretKey, wireMessageBytes);
-    return signature;
+  function getCompiledMessageDecoder() {
+    return mapDecoder(
+      getStructDecoder(getPreludeStructDecoderTuple(), {
+        description: messageDescription
+      }),
+      ({ addressTableLookups, ...restOfMessage }) => {
+        if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
+          return restOfMessage;
+        }
+        return { ...restOfMessage, addressTableLookups };
+      }
+    );
+  }
+  var signaturesDescription = "A compact array of 64-byte, base-64 encoded Ed25519 signatures" ;
+  var transactionDescription = "The wire format of a Solana transaction" ;
+  function getCompiledTransactionEncoder() {
+    return getStructEncoder(
+      [
+        [
+          "signatures",
+          getArrayEncoder(getBytesEncoder({ size: 64 }), {
+            description: signaturesDescription,
+            size: getShortU16Encoder()
+          })
+        ],
+        ["compiledMessage", getCompiledMessageEncoder()]
+      ],
+      {
+        description: transactionDescription
+      }
+    );
+  }
+  function getSignatureDecoder() {
+    return mapDecoder(getBytesDecoder({ size: 64 }), (bytes) => bytes);
+  }
+  function getCompiledTransactionDecoder() {
+    return getStructDecoder(
+      [
+        [
+          "signatures",
+          getArrayDecoder(getSignatureDecoder(), {
+            description: signaturesDescription,
+            size: getShortU16Decoder()
+          })
+        ],
+        ["compiledMessage", getCompiledMessageDecoder()]
+      ],
+      {
+        description: transactionDescription
+      }
+    );
+  }
+  function getTransactionEncoder() {
+    return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
+  }
+  function getTransactionDecoder(lastValidBlockHeight) {
+    return mapDecoder(
+      getCompiledTransactionDecoder(),
+      (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+    );
+  }
+  function getTransactionCodec(lastValidBlockHeight) {
+    return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
+  }
+  var base58Decoder;
+  function getSignatureFromTransaction(transaction) {
+    if (!base58Decoder)
+      base58Decoder = getBase58Decoder();
+    const signatureBytes = transaction.signatures[transaction.feePayer];
+    if (!signatureBytes) {
+      throw new Error(
+        "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
+      );
+    }
+    const transactionSignature = base58Decoder.decode(signatureBytes)[0];
+    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
@@ -1678,52 +2242,192 @@ 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) => i.accounts?.filter((a) => isSignerRole2(a.role)) ?? []).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 btoa(String.fromCharCode(...wireTransactionBytes));
     }
-    return {
-      compiledMessage,
-      signatures
+  }
+
+  // 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?.throwIfAborted();
+    const abortController = new AbortController();
+    if (callerAbortSignal) {
+      const handleAbort = () => {
+        abortController.abort();
+      };
+      callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
+    }
+    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();
+      }
     };
   }
-  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);
+
+  // 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)
+      );
+    });
   }
-  function getTransactionEncoder() {
-    return {
-      ...BASE_CONFIG3,
-      deserialize: getUnimplementedDecoder("CompiledMessage"),
-      serialize: serialize3
+
+  // src/airdrop-confirmer.ts
+  function createDefaultSignatureOnlyRecentTransactionConfirmer({
+    rpc,
+    rpcSubscriptions
+  }) {
+    const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
+      rpc,
+      rpcSubscriptions
+    );
+    return async function confirmSignatureOnlyRecentTransaction(config) {
+      await waitForRecentTransactionConfirmationUntilTimeout({
+        ...config,
+        getRecentSignatureConfirmationPromise,
+        getTimeoutPromise
+      });
     };
   }
-  function getBase64EncodedWireTransaction(transaction) {
-    const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
-    {
-      return btoa(String.fromCharCode(...wireTransactionBytes));
-    }
+  async function waitForRecentTransactionConfirmationUntilTimeout(config) {
+    await raceStrategies(
+      config.signature,
+      config,
+      function getSpecificStrategiesForRace({ abortSignal, commitment, getTimeoutPromise: getTimeoutPromise2 }) {
+        return [
+          getTimeoutPromise2({
+            abortSignal,
+            commitment
+          })
+        ];
+      }
+    );
+  }
+
+  // src/airdrop.ts
+  function createDefaultAirdropRequester({ rpc, rpcSubscriptions }) {
+    const confirmSignatureOnlyTransaction = createDefaultSignatureOnlyRecentTransactionConfirmer({
+      rpc,
+      rpcSubscriptions
+    });
+    return async function requestAirdrop(config) {
+      return await requestAndConfirmAirdrop({
+        ...config,
+        confirmSignatureOnlyTransaction,
+        rpc
+      });
+    };
+  }
+  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
@@ -1757,68 +2461,215 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return visitNode(params, [], onIntegerOverflow);
   }
   var KEYPATH_WILDCARD = {};
+  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 = {};
+      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"]
+        ],
+        programNotifications: jsonParsedAccountsConfigs.flatMap((c) => [
+          ["value", KEYPATH_WILDCARD, "account", ...c],
+          [KEYPATH_WILDCARD, "account", ...c]
+        ])
+      };
     }
     return memoizedNotificationKeypaths;
   }
   function getAllowedNumericKeypathsForResponse() {
     if (!memoizedResponseKeypaths) {
-      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"
-        ],
-        ["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"]
-      ];
       memoizedResponseKeypaths = {
         getAccountInfo: jsonParsedAccountsConfigs.map((c) => ["value", ...c]),
         getBlock: [
@@ -2083,6 +2934,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
       }
     });
   }
+  function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
+    return createSolanaRpcSubscriptionsApi(config);
+  }
 
   // ../rpc-transport/dist/index.browser.js
   init_env_shim();
@@ -2149,20 +3003,21 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function createJsonRpc(rpcConfig) {
     return makeProxy(rpcConfig);
   }
-  function registerIterableFatal(iterable, catchFn) {
+  function registerIterableCleanup(iterable, cleanupFn) {
     (async () => {
       try {
         for await (const _ of iterable)
           ;
-      } catch (e3) {
-        catchFn(e3);
+      } catch {
+      } finally {
+        cleanupFn();
       }
     })();
   }
   function createPendingRpcSubscription(rpcConfig, { params, subscribeMethodName, unsubscribeMethodName, responseProcessor }) {
     return {
-      async subscribe(options) {
-        options?.abortSignal?.throwIfAborted();
+      async subscribe({ abortSignal }) {
+        abortSignal.throwIfAborted();
         let subscriptionId;
         function handleCleanup() {
           if (subscriptionId !== void 0) {
@@ -2174,17 +3029,17 @@ this.globalThis.solanaWeb3 = (function (exports) {
             connectionAbortController.abort();
           }
         }
-        options?.abortSignal?.addEventListener("abort", handleCleanup);
+        abortSignal.addEventListener("abort", handleCleanup);
         const connectionAbortController = new AbortController();
         const subscribeMessage = createJsonRpcMessage(subscribeMethodName, params);
         const connection = await rpcConfig.transport({
           payload: subscribeMessage,
           signal: connectionAbortController.signal
         });
-        function handleConnectionFatal() {
-          options?.abortSignal?.removeEventListener("abort", handleCleanup);
+        function handleConnectionCleanup() {
+          abortSignal.removeEventListener("abort", handleCleanup);
         }
-        registerIterableFatal(connection, handleConnectionFatal);
+        registerIterableCleanup(connection, handleConnectionCleanup);
         for await (const message of connection) {
           if ("id" in message && message.id === subscribeMessage.id) {
             if ("error" in message) {
@@ -2242,7 +3097,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   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}`);
@@ -2301,16 +3156,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,
@@ -2318,7 +3167,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }) {
       const body = JSON.stringify(payload);
       const requestInfo = {
-        agent,
         body,
         headers: {
           ...customHeaders,
@@ -2330,7 +3178,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,
@@ -2340,7 +3188,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return await response.json();
     };
   }
-  var e2 = globalThis.WebSocket;
+  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,
@@ -2349,8 +3200,19 @@ this.globalThis.solanaWeb3 = (function (exports) {
     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() {
-        if (webSocket.readyState !== e2.CLOSED && webSocket.readyState !== e2.CLOSING) {
+        errorAndClearAllIteratorStates(EXPLICIT_ABORT_TOKEN);
+        if (webSocket.readyState !== e22.CLOSED && webSocket.readyState !== e22.CLOSING) {
           webSocket.close(1e3);
         }
       }
@@ -2361,15 +3223,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         webSocket.removeEventListener("error", handleError);
         webSocket.removeEventListener("open", handleOpen);
         webSocket.removeEventListener("message", handleMessage);
-        iteratorState.forEach((state, iteratorKey) => {
-          if (state.__hasPolled) {
-            const { onError } = state;
-            iteratorState.delete(iteratorKey);
-            onError(ev);
-          } else {
-            iteratorState.delete(iteratorKey);
-          }
-        });
+        errorAndClearAllIteratorStates(ev);
       }
       function handleError(ev) {
         if (!hasConnected) {
@@ -2386,11 +3240,11 @@ this.globalThis.solanaWeb3 = (function (exports) {
         resolve({
           async send(payload) {
             const message = JSON.stringify(payload);
-            if (!bufferDrainWatcher && webSocket.readyState === e2.OPEN && webSocket.bufferedAmount > sendBufferHighWatermark) {
+            if (!bufferDrainWatcher && webSocket.readyState === e22.OPEN && webSocket.bufferedAmount > sendBufferHighWatermark) {
               let onCancel;
               const promise = new Promise((resolve2, reject2) => {
                 const intervalId = setInterval(() => {
-                  if (webSocket.readyState !== e2.OPEN || !(webSocket.bufferedAmount > sendBufferHighWatermark)) {
+                  if (webSocket.readyState !== e22.OPEN || !(webSocket.bufferedAmount > sendBufferHighWatermark)) {
                     clearInterval(intervalId);
                     bufferDrainWatcher = void 0;
                     resolve2();
@@ -2437,15 +3291,15 @@ this.globalThis.solanaWeb3 = (function (exports) {
                   yield* queuedMessages;
                 } else {
                   try {
-                    yield await new Promise((onMessage, onError) => {
+                    yield await new Promise((resolve2, reject2) => {
                       iteratorState.set(iteratorKey, {
                         __hasPolled: true,
-                        onError,
-                        onMessage
+                        onError: reject2,
+                        onMessage: resolve2
                       });
                     });
                   } catch (e3) {
-                    if (e3 !== null && typeof e3 === "object" && "type" in e3 && e3.type === "close" && "wasClean" in e3 && e3.wasClean) {
+                    if (e3 === EXPLICIT_ABORT_TOKEN) {
                       return;
                     } else {
                       throw new Error("WebSocket connection closed", { cause: e3 });
@@ -2471,7 +3325,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
           }
         });
       }
-      const webSocket = new e2(url);
+      const webSocket = new e22(url);
       webSocket.addEventListener("close", handleClose);
       webSocket.addEventListener("error", handleError);
       webSocket.addEventListener("open", handleOpen);
@@ -2501,6 +3355,9 @@ this.globalThis.solanaWeb3 = (function (exports) {
     };
   }
 
+  // src/rpc.ts
+  var import_fast_stable_stringify = __toESM(require_fast_stable_stringify(), 1);
+
   // src/rpc-default-config.ts
   init_env_shim();
 
@@ -2541,6 +3398,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?.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({
@@ -2549,9 +3597,21 @@ this.globalThis.solanaWeb3 = (function (exports) {
     });
   }
   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(DEFAULT_RPC_CONFIG)
+      api: createSolanaRpcSubscriptionsApi_UNSTABLE(DEFAULT_RPC_CONFIG)
     });
   }
 
@@ -2613,14 +3673,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
@@ -2632,7 +3693,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return out;
   }
   function createDefaultRpcTransport(config) {
-    return getRpcTransportWithRequestCoalescing(
+    return pipe(
       createHttpTransport({
         ...config,
         headers: {
@@ -2643,7 +3704,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
           }
         }
       }),
-      getSolanaRpcPayloadDeduplicationKey
+      (transport) => getRpcTransportWithRequestCoalescing(transport, getSolanaRpcPayloadDeduplicationKey)
     );
   }
 
@@ -2661,11 +3722,12 @@ this.globalThis.solanaWeb3 = (function (exports) {
     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(() => {
-          connection.send_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(PING_PAYLOAD);
-        }, intervalMs);
+        intervalId = setInterval(sendPing, intervalMs);
       }
       if (pingableConnections.has(connection) === false) {
         pingableConnections.set(connection, {
@@ -2684,58 +3746,425 @@ this.globalThis.solanaWeb3 = (function (exports) {
           } finally {
             pingableConnections.delete(connection);
             clearInterval(intervalId);
+            if (handleOffline) {
+              globalThis.window.removeEventListener("offline", handleOffline);
+            }
+            if (handleOnline) {
+              globalThis.window.removeEventListener("online", handleOnline);
+            }
           }
         })();
-        restartPingTimer();
+        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?.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) {
-    const { intervalMs, ...rest } = config;
-    return getWebSocketTransportWithAutoping({
-      intervalMs: intervalMs ?? 5e3,
-      transport: createWebSocketTransport({
+    const { getShard, intervalMs, ...rest } = config;
+    return pipe(
+      createWebSocketTransport({
         ...rest,
         sendBufferHighWatermark: config.sendBufferHighWatermark ?? // Let 128KB of data into the WebSocket buffer before buffering it in the app.
         131072
+      }),
+      (transport) => getWebSocketTransportWithAutoping({
+        intervalMs: intervalMs ?? 5e3,
+        transport
+      }),
+      (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)[0];
+      }
+      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?.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.assertIsUnixTimestamp = assertIsUnixTimestamp;
+  exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
+  exports.commitmentComparator = commitmentComparator;
   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.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.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;