@solana/keys 2.0.0-experimental.021b83f → 2.0.0-experimental.02a66ef

package/README.md

@@ -0,0 +1,52 @@
+[![npm][npm-image]][npm-url]
+[![npm-downloads][npm-downloads-image]][npm-url]
+[![semantic-release][semantic-release-image]][semantic-release-url]
+<br />
+[![code-style-prettier][code-style-prettier-image]][code-style-prettier-url]
+
+[code-style-prettier-image]: https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square
+[code-style-prettier-url]: https://github.com/prettier/prettier
+[npm-downloads-image]: https://img.shields.io/npm/dm/@solana/keys/experimental.svg?style=flat
+[npm-image]: https://img.shields.io/npm/v/@solana/keys/experimental.svg?style=flat
+[npm-url]: https://www.npmjs.com/package/@solana/keys/v/experimental
+[semantic-release-image]: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
+[semantic-release-url]: https://github.com/semantic-release/semantic-release
+
+# @solana/keys
+
+This package contains utilities for validating, generating, and manipulating addresses and key material. It can be used standalone, but it is also exported as part of the Solana JavaScript SDK [`@solana/web3.js@experimental`](https://github.com/solana-labs/solana-web3.js/tree/master/packages/library).
+
+## Types
+
+### `Base58EncodedAddress`
+
+This type represents a string that validates as a Solana address or public key. Functions that require well-formed addresses should specify their inputs in terms of this type.
+
+Whenever you need to validate an arbitrary string as a base58-encoded address, use the `assertIsBase58EncodedAddress()` function in this package.
+
+## Functions
+
+### `assertIsBase58EncodedAddress()`
+
+Client applications primarily deal with addresses and public keys in the form of base58-encoded strings. Addresses and public keys returned from the RPC API conform to the type `Base58EncodedAddress`. You can use a value of that type wherever a base58-encoded address or key is expected.
+
+From time to time you might acquire a string, that you expect to validate as an address, from an untrusted network API or user input. To assert that such an arbitrary string is a base58-encoded address, use the `assertIsBase58EncodedAddress` function.
+
+```ts
+import { assertIsBase58EncodedAddress } from '@solana/web3.js`;
+
+// Imagine a function that fetches an account's balance when a user submits a form.
+function handleSubmit() {
+    // We know only that what the user typed conforms to the `string` type.
+    const address: string = accountAddressInput.value;
+    try {
+        // If this type assertion function doesn't throw, then
+        // Typescript will upcast `address` to `Base58EncodedAddress`.
+        assertIsBase58EncodedAddress(address);
+        // At this point, `address` is a `Base58EncodedAddress` that can be used with the RPC.
+        const balanceInLamports = await rpc.getBalance(address).send();
+    } catch (e) {
+        // `address` turned out not to be a base58-encoded address
+    }
+}
+```

package/dist/index.browser.cjs

@@ -1,10 +1,6 @@
 'use strict';
 
-var bs58 = require('bs58');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var bs58__default = /*#__PURE__*/_interopDefault(bs58);
+var umiSerializersEncodings = require('@metaplex-foundation/umi-serializers-encodings');
 
 // src/base58.ts
 function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
@@ -16,7 +12,7 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes = bs58__default.default.decode(putativeBase58EncodedAddress);
+    const bytes = umiSerializersEncodings.base58.serialize(putativeBase58EncodedAddress);
     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}`);
@@ -27,7 +23,18 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     });
   }
 }
+function getBase58EncodedAddressComparator() {
+  return new Intl.Collator("en", {
+    caseFirst: "lower",
+    ignorePunctuation: false,
+    localeMatcher: "best fit",
+    numeric: false,
+    sensitivity: "variant",
+    usage: "sort"
+  }).compare;
+}
 
 exports.assertIsBase58EncodedAddress = assertIsBase58EncodedAddress;
+exports.getBase58EncodedAddressComparator = getBase58EncodedAddressComparator;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.cjs.map

package/dist/index.browser.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU;AAIV,SAAS,6BACZ,8BAC4D;AAC5D,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,KAAK,OAAO,4BAA4B;AACtD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ","sourcesContent":["import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,SAAS,cAAc;AAMhB,SAAS,6BACZ,8BACiG;AACjG,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,OAAO,UAAU,4BAA4B;AAC3D,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,oCAAsE;AAClF,SAAO,IAAI,KAAK,SAAS,MAAM;AAAA,IAC3B,WAAW;AAAA,IACX,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,SAAS;AAAA,IACT,aAAa;AAAA,IACb,OAAO;AAAA,EACX,CAAC,EAAE;AACP","sourcesContent":["import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.browser.js

@@ -1,4 +1,4 @@
-import bs58 from 'bs58';
+import { base58 } from '@metaplex-foundation/umi-serializers-encodings';
 
 // src/base58.ts
 function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
