@tuwaio/siwx-solana 0.4.2 → 0.5.0

package/README.md

@@ -18,7 +18,7 @@
 ## 💾 Installation
 
 ```bash
-pnpm add @tuwaio/siwx-solana @tuwaio/siwx-core @solana/kit @wallet-standard/base
+pnpm add @tuwaio/siwx-solana @tuwaio/siwx-core @tuwaio/orbit-core @solana/kit @wallet-standard/base
 ```
 
 > [!IMPORTANT]

package/dist/index.js

@@ -1 +1 @@
-'use strict';var kit=require('@solana/kit'),siwxCore=require('@tuwaio/siwx-core');function W(e,n){if(e===n)return  true;if(e.length!==n.length)return  false;for(let s=0;s<e.length;s++)if(e[s]!==n[s])return  false;return  true}function v(e,n){if(typeof e?.modifyAndSignMessages=="function")return e;if(typeof n?.modifyAndSignMessages=="function")return n;let s=n?.features,t=e?.features,r;Array.isArray(s)&&s.includes("solana:signMessage"),t&&typeof t=="object"&&!Array.isArray(t)&&(r=t["solana:signMessage"]);let i=e?.adapter??n?.adapter,o=e?.signMessage??i?.signMessage??n?.signMessage,l=e?.signMessages??n?.signMessages;if(!r&&!o&&!l)throw new Error("[SIWX-SOLANA] Signer lacks known message signing capabilities.");let a=String(n?.address??e?.address??"solana:signer");return {address:a,async modifyAndSignMessages(g,p={}){if(p.abortSignal?.aborted)throw new Error("Aborted");if(g.length===0)return g;let y=[];for(let m=0;m<g.length;m++){let d=g[m],c,S;if(r){let u=[{account:n,message:d.content}],A=(await r.signMessage(...u))[0];if(!A||!A.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessage output.");c=A.signature,S=A.signedMessage??d.content;}else if(typeof l=="function"){let f=(await l([{account:n,message:d.content}]))[0];if(!f||!f.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessages output.");c=f.signature,S=f.signedMessage??d.content;}else if(typeof o=="function"){let u=await o.call(i??e??n,d.content);if(S=d.content,u instanceof Uint8Array||u&&u.buffer instanceof ArrayBuffer)c=u;else if(u&&typeof u=="object"&&"signature"in u)c=u.signature;else throw new Error("[SIWX-SOLANA] Unexpected legacy signMessage result format.")}else throw new Error("[SIWX-SOLANA] Missing signing implementation.");let h=d.content.length!==S.length||d.content.some((u,f)=>u!==S[f]),b=d.signatures[a];if(!(b===void 0||!W(b,c))&&!h){y.push(d);continue}let U=h?{[a]:c}:{...d.signatures,[a]:c};y.push(Object.freeze({content:S,signatures:Object.freeze(U)}));}return y}}}function P(e){return async n=>{try{if(!e)throw new Error("[SIWX-SOLANA] Invalid signer target.");let{wallet:s,account:t}=e,r=s??e,i=t??e,l=kit.getUtf8Encoder().encode(n),a=v(r,i),g=kit.createSignableMessage(l),M=(await a.modifyAndSignMessages([g]))[0];if(!M)throw new Error("[SIWX-SOLANA] No signed message returned.");let y=M.signatures[a.address];if(!y)throw new Error(`[SIWX-SOLANA] Signature missing for address: ${a.address}`);return kit.getBase58Decoder().decode(y)}catch(s){throw new Error(`[SIWX-SOLANA] Signing failed: ${s.message}`,{cause:s})}}}function x(e){let n="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",s=new Map(n.split("").map((a,g)=>[a,BigInt(g)])),t=0n;for(let a of e){let g=s.get(a);if(g===void 0)throw new siwxCore.SiwxVerificationError(`Invalid base58 character: "${a}"`);t=t*58n+g;}let r=t.toString(16);r.length%2!==0&&(r="0"+r);let i=[];for(let a=0;a<r.length;a+=2)i.push(parseInt(r.slice(a,a+2),16));let o=0;for(let a of e)if(a==="1")o++;else break;let l=new Uint8Array(o+i.length);return l.set(i,o),l}function V(e){let n=e.split(":");if(n.length!==3||n[0]!=="solana")throw new siwxCore.SiwxVerificationError(`Expected solana CAIP-10 address format. Got: "${e}"`);return n[2]}function j(e){let n="output"in e?e.output:e,s="signedMessage"in n?n.signedMessage:n.message,t=n.signature,r,i;s instanceof Uint8Array?(i=s,r=new TextDecoder().decode(s)):(r=s,i=new TextEncoder().encode(s));let o;return t instanceof Uint8Array?o=t:o=x(t),{messageString:r,messageBytes:i,signatureBytes:o}}async function R(e,n){try{let{messageString:s,messageBytes:t,signatureBytes:r}=j(e),i=siwxCore.parseMessage(s);if(!i.chainId.startsWith("solana:"))throw new siwxCore.SiwxUnsupportedNamespaceError(i.chainId.split(":")[0]??"unknown");if(r.length!==64)throw new siwxCore.SiwxVerificationError(`Invalid Solana signature length: ${r.length} bytes (expected 64)`);let o=siwxCore.validateMessage(i,{skipExpiration:n?.skipExpiration,policy:{enforceNotBefore:!0}});if(!o.valid)throw new siwxCore.SiwxValidationError(o.errors);let l=V(i.address),a=kit.address(l),g=x(a),p=await globalThis.crypto.subtle.importKey("raw",g.buffer,{name:"Ed25519"},!1,["verify"]);if(!await globalThis.crypto.subtle.verify({name:"Ed25519"},p,r.buffer,t.buffer))throw new siwxCore.SiwxVerificationError(`ed25519 signature verification failed for address: ${l}`);return {success:!0,data:i}}catch(s){return s instanceof siwxCore.SiwxVerificationError||s instanceof siwxCore.SiwxValidationError?{success:false,error:s.message}:{success:false,error:`ed25519 verification failed: ${String(s)}`}}}exports.createSolanaSiwxSigner=P;exports.verifyEd25519=R;
+'use strict';var kit=require('@solana/kit'),orbitCore=require('@tuwaio/orbit-core'),siwxCore=require('@tuwaio/siwx-core');function W(e,s){if(e===s)return  true;if(e.length!==s.length)return  false;for(let n=0;n<e.length;n++)if(e[n]!==s[n])return  false;return  true}function v(e,s){if(typeof e?.modifyAndSignMessages=="function")return e;if(typeof s?.modifyAndSignMessages=="function")return s;let n=s?.features,t=e?.features,r;Array.isArray(n)&&n.includes("solana:signMessage"),t&&typeof t=="object"&&!Array.isArray(t)&&(r=t["solana:signMessage"]);let i=e?.adapter??s?.adapter,o=e?.signMessage??i?.signMessage??s?.signMessage,l=e?.signMessages??s?.signMessages;if(!r&&!o&&!l)throw new Error("[SIWX-SOLANA] Signer lacks known message signing capabilities.");let a=String(s?.address??e?.address??"solana:signer");return {address:a,async modifyAndSignMessages(g,M={}){if(M.abortSignal?.aborted)throw new Error("Aborted");if(g.length===0)return g;let c=[];for(let A=0;A<g.length;A++){let d=g[A],f,S;if(r){let u=[{account:s,message:d.content}],m=(await r.signMessage(...u))[0];if(!m||!m.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessage output.");f=m.signature,S=m.signedMessage??d.content;}else if(typeof l=="function"){let y=(await l([{account:s,message:d.content}]))[0];if(!y||!y.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessages output.");f=y.signature,S=y.signedMessage??d.content;}else if(typeof o=="function"){let u=await o.call(i??e??s,d.content);if(S=d.content,u instanceof Uint8Array||u&&u.buffer instanceof ArrayBuffer)f=u;else if(u&&typeof u=="object"&&"signature"in u)f=u.signature;else throw new Error("[SIWX-SOLANA] Unexpected legacy signMessage result format.")}else throw new Error("[SIWX-SOLANA] Missing signing implementation.");let b=d.content.length!==S.length||d.content.some((u,y)=>u!==S[y]),h=d.signatures[a];if(!(h===void 0||!W(h,f))&&!b){c.push(d);continue}let U=b?{[a]:f}:{...d.signatures,[a]:f};c.push(Object.freeze({content:S,signatures:Object.freeze(U)}));}return c}}}function P(e){return async s=>{try{if(!e)throw new Error("[SIWX-SOLANA] Invalid signer target.");let{wallet:n,account:t}=e,r=n??e,i=t??e,l=kit.getUtf8Encoder().encode(s),a=v(r,i),g=kit.createSignableMessage(l),p=(await a.modifyAndSignMessages([g]))[0];if(!p)throw new Error("[SIWX-SOLANA] No signed message returned.");let c=p.signatures[a.address];if(!c)throw new Error(`[SIWX-SOLANA] Signature missing for address: ${a.address}`);return kit.getBase58Decoder().decode(c)}catch(n){throw new Error(`[SIWX-SOLANA] Signing failed: ${n.message}`,{cause:n})}}}function x(e){let s="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",n=new Map(s.split("").map((a,g)=>[a,BigInt(g)])),t=0n;for(let a of e){let g=n.get(a);if(g===void 0)throw new siwxCore.SiwxVerificationError(`Invalid base58 character: "${a}"`);t=t*58n+g;}let r=t.toString(16);r.length%2!==0&&(r="0"+r);let i=[];for(let a=0;a<r.length;a+=2)i.push(parseInt(r.slice(a,a+2),16));let o=0;for(let a of e)if(a==="1")o++;else break;let l=new Uint8Array(o+i.length);return l.set(i,o),l}function R(e){let s="output"in e?e.output:e,n="signedMessage"in s?s.signedMessage:s.message,t=s.signature,r,i;n instanceof Uint8Array?(i=n,r=new TextDecoder().decode(n)):(r=n,i=new TextEncoder().encode(n));let o;return t instanceof Uint8Array?o=t:o=x(t),{messageString:r,messageBytes:i,signatureBytes:o}}async function X(e,s){try{let{messageString:n,messageBytes:t,signatureBytes:r}=R(e),i=siwxCore.parseMessage(n),o=orbitCore.parseCaip2ChainId(i.chainId)?.namespace;if(o!=="solana")throw new siwxCore.SiwxUnsupportedNamespaceError(o??"unknown");if(r.length!==64)throw new siwxCore.SiwxVerificationError(`Invalid Solana signature length: ${r.length} bytes (expected 64)`);let l=siwxCore.validateMessage(i,{skipExpiration:s?.skipExpiration,policy:{enforceNotBefore:!0}});if(!l.valid)throw new siwxCore.SiwxValidationError(l.errors);let a=orbitCore.parseCaip10AccountId(i.address);if(a?.namespace!=="solana")throw new siwxCore.SiwxVerificationError(`Expected solana CAIP-10 address format. Got: "${i.address}"`);let g=a.address,M=kit.address(g),p=x(M),c=await globalThis.crypto.subtle.importKey("raw",p.buffer,{name:"Ed25519"},!1,["verify"]);if(!await globalThis.crypto.subtle.verify({name:"Ed25519"},c,r.buffer,t.buffer))throw new siwxCore.SiwxVerificationError(`ed25519 signature verification failed for address: ${g}`);return {success:!0,data:i}}catch(n){return n instanceof siwxCore.SiwxVerificationError||n instanceof siwxCore.SiwxValidationError?{success:false,error:n.message}:{success:false,error:`ed25519 verification failed: ${String(n)}`}}}exports.createSolanaSiwxSigner=P;exports.verifyEd25519=X;

