@@ -3,7 +3,7 @@ import { ed25519 } from '@noble/curves/ed25519';
3
3
import { sha256 } from '@noble/hashes/sha256' ;
4
4
import { Buffer } from 'buffer' ;
5
5
import asn1 from 'asn1-parser' ;
6
- import { KeyPair } from '@near-js/crypto' ;
6
+ import { KeyPair , KeyPairEd25519 } from '@near-js/crypto' ;
7
7
import { baseEncode } from '@near-js/utils' ;
8
8
import {
9
9
validateUsername ,
@@ -18,7 +18,6 @@ import {
18
18
} from './utils' ;
19
19
import { Fido2 } from './fido2' ;
20
20
import type { AssertionResponse } from './type' ;
21
- import { KeyPairString } from '@near-js/crypto' ;
22
21
23
22
const CHALLENGE_TIMEOUT_MS = 90 * 1000 ;
24
23
const RP_NAME = 'NEAR_API_JS_WEBAUTHN' ;
@@ -87,7 +86,7 @@ export const createKey = async (username: string): Promise<KeyPair> => {
87
86
const publicKeyBytes = get64BytePublicKeyFromPEM ( publicKey ) ;
88
87
const secretKey = sha256 . create ( ) . update ( Buffer . from ( publicKeyBytes ) ) . digest ( ) ;
89
88
const pubKey = ed25519 . getPublicKey ( secretKey ) ;
90
- return KeyPair . fromString ( baseEncode ( new Uint8Array ( Buffer . concat ( [ Buffer . from ( secretKey ) , Buffer . from ( pubKey ) ] ) ) ) as KeyPairString ) ;
89
+ return new KeyPairEd25519 ( baseEncode ( Buffer . concat ( [ Buffer . from ( secretKey ) , Buffer . from ( pubKey ) ] ) ) ) ;
91
90
} ) ;
92
91
} ;
93
92
@@ -130,8 +129,8 @@ export const getKeys = async (username: string): Promise<[KeyPair, KeyPair]> =>
130
129
const firstEDPublic = ed25519 . getPublicKey ( firstEDSecret ) ;
131
130
const secondEDSecret = sha256 . create ( ) . update ( Buffer . from ( correctPKs [ 1 ] ) ) . digest ( ) ;
132
131
const secondEDPublic = ed25519 . getPublicKey ( secondEDSecret ) ;
133
- const firstKeyPair = KeyPair . fromString ( baseEncode ( new Uint8Array ( Buffer . concat ( [ Buffer . from ( firstEDSecret ) , Buffer . from ( firstEDPublic ) ] ) ) ) as KeyPairString ) ;
134
- const secondKeyPair = KeyPair . fromString ( baseEncode ( new Uint8Array ( Buffer . concat ( [ Buffer . from ( secondEDSecret ) , Buffer . from ( secondEDPublic ) ] ) ) ) as KeyPairString ) ;
132
+ const firstKeyPair = new KeyPairEd25519 ( baseEncode ( Buffer . concat ( [ Buffer . from ( firstEDSecret ) , Buffer . from ( firstEDPublic ) ] ) ) ) ;
133
+ const secondKeyPair = new KeyPairEd25519 ( baseEncode ( Buffer . concat ( [ Buffer . from ( secondEDSecret ) , Buffer . from ( secondEDPublic ) ] ) ) ) ;
135
134
return [ firstKeyPair , secondKeyPair ] ;
136
135
} ) ;
137
136
} ;
0 commit comments