@solana/addresses 2.0.0-experimental.f57da91 → 2.0.0-experimental.f7d1af1

package/dist/index.development.js

@@ -2,19 +2,30 @@ this.globalThis = this.globalThis || {};
 this.globalThis.solanaWeb3 = (function (exports) {
   'use strict';
 
-  var __defProp = Object.defineProperty;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-core@0.8.9/node_modules/@metaplex-foundation/umi-serializers-core/dist/esm/bytes.mjs
-  var mergeBytes = (bytesArr) => {
-    const totalLength = bytesArr.reduce((total, arr) => total + arr.length, 0);
+  // ../codecs-core/dist/index.browser.js
+  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;
     });
@@ -27,69 +38,157 @@ this.globalThis.solanaWeb3 = (function (exports) {
     paddedBytes.set(bytes);
     return paddedBytes;
   };
-  var fixBytes = (bytes, length) => padBytes(bytes.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
-  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}].`
+      );
+    }
+    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
-  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];
       }
     };
   }
+  function mapEncoder(encoder, unmap) {
+    return {
+      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/errors.mjs
-  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;
+  // ../codecs-numbers/dist/index.browser.js
+  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}.`
+      );
     }
-  };
+  }
+  function sharedNumberFactory(input) {
+    let littleEndian;
+    let defaultDescription = input.name;
+    if (input.size > 1) {
+      littleEndian = !("endian" in input.options) || input.options.endian === 0;
+      defaultDescription += littleEndian ? "(le)" : "(be)";
+    }
+    return {
+      description: input.options.description ?? defaultDescription,
+      fixedSize: input.size,
+      littleEndian,
+      maxSize: input.size
+    };
+  }
+  function numberEncoderFactory(input) {
+    const codecData = sharedNumberFactory(input);
+    return {
+      description: codecData.description,
+      encode(value) {
+        if (input.range) {
+          assertNumberIsBetweenForCodec(input.name, input.range[0], input.range[1], value);
+        }
+        const arrayBuffer = new ArrayBuffer(input.size);
+        input.set(new DataView(arrayBuffer), value, codecData.littleEndian);
+        return new Uint8Array(arrayBuffer);
+      },
+      fixedSize: codecData.fixedSize,
+      maxSize: codecData.maxSize
+    };
+  }
+  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 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
+  });
 
-  // ../../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;
+  // ../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}`,
-      fixedSize: null,
-      maxSize: null,
-      serialize(value) {
-        if (!value.match(new RegExp(`^[${alphabet}]*$`))) {
-          throw new InvalidBaseStringError(value, base);
-        }
+      encode(value) {
+        assertValidBaseString(alphabet4, value);
         if (value === "")
           return new Uint8Array();
         const chars = [...value];
-        let trailIndex = chars.findIndex((c) => c !== alphabet[0]);
+        let trailIndex = chars.findIndex((c) => c !== alphabet4[0]);
         trailIndex = trailIndex === -1 ? chars.length : trailIndex;
         const leadingZeroes = Array(trailIndex).fill(0);
         if (trailIndex === chars.length)
@@ -98,7 +197,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         let base10Number = 0n;
         let baseXPower = 1n;
         for (let i = tailChars.length - 1; i >= 0; i -= 1) {
-          base10Number += baseXPower * BigInt(alphabet.indexOf(tailChars[i]));
+          base10Number += baseXPower * BigInt(alphabet4.indexOf(tailChars[i]));
           baseXPower *= baseBigInt;
         }
         const tailBytes = [];
@@ -108,211 +207,192 @@ this.globalThis.solanaWeb3 = (function (exports) {
         }
         return Uint8Array.from(leadingZeroes.concat(tailBytes));
       },
-      deserialize(buffer, offset = 0) {
-        if (buffer.length === 0)
+      fixedSize: null,
+      maxSize: null
+    };
+  };
+  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];
-        const bytes = buffer.slice(offset);
         let trailIndex = bytes.findIndex((n) => n !== 0);
         trailIndex = trailIndex === -1 ? bytes.length : trailIndex;
