sdk/solana: 2.0.0-beta.4 - support async token validation

tsmbl · tsmbl · commit ced9019fcf88 · 2025-05-28T21:46:24.000+03:00
diff --git a/packages/blockchain-sdk-aptos/package.json b/packages/blockchain-sdk-aptos/package.json
@@ -27,11 +27,11 @@
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
-    "@dialectlabs/sdk": "1.x",
+    "@dialectlabs/sdk": "2.x",
     "aptos": "1.3.x"
   },
   "devDependencies": {
     "aptos": "1.3.12",
-    "@dialectlabs/sdk": "^1.0.0"
+    "@dialectlabs/sdk": "^2.0.0-beta.3"
   }
 }
diff --git a/packages/blockchain-sdk-aptos/src/auth/ed25519-payload/aptos-ed25519-payload-token-validator.ts b/packages/blockchain-sdk-aptos/src/auth/ed25519-payload/aptos-ed25519-payload-token-validator.ts
@@ -17,7 +17,7 @@ export class AptosEd25519PayloadTokenValidator extends TokenValidator {
     return tokenHeader.alg === APTOS_ED25519_PAYLOAD_TOKEN_SIGNER_ALG;
   }
 
-  override isSignatureValid(token: Token): boolean {
+  override async isSignatureValid(token: Token): Promise<boolean> {
     const signedPayload = decodeURLSafe(token.base64Body);
     return sign.detached.verify(
       signedPayload,
diff --git a/packages/blockchain-sdk-aptos/src/auth/ed25519/aptos-ed25519-token-validator.ts b/packages/blockchain-sdk-aptos/src/auth/ed25519/aptos-ed25519-token-validator.ts
@@ -16,7 +16,7 @@ export class AptosEd25519TokenValidator extends TokenValidator {
     return tokenHeader.alg === APTOS_ED25519_TOKEN_SIGNER_ALG;
   }
 
-  override isSignatureValid(token: Token): boolean {
+  async isSignatureValid(token: Token): Promise<boolean> {
     const signedPayload = token.base64Header + '.' + token.base64Body;
     const signingPayload = new TextEncoder().encode(signedPayload);
     return sign.detached.verify(
diff --git a/packages/blockchain-sdk-evm/package.json b/packages/blockchain-sdk-evm/package.json
@@ -24,12 +24,12 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\""
   },
   "devDependencies": {
-    "@dialectlabs/sdk": "^1.0.0",
-    "ethers": "^5.7.2"
+    "@dialectlabs/sdk": "^2.0.0-beta.3",
+    "ethers": "^5.6.9"
   },
   "peerDependencies": {
-    "@dialectlabs/sdk": "1.x",
-    "ethers": "^5.x"
+    "@dialectlabs/sdk": "2.x",
+    "ethers": "^5.6.9"
   },
   "dependencies": {
     "ethers": "^5.7.2"
diff --git a/packages/blockchain-sdk-evm/src/auth/evm-ed25519-token-validator.ts b/packages/blockchain-sdk-evm/src/auth/evm-ed25519-token-validator.ts
@@ -3,7 +3,7 @@ import { ethers } from 'ethers';
 import { EVM_ED25519_TOKEN_SIGNER_ALG } from './evm-ed25519-token-signer';
 
 export class EvmEd25519TokenValidator extends TokenValidator {
-  isSignatureValid(token: Token): boolean {
+  async isSignatureValid(token: Token): Promise<boolean> {
     const messageBase64 = token.base64Header + '.' + token.base64Body;
     const messageHash = ethers.utils.solidityKeccak256(
       ['string'],
diff --git a/packages/blockchain-sdk-solana/package.json b/packages/blockchain-sdk-solana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dialectlabs/blockchain-sdk-solana",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "type": "module",
   "repository": "git@github.com:dialectlabs/sdk.git",
   "author": "dialectlabs",
@@ -27,11 +27,11 @@
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\""
   },
   "devDependencies": {
-    "@dialectlabs/sdk": "2.0.0-beta.3",
+    "@dialectlabs/sdk": "2.0.0-beta.4",
     "@solana/wallet-adapter-base": "^0.9.15"
   },
   "peerDependencies": {
-    "@dialectlabs/sdk": "^2.0.0-beta.3",
+    "@dialectlabs/sdk": "^2.0.0-beta.4",
     "@solana/wallet-adapter-base": "0.x"
   },
   "dependencies": {
diff --git a/packages/blockchain-sdk-solana/src/auth/ed25519/solana-ed25519-token-validator.ts b/packages/blockchain-sdk-solana/src/auth/ed25519/solana-ed25519-token-validator.ts
@@ -14,7 +14,7 @@ export class SolanaEd25519TokenValidator extends TokenValidator {
     );
   }
 
-  isSignatureValid(token: Token): boolean {
+  async isSignatureValid(token: Token): Promise<boolean> {
     const signedPayload = token.base64Header + '.' + token.base64Body;
     const signingPayload = new TextEncoder().encode(signedPayload);
     return nacl.sign.detached.verify(
diff --git a/packages/blockchain-sdk-solana/src/auth/tx/solana-tx-token-validator.ts b/packages/blockchain-sdk-solana/src/auth/tx/solana-tx-token-validator.ts
@@ -9,7 +9,7 @@ export class SolanaTxTokenValidator extends TokenValidator {
     return tokenHeader.alg === SOLANA_TX_TOKEN_SIGNER_ALG;
   }
 
-  isSignatureValid(token: Token): boolean {
+  async isSignatureValid(token: Token): Promise<boolean> {
     const byteBody = decodeURLSafe(token.base64Body);
     const tx = Transaction.from(byteBody);
     tx.recentBlockhash = PublicKey.default.toString();
diff --git a/packages/blockchain-sdk-solana/src/auth/v2/solana-v2-token-validator.ts b/packages/blockchain-sdk-solana/src/auth/v2/solana-v2-token-validator.ts
@@ -13,7 +13,7 @@ export const v2tokenValidationCache: Record<
   }
 > = {};
 
-const VALIDATION_CACHE_TTL = 1000 * 60; // 1 minute
+const VALIDATION_CACHE_TTL = 1000 * 60 * 5; // 5 minutes
 
 const validationPromises: Record<string, Promise<void>> = {};
 
@@ -26,7 +26,7 @@ export class SolanaV2TokenValidator extends TokenValidator {
     return tokenHeader.typ === 'JWT' && tokenHeader.alg === 'HS256';
   }
 
-  override isSignatureValid(token: Token): boolean {
+  override async isSignatureValid(token: Token): Promise<boolean> {
     const cachedValidation = v2tokenValidationCache[token.rawValue];
     const shouldRevalidate =
       !cachedValidation ||
@@ -35,19 +35,14 @@ export class SolanaV2TokenValidator extends TokenValidator {
         Date.now();
 
     if (shouldRevalidate) {
-      this.validateAndCache(token).catch(console.error);
+      await this.validateAndCache(token);
     }
 
-    if (!cachedValidation) {
-      return true;
-    }
-    if (!cachedValidation.isValid) {
-      return false;
-    }
-    return cachedValidation.isValid;
+    const finalValidation = v2tokenValidationCache[token.rawValue];
+    return finalValidation ? finalValidation.isValid : false;
   }
 
-  private async validateAndCache(token: Token) {
+  private async validateAndCache(token: Token): Promise<void> {
     if (validationPromises[token.rawValue]) {
       return validationPromises[token.rawValue];
     }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dialectlabs/sdk",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "type": "module",
   "repository": "git@github.com:dialectlabs/sdk.git",
   "author": "dialectlabs",
diff --git a/packages/sdk/src/auth/authentication-facade.ts b/packages/sdk/src/auth/authentication-facade.ts
@@ -14,13 +14,13 @@ export class Authenticator {
     readonly validator: TokenValidator,
   ) {}
 
-  authenticate(token: string): Token | null {
+  async authenticate(token: string): Promise<Token | null> {
     const header = this.parser.parseHeader(token);
     if (!this.validator.canValidate(header)) {
       return null;
     }
     const parsedToken = this.parser.parse(token);
-    const isValid = this.validator.isValid(parsedToken);
+    const isValid = await this.validator.isValid(parsedToken);
     if (!isValid) {
       return null;
     }
diff --git a/packages/sdk/src/auth/ed25519/ed25519-token-validator.ts b/packages/sdk/src/auth/ed25519/ed25519-token-validator.ts
@@ -8,7 +8,7 @@ export class Ed25519TokenValidator extends TokenValidator {
     return tokenHeader.alg === 'ed25519';
   }
 
-  isSignatureValid(token: Token): boolean {
+  async isSignatureValid(token: Token): Promise<boolean> {
     const signedPayload = token.base64Header + '.' + token.base64Body;
     const signingPayload = new TextEncoder().encode(signedPayload);
     return nacl.sign.detached.verify(
diff --git a/packages/sdk/src/auth/token-provider.ts b/packages/sdk/src/auth/token-provider.ts
@@ -67,7 +67,7 @@ export class CachedTokenProvider extends TokenProvider {
     const existingToken = this.getCachedToken();
     const subject = this.subject.toString();
 
-    if (existingToken && this.tokenValidator.isValid(existingToken)) {
+    if (existingToken && (await this.tokenValidator.isValid(existingToken))) {
       return existingToken;
     }
     const existingDelegatePromise = this.delegateGetPromises[subject];
@@ -96,7 +96,7 @@ export class CachedTokenProvider extends TokenProvider {
     return delegatePromise;
   }
 
-  hasValidCachedToken() {
+  async hasValidCachedToken() {
     const cachedToken = this.getCachedToken();
     if (!cachedToken) {
       return false;
diff --git a/packages/sdk/src/auth/token-validator.ts b/packages/sdk/src/auth/token-validator.ts
@@ -1,11 +1,11 @@
 import type { Token, TokenHeader } from './auth.interface';
 
 export abstract class TokenValidator {
-  isValid(token: Token): boolean {
+  async isValid(token: Token): Promise<boolean> {
     if (!this.canValidate(token.header)) {
       return false;
     }
-    if (!this.isSignatureValid(token)) {
+    if (!(await this.isSignatureValid(token))) {
       return false;
     }
     if (this.isExpired(token)) {
@@ -16,7 +16,7 @@ export abstract class TokenValidator {
 
   abstract canValidate(tokenHeader: TokenHeader): boolean;
 
-  abstract isSignatureValid(token: Token): boolean;
+  abstract isSignatureValid(token: Token): Promise<boolean>;
 
   protected performExtraValidation(token: Token): boolean {
     return true;
diff --git a/packages/sdk/src/internal/sdk/sdk-factory.ts b/packages/sdk/src/internal/sdk/sdk-factory.ts
@@ -61,10 +61,10 @@ export class InternalDialectSdk<ChainSdk extends BlockchainSdk>
     readonly blockchainSdk: ChainSdk,
   ) {}
 
-  get info(): DialectSdkInfo {
+  async info(): Promise<DialectSdkInfo> {
     return {
       supportsEndToEndEncryption: this.encryptionKeysProvider.isAvailable(),
-      hasValidAuthentication: this.tokenProvider.hasValidCachedToken(),
+      hasValidAuthentication: await this.tokenProvider.hasValidCachedToken(),
     };
   }
 }
diff --git a/packages/sdk/src/sdk/sdk.interface.ts b/packages/sdk/src/sdk/sdk.interface.ts
@@ -48,7 +48,7 @@ export interface BlockChainSdkInfo {
 }
 
 export abstract class DialectSdk<ChainSdk extends BlockchainSdk> {
-  readonly info!: DialectSdkInfo;
+  abstract info(): Promise<DialectSdkInfo>;
   readonly config!: Config;
   readonly threads!: Messaging;
   readonly dapps!: Dapps;
diff --git a/yarn.lock b/yarn.lock
@@ -493,19 +493,6 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@dialectlabs/sdk@^1.0.0":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@dialectlabs/sdk/-/sdk-1.9.5.tgz#62665841f034bdb7edcafa219a6d74b6d5a8df08"
-  integrity sha512-5aNpqA40cfzgoY1JrOmqq/ogDnDt3gk+pbhb/SAfw4glEoFNqmrwTlinyo+cRQxcdAzYl32Fb9EkCvh/J2HAYA==
-  dependencies:
-    "@stablelib/base64" "^1.0.1"
-    axios "^0.27.2"
-    bs58 "^5.0.0"
-    ed2curve "^0.3.0"
-    js-sha3 "^0.8.0"
-    nanoid "^3.3.4"
-    tweetnacl "^1.0.3"
-
 "@esbuild/aix-ppc64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@`
`27`	`27`	`"tweetnacl": "^1.0.3"`
`28`	`28`	`},`
`29`	`29`	`"peerDependencies": {`
`30`		`- "@dialectlabs/sdk": "1.x",`
	`30`	`+ "@dialectlabs/sdk": "2.x",`
`31`	`31`	`"aptos": "1.3.x"`
`32`	`32`	`},`
`33`	`33`	`"devDependencies": {`
`34`	`34`	`"aptos": "1.3.12",`
`35`		`- "@dialectlabs/sdk": "^1.0.0"`
	`35`	`+ "@dialectlabs/sdk": "^2.0.0-beta.3"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class AptosEd25519PayloadTokenValidator extends TokenValidator {`
`17`	`17`	`return tokenHeader.alg === APTOS_ED25519_PAYLOAD_TOKEN_SIGNER_ALG;`
`18`	`18`	`}`
`19`	`19`
`20`		`- override isSignatureValid(token: Token): boolean {`
	`20`	`+ override async isSignatureValid(token: Token): Promise<boolean> {`
`21`	`21`	`const signedPayload = decodeURLSafe(token.base64Body);`
`22`	`22`	`return sign.detached.verify(`
`23`	`23`	`signedPayload,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export class AptosEd25519TokenValidator extends TokenValidator {`
`16`	`16`	`return tokenHeader.alg === APTOS_ED25519_TOKEN_SIGNER_ALG;`
`17`	`17`	`}`
`18`	`18`
`19`		`- override isSignatureValid(token: Token): boolean {`
	`19`	`+ async isSignatureValid(token: Token): Promise<boolean> {`
`20`	`20`	`const signedPayload = token.base64Header + '.' + token.base64Body;`
`21`	`21`	`const signingPayload = new TextEncoder().encode(signedPayload);`
`22`	`22`	`return sign.detached.verify(`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class SolanaEd25519TokenValidator extends TokenValidator {`
`14`	`14`	`);`
`15`	`15`	`}`
`16`	`16`
`17`		`- isSignatureValid(token: Token): boolean {`
	`17`	`+ async isSignatureValid(token: Token): Promise<boolean> {`
`18`	`18`	`const signedPayload = token.base64Header + '.' + token.base64Body;`
`19`	`19`	`const signingPayload = new TextEncoder().encode(signedPayload);`
`20`	`20`	`return nacl.sign.detached.verify(`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export class SolanaTxTokenValidator extends TokenValidator {`
`9`	`9`	`return tokenHeader.alg === SOLANA_TX_TOKEN_SIGNER_ALG;`
`10`	`10`	`}`
`11`	`11`
`12`		`- isSignatureValid(token: Token): boolean {`
	`12`	`+ async isSignatureValid(token: Token): Promise<boolean> {`
`13`	`13`	`const byteBody = decodeURLSafe(token.base64Body);`
`14`	`14`	`const tx = Transaction.from(byteBody);`
`15`	`15`	`tx.recentBlockhash = PublicKey.default.toString();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dialectlabs/sdk",`
`3`		`- "version": "2.0.0-beta.3",`
	`3`	`+ "version": "2.0.0-beta.4",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"repository": "[email protected]:dialectlabs/sdk.git",`
`6`	`6`	`"author": "dialectlabs",`