V4.2.0

- Added support for aptos addresses using Secp256k1, Secp256r1, Multikey and MultiEd25519.
- Fix sui multisig address validator

Author: mrtnetwork

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.2.0
+
+- Added support for aptos addresses using Secp256k1, Secp256r1, Multikey and MultiEd25519.
+- Fix sui multisig address validator  
+
 ## 4.1.0
 
 - Added support for Sui addresses using Secp256k1, Secp256r1, Ed25519, and MultiSig.  

lib/bip/address/aptos_addr.dart

@@ -37,6 +37,11 @@ class AptosAddrConst {
 
   static const int shortAddressLength = 63;
 
+  static const int multikeyMinPublicKey = 1;
+  static const int multikeyMaxPublicKey = mask32;
+
+  static const int multiKeyMaxSignature = 32;
+
   /// Bcs layout for encdoing multikey address
   static final multiKeyAddressLayout = LayoutConst.struct([
     LayoutConst.bcsVector(
@@ -154,6 +159,10 @@ class AptosAddressUtils {
   static List<int> encodeMultiEd25519Key(
       List<Ed25519PublicKey> publicKeys, int threshold) {
     try {
+      final keys = publicKeys.toSet();
+      if (keys.length != publicKeys.length) {
+        throw AddressConverterException("Duplicate public key detected.");
+      }
       if (publicKeys.length < AptosAddrConst.minPublicKeys ||
           publicKeys.length > AptosAddrConst.maximumPublicKeys) {
         throw AddressConverterException(
@@ -191,15 +200,24 @@ class AptosAddressUtils {
               "Unsupported public key: Aptos Multikey address can only be generated from secp256k1 or ed25519 public keys.")
         };
       }).toList();
-      if (publicKeys.length < AptosAddrConst.minPublicKeys ||
-          publicKeys.length > AptosAddrConst.maximumPublicKeys) {
+      final keys = publicKeys.toSet();
+      if (keys.length != publicKeys.length) {
+        throw AddressConverterException("Duplicate public key detected.");
+      }
+      if (publicKeys.length < AptosAddrConst.multikeyMinPublicKey ||
+          publicKeys.length > AptosAddrConst.multikeyMaxPublicKey) {
         throw AddressConverterException(
-            "The number of public keys provided is invalid. It must be between ${AptosAddrConst.minPublicKeys} and ${AptosAddrConst.maximumPublicKeys}.");
+            "The number of public keys provided is invalid. It must be between ${AptosAddrConst.multikeyMinPublicKey} and ${AptosAddrConst.multikeyMaxPublicKey}.");
       }
+
       if (requiredSignature < AptosAddrConst.minthreshold ||
-          requiredSignature > publicKeys.length) {
+          requiredSignature > AptosAddrConst.multiKeyMaxSignature) {
         throw AddressConverterException(
-            "Invalid threshold. The threshold must be between ${AptosAddrConst.minthreshold} and the number of provided public keys (${publicKeys.length}).");
+            "Invalid threshold. The threshold must be between ${AptosAddrConst.minthreshold} and ${AptosAddrConst.multiKeyMaxSignature}.");
+      }
+      if (publicKeys.length < requiredSignature) {
+        throw AddressConverterException(
+            "The number of public keys must be at least equal to the required signatures.");
       }
       final layoutStruct = {
         "requiredSignature": requiredSignature,

lib/bip/address/sui.dart

@@ -15,14 +15,15 @@ class SuiPublicKeyAndWeight {
       {required this.publicKey, required this.weight});
   factory SuiPublicKeyAndWeight(
       {required IPublicKey publicKey, required int weight}) {
-    if (weight < 1 || weight >= mask8) {
+    if (weight < 1 || weight > mask8) {
       throw AddressConverterException(
           "Invalid signer wieght. weight must be between 1 and $mask8 .");
     }
     switch (publicKey.curve) {
       case EllipticCurveTypes.ed25519:
       case EllipticCurveTypes.secp256k1:
       case EllipticCurveTypes.nist256p1:
+      case EllipticCurveTypes.nist256p1Hybrid:
         break;
       default:
         throw AddressConverterException(
@@ -62,6 +63,12 @@ class SuiAddrConst {
 
   /// A multi-key signing scheme flag where multiple different types of keys are involved
   static const int multisigAddressFlag = 3;
+
+  static const int multisigAccountMaxThreshold = mask16;
+  static const int multisigAccountMinThreshold = 1;
+  static const int multisigAccountMaxPublicKey = 10;
+  static const int multisigAccountPublicKeyMaxWeight = 255;
+  static const int multisigAccountPublicKeyMinWeight = 1;
 }
 
 class SuiAddressUtils {
@@ -144,8 +151,17 @@ class SuiAddressUtils {
       if (keys.length != publicKeys.length) {
         throw AddressConverterException("Duplicate public key detected.");
       }
+      if (keys.length > SuiAddrConst.multisigAccountMaxPublicKey) {
+        throw AddressConverterException(
+            "Exceeded the maximum allowed public keys for a multisig account.",
+            details: {
+              "maximum": SuiAddrConst.multisigAccountMaxPublicKey,
+              "length": publicKeys.length
+            });
+      }
 
-      if (threshold < 1 || threshold >= mask16) {
+      if (threshold < SuiAddrConst.multisigAccountMinThreshold ||
+          threshold > SuiAddrConst.multisigAccountMaxThreshold) {
         throw AddressConverterException(
             "Invalid threshold. threshold must be between 1 and $mask16 .");
       }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: blockchain_utils
 description: Comprehensive Crypto & Blockchain Toolkit, Pure Dart, Cross-Platform, Encoding, Cryptography, Addresses, Mnemonics, & More.
-version: 4.1.0
+version: 4.2.0
 homepage: "https://github.com/mrtnetwork/blockchain_utils"
 repository: "https://github.com/mrtnetwork/blockchain_utils"
 Author: [email protected]