main

Author: mrtnetwork

Diff for: CHANGELOG.md

@@ -1,3 +1,7 @@
 ## 0.1.0
 
-* TODO: Release.
+* TODO: Release.
+
+## 0.2.0
+
+* TODO: Removing inefficient methods.

Diff for: README.md

@@ -56,15 +56,21 @@ At least one example has been created for each transaction type, which you can f
   final randomPrivate =
       XRPPrivateKey.random(algorithm: CryptoAlgorithm.SECP256K1);
   final toHex = randomPrivate.toHex();
+  
   /// access private key with hex
   final private = XRPPrivateKey.fromHex(toHex);
+
   /// accesss publicKey
   final publicKey = private.getPublic();
+
   final addressClass = publicKey.toAddress();
+
   /// rpjEqWDFtoin7fFxuw6oQG2onkZkf72hhc
   final classicAddress = addressClass.address;
+
   /// X7ZBWLX4XnxEwvQa4sgH11QbhQzuTuGeoZKEb2naE92oNEc
   final xAddress = addressClass.toXAddress(isTestNetwork: false);
+
   /// sign with privateKey
   final sig = private.sign(...)
   
@@ -83,7 +89,7 @@ Descriptions for some of these classes are provided below.
       signingPubKey: ownerPublic); // Sender's public key
 
   ```
-- NTF, mint, createOffer, cancelOffer
+- NTF, mint, createOffer, acceptOffer
 
   ```
   // mint token
@@ -128,16 +134,20 @@ Descriptions for some of these classes are provided below.
     signingPubKey: ownerPublic,
     memos: [memo],
   );
+
   // It receives the transaction, the RPC class, and then fulfills the transaction requirements, including the fee amount, account sequence, and the last network ledger sequence.
   await autoFill(rpc, escrowCreate);
+  
   // At this point, we need to sign the transaction with the sender's account.
   // We receive the transaction blob and sign it with the sender's private key.
   final sig = owner.sign(escrowCreate.toBlob());
   // After completing the signature, we add it to the transaction.
   escrowCreate.setSignature(sig);
+
   /// In the final step, we need to send the transaction to the network.
   /// We receive another transaction blob that already contains a signature. At this point, we no longer need to include a signature, and we must set the 'forSigning' variable to false.
   final trBlob = escrowCreate.toBlob(forSigning: false);
+
   // broadcasting transaction
   final result = await rpc.submit(trBlob)
   // transaction hash: result.txJson.hash ()
