Bugfix: Properly decode xpriv/tpriv network bytes

twostack · Oct 28, 2023 · ba687f3 · ba687f3
1 parent 31fa906
commit ba687f3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/lib/src/encoding/ckdserializer.dart b/lib/src/encoding/ckdserializer.dart
@@ -1,4 +1,6 @@
 
+import 'package:collection/collection.dart';
+
 import '../networks.dart';
 import 'package:hex/hex.dart';
 import 'dart:convert';
@@ -38,6 +40,8 @@ abstract class CKDSerializer {
 
         var version = HEX.encode(this._versionBytes.map( (elem) => elem.toUnsigned(8) ).toList());
 
+        this.networkType = getXPrivNetworkType(HEX.decode(version));
+
     }
 
     // FIXME: Rewrite using the Buffer class
@@ -84,6 +88,21 @@ abstract class CKDSerializer {
         }
     }
 
+    Function eq = const ListEquality().equals;
+
+    NetworkType getXPrivNetworkType(List<int> versionBytes){
+
+        if (eq(versionBytes, MAINNET_PUBLIC) || eq(versionBytes, MAINNET_PRIVATE)){
+            return NetworkType.MAIN;
+        }
+
+        if (eq(versionBytes, TESTNET_PUBLIC) || eq(versionBytes, TESTNET_PRIVATE)){
+            return NetworkType.TEST;
+        }
+
+        return NetworkType.TEST;
+    }
+
     set chainCode(List<int> bytes) {
         this._chainCode = bytes;
     }

diff --git a/lib/src/hdprivatekey.dart b/lib/src/hdprivatekey.dart
@@ -62,7 +62,9 @@ class HDPrivateKey extends CKDSerializer{
     /// Reconstruct a private key from a standard `xpriv` string.
     ///
     HDPrivateKey.fromXpriv(String vector){
-        this.networkType = NetworkType.MAIN;
+
+
+
         this.keyType = KeyType.PRIVATE;
 
         this.deserialize(vector);

diff --git a/lib/src/hdpublickey.dart b/lib/src/hdpublickey.dart
@@ -76,7 +76,6 @@ class HDPublicKey extends CKDSerializer {
 
     /// Constructs a new public key from it's `xpub`-encoded representation
     HDPublicKey.fromXpub(String vector){
-        this.networkType = NetworkType.MAIN;
         this.keyType = KeyType.PUBLIC;
         deserialize(vector);
     }