@@ -10,7 +10,7 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes = bs58.decode(putativeBase58EncodedAddress);
+    const bytes = base58.serialize(putativeBase58EncodedAddress);
     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}`);
@@ -21,7 +21,17 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     });
   }
 }
+function getBase58EncodedAddressComparator() {
+  return new Intl.Collator("en", {
+    caseFirst: "lower",
+    ignorePunctuation: false,
+    localeMatcher: "best fit",
+    numeric: false,
+    sensitivity: "variant",
+    usage: "sort"
+  }).compare;
+}
 
-export { assertIsBase58EncodedAddress };
+export { assertIsBase58EncodedAddress, getBase58EncodedAddressComparator };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map

package/dist/index.browser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU;AAIV,SAAS,6BACZ,8BAC4D;AAC5D,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,KAAK,OAAO,4BAA4B;AACtD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ","sourcesContent":["import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,SAAS,cAAc;AAMhB,SAAS,6BACZ,8BACiG;AACjG,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,OAAO,UAAU,4BAA4B;AAC3D,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,oCAAsE;AAClF,SAAO,IAAI,KAAK,SAAS,MAAM;AAAA,IAC3B,WAAW;AAAA,IACX,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,SAAS;AAAA,IACT,aAAa;AAAA,IACb,OAAO;AAAA,EACX,CAAC,EAAE;AACP","sourcesContent":["import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.development.js

@@ -2,188 +2,81 @@ this.globalThis = this.globalThis || {};
 this.globalThis.solanaWeb3 = (function (exports) {
   'use strict';
 
-  var __create = Object.create;
   var __defProp = Object.defineProperty;
-  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-  var __getOwnPropNames = Object.getOwnPropertyNames;
-  var __getProtoOf = Object.getPrototypeOf;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __esm = (fn, res) => function __init() {
-    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  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;
   };
-  var __commonJS = (cb, mod) => function __require() {
-    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-  };
-  var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from === "object" || typeof from === "function") {
-      for (let key of __getOwnPropNames(from))
-        if (!__hasOwnProp.call(to, key) && key !== except)
-          __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-    }
-    return to;
-  };
-  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-    // If the importer is in node compatibility mode or this is not an ESM
-    // file that has been converted to a CommonJS file using a Babel-
-    // compatible transform (i.e. "__esModule" has not been set), then set
-    // "default" to the CommonJS "module.exports" for node compatibility.
-    isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-    mod
-  ));
 
-  // ../build-scripts/env-shim.ts
-  var init_env_shim = __esm({
-    "../build-scripts/env-shim.ts"() {
+  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/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;
     }
-  });
+  };
 
-  // ../../node_modules/.pnpm/base-x@4.0.0/node_modules/base-x/src/index.js
-  var require_src = __commonJS({
-    "../../node_modules/.pnpm/base-x@4.0.0/node_modules/base-x/src/index.js"(exports, module) {
-      init_env_shim();
-      function base(ALPHABET) {
-        if (ALPHABET.length >= 255) {
-          throw new TypeError("Alphabet too long");
-        }
-        var BASE_MAP = new Uint8Array(256);
-        for (var j = 0; j < BASE_MAP.length; j++) {
-          BASE_MAP[j] = 255;
-        }
-        for (var i = 0; i < ALPHABET.length; i++) {
-          var x = ALPHABET.charAt(i);
-          var xc = x.charCodeAt(0);
-          if (BASE_MAP[xc] !== 255) {
-            throw new TypeError(x + " is ambiguous");
-          }
-          BASE_MAP[xc] = i;
+  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/baseX.mjs
+  var baseX = (alphabet) => {
+    const base = alphabet.length;
+    const baseBigInt = BigInt(base);
+    return {
+      description: `base${base}`,
+      fixedSize: null,
+      maxSize: null,
+      serialize(value) {
+        if (!value.match(new RegExp(`^[${alphabet}]*$`))) {
+          throw new InvalidBaseStringError(value, base);
         }
-        var BASE = ALPHABET.length;
-        var LEADER = ALPHABET.charAt(0);
-        var FACTOR = Math.log(BASE) / Math.log(256);
-        var iFACTOR = Math.log(256) / Math.log(BASE);
-        function encode(source) {
-          if (source instanceof Uint8Array) ; else if (ArrayBuffer.isView(source)) {
-            source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
-          } else if (Array.isArray(source)) {
-            source = Uint8Array.from(source);
-          }
-          if (!(source instanceof Uint8Array)) {
-            throw new TypeError("Expected Uint8Array");
-          }
-          if (source.length === 0) {
-            return "";
-          }
-          var zeroes = 0;
-          var length = 0;
-          var pbegin = 0;
-          var pend = source.length;
-          while (pbegin !== pend && source[pbegin] === 0) {
-            pbegin++;
-            zeroes++;
-          }
-          var size = (pend - pbegin) * iFACTOR + 1 >>> 0;
-          var b58 = new Uint8Array(size);
-          while (pbegin !== pend) {
-            var carry = source[pbegin];
-            var i2 = 0;
-            for (var it1 = size - 1; (carry !== 0 || i2 < length) && it1 !== -1; it1--, i2++) {
-              carry += 256 * b58[it1] >>> 0;
-              b58[it1] = carry % BASE >>> 0;
-              carry = carry / BASE >>> 0;
-            }
-            if (carry !== 0) {
-              throw new Error("Non-zero carry");
-            }
-            length = i2;
-            pbegin++;
-          }
-          var it2 = size - length;
-          while (it2 !== size && b58[it2] === 0) {
-            it2++;
-          }
-          var str = LEADER.repeat(zeroes);
-          for (; it2 < size; ++it2) {
-            str += ALPHABET.charAt(b58[it2]);
-          }
-          return str;
+        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;
         }
-        function decodeUnsafe(source) {
-          if (typeof source !== "string") {
-            throw new TypeError("Expected String");
-          }
-          if (source.length === 0) {
-            return new Uint8Array();
-          }
-          var psz = 0;
-          var zeroes = 0;
-          var length = 0;
-          while (source[psz] === LEADER) {
-            zeroes++;
-            psz++;
-          }
-          var size = (source.length - psz) * FACTOR + 1 >>> 0;
-          var b256 = new Uint8Array(size);
-          while (source[psz]) {
-            var carry = BASE_MAP[source.charCodeAt(psz)];
-            if (carry === 255) {
-              return;
-            }
-            var i2 = 0;
-            for (var it3 = size - 1; (carry !== 0 || i2 < length) && it3 !== -1; it3--, i2++) {
-              carry += BASE * b256[it3] >>> 0;
-              b256[it3] = carry % 256 >>> 0;
-              carry = carry / 256 >>> 0;
-            }
-            if (carry !== 0) {
-              throw new Error("Non-zero carry");
-            }
-            length = i2;
-            psz++;
-          }
-          var it4 = size - length;
-          while (it4 !== size && b256[it4] === 0) {
-            it4++;
-          }
-          var vch = new Uint8Array(zeroes + (size - it4));
-          var j2 = zeroes;
-          while (it4 !== size) {
-            vch[j2++] = b256[it4++];
-          }
-          return vch;
+        const tailBytes = [];
+        while (base10Number > 0n) {
+          tailBytes.unshift(Number(base10Number % 256n));
+          base10Number /= 256n;
         }
-        function decode(string) {
-          var buffer = decodeUnsafe(string);
-          if (buffer) {
-            return buffer;
-          }
-          throw new Error("Non-base" + BASE + " character");
+        return Uint8Array.from(leadingZeroes.concat(tailBytes));
+      },
+      deserialize(buffer, offset = 0) {
+        if (buffer.length === 0)
+          return ["", 0];
+        const bytes = buffer.slice(offset);
+        let trailIndex = bytes.findIndex((n) => n !== 0);
+        trailIndex = trailIndex === -1 ? bytes.length : trailIndex;
+        const leadingZeroes = alphabet[0].repeat(trailIndex);
+        if (trailIndex === bytes.length)
+          return [leadingZeroes, buffer.length];
+        let base10Number = bytes.slice(trailIndex).reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);
+        const tailChars = [];
+        while (base10Number > 0n) {
+          tailChars.unshift(alphabet[Number(base10Number % baseBigInt)]);
+          base10Number /= baseBigInt;
         }
-        return {
-          encode,
-          decodeUnsafe,
-          decode
-        };
+        return [leadingZeroes + tailChars.join(""), buffer.length];
       }
-      module.exports = base;
-    }
-  });
-
-  // ../../node_modules/.pnpm/bs58@5.0.0/node_modules/bs58/index.js
-  var require_bs58 = __commonJS({
-    "../../node_modules/.pnpm/bs58@5.0.0/node_modules/bs58/index.js"(exports, module) {
-      init_env_shim();
-      var basex = require_src();
-      var ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
-      module.exports = basex(ALPHABET);
-    }
-  });
+    };
+  };
 
-  // src/index.ts
-  init_env_shim();
+  // ../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/dist/esm/base58.mjs
+  var base58 = baseX("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
 
   // src/base58.ts
-  init_env_shim();
-  var import_bs58 = __toESM(require_bs58(), 1);
   function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     try {
       if (
@@ -193,7 +86,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       ) {
         throw new Error("Expected input string to decode to a byte array of length 32.");
       }
-      const bytes = import_bs58.default.decode(putativeBase58EncodedAddress);
+      const bytes = base58.serialize(putativeBase58EncodedAddress);
       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}`);