-        const leadingZeroes = alphabet[0].repeat(trailIndex);
+        const leadingZeroes = alphabet4[0].repeat(trailIndex);
         if (trailIndex === bytes.length)
-          return [leadingZeroes, buffer.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(alphabet[Number(base10Number % baseBigInt)]);
+          tailChars.unshift(alphabet4[Number(base10Number % baseBigInt)]);
           base10Number /= baseBigInt;
         }
-        return [leadingZeroes + tailChars.join(""), buffer.length];
-      }
+        return [leadingZeroes + tailChars.join(""), rawBytes.length];
+      },
+      description: `base${base}`,
+      fixedSize: null,
+      maxSize: null
     };
   };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.9/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base58.mjs
-  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
+  var alphabet2 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+  var getBase58Encoder = () => getBaseXEncoder(alphabet2);
+  var getBase58Decoder = () => getBaseXDecoder(alphabet2);
   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
-  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/common.mjs
-  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
-  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");
-    }
+  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
+    };
   };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.9/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/utils.mjs
-  function numberFactory(input) {
-    let littleEndian;
-    let defaultDescription = input.name;
-    if (input.size > 1) {
-      littleEndian = !("endian" in input.options) || input.options.endian === Endian.Little;
-      defaultDescription += littleEndian ? "(le)" : "(be)";
-    }
+  var getUtf8Decoder = () => {
+    let textDecoder;
     return {
-      description: input.options.description ?? defaultDescription,
-      fixedSize: input.size,
-      maxSize: input.size,
-      serialize(value) {
-        if (input.range) {
-          assertRange(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);
+      decode(bytes, offset = 0) {
+        const value = (textDecoder || (textDecoder = new e())).decode(bytes.slice(offset));
+        return [removeNullCharacters(value), bytes.length];
       },
-      deserialize(bytes, offset = 0) {
-        const slice = bytes.slice(offset, offset + input.size);
-        assertEnoughBytes("i8", slice, input.size);
-        const view = toDataView(slice);
-        return [input.get(view, littleEndian), offset + input.size];
-      }
+      description: "utf8",
+      fixedSize: null,
+      maxSize: null
     };
-  }
-  var toArrayBuffer = (array) => array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset);
-  var toDataView = (array) => new DataView(toArrayBuffer(array));
-  var assertRange = (serializer, min, max, value) => {
-    if (value < min || value > max) {
-      throw new NumberOutOfRangeError(serializer, min, max, value);
-    }
   };
-  var assertEnoughBytes = (serializer, bytes, expected) => {
-    if (bytes.length === 0) {
-      throw new DeserializingEmptyBufferError(serializer);
-    }
-    if (bytes.length < expected) {
-      throw new NotEnoughBytesError(serializer, expected, bytes.length);
-    }
-  };
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-numbers@0.8.9/node_modules/@metaplex-foundation/umi-serializers-numbers/dist/esm/u32.mjs
-  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@0.8.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/utils.mjs
-  function getSizeDescription(size) {
-    return typeof size === "object" ? size.description : `${size}`;
-  }
-
-  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers@0.8.9/node_modules/@metaplex-foundation/umi-serializers/dist/esm/string.mjs
-  function string(options = {}) {
-    const size = options.size ?? u32();
-    const encoding = options.encoding ?? utf8;
+  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
-      };
+      return { ...encoding, description };
     }
     if (typeof size === "number") {
-      return fixSerializer(encoding, size, description);
+      return fixEncoder(encoding, size, description);
     }
     return {
       description,
-      fixedSize: null,
-      maxSize: null,
-      serialize: (value) => {
-        const contentBytes = encoding.serialize(value);
-        const lengthBytes = size.serialize(contentBytes.length);
+      encode: (value) => {
+        const contentBytes = encoding.encode(value);
+        const lengthBytes = size.encode(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);
+      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 (typeof size === "number") {
+      return fixDecoder(encoding, size, description);
+    }
+    return {
+      decode: (bytes, offset = 0) => {
+        assertByteArrayIsNotEmptyForCodec("string", bytes, offset);
+        const [lengthBigInt, lengthOffset] = size.decode(bytes, offset);
         const length = Number(lengthBigInt);
         offset = lengthOffset;
-        const contentBuffer = buffer.slice(offset, offset + length);
-        if (contentBuffer.length < length) {
-          throw new NotEnoughBytesError("string", length, contentBuffer.length);
-        }
-        const [value, contentOffset] = encoding.deserialize(contentBuffer);
+        const contentBytes = bytes.slice(offset, offset + length);
+        assertByteArrayHasEnoughBytesForCodec("string", length, contentBytes);
+        const [value, contentOffset] = encoding.decode(contentBytes);
         offset += contentOffset;
         return [value, offset];
-      }
+      },
+      description,
+      fixedSize: null,
+      maxSize: null
     };
+  };
+  function getSizeDescription(size) {
+    return typeof size === "object" ? size.description : `${size}`;
   }
 
   // src/address.ts
-  function isAddress(putativeBase58EncodedAddress) {
+  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)
-      putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
-      putativeBase58EncodedAddress.length > 44
+      putativeAddress.length < 32 || // Highest address (32 bytes of 255)
+      putativeAddress.length > 44
     ) {
       return false;
     }
-    const bytes = base58.serialize(putativeBase58EncodedAddress);
+    const base58Encoder = getMemoizedBase58Encoder();
+    const bytes = base58Encoder.encode(putativeAddress);
     const numBytes = bytes.byteLength;
     if (numBytes !== 32) {
       return false;
     }
     return true;
   }
