@btc-vision/bitcoin 7.0.0-alpha.1 → 7.0.0-alpha.3

package/src/psbt/types.ts

@@ -6,7 +6,7 @@
 import type { Psbt as PsbtBase, PsbtGlobal, PsbtInput, PsbtOutput } from 'bip174';
 import type { Network } from '../networks.js';
 import type { TaprootHashCache, Transaction } from '../transaction.js';
-import type { Bytes32, PublicKey, Satoshi, SchnorrSignature, Script, Signature } from '../types.js';
+import type { Bytes32, MessageHash, PublicKey, Satoshi, Script } from '../types.js';
 
 /**
  * Transaction input interface for PSBT.
@@ -45,7 +45,7 @@ export interface PsbtTxOutput extends TransactionOutput {
  */
 export type ValidateSigFunction = (
     pubkey: PublicKey,
-    msghash: Bytes32,
+    msghash: MessageHash,
     signature: Uint8Array,
 ) => boolean;
 
@@ -102,89 +102,7 @@ export interface PsbtOutputExtendedScript extends PsbtOutput {
     readonly value: Satoshi;
 }
 
-/**
- * Base interface for HD signers.
- */
-interface HDSignerBase {
-    /**
-     * DER format compressed publicKey Uint8Array
-     */
-    readonly publicKey: PublicKey;
-    /**
-     * The first 4 bytes of the sha256-ripemd160 of the publicKey
-     */
-    readonly fingerprint: Uint8Array;
-}
-
-/**
- * HD signer interface for synchronous signing.
- */
-export interface HDSigner extends HDSignerBase {
-    /**
-     * The path string must match /^m(\/\d+'?)+$/
-     * ex. m/44'/0'/0'/1/23 levels with ' must be hard derivations
-     */
-    derivePath(path: string): HDSigner;
-
-    /**
-     * 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;
-}
-
-/**
- * HD signer interface for asynchronous signing.
- */
-export interface HDSignerAsync extends HDSignerBase {
-    derivePath(path: string): HDSignerAsync;
-
-    sign(hash: Bytes32): Promise<Uint8Array>;
-}
-
-/**
- * Alternative signer interface with lowR support.
- */
-export interface SignerAlternative {
-    readonly publicKey: PublicKey;
-    readonly lowR: boolean;
-
-    sign(hash: Bytes32, lowR?: boolean): Signature;
-
-    verify(hash: Bytes32, signature: Signature): boolean;
-
-    signSchnorr(hash: Bytes32): SchnorrSignature;
-
-    verifySchnorr(hash: Bytes32, signature: SchnorrSignature): boolean;
-}
-
-/**
- * Basic signer interface for synchronous signing.
- */
-export interface Signer {
-    readonly publicKey: PublicKey;
-    readonly network?: Network | undefined;
-
-    sign(hash: Bytes32, lowR?: boolean): Signature;
-
-    signSchnorr?(hash: Bytes32): SchnorrSignature;
-
-    getPublicKey?(): PublicKey;
-}
-
-/**
- * Basic signer interface for asynchronous signing.
- */
-export interface SignerAsync {
-    readonly publicKey: PublicKey;
-    readonly network?: Network | undefined;
-
-    sign(hash: Bytes32, lowR?: boolean): Promise<Signature>;
-
-    signSchnorr?(hash: Bytes32): Promise<SchnorrSignature>;
-
-    getPublicKey?(): PublicKey;
-}
+export type { Signer, SignerAsync, HDSigner, HDSignerAsync } from '@btc-vision/ecpair';
 
 /**
  * Minimal key pair interface for checking Taproot hashes.
@@ -199,7 +117,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

@@ -11,7 +11,7 @@ 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';
 
 /**