@btc-vision/transaction 1.6.4 → 1.6.5

package/browser/keypair/Address.d.ts

@@ -1,5 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
-import { ITimeLockOutput } from '../transaction/mineable/TimelockGenerator.js';
+import { IP2WSHAddress } from '../transaction/mineable/IP2WSHAddress.js';
 export declare class Address extends Uint8Array {
     #private;
     constructor(bytes?: ArrayLike<number>);
@@ -29,7 +29,8 @@ export declare class Address extends Uint8Array {
     toString(): string;
     toJSON(): string;
     p2tr(network: Network): string;
-    toCSV(duration: bigint | number | string, network: Network): ITimeLockOutput;
+    p2wda(network: Network): IP2WSHAddress;
+    toCSV(duration: bigint | number | string, network: Network): IP2WSHAddress;
     p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;

package/browser/keypair/AddressVerificator.d.ts

@@ -6,13 +6,24 @@ export declare enum AddressTypes {
     P2PK = "P2PK",
     P2TR = "P2TR",
     P2WPKH = "P2WPKH",
-    P2WSH = "P2WSH"
+    P2WSH = "P2WSH",
+    P2WDA = "P2WDA"
+}
+export interface ValidatedP2WDAAddress {
+    readonly isValid: boolean;
+    readonly isPotentiallyP2WDA: boolean;
+    readonly isDefinitelyP2WDA: boolean;
+    readonly publicKey?: Buffer;
+    readonly error?: string;
 }
 export declare class AddressVerificator {
     static isValidP2TRAddress(inAddress: string, network: Network): boolean;
     static isP2WPKHAddress(inAddress: string, network: Network): boolean;
+    static isP2WDAWitnessScript(witnessScript: Buffer): boolean;
     static isP2PKHOrP2SH(addy: string, network: Network): boolean;
     static isValidPublicKey(input: string, network: Network): boolean;
     static requireRedeemScript(addy: string, network: Network): boolean;
     static detectAddressType(addy: string, network: Network): AddressTypes | null;
+    static detectAddressTypeWithWitnessScript(addy: string, network: Network, witnessScript?: Buffer): AddressTypes | null;
+    static validateP2WDAAddress(address: string, network: Network, witnessScript?: Buffer): ValidatedP2WDAAddress;
 }

package/browser/keypair/Wallet.d.ts

@@ -1,11 +1,13 @@
 import { ECPairInterface } from 'ecpair';
 import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
+import { IP2WSHAddress } from '../transaction/mineable/IP2WSHAddress.js';
 export declare class Wallet {
     readonly network: Network;
     private readonly _keypair;
     private readonly _p2wpkh;
     private readonly _p2tr;
+    private readonly _p2wda;
     private readonly _legacy;
     private readonly _segwitLegacy;
     private readonly _bufferPubKey;
@@ -17,6 +19,7 @@ export declare class Wallet {
     get keypair(): ECPairInterface;
     get p2wpkh(): string;
     get p2tr(): string;
+    get p2wda(): IP2WSHAddress;
     get legacy(): string;
     get addresses(): string[];
     get segwitLegacy(): string;

package/browser/opnet.d.ts

@@ -6,9 +6,12 @@ export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/LegacyCalldataGenerator.js';
 export * from './generators/builders/MultiSignGenerator.js';
+export * from './generators/builders/P2WDAGenerator.js';
 export * from './generators/Features.js';
 export * from './generators/Generator.js';
 export * from './transaction/mineable/TimelockGenerator.js';
+export * from './transaction/mineable/IP2WSHAddress.js';
+export * from './p2wda/P2WDADetector.js';
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 export * from './keypair/AddressVerificator.js';
@@ -27,6 +30,7 @@ export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
 export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';

package/browser/p2wda/P2WDADetector.d.ts

@@ -0,0 +1,16 @@
+import { Buffer } from 'buffer';
+import { Network } from '@btc-vision/bitcoin';
+import { UTXO } from '../utxo/interfaces/IUTXO.js';
+import { IP2WSHAddress } from '../transaction/mineable/IP2WSHAddress.js';
+export declare class P2WDADetector {
+    static isP2WDAUTXO(utxo: UTXO): boolean;
+    static isP2WDAWitnessScript(witnessScript: Buffer): boolean;
+    static generateP2WDAAddress(publicKey: Buffer, network: Network): IP2WSHAddress & {
+        scriptPubKey: Buffer;
+    };
+    static extractPublicKeyFromP2WDA(witnessScript: Buffer): Buffer | null;
+    static createSimpleP2WDAWitness(transactionSignature: Buffer, witnessScript: Buffer): Buffer[];
+    static validateP2WDASignature(publicKey: Buffer, dataSignature: Buffer, operationData: Buffer): boolean;
+    static estimateP2WDAWitnessSize(dataSize?: number): number;
+    static couldBeP2WDA(scriptPubKey: Buffer): boolean;
+}

package/browser/transaction/TransactionFactory.d.ts

@@ -26,7 +26,7 @@ export interface BitcoinTransferBase {
     readonly nextUTXOs: UTXO[];
 }
 export interface InteractionResponse {
-    readonly fundingTransaction: string;
+    readonly fundingTransaction: string | null;
     readonly interactionTransaction: string;
     readonly estimatedFees: bigint;
     readonly nextUTXOs: UTXO[];
@@ -45,7 +45,9 @@ export declare class TransactionFactory {
     private detectInteractionOPWallet;
     private detectDeploymentOPWallet;
     private createFundTransaction;
+    private hasP2WDAInputs;
     private writePSBTHeader;
+    private signP2WDAInteraction;
     private getPriorityFee;
     private getUTXOAsTransaction;
 }

package/browser/transaction/builders/DeploymentTransaction.d.ts

@@ -4,13 +4,13 @@ import { P2TRPayment, Psbt } from '@btc-vision/bitcoin';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { Address } from '../../keypair/Address.js';
-import { ITimeLockOutput } from '../mineable/TimelockGenerator.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 export declare class DeploymentTransaction extends TransactionBuilder<TransactionType.DEPLOYMENT> {
     static readonly MAXIMUM_CONTRACT_SIZE: number;
     type: TransactionType.DEPLOYMENT;
     protected readonly challenge: ChallengeSolution;
-    protected readonly epochChallenge: ITimeLockOutput;
+    protected readonly epochChallenge: IP2WSHAddress;
     protected readonly _contractAddress: Address;
     protected tapLeafScript: TapLeafScript | null;
     private readonly deploymentVersion;
@@ -31,7 +31,7 @@ export declare class DeploymentTransaction extends TransactionBuilder<Transactio
     get contractAddress(): Address;
     get p2trAddress(): string;
     getRndBytes(): Buffer;
-    getPreimage(): ChallengeSolution;
+    getChallenge(): ChallengeSolution;
     getContractAddress(): string;
     protected contractSignerXOnlyPubKey(): Buffer;
     protected buildTransaction(): Promise<void>;

package/browser/transaction/builders/InteractionTransactionP2WDA.d.ts

@@ -0,0 +1,37 @@
+import { Buffer } from 'buffer';
+import { Psbt } from '@btc-vision/bitcoin';
+import { TransactionType } from '../enums/TransactionType.js';
+import { IInteractionParameters } from '../interfaces/ITransactionParameters.js';
+import { TransactionBuilder } from './TransactionBuilder.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
+export declare class InteractionTransactionP2WDA extends TransactionBuilder<TransactionType.INTERACTION> {
+    private static readonly MAX_WITNESS_FIELDS;
+    private static readonly MAX_BYTES_PER_WITNESS;
+    readonly type: TransactionType.INTERACTION;
+    protected readonly epochChallenge: IP2WSHAddress;
+    protected readonly disableAutoRefund: boolean;
+    private readonly contractAddress;
+    private readonly contractSecret;
+    private readonly calldata;
+    private readonly challenge;
+    private readonly randomBytes;
+    private p2wdaGenerator;
+    private scriptSigner;
+    private p2wdaInputIndices;
+    private readonly compiledOperationData;
+    constructor(parameters: IInteractionParameters);
+    getRndBytes(): Buffer;
+    getChallenge(): ChallengeSolution;
+    getContractSecret(): Buffer;
+    protected buildTransaction(): Promise<void>;
+    protected createMineableRewardOutputs(): Promise<void>;
+    protected signInputs(transaction: Psbt): Promise<void>;
+    private generateFeatures;
+    private generateKeyPairFromSeed;
+    private scriptSignerXOnlyPubKey;
+    private validateP2WDAInputs;
+    private validateOperationDataSize;
+    private finalizePrimaryP2WDA;
+    private splitIntoWitnessChunks;
+}

package/browser/transaction/builders/SharedInteractionTransaction.d.ts

@@ -4,8 +4,8 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 import { TransactionType } from '../enums/TransactionType.js';
 import { CalldataGenerator } from '../../generators/builders/CalldataGenerator.js';
 import { SharedInteractionParameters } from '../interfaces/ITransactionParameters.js';
-import { ITimeLockOutput } from '../mineable/TimelockGenerator.js';
 import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+import { IP2WSHAddress } from '../mineable/IP2WSHAddress.js';
 export declare abstract class SharedInteractionTransaction<T extends TransactionType> extends TransactionBuilder<T> {
     static readonly MAXIMUM_CALLDATA_SIZE: number;
     readonly randomBytes: Buffer;
@@ -14,7 +14,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected abstract readonly compiledTargetScript: Buffer;
     protected abstract readonly scriptTree: Taptree;
     protected readonly challenge: ChallengeSolution;
-    protected readonly epochChallenge: ITimeLockOutput;
+    protected readonly epochChallenge: IP2WSHAddress;
     protected calldataGenerator: CalldataGenerator;
     protected readonly calldata: Buffer;
     protected abstract readonly contractSecret: Buffer;
@@ -23,7 +23,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     protected constructor(parameters: SharedInteractionParameters);
     getContractSecret(): Buffer;
     getRndBytes(): Buffer;
-    getPreimage(): ChallengeSolution;
+    getChallenge(): ChallengeSolution;
     protected scriptSignerXOnlyPubKey(): Buffer;
     protected generateKeyPairFromSeed(): ECPairInterface;
     protected buildTransaction(): Promise<void>;
@@ -37,7 +37,7 @@ export declare abstract class SharedInteractionTransaction<T extends Transaction
     };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     protected signInputsNonWalletBased(transaction: Psbt): Promise<void>;
-    private createMineableRewardOutputs;
+    protected createMineableRewardOutputs(): Promise<void>;
     private getPubKeys;
     private generateRedeemScripts;
 }

package/browser/transaction/mineable/IP2WSHAddress.d.ts

@@ -0,0 +1,4 @@
+export interface IP2WSHAddress {
+    address: string;
+    witnessScript: Buffer;
+}

package/browser/transaction/mineable/TimelockGenerator.d.ts

@@ -1,9 +1,6 @@
 import { Network } from '@btc-vision/bitcoin';
-export interface ITimeLockOutput {
-    address: string;
-    witnessScript: Buffer;
-}
+import { IP2WSHAddress } from './IP2WSHAddress.js';
 export declare class TimeLockGenerator {
     private static readonly CSV_BLOCKS;
-    static generateTimeLockAddress(publicKey: Buffer, network?: Network, csvBlocks?: number): ITimeLockOutput;
+    static generateTimeLockAddress(publicKey: Buffer, network?: Network, csvBlocks?: number): IP2WSHAddress;
 }

package/browser/transaction/shared/TweakedTransaction.d.ts

@@ -5,6 +5,7 @@ import { UTXO } from '../../utxo/interfaces/IUTXO.js';
 import { TapLeafScript } from '../interfaces/Tap.js';
 import { ChainId } from '../../network/ChainId.js';
 import { UnisatSigner } from '../browser/extensions/UnisatSigner.js';
+import { Buffer } from 'buffer';
 export type SupportedTransactionVersion = 1 | 2 | 3;
 export interface ITweakedTransactionData {
     readonly signer: Signer | ECPairInterface | UnisatSigner;
@@ -88,6 +89,10 @@ export declare abstract class TweakedTransaction extends Logger {
         finalScriptSig: Buffer | undefined;
         finalScriptWitness: Buffer | undefined;
     };
+    protected finalizeSecondaryP2WDA(inputIndex: number, input: PsbtInput): {
+        finalScriptWitness: Buffer | undefined;
+        finalScriptSig: Buffer | undefined;
+    };
     protected signInputsWalletBased(transaction: Psbt): Promise<void>;
     protected isCSVScript(decompiled: (number | Buffer)[]): boolean;
     protected setCSVSequence(csvBlocks: number, currentSequence: number): number;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.6.4";
+export declare const version = "1.6.5";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.6.4';
+export const version = '1.6.5';

package/build/generators/builders/P2WDAGenerator.d.ts

@@ -0,0 +1,13 @@
+import { Network } from '@btc-vision/bitcoin';
+import { Feature, Features } from '../Features.js';
+import { Generator } from '../Generator.js';
+import { ChallengeSolution } from '../../epoch/ChallengeSolution.js';
+export declare class P2WDAGenerator extends Generator {
+    private static readonly P2WDA_VERSION;
+    constructor(senderPubKey: Buffer, contractSaltPubKey: Buffer, network?: Network);
+    static validateWitnessSize(dataSize: number, maxWitnessFields?: number, maxBytesPerWitness?: number): boolean;
+    compile(calldata: Buffer, contractSecret: Buffer, challenge: ChallengeSolution, maxPriority: bigint, features?: Feature<Features>[]): Buffer;
+    getHeader(maxPriority: bigint, features?: Features[]): Buffer;
+    private writeFeatures;
+    private encodeFeatureData;
+}

package/build/generators/builders/P2WDAGenerator.js

@@ -0,0 +1,62 @@
+import { networks } from '@btc-vision/bitcoin';
+import { BinaryWriter } from '../../buffer/BinaryWriter.js';
+import { Features } from '../Features.js';
+import { Generator } from '../Generator.js';
+export class P2WDAGenerator extends Generator {
+    constructor(senderPubKey, contractSaltPubKey, network = networks.bitcoin) {
+        super(senderPubKey, contractSaltPubKey, network);
+    }
+    static validateWitnessSize(dataSize, maxWitnessFields = 10, maxBytesPerWitness = 80) {
+        const signatureSize = 64;
+        const compressionRatio = 0.7;
+        const totalSize = dataSize + signatureSize;
+        const compressedSize = Math.ceil(totalSize * compressionRatio);
+        const requiredFields = Math.ceil(compressedSize / maxBytesPerWitness);
+        return requiredFields <= maxWitnessFields;
+    }
+    compile(calldata, contractSecret, challenge, maxPriority, features = []) {
+        if (!this.contractSaltPubKey) {
+            throw new Error('Contract salt public key not set');
+        }
+        if (contractSecret.length !== 32) {
+            throw new Error('Contract secret must be exactly 32 bytes');
+        }
+        const writer = new BinaryWriter();
+        writer.writeU8(P2WDAGenerator.P2WDA_VERSION);
+        writer.writeBytes(this.getHeader(maxPriority, features.map((f) => f.opcode)));
+        writer.writeBytes(contractSecret);
+        writer.writeBytes(challenge.publicKey.originalPublicKeyBuffer());
+        writer.writeBytes(challenge.solution);
+        writer.writeU32(calldata.length);
+        writer.writeBytes(calldata);
+        this.writeFeatures(writer, features);
+        return Buffer.from(writer.getBuffer());
+    }
+    getHeader(maxPriority, features = []) {
+        return super.getHeader(maxPriority, features);
+    }
+    writeFeatures(writer, features) {
+        writer.writeU16(features.length);
+        for (const feature of features) {
+            writer.writeU8(feature.opcode);
+            const encodedData = this.encodeFeatureData(feature);
+            writer.writeU32(encodedData.length);
+            writer.writeBytes(encodedData);
+        }
+    }
+    encodeFeatureData(feature) {
+        switch (feature.opcode) {
+            case Features.ACCESS_LIST: {
+                const chunks = this.encodeFeature(feature);
+                return Buffer.concat(chunks.flat());
+            }
+            case Features.EPOCH_SUBMISSION: {
+                const chunks = this.encodeFeature(feature);
+                return Buffer.concat(chunks.flat());
+            }
+            default:
+                throw new Error(`Unknown feature type: ${feature.opcode}`);
+        }
+    }
+}
+P2WDAGenerator.P2WDA_VERSION = 0x01;

package/build/keypair/Address.d.ts

@@ -1,5 +1,5 @@
 import { Network } from '@btc-vision/bitcoin';
-import { ITimeLockOutput } from '../transaction/mineable/TimelockGenerator.js';
+import { IP2WSHAddress } from '../transaction/mineable/IP2WSHAddress.js';
 export declare class Address extends Uint8Array {
     #private;
     constructor(bytes?: ArrayLike<number>);
@@ -29,7 +29,8 @@ export declare class Address extends Uint8Array {
     toString(): string;
     toJSON(): string;
     p2tr(network: Network): string;
-    toCSV(duration: bigint | number | string, network: Network): ITimeLockOutput;
+    p2wda(network: Network): IP2WSHAddress;
+    toCSV(duration: bigint | number | string, network: Network): IP2WSHAddress;
     p2op(network: Network): string;
     toTweakedHybridPublicKeyHex(): string;
     toTweakedHybridPublicKeyBuffer(): Buffer;

package/build/keypair/Address.js

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _Address_p2tr, _Address_p2op, _Address_network, _Address_originalPublicKey, _Address_keyPair, _Address_uncompressed, _Address_tweakedUncompressed;
+var _Address_p2tr, _Address_p2op, _Address_network, _Address_originalPublicKey, _Address_keyPair, _Address_uncompressed, _Address_tweakedUncompressed, _Address_p2wda;
 import { decompressPublicKey, toXOnly } from '@btc-vision/bitcoin';
 import { ADDRESS_BYTE_LENGTH } from '../utils/lengths.js';
 import { AddressVerificator } from './AddressVerificator.js';
@@ -17,6 +17,7 @@ import { EcKeyPair } from './EcKeyPair.js';
 import { ContractAddress } from '../transaction/ContractAddress.js';
 import { BitcoinUtils } from '../utils/BitcoinUtils.js';
 import { TimeLockGenerator } from '../transaction/mineable/TimelockGenerator.js';
+import { P2WDADetector } from '../p2wda/P2WDADetector.js';
 export class Address extends Uint8Array {
     constructor(bytes) {
         super(ADDRESS_BYTE_LENGTH);
@@ -27,6 +28,7 @@ export class Address extends Uint8Array {
         _Address_keyPair.set(this, void 0);
         _Address_uncompressed.set(this, void 0);
         _Address_tweakedUncompressed.set(this, void 0);
+        _Address_p2wda.set(this, void 0);
         if (!bytes) {
             return;
         }
@@ -195,6 +197,30 @@ export class Address extends Uint8Array {
         }
         throw new Error('Public key not set');
     }
+    p2wda(network) {
+        if (__classPrivateFieldGet(this, _Address_p2wda, "f") && __classPrivateFieldGet(this, _Address_network, "f") === network) {
+            return __classPrivateFieldGet(this, _Address_p2wda, "f");
+        }
+        if (!__classPrivateFieldGet(this, _Address_originalPublicKey, "f")) {
+            throw new Error('Cannot create P2WDA address: public key not set');
+        }
+        const publicKeyBuffer = Buffer.from(__classPrivateFieldGet(this, _Address_originalPublicKey, "f"));
+        if (publicKeyBuffer.length !== 33) {
+            throw new Error('P2WDA requires a compressed public key (33 bytes)');
+        }
+        try {
+            const p2wdaInfo = P2WDADetector.generateP2WDAAddress(publicKeyBuffer, network);
+            __classPrivateFieldSet(this, _Address_network, network, "f");
+            __classPrivateFieldSet(this, _Address_p2wda, p2wdaInfo, "f");
+            return {
+                address: p2wdaInfo.address,
+                witnessScript: p2wdaInfo.witnessScript,
+            };
+        }
+        catch (error) {
+            throw new Error(`Failed to generate P2WDA address: ${error.message}`);
+        }
+    }
     toCSV(duration, network) {
         const n = Number(duration);
         if (n < 1 || n > 65535) {
@@ -245,4 +271,4 @@ export class Address extends Uint8Array {
         super.set(tweakedBytes);
     }
 }
-_Address_p2tr = new WeakMap(), _Address_p2op = new WeakMap(), _Address_network = new WeakMap(), _Address_originalPublicKey = new WeakMap(), _Address_keyPair = new WeakMap(), _Address_uncompressed = new WeakMap(), _Address_tweakedUncompressed = new WeakMap();
+_Address_p2tr = new WeakMap(), _Address_p2op = new WeakMap(), _Address_network = new WeakMap(), _Address_originalPublicKey = new WeakMap(), _Address_keyPair = new WeakMap(), _Address_uncompressed = new WeakMap(), _Address_tweakedUncompressed = new WeakMap(), _Address_p2wda = new WeakMap();

package/build/keypair/AddressVerificator.d.ts

@@ -6,13 +6,24 @@ export declare enum AddressTypes {
     P2PK = "P2PK",
     P2TR = "P2TR",
     P2WPKH = "P2WPKH",
-    P2WSH = "P2WSH"
+    P2WSH = "P2WSH",
+    P2WDA = "P2WDA"
+}
+export interface ValidatedP2WDAAddress {
+    readonly isValid: boolean;
+    readonly isPotentiallyP2WDA: boolean;
+    readonly isDefinitelyP2WDA: boolean;
+    readonly publicKey?: Buffer;
+    readonly error?: string;
 }
 export declare class AddressVerificator {
     static isValidP2TRAddress(inAddress: string, network: Network): boolean;
     static isP2WPKHAddress(inAddress: string, network: Network): boolean;
+    static isP2WDAWitnessScript(witnessScript: Buffer): boolean;
     static isP2PKHOrP2SH(addy: string, network: Network): boolean;
     static isValidPublicKey(input: string, network: Network): boolean;
     static requireRedeemScript(addy: string, network: Network): boolean;
     static detectAddressType(addy: string, network: Network): AddressTypes | null;
+    static detectAddressTypeWithWitnessScript(addy: string, network: Network, witnessScript?: Buffer): AddressTypes | null;
+    static validateP2WDAAddress(address: string, network: Network, witnessScript?: Buffer): ValidatedP2WDAAddress;
 }

package/build/keypair/AddressVerificator.js

@@ -1,7 +1,8 @@
-import { address, initEccLib } from '@btc-vision/bitcoin';
+import { address, initEccLib, payments } from '@btc-vision/bitcoin';
 import * as ecc from '@bitcoinerlab/secp256k1';
 import { EcKeyPair } from './EcKeyPair.js';
 import { BitcoinUtils } from '../utils/BitcoinUtils.js';
+import { P2WDADetector } from '../p2wda/P2WDADetector.js';
 initEccLib(ecc);
 export var AddressTypes;
 (function (AddressTypes) {
@@ -12,6 +13,7 @@ export var AddressTypes;
     AddressTypes["P2TR"] = "P2TR";
     AddressTypes["P2WPKH"] = "P2WPKH";
     AddressTypes["P2WSH"] = "P2WSH";
+    AddressTypes["P2WDA"] = "P2WDA";
 })(AddressTypes || (AddressTypes = {}));
 export class AddressVerificator {
     static isValidP2TRAddress(inAddress, network) {
@@ -39,6 +41,9 @@ export class AddressVerificator {
         catch { }
         return isValidSegWitAddress;
     }
+    static isP2WDAWitnessScript(witnessScript) {
+        return P2WDADetector.isP2WDAWitnessScript(witnessScript);
+    }
     static isP2PKHOrP2SH(addy, network) {
         try {
             const decodedBase58 = address.fromBase58Check(addy);
@@ -124,4 +129,76 @@ export class AddressVerificator {
         catch { }
         return null;
     }
+    static detectAddressTypeWithWitnessScript(addy, network, witnessScript) {
+        const baseType = AddressVerificator.detectAddressType(addy, network);
+        if (baseType === AddressTypes.P2WSH && witnessScript) {
+            if (AddressVerificator.isP2WDAWitnessScript(witnessScript)) {
+                return AddressTypes.P2WDA;
+            }
+        }
+        return baseType;
+    }
+    static validateP2WDAAddress(address, network, witnessScript) {
+        try {
+            const addressType = AddressVerificator.detectAddressType(address, network);
+            if (addressType !== AddressTypes.P2WSH) {
+                return {
+                    isValid: false,
+                    isPotentiallyP2WDA: false,
+                    isDefinitelyP2WDA: false,
+                    error: 'Not a P2WSH address',
+                };
+            }
+            if (!witnessScript) {
+                return {
+                    isValid: true,
+                    isPotentiallyP2WDA: true,
+                    isDefinitelyP2WDA: false,
+                };
+            }
+            if (!AddressVerificator.isP2WDAWitnessScript(witnessScript)) {
+                return {
+                    isValid: true,
+                    isPotentiallyP2WDA: true,
+                    isDefinitelyP2WDA: false,
+                    error: 'Witness script does not match P2WDA pattern',
+                };
+            }
+            const p2wsh = payments.p2wsh({
+                redeem: { output: witnessScript },
+                network,
+            });
+            if (p2wsh.address !== address) {
+                return {
+                    isValid: false,
+                    isPotentiallyP2WDA: false,
+                    isDefinitelyP2WDA: false,
+                    error: 'Witness script does not match address',
+                };
+            }
+            const publicKey = P2WDADetector.extractPublicKeyFromP2WDA(witnessScript);
+            if (!publicKey) {
+                return {
+                    isValid: false,
+                    isPotentiallyP2WDA: false,
+                    isDefinitelyP2WDA: false,
+                    error: 'Failed to extract public key from witness script',
+                };
+            }
+            return {
+                isValid: true,
+                isPotentiallyP2WDA: true,
+                isDefinitelyP2WDA: true,
+                publicKey,
+            };
+        }
+        catch (error) {
+            return {
+                isValid: false,
+                isPotentiallyP2WDA: false,
+                isDefinitelyP2WDA: false,
+                error: error.message,
+            };
+        }
+    }
 }

package/build/keypair/Wallet.d.ts

@@ -1,11 +1,13 @@
 import { ECPairInterface } from 'ecpair';
 import { Network } from '@btc-vision/bitcoin';
 import { Address } from './Address.js';
+import { IP2WSHAddress } from '../transaction/mineable/IP2WSHAddress.js';
 export declare class Wallet {
     readonly network: Network;
     private readonly _keypair;
     private readonly _p2wpkh;
     private readonly _p2tr;
+    private readonly _p2wda;
     private readonly _legacy;
     private readonly _segwitLegacy;
     private readonly _bufferPubKey;
@@ -17,6 +19,7 @@ export declare class Wallet {
     get keypair(): ECPairInterface;
     get p2wpkh(): string;
     get p2tr(): string;
+    get p2wda(): IP2WSHAddress;
     get legacy(): string;
     get addresses(): string[];
     get segwitLegacy(): string;

package/build/keypair/Wallet.js

@@ -20,6 +20,7 @@ export class Wallet {
         this._p2wpkh = this._address.p2wpkh(this.network);
         this._legacy = this._address.p2pkh(this.network);
         this._segwitLegacy = this._address.p2wpkh(this.network);
+        this._p2wda = this._address.p2wda(this.network);
         this._tweakedKey = this._address.toBuffer();
     }
     get address() {
@@ -39,6 +40,9 @@ export class Wallet {
     get p2tr() {
         return this._p2tr;
     }
+    get p2wda() {
+        return this._p2wda;
+    }
     get legacy() {
         return this._legacy;
     }

package/build/opnet.d.ts

@@ -6,9 +6,12 @@ export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/LegacyCalldataGenerator.js';
 export * from './generators/builders/MultiSignGenerator.js';
+export * from './generators/builders/P2WDAGenerator.js';
 export * from './generators/Features.js';
 export * from './generators/Generator.js';
 export * from './transaction/mineable/TimelockGenerator.js';
+export * from './transaction/mineable/IP2WSHAddress.js';
+export * from './p2wda/P2WDADetector.js';
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 export * from './keypair/AddressVerificator.js';
@@ -27,6 +30,7 @@ export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
 export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';

package/build/opnet.js

@@ -5,9 +5,12 @@ export * from './generators/builders/CustomGenerator.js';
 export * from './generators/builders/DeploymentGenerator.js';
 export * from './generators/builders/LegacyCalldataGenerator.js';
 export * from './generators/builders/MultiSignGenerator.js';
+export * from './generators/builders/P2WDAGenerator.js';
 export * from './generators/Features.js';
 export * from './generators/Generator.js';
 export * from './transaction/mineable/TimelockGenerator.js';
+export * from './transaction/mineable/IP2WSHAddress.js';
+export * from './p2wda/P2WDADetector.js';
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 export * from './keypair/AddressVerificator.js';
@@ -26,6 +29,7 @@ export * from './transaction/builders/CustomScriptTransaction.js';
 export * from './transaction/builders/DeploymentTransaction.js';
 export * from './transaction/builders/FundingTransaction.js';
 export * from './transaction/builders/InteractionTransaction.js';
+export * from './transaction/builders/InteractionTransactionP2WDA.js';
 export * from './transaction/builders/MultiSignTransaction.js';
 export * from './transaction/builders/SharedInteractionTransaction.js';
 export * from './transaction/builders/TransactionBuilder.js';