@solana/addresses 2.0.0-experimental.e36f58d → 2.0.0-experimental.e4483d3

package/dist/index.production.min.js

@@ -2,13 +2,20 @@ this.globalThis = this.globalThis || {};
 this.globalThis.solanaWeb3 = (function (exports) {
 	'use strict';
 
-	var X=Object.defineProperty;var M=(e,r,t)=>r in e?X(e,r,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[r]=t;var x=(e,r,t)=>(M(e,typeof r!="symbol"?r+"":r,t),t);var v=e=>{let r=e.reduce((i,o)=>i+o.length,0),t=new Uint8Array(r),n=0;return e.forEach(i=>{t.set(i,n),n+=i.length;}),t},_=(e,r)=>{if(e.length>=r)return e;let t=new Uint8Array(r).fill(0);return t.set(e),t},h=(e,r)=>_(e.slice(0,r),r);var b=class extends Error{constructor(t){super(`Serializer [${t}] cannot deserialize empty buffers.`);x(this,"name","DeserializingEmptyBufferError");}},y=class extends Error{constructor(t,n,i){super(`Serializer [${t}] expected ${n} bytes, got ${i}.`);x(this,"name","NotEnoughBytesError");}};function I(e,r,t){return {description:t??`fixed(${r}, ${e.description})`,fixedSize:r,maxSize:r,serialize:n=>h(e.serialize(n),r),deserialize:(n,i=0)=>{if(n=n.slice(i,i+r),n.length<r)throw new y("fixSerializer",r,n.length);e.fixedSize!==null&&(n=h(n,e.fixedSize));let[o]=e.deserialize(n,0);return [o,i+r]}}}var E=class extends Error{constructor(t,n,i){let o=`Expected a string of base ${n}, got [${t}].`;super(o);x(this,"name","InvalidBaseStringError");this.cause=i;}};var $=e=>{let r=e.length,t=BigInt(r);return {description:`base${r}`,fixedSize:null,maxSize:null,serialize(n){if(!n.match(new RegExp(`^[${e}]*$`)))throw new E(n,r);if(n==="")return new Uint8Array;let i=[...n],o=i.findIndex(d=>d!==e[0]);o=o===-1?i.length:o;let s=Array(o).fill(0);if(o===i.length)return Uint8Array.from(s);let f=i.slice(o),c=0n,l=1n;for(let d=f.length-1;d>=0;d-=1)c+=l*BigInt(e.indexOf(f[d])),l*=t;let u=[];for(;c>0n;)u.unshift(Number(c%256n)),c/=256n;return Uint8Array.from(s.concat(u))},deserialize(n,i=0){if(n.length===0)return ["",0];let o=n.slice(i),s=o.findIndex(u=>u!==0);s=s===-1?o.length:s;let f=e[0].repeat(s);if(s===o.length)return [f,n.length];let c=o.slice(s).reduce((u,d)=>u*256n+BigInt(d),0n),l=[];for(;c>0n;)l.unshift(e[Number(c%t)]),c/=t;return [f+l.join(""),n.length]}}};var w=$("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");var T=e=>e.replace(/\u0000/g,"");var C={description:"utf8",fixedSize:null,maxSize:null,serialize(e){return new TextEncoder().encode(e)},deserialize(e,r=0){let t=new TextDecoder().decode(e.slice(r));return [T(t),e.length]}};var z;(function(e){e.Little="le",e.Big="be";})(z||(z={}));var S=class extends RangeError{constructor(t,n,i,o){super(`Serializer [${t}] expected number to be between ${n} and ${i}, got ${o}.`);x(this,"name","NumberOutOfRangeError");}};function U(e){let r,t=e.name;return e.size>1&&(r=!("endian"in e.options)||e.options.endian===z.Little,t+=r?"(le)":"(be)"),{description:e.options.description??t,fixedSize:e.size,maxSize:e.size,serialize(n){e.range&&H(e.name,e.range[0],e.range[1],n);let i=new ArrayBuffer(e.size);return e.set(new DataView(i),n,r),new Uint8Array(i)},deserialize(n,i=0){let o=n.slice(i,i+e.size);W("i8",o,e.size);let s=G(o);return [e.get(s,r),i+e.size]}}}var j=e=>e.buffer.slice(e.byteOffset,e.byteLength+e.byteOffset),G=e=>new DataView(j(e)),H=(e,r,t,n)=>{if(n<r||n>t)throw new S(e,r,t,n)},W=(e,r,t)=>{if(r.length===0)throw new b(e);if(r.length<t)throw new y(e,t,r.length)};var D=(e={})=>U({name:"u32",size:4,range:[0,+"0xffffffff"],set:(r,t,n)=>r.setUint32(0,Number(t),n),get:(r,t)=>r.getUint32(0,t),options:e});function R(e){return typeof e=="object"?e.description:`${e}`}function N(e={}){let r=e.size??D(),t=e.encoding??C,n=e.description??`string(${t.description}; ${R(r)})`;return r==="variable"?{...t,description:n}:typeof r=="number"?I(t,r,n):{description:n,fixedSize:null,maxSize:null,serialize:i=>{let o=t.serialize(i),s=r.serialize(o.length);return v([s,o])},deserialize:(i,o=0)=>{if(i.slice(o).length===0)throw new b("string");let[s,f]=r.deserialize(i,o),c=Number(s);o=f;let l=i.slice(o,o+c);if(l.length<c)throw new y("string",c,l.length);let[u,d]=t.deserialize(l);return o+=d,[u,o]}}}function xr(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=w.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 A(e){return N({description:e?.description??"",encoding:w,size:32})}function br(){return new Intl.Collator("en",{caseFirst:"lower",ignorePunctuation:!1,localeMatcher:"best fit",numeric:!1,sensitivity:"variant",usage:"sort"}).compare}function P(){if(!globalThis.isSecureContext)throw new Error("Cryptographic operations are only allowed in secure browser contexts. Read more here: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts")}async function O(){if(P(),typeof globalThis.crypto>"u"||typeof globalThis.crypto.subtle?.digest!="function")throw new Error("No digest implementation could be found")}async function L(){if(P(),typeof globalThis.crypto>"u"||typeof globalThis.crypto.subtle?.exportKey!="function")throw new Error("No key export implementation could be found")}var Z=37095705934669439343138083508754565189542113879843219016388785533085940283555n,p=57896044618658097711785492504343953926634992332820282019728792003956564819949n,K=19681161376707505956807079304988542015446066515923890162744021073123829784752n;function m(e){let r=e%p;return r>=0n?r:p+r}function g(e,r){let t=e;for(;r-- >0n;)t*=t,t%=p;return t}function q(e){let t=e*e%p*e%p,n=g(t,2n)*t%p,i=g(n,1n)*e%p,o=g(i,5n)*i%p,s=g(o,10n)*o%p,f=g(s,20n)*s%p,c=g(f,40n)*f%p,l=g(c,80n)*c%p,u=g(l,80n)*c%p,d=g(u,10n)*o%p;return g(d,2n)*e%p}function Y(e,r){let t=m(r*r*r),n=m(t*t*r),i=q(e*n),o=m(e*t*i),s=m(r*o*o),f=o,c=m(o*K),l=s===e,u=s===m(-e),d=s===m(-e*K);return l&&(o=f),(u||d)&&(o=c),(m(o)&1n)===1n&&(o=m(-o)),!l&&!u?null:o}function k(e,r){let t=m(e*e),n=m(t-1n),i=m(Z*t+1n),o=Y(n,i);if(o===null)return !1;let s=(r&128)!==0;return !(o===0n&&s)}function J(e){let r=e.toString(16);return r.length===1?`0${r}`:r}function Q(e){let t=`0x${e.reduce((n,i,o)=>`${J(o===31?i&-129:i)}${n}`,"")}`;return BigInt(t)}async function V(e){if(e.byteLength!==32)return !1;let r=Q(e);return k(r,e[31])}var ee=32,F=16,re=[80,114,111,103,114,97,109,68,101,114,105,118,101,100,65,100,100,114,101,115,115],B=class extends Error{};async function te({programAddress:e,seeds:r}){if(await O(),r.length>F)throw new Error(`A maximum of ${F} seeds may be supplied when creating an address`);let t,n=r.reduce((c,l,u)=>{let d=typeof l=="string"?(t||(t=new TextEncoder)).encode(l):l;if(d.byteLength>ee)throw new Error(`The seed at index ${u} exceeds the maximum length of 32 bytes`);return c.push(...d),c},[]),i=A(),o=i.serialize(e),s=await crypto.subtle.digest("SHA-256",new Uint8Array([...n,...o,...re])),f=new Uint8Array(s);if(await V(f))throw new B("Invalid seeds; point must fall off the Ed25519 curve");return i.deserialize(f)[0]}async function $r({programAddress:e,seeds:r}){let t=255;for(;t>0;)try{return {bumpSeed:t,pda:await te({programAddress:e,seeds:[...r,new Uint8Array([t])]})}}catch(n){if(n instanceof B)t--;else throw n}throw new Error("Unable to find a viable program address bump seed")}async function Lr(e){if(await L(),e.type!=="public"||e.algorithm.name!=="Ed25519")throw new Error("The `CryptoKey` must be an `Ed25519` public key");let r=await crypto.subtle.exportKey("raw",e),[t]=A().deserialize(new Uint8Array(r));return t}
+	function y(e,r,t=0){if(r.length-t<=0)throw new Error(`Codec [${e}] cannot decode empty byte arrays.`)}function h(e,r,t,n=0){let s=t.length-n;if(s<r)throw new Error(`Codec [${e}] expected ${r} bytes, got ${s}.`)}var C=e=>{let r=e.filter(o=>o.length);if(r.length===0)return e.length?e[0]:new Uint8Array;if(r.length===1)return r[0];let t=r.reduce((o,i)=>o+i.length,0),n=new Uint8Array(t),s=0;return r.forEach(o=>{n.set(o,s),s+=o.length;}),n},ee=(e,r)=>{if(e.length>=r)return e;let t=new Uint8Array(r).fill(0);return t.set(e),t},D=(e,r)=>ee(e.length<=r?e:e.slice(0,r),r);function x(e,r,t){if(e.fixedSize!==r.fixedSize)throw new Error(`Encoder and decoder must have the same fixed size, got [${e.fixedSize}] and [${r.fixedSize}].`);if(e.maxSize!==r.maxSize)throw new Error(`Encoder and decoder must have the same max size, got [${e.maxSize}] and [${r.maxSize}].`);if(t===void 0&&e.description!==r.description)throw new Error(`Encoder and decoder must have the same description, got [${e.description}] and [${r.description}]. Pass a custom description as a third argument if you want to override the description and bypass this error.`);return {decode:r.decode,description:t!=null?t:e.description,encode:e.encode,fixedSize:e.fixedSize,maxSize:e.maxSize}}function U(e,r,t){return {description:t!=null?t:`fixed(${r}, ${e.description})`,fixedSize:r,maxSize:r}}function T(e,r,t){return {...U(e,r,t),encode:n=>D(e.encode(n),r)}}function $(e,r,t){return {...U(e,r,t),decode:(n,s=0)=>{h("fixCodec",r,n,s),(s>0||n.length>r)&&(n=n.slice(s,s+r)),e.fixedSize!==null&&(n=D(n,e.fixedSize));let[o]=e.decode(n,0);return [o,s+r]}}}function P(e,r){return {description:e.description,encode:t=>e.encode(r(t)),fixedSize:e.fixedSize,maxSize:e.maxSize}}function re(e,r,t,n){if(n<r||n>t)throw new Error(`Codec [${e}] expected number to be in the range [${r}, ${t}], got ${n}.`)}function N(e){var n;let r,t=e.name;return e.size>1&&(r=!("endian"in e.config)||e.config.endian===0,t+=r?"(le)":"(be)"),{description:(n=e.config.description)!=null?n:t,fixedSize:e.size,littleEndian:r,maxSize:e.size}}function te(e){let r=N(e);return {description:r.description,encode(t){e.range&&re(e.name,e.range[0],e.range[1],t);let n=new ArrayBuffer(e.size);return e.set(new DataView(n),t,r.littleEndian),new Uint8Array(n)},fixedSize:r.fixedSize,maxSize:r.maxSize}}function ne(e){let r=N(e);return {decode(t,n=0){y(r.description,t,n),h(r.description,e.size,t,n);let s=new DataView(oe(t,n,e.size));return [e.get(s,r.littleEndian),n+e.size]},description:r.description,fixedSize:r.fixedSize,maxSize:r.maxSize}}function oe(e,r,t){let n=e.byteOffset+(r!=null?r:0),s=t!=null?t:e.byteLength;return e.buffer.slice(n,n+s)}var F=(e={})=>te({config:e,name:"u32",range:[0,+"0xffffffff"],set:(r,t,n)=>r.setUint32(0,t,n),size:4}),_=(e={})=>ne({config:e,get:(r,t)=>r.getUint32(0,t),name:"u32",size:4});function se(e,r,t=r){if(!r.match(new RegExp(`^[${e}]*$`)))throw new Error(`Expected a string of base ${e.length}, got [${t}].`)}var ie=e=>{let r=e.length,t=BigInt(r);return {description:`base${r}`,encode(n){if(se(e,n),n==="")return new Uint8Array;let s=[...n],o=s.findIndex(g=>g!==e[0]);o=o===-1?s.length:o;let i=Array(o).fill(0);if(o===s.length)return Uint8Array.from(i);let a=s.slice(o),d=0n,c=1n;for(let g=a.length-1;g>=0;g-=1)d+=c*BigInt(e.indexOf(a[g])),c*=t;let f=[];for(;d>0n;)f.unshift(Number(d%256n)),d/=256n;return Uint8Array.from(i.concat(f))},fixedSize:null,maxSize:null}},de=e=>{let r=e.length,t=BigInt(r);return {decode(n,s=0){let o=s===0?n:n.slice(s);if(o.length===0)return ["",0];let i=o.findIndex(f=>f!==0);i=i===-1?o.length:i;let a=e[0].repeat(i);if(i===o.length)return [a,n.length];let d=o.slice(i).reduce((f,g)=>f*256n+BigInt(g),0n),c=[];for(;d>0n;)c.unshift(e[Number(d%t)]),d/=t;return [a+c.join(""),n.length]},description:`base${r}`,fixedSize:null,maxSize:null}};var O="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",R=()=>ie(O),L=()=>de(O);var ae=e=>e.replace(/\u0000/g,"");var ce=globalThis.TextDecoder,fe=globalThis.TextEncoder,ge=()=>{let e;return {description:"utf8",encode:r=>new Uint8Array((e||(e=new fe)).encode(r)),fixedSize:null,maxSize:null}},ue=()=>{let e;return {decode(r,t=0){let n=(e||(e=new ce)).decode(r.slice(t));return [ae(n),r.length]},description:"utf8",fixedSize:null,maxSize:null}};var k=(e={})=>{var s,o,i;let r=(s=e.size)!=null?s:F(),t=(o=e.encoding)!=null?o:ge(),n=(i=e.description)!=null?i:`string(${t.description}; ${M(r)})`;return r==="variable"?{...t,description:n}:typeof r=="number"?T(t,r,n):{description:n,encode:a=>{let d=t.encode(a),c=r.encode(d.length);return C([c,d])},fixedSize:null,maxSize:null}},K=(e={})=>{var s,o,i;let r=(s=e.size)!=null?s:_(),t=(o=e.encoding)!=null?o:ue(),n=(i=e.description)!=null?i:`string(${t.description}; ${M(r)})`;return r==="variable"?{...t,description:n}:typeof r=="number"?$(t,r,n):{decode:(a,d=0)=>{y("string",a,d);let[c,f]=r.decode(a,d),g=Number(c);d=f;let A=a.slice(d,d+g);h("string",g,A);let[J,Q]=t.decode(A);return d+=Q,[J,d]},description:n,fixedSize:null,maxSize:null}};function M(e){return typeof e=="object"?e.description:`${e}`}var E,z;function w(){return E||(E=R()),E}function le(){return z||(z=L()),z}function X(e){return !(e.length<32||e.length>44||w().encode(e).byteLength!==32)}function S(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=w().encode(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})}}function me(e){return S(e),e}function pe(e){var r;return P(k({description:(r=e==null?void 0:e.description)!=null?r:"Address",encoding:w(),size:32}),t=>me(t))}function B(e){var r;return K({description:(r=e==null?void 0:e.description)!=null?r:"Address",encoding:le(),size:32})}function I(e){return x(pe(e),B(e))}function Oe(){return new Intl.Collator("en",{caseFirst:"lower",ignorePunctuation:!1,localeMatcher:"best fit",numeric:!1,sensitivity:"variant",usage:"sort"}).compare}function H(){if(!globalThis.isSecureContext)throw new Error("Cryptographic operations are only allowed in secure browser contexts. Read more here: https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts")}async function V(){var e;if(H(),typeof globalThis.crypto>"u"||typeof((e=globalThis.crypto.subtle)==null?void 0:e.digest)!="function")throw new Error("No digest implementation could be found")}async function G(){var e;if(H(),typeof globalThis.crypto>"u"||typeof((e=globalThis.crypto.subtle)==null?void 0:e.exportKey)!="function")throw new Error("No key export implementation could be found")}var he=37095705934669439343138083508754565189542113879843219016388785533085940283555n,u=57896044618658097711785492504343953926634992332820282019728792003956564819949n,j=19681161376707505956807079304988542015446066515923890162744021073123829784752n;function l(e){let r=e%u;return r>=0n?r:u+r}function m(e,r){let t=e;for(;r-- >0n;)t*=t,t%=u;return t}function ye(e){let t=e*e%u*e%u,n=m(t,2n)*t%u,s=m(n,1n)*e%u,o=m(s,5n)*s%u,i=m(o,10n)*o%u,a=m(i,20n)*i%u,d=m(a,40n)*a%u,c=m(d,80n)*d%u,f=m(c,80n)*d%u,g=m(f,10n)*o%u;return m(g,2n)*e%u}function xe(e,r){let t=l(r*r*r),n=l(t*t*r),s=ye(e*n),o=l(e*t*s),i=l(r*o*o),a=o,d=l(o*j),c=i===e,f=i===l(-e),g=i===l(-e*j);return c&&(o=a),(f||g)&&(o=d),(l(o)&1n)===1n&&(o=l(-o)),!c&&!f?null:o}function W(e,r){let t=l(e*e),n=l(t-1n),s=l(he*t+1n),o=xe(n,s);if(o===null)return !1;let i=(r&128)!==0;return !(o===0n&&i)}function be(e){let r=e.toString(16);return r.length===1?`0${r}`:r}function ve(e){let t=`0x${e.reduce((n,s,o)=>`${be(o===31?s&-129:s)}${n}`,"")}`;return BigInt(t)}async function q(e){if(e.byteLength!==32)return !1;let r=ve(e);return W(r,e[31])}function Ye(e){return Array.isArray(e)&&e.length===2&&typeof e[0]=="string"&&typeof e[1]=="number"&&e[1]>=0&&e[1]<=255&&X(e[0])}function Je(e){if(!(Array.isArray(e)&&e.length===2&&typeof e[0]=="string"&&typeof e[1]=="number"))throw new Error("Expected given program derived address to have the following format: [Address, ProgramDerivedAddressBump].");if(e[1]<0||e[1]>255)throw new Error(`Expected program derived address bump to be in the range [0, 255], got: ${e[1]}.`);S(e[0]);}var Y=32,Z=16,b=[80,114,111,103,114,97,109,68,101,114,105,118,101,100,65,100,100,114,101,115,115],v=class extends Error{};async function Ae({programAddress:e,seeds:r}){if(await V(),r.length>Z)throw new Error(`A maximum of ${Z} seeds may be supplied when creating an address`);let t,n=r.reduce((d,c,f)=>{let g=typeof c=="string"?(t||(t=new TextEncoder)).encode(c):c;if(g.byteLength>Y)throw new Error(`The seed at index ${f} exceeds the maximum length of 32 bytes`);return d.push(...g),d},[]),s=I(),o=s.encode(e),i=await crypto.subtle.digest("SHA-256",new Uint8Array([...n,...o,...b])),a=new Uint8Array(i);if(await q(a))throw new v("Invalid seeds; point must fall off the Ed25519 curve");return s.decode(a)[0]}async function Qe({programAddress:e,seeds:r}){let t=255;for(;t>0;)try{return [await Ae({programAddress:e,seeds:[...r,new Uint8Array([t])]}),t]}catch(n){if(n instanceof v)t--;else throw n}throw new Error("Unable to find a viable program address bump seed")}async function er({baseAddress:e,programAddress:r,seed:t}){let{encode:n,decode:s}=I(),o=typeof t=="string"?new TextEncoder().encode(t):t;if(o.byteLength>Y)throw new Error("The seed exceeds the maximum length of 32 bytes");let i=n(r);if(i.length>=b.length&&i.slice(-b.length).every((c,f)=>c===b[f]))throw new Error("programAddress cannot end with the PDA marker");let a=await crypto.subtle.digest("SHA-256",new Uint8Array([...n(e),...o,...i])),d=new Uint8Array(a);return s(d)[0]}async function ir(e){if(await G(),e.type!=="public"||e.algorithm.name!=="Ed25519")throw new Error("The `CryptoKey` must be an `Ed25519` public key");let r=await crypto.subtle.exportKey("raw",e),[t]=B().decode(new Uint8Array(r));return t}
 
-	exports.assertIsBase58EncodedAddress = xr;
-	exports.getBase58EncodedAddressCodec = A;
-	exports.getBase58EncodedAddressComparator = br;
-	exports.getBase58EncodedAddressFromPublicKey = Lr;
-	exports.getProgramDerivedAddress = $r;
+	exports.address = me;
+	exports.assertIsAddress = S;
+	exports.assertIsProgramDerivedAddress = Je;
+	exports.createAddressWithSeed = er;
+	exports.getAddressCodec = I;
+	exports.getAddressComparator = Oe;
+	exports.getAddressDecoder = B;
+	exports.getAddressEncoder = pe;
+	exports.getAddressFromPublicKey = ir;
+	exports.getProgramDerivedAddress = Qe;
+	exports.isAddress = X;
+	exports.isProgramDerivedAddress = Ye;
 
 	return exports;
 

package/dist/types/address.d.ts

@@ -0,0 +1,18 @@
+import { Codec, Decoder, Encoder } from '@solana/codecs-core';
+export type Address<TAddress extends string = string> = TAddress & {
+    readonly __brand: unique symbol;
+};
+export declare function isAddress(putativeAddress: string): putativeAddress is Address<typeof putativeAddress>;
+export declare function assertIsAddress(putativeAddress: string): asserts putativeAddress is Address<typeof putativeAddress>;
+export declare function address<TAddress extends string = string>(putativeAddress: TAddress): Address<TAddress>;
+export declare function getAddressEncoder(config?: Readonly<{
+    description: string;
+}>): Encoder<Address>;
+export declare function getAddressDecoder(config?: Readonly<{
+    description: string;
+}>): Decoder<Address>;
+export declare function getAddressCodec(config?: Readonly<{
+    description: string;
+}>): Codec<Address>;
+export declare function getAddressComparator(): (x: string, y: string) => number;
+//# sourceMappingURL=address.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../src/address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,OAAO,EAAE,OAAO,EAAc,MAAM,qBAAqB,CAAC;AAGxF,MAAM,MAAM,OAAO,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,IAAI,QAAQ,GAAG;IAC/D,QAAQ,CAAC,OAAO,EAAE,OAAO,MAAM,CAAC;CACnC,CAAC;AAeF,wBAAgB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,IAAI,OAAO,CAAC,OAAO,eAAe,CAAC,CAkBrG;AAED,wBAAgB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,OAAO,eAAe,CAAC,CAuBnH;AAED,wBAAgB,OAAO,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAAE,eAAe,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAGtG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAS9F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAM9F;AAED,wBAAgB,eAAe,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAE1F;AAED,wBAAgB,oBAAoB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CASvE"}

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export * from './base58';
+export * from './address';
 export * from './program-derived-address';
 export * from './public-key';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,cAAc,CAAC"}

package/dist/types/program-derived-address.d.ts

@@ -1,12 +1,38 @@
-import { Base58EncodedAddress } from './base58';
-type PDAInput = Readonly<{
-    programAddress: Base58EncodedAddress;
+import { Address } from './address';
+/**
+ * An address derived from a program address and a set of seeds.
+ * It includes the bump seed used to derive the address and
+ * ensure the address is not on the Ed25519 curve.
+ */
+export type ProgramDerivedAddress<TAddress extends string = string> = Readonly<[
+    Address<TAddress>,
+    ProgramDerivedAddressBump
+]>;
+/**
+ * A number between 0 and 255, inclusive.
+ */
+export type ProgramDerivedAddressBump = number & {
+    readonly __brand: unique symbol;
+};
+/**
+ * Returns true if the input value is a program derived address.
+ */
+export declare function isProgramDerivedAddress<TAddress extends string = string>(value: unknown): value is ProgramDerivedAddress<TAddress>;
+/**
+ * Fails if the input value is not a program derived address.
+ */
+export declare function assertIsProgramDerivedAddress<TAddress extends string = string>(value: unknown): asserts value is ProgramDerivedAddress<TAddress>;
+type ProgramDerivedAddressInput = Readonly<{
+    programAddress: Address;
     seeds: Seed[];
 }>;
+type SeedInput = Readonly<{
+    baseAddress: Address;
+    programAddress: Address;
+    seed: Seed;
+}>;
 type Seed = string | Uint8Array;
-export declare function getProgramDerivedAddress({ programAddress, seeds }: PDAInput): Promise<Readonly<{
-    bumpSeed: number;
-    pda: Base58EncodedAddress;
-}>>;
+export declare function getProgramDerivedAddress({ programAddress, seeds, }: ProgramDerivedAddressInput): Promise<ProgramDerivedAddress>;
+export declare function createAddressWithSeed({ baseAddress, programAddress, seed }: SeedInput): Promise<Address>;
 export {};
 //# sourceMappingURL=program-derived-address.d.ts.map

package/dist/types/program-derived-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program-derived-address.d.ts","sourceRoot":"","sources":["../../src/program-derived-address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAgC,MAAM,UAAU,CAAC;AAG9E,KAAK,QAAQ,GAAG,QAAQ,CAAC;IACrB,cAAc,EAAE,oBAAoB,CAAC;IACrC,KAAK,EAAE,IAAI,EAAE,CAAC;CACjB,CAAC,CAAC;AACH,KAAK,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;AA0ChC,wBAAsB,wBAAwB,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,QAAQ,GAAG,OAAO,CACxF,QAAQ,CAAC;IACL,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,oBAAoB,CAAC;CAC7B,CAAC,CACL,CAqBA"}
+{"version":3,"file":"program-derived-address.d.ts","sourceRoot":"","sources":["../../src/program-derived-address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+C,MAAM,WAAW,CAAC;AAGjF;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,IAAI,QAAQ,CAC1E;IAAC,OAAO,CAAC,QAAQ,CAAC;IAAE,yBAAyB;CAAC,CACjD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,MAAM,GAAG;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,MAAM,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EACpE,KAAK,EAAE,OAAO,GACf,KAAK,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAU1C;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM,EAC1E,KAAK,EAAE,OAAO,GACf,OAAO,CAAC,KAAK,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAclD;AAED,KAAK,0BAA0B,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;CACjB,CAAC,CAAC;AAEH,KAAK,SAAS,GAAG,QAAQ,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,IAAI,CAAC;CACd,CAAC,CAAC;AAEH,KAAK,IAAI,GAAG,MAAM,GAAG,UAAU,CAAC;AA0ChC,wBAAsB,wBAAwB,CAAC,EAC3C,cAAc,EACd,KAAK,GACR,EAAE,0BAA0B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAmB7D;AAED,wBAAsB,qBAAqB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAyB9G"}

package/dist/types/public-key.d.ts

@@ -1,3 +1,3 @@
-import { Base58EncodedAddress } from './base58';
-export declare function getBase58EncodedAddressFromPublicKey(publicKey: CryptoKey): Promise<Base58EncodedAddress>;
+import { Address } from './address';
+export declare function getAddressFromPublicKey(publicKey: CryptoKey): Promise<Address>;
 //# sourceMappingURL=public-key.d.ts.map

package/dist/types/public-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public-key.d.ts","sourceRoot":"","sources":["../../src/public-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAgC,MAAM,UAAU,CAAC;AAE9E,wBAAsB,oCAAoC,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAS9G"}
+{"version":3,"file":"public-key.d.ts","sourceRoot":"","sources":["../../src/public-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAqB,MAAM,WAAW,CAAC;AAEvD,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CASpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/addresses",
-  "version": "2.0.0-experimental.e36f58d",
+  "version": "2.0.0-experimental.e4483d3",
   "description": "Helpers for generating account addresses",
   "exports": {
     "browser": {
@@ -49,26 +49,27 @@
     "node": ">=17.4"
   },
   "dependencies": {
-    "@metaplex-foundation/umi-serializers": "^0.8.5",
-    "@solana/assertions": "2.0.0-experimental.e36f58d"
+    "@solana/assertions": "2.0.0-experimental.e4483d3",
+    "@solana/codecs-strings": "2.0.0-experimental.e4483d3",
+    "@solana/codecs-core": "2.0.0-experimental.e4483d3"
   },
   "devDependencies": {
     "@solana/eslint-config-solana": "^1.0.2",
-    "@swc/jest": "^0.2.27",
-    "@types/jest": "^29.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@swc/jest": "^0.2.29",
+    "@types/jest": "^29.5.6",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.3.0",
     "agadoo": "^3.0.0",
     "eslint": "^8.45.0",
-    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-jest": "^27.4.2",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "jest": "^29.6.1",
-    "jest-environment-jsdom": "^29.6.0",
-    "jest-runner-eslint": "^2.1.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-runner-eslint": "^2.1.2",
     "jest-runner-prettier": "^1.0.0",
-    "prettier": "^2.8.8",
-    "tsup": "7.2.0",
-    "typescript": "^5.1.6",
+    "prettier": "^2.8",
+    "tsup": "^8.0.1",
+    "typescript": "^5.2.2",
     "version-from-git": "^1.1.1",
     "build-scripts": "0.0.0",
     "test-config": "0.0.0",
@@ -87,11 +88,12 @@
     "compile:typedefs": "tsc -p ./tsconfig.declarations.json",
     "dev": "jest -c node_modules/test-config/jest-dev.config.ts --rootDir . --watch",
     "publish-packages": "pnpm publish --tag experimental --access public --no-git-checks",
+    "style:fix": "pnpm eslint --fix src/* && pnpm prettier -w src/* package.json",
     "test:lint": "jest -c node_modules/test-config/jest-lint.config.ts --rootDir . --silent",
     "test:prettier": "jest -c node_modules/test-config/jest-prettier.config.ts --rootDir . --silent",
     "test:treeshakability:browser": "agadoo dist/index.browser.js",
-    "test:treeshakability:native": "agadoo dist/index.node.js",
-    "test:treeshakability:node": "agadoo dist/index.native.js",
+    "test:treeshakability:native": "agadoo dist/index.native.js",
+    "test:treeshakability:node": "agadoo dist/index.node.js",
     "test:typecheck": "tsc --noEmit",
     "test:unit:browser": "jest -c node_modules/test-config/jest-unit.config.browser.ts --rootDir . --silent",
     "test:unit:node": "jest -c node_modules/test-config/jest-unit.config.node.ts --rootDir . --silent"

package/dist/types/base58.d.ts

@@ -1,10 +0,0 @@
-import { Serializer } from '@metaplex-foundation/umi-serializers';
-export type Base58EncodedAddress<TAddress extends string = string> = TAddress & {
-    readonly __base58EncodedAddress: unique symbol;
-};
-export declare function assertIsBase58EncodedAddress(putativeBase58EncodedAddress: string): asserts putativeBase58EncodedAddress is Base58EncodedAddress<typeof putativeBase58EncodedAddress>;
-export declare function getBase58EncodedAddressCodec(config?: Readonly<{
-    description: string;
-}>): Serializer<Base58EncodedAddress>;
-export declare function getBase58EncodedAddressComparator(): (x: string, y: string) => number;
-//# sourceMappingURL=base58.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"base58.d.ts","sourceRoot":"","sources":["../../src/base58.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,UAAU,EAAU,MAAM,sCAAsC,CAAC;AAElF,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,4BAA4B,CACxC,MAAM,CAAC,EAAE,QAAQ,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC,GACH,UAAU,CAAC,oBAAoB,CAAC,CAMlC;AAED,wBAAgB,iCAAiC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CASpF"}