Skip to content

Commit

Permalink
fix: use tkeyStoreItem
Browse files Browse the repository at this point in the history
  • Loading branch information
@ieow
ieow committed Feb 29, 2024
1 parent ed82887 commit f41f00b
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 57 deletions.
96 changes: 53 additions & 43 deletions packages/core/src/core.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ import {
} from "./lagrangeInterpolatePolynomial";
import Metadata from "./metadata";
// TODO: handle errors for get and set with retries
// export const TSS_MODULE = "tssModule";
export const TSS_MODULE = "tssModule";
export const ACCOUNTSALT = "accountSalt";

class ThresholdKey implements ITKey {
modules: ModuleMap;
Expand Down Expand Up @@ -305,10 +306,13 @@ class ThresholdKey implements ITKey {
if (useTSS) {
const { factorEncs, factorPubs, tssPolyCommits } = await this._initializeNewTSSKey(this.tssTag, deviceTSSShare, factorPub, deviceTSSIndex);

const { encryptedSalt } = await this.generateSaltAndEncrypted(this.privKey);
this.metadata.addTSSData({ tssTag: this.tssTag, tssNonce: 0, tssPolyCommits, factorPubs, factorEncs, encryptedSalt });
const salt = await this.getAccountSalt(this.privKey);
this._accountSalt = salt;
this.metadata.addTSSData({ tssTag: this.tssTag, tssNonce: 0, tssPolyCommits, factorPubs, factorEncs });
const accountSalt = generateSalt();
await this._setTKeyStoreItem(TSS_MODULE, {
id: "accountSalt",
value: accountSalt,
});
this._accountSalt = accountSalt;
}
return this.getKeyDetails();
}
Expand Down Expand Up @@ -623,15 +627,16 @@ class ThresholdKey implements ITKey {
// only valid for use Tss
// assign account salt from tKey store if it exists
if (Object.keys(this.metadata.tssPolyCommits).length > 0) {
const accountSalt = await this.getAccountSalt(privKey);

if (accountSalt) {
this._accountSalt = accountSalt;
const accountSalt = await this.getTKeyStoreItem(TSS_MODULE, "accountSalt");
if (accountSalt && accountSalt.value) {
this._accountSalt = accountSalt.value;
} else {
const { salt, encryptedSalt } = await this.generateSaltAndEncrypted(privKey);
this.metadata.addTSSData({ tssTag: this.tssTag, encryptedSalt });
this._accountSalt = salt;
await this._syncShareMetadata();
const newSalt = generateSalt();
await this._setTKeyStoreItem(TSS_MODULE, {
id: "accountSalt",
value: newSalt,
});
this._accountSalt = newSalt;
// this is very specific case where exisiting user do not have salt.
// sync metadata to cloud to ensure salt is stored incase of manual sync mode
// new user or importKey should not hit this cases
Expand Down Expand Up @@ -926,23 +931,28 @@ class ThresholdKey implements ITKey {
serverEncs: refreshResponse.serverFactorEncs,
};
}
let accountSalt = await this.getAccountSalt(this.privKey);
let encryptedAccountSalt;
if (!accountSalt) {
const { salt, encryptedSalt } = await this.generateSaltAndEncrypted(this.privKey);
accountSalt = salt;
encryptedAccountSalt = encryptedSalt;
}
this.metadata.addTSSData({
tssTag: this.tssTag,
tssNonce: newTssNonce,
tssPolyCommits: newTSSCommits,
factorPubs,
factorEncs,
encryptedSalt: encryptedAccountSalt,
});
this._accountSalt = accountSalt;
if (updateMetadata) await this._syncShareMetadata();
if (!this._accountSalt) {
const accountSalt = generateSalt();
// tkeyStoreItem already syncMetadata
await this._setTKeyStoreItem(
TSS_MODULE,
{
id: "accountSalt",
value: accountSalt,
},
updateMetadata
);
this._accountSalt = accountSalt;
} else if (updateMetadata) {
await this._syncShareMetadata();
}
} catch (error) {
this.tssTag = oldTag;
throw error;
Expand Down Expand Up @@ -1830,7 +1840,7 @@ class ThresholdKey implements ITKey {
return decrypt(toPrivKeyECC(this.privKey), encryptedMessage);
}

async _setTKeyStoreItem(moduleName: string, data: TkeyStoreItemType): Promise<void> {
async _setTKeyStoreItem(moduleName: string, data: TkeyStoreItemType, updateMetadata: boolean = true): Promise<void> {
if (!this.metadata) {
throw CoreError.metadataUndefined();
}
Expand All @@ -1851,7 +1861,7 @@ class ThresholdKey implements ITKey {

// update metadataStore
this.metadata.setTkeyStoreDomain(moduleName, rawTkeyStoreItems);
await this._syncShareMetadata();
if (updateMetadata) await this._syncShareMetadata();
}

async _deleteTKeyStoreItem(moduleName: string, id: string): Promise<void> {
Expand Down Expand Up @@ -2039,24 +2049,24 @@ class ThresholdKey implements ITKey {
}

//
private async generateSaltAndEncrypted(privKey: BN): Promise<{ salt: string; encryptedSalt: EncryptedMessage }> {
if (!privKey) {
throw CoreError.privateKeyUnavailable();
}

const salt = generateSalt();
const encryptedSalt = await encrypt(getPubKeyECC(privKey), Buffer.from(salt, "hex"));
return { salt, encryptedSalt };
}

private async getAccountSalt(privKey: BNString): Promise<string | undefined> {
if (this._accountSalt) return this._accountSalt;
if (Object.keys(this.metadata.encryptedSalt).length) {
const decryptedSalt = await decrypt(toPrivKeyECC(privKey), this.metadata.encryptedSalt as EncryptedMessage);
return decryptedSalt.toString("hex");
}
return undefined;
}
// private async generateSaltAndEncrypted(privKey: BN): Promise<{ salt: string; encryptedSalt: EncryptedMessage }> {
// if (!privKey) {
// throw CoreError.privateKeyUnavailable();
// }

// const salt = generateSalt();
// const encryptedSalt = await encrypt(getPubKeyECC(privKey), Buffer.from(salt, "hex"));
// return { salt, encryptedSalt };
// }

// private async getAccountSalt(privKey: BNString): Promise<string | undefined> {
// if (this._accountSalt) return this._accountSalt;
// if (Object.keys(this.metadata.encryptedSalt).length) {
// const decryptedSalt = await decrypt(toPrivKeyECC(privKey), this.metadata.encryptedSalt as EncryptedMessage);
// return decryptedSalt.toString("hex");
// }
// return undefined;
// }
}

export default ThresholdKey;
13 changes: 2 additions & 11 deletions packages/core/src/metadata.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,11 @@ class Metadata implements IMetadata {
};
};

encryptedSalt?: EncryptedMessage | Record<string, unknown>;

constructor(input: Point) {
this.tssPolyCommits = {};
this.tssNonces = {};
this.factorPubs = {};
this.factorEncs = {};
this.encryptedSalt = {};
this.publicPolynomials = {};
this.publicShares = {};
this.generalStore = {};
Expand All @@ -87,8 +84,7 @@ class Metadata implements IMetadata {
}

static fromJSON(value: StringifiedType): Metadata {
const { pubKey, polyIDList, generalStore, tkeyStore, scopedStore, nonce, tssNonces, tssPolyCommits, factorPubs, factorEncs, encryptedSalt } =
value;
const { pubKey, polyIDList, generalStore, tkeyStore, scopedStore, nonce, tssNonces, tssPolyCommits, factorPubs, factorEncs } = value;
const point = Point.fromCompressedPub(pubKey);
const metadata = new Metadata(point);
const unserializedPolyIDList: PolyIDAndShares[] = [];
Expand Down Expand Up @@ -117,8 +113,6 @@ class Metadata implements IMetadata {
}
if (factorEncs) metadata.factorEncs = factorEncs;

if (encryptedSalt) metadata.encryptedSalt = encryptedSalt;

for (let i = 0; i < polyIDList.length; i += 1) {
const serializedPolyID: string = polyIDList[i];
const arrPolyID = serializedPolyID.split("|");
Expand Down Expand Up @@ -195,14 +189,12 @@ class Metadata implements IMetadata {
factorEncs?: {
[factorPubID: string]: FactorEnc;
};
encryptedSalt?: EncryptedMessage;
}): void {
const { tssTag, tssNonce, tssPolyCommits, factorPubs, factorEncs, encryptedSalt } = tssData;
const { tssTag, tssNonce, tssPolyCommits, factorPubs, factorEncs } = tssData;
if (tssNonce !== undefined) this.tssNonces[tssTag] = tssNonce;
if (tssPolyCommits) this.tssPolyCommits[tssTag] = tssPolyCommits;
if (factorPubs) this.factorPubs[tssTag] = factorPubs;
if (factorEncs) this.factorEncs[tssTag] = factorEncs;
if (encryptedSalt && Object.keys(this.encryptedSalt).length === 0) this.encryptedSalt = encryptedSalt;
}

// appends shares and public polynomial to metadata.
Expand Down Expand Up @@ -346,7 +338,6 @@ class Metadata implements IMetadata {
...(this.tssPolyCommits && { tssPolyCommits: this.tssPolyCommits }),
...(this.factorPubs && { factorPubs: this.factorPubs }),
...(this.factorEncs && { factorEncs: this.factorEncs }),
...(this.encryptedSalt && { encryptedSalt: this.encryptedSalt }),
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/default/test/RefreshAndAccountIndex.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ThresholdKey from "../src/index";
import { assignTssDkgKeys, computeIndexedPrivateKey, fetchPostboxKeyAndSigs, getMetadataUrl, initStorageLayer } from "./helpers";

const metadataURL = getMetadataUrl();

const TSS_MODULE = "tssModule";
// eslint-disable-next-line mocha/no-exports
export const refreshAndAccountIndex = (customSP, manualSync, resetAccountSalt) => {
const mode = manualSync;
Expand Down Expand Up @@ -52,8 +52,8 @@ export const refreshAndAccountIndex = (customSP, manualSync, resetAccountSalt) =
const tss0ShareIndex2 = await tb0.getTSSShare(factorKey, { accountIndex: 2 });
const tss0ShareIndex99 = await tb0.getTSSShare(factorKey, { accountIndex: 99 });
if (resetAccountSalt) {
// eslint-disable-next-line require-atomic-updates
tb0.metadata.encryptedSalt = {};
// tb0.metadata.encryptedSalt = {};
await tb0._deleteTKeyStoreItem(TSS_MODULE, "accountSalt");
}

const newShare = await tb0.generateNewShare();
Expand Down

0 comments on commit f41f00b

Please sign in to comment.