Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions server/io/addDescriptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ export default async ({ data, io }) => {
}

// Validate by trying to derive the first address
const testAddress = deriveAddress(data.descriptor, 0);
if (!testAddress) {
logger.error(`Invalid descriptor: Could not derive address`);
return { error: "Invalid descriptor: Could not derive address" };
try {
deriveAddress(data.descriptor, 0);
} catch (error) {
logger.error(`Invalid descriptor: ${error.message}`);
return { error: `Invalid descriptor: ${error.message}` };
}

// If the descriptor is just an extended key, wrap it in the appropriate format
Expand Down
9 changes: 5 additions & 4 deletions server/io/editDescriptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ export default async ({ data, io }) => {
}

// Validate by trying to derive the first address
const testAddress = deriveAddress(data.descriptor, 0);
if (!testAddress) {
logger.error(`Invalid descriptor: Could not derive address`);
return { error: "Invalid descriptor: Could not derive address" };
try {
deriveAddress(data.descriptor, 0);
} catch (error) {
logger.error(`Invalid descriptor: ${error.message}`);
return { error: `Invalid descriptor: ${error.message}` };
}
// Get all addresses in one batch
const allAddressesResult = await deriveAddresses(
Expand Down
14 changes: 7 additions & 7 deletions server/lib/descriptors.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,16 @@ export const deriveAddresses = (descriptor, startIndex, count, skip = 0) => {
const addresses = [];
for (let i = 0; i < count; i++) {
const index = startIndex + skip + i;
const address = deriveAddress(descriptor, index);
if (!address) {
logger.error(`Failed to derive address at index ${index}`);
try {
const address = deriveAddress(descriptor, index);
addresses.push(address);
} catch (error) {
logger.error(`Failed to derive address at index ${index}: ${error.message}`);
return {
success: false,
error: `Failed to derive address at index ${index}`,
error: `Failed to derive address at index ${index}: ${error.message}`,
};
}
addresses.push(address);
}
return {
success: true,
Expand Down Expand Up @@ -330,8 +331,7 @@ export const deriveAddress = (descriptor, index) => {
}

if (!payment?.address) {
logger.error("Failed to generate address");
return null;
throw new Error("Failed to generate address");
}

return {
Expand Down