@btc-vision/bitcoin 7.0.0-alpha.0 → 7.0.0-alpha.2

package/src/psbt/types.ts

@@ -5,15 +5,8 @@
 
 import type { Psbt as PsbtBase, PsbtGlobal, PsbtInput, PsbtOutput } from 'bip174';
 import type { Network } from '../networks.js';
-import type { Transaction, TaprootHashCache } from '../transaction.js';
-import type {
-    Bytes32,
-    PublicKey,
-    Satoshi,
-    Script,
-    Signature,
-    SchnorrSignature,
-} from '../types.js';
+import type { TaprootHashCache, Transaction } from '../transaction.js';
+import type { Bytes32, MessageHash, PublicKey, Satoshi, SchnorrSignature, Script, Signature } from '../types.js';
 
 /**
  * Transaction input interface for PSBT.
@@ -52,7 +45,7 @@ export interface PsbtTxOutput extends TransactionOutput {
  */
 export type ValidateSigFunction = (
     pubkey: PublicKey,
-    msghash: Bytes32,
+    msghash: MessageHash,
     signature: Uint8Array,
 ) => boolean;
 
@@ -137,7 +130,7 @@ export interface HDSigner extends HDSignerBase {
      * Input hash (the "message digest") for the signature algorithm
      * Return a 64 byte signature (32 byte r and 32 byte s in that order)
      */
-    sign(hash: Bytes32): Uint8Array;
+    sign(hash: MessageHash): Uint8Array;
 }
 
 /**
@@ -146,7 +139,7 @@ export interface HDSigner extends HDSignerBase {
 export interface HDSignerAsync extends HDSignerBase {
     derivePath(path: string): HDSignerAsync;
 
-    sign(hash: Bytes32): Promise<Uint8Array>;
+    sign(hash: MessageHash): Promise<Uint8Array>;
 }
 
 /**
@@ -156,13 +149,13 @@ export interface SignerAlternative {
     readonly publicKey: PublicKey;
     readonly lowR: boolean;
 
-    sign(hash: Bytes32, lowR?: boolean): Signature;
+    sign(hash: MessageHash, lowR?: boolean): Signature;
 
-    verify(hash: Bytes32, signature: Signature): boolean;
+    verify(hash: MessageHash, signature: Signature): boolean;
 
-    signSchnorr(hash: Bytes32): SchnorrSignature;
+    signSchnorr(hash: MessageHash): SchnorrSignature;
 
-    verifySchnorr(hash: Bytes32, signature: SchnorrSignature): boolean;
+    verifySchnorr(hash: MessageHash, signature: SchnorrSignature): boolean;
 }
 
 /**
@@ -172,9 +165,9 @@ export interface Signer {
     readonly publicKey: PublicKey;
     readonly network?: Network | undefined;
 
-    sign(hash: Bytes32, lowR?: boolean): Signature;
+    sign(hash: MessageHash, lowR?: boolean): Signature;
 
-    signSchnorr?(hash: Bytes32): SchnorrSignature;
+    signSchnorr?(hash: MessageHash): SchnorrSignature;
 
     getPublicKey?(): PublicKey;
 }
@@ -186,9 +179,9 @@ export interface SignerAsync {
     readonly publicKey: PublicKey;
     readonly network?: Network | undefined;
 
-    sign(hash: Bytes32, lowR?: boolean): Promise<Signature>;
+    sign(hash: MessageHash, lowR?: boolean): Promise<Signature>;
 
-    signSchnorr?(hash: Bytes32): Promise<SchnorrSignature>;
+    signSchnorr?(hash: MessageHash): Promise<SchnorrSignature>;
 
     getPublicKey?(): PublicKey;
 }
@@ -206,7 +199,7 @@ export interface TaprootHashCheckSigner {
 /**
  * Internal PSBT cache for computed values.
  */
-export interface PsbtCache {
+export interface PsbtCacheInterface {
     nonWitnessUtxoTxCache: Transaction[];
     nonWitnessUtxoBufCache: Uint8Array[];
     txInCache: TxInCacheMap;

package/src/psbt/validation.ts

@@ -4,14 +4,14 @@
  */
 
 import type { PsbtInput } from 'bip174';
-import { reverse, equals, toHex } from '../io/index.js';
-import * as payments from '../payments/index.js';
+import { equals, reverse, toHex } from '../io/index.js';
 import type { P2SHPayment, Payment, PaymentOpts } from '../payments/index.js';
+import * as payments from '../payments/index.js';
 import { checkTaprootInputForSigs, isTaprootInput } from './bip371.js';
 import { checkInputForSig, pubkeyInScript } from './psbtutils.js';
 import * as bscript from '../script.js';
 import type { Transaction } from '../transaction.js';
-import type { PsbtCache } from './types.js';
+import type { PsbtCacheInterface as PsbtCache } from './types.js';
 import type { PublicKey, Script } from '../types.js';
 
 /**
@@ -142,9 +142,7 @@ export function checkPartialSigSighashes(input: PsbtInput): void {
  */
 export function checkScriptForPubkey(pubkey: PublicKey, script: Script, action: string): void {
     if (!pubkeyInScript(pubkey, script)) {
-        throw new Error(
-            `Can not ${action} for this input with the key ${toHex(pubkey)}`,
-        );
+        throw new Error(`Can not ${action} for this input with the key ${toHex(pubkey)}`);
     }
 }
 
@@ -157,12 +155,7 @@ export function checkScriptForPubkey(pubkey: PublicKey, script: Script, action:
 export function scriptCheckerFactory(
     payment: (a: Omit<Payment, 'name'>, opts?: PaymentOpts) => Payment,
     paymentScriptName: string,
-): (
-    idx: number,
-    scriptPubKey: Script,
-    redeemScript: Script,
-    ioType: 'input' | 'output',
-) => void {
+): (idx: number, scriptPubKey: Script, redeemScript: Script, ioType: 'input' | 'output') => void {
     return (
         inputIndex: number,
         scriptPubKey: Script,