-  function assertIsAddress(putativeBase58EncodedAddress) {
+  function assertIsAddress(putativeAddress) {
     try {
       if (
         // Lowest address (32 bytes of zeroes)
-        putativeBase58EncodedAddress.length < 32 || // Highest address (32 bytes of 255)
-        putativeBase58EncodedAddress.length > 44
+        putativeAddress.length < 32 || // Highest address (32 bytes of 255)
+        putativeAddress.length > 44
       ) {
         throw new Error("Expected input string to decode to a byte array of length 32.");
       }
-      const bytes = base58.serialize(putativeBase58EncodedAddress);
+      const base58Encoder = getMemoizedBase58Encoder();
+      const bytes = base58Encoder.encode(putativeAddress);
       const numBytes = bytes.byteLength;
       if (numBytes !== 32) {
         throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
       }
-    } catch (e) {
-      throw new Error(`\`${putativeBase58EncodedAddress}\` is not a base-58 encoded address`, {
-        cause: e
+    } catch (e2) {
+      throw new Error(`\`${putativeAddress}\` is not a base-58 encoded address`, {
+        cause: e2
       });
     }
   }
-  function address(putativeBase58EncodedAddress) {
-    assertIsAddress(putativeBase58EncodedAddress);
-    return putativeBase58EncodedAddress;
+  function address(putativeAddress) {
+    assertIsAddress(putativeAddress);
+    return putativeAddress;
   }
-  function getAddressCodec(config) {
-    return string({
-      description: config?.description ?? ("A 32-byte account address" ),
-      encoding: base58,
+  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 getAddressCodec(config) {
+    return combineCodec(getAddressEncoder(config), getAddressDecoder(config));
+  }
   function getAddressComparator() {
     return new Intl.Collator("en", {
       caseFirst: "lower",
@@ -443,7 +523,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
     const validFormat = Array.isArray(value) && value.length === 2 && typeof value[0] === "string" && typeof value[1] === "number";
     if (!validFormat) {
       throw new Error(
-        `Expected given program derived address to have the following format: [Base58EncodedAddress, ProgramDerivedAddressBump].`
+        `Expected given program derived address to have the following format: [Address, ProgramDerivedAddressBump].`
       );
     }
     if (value[1] < 0 || value[1] > 255) {
@@ -479,10 +559,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   ];
   var PointOnCurveError = class extends Error {
   };
-  async function createProgramDerivedAddress({
-    programAddress,
-    seeds
-  }) {
+  async function createProgramDerivedAddress({ programAddress, seeds }) {
     await assertDigestCapabilityIsAvailable();
     if (seeds.length > MAX_SEEDS) {
       throw new Error(`A maximum of ${MAX_SEEDS} seeds may be supplied when creating an address`);
@@ -497,7 +574,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return acc;
     }, []);
     const base58EncodedAddressCodec = getAddressCodec();
-    const programAddressBytes = base58EncodedAddressCodec.serialize(programAddress);
+    const programAddressBytes = base58EncodedAddressCodec.encode(programAddress);
     const addressBytesBuffer = await crypto.subtle.digest(
       "SHA-256",
       new Uint8Array([...seedBytes, ...programAddressBytes, ...PDA_MARKER_BYTES])
@@ -506,7 +583,7 @@ 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,
@@ -520,36 +597,32 @@ this.globalThis.solanaWeb3 = (function (exports) {
           seeds: [...seeds, new Uint8Array([bumpSeed])]
         });
         return [address2, bumpSeed];
-      } catch (e) {
-        if (e instanceof PointOnCurveError) {
+      } catch (e2) {
+        if (e2 instanceof PointOnCurveError) {
           bumpSeed--;
         } else {
-          throw e;
+          throw e2;
         }
       }
     }
     throw new Error("Unable to find a viable program address bump seed");
   }
-  async function createAddressWithSeed({
-    baseAddress,
-    programAddress,
-    seed
-  }) {
-    const { serialize, deserialize } = getAddressCodec();
+  async function createAddressWithSeed({ baseAddress, programAddress, seed }) {
+    const { encode, decode } = getAddressCodec();
     const seedBytes = typeof seed === "string" ? new TextEncoder().encode(seed) : seed;
     if (seedBytes.byteLength > MAX_SEED_LENGTH) {
       throw new Error(`The seed exceeds the maximum length of 32 bytes`);
     }
-    const programAddressBytes = serialize(programAddress);
+    const programAddressBytes = encode(programAddress);
     if (programAddressBytes.length >= PDA_MARKER_BYTES.length && programAddressBytes.slice(-PDA_MARKER_BYTES.length).every((byte, index) => byte === PDA_MARKER_BYTES[index])) {
       throw new Error(`programAddress cannot end with the PDA marker`);
     }
     const addressBytesBuffer = await crypto.subtle.digest(
       "SHA-256",
-      new Uint8Array([...serialize(baseAddress), ...seedBytes, ...programAddressBytes])
+      new Uint8Array([...encode(baseAddress), ...seedBytes, ...programAddressBytes])
     );
     const addressBytes = new Uint8Array(addressBytesBuffer);
-    return deserialize(addressBytes)[0];
+    return decode(addressBytes)[0];
   }
 
   // src/public-key.ts
@@ -559,7 +632,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] = getAddressCodec().deserialize(new Uint8Array(publicKeyBytes));
+    const [base58EncodedAddress] = getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
     return base58EncodedAddress;
   }
 
@@ -569,6 +642,8 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.createAddressWithSeed = createAddressWithSeed;
   exports.getAddressCodec = getAddressCodec;
   exports.getAddressComparator = getAddressComparator;
+  exports.getAddressDecoder = getAddressDecoder;
+  exports.getAddressEncoder = getAddressEncoder;
   exports.getAddressFromPublicKey = getAddressFromPublicKey;
   exports.getProgramDerivedAddress = getProgramDerivedAddress;
   exports.isAddress = isAddress;