Throw an error when attempting to derive from a master path from a no…

…n-master node (#4551).
ethers-io · Feb 14, 2024 · 556fdd9 · 556fdd9
1 parent 7f14bde
commit 556fdd9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src.ts/wallet/hdwallet.ts b/src.ts/wallet/hdwallet.ts
@@ -87,9 +87,12 @@ type HDNodeLike<T> = { depth: number, deriveChild: (i: number) => T };
 function derivePath<T extends HDNodeLike<T>>(node: T, path: string): T {
     const components = path.split("/");
 
-    assertArgument(components.length > 0 && (components[0] === "m" || node.depth > 0), "invalid path", "path", path);
+    assertArgument(components.length > 0, "invalid path", "path", path);
 
-    if (components[0] === "m") { components.shift(); }
+    if (components[0] === "m") {
+        assertArgument(node.depth === 0, `cannot derive root path (i.e. path starting with "m/") for a node at non-zero depth ${ node.depth }`, "path", path);
+        components.shift();
+    }
 
     let result: T = node;
     for (let i = 0; i < components.length; i++) {