@@ -204,8 +97,19 @@ this.globalThis.solanaWeb3 = (function (exports) {
       });
     }
   }
+  function getBase58EncodedAddressComparator() {
+    return new Intl.Collator("en", {
+      caseFirst: "lower",
+      ignorePunctuation: false,
+      localeMatcher: "best fit",
+      numeric: false,
+      sensitivity: "variant",
+      usage: "sort"
+    }).compare;
+  }
 
   exports.assertIsBase58EncodedAddress = assertIsBase58EncodedAddress;
+  exports.getBase58EncodedAddressComparator = getBase58EncodedAddressComparator;
 
   return exports;
 

package/dist/index.development.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../build-scripts/env-shim.ts","../../../node_modules/.pnpm/base-x@4.0.0/node_modules/base-x/src/index.js","../../../node_modules/.pnpm/bs58@5.0.0/node_modules/bs58/index.js","../src/index.ts","../src/base58.ts"],"names":["i","j","bs58"],"mappings":"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","sourcesContent":["// Clever obfuscation to prevent the build system from inlining the value of `NODE_ENV`\nexport const __DEV__ = /* @__PURE__ */ (() => (process as any)['en' + 'v'].NODE_ENV === 'development')();\n","'use strict'\n// base-x encoding / decoding\n// Copyright (c) 2018 base-x contributors\n// Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)\n// Distributed under the MIT software license, see the accompanying\n// file LICENSE or http://www.opensource.org/licenses/mit-license.php.\nfunction base (ALPHABET) {\n  if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }\n  var BASE_MAP = new Uint8Array(256)\n  for (var j = 0; j < BASE_MAP.length; j++) {\n    BASE_MAP[j] = 255\n  }\n  for (var i = 0; i < ALPHABET.length; i++) {\n    var x = ALPHABET.charAt(i)\n    var xc = x.charCodeAt(0)\n    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }\n    BASE_MAP[xc] = i\n  }\n  var BASE = ALPHABET.length\n  var LEADER = ALPHABET.charAt(0)\n  var FACTOR = Math.log(BASE) / Math.log(256) // log(BASE) / log(256), rounded up\n  var iFACTOR = Math.log(256) / Math.log(BASE) // log(256) / log(BASE), rounded up\n  function encode (source) {\n    if (source instanceof Uint8Array) {\n    } else if (ArrayBuffer.isView(source)) {\n      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength)\n    } else if (Array.isArray(source)) {\n      source = Uint8Array.from(source)\n    }\n    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }\n    if (source.length === 0) { return '' }\n        // Skip & count leading zeroes.\n    var zeroes = 0\n    var length = 0\n    var pbegin = 0\n    var pend = source.length\n    while (pbegin !== pend && source[pbegin] === 0) {\n      pbegin++\n      zeroes++\n    }\n        // Allocate enough space in big-endian base58 representation.\n    var size = ((pend - pbegin) * iFACTOR + 1) >>> 0\n    var b58 = new Uint8Array(size)\n        // Process the bytes.\n    while (pbegin !== pend) {\n      var carry = source[pbegin]\n            // Apply \"b58 = b58 * 256 + ch\".\n      var i = 0\n      for (var it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {\n        carry += (256 * b58[it1]) >>> 0\n        b58[it1] = (carry % BASE) >>> 0\n        carry = (carry / BASE) >>> 0\n      }\n      if (carry !== 0) { throw new Error('Non-zero carry') }\n      length = i\n      pbegin++\n    }\n        // Skip leading zeroes in base58 result.\n    var it2 = size - length\n    while (it2 !== size && b58[it2] === 0) {\n      it2++\n    }\n        // Translate the result into a string.\n    var str = LEADER.repeat(zeroes)\n    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]) }\n    return str\n  }\n  function decodeUnsafe (source) {\n    if (typeof source !== 'string') { throw new TypeError('Expected String') }\n    if (source.length === 0) { return new Uint8Array() }\n    var psz = 0\n        // Skip and count leading '1's.\n    var zeroes = 0\n    var length = 0\n    while (source[psz] === LEADER) {\n      zeroes++\n      psz++\n    }\n        // Allocate enough space in big-endian base256 representation.\n    var size = (((source.length - psz) * FACTOR) + 1) >>> 0 // log(58) / log(256), rounded up.\n    var b256 = new Uint8Array(size)\n        // Process the characters.\n    while (source[psz]) {\n            // Decode character\n      var carry = BASE_MAP[source.charCodeAt(psz)]\n            // Invalid character\n      if (carry === 255) { return }\n      var i = 0\n      for (var it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {\n        carry += (BASE * b256[it3]) >>> 0\n        b256[it3] = (carry % 256) >>> 0\n        carry = (carry / 256) >>> 0\n      }\n      if (carry !== 0) { throw new Error('Non-zero carry') }\n      length = i\n      psz++\n    }\n        // Skip leading zeroes in b256.\n    var it4 = size - length\n    while (it4 !== size && b256[it4] === 0) {\n      it4++\n    }\n    var vch = new Uint8Array(zeroes + (size - it4))\n    var j = zeroes\n    while (it4 !== size) {\n      vch[j++] = b256[it4++]\n    }\n    return vch\n  }\n  function decode (string) {\n    var buffer = decodeUnsafe(string)\n    if (buffer) { return buffer }\n    throw new Error('Non-base' + BASE + ' character')\n  }\n  return {\n    encode: encode,\n    decodeUnsafe: decodeUnsafe,\n    decode: decode\n  }\n}\nmodule.exports = base\n","const basex = require('base-x')\nconst ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'\n\nmodule.exports = basex(ALPHABET)\n","export * from './base58';\n","import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/src/errors.ts","../../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/src/baseX.ts","../../../node_modules/.pnpm/@metaplex-foundation+umi-serializers-encodings@0.8.2/node_modules/@metaplex-foundation/umi-serializers-encodings/src/base58.ts","../src/base58.ts"],"names":["InvalidBaseStringError","Error","constructor","value","base","cause","message","name","baseX","alphabet","length","baseBigInt","BigInt","description","fixedSize","maxSize","serialize","match","RegExp","Uint8Array","chars","trailIndex","findIndex","c","leadingZeroes","Array","fill","from","tailChars","slice","base10Number","baseXPower","i","indexOf","tailBytes","unshift","Number","concat","deserialize","buffer","offset","bytes","n","repeat","reduce","sum","byte","join","base58"],"mappings":"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","sourcesContent":["/** @category Errors */\nexport class InvalidBaseStringError extends Error {\n  readonly name: string = 'InvalidBaseStringError';\n\n  readonly cause?: Error;\n\n  constructor(value: string, base: number, cause?: Error) {\n    const message = `Expected a string of base ${base}, got [${value}].`;\n    super(message);\n    this.cause = cause;\n  }\n}\n","import type { Serializer } from '@metaplex-foundation/umi-serializers-core';\nimport { InvalidBaseStringError } from './errors';\n\n/**\n * A string serializer that uses a custom alphabet.\n * This can be used to create serializers for base58, base64, etc.\n * @category Serializers\n */\nexport const baseX = (alphabet: string): Serializer<string> => {\n  const base = alphabet.length;\n  const baseBigInt = BigInt(base);\n  return {\n    description: `base${base}`,\n    fixedSize: null,\n    maxSize: null,\n    serialize(value: string): Uint8Array {\n      // Check if the value is valid.\n      if (!value.match(new RegExp(`^[${alphabet}]*$`))) {\n        throw new InvalidBaseStringError(value, base);\n      }\n      if (value === '') return new Uint8Array();\n\n      // Handle leading zeroes.\n      const chars = [...value];\n      let trailIndex = chars.findIndex((c) => c !== alphabet[0]);\n      trailIndex = trailIndex === -1 ? chars.length : trailIndex;\n      const leadingZeroes = Array(trailIndex).fill(0);\n      if (trailIndex === chars.length) return Uint8Array.from(leadingZeroes);\n\n      // From baseX to base10.\n      const tailChars = chars.slice(trailIndex);\n      let base10Number = 0n;\n      let baseXPower = 1n;\n      for (let i = tailChars.length - 1; i >= 0; i -= 1) {\n        base10Number += baseXPower * BigInt(alphabet.indexOf(tailChars[i]));\n        baseXPower *= baseBigInt;\n      }\n\n      // From base10 to bytes.\n      const tailBytes = [];\n      while (base10Number > 0n) {\n        tailBytes.unshift(Number(base10Number % 256n));\n        base10Number /= 256n;\n      }\n      return Uint8Array.from(leadingZeroes.concat(tailBytes));\n    },\n    deserialize(buffer, offset = 0): [string, number] {\n      if (buffer.length === 0) return ['', 0];\n\n      // Handle leading zeroes.\n      const bytes = buffer.slice(offset);\n      let trailIndex = bytes.findIndex((n) => n !== 0);\n      trailIndex = trailIndex === -1 ? bytes.length : trailIndex;\n      const leadingZeroes = alphabet[0].repeat(trailIndex);\n      if (trailIndex === bytes.length) return [leadingZeroes, buffer.length];\n\n      // From bytes to base10.\n      let base10Number = bytes\n        .slice(trailIndex)\n        .reduce((sum, byte) => sum * 256n + BigInt(byte), 0n);\n\n      // From base10 to baseX.\n      const tailChars = [];\n      while (base10Number > 0n) {\n        tailChars.unshift(alphabet[Number(base10Number % baseBigInt)]);\n        base10Number /= baseBigInt;\n      }\n\n      return [leadingZeroes + tailChars.join(''), buffer.length];\n    },\n  };\n};\n","import type { Serializer } from '@metaplex-foundation/umi-serializers-core';\nimport { baseX } from './baseX';\n\n/**\n * A string serializer that uses base58 encoding.\n * @category Serializers\n */\nexport const base58: Serializer<string> = baseX(\n  '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'\n);\n","import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.native.js

