Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for share transfer save device #2040

Merged
merged 2 commits into from
Mar 24, 2022
Merged

fix for share transfer save device #2040

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe210c
feat: initial fix for share transfer
metallicalfa2 Mar 23, 2022
49ebfd7
Merge branch 'dev' into fix/shareTransfer
FSM1 Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/files-ui/src/Contexts/ThresholdKeyContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ const ThresholdKeyProvider = ({ children, network = "mainnet", enableLogging = f
// cached may be stale, resulting in a failure to reconstruct the key. This is
// identified through the nonce. Manually refreshing the metadata cache solves this problem
if (error.message.includes("nonce")) {
await TKeySdk._syncShareMetadata()
// await TKeySdk._syncShareMetadata()
const { privKey } = await TKeySdk.reconstructKey(false)
const privKeyString = privKey.toString("hex")
if (privKeyString.length < 64) {
Expand Down Expand Up @@ -360,8 +360,9 @@ const ThresholdKeyProvider = ({ children, network = "mainnet", enableLogging = f
console.log("Share transfer request created. Starting request status poller")
shareEncPubKeyX = currentEncPubKeyX
await shareTransferModule.startRequestStatusCheck(currentEncPubKeyX, true)
const resultKey = await TKeySdk?.getKeyDetails()
await TKeySdk.syncLocalMetadataTransitions()
await TKeySdk.reconstructKey()
const resultKey = TKeySdk?.getKeyDetails()

setKeyDetails(resultKey)
shareEncPubKeyX = undefined
} catch (error) {
Expand Down Expand Up @@ -664,7 +665,9 @@ const ThresholdKeyProvider = ({ children, network = "mainnet", enableLogging = f

try {
const storageModule = TKeySdk.modules[WEB_STORAGE_MODULE_NAME] as WebStorageModule
await TKeySdk._syncShareMetadata()
await TKeySdk.initialize() // should reinitialize internally
await TKeySdk.reconstructKey()

const newDeviceShare = await TKeySdk.generateNewShare()
const newDeviceShareStore = newDeviceShare.newShareStores[newDeviceShare.newShareIndex.toString("hex")]

Expand All @@ -684,9 +687,9 @@ const ThresholdKeyProvider = ({ children, network = "mainnet", enableLogging = f

try {
const shareTransferModule = TKeySdk.modules[SHARE_TRANSFER_MODULE_NAME] as ShareTransferModule
await shareTransferModule.approveRequest(encPubKeyX)
await TKeySdk._syncShareMetadata()
const newKeyDetails = await TKeySdk.getKeyDetails()
const result = await TKeySdk.generateNewShare()
await shareTransferModule.approveRequest(encPubKeyX, result.newShareStores[result.newShareIndex.toString("hex")])
const newKeyDetails = TKeySdk.getKeyDetails()
setKeyDetails(newKeyDetails)
} catch (e) {
console.error(e)
Expand Down