Merge pull request #56 from ardriveapp/PE-4971-generate-optional-fiel…

…ds-if-missing

PE-4971: generate optional fields if missing

lib/src/models/wallet.dart

@@ -40,6 +40,11 @@ class Wallet {
         d: encodeBigIntToBytes(privK.privateExponent!),
         p: encodeBigIntToBytes(privK.p!),
         q: encodeBigIntToBytes(privK.q!),
+        dp: encodeBigIntToBytes(
+            privK.privateExponent! % (privK.p! - BigInt.one)),
+        dq: encodeBigIntToBytes(
+            privK.privateExponent! % (privK.q! - BigInt.one)),
+        qi: encodeBigIntToBytes(privK.q!.modInverse(privK.p!)),
       ),
     );
   }
@@ -81,7 +86,28 @@ class Wallet {
       }
     });
 
-    return Wallet(keyPair: Jwk.fromJson(jwk).toKeyPair());
+    var privK = Jwk.fromJson(jwk).toKeyPair() as RsaKeyPairData;
+
+    if (privK.dp == null ||
+        privK.dp!.isEmpty ||
+        privK.dq == null ||
+        privK.dq!.isEmpty ||
+        privK.qi == null ||
+        privK.qi!.isEmpty) {
+      final d = decodeBytesToBigInt(privK.d);
+      final p = decodeBytesToBigInt(privK.p);
+      final q = decodeBytesToBigInt(privK.q);
+
+      jwk.addAll({
+        'dp': base64.normalize(encodeBigIntToBase64(d % (p - BigInt.one))),
+        'dq': base64.normalize(encodeBigIntToBase64(d % (q - BigInt.one))),
+        'qi': base64.normalize(encodeBigIntToBase64(q.modInverse(p))),
+      });
+
+      privK = Jwk.fromJson(jwk).toKeyPair() as RsaKeyPairData;
+    }
+
+    return Wallet(keyPair: privK);
   }
 
   Map<String, dynamic> toJwk() => Jwk.fromKeyPair(_keyPair!).toJson().map(

pubspec.yaml

@@ -1,6 +1,6 @@
 name: arweave
 description: ""
-version: 3.8.0
+version: 3.8.1
 environment:
   sdk: ">=3.0.0 <4.0.0"
 publish_to: none

test/wallets_test.dart

@@ -102,4 +102,22 @@ void main() {
       'browser': Skip('TODO: implement this test for browser'),
     });
   });
+
+  test('loading wallets with missing dp, dq, and qi will have values generated',
+      () async {
+    final wallet =
+        await Wallet.createWalletFromMnemonic(testArweaveAppWalletMnemonic);
+
+    final jwk = wallet.toJwk();
+
+    jwk.remove('dp');
+    jwk.remove('dq');
+    jwk.remove('qi');
+
+    final wallet2 = Wallet.fromJwk(jwk);
+
+    expect(wallet.toJwk(), equals(wallet2.toJwk()));
+  }, onPlatform: {
+    'browser': Skip('TODO: implement this test for browser'),
+  });
 }