package/dist/index.mjs

@@ -1 +1 @@
-import {getUtf8Encoder,createSignableMessage,getBase58Decoder,address}from'@solana/kit';import {parseMessage,SiwxUnsupportedNamespaceError,SiwxVerificationError,validateMessage,SiwxValidationError}from'@tuwaio/siwx-core';function W(e,n){if(e===n)return  true;if(e.length!==n.length)return  false;for(let s=0;s<e.length;s++)if(e[s]!==n[s])return  false;return  true}function v(e,n){if(typeof e?.modifyAndSignMessages=="function")return e;if(typeof n?.modifyAndSignMessages=="function")return n;let s=n?.features,t=e?.features,r;Array.isArray(s)&&s.includes("solana:signMessage"),t&&typeof t=="object"&&!Array.isArray(t)&&(r=t["solana:signMessage"]);let i=e?.adapter??n?.adapter,o=e?.signMessage??i?.signMessage??n?.signMessage,l=e?.signMessages??n?.signMessages;if(!r&&!o&&!l)throw new Error("[SIWX-SOLANA] Signer lacks known message signing capabilities.");let a=String(n?.address??e?.address??"solana:signer");return {address:a,async modifyAndSignMessages(g,p={}){if(p.abortSignal?.aborted)throw new Error("Aborted");if(g.length===0)return g;let y=[];for(let m=0;m<g.length;m++){let d=g[m],c,S;if(r){let u=[{account:n,message:d.content}],A=(await r.signMessage(...u))[0];if(!A||!A.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessage output.");c=A.signature,S=A.signedMessage??d.content;}else if(typeof l=="function"){let f=(await l([{account:n,message:d.content}]))[0];if(!f||!f.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessages output.");c=f.signature,S=f.signedMessage??d.content;}else if(typeof o=="function"){let u=await o.call(i??e??n,d.content);if(S=d.content,u instanceof Uint8Array||u&&u.buffer instanceof ArrayBuffer)c=u;else if(u&&typeof u=="object"&&"signature"in u)c=u.signature;else throw new Error("[SIWX-SOLANA] Unexpected legacy signMessage result format.")}else throw new Error("[SIWX-SOLANA] Missing signing implementation.");let h=d.content.length!==S.length||d.content.some((u,f)=>u!==S[f]),b=d.signatures[a];if(!(b===void 0||!W(b,c))&&!h){y.push(d);continue}let U=h?{[a]:c}:{...d.signatures,[a]:c};y.push(Object.freeze({content:S,signatures:Object.freeze(U)}));}return y}}}function P(e){return async n=>{try{if(!e)throw new Error("[SIWX-SOLANA] Invalid signer target.");let{wallet:s,account:t}=e,r=s??e,i=t??e,l=getUtf8Encoder().encode(n),a=v(r,i),g=createSignableMessage(l),M=(await a.modifyAndSignMessages([g]))[0];if(!M)throw new Error("[SIWX-SOLANA] No signed message returned.");let y=M.signatures[a.address];if(!y)throw new Error(`[SIWX-SOLANA] Signature missing for address: ${a.address}`);return getBase58Decoder().decode(y)}catch(s){throw new Error(`[SIWX-SOLANA] Signing failed: ${s.message}`,{cause:s})}}}function x(e){let n="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",s=new Map(n.split("").map((a,g)=>[a,BigInt(g)])),t=0n;for(let a of e){let g=s.get(a);if(g===void 0)throw new SiwxVerificationError(`Invalid base58 character: "${a}"`);t=t*58n+g;}let r=t.toString(16);r.length%2!==0&&(r="0"+r);let i=[];for(let a=0;a<r.length;a+=2)i.push(parseInt(r.slice(a,a+2),16));let o=0;for(let a of e)if(a==="1")o++;else break;let l=new Uint8Array(o+i.length);return l.set(i,o),l}function V(e){let n=e.split(":");if(n.length!==3||n[0]!=="solana")throw new SiwxVerificationError(`Expected solana CAIP-10 address format. Got: "${e}"`);return n[2]}function j(e){let n="output"in e?e.output:e,s="signedMessage"in n?n.signedMessage:n.message,t=n.signature,r,i;s instanceof Uint8Array?(i=s,r=new TextDecoder().decode(s)):(r=s,i=new TextEncoder().encode(s));let o;return t instanceof Uint8Array?o=t:o=x(t),{messageString:r,messageBytes:i,signatureBytes:o}}async function R(e,n){try{let{messageString:s,messageBytes:t,signatureBytes:r}=j(e),i=parseMessage(s);if(!i.chainId.startsWith("solana:"))throw new SiwxUnsupportedNamespaceError(i.chainId.split(":")[0]??"unknown");if(r.length!==64)throw new SiwxVerificationError(`Invalid Solana signature length: ${r.length} bytes (expected 64)`);let o=validateMessage(i,{skipExpiration:n?.skipExpiration,policy:{enforceNotBefore:!0}});if(!o.valid)throw new SiwxValidationError(o.errors);let l=V(i.address),a=address(l),g=x(a),p=await globalThis.crypto.subtle.importKey("raw",g.buffer,{name:"Ed25519"},!1,["verify"]);if(!await globalThis.crypto.subtle.verify({name:"Ed25519"},p,r.buffer,t.buffer))throw new SiwxVerificationError(`ed25519 signature verification failed for address: ${l}`);return {success:!0,data:i}}catch(s){return s instanceof SiwxVerificationError||s instanceof SiwxValidationError?{success:false,error:s.message}:{success:false,error:`ed25519 verification failed: ${String(s)}`}}}export{P as createSolanaSiwxSigner,R as verifyEd25519};
+import {getUtf8Encoder,createSignableMessage,getBase58Decoder,address}from'@solana/kit';import {parseCaip2ChainId,parseCaip10AccountId}from'@tuwaio/orbit-core';import {parseMessage,SiwxUnsupportedNamespaceError,SiwxVerificationError,validateMessage,SiwxValidationError}from'@tuwaio/siwx-core';function W(e,s){if(e===s)return  true;if(e.length!==s.length)return  false;for(let n=0;n<e.length;n++)if(e[n]!==s[n])return  false;return  true}function v(e,s){if(typeof e?.modifyAndSignMessages=="function")return e;if(typeof s?.modifyAndSignMessages=="function")return s;let n=s?.features,t=e?.features,r;Array.isArray(n)&&n.includes("solana:signMessage"),t&&typeof t=="object"&&!Array.isArray(t)&&(r=t["solana:signMessage"]);let i=e?.adapter??s?.adapter,o=e?.signMessage??i?.signMessage??s?.signMessage,l=e?.signMessages??s?.signMessages;if(!r&&!o&&!l)throw new Error("[SIWX-SOLANA] Signer lacks known message signing capabilities.");let a=String(s?.address??e?.address??"solana:signer");return {address:a,async modifyAndSignMessages(g,M={}){if(M.abortSignal?.aborted)throw new Error("Aborted");if(g.length===0)return g;let c=[];for(let A=0;A<g.length;A++){let d=g[A],f,S;if(r){let u=[{account:s,message:d.content}],m=(await r.signMessage(...u))[0];if(!m||!m.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessage output.");f=m.signature,S=m.signedMessage??d.content;}else if(typeof l=="function"){let y=(await l([{account:s,message:d.content}]))[0];if(!y||!y.signature)throw new Error("[SIWX-SOLANA] Wallet returned invalid signMessages output.");f=y.signature,S=y.signedMessage??d.content;}else if(typeof o=="function"){let u=await o.call(i??e??s,d.content);if(S=d.content,u instanceof Uint8Array||u&&u.buffer instanceof ArrayBuffer)f=u;else if(u&&typeof u=="object"&&"signature"in u)f=u.signature;else throw new Error("[SIWX-SOLANA] Unexpected legacy signMessage result format.")}else throw new Error("[SIWX-SOLANA] Missing signing implementation.");let b=d.content.length!==S.length||d.content.some((u,y)=>u!==S[y]),h=d.signatures[a];if(!(h===void 0||!W(h,f))&&!b){c.push(d);continue}let U=b?{[a]:f}:{...d.signatures,[a]:f};c.push(Object.freeze({content:S,signatures:Object.freeze(U)}));}return c}}}function P(e){return async s=>{try{if(!e)throw new Error("[SIWX-SOLANA] Invalid signer target.");let{wallet:n,account:t}=e,r=n??e,i=t??e,l=getUtf8Encoder().encode(s),a=v(r,i),g=createSignableMessage(l),p=(await a.modifyAndSignMessages([g]))[0];if(!p)throw new Error("[SIWX-SOLANA] No signed message returned.");let c=p.signatures[a.address];if(!c)throw new Error(`[SIWX-SOLANA] Signature missing for address: ${a.address}`);return getBase58Decoder().decode(c)}catch(n){throw new Error(`[SIWX-SOLANA] Signing failed: ${n.message}`,{cause:n})}}}function x(e){let s="123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",n=new Map(s.split("").map((a,g)=>[a,BigInt(g)])),t=0n;for(let a of e){let g=n.get(a);if(g===void 0)throw new SiwxVerificationError(`Invalid base58 character: "${a}"`);t=t*58n+g;}let r=t.toString(16);r.length%2!==0&&(r="0"+r);let i=[];for(let a=0;a<r.length;a+=2)i.push(parseInt(r.slice(a,a+2),16));let o=0;for(let a of e)if(a==="1")o++;else break;let l=new Uint8Array(o+i.length);return l.set(i,o),l}function R(e){let s="output"in e?e.output:e,n="signedMessage"in s?s.signedMessage:s.message,t=s.signature,r,i;n instanceof Uint8Array?(i=n,r=new TextDecoder().decode(n)):(r=n,i=new TextEncoder().encode(n));let o;return t instanceof Uint8Array?o=t:o=x(t),{messageString:r,messageBytes:i,signatureBytes:o}}async function X(e,s){try{let{messageString:n,messageBytes:t,signatureBytes:r}=R(e),i=parseMessage(n),o=parseCaip2ChainId(i.chainId)?.namespace;if(o!=="solana")throw new SiwxUnsupportedNamespaceError(o??"unknown");if(r.length!==64)throw new SiwxVerificationError(`Invalid Solana signature length: ${r.length} bytes (expected 64)`);let l=validateMessage(i,{skipExpiration:s?.skipExpiration,policy:{enforceNotBefore:!0}});if(!l.valid)throw new SiwxValidationError(l.errors);let a=parseCaip10AccountId(i.address);if(a?.namespace!=="solana")throw new SiwxVerificationError(`Expected solana CAIP-10 address format. Got: "${i.address}"`);let g=a.address,M=address(g),p=x(M),c=await globalThis.crypto.subtle.importKey("raw",p.buffer,{name:"Ed25519"},!1,["verify"]);if(!await globalThis.crypto.subtle.verify({name:"Ed25519"},c,r.buffer,t.buffer))throw new SiwxVerificationError(`ed25519 signature verification failed for address: ${g}`);return {success:!0,data:i}}catch(n){return n instanceof SiwxVerificationError||n instanceof SiwxValidationError?{success:false,error:n.message}:{success:false,error:`ed25519 verification failed: ${String(n)}`}}}export{P as createSolanaSiwxSigner,X as verifyEd25519};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuwaio/siwx-solana",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "private": false,
   "author": "Oleksandr Tkach",
   "license": "Apache-2.0",
@@ -45,12 +45,14 @@
     }
   ],
   "peerDependencies": {
-    "@tuwaio/siwx-core": "0.4.1",
+    "@tuwaio/orbit-core": ">=0.5",
+    "@tuwaio/siwx-core": ">=0.4.1",
     "@wallet-standard/base": ">=1.1.1",
     "@solana/kit": ">=8.2"
   },
   "devDependencies": {
-    "@tuwaio/siwx-core": "0.4.1",
+    "@tuwaio/orbit-core": "^0.5.0",
+    "@tuwaio/siwx-core": "0.6.0",
     "@wallet-standard/base": "^1.1.1",
     "@solana/kit": "^8.4.0",
     "tsup": "^8.5.1",