@@ -1,4 +1,4 @@
-import bs58 from 'bs58';
+import { base58 } from '@metaplex-foundation/umi-serializers-encodings';
 
 // src/base58.ts
 function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
@@ -10,7 +10,7 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes = bs58.decode(putativeBase58EncodedAddress);
+    const bytes = base58.serialize(putativeBase58EncodedAddress);
     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}`);
@@ -21,7 +21,17 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     });
   }
 }
+function getBase58EncodedAddressComparator() {
+  return new Intl.Collator("en", {
+    caseFirst: "lower",
+    ignorePunctuation: false,
+    localeMatcher: "best fit",
+    numeric: false,
+    sensitivity: "variant",
+    usage: "sort"
+  }).compare;
+}
 
-export { assertIsBase58EncodedAddress };
+export { assertIsBase58EncodedAddress, getBase58EncodedAddressComparator };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.native.js.map

package/dist/index.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU;AAIV,SAAS,6BACZ,8BAC4D;AAC5D,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,KAAK,OAAO,4BAA4B;AACtD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ","sourcesContent":["import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,SAAS,cAAc;AAMhB,SAAS,6BACZ,8BACiG;AACjG,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,OAAO,UAAU,4BAA4B;AAC3D,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,oCAAsE;AAClF,SAAO,IAAI,KAAK,SAAS,MAAM;AAAA,IAC3B,WAAW;AAAA,IACX,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,SAAS;AAAA,IACT,aAAa;AAAA,IACb,OAAO;AAAA,EACX,CAAC,EAAE;AACP","sourcesContent":["import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.node.cjs

@@ -1,10 +1,6 @@
 'use strict';
 
-var bs58 = require('bs58');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var bs58__default = /*#__PURE__*/_interopDefault(bs58);
+var umiSerializersEncodings = require('@metaplex-foundation/umi-serializers-encodings');
 
 // src/base58.ts
 function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
@@ -16,7 +12,7 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes = bs58__default.default.decode(putativeBase58EncodedAddress);
+    const bytes = umiSerializersEncodings.base58.serialize(putativeBase58EncodedAddress);
     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}`);
