added derive without warns, added skip discovery if account is zero

Author: albertopeam

Sources/Web3Core/KeystoreManager/BIP44.swift

@@ -25,11 +25,13 @@ public enum BIP44Error: Equatable {
 extension HDNode: BIP44 {
     public func derive(path: String, warns: Bool = true) async throws -> HDNode? {
         if warns {
-            var accountIndex = 0
             guard let account = path.accountFromPath else {
                 return nil
             }
-            
+            if account == 0 {
+                return derive(path: path, derivePrivateKey: true)
+            }
+            var accountIndex = 0
             return nil
         } else {
             return derive(path: path, derivePrivateKey: true)

Tests/web3swiftTests/localTests/BIP44Tests.swift

@@ -8,17 +8,28 @@ import Web3Core
 @testable import web3swift
 
 final class BIP44Tests: LocalTestCase {
-    
-    private let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
 
-    func testBIP44DeriveWithoutWarningIfChildNodeHasPreviousChildsWithTransactions() async throws {
-        let seed = try XCTUnwrap(BIP39.seedFromMmemonics(mnemonic, password: ""))
-        let rootNode = try XCTUnwrap(HDNode(seed: seed))
+    func testDeriveNoWarn() async throws {
+        let rootNode = try rootNode()
 
-        let optChildNode = try await rootNode.derive(path: "m/44'/60'/1'/0/1", warns: false)
-        let childNode = try XCTUnwrap(optChildNode)
+        let childNode = try await rootNode.derive(path: "m/44'/60'/8096'/0/1", warns: false)
 
-        XCTAssertEqual(childNode.publicKey.toHexString(), "03fe5fad1740a0c749c3c976c9b37f337204bf3df1d73d78da282dd365a7d47ad9")
-        XCTAssertEqual(Utilities.publicToAddress(childNode.publicKey)?.address, "0x73C13e421eF367c4F55BBC02a8e2a2b12e82f717")
+        XCTAssertEqual(try XCTUnwrap(childNode).publicKey.toHexString(), "035785d4918449c87892371c0f9ccf6e4eda40a7fb0f773f1254c064d3bba64026")
+    }
+   
+    func testAccountZeroCanBeDerived() async throws {
+        let rootNode = try rootNode()
+        
+        let childNode = try await rootNode.derive(path: "m/44'/60'/0'/0/255", warns: true)
+        
+        XCTAssertEqual(try XCTUnwrap(childNode).publicKey.toHexString(), "0262fba1af8f149258123265318114066decf50d16c1222a9d657b7de2296c2734")
+    }
+    
+    // MARK: - private
+    
+    private func rootNode() throws -> HDNode {
+        let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
+        let seed = try XCTUnwrap(BIP39.seedFromMmemonics(mnemonic, password: ""))
+        return try XCTUnwrap(HDNode(seed: seed))
     }
 }