From 07ad35f88012d03da7bd6d3ef1c1d2f38e624290 Mon Sep 17 00:00:00 2001 From: Moein zargarzadeh Date: Wed, 6 Nov 2024 13:24:29 +0330 Subject: [PATCH 1/4] fix tsconfig --- services/keygen-service/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/services/keygen-service/tsconfig.json b/services/keygen-service/tsconfig.json index 0540f57..3e7a3dd 100644 --- a/services/keygen-service/tsconfig.json +++ b/services/keygen-service/tsconfig.json @@ -17,6 +17,7 @@ "outDir": "./dist" }, "include": ["./**/*.ts"], + "exclude": ["dist"], "ts-node": { "esm": true } From f5d095f12d8119b59e366b941a9e005fe315e853 Mon Sep 17 00:00:00 2001 From: Moein zargarzadeh Date: Wed, 6 Nov 2024 13:24:51 +0330 Subject: [PATCH 2/4] add README --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..0a1240f --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# Rosen Bridge Sign Protocols + +A monorepo containing all the packages related to Rosen Bridge Signing process. It contains the following packages: + +1. [keygen-service](./services/keygen-service/README.md): Keygen service is a tool top of [tss-api](./services/tss-api/README.md) for setup keygen ceremony for new guards. +2. [tss-api](./services/tss-api/README.md): A service for keygen, sign and regroup operations on eddsa and ecdsa protocols in threshold signature. +3. [communication](./packages/communication/README.md): A package that abstractly manages communication between endpoints. +4. [encryption](./packages/encryption/README.md): unify encryption interface. +5. [detection](./packages/detection/README.md): A package that finds available endpoints in private network. +6. [tss](./packages/tss/README.md): A package for building and validating TSS signatures. +7. [ergo-multi-sig](./packages/ergo-multi-sig/README.md): A package that manage multi signature protocol for ergo network. + +For more info on how each of the packages works, refer to their specific page. From 23888db214c85a33ed134a8e12fc0a851fb4cd11 Mon Sep 17 00:00:00 2001 From: Moein zargarzadeh Date: Fri, 8 Nov 2024 13:27:36 +0330 Subject: [PATCH 3/4] refactor classes to pass encryptor from external sources --- packages/communication/lib/Communicator.ts | 16 ++--- .../communication/tests/Comunicator.spec.ts | 34 ++++++----- packages/detection/lib/GuardDetection.ts | 4 +- packages/detection/lib/interfaces/types.ts | 2 +- .../detection/tests/GuardDetection.spec.ts | 18 +++--- .../ergo-multi-sig/lib/MultiSigHandler.ts | 3 +- packages/ergo-multi-sig/lib/types.ts | 2 + .../tests/MultiSigUtils.spec.ts | 7 --- .../tests/testUtils/TestUtils.ts | 5 +- packages/tss/lib/tss/EcdsaSigner.ts | 8 +-- packages/tss/lib/tss/EddsaSigner.ts | 8 +-- packages/tss/lib/tss/TssSigner.ts | 18 +++--- packages/tss/lib/types/signer.ts | 14 +---- packages/tss/tests/tss/EcdsaSigner.spec.ts | 6 +- packages/tss/tests/tss/EddsaSigner.spec.ts | 6 +- packages/tss/tests/tss/TssSigner.spec.ts | 59 ++++++++++--------- 16 files changed, 102 insertions(+), 108 deletions(-) diff --git a/packages/communication/lib/Communicator.ts b/packages/communication/lib/Communicator.ts index 644b3dd..4805be1 100644 --- a/packages/communication/lib/Communicator.ts +++ b/packages/communication/lib/Communicator.ts @@ -5,7 +5,7 @@ import { guardMessageValidTimeoutDefault } from './const/const'; export abstract class Communicator { protected logger: AbstractLogger; - protected signer: EncryptionHandler; + protected messageEnc: EncryptionHandler; private readonly submitMessage: ( msg: string, peers: Array, @@ -21,13 +21,13 @@ export abstract class Communicator { protected constructor( logger: AbstractLogger, - signer: EncryptionHandler, + messageEnc: EncryptionHandler, submitMessage: (msg: string, peers: Array) => unknown, guardPks: Array, messageValidDurationSeconds?: number, ) { this.logger = logger; - this.signer = signer; + this.messageEnc = messageEnc; this.guardPks = guardPks; this.submitMessage = submitMessage; this.messageValidDuration = messageValidDurationSeconds @@ -40,7 +40,7 @@ export abstract class Communicator { */ protected getIndex = async () => { if (this.index === -1) { - const pk = await this.signer.getPk(); + const pk = await this.messageEnc.getPk(); this.index = this.guardPks.indexOf(pk); } return this.index; @@ -66,8 +66,8 @@ export abstract class Communicator { * @param timestamp */ signPayload = async (payload: any, timestamp: number) => { - const publicKey = await this.signer.getPk(); - return await this.signer.sign( + const publicKey = await this.messageEnc.getPk(); + return await this.messageEnc.sign( Communicator.generatePayloadToSign(payload, timestamp, publicKey), ); }; @@ -92,7 +92,7 @@ export abstract class Communicator { )} to ${JSON.stringify(peers)}`, ); timestamp = timestamp ? timestamp : this.getDate(); - const publicKey = await this.signer.getPk(); + const publicKey = await this.messageEnc.getPk(); const payloadSign = await this.signPayload(payload, timestamp); const message: CommunicationMessage = { type: messageType, @@ -142,7 +142,7 @@ export abstract class Communicator { return; } if ( - !(await this.signer.verify( + !(await this.messageEnc.verify( Communicator.generatePayloadToSign( msg.payload, msg.timestamp, diff --git a/packages/communication/tests/Comunicator.spec.ts b/packages/communication/tests/Comunicator.spec.ts index b3a5f53..bd63693 100644 --- a/packages/communication/tests/Comunicator.spec.ts +++ b/packages/communication/tests/Comunicator.spec.ts @@ -5,19 +5,23 @@ import { describe, expect, it, vi, beforeEach } from 'vitest'; describe('Communicator', () => { let communicator: TestCommunicator; let mockSubmit = vi.fn(); - let guardSigners: Array; + let guardMessageEncs: Array; const payload = { foo: 'bar' }; beforeEach(async () => { - guardSigners = []; + guardMessageEncs = []; const guardPks: Array = []; for (let index = 0; index < 10; index++) { const sk = new EdDSA(await EdDSA.randomKey()); - guardSigners.push(sk); + guardMessageEncs.push(sk); guardPks.push(await sk.getPk()); } mockSubmit = vi.fn(); - communicator = new TestCommunicator(guardSigners[1], mockSubmit, guardPks); + communicator = new TestCommunicator( + guardMessageEncs[1], + mockSubmit, + guardPks, + ); }); describe('getDate', () => { @@ -51,8 +55,8 @@ describe('Communicator', () => { */ it('should call submit message', async () => { const currentTime = 1685683141; - const publicKey = await guardSigners[1].getPk(); - const sign = await guardSigners[1].sign( + const publicKey = await guardMessageEncs[1].getPk(); + const sign = await guardMessageEncs[1].sign( `${JSON.stringify(payload)}${currentTime}${publicKey}`, ); vi.spyOn(Date, 'now').mockReturnValue(currentTime * 1000); @@ -84,8 +88,8 @@ describe('Communicator', () => { */ it('should pass arguments to process message function when sign is valid', async () => { const currentTime = 1685683142; - const publicKey = await guardSigners[2].getPk(); - const sign = await guardSigners[2].sign( + const publicKey = await guardMessageEncs[2].getPk(); + const sign = await guardMessageEncs[2].sign( `${JSON.stringify(payload)}${currentTime}${publicKey}`, ); vi.spyOn(Date, 'now').mockReturnValue(currentTime * 1000); @@ -120,15 +124,15 @@ describe('Communicator', () => { */ it('should not call processMessage when signature is not valid', async () => { const currentTime = 1685683143; - const publicKey = await guardSigners[2].getPk(); - const sign = await guardSigners[2].sign( + const publicKey = await guardMessageEncs[2].getPk(); + const sign = await guardMessageEncs[2].sign( `${JSON.stringify(payload)}${currentTime}${publicKey}`, ); vi.spyOn(Date, 'now').mockReturnValue(currentTime * 1000); const message = { type: 'message', payload: payload, - publicKey: await guardSigners[3].getPk(), + publicKey: await guardMessageEncs[3].getPk(), timestamp: currentTime, sign: sign, index: 3, @@ -148,8 +152,8 @@ describe('Communicator', () => { */ it('should not call processMessage when signer public key differ from index', async () => { const currentTime = 1685683144; - const publicKey = await guardSigners[2].getPk(); - const sign = await guardSigners[2].sign( + const publicKey = await guardMessageEncs[2].getPk(); + const sign = await guardMessageEncs[2].sign( `${JSON.stringify(payload)}${currentTime}${publicKey}`, ); vi.spyOn(Date, 'now').mockReturnValue(currentTime * 1000); @@ -177,8 +181,8 @@ describe('Communicator', () => { */ it('should not call processMessage when message timed out', async () => { const currentTime = 1685683145; - const publicKey = await guardSigners[2].getPk(); - const sign = await guardSigners[2].sign( + const publicKey = await guardMessageEncs[2].getPk(); + const sign = await guardMessageEncs[2].sign( `${JSON.stringify(payload)}${currentTime - 60001}${publicKey}`, ); vi.spyOn(Date, 'now').mockReturnValue(currentTime * 1000); diff --git a/packages/detection/lib/GuardDetection.ts b/packages/detection/lib/GuardDetection.ts index 76eb86d..b81d241 100644 --- a/packages/detection/lib/GuardDetection.ts +++ b/packages/detection/lib/GuardDetection.ts @@ -39,7 +39,7 @@ export class GuardDetection extends Communicator { constructor(config: GuardDetectionConfig) { super( config.logger ? config.logger : new DummyLogger(), - config.signer, + config.messageEnc, config.submit, config.guardsPublicKey, config.messageValidDurationSeconds, @@ -322,7 +322,7 @@ export class GuardDetection extends Communicator { */ activeGuards = async (): Promise> => { const myActiveGuard: ActiveGuard = { - publicKey: await this.signer.getPk(), + publicKey: await this.messageEnc.getPk(), peerId: await this.getPeerId(), }; return [ diff --git a/packages/detection/lib/interfaces/types.ts b/packages/detection/lib/interfaces/types.ts index f656e9f..c50473d 100644 --- a/packages/detection/lib/interfaces/types.ts +++ b/packages/detection/lib/interfaces/types.ts @@ -10,7 +10,7 @@ export interface ActiveGuard { export interface GuardDetectionConfig { logger?: AbstractLogger; guardsPublicKey: string[]; - signer: EncryptionHandler; + messageEnc: EncryptionHandler; submit: (msg: string, peers: Array) => unknown; activeTimeoutSeconds?: number; heartbeatTimeoutSeconds?: number; diff --git a/packages/detection/tests/GuardDetection.spec.ts b/packages/detection/tests/GuardDetection.spec.ts index 5cef1b0..a6d0fb7 100644 --- a/packages/detection/tests/GuardDetection.spec.ts +++ b/packages/detection/tests/GuardDetection.spec.ts @@ -12,16 +12,16 @@ import { describe, expect, it, vi, beforeEach } from 'vitest'; describe('GuardDetection', () => { let detection: TestGuardDetection; let mockSubmit = vi.fn(); - let guardSigners: Array; + let guardMessageEncs: Array; beforeEach(async () => { const signers = await generateSigners(); - guardSigners = signers.guardSigners; + guardMessageEncs = signers.guardSigners; vi.resetAllMocks(); mockSubmit = vi.fn(); detection = new TestGuardDetection({ submit: mockSubmit, - signer: guardSigners[0], + messageEnc: guardMessageEncs[0], guardsPublicKey: signers.guardPks, getPeerId: () => Promise.resolve('myPeerId'), }); @@ -241,7 +241,7 @@ describe('GuardDetection', () => { const info = detection.getInfo(); const currentTime = 1685683141; vi.setSystemTime(new Date(currentTime * 1000)); - const myPk = await guardSigners[0].getPk(); + const myPk = await guardMessageEncs[0].getPk(); info.forEach((item, index) => { if (item.publicKey !== myPk) { item.lastUpdate = currentTime; @@ -294,7 +294,7 @@ describe('GuardDetection', () => { const callback = vi.fn(); await detection.register( 'peerId-1', - await guardSigners[1].getPk(), + await guardMessageEncs[1].getPk(), callback, ); await expect(callback).toHaveBeenCalledTimes(1); @@ -320,7 +320,7 @@ describe('GuardDetection', () => { const callback = vi.fn(); await detection.register( 'peerId-1', - await guardSigners[1].getPk(), + await guardMessageEncs[1].getPk(), callback, ); await expect(callback).toHaveBeenCalledTimes(1); @@ -340,7 +340,7 @@ describe('GuardDetection', () => { it('should call send message if guard is not in active state', async () => { await detection.register( 'peerId-1', - await guardSigners[1].getPk(), + await guardMessageEncs[1].getPk(), vi.fn(), ); expect(mockSubmit).toHaveBeenCalledTimes(1); @@ -368,12 +368,12 @@ describe('GuardDetection', () => { vi.spyOn(detection as any, 'addNonce').mockReturnValue('new nonce'); await detection.mockedHandleRegister( { nonce: 'random nonce' }, - await guardSigners[1].getPk(), + await guardMessageEncs[1].getPk(), 1, ); expect(mockSubmit).toHaveBeenCalledTimes(1); expect(mockSubmit).toHaveBeenCalledWith(expect.any(String), [ - await guardSigners[1].getPk(), + await guardMessageEncs[1].getPk(), ]); const msg = JSON.parse(mockSubmit.mock.calls[0][0]); expect(msg.type).toEqual(approveMessage); diff --git a/packages/ergo-multi-sig/lib/MultiSigHandler.ts b/packages/ergo-multi-sig/lib/MultiSigHandler.ts index e2e19f7..d82e7c5 100644 --- a/packages/ergo-multi-sig/lib/MultiSigHandler.ts +++ b/packages/ergo-multi-sig/lib/MultiSigHandler.ts @@ -12,7 +12,6 @@ import { } from './types'; import { turnTime } from './const'; import { Semaphore } from 'await-semaphore'; -import { ECDSA } from '@rosen-bridge/encryption'; import { MultiSigUtils } from './MultiSigUtils'; import { AbstractLogger, DummyLogger } from '@rosen-bridge/abstract-logger'; import { ActiveGuard, GuardDetection } from '@rosen-bridge/detection'; @@ -33,7 +32,7 @@ export class MultiSigHandler extends Communicator { constructor(config: ErgoMultiSigConfig) { super( config.logger ? config.logger : new DummyLogger(), - new ECDSA(config.secretHex), + config.messageEnc, config.submit, config.guardsPk, ); diff --git a/packages/ergo-multi-sig/lib/types.ts b/packages/ergo-multi-sig/lib/types.ts index 4b8a009..7fd7a3b 100644 --- a/packages/ergo-multi-sig/lib/types.ts +++ b/packages/ergo-multi-sig/lib/types.ts @@ -2,6 +2,7 @@ import * as wasm from 'ergo-lib-wasm-nodejs'; import { AbstractLogger } from '@rosen-bridge/abstract-logger'; import { MultiSigUtils } from './MultiSigUtils'; import { GuardDetection } from '@rosen-bridge/detection'; +import { EncryptionHandler } from '@rosen-bridge/encryption'; interface Signer { id?: string; @@ -107,6 +108,7 @@ export enum MessageType { interface ErgoMultiSigConfig { logger?: AbstractLogger; multiSigUtilsInstance: MultiSigUtils; + messageEnc: EncryptionHandler; secretHex: string; txSignTimeout: number; multiSigFirstSignDelay?: number; diff --git a/packages/ergo-multi-sig/tests/MultiSigUtils.spec.ts b/packages/ergo-multi-sig/tests/MultiSigUtils.spec.ts index 30686bb..262621c 100644 --- a/packages/ergo-multi-sig/tests/MultiSigUtils.spec.ts +++ b/packages/ergo-multi-sig/tests/MultiSigUtils.spec.ts @@ -1,13 +1,6 @@ import { MultiSigUtils } from '../lib'; import { describe, expect, it } from 'vitest'; -import { boxJs } from './testData'; -import { - getChangeBoxJs, - getOutBoxJs, - jsToReducedTx, -} from './testUtils/txUtils'; import * as wasm from 'ergo-lib-wasm-nodejs'; -import { ErgoBox } from 'ergo-lib-wasm-nodejs'; import fs from 'fs'; import path from 'path'; import { mockedErgoStateContext } from '@rosen-bridge/ergo-multi-sig/tests/testData'; diff --git a/packages/ergo-multi-sig/tests/testUtils/TestUtils.ts b/packages/ergo-multi-sig/tests/testUtils/TestUtils.ts index 1231abf..f584df9 100644 --- a/packages/ergo-multi-sig/tests/testUtils/TestUtils.ts +++ b/packages/ergo-multi-sig/tests/testUtils/TestUtils.ts @@ -28,10 +28,10 @@ class TestUtils { }); const pubKeys = pks ? pks : testPubs; const secretInd = testSecrets.indexOf(secret); - const ecdsaSigner = new ECDSA(testSecrets[secretInd]); + const ecdsaMessageEnc = new ECDSA(testSecrets[secretInd]); const guardDetection = new GuardDetection({ guardsPublicKey: pubKeys, - signer: ecdsaSigner, + messageEnc: ecdsaMessageEnc, submit: submit, getPeerId: () => Promise.resolve(testPubs[secretInd]), }); @@ -43,6 +43,7 @@ class TestUtils { return new MultiSigHandler({ multiSigUtilsInstance: multiSigUtilsInstance, + messageEnc: ecdsaMessageEnc, secretHex: secret, txSignTimeout: TestConfigs.txSignTimeout, multiSigFirstSignDelay: TestConfigs.multiSigFirstSignDelay, diff --git a/packages/tss/lib/tss/EcdsaSigner.ts b/packages/tss/lib/tss/EcdsaSigner.ts index bb2de0f..86f325a 100644 --- a/packages/tss/lib/tss/EcdsaSigner.ts +++ b/packages/tss/lib/tss/EcdsaSigner.ts @@ -1,12 +1,13 @@ -import { ECDSA } from '@rosen-bridge/encryption'; -import { EcdsaConfig, Sign, SignResult } from '../types/signer'; +import { Sign, SignerConfig, SignResult } from '../types/signer'; import { TssSigner } from './TssSigner'; export class EcdsaSigner extends TssSigner { - constructor(config: EcdsaConfig) { + constructor(config: SignerConfig) { super({ logger: config.logger, guardsPk: config.guardsPk, + signingCrypto: 'ecdsa', + messageEnc: config.messageEnc, submitMsg: config.submitMsg, messageValidDuration: config.messageValidDuration, timeoutSeconds: config.timeoutSeconds, @@ -20,7 +21,6 @@ export class EcdsaSigner extends TssSigner { thresholdTTL: config.thresholdTTL, responseDelay: config.responseDelay, signPerRoundLimit: config.signPerRoundLimit, - signer: new ECDSA(config.secret), }); } diff --git a/packages/tss/lib/tss/EddsaSigner.ts b/packages/tss/lib/tss/EddsaSigner.ts index 235de5d..be41511 100644 --- a/packages/tss/lib/tss/EddsaSigner.ts +++ b/packages/tss/lib/tss/EddsaSigner.ts @@ -1,12 +1,13 @@ -import { EdDSA } from '@rosen-bridge/encryption'; -import { EddsaConfig, Sign, SignResult } from '../types/signer'; +import { Sign, SignerConfig, SignResult } from '../types/signer'; import { TssSigner } from './TssSigner'; export class EddsaSigner extends TssSigner { - constructor(config: EddsaConfig) { + constructor(config: SignerConfig) { super({ logger: config.logger, guardsPk: config.guardsPk, + signingCrypto: 'eddsa', + messageEnc: config.messageEnc, submitMsg: config.submitMsg, messageValidDuration: config.messageValidDuration, timeoutSeconds: config.timeoutSeconds, @@ -20,7 +21,6 @@ export class EddsaSigner extends TssSigner { thresholdTTL: config.thresholdTTL, responseDelay: config.responseDelay, signPerRoundLimit: config.signPerRoundLimit, - signer: new EdDSA(config.secret), }); } diff --git a/packages/tss/lib/tss/TssSigner.ts b/packages/tss/lib/tss/TssSigner.ts index b2571db..6444b0b 100644 --- a/packages/tss/lib/tss/TssSigner.ts +++ b/packages/tss/lib/tss/TssSigner.ts @@ -3,7 +3,7 @@ import { PendingSign, Sign, SignApprovePayload, - SignerConfig, + SignerBaseConfig, SignMessageType, SignRequestPayload, SignResult, @@ -32,6 +32,7 @@ import axios, { AxiosInstance } from 'axios'; export abstract class TssSigner extends Communicator { protected readonly axios: AxiosInstance; protected readonly callbackUrl: string; + protected readonly signingCrypto: string; protected threshold: Threshold; protected readonly thresholdTTL: number; protected readonly turnDuration: number; @@ -56,7 +57,7 @@ export abstract class TssSigner extends Communicator { try { if (this.threshold.expiry < Date.now()) { const res = await this.axios.get<{ threshold: number }>(thresholdUrl, { - params: { crypto: this.signer.getCrypto() }, + params: { crypto: this.signingCrypto }, }); const threshold = res.data.threshold + 1; this.detection.setNeedGuardThreshold(threshold); @@ -75,10 +76,10 @@ export abstract class TssSigner extends Communicator { } }; - constructor(config: SignerConfig) { + constructor(config: SignerBaseConfig) { super( config.logger ? config.logger : new DummyLogger(), - config.signer, + config.messageEnc, config.submitMsg, config.guardsPk, config.messageValidDuration, @@ -86,6 +87,7 @@ export abstract class TssSigner extends Communicator { this.axios = axios.create({ baseURL: config.tssApiUrl, }); + this.signingCrypto = config.signingCrypto; this.callbackUrl = config.callbackUrl; this.detection = config.detection; this.turnDuration = config.turnDurationSeconds @@ -486,7 +488,7 @@ export abstract class TssSigner extends Communicator { ); return; } - const myPk = await this.signer.getPk(); + const myPk = await this.messageEnc.getPk(); if (sign.request && !this.isNoWorkTime()) { return await this.signAccessMutex.acquire().then(async (release) => { @@ -569,7 +571,7 @@ export abstract class TssSigner extends Communicator { guards: payload.guards, initGuardIndex: guardIndex, }; - const myPk = await this.signer.getPk(); + const myPk = await this.messageEnc.getPk(); if (payload.guards.filter((item) => item.publicKey === myPk).length == 0) { this.logger.warn( `Got a request to sign message from [${sender}] but I'm not involved`, @@ -608,7 +610,7 @@ export abstract class TssSigner extends Communicator { if (index === -1) return undefined; const sign = signs[index]; if (sign === '') return undefined; - const verifiedSign = await this.signer.verify( + const verifiedSign = await this.messageEnc.verify( TssSigner.generatePayloadToSign( payload, timestamp, @@ -639,7 +641,7 @@ export abstract class TssSigner extends Communicator { p2pID: item.peerId, })), message: message, - crypto: this.signer.getCrypto(), + crypto: this.signingCrypto, operationTimeout: remainingTime - this.responseDelay, callBackUrl: this.callbackUrl, chainCode: sign.chainCode, diff --git a/packages/tss/lib/types/signer.ts b/packages/tss/lib/types/signer.ts index 85eb435..417b146 100644 --- a/packages/tss/lib/types/signer.ts +++ b/packages/tss/lib/types/signer.ts @@ -5,6 +5,8 @@ import { GuardDetection, ActiveGuard } from '@rosen-bridge/detection'; export interface SignerBaseConfig { logger?: AbstractLogger; guardsPk: Array; + signingCrypto: string; + messageEnc: EncryptionHandler; submitMsg: (message: string, guards: Array) => unknown; messageValidDuration?: number; timeoutSeconds?: number; @@ -20,17 +22,7 @@ export interface SignerBaseConfig { signPerRoundLimit?: number; } -export interface SignerConfig extends SignerBaseConfig { - signer: EncryptionHandler; -} - -export interface EcdsaConfig extends SignerBaseConfig { - secret: string; -} - -export interface EddsaConfig extends SignerBaseConfig { - secret: string; -} +export type SignerConfig = Omit; export interface Sign { msg: string; diff --git a/packages/tss/tests/tss/EcdsaSigner.spec.ts b/packages/tss/tests/tss/EcdsaSigner.spec.ts index f512abf..da3ae63 100644 --- a/packages/tss/tests/tss/EcdsaSigner.spec.ts +++ b/packages/tss/tests/tss/EcdsaSigner.spec.ts @@ -18,11 +18,11 @@ describe('EcdsaSigner', () => { */ it('should throw error when derivationPath is not defined', async () => { const sk = await ECDSA.randomKey(); - const signer = new ECDSA(sk); + const ecdsaMessageEnc = new ECDSA(sk); vi.restoreAllMocks(); vi.setSystemTime(new Date(currentTime)); const detection = new GuardDetection({ - signer: signer, + messageEnc: ecdsaMessageEnc, guardsPublicKey: [], submit: vi.fn(), getPeerId: () => Promise.resolve('myPeerId'), @@ -30,7 +30,7 @@ describe('EcdsaSigner', () => { const ecdsaSigner = new EcdsaSigner({ submitMsg: vi.fn(), callbackUrl: '', - secret: sk, + messageEnc: ecdsaMessageEnc, detection: detection, guardsPk: [], tssApiUrl: '', diff --git a/packages/tss/tests/tss/EddsaSigner.spec.ts b/packages/tss/tests/tss/EddsaSigner.spec.ts index 9f6baf5..e18ece6 100644 --- a/packages/tss/tests/tss/EddsaSigner.spec.ts +++ b/packages/tss/tests/tss/EddsaSigner.spec.ts @@ -18,11 +18,11 @@ describe('EddsaSigner', () => { */ it('should throw error when derivationPath is defined', async () => { const sk = await EdDSA.randomKey(); - const signer = new EdDSA(sk); + const eddsaMessageEnc = new EdDSA(sk); vi.restoreAllMocks(); vi.setSystemTime(new Date(currentTime)); const detection = new GuardDetection({ - signer: signer, + messageEnc: eddsaMessageEnc, guardsPublicKey: [], submit: vi.fn(), getPeerId: () => Promise.resolve('myPeerId'), @@ -30,7 +30,7 @@ describe('EddsaSigner', () => { const eddsaSigner = new EddsaSigner({ submitMsg: vi.fn(), callbackUrl: '', - secret: sk, + messageEnc: eddsaMessageEnc, detection: detection, guardsPk: [], tssApiUrl: '', diff --git a/packages/tss/tests/tss/TssSigner.spec.ts b/packages/tss/tests/tss/TssSigner.spec.ts index ae41186..ef52bd0 100644 --- a/packages/tss/tests/tss/TssSigner.spec.ts +++ b/packages/tss/tests/tss/TssSigner.spec.ts @@ -13,19 +13,19 @@ import { beforeEach, describe, expect, it, MockInstance, vi } from 'vitest'; describe('TssSigner', () => { let signer: TestTssSigner; let mockSubmit = vi.fn(); - let guardSigners: Array; + let guardMessageEncs: Array; let detection: GuardDetection; const currentTime = 1686286005068; const timestamp = Math.floor(currentTime / 1000); beforeEach(async () => { const signers = await generateSigners(); - guardSigners = signers.guardSigners; + guardMessageEncs = signers.guardSigners; vi.restoreAllMocks(); vi.setSystemTime(new Date(currentTime)); mockSubmit = vi.fn(); detection = new GuardDetection({ - signer: guardSigners[0], + messageEnc: guardMessageEncs[0], guardsPublicKey: signers.guardPks, submit: mockSubmit, getPeerId: () => Promise.resolve('myPeerId'), @@ -33,7 +33,8 @@ describe('TssSigner', () => { signer = new TestTssSigner({ submitMsg: mockSubmit, callbackUrl: '', - signer: guardSigners[0], + signingCrypto: 'eddsa', + messageEnc: guardMessageEncs[0], detection: detection, guardsPk: signers.guardPks, tssApiUrl: '', @@ -468,13 +469,13 @@ describe('TssSigner', () => { */ it('should return list of unknown guards', async () => { const myActiveGuards = [ - { peerId: 'peerId-1', publicKey: await guardSigners[1].getPk() }, - { peerId: 'peerId-2', publicKey: await guardSigners[2].getPk() }, - { peerId: 'peerId-3', publicKey: await guardSigners[3].getPk() }, + { peerId: 'peerId-1', publicKey: await guardMessageEncs[1].getPk() }, + { peerId: 'peerId-2', publicKey: await guardMessageEncs[2].getPk() }, + { peerId: 'peerId-3', publicKey: await guardMessageEncs[3].getPk() }, ]; const unknownGuard = { peerId: 'peerId-4', - publicKey: await guardSigners[4].getPk(), + publicKey: await guardMessageEncs[4].getPk(), }; const requestedGuard = [...myActiveGuards, unknownGuard]; vi.spyOn(detection, 'activeGuards').mockResolvedValue(myActiveGuards); @@ -495,13 +496,13 @@ describe('TssSigner', () => { */ it('should return list of unknown guards', async () => { const myActiveGuards = [ - { peerId: 'peerId-1', publicKey: await guardSigners[1].getPk() }, - { peerId: 'peerId-2', publicKey: await guardSigners[2].getPk() }, - { peerId: 'peerId-3', publicKey: await guardSigners[3].getPk() }, + { peerId: 'peerId-1', publicKey: await guardMessageEncs[1].getPk() }, + { peerId: 'peerId-2', publicKey: await guardMessageEncs[2].getPk() }, + { peerId: 'peerId-3', publicKey: await guardMessageEncs[3].getPk() }, ]; const invalidGuard = { peerId: 'peerId-3-new', - publicKey: await guardSigners[3].getPk(), + publicKey: await guardMessageEncs[3].getPk(), }; const requestedGuard = [...myActiveGuards.slice(0, 2), invalidGuard]; vi.spyOn(detection, 'activeGuards').mockResolvedValue(myActiveGuards); @@ -514,9 +515,9 @@ describe('TssSigner', () => { let activeGuards: Array; beforeEach(async () => { activeGuards = [ - { peerId: 'peerId-1', publicKey: await guardSigners[1].getPk() }, - { peerId: 'peerId-2', publicKey: await guardSigners[2].getPk() }, - { peerId: 'peerId-3', publicKey: await guardSigners[3].getPk() }, + { peerId: 'peerId-1', publicKey: await guardMessageEncs[1].getPk() }, + { peerId: 'peerId-2', publicKey: await guardMessageEncs[2].getPk() }, + { peerId: 'peerId-3', publicKey: await guardMessageEncs[3].getPk() }, ]; vi.spyOn(detection, 'activeGuards').mockResolvedValue(activeGuards); signer.getSigns().push({ @@ -638,7 +639,7 @@ describe('TssSigner', () => { .mockResolvedValue(); const guards = [ ...activeGuards, - { peerId: 'peerId-4', publicKey: await guardSigners[4].getPk() }, + { peerId: 'peerId-4', publicKey: await guardMessageEncs[4].getPk() }, ]; const payload: SignRequestPayload = { msg: 'test message', @@ -655,7 +656,7 @@ describe('TssSigner', () => { expect(mockSubmit).toHaveBeenCalledTimes(0); expect(mockedRegister).toHaveBeenCalledWith( 'peerId-4', - await guardSigners[4].getPk(), + await guardMessageEncs[4].getPk(), expect.anything(), ); const callback = mockedRegister.mock.calls[0][2]; @@ -693,7 +694,7 @@ describe('TssSigner', () => { msg: 'test message', guards: [ ...activeGuards, - { peerId: 'peerId-4', publicKey: await guardSigners[4].getPk() }, + { peerId: 'peerId-4', publicKey: await guardMessageEncs[4].getPk() }, ], }; await signer.mockedHandleRequestMessage( @@ -901,9 +902,9 @@ describe('TssSigner', () => { let activeGuards: Array; beforeEach(async () => { activeGuards = [ - { peerId: 'peerId-1', publicKey: await guardSigners[1].getPk() }, - { peerId: 'peerId-2', publicKey: await guardSigners[2].getPk() }, - { peerId: 'peerId-3', publicKey: await guardSigners[3].getPk() }, + { peerId: 'peerId-1', publicKey: await guardMessageEncs[1].getPk() }, + { peerId: 'peerId-2', publicKey: await guardMessageEncs[2].getPk() }, + { peerId: 'peerId-3', publicKey: await guardMessageEncs[3].getPk() }, ]; signer.getSigns().push({ msg: 'test message', @@ -934,7 +935,7 @@ describe('TssSigner', () => { * - inserted sign must contain new signature only */ it('should add guard sign to sign object when all conditions are met and signs are not enough', async () => { - vi.spyOn(guardSigners[0], 'verify').mockResolvedValue(true); + vi.spyOn(guardMessageEncs[0], 'verify').mockResolvedValue(true); vi.spyOn(signer as any, 'updateThreshold').mockResolvedValue(undefined); (signer as any).threshold = { expiry: 0, value: 7 }; await signer.mockedHandleApproveMessage( @@ -975,7 +976,7 @@ describe('TssSigner', () => { .fill('') .map(async (item, index) => ({ peerId: `peerId-${index}`, - publicKey: await guardSigners[index].getPk(), + publicKey: await guardMessageEncs[index].getPk(), })), ); vi.spyOn(signer as any, 'getApprovedGuards').mockResolvedValue( @@ -1126,7 +1127,7 @@ describe('TssSigner', () => { chainCode: 'chainCode', }); activeGuards = await Promise.all( - guardSigners.map(async (item, index) => ({ + guardMessageEncs.map(async (item, index) => ({ peerId: `peerId-${index}`, publicKey: await item.getPk(), })), @@ -1413,7 +1414,7 @@ describe('TssSigner', () => { { guards: [ { - publicKey: await guardSigners[1].getPk(), + publicKey: await guardMessageEncs[1].getPk(), peerId: 'peer-Id1', }, ], @@ -1461,13 +1462,13 @@ describe('TssSigner', () => { * - returned list must be empty */ it('should not return selected guard when signature is invalid', async () => { - vi.spyOn(guardSigners[0], 'verify').mockResolvedValue(false); + vi.spyOn(guardMessageEncs[0], 'verify').mockResolvedValue(false); const res = await signer.mockedGetApprovedGuards( timestamp, { guards: [ { - publicKey: await guardSigners[0].getPk(), + publicKey: await guardMessageEncs[0].getPk(), peerId: 'peer-Id1', }, ], @@ -1489,10 +1490,10 @@ describe('TssSigner', () => { * - returned list must contain entered guard */ it('should return selected guard when signature is valid', async () => { - vi.spyOn(guardSigners[0], 'verify').mockResolvedValue(true); + vi.spyOn(guardMessageEncs[0], 'verify').mockResolvedValue(true); const guards = [ { - publicKey: await guardSigners[0].getPk(), + publicKey: await guardMessageEncs[0].getPk(), peerId: 'peer-Id1', }, ]; From 96ea1c3d8da74a7d21ab4d5f57aff0d2ff4003ad Mon Sep 17 00:00:00 2001 From: Moein zargarzadeh Date: Fri, 8 Nov 2024 13:27:59 +0330 Subject: [PATCH 4/4] apply changeset --- .changeset/nine-colts-kneel.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/nine-colts-kneel.md diff --git a/.changeset/nine-colts-kneel.md b/.changeset/nine-colts-kneel.md new file mode 100644 index 0000000..5f59e07 --- /dev/null +++ b/.changeset/nine-colts-kneel.md @@ -0,0 +1,8 @@ +--- +'@rosen-bridge/ergo-multi-sig': major +'@rosen-bridge/communication': major +'@rosen-bridge/detection': major +'@rosen-bridge/tss': major +--- + +Refactor constructor interfaces, add messageEnc and remove unnecessary secrets