feat: unified combiner for multiple signing schemes aggregation #799
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,210 @@ | ||
| import { p256 } from '@noble/curves/p256'; | ||
| import { p384 } from '@noble/curves/p384'; | ||
| import { secp256k1 } from '@noble/curves/secp256k1'; | ||
| import { hexToBytes } from '@noble/hashes/utils'; | ||
|
|
||
| import { | ||
| UnknownSignatureError, | ||
| EcdsaSigType, | ||
| SigType, | ||
| } from '@lit-protocol/constants'; | ||
| import { hashLitMessage } from '@lit-protocol/crypto'; | ||
| import { log } from '@lit-protocol/misc'; | ||
|
|
||
| import { getEoaAuthContext } from 'local-tests/setup/session-sigs/get-eoa-session-sigs'; | ||
| import { TinnyEnvironment } from 'local-tests/setup/tinny-environment'; | ||
|
|
||
| interface SigningSchemeConfig { | ||
| hasRecoveryId?: boolean; | ||
| hashesMessage: boolean; | ||
| recoversPublicKey?: boolean; | ||
| signingScheme: SigType; | ||
| } | ||
|
|
||
| // Map the right curve function per signing scheme | ||
| export const ecdsaCurveFunctions: Record<EcdsaSigType, any> = { | ||
| EcdsaK256Sha256: secp256k1, | ||
| EcdsaP256Sha256: p256, | ||
| EcdsaP384Sha384: p384, | ||
| } as const; | ||
|
|
||
| /** | ||
| * Test Commands: | ||
| * ✅ NETWORK=naga-dev yarn test:local --filter=testUseEoaSessionSigsToPkpSign | ||
| * ✅ NETWORK=naga-test yarn test:local --filter=testUseEoaSessionSigsToPkpSign | ||
| * ✅ NETWORK=custom yarn test:local --filter=testUseEoaSessionSigsToPkpSign | ||
| */ | ||
| export const testUseEoaSessionSigsToPkpSign = async ( | ||
| devEnv: TinnyEnvironment | ||
| ) => { | ||
| const alice = await devEnv.createRandomPerson(); | ||
| const signingSchemeConfigs: SigningSchemeConfig[] = [ | ||
| // BLS | ||
| // { | ||
| // signingScheme: 'Bls12381', // TODO nodes accept this signing scheme but they throw an unexpected error | ||
| // hashesMessage: false, | ||
| // }, | ||
| // { | ||
| // signingScheme: 'Bls12381G1ProofOfPossession', | ||
| // hashesMessage: false, | ||
| // }, | ||
| // ECDSA | ||
| { | ||
| hasRecoveryId: true, | ||
| hashesMessage: true, | ||
| recoversPublicKey: true, | ||
| signingScheme: 'EcdsaK256Sha256', | ||
| }, | ||
| { | ||
| hasRecoveryId: true, | ||
| hashesMessage: true, | ||
| recoversPublicKey: true, | ||
| signingScheme: 'EcdsaP256Sha256', | ||
| }, | ||
| { | ||
| hasRecoveryId: true, | ||
| hashesMessage: true, | ||
| recoversPublicKey: true, | ||
| signingScheme: 'EcdsaP384Sha384', | ||
| }, | ||
| // FROST | ||
| { | ||
| signingScheme: 'SchnorrEd25519Sha512', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrK256Sha256', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrP256Sha256', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrP384Sha384', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrRistretto25519Sha512', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrEd448Shake256', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrRedJubjubBlake2b512', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrK256Taproot', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrRedDecaf377Blake2b512', | ||
| hashesMessage: false, | ||
| }, | ||
| { | ||
| signingScheme: 'SchnorrkelSubstrate', | ||
| hashesMessage: false, | ||
| }, | ||
| ]; | ||
|
|
||
| for (const signingSchemeConfig of signingSchemeConfigs) { | ||
| try { | ||
| const signingScheme = signingSchemeConfig.signingScheme; | ||
| log(`Checking testUseEoaSessionSigsToPkpSign for ${signingSchemeConfig}`); | ||
|
|
||
| const pkpSignature = await devEnv.litNodeClient.pkpSign({ | ||
| pubKey: alice.pkp.publicKey, | ||
| authContext: getEoaAuthContext(devEnv, alice), | ||
| messageToSign: alice.loveLetter, | ||
| signingScheme, | ||
| }); | ||
|
|
||
| devEnv.releasePrivateKeyFromUser(alice); | ||
|
|
||
| // -- Combined signature format assertions | ||
| for (const hexString of [ | ||
| 'signature', | ||
|
There was a problem hiding this comment. nit: can we use zod schema instead? |
||
| 'verifyingKey', | ||
| 'signedData', | ||
| 'publicKey', | ||
| ]) { | ||
| if ( | ||
| !pkpSignature[hexString] || | ||
| !pkpSignature[hexString].startsWith('0x') | ||
| ) { | ||
| throw new Error( | ||
| `Expected "${hexString}" hex string in pkpSignature. Signing Scheme: ${signingScheme}` | ||
| ); | ||
| } | ||
| } | ||
| // Verify correct recoveryId | ||
| if ( | ||
| signingSchemeConfig.hasRecoveryId | ||
| ? ![0, 1].includes(pkpSignature.recoveryId) | ||
| : pkpSignature.recoveryId !== null | ||
| ) { | ||
| throw new Error( | ||
| `Expected "recoveryId" to be 0/1 for ECDSA and "null" for the rest of curves. Signing Scheme: ${signingScheme}` | ||
| ); | ||
| } | ||
|
|
||
| if (signingSchemeConfig.recoversPublicKey) { | ||
| const curve = ecdsaCurveFunctions[signingScheme]; | ||
|
There was a problem hiding this comment. nit: can we use zod schema here? eg. const validConfig = SigningSchemeConfigSchema.parse(signingSchemeConfig);
const validSignature = PKPSignatureSchema.parse(pkpSignature); |
||
| const signatureBytes = hexToBytes( | ||
| pkpSignature.signature.replace(/^0x/, '') | ||
| ); | ||
| const signature = curve.Signature.fromCompact( | ||
| signatureBytes | ||
| ).addRecoveryBit(pkpSignature.recoveryId); | ||
|
|
||
| const msgHash = hexToBytes(pkpSignature.signedData.replace(/^0x/, '')); | ||
| const recoveredPubKeyBytes = signature.recoverPublicKey(msgHash); | ||
| const recoveredPubKey = recoveredPubKeyBytes.toHex(false); | ||
|
|
||
| if (pkpSignature.publicKey.replace('0x', '') !== recoveredPubKey) { | ||
| throw new Error( | ||
| `Expected recovered public key to match nodesPublicKey` | ||
| ); | ||
| } | ||
| // PKP public key lives in k256, it cannot be directly compared in any other curve | ||
| if ( | ||
| signingScheme === 'EcdsaK256Sha256' && | ||
| alice.pkp.publicKey !== recoveredPubKey | ||
| ) { | ||
| throw new Error( | ||
| `Expected recovered public key to match alice.pkp.publicKey. Signing Scheme: ${signingSchemeConfig}` | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const messageHash = signingSchemeConfig.hashesMessage | ||
| ? hashLitMessage(signingScheme as EcdsaSigType, alice.loveLetter) | ||
| : alice.loveLetter; | ||
| const messageHashHex = Buffer.from(messageHash).toString('hex'); | ||
| if (pkpSignature.signedData.replace('0x', '') !== messageHashHex) { | ||
| throw new Error( | ||
| `Expected signed data to match hashLitMessage(signingScheme, alice.loveLetter). Signing Scheme: ${signingScheme}` | ||
| ); | ||
| } | ||
|
|
||
| log(`✅ testUseEoaSessionSigsToPkpSign - ${signingScheme}`); | ||
| } catch (e) { | ||
| throw new UnknownSignatureError( | ||
| { | ||
| info: { | ||
| signingSchemeConfig, | ||
| message: alice.loveLetter, | ||
| pkp: alice.pkp, | ||
| }, | ||
| cause: e, | ||
| }, | ||
| `Signature failed with signing scheme ${signingSchemeConfig.signingScheme}` | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| log('✅ testUseEoaSessionSigsToPkpSign all signing schemes'); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we have this config in
constants?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. This is just to apply more validations later in this test. Doesn't have much value in real scenarios as we are not doing signature parsing or validation anymore