@@ -27,7 +23,18 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     });
   }
 }
+function getBase58EncodedAddressComparator() {
+  return new Intl.Collator("en", {
+    caseFirst: "lower",
+    ignorePunctuation: false,
+    localeMatcher: "best fit",
+    numeric: false,
+    sensitivity: "variant",
+    usage: "sort"
+  }).compare;
+}
 
 exports.assertIsBase58EncodedAddress = assertIsBase58EncodedAddress;
+exports.getBase58EncodedAddressComparator = getBase58EncodedAddressComparator;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.node.cjs.map

package/dist/index.node.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU;AAIV,SAAS,6BACZ,8BAC4D;AAC5D,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,KAAK,OAAO,4BAA4B;AACtD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ","sourcesContent":["import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,SAAS,cAAc;AAMhB,SAAS,6BACZ,8BACiG;AACjG,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,OAAO,UAAU,4BAA4B;AAC3D,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,oCAAsE;AAClF,SAAO,IAAI,KAAK,SAAS,MAAM;AAAA,IAC3B,WAAW;AAAA,IACX,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,SAAS;AAAA,IACT,aAAa;AAAA,IACb,OAAO;AAAA,EACX,CAAC,EAAE;AACP","sourcesContent":["import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.node.js

@@ -1,4 +1,4 @@
-import bs58 from 'bs58';
+import { base58 } from '@metaplex-foundation/umi-serializers-encodings';
 
 // src/base58.ts
 function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
