From 6c852f8d135d8c2059fb95f003f488301c93208e Mon Sep 17 00:00:00 2001 From: erkostandyan Date: Thu, 9 Oct 2025 18:30:54 +0400 Subject: [PATCH 1/3] Fix vault set changes to accept private_salt values --- treasury/src/kv/vault.service.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/treasury/src/kv/vault.service.ts b/treasury/src/kv/vault.service.ts index ac60c813..71510ab7 100644 --- a/treasury/src/kv/vault.service.ts +++ b/treasury/src/kv/vault.service.ts @@ -31,10 +31,22 @@ export class PrivateKeyService { public async setAsync(address: string, privateKey: string, pkKey: string = 'private_key'): Promise { try { + await this.getTokenAsync(); + let existingData: Record = {}; + try { + const existing = await this.vault.read(`${this.privateKeyConfig.mountPath}/data/${address}`); + if (existing?.data?.data) { + existingData = existing.data.data; + } + } catch (readError: any) { + if (readError?.response?.statusCode !== 404) { + throw readError; + } + } + await this.vault.write(`${this.privateKeyConfig.mountPath}/data/${address}`, { - data: { [pkKey]: privateKey } - }); + data: { ...existingData, [pkKey]: privateKey }}) } catch (error) { this.handleVaultError(error); From ad2d633f527ad6a50d4c3f2f1f7d1b31de7e16b8 Mon Sep 17 00:00:00 2001 From: erkostandyan Date: Thu, 9 Oct 2025 20:03:11 +0400 Subject: [PATCH 2/3] added new method in vault service. --- treasury/src/kv/vault.service.ts | 32 +++++++++++--------- treasury/src/treasury/aztec/aztec.service.ts | 15 ++++++--- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/treasury/src/kv/vault.service.ts b/treasury/src/kv/vault.service.ts index 71510ab7..814486ae 100644 --- a/treasury/src/kv/vault.service.ts +++ b/treasury/src/kv/vault.service.ts @@ -18,7 +18,7 @@ export class PrivateKeyService { this.initLogin(); } - public async getAsync(address: string, pkKey: string = 'private_key'): Promise { + public async getAsync(address: string, pkKey: string = this.pkKey): Promise { try { await this.getTokenAsync(); const { data } = await this.vault.read(`${this.privateKeyConfig.mountPath}/data/${address}`); @@ -29,24 +29,28 @@ export class PrivateKeyService { } } - public async setAsync(address: string, privateKey: string, pkKey: string = 'private_key'): Promise { + public async setAsync(address: string, privateKey: string, pkKey: string = this.pkKey): Promise { try { await this.getTokenAsync(); - let existingData: Record = {}; - try { - const existing = await this.vault.read(`${this.privateKeyConfig.mountPath}/data/${address}`); - if (existing?.data?.data) { - existingData = existing.data.data; - } - } catch (readError: any) { - if (readError?.response?.statusCode !== 404) { - throw readError; - } - } await this.vault.write(`${this.privateKeyConfig.mountPath}/data/${address}`, { - data: { ...existingData, [pkKey]: privateKey }}) + data: { [pkKey]: privateKey } + }); + } + catch (error) { + this.handleVaultError(error); + } + } + + public async setDictAsync(address: string, keyVaulePair: Record): Promise { + try { + + await this.getTokenAsync(); + + await this.vault.write(`${this.privateKeyConfig.mountPath}/data/${address}`, { + data: { keyVaulePair } + }); } catch (error) { this.handleVaultError(error); diff --git a/treasury/src/treasury/aztec/aztec.service.ts b/treasury/src/treasury/aztec/aztec.service.ts index 79aab944..6e5abf6e 100644 --- a/treasury/src/treasury/aztec/aztec.service.ts +++ b/treasury/src/treasury/aztec/aztec.service.ts @@ -177,15 +177,20 @@ export class AztecTreasuryService extends TreasuryService { } async generate(): Promise { - + const prKey = Fr.random(); const salt = Fr.random(); - const addressResponse = await getSchnorrAccountContractAddress(prKey, salt); + const address = (await getSchnorrAccountContractAddress(prKey, salt)).toString(); + + // await this.privateKeyService.setAsync(addressResponse.toString(), prKey.toString()); + //salt.toString(), "private_salt" - await this.privateKeyService.setAsync(addressResponse.toString(), prKey.toString()); - await this.privateKeyService.setAsync(addressResponse.toString(), salt.toString(), "private_salt"); + const dict: Record = { + "private_salt": salt.toString(), + "private_key": prKey.toString(), + }; - const address = addressResponse.toString() + await this.privateKeyService.setDictAsync(address.toString(), dict); await createStore(address, { dataDirectory: this.configService.storePath, From 3fbfb9ed6ca6ff8440b2ec894ec4886285a6e922 Mon Sep 17 00:00:00 2001 From: erkostandyan Date: Thu, 9 Oct 2025 20:03:59 +0400 Subject: [PATCH 3/3] remove comment. --- treasury/src/treasury/aztec/aztec.service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/treasury/src/treasury/aztec/aztec.service.ts b/treasury/src/treasury/aztec/aztec.service.ts index 6e5abf6e..aedf22d1 100644 --- a/treasury/src/treasury/aztec/aztec.service.ts +++ b/treasury/src/treasury/aztec/aztec.service.ts @@ -182,12 +182,9 @@ export class AztecTreasuryService extends TreasuryService { const salt = Fr.random(); const address = (await getSchnorrAccountContractAddress(prKey, salt)).toString(); - // await this.privateKeyService.setAsync(addressResponse.toString(), prKey.toString()); - //salt.toString(), "private_salt" - const dict: Record = { - "private_salt": salt.toString(), "private_key": prKey.toString(), + "private_salt": salt.toString(), }; await this.privateKeyService.setDictAsync(address.toString(), dict);