support generated fields on serverside wallets #1769
Conversation
| if (validData) { | ||
| data && Object.keys(validData).filter(key => key in data).forEach(key => { data[key] = validData[key] }) | ||
| settings && Object.keys(validData).filter(key => key in settings).forEach(key => { settings[key] = validData[key] }) | ||
| } |
There was a problem hiding this comment.
this becomes a function since we need to run it twice:
- Before testCreateInvoice with skipGenerated=true (because we don't have the generated properties yet)
- After testCreateInvoice with skipGenerated=false
| @@ -779,6 +784,7 @@ async function upsertWallet ( | |||
| if (testCreateInvoice) { | |||
| try { | |||
| await testCreateInvoice(data) | |||
| await validate({ data, settings, skipGenerated: false }) | |||
There was a problem hiding this comment.
validate again, since now we'll have the generated fields
| @@ -63,7 +63,7 @@ export function useWalletConfigurator (wallet) { | |||
| throw err | |||
| } | |||
| } else if (canReceive({ def: wallet.def, config: serverConfig })) { | |||
| const transformedConfig = await validateWallet(wallet.def, serverConfig) | |||
| const transformedConfig = await validateWallet(wallet.def, serverConfig, { skipGenerated: true }) | |||
There was a problem hiding this comment.
the client needs to skip generated fields for receivers , because they are generated by the testCreateInvoice that runs serverside
There was a problem hiding this comment.
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| @@ -72,7 +72,7 @@ function composeWalletSchema (walletDef, serverSide, skipGenerated) { | |||
|
|
|||
| if (clientOnly && serverSide) { | |||
| // For server-side validation, accumulate clientOnly fields as vaultEntries | |||
| vaultEntrySchemas[optional ? 'optional' : 'required'].push(vaultEntrySchema(name)) | |||
| vaultEntrySchemas[(optional || generated) ? 'optional' : 'required'].push(vaultEntrySchema(name)) | |||
There was a problem hiding this comment.
every client-side generated field must be optional for server-side validation, otherwise if the user configures only the receiver part of a send&receiver wallet, the validation will fail because the non optional generated client-side fields are not compiled.
|
Does this fix something broken in production? |
no, it doesn't |
Description
Client-side wallets can transform credentials during initial configuration. Previously, this functionality was also available for server-side wallets, but a recent refactoring broke it. This PR restores it, as it is required for stackernews/stacker.news#1763.
Checklist
Are your changes backwards compatible? Please answer below:
yes
On a scale of 1-10 how well and how have you QA'd this change and any features it might affect? Please answer below:
tested as part of #1763
For frontend changes: Tested on mobile, light and dark mode? Please answer below:
Did you introduce any new environment variables? If so, call them out explicitly here:
no