@@ -179,7 +189,7 @@ Descriptions for some of these classes are provided below.
 ### JSON-RPC
 ```
   /// access devent
-  final devnetRPC = XRPLRpc.ammDevnet();
+  final devnetRPC = XRPLRpc.devNet();
 
   /// access testnet
   final testnetRPC = XRPLRpc.testNet();

Diff for: example/transactions/amm_test.dart

@@ -10,7 +10,7 @@ import 'package:xrp_dart/src/xrpl/models/amm/amm_deposit.dart';
 import 'package:xrp_dart/src/xrpl/models/amm/amm_vote.dart';
 import 'package:xrp_dart/src/xrpl/models/amm/amm_withdraw.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 
 import '../main.dart';
 

Diff for: example/transactions/block_hole_account_test.dart

@@ -7,7 +7,7 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/account/accountset.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 import 'package:xrp_dart/src/xrpl/models/account/set_reqular_key.dart';
 
 final rpc = XRPLRpc.testNet();

Diff for: example/transactions/check_test.dart

@@ -11,8 +11,8 @@ import 'package:xrp_dart/src/xrpl/models/check/check_cancel.dart';
 import 'package:xrp_dart/src/xrpl/models/check/check_cash.dart';
 import 'package:xrp_dart/src/xrpl/models/check/check_create.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/transaction.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/base/transaction.dart';
 
 import '../main.dart';
 import 'issue_token_test.dart';

Diff for: example/transactions/create_ticket_test.dart

@@ -7,7 +7,7 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/account/accountset.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 import 'package:xrp_dart/src/xrpl/models/ticket/ticket_create.dart';
 
 final rpc = XRPLRpc.testNet();

Diff for: example/transactions/escrow_test.dart

@@ -7,7 +7,7 @@ import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/escrow_create/escrow_cancel.dart';
 import 'package:xrp_dart/src/xrpl/models/escrow_create/escrow_create.dart';
 import 'package:xrp_dart/src/xrpl/models/escrow_create/escrow_finish.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 
 import 'block_hole_account_test.dart';
 

Diff for: example/transactions/issue_token_test.dart

@@ -7,9 +7,9 @@ import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/account/accountset.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
-import 'package:xrp_dart/src/xrpl/models/trust_set.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/trust_set.dart';
 
 import '../main.dart';
 

Diff for: example/transactions/nft_token_test.dart

@@ -5,7 +5,7 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 import 'package:xrp_dart/src/xrpl/models/nft/nft_accept_offer.dart';
 import 'package:xrp_dart/src/xrpl/models/nft/nft_token_burn.dart';
 import 'package:xrp_dart/src/xrpl/models/nft/nft_token_cancel_offer.dart';

Diff for: example/transactions/path_set_test.dart

@@ -6,8 +6,8 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
 
 import '../main.dart';
 

Diff for: example/transactions/payment_channel_test.dart

@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
 import 'package:xrp_dart/src/xrpl/models/payment_channel/payment_channel_claim.dart';
 import 'package:xrp_dart/src/xrpl/models/payment_channel/payment_channel_create.dart';
 import 'package:xrp_dart/src/xrpl/models/payment_channel/payment_channel_fund.dart';

Diff for: example/transactions/reqular_key_test.dart

@@ -6,8 +6,8 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
 import 'package:xrp_dart/src/xrpl/models/account/set_reqular_key.dart';
 
 import '../main.dart';

Diff for: example/transactions/simple_transaction_test.dart

@@ -3,7 +3,7 @@
 import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
 
 import '../main.dart';
 

Diff for: example/transactions/transaction_with_memo_test.dart

@@ -5,8 +5,8 @@ import 'package:xrp_dart/src/crypto/keypair/xrpl_private_key.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
 
 import 'block_hole_account_test.dart';
 

Diff for: example/transactions/xrpl_multisig_test.dart

@@ -6,8 +6,8 @@ import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 import 'package:xrp_dart/src/xrpl/helper.dart';
 import 'package:xrp_dart/src/xrpl/models/account/accountset.dart';
 import 'package:xrp_dart/src/xrpl/models/currencies/currencies.dart';
-import 'package:xrp_dart/src/xrpl/models/memo.dart';
-import 'package:xrp_dart/src/xrpl/models/payment.dart';
+import 'package:xrp_dart/src/xrpl/models/memo/memo.dart';
+import 'package:xrp_dart/src/xrpl/models/payment/payment.dart';
 import 'package:xrp_dart/src/xrpl/models/signer_list/signer_list.dart';
 import 'package:xrp_dart/src/xrpl/models/account/signers.dart';
 

Diff for: lib/src/crypto/crypto.dart

@@ -22,7 +22,8 @@ Uint8List hash512(Uint8List data) {
 }
 
 Uint8List hash512Half(Uint8List data) {
-  return SHA512Digest().process(data).sublist(0, 32);
+  final sh512 = hash512(data);
+  return sh512.sublist(0, 32);
 }
 
 Uint8List doubleHash(Uint8List buffer) {

Diff for: lib/src/crypto/keypair/ed_curve.dart

@@ -1,4 +1,5 @@
 import 'dart:typed_data';
+import 'package:xrp_dart/src/crypto/crypto.dart';
 import 'package:xrp_dart/src/formating/bytes_num_formating.dart';
 
 (BigInt, BigInt, BigInt, BigInt) _dblExt(
@@ -247,3 +248,60 @@ class EDPoint {
   @override
   int get hashCode => Object.hash(x, y);
 }
+
+/// get publick key from ED25519 privateKey
+(Uint8List, Uint8List, BigInt) getMaterial(Uint8List privateKey) {
+  final digest = hash512(privateKey);
+  final a = digest.sublist(0, 32);
+  final prefix = digest.sublist(32);
+  a[0] &= 0xF8;
+  a[31] = (a[31] & 0x7F) | 0x40;
+  final aB = liteEddianToBigInt(a);
+  final mul = EDCurve.generator * aB;
+  final publicKey = mul.encodePoint();
+  return (publicKey, prefix, aB);
+}
+
+String signED(String hexMessage, Uint8List privateKey) {
+  final mt = getMaterial(privateKey);
+  final message = hexToBytes(hexMessage);
+  final combine = Uint8List.fromList([...mt.$2, ...message]);
+  final hashDigest = hash512(combine);
+  BigInt r = liteEddianToBigInt(hashDigest);
+  r = r % EDCurve.order;
+
+  final R = EDCurve.generator * r;
+  final eR = R.encodePoint();
+  final combine2 = hash512(Uint8List.fromList([...eR, ...mt.$1, ...message]));
+  final i = liteEddianToBigInt(combine2);
+  final S = (r + i * mt.$3) % EDCurve.order;
+  final eRB = liteEddianToBigInt(eR);
+  final Uint8List encodedDigest = Uint8List.fromList([
+    ...bigIntToLittleEndianBytes(eRB, 32),
+    ...bigIntToLittleEndianBytes(S, 32)
+  ]);
+  return bytesToHex(encodedDigest);
+}
+
+bool verifyEDBlob(String messageHex, String signatureHex, Uint8List publicKey) {
+  final message = hexToBytes(messageHex);
+  final signature = hexToBytes(signatureHex);
+  final decodePublic = EDPoint.decodePoint(publicKey);
+  int len = signature.length;
+  if (len.isOdd) {
+    return false;
+  }
+  len = len >> 1;
+  final eR = liteEddianToBigInt(signature.sublist(0, len));
+  final S = liteEddianToBigInt(signature.sublist(len));
+  final eRB = bigIntToLittleEndianBytes(eR, 32);
+  final R = EDPoint.decodePoint(eRB);
+  final eA = decodePublic.encodePoint();
+  final combine = hash512(Uint8List.fromList([...eRB, ...eA, ...message]));
+  BigInt h = liteEddianToBigInt(combine);
+  h = h % EDCurve.order;
+  final A = decodePublic * h;
+  final left = A + R;
+  final right = EDCurve.generator * S;
+  return right == left;
+}

Diff for: lib/src/crypto/keypair/xrpl_private_key.dart

@@ -20,8 +20,8 @@ class XRPPrivateKey {
     XRPAddressUtilities.encodeSeed(hexToBytes(entropy), algorithm);
     switch (algorithm) {
       case CryptoAlgorithm.ED25519:
-        final privateKey = _seedToHash(hexToBytes(entropy));
-        final public = _getMaterial(privateKey);
+        final privateKey = hash512Half(hexToBytes(entropy));
+        final public = xrpl.getMaterial(privateKey);
         return XRPPrivateKey._(privateKey, public.$1, algorithm);
       default:
         final privateKey = ec.deriveKeyPair(entropy);
@@ -42,7 +42,7 @@ class XRPPrivateKey {
     Uint8List bytes = hexToBytes(privateKey);
     if (bytes[0] == CryptoAlgorithm.ED25519.value) {
       bytes = bytes.sublist(1);
-      final public = _getMaterial(bytes);
+      final public = xrpl.getMaterial(bytes);
       return XRPPrivateKey._(bytes, public.$1, CryptoAlgorithm.ED25519);
     } else if (bytes[0] != CryptoAlgorithm.SECP256K1.value) {
       throw ArgumentError("Invalid prefix");
@@ -68,7 +68,7 @@ class XRPPrivateKey {
         final public = ec.pointFromScalar(privateKey, true);
         return XRPPrivateKey._(privateKey, public!, CryptoAlgorithm.SECP256K1);
       default:
-        final public = _getMaterial(privateKey);
+        final public = xrpl.getMaterial(privateKey);
         return XRPPrivateKey._(privateKey, public.$1, CryptoAlgorithm.ED25519);
     }
   }
@@ -87,52 +87,13 @@ class XRPPrivateKey {
   String sign(String message) {
     switch (algorithm) {
       case CryptoAlgorithm.ED25519:
-        return _signED(message);
+        return xrpl.signED(message, _privateKey);
       default:
         return _signSEC(message);
     }
   }
 
   /// sign with ED25519 cryptography
-  String _signED(String hexMessage) {
-    final mt = _getMaterial(_privateKey);
-    final message = hexToBytes(hexMessage);
-    final combine = Uint8List.fromList([...mt.$2, ...message]);
-    final hashDigest = hash512(combine);
-    BigInt r = xrpl.liteEddianToBigInt(hashDigest);
-    r = r % xrpl.EDCurve.order;
-
-    final R = xrpl.EDCurve.generator * r;
-    final eR = R.encodePoint();
-    final combine2 = hash512(Uint8List.fromList([...eR, ...mt.$1, ...message]));
-    final i = xrpl.liteEddianToBigInt(combine2);
-    final S = (r + i * mt.$3) % xrpl.EDCurve.order;
-    final eRB = xrpl.liteEddianToBigInt(eR);
-    final Uint8List encodedDigest = Uint8List.fromList([
-      ...xrpl.bigIntToLittleEndianBytes(eRB, 32),
-      ...xrpl.bigIntToLittleEndianBytes(S, 32)
-    ]);
-    return bytesToHex(encodedDigest);
-  }
-
-  static Uint8List _seedToHash(Uint8List seed) {
-    final seedHash = hash512(seed);
-    final privateKey = seedHash.sublist(0, 32);
-    return privateKey;
-  }
-
-  /// get publick key from ED25519 privateKey
-  static (Uint8List, Uint8List, BigInt) _getMaterial(Uint8List privateKey) {
-    final digest = hash512(privateKey);
-    final a = digest.sublist(0, 32);
-    final prefix = digest.sublist(32);
-    a[0] &= 0xF8;
-    a[31] = (a[31] & 0x7F) | 0x40;
-    final aa = xrpl.liteEddianToBigInt(a);
-    final mul = xrpl.EDCurve.generator * aa;
-    final publicKey = mul.encodePoint();
-    return (publicKey, prefix, aa);
-  }
 
   final Uint8List _privateKey;
   final Uint8List _publicKey;