@@ -10,7 +10,7 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     ) {
       throw new Error("Expected input string to decode to a byte array of length 32.");
     }
-    const bytes = bs58.decode(putativeBase58EncodedAddress);
+    const bytes = base58.serialize(putativeBase58EncodedAddress);
     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}`);
@@ -21,7 +21,17 @@ function assertIsBase58EncodedAddress(putativeBase58EncodedAddress) {
     });
   }
 }
+function getBase58EncodedAddressComparator() {
+  return new Intl.Collator("en", {
+    caseFirst: "lower",
+    ignorePunctuation: false,
+    localeMatcher: "best fit",
+    numeric: false,
+    sensitivity: "variant",
+    usage: "sort"
+  }).compare;
+}
 
-export { assertIsBase58EncodedAddress };
+export { assertIsBase58EncodedAddress, getBase58EncodedAddressComparator };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.node.js.map

package/dist/index.node.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,OAAO,UAAU;AAIV,SAAS,6BACZ,8BAC4D;AAC5D,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,KAAK,OAAO,4BAA4B;AACtD,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ","sourcesContent":["import bs58 from 'bs58';\n\nexport type Base58EncodedAddress = string & { readonly __base58EncodedAddress: unique symbol };\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = bs58.decode(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n"]}
+{"version":3,"sources":["../src/base58.ts"],"names":[],"mappings":";AAAA,SAAS,cAAc;AAMhB,SAAS,6BACZ,8BACiG;AACjG,MAAI;AAEA;AAAA;AAAA,MAEI,6BAA6B,SAAS;AAAA,MAEtC,6BAA6B,SAAS;AAAA,MACxC;AACE,YAAM,IAAI,MAAM,+DAA+D;AAAA,IACnF;AAEA,UAAM,QAAQ,OAAO,UAAU,4BAA4B;AAC3D,UAAM,WAAW,MAAM;AACvB,QAAI,aAAa,IAAI;AACjB,YAAM,IAAI,MAAM,gFAAgF,UAAU;AAAA,IAC9G;AAAA,EACJ,SAAS,GAAP;AACE,UAAM,IAAI,MAAM,KAAK,mEAAmE;AAAA,MACpF,OAAO;AAAA,IACX,CAAC;AAAA,EACL;AACJ;AAEO,SAAS,oCAAsE;AAClF,SAAO,IAAI,KAAK,SAAS,MAAM;AAAA,IAC3B,WAAW;AAAA,IACX,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,SAAS;AAAA,IACT,aAAa;AAAA,IACb,OAAO;AAAA,EACX,CAAC,EAAE;AACP","sourcesContent":["import { base58 } from '@metaplex-foundation/umi-serializers-encodings';\n\nexport type Base58EncodedAddress<TAddress extends string = string> = TAddress & {\n    readonly __base58EncodedAddress: unique symbol;\n};\n\nexport function assertIsBase58EncodedAddress(\n    putativeBase58EncodedAddress: string\n): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress> {\n    try {\n        // Fast-path; see if the input string is of an acceptable length.\n        if (\n            // Lowest address (32 bytes of zeroes)\n            putativeBase58EncodedAddress.length < 32 ||\n            // Highest address (32 bytes of 255)\n            putativeBase58EncodedAddress.length > 44\n        ) {\n            throw new Error('Expected input string to decode to a byte array of length 32.');\n        }\n        // Slow-path; actually attempt to decode the input string.\n        const bytes = base58.serialize(putativeBase58EncodedAddress);\n        const numBytes = bytes.byteLength;\n        if (numBytes !== 32) {\n            throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);\n        }\n    } catch (e) {\n        throw new Error(`\\`${putativeBase58EncodedAddress}\\` is not a base-58 encoded address`, {\n            cause: e,\n        });\n    }\n}\n\nexport function getBase58EncodedAddressComparator(): (x: string, y: string) => number {\n    return new Intl.Collator('en', {\n        caseFirst: 'lower',\n        ignorePunctuation: false,\n        localeMatcher: 'best fit',\n        numeric: false,\n        sensitivity: 'variant',\n        usage: 'sort',\n    }).compare;\n}\n"]}

package/dist/index.production.min.js

@@ -2,9 +2,10 @@ this.globalThis = this.globalThis || {};
 this.globalThis.solanaWeb3 = (function (exports) {
 	'use strict';
 
-	var V=Object.create;var m=Object.defineProperty;var q=Object.getOwnPropertyDescriptor;var F=Object.getOwnPropertyNames;var T=Object.getPrototypeOf,B=Object.prototype.hasOwnProperty;var $=(e,r)=>()=>(e&&(r=e(e=0)),r);var z=(e,r)=>()=>(r||e((r={exports:{}}).exports,r),r.exports);var k=(e,r,n,p)=>{if(r&&typeof r=="object"||typeof r=="function")for(let v of F(r))!B.call(e,v)&&v!==n&&m(e,v,{get:()=>r[v],enumerable:!(p=q(r,v))||p.enumerable});return e};var G=(e,r,n)=>(n=e!=null?V(T(e)):{},k(r||!e||!e.__esModule?m(n,"default",{value:e,enumerable:!0}):n,e));var l=$(()=>{});var u=z((X,_)=>{l();function I(e){if(e.length>=255)throw new TypeError("Alphabet too long");for(var r=new Uint8Array(256),n=0;n<r.length;n++)r[n]=255;for(var p=0;p<e.length;p++){var v=e.charAt(p),c=v.charCodeAt(0);if(r[c]!==255)throw new TypeError(v+" is ambiguous");r[c]=p;}var b=e.length,U=e.charAt(0),D=Math.log(b)/Math.log(256),O=Math.log(256)/Math.log(b);function R(t){if(t instanceof Uint8Array||(ArrayBuffer.isView(t)?t=new Uint8Array(t.buffer,t.byteOffset,t.byteLength):Array.isArray(t)&&(t=Uint8Array.from(t))),!(t instanceof Uint8Array))throw new TypeError("Expected Uint8Array");if(t.length===0)return "";for(var a=0,y=0,i=0,f=t.length;i!==f&&t[i]===0;)i++,a++;for(var s=(f-i)*O+1>>>0,o=new Uint8Array(s);i!==f;){for(var d=t[i],g=0,h=s-1;(d!==0||g<y)&&h!==-1;h--,g++)d+=256*o[h]>>>0,o[h]=d%b>>>0,d=d/b>>>0;if(d!==0)throw new Error("Non-zero carry");y=g,i++;}for(var w=s-y;w!==s&&o[w]===0;)w++;for(var A=U.repeat(a);w<s;++w)A+=e.charAt(o[w]);return A}function x(t){if(typeof t!="string")throw new TypeError("Expected String");if(t.length===0)return new Uint8Array;for(var a=0,y=0,i=0;t[a]===U;)y++,a++;for(var f=(t.length-a)*D+1>>>0,s=new Uint8Array(f);t[a];){var o=r[t.charCodeAt(a)];if(o===255)return;for(var d=0,g=f-1;(o!==0||d<i)&&g!==-1;g--,d++)o+=b*s[g]>>>0,s[g]=o%256>>>0,o=o/256>>>0;if(o!==0)throw new Error("Non-zero carry");i=d,a++;}for(var h=f-i;h!==f&&s[h]===0;)h++;for(var w=new Uint8Array(y+(f-h)),A=y;h!==f;)w[A++]=s[h++];return w}function S(t){var a=x(t);if(a)return a;throw new Error("Non-base"+b+" character")}return {encode:R,decodeUnsafe:x,decode:S}}_.exports=I;});var N=z((Z,M)=>{l();var J=u(),K="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";M.exports=J(K);});l();l();var C=G(N(),1);function L(e){try{if(e.length<32||e.length>44)throw new Error("Expected input string to decode to a byte array of length 32.");let n=C.default.decode(e).byteLength;if(n!==32)throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${n}`)}catch(r){throw new Error(`\`${e}\` is not a base-58 encoded address`,{cause:r})}}
+	var h=Object.defineProperty;var b=(e,r,t)=>r in e?h(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t;var x=(e,r,t)=>(b(e,typeof r!="symbol"?r+"":r,t),t);var m=class extends Error{constructor(t,s,i){let n=`Expected a string of base ${s}, got [${t}].`;super(n);x(this,"name","InvalidBaseStringError");this.cause=i;}};var p=e=>{let r=e.length,t=BigInt(r);return {description:`base${r}`,fixedSize:null,maxSize:null,serialize(s){if(!s.match(new RegExp(`^[${e}]*$`)))throw new m(s,r);if(s==="")return new Uint8Array;let i=[...s],n=i.findIndex(c=>c!==e[0]);n=n===-1?i.length:n;let o=Array(n).fill(0);if(n===i.length)return Uint8Array.from(o);let l=i.slice(n),a=0n,g=1n;for(let c=l.length-1;c>=0;c-=1)a+=g*BigInt(e.indexOf(l[c])),g*=t;let d=[];for(;a>0n;)d.unshift(Number(a%256n)),a/=256n;return Uint8Array.from(o.concat(d))},deserialize(s,i=0){if(s.length===0)return ["",0];let n=s.slice(i),o=n.findIndex(d=>d!==0);o=o===-1?n.length:o;let l=e[0].repeat(o);if(o===n.length)return [l,s.length];let a=n.slice(o).reduce((d,c)=>d*256n+BigInt(c),0n),g=[];for(;a>0n;)g.unshift(e[Number(a%t)]),a/=t;return [l+g.join(""),s.length]}}};var u=p("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");function D(e){try{if(e.length<32||e.length>44)throw new Error("Expected input string to decode to a byte array of length 32.");let t=u.serialize(e).byteLength;if(t!==32)throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${t}`)}catch(r){throw new Error(`\`${e}\` is not a base-58 encoded address`,{cause:r})}}function P(){return new Intl.Collator("en",{caseFirst:"lower",ignorePunctuation:!1,localeMatcher:"best fit",numeric:!1,sensitivity:"variant",usage:"sort"}).compare}
 
