@btc-vision/bitcoin 7.0.0-alpha.8 → 7.0.0-beta.0

package/src/io/utils.ts

@@ -27,14 +27,13 @@
  */
 export function concat(arrays: readonly Uint8Array[]): Uint8Array {
     let totalLength = 0;
-    for (let i = 0; i < arrays.length; i++) {
-        totalLength += arrays[i]!.length;
+    for (const arr of arrays) {
+        totalLength += arr.length;
     }
 
     const result = new Uint8Array(totalLength);
     let offset = 0;
-    for (let i = 0; i < arrays.length; i++) {
-        const arr = arrays[i]!;
+    for (const arr of arrays) {
         result.set(arr, offset);
         offset += arr.length;
     }
@@ -95,7 +94,7 @@ export function equals(a: Uint8Array, b: Uint8Array): boolean {
 export function compare(a: Uint8Array, b: Uint8Array): number {
     const minLength = Math.min(a.length, b.length);
     for (let i = 0; i < minLength; i++) {
-        const diff = a[i]! - b[i]!;
+        const diff = (a[i] as number) - (b[i] as number);
         if (diff !== 0) {
             return diff;
         }
@@ -187,7 +186,7 @@ export function reverse(bytes: Uint8Array): Uint8Array {
 export function reverseCopy(bytes: Uint8Array): Uint8Array {
     const result = new Uint8Array(bytes.length);
     for (let i = 0; i < bytes.length; i++) {
-        result[i] = bytes[bytes.length - 1 - i]!;
+        result[i] = bytes[bytes.length - 1 - i] as number;
     }
     return result;
 }
@@ -240,7 +239,7 @@ export function xor(a: Uint8Array, b: Uint8Array): Uint8Array {
     }
     const result = new Uint8Array(a.length);
     for (let i = 0; i < a.length; i++) {
-        result[i] = a[i]! ^ b[i]!;
+        result[i] = (a[i] as number) ^ (b[i] as number);
     }
     return result;
 }

package/src/merkle.ts

@@ -20,8 +20,8 @@ export function fastMerkleRoot(
         let j = 0;
 
         for (let i = 0; i < length; i += 2, ++j) {
-            const left = results[i]!;
-            const right = i + 1 === length ? left : results[i + 1]!;
+            const left = results[i] as Uint8Array;
+            const right = i + 1 === length ? left : (results[i + 1] as Uint8Array);
             const data = new Uint8Array(left.length + right.length);
             data.set(left);
             data.set(right, left.length);
@@ -32,5 +32,5 @@ export function fastMerkleRoot(
         length = j;
     }
 
-    return results[0]!;
+    return results[0] as Uint8Array;
 }

package/src/payments/bip341.ts

@@ -68,12 +68,13 @@ export function toHashTree(scriptTree: Taptree): HashTree {
 
     const hashes = [toHashTree(scriptTree[0]), toHashTree(scriptTree[1])];
     hashes.sort((a, b) => compare(a.hash, b.hash));
-    const [left, right] = hashes;
+    const left = hashes[0] as HashTree;
+    const right = hashes[1] as HashTree;
 
     return {
-        hash: tapBranchHash(left!.hash, right!.hash),
-        left: left!,
-        right: right!,
+        hash: tapBranchHash(left.hash, right.hash),
+        left,
+        right,
     };
 }
 
@@ -104,11 +105,11 @@ export function tapleafHash(leaf: Tapleaf): Bytes32 {
     return bcrypto.taggedHash(
         'TapLeaf',
         concat([new Uint8Array([version]), serializeScript(leaf.output)]),
-    ) as Bytes32;
+    );
 }
 
 export function tapTweakHash(pubKey: XOnlyPublicKey, h: Bytes32 | undefined): Bytes32 {
-    return bcrypto.taggedHash('TapTweak', h ? concat([pubKey, h]) : pubKey) as Bytes32;
+    return bcrypto.taggedHash('TapTweak', h ? concat([pubKey, h]) : pubKey);
 }
 
 export function tweakKey(pubKey: XOnlyPublicKey, h: Bytes32 | undefined): TweakedPublicKey | null {
@@ -128,7 +129,7 @@ export function tweakKey(pubKey: XOnlyPublicKey, h: Bytes32 | undefined): Tweake
 }
 
 function tapBranchHash(a: Uint8Array, b: Uint8Array): Bytes32 {
-    return bcrypto.taggedHash('TapBranch', concat([a, b])) as Bytes32;
+    return bcrypto.taggedHash('TapBranch', concat([a, b]));
 }
 
 function serializeScript(s: Uint8Array): Uint8Array {

package/src/payments/embed.ts

@@ -199,7 +199,7 @@ export class Embed {
         if (!this.#inputData) {
             return undefined;
         }
-        return bscript.compile(([OPS.OP_RETURN] as Stack).concat(this.#inputData)) as Script;
+        return bscript.compile(([OPS.OP_RETURN] as Stack).concat(this.#inputData));
     }
 
     #validate(): void {

package/src/payments/p2ms.ts

@@ -377,7 +377,7 @@ export class P2MS {
         }
         return bscript.compile(
             ([] as Stack).concat(OP_INT_BASE + m, pubkeys, OP_INT_BASE + n, OPS.OP_CHECKMULTISIG),
-        ) as Script;
+        );
     }
 
     #computeInput(): Script | undefined {
@@ -387,7 +387,7 @@ export class P2MS {
         if (!this.#inputSignatures) {
             return undefined;
         }
-        return bscript.compile(([OPS.OP_0] as Stack).concat(this.#inputSignatures)) as Script;
+        return bscript.compile(([OPS.OP_0] as Stack).concat(this.#inputSignatures));
     }
 
     // Validation

package/src/payments/p2op.ts

@@ -326,11 +326,13 @@ export class P2OP {
             }
             let pushPos = 1;
             let progLen: number;
-            if (this.#inputOutput[1]! < 0x4c) {
-                progLen = this.#inputOutput[1]!;
+            const byte1 = this.#inputOutput[1];
+            const byte2 = this.#inputOutput[2];
+            if (byte1 !== undefined && byte1 < 0x4c) {
+                progLen = byte1;
                 pushPos = 2;
-            } else if (this.#inputOutput[1] === 0x4c) {
-                progLen = this.#inputOutput[2]!;
+            } else if (byte1 === 0x4c && byte2 !== undefined) {
+                progLen = byte2;
                 pushPos = 3;
             } else {
                 throw new TypeError('Unsupported push opcode in P2OP script');

package/src/payments/p2pk.ts

@@ -285,7 +285,7 @@ export class P2PK {
         }
         const pubkey = this.#inputPubkey;
         if (pubkey) {
-            return bscript.compile([pubkey, OPS.OP_CHECKSIG]) as Script;
+            return bscript.compile([pubkey, OPS.OP_CHECKSIG]);
         }
         return undefined;
     }
@@ -296,7 +296,7 @@ export class P2PK {
         }
         const signature = this.#inputSignature;
         if (signature) {
-            return bscript.compile([signature]) as Script;
+            return bscript.compile([signature]);
         }
         return undefined;
     }

package/src/payments/p2pkh.ts

@@ -8,13 +8,12 @@
  * @packageDocumentation
  */
 
-import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import { decompressPublicKey } from '../pubkey.js';
 import * as bscript from '../script.js';
 import { type Bytes20, isPoint, type PublicKey, type Script, type Signature } from '../types.js';
-import { alloc, equals } from '../io/index.js';
+import { alloc, base58check, equals } from '../io/index.js';
 import { type P2PKHPayment, type PaymentOpts, PaymentType } from './types.js';
 
 const OPS = bscript.opcodes;
@@ -325,9 +324,9 @@ export class P2PKH {
     #getDecodedAddress(): { version: number; hash: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
-                const payload = new Uint8Array(bs58check.default.decode(this.#inputAddress));
+                const payload = new Uint8Array(base58check.decode(this.#inputAddress));
                 this.#decodedAddress = {
-                    version: payload[0]!,
+                    version: payload[0] as number,
                     hash: payload.subarray(1),
                 };
             }
@@ -358,7 +357,7 @@ export class P2PKH {
         const payload = alloc(21);
         payload[0] = this.#network.pubKeyHash;
         payload.set(h, 1);
-        return bs58check.default.encode(payload);
+        return base58check.encode(payload);
     }
 
     #computeHash(): Bytes20 | undefined {
@@ -374,7 +373,7 @@ export class P2PKH {
         // Use the pubkey getter to derive pubkey from input if available
         const pk = this.pubkey;
         if (pk) {
-            return bcrypto.hash160(pk) as Bytes20;
+            return bcrypto.hash160(pk);
         }
         return undefined;
     }
@@ -418,7 +417,7 @@ export class P2PKH {
             h,
             OPS.OP_EQUALVERIFY,
             OPS.OP_CHECKSIG,
-        ]) as Script;
+        ]);
     }
 
     #computeInput(): Script | undefined {
@@ -441,7 +440,7 @@ export class P2PKH {
             }
         }
 
-        return bscript.compile([this.#inputSignature, pubKey]) as Script;
+        return bscript.compile([this.#inputSignature, pubKey]);
     }
 
     // Validation

package/src/payments/p2sh.ts

@@ -8,12 +8,11 @@
  * @packageDocumentation
  */
 
-import * as bs58check from 'bs58check';
 import * as bcrypto from '../crypto.js';
 import { bitcoin as BITCOIN_NETWORK, type Network } from '../networks.js';
 import * as bscript from '../script.js';
 import { type Bytes20, type Script, type Stack, stacksEqual } from '../types.js';
-import { alloc, equals } from '../io/index.js';
+import { alloc, base58check, equals } from '../io/index.js';
 import {
     type P2SHPayment,
     type Payment,
@@ -303,9 +302,9 @@ export class P2SH {
     #getDecodedAddress(): { version: number; hash: Uint8Array } | undefined {
         if (!this.#decodedAddressComputed) {
             if (this.#inputAddress) {
-                const payload = new Uint8Array(bs58check.default.decode(this.#inputAddress));
+                const payload = new Uint8Array(base58check.decode(this.#inputAddress));
                 this.#decodedAddress = {
-                    version: payload[0]!,
+                    version: payload[0] as number,
                     hash: payload.subarray(1),
                 };
             }
@@ -336,7 +335,7 @@ export class P2SH {
                     output: (lastChunk === OPS.OP_FALSE
                         ? new Uint8Array(0)
                         : (lastChunk as Uint8Array)) as Script,
-                    input: bscript.compile(chunks.slice(0, -1)) as Script,
+                    input: bscript.compile(chunks.slice(0, -1)),
                     witness: this.#inputWitness || [],
                 };
             }
@@ -355,7 +354,7 @@ export class P2SH {
         const payload = alloc(21);
         payload[0] = this.#network.scriptHash;
         payload.set(h, 1);
-        return bs58check.default.encode(payload);
+        return base58check.encode(payload);
     }
 
     #computeHash(): Bytes20 | undefined {
@@ -370,7 +369,7 @@ export class P2SH {
         }
         const r = this.redeem;
         if (r && r.output) {
-            return bcrypto.hash160(r.output) as Bytes20;
+            return bcrypto.hash160(r.output);
         }
         return undefined;
     }
@@ -382,7 +381,7 @@ export class P2SH {
         const h = this.hash;
         if (!h) return undefined;
 
-        return bscript.compile([OPS.OP_HASH160, h, OPS.OP_EQUAL]) as Script;
+        return bscript.compile([OPS.OP_HASH160, h, OPS.OP_EQUAL]);
     }
 
     #computeInput(): Script | undefined {
@@ -395,7 +394,7 @@ export class P2SH {
         }
         return bscript.compile(
             ([] as Stack).concat(bscript.decompile(r.input) as Stack, r.output),
-        ) as Script;
+        );
     }
 
     #computeRedeem(): ScriptRedeem | undefined {

package/src/payments/p2tr.ts

@@ -405,9 +405,10 @@ export class P2TR {
         if (!this.#witnessWithoutAnnexComputed) {
             if (this.#inputWitness && this.#inputWitness.length > 0) {
                 // Remove annex if present
+                const lastWitness = this.#inputWitness[this.#inputWitness.length - 1];
                 if (
                     this.#inputWitness.length >= 2 &&
-                    this.#inputWitness[this.#inputWitness.length - 1]![0] === ANNEX_PREFIX
+                    lastWitness && lastWitness[0] === ANNEX_PREFIX
                 ) {
                     this.#witnessWithoutAnnex = this.#inputWitness.slice(0, -1);
                 } else {
@@ -459,7 +460,7 @@ export class P2TR {
         if (internalPk) {
             const tweakedKey = tweakKey(internalPk, this.hash);
             if (tweakedKey) {
-                return tweakedKey.x as XOnlyPublicKey;
+                return tweakedKey.x;
             }
         }
         return undefined;
@@ -471,7 +472,10 @@ export class P2TR {
         }
         const witness = this.#getWitnessWithoutAnnex();
         if (witness && witness.length > 1) {
-            return witness[witness.length - 1]!.subarray(1, 33) as XOnlyPublicKey;
+            const lastWitness = witness[witness.length - 1];
+            if (lastWitness) {
+                return lastWitness.subarray(1, 33) as XOnlyPublicKey;
+            }
         }
         return undefined;
     }
@@ -479,19 +483,19 @@ export class P2TR {
     #computeHash(): Bytes32 | undefined {
         const hashTree = this.#getHashTree();
         if (hashTree) {
-            return hashTree.hash as Bytes32;
+            return hashTree.hash;
         }
 
         const w = this.#getWitnessWithoutAnnex();
         if (w && w.length > 1) {
-            const controlBlock = w[w.length - 1]!;
-            const leafVersion = controlBlock[0]! & TAPLEAF_VERSION_MASK;
-            const script = w[w.length - 2]!;
+            const controlBlock = w[w.length - 1] as Uint8Array;
+            const leafVersion = (controlBlock[0] as number) & TAPLEAF_VERSION_MASK;
+            const script = w[w.length - 2] as Uint8Array;
             const leafHash = tapleafHash({
                 output: script,
                 version: leafVersion,
             });
-            return rootHashFromPath(controlBlock, leafHash) as Bytes32;
+            return rootHashFromPath(controlBlock, leafHash);
         }
 
         return undefined;
@@ -515,7 +519,7 @@ export class P2TR {
         const pk = this.pubkey;
         if (!pk) return undefined;
 
-        return bscript.compile([OPS.OP_1, pk]) as Script;
+        return bscript.compile([OPS.OP_1, pk]);
     }
 
     #computeRedeem(): ScriptRedeem | undefined {
@@ -526,10 +530,11 @@ export class P2TR {
         if (!witness || witness.length < 2) {
             return undefined;
         }
+        const lastWitness = witness[witness.length - 1] as Uint8Array;
         return {
             output: witness[witness.length - 2] as Script,
             witness: witness.slice(0, -2),
-            redeemVersion: witness[witness.length - 1]![0]! & TAPLEAF_VERSION_MASK,
+            redeemVersion: (lastWitness[0] as number) & TAPLEAF_VERSION_MASK,
         };
     }
 
@@ -688,12 +693,13 @@ export class P2TR {
         if (witness && witness.length > 0) {
             if (witness.length === 1) {
                 // Key-path spending
-                if (this.#inputSignature && !equals(this.#inputSignature!, witness[0]!)) {
+                const firstWitness = witness[0] as Uint8Array;
+                if (this.#inputSignature && !equals(this.#inputSignature, firstWitness)) {
                     throw new TypeError('Signature mismatch');
                 }
             } else {
                 // Script-path spending
-                const controlBlock = witness[witness.length - 1]!;
+                const controlBlock = witness[witness.length - 1] as Uint8Array;
                 if (controlBlock.length < 33) {
                     throw new TypeError(
                         `The control-block length is too small. Got ${controlBlock.length}, expected min 33.`,
@@ -712,7 +718,7 @@ export class P2TR {
                 }
 
                 const internalPk = controlBlock.subarray(1, 33);
-                if (this.#inputInternalPubkey && !equals(this.#inputInternalPubkey!, internalPk)) {
+                if (this.#inputInternalPubkey && !equals(this.#inputInternalPubkey, internalPk)) {
                     throw new TypeError('Internal pubkey mismatch');
                 }
 
@@ -720,8 +726,9 @@ export class P2TR {
                     throw new TypeError('Invalid internalPubkey for p2tr witness');
                 }
 
-                const leafVersion = controlBlock[0]! & TAPLEAF_VERSION_MASK;
-                const script = witness[witness.length - 2]!;
+                const controlBlockFirstByte = controlBlock[0] as number;
+                const leafVersion = controlBlockFirstByte & TAPLEAF_VERSION_MASK;
+                const script = witness[witness.length - 2] as Uint8Array;
 
                 const leafHash = tapleafHash({
                     output: script,
@@ -729,7 +736,7 @@ export class P2TR {
                 });
                 const computedHash = rootHashFromPath(controlBlock, leafHash);
 
-                const outputKey = tweakKey(internalPk as XOnlyPublicKey, computedHash);
+                const outputKey = tweakKey(internalPk, computedHash);
                 if (!outputKey) {
                     throw new TypeError('Invalid outputKey for p2tr witness');
                 }
@@ -738,7 +745,7 @@ export class P2TR {
                     throw new TypeError('Pubkey mismatch for p2tr witness');
                 }
 
-                if (outputKey.parity !== (controlBlock[0]! & 1)) {
+                if (outputKey.parity !== (controlBlockFirstByte & 1)) {
                     throw new Error('Incorrect parity');
                 }
             }

package/src/payments/p2wpkh.ts

@@ -341,7 +341,7 @@ export class P2WPKH {
         }
         const pk = this.#inputPubkey ?? this.pubkey;
         if (pk) {
-            return bcrypto.hash160(pk) as Bytes20;
+            return bcrypto.hash160(pk);
         }
         return undefined;
     }
@@ -373,7 +373,7 @@ export class P2WPKH {
         const h = this.hash;
         if (!h) return undefined;
 
-        return bscript.compile([OPS.OP_0, h]) as Script;
+        return bscript.compile([OPS.OP_0, h]);
     }
 
     #computeInput(): Uint8Array | undefined {
@@ -454,21 +454,23 @@ export class P2WPKH {
             if (this.#inputWitness.length !== 2) {
                 throw new TypeError('Witness is invalid');
             }
-            if (!bscript.isCanonicalScriptSignature(this.#inputWitness[0]!)) {
+            const witnessSig = this.#inputWitness[0] as Uint8Array;
+            const witnessPubkey = this.#inputWitness[1] as Uint8Array;
+            if (!bscript.isCanonicalScriptSignature(witnessSig)) {
                 throw new TypeError('Witness has invalid signature');
             }
-            if (!isPoint(this.#inputWitness[1]!) || this.#inputWitness[1]!.length !== 33) {
+            if (!isPoint(witnessPubkey) || witnessPubkey.length !== 33) {
                 throw new TypeError('Witness has invalid pubkey');
             }
 
-            if (this.#inputSignature && !equals(this.#inputSignature!, this.#inputWitness[0]!)) {
+            if (this.#inputSignature && !equals(this.#inputSignature, witnessSig)) {
                 throw new TypeError('Signature mismatch');
             }
-            if (this.#inputPubkey && !equals(this.#inputPubkey!, this.#inputWitness[1]!)) {
+            if (this.#inputPubkey && !equals(this.#inputPubkey, witnessPubkey)) {
                 throw new TypeError('Pubkey mismatch');
             }
 
-            const pkh = bcrypto.hash160(this.#inputWitness[1]);
+            const pkh = bcrypto.hash160(witnessPubkey);
             if (hash.length > 0 && !equals(hash, pkh)) {
                 throw new TypeError('Hash mismatch');
             }

package/src/payments/p2wsh.ts

@@ -352,7 +352,7 @@ export class P2WSH {
         }
         const r = this.redeem;
         if (r && r.output) {
-            return bcrypto.sha256(r.output) as Bytes32;
+            return bcrypto.sha256(r.output);
         }
         return undefined;
     }
@@ -364,7 +364,7 @@ export class P2WSH {
         const h = this.hash;
         if (!h) return undefined;
 
-        return bscript.compile([OPS.OP_0, h]) as Script;
+        return bscript.compile([OPS.OP_0, h]);
     }
 
     #computeInput(): Uint8Array | undefined {
@@ -523,7 +523,7 @@ export class P2WSH {
         }
 
         if (this.#inputWitness && this.#inputWitness.length > 0) {
-            const wScript = this.#inputWitness[this.#inputWitness.length - 1]!;
+            const wScript = this.#inputWitness[this.#inputWitness.length - 1] as Uint8Array;
             if (
                 this.#inputRedeem &&
                 this.#inputRedeem.output &&

package/src/psbt/PsbtCache.ts

@@ -75,7 +75,7 @@ export class PsbtCache {
         if (!cached) {
             this.addNonWitnessTxCache(input, inputIndex, txFromBuffer);
         }
-        return this.nonWitnessUtxoTxCache[inputIndex]!;
+        return this.nonWitnessUtxoTxCache[inputIndex] as Transaction;
     }
 
     public getScriptFromUtxo(
@@ -99,7 +99,8 @@ export class PsbtCache {
             };
         } else if (input.nonWitnessUtxo !== undefined) {
             const nonWitnessUtxoTx = this.getNonWitnessUtxoTx(input, inputIndex, txFromBuffer);
-            const o = nonWitnessUtxoTx.outs[this.tx.ins[inputIndex]!.index]!;
+            const txIn = this.tx.ins[inputIndex] as Transaction['ins'][0];
+            const o = nonWitnessUtxoTx.outs[txIn.index] as Transaction['outs'][0];
             return { script: o.script, value: o.value };
         } else {
             throw new Error("Can't find pubkey in input without Utxo data");
@@ -192,7 +193,7 @@ export class PsbtCache {
     }
 
     public pubkeyInOutput(pubkey: PublicKey, output: PsbtOutput, outputIndex: number): boolean {
-        const script = this.tx.outs[outputIndex]!.script;
+        const script = (this.tx.outs[outputIndex] as Transaction['outs'][0]).script;
         const { meaningfulScript } = getMeaningfulScript(
             script,
             outputIndex,
@@ -207,7 +208,7 @@ export class PsbtCache {
         if (!finalScript) return;
         const decomp = bscript.decompile(finalScript);
         if (!decomp) return;
-        const lastItem = decomp[decomp.length - 1]!;
+        const lastItem = decomp[decomp.length - 1];
         if (!(lastItem instanceof Uint8Array) || isPubkeyLike(lastItem) || isSigLike(lastItem))
             return;
         const sDecomp = bscript.decompile(lastItem);
@@ -220,7 +221,8 @@ export class PsbtCache {
     ): Uint8Array | undefined {
         if (!finalScript) return;
         const decomp = scriptWitnessToWitnessStack(finalScript);
-        const lastItem = decomp[decomp.length - 1]!;
+        const lastItem = decomp[decomp.length - 1];
+        if (!lastItem) return;
         if (isPubkeyLike(lastItem)) return;
         const sDecomp = bscript.decompile(lastItem);
         if (!sDecomp) return;
@@ -240,10 +242,11 @@ export class PsbtCache {
     ): { fee: number; feeRate: number } {
         let inputAmount = 0n;
         inputs.forEach((input, idx) => {
+            const txIn = tx.ins[idx] as Transaction['ins'][0];
             if (mustFinalize && input.finalScriptSig)
-                tx.ins[idx]!.script = input.finalScriptSig as Script;
+                txIn.script = input.finalScriptSig as Script;
             if (mustFinalize && input.finalScriptWitness) {
-                tx.ins[idx]!.witness = scriptWitnessToWitnessStack(input.finalScriptWitness);
+                txIn.witness = scriptWitnessToWitnessStack(input.finalScriptWitness);
             }
             if (input.witnessUtxo) {
                 inputAmount += input.witnessUtxo.value;
@@ -251,8 +254,8 @@ export class PsbtCache {
                 if (!txFromBuffer)
                     throw new Error('txFromBuffer is required for nonWitnessUtxo inputs');
                 const nwTx = this.getNonWitnessUtxoTx(input, idx, txFromBuffer);
-                const vout = tx.ins[idx]!.index;
-                const out = nwTx.outs[vout]!;
+                const vout = txIn.index;
+                const out = nwTx.outs[vout] as Transaction['outs'][0];
                 inputAmount += out.value;
             }
         });
@@ -296,8 +299,8 @@ export class PsbtCache {
         } else {
             if (input.nonWitnessUtxo) {
                 const nonWitnessUtxoTx = this.getNonWitnessUtxoTx(input, inputIndex, txFromBuffer);
-                const prevoutIndex = this.tx.ins[inputIndex]!.index;
-                res.script = nonWitnessUtxoTx.outs[prevoutIndex]!.script;
+                const prevoutIndex = (this.tx.ins[inputIndex] as Transaction['ins'][0]).index;
+                res.script = (nonWitnessUtxoTx.outs[prevoutIndex] as Transaction['outs'][0]).script;
             } else if (input.witnessUtxo) {
                 res.script = input.witnessUtxo.script as Script;
             }

package/src/psbt/PsbtFinalizer.ts

@@ -110,18 +110,18 @@ export function prepareFinalScripts(
             finalScriptWitness = witnessStackToScriptWitness(solution ?? [new Uint8Array([0x00])]);
         }
         if (p2sh) {
-            finalScriptSig = p2sh?.input as Script | undefined;
+            finalScriptSig = p2sh?.input;
         }
     } else {
         if (p2sh) {
-            finalScriptSig = p2sh?.input as Script | undefined;
+            finalScriptSig = p2sh?.input;
         } else {
             if (!payment) {
                 finalScriptSig = (
                     Array.isArray(solution) && solution[0] ? solution[0] : new Uint8Array([0x01])
                 ) as Script;
             } else {
-                finalScriptSig = payment.input as Script | undefined;
+                finalScriptSig = payment.input;
             }
         }
     }
@@ -175,23 +175,29 @@ function getPayment(script: Uint8Array, scriptType: string, partialSig: PartialS
                 signatures: sigs as Signature[],
             });
         }
-        case 'pubkey':
+        case 'pubkey': {
+            const sig0 = partialSig[0] as PartialSig;
             return payments.p2pk({
                 output: scriptBranded,
-                signature: partialSig[0]!.signature as Signature,
+                signature: sig0.signature as Signature,
             });
-        case 'pubkeyhash':
+        }
+        case 'pubkeyhash': {
+            const sig0 = partialSig[0] as PartialSig;
             return payments.p2pkh({
                 output: scriptBranded,
-                pubkey: partialSig[0]!.pubkey as PublicKey,
-                signature: partialSig[0]!.signature as Signature,
+                pubkey: sig0.pubkey as PublicKey,
+                signature: sig0.signature as Signature,
             });
-        case 'witnesspubkeyhash':
+        }
+        case 'witnesspubkeyhash': {
+            const sig0 = partialSig[0] as PartialSig;
             return payments.p2wpkh({
                 output: scriptBranded,
-                pubkey: partialSig[0]!.pubkey as PublicKey,
-                signature: partialSig[0]!.signature as Signature,
+                pubkey: sig0.pubkey as PublicKey,
+                signature: sig0.signature as Signature,
             });
+        }
         default:
             throw new Error(`Unknown script type: ${scriptType}`);
     }