Skip to content

Commit 662eb40

Browse files
committed
refactor: update sign function PE-1136
1 parent a52b706 commit 662eb40

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

lib/src/models/data_item.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,8 @@ class DataItem implements TransactionBase {
138138
/// Signs the [DataItem] using the specified wallet and sets the `id` and `signature` appropriately.
139139
@override
140140
Future<Uint8List> sign(Wallet wallet) async {
141-
final rawSignature = await wallet.sign(this);
142-
143-
_signature = encodeBytesToBase64(rawSignature);
141+
_signature = await wallet.sign(this);
142+
final rawSignature = decodeBase64ToBytes(_signature);
144143

145144
final idHash = await sha256.hash(rawSignature);
146145
_id = encodeBytesToBase64(idHash.bytes);

lib/src/models/transaction.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,8 @@ class Transaction implements TransactionBase {
277277

278278
@override
279279
Future<void> sign(Wallet wallet) async {
280-
final rawSignature = await wallet.sign(this);
281-
282-
_signature = encodeBytesToBase64(rawSignature);
280+
_signature = await wallet.sign(this);
281+
final rawSignature = decodeBase64ToBytes(_signature);
283282

284283
final idHash = await sha256.hash(rawSignature);
285284
_id = encodeBytesToBase64(idHash.bytes);

lib/src/models/wallet.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,14 @@ class Wallet {
5555
await _keyPair!.extractPublicKey().then((res) => res.n));
5656
Future<String> getAddress() async => ownerToAddress(await getOwner());
5757

58-
Future<Uint8List> sign(TransactionBase transaction) async => rsaPssSign(
59-
message: await transaction.getSignatureData(), keyPair: _keyPair!);
58+
Future<String> sign(TransactionBase transaction) async {
59+
return encodeBytesToBase64(
60+
await rsaPssSign(
61+
message: await transaction.getSignatureData(),
62+
keyPair: _keyPair!,
63+
),
64+
);
65+
}
6066

6167
Future<Uint8List> signMessage(Uint8List message) async =>
6268
rsaPssSign(message: message, keyPair: _keyPair!);

0 commit comments

Comments
 (0)