-	exports.assertIsBase58EncodedAddress = L;
+	exports.assertIsBase58EncodedAddress = D;
+	exports.getBase58EncodedAddressComparator = P;
 
 	return exports;
 

package/dist/types/base58.d.ts

@@ -1,5 +1,6 @@
-export type Base58EncodedAddress = string & {
+export type Base58EncodedAddress<TAddress extends string = string> = TAddress & {
     readonly __base58EncodedAddress: unique symbol;
 };
-export declare function assertIsBase58EncodedAddress(putativeBase58EncodedAddress: string): asserts putativeBase58EncodedAddress is Base58EncodedAddress;
+export declare function assertIsBase58EncodedAddress(putativeBase58EncodedAddress: string): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress>;
+export declare function getBase58EncodedAddressComparator(): (x: string, y: string) => number;
 //# sourceMappingURL=base58.d.ts.map

package/dist/types/base58.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base58.d.ts","sourceRoot":"","sources":["../../src/base58.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,sBAAsB,EAAE,OAAO,MAAM,CAAA;CAAE,CAAC;AAE/F,wBAAgB,4BAA4B,CACxC,4BAA4B,EAAE,MAAM,GACrC,OAAO,CAAC,4BAA4B,IAAI,oBAAoB,CAsB9D"}
+{"version":3,"file":"base58.d.ts","sourceRoot":"","sources":["../../src/base58.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,IAAI,QAAQ,GAAG;IAC5E,QAAQ,CAAC,sBAAsB,EAAE,OAAO,MAAM,CAAC;CAClD,CAAC;AAEF,wBAAgB,4BAA4B,CACxC,4BAA4B,EAAE,MAAM,GACrC,OAAO,CAAC,4BAA4B,IAAI,oBAAoB,CAAC,OAAO,4BAA4B,CAAC,CAsBnG;AAED,wBAAgB,iCAAiC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CASpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/keys",
-  "version": "2.0.0-experimental.021b83f",
+  "version": "2.0.0-experimental.02a66ef",
   "description": "Helpers for generating and transforming key material",
   "exports": {
     "browser": {
@@ -45,11 +45,14 @@
     "supports bigint and not dead",
     "maintained node versions"
   ],
+  "dependencies": {
+    "@metaplex-foundation/umi-serializers-encodings": "^0.8.2"
+  },
   "devDependencies": {
-    "@solana/eslint-config-solana": "^1.0.0",
+    "@solana/eslint-config-solana": "^1.0.1",
     "@swc/core": "^1.3.18",
-    "@swc/jest": "^0.2.23",
-    "@types/jest": "^29.5.0",
+    "@swc/jest": "^0.2.26",
+    "@types/jest": "^29.5.1",
     "@typescript-eslint/eslint-plugin": "^5.57.1",
     "@typescript-eslint/parser": "^5.57.1",
     "agadoo": "^3.0.0",
@@ -59,14 +62,13 @@
     "eslint-plugin-sort-keys-fix": "^1.1.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
-    "jest-runner-eslint": "^2.0.0",
+    "jest-runner-eslint": "^2.1.0",
     "jest-runner-prettier": "^1.0.0",
     "postcss": "^8.4.12",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.8",
     "ts-node": "^10.9.1",
     "tsup": "6.7.0",
-    "turbo": "^1.6.3",
-    "typescript": "^5.0.3",
+    "typescript": "^5.0.4",
     "version-from-git": "^1.1.1",
     "build-scripts": "0.0.0",
     "test-config": "0.0.0",
@@ -80,9 +82,6 @@
       }
     ]
   },
-  "dependencies": {
-    "bs58": "^5.0.0"
-  },
   "scripts": {
     "compile:js": "tsup --config build-scripts/tsup.config.library.ts",
     "compile:typedefs": "tsc -p ./tsconfig.declarations.json",