From b4843a87cd9be92fa4f3f59f369fce4eb1317fff Mon Sep 17 00:00:00 2001 From: Stephan February Date: Tue, 12 Nov 2024 11:10:46 +0800 Subject: [PATCH] Linting fixes - Release Prep v2.1.0 --- lib/src/block/merkleblock.dart | 4 ++-- lib/src/crypto/childnumber.dart | 2 +- lib/src/crypto/ecies.dart | 4 ++-- lib/src/encoding/ckdserializer.dart | 8 ++++---- lib/src/script/svscript.dart | 1 - lib/src/transaction/default_builder.dart | 9 +++------ lib/src/transaction/p2sh_builder.dart | 10 +++++++--- lib/src/transaction/signed_unlock_builder.dart | 3 ++- lib/src/transaction/transaction_output.dart | 8 ++------ 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/lib/src/block/merkleblock.dart b/lib/src/block/merkleblock.dart index 7e25554..bbea5dd 100644 --- a/lib/src/block/merkleblock.dart +++ b/lib/src/block/merkleblock.dart @@ -34,8 +34,8 @@ class MerkleBlock { int? _numTransactions; List? _hashes; List? _flags; - int _flagBitsUsed = 0; - int _hashesUsed = 0; + // int _flagBitsUsed = 0; + // int _hashesUsed = 0; diff --git a/lib/src/crypto/childnumber.dart b/lib/src/crypto/childnumber.dart index d1fb4e7..1a86379 100644 --- a/lib/src/crypto/childnumber.dart +++ b/lib/src/crypto/childnumber.dart @@ -59,7 +59,7 @@ class ChildNumber implements Comparable { bool operator ==(otherChild){ - if (otherChild == null || runtimeType != otherChild.runtimeType) + if (runtimeType != otherChild.runtimeType) return false; return this._i == (otherChild as ChildNumber).i; diff --git a/lib/src/crypto/ecies.dart b/lib/src/crypto/ecies.dart index cf3b04d..4603dca 100644 --- a/lib/src/crypto/ecies.dart +++ b/lib/src/crypto/ecies.dart @@ -14,7 +14,7 @@ import 'package:pointycastle/pointycastle.dart'; /// This class only makes provision for the "Electrum ECIES" aka "BIE1" serialization /// format for the cipherText. class Ecies { - final ECDomainParameters _domainParams = ECDomainParameters('secp256k1'); + // final ECDomainParameters _domainParams = ECDomainParameters('secp256k1'); final SHA256Digest _sha256Digest = SHA256Digest(); final tagLength = 32; //size of hmac @@ -109,7 +109,7 @@ class Ecies { //calculate S = recipientPrivateKey o senderPublicKey final S = (senderPublicKey.point * recipientPrivateKey.privateKey)!; //point multiplication - final cipher = S.x; + // final cipher = S.x; if (cipherText.length - tagLength <= 37 ){ throw Exception('Invalid Checksum detected. Combined sum of Checksum and Message makes no sense'); diff --git a/lib/src/encoding/ckdserializer.dart b/lib/src/encoding/ckdserializer.dart index 47f0194..2470894 100644 --- a/lib/src/encoding/ckdserializer.dart +++ b/lib/src/encoding/ckdserializer.dart @@ -49,10 +49,10 @@ abstract class CKDSerializer { var versionBytes = getVersionBytes(); - var depth = this._nodeDepth; - var fingerprint = this._parentFingerprint; - var chainCode = this._chainCode; - var pubkeyHex = this._keyHex; + // var depth = this._nodeDepth; + // var fingerprint = this._parentFingerprint; + // var chainCode = this._chainCode; + // var pubkeyHex = this._keyHex; List serializedKey = List.filled(78, 0); serializedKey.setRange(0, 4, versionBytes); diff --git a/lib/src/script/svscript.dart b/lib/src/script/svscript.dart index 5fb481c..7ef54fb 100644 --- a/lib/src/script/svscript.dart +++ b/lib/src/script/svscript.dart @@ -1,4 +1,3 @@ -import 'dart:convert'; import 'dart:typed_data'; import 'package:collection/collection.dart'; import 'package:dartsv/src/encoding/utils.dart'; diff --git a/lib/src/transaction/default_builder.dart b/lib/src/transaction/default_builder.dart index 34ff8d6..6ca70ff 100644 --- a/lib/src/transaction/default_builder.dart +++ b/lib/src/transaction/default_builder.dart @@ -1,11 +1,8 @@ -import 'dart:typed_data'; +import 'package:dartsv/src/script/svscript.dart'; -import 'package:dartsv/src/transaction/signed_unlock_builder.dart'; -import 'package:hex/hex.dart'; -import 'package:sprintf/sprintf.dart'; - -import '../../dartsv.dart'; +import 'locking_script_builder.dart'; +import 'unlocking_script_builder.dart'; class DefaultLockBuilder extends LockingScriptBuilder { diff --git a/lib/src/transaction/p2sh_builder.dart b/lib/src/transaction/p2sh_builder.dart index 48aa6f8..85088c4 100644 --- a/lib/src/transaction/p2sh_builder.dart +++ b/lib/src/transaction/p2sh_builder.dart @@ -1,13 +1,17 @@ import 'dart:typed_data'; +import 'package:dartsv/src/encoding/utils.dart'; import 'package:dartsv/src/exceptions.dart'; import 'package:dartsv/src/script/opcodes.dart'; -import 'package:dartsv/src/transaction/signed_unlock_builder.dart'; +import 'package:dartsv/src/script/script_error.dart'; +import 'package:dartsv/src/script/svscript.dart'; +import 'package:dartsv/src/transaction/script_builder.dart'; import 'package:hex/hex.dart'; -import 'package:sprintf/sprintf.dart'; -import '../../dartsv.dart'; +import 'locking_script_builder.dart'; +import 'unlocking_script_builder.dart'; + class P2SHLockBuilder extends LockingScriptBuilder { diff --git a/lib/src/transaction/signed_unlock_builder.dart b/lib/src/transaction/signed_unlock_builder.dart index c527771..e6c003b 100644 --- a/lib/src/transaction/signed_unlock_builder.dart +++ b/lib/src/transaction/signed_unlock_builder.dart @@ -1,5 +1,6 @@ -import '../../dartsv.dart'; + +import 'package:dartsv/src/signature.dart'; /// All unlocking scripts that will use OP_CHECKSIG or OP_CHECKMULTISIG operations /// must implement this interface. Implementing this interface will signal to diff --git a/lib/src/transaction/transaction_output.dart b/lib/src/transaction/transaction_output.dart index ed22518..b48dc8a 100644 --- a/lib/src/transaction/transaction_output.dart +++ b/lib/src/transaction/transaction_output.dart @@ -1,14 +1,10 @@ -import 'dart:typed_data'; import 'package:buffer/buffer.dart'; -import 'package:dartsv/src/address.dart'; import 'package:dartsv/src/encoding/utils.dart'; +import 'package:dartsv/src/script/opcodes.dart'; import 'package:dartsv/src/script/svscript.dart'; -import 'package:hex/hex.dart'; -import '../../dartsv.dart'; -import 'default_builder.dart'; +import 'package:dartsv/src/varint.dart'; import 'transaction.dart'; -import 'package:sprintf/sprintf.dart'; /// Class that represents the output (UTXO) of a transaction. ///