@btc-vision/transaction 1.5.3 → 1.6.0

package/src/verification/TapscriptVerificator.ts

@@ -9,14 +9,17 @@ import {
 } from '@btc-vision/bitcoin';
 import { DeploymentGenerator } from '../generators/builders/DeploymentGenerator.js';
 import { TransactionBuilder } from '../transaction/builders/TransactionBuilder.js';
+import { ChallengeSolution } from '../epoch/ChallengeSolution.js';
+import { Feature, Features } from '../generators/Features.js';
 
 export interface ContractAddressVerificationParams {
     readonly deployerPubKey: Buffer;
     readonly contractSaltPubKey: Buffer;
     readonly originalSalt: Buffer;
     readonly bytecode: Buffer;
-    readonly preimage: Buffer;
+    readonly challenge: ChallengeSolution;
     readonly priorityFee: bigint;
+    readonly features: Feature<Features>[];
     readonly calldata?: Buffer;
     readonly network?: Network;
 }
@@ -37,9 +40,10 @@ export class TapscriptVerificator {
         const compiledTargetScript: Buffer = scriptBuilder.compile(
             params.bytecode,
             params.originalSalt,
-            params.preimage,
+            params.challenge,
             params.priorityFee,
             params.calldata,
+            params.features,
         );
 
         const scriptTree: Taptree = [
@@ -70,9 +74,10 @@ export class TapscriptVerificator {
         const compiledTargetScript: Buffer = scriptBuilder.compile(
             params.bytecode,
             params.originalSalt,
-            params.preimage,
+            params.challenge,
             params.priorityFee,
             params.calldata,
+            params.features,
         );
 
         const scriptTree: Taptree = [
@@ -91,7 +96,6 @@ export class TapscriptVerificator {
             network: network,
             scriptTree: scriptTree,
             redeem: {
-                //pubkeys: [params.deployerPubKey, params.contractSaltPubKey],
                 output: compiledTargetScript,
                 redeemVersion: TapscriptVerificator.TAP_SCRIPT_VERSION,
             },

package/browser/generators/builders/MineableReward.d.ts

@@ -1,7 +0,0 @@
-import { Network } from '@btc-vision/bitcoin';
-import { Generator } from '../Generator.js';
-export declare class MineableReward extends Generator {
-    constructor(senderPubKey: Buffer, network?: Network);
-    compile(preimage1: Buffer): Buffer;
-    private isTestnet;
-}

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

@@ -1,9 +0,0 @@
-import { Network } from '@btc-vision/bitcoin';
-export interface IMineableReward {
-    address: string;
-    p2shOutputScript: Buffer;
-    redeemScript: Buffer;
-}
-export declare class ChallengeGenerator {
-    static generateMineableReward(preimage1: Buffer, network: Network): IMineableReward;
-}

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

@@ -1,7 +0,0 @@
-import { Network } from '@btc-vision/bitcoin';
-import { Generator } from '../Generator.js';
-export declare class MineableReward extends Generator {
-    constructor(senderPubKey: Buffer, network?: Network);
-    compile(preimage1: Buffer): Buffer;
-    private isTestnet;
-}

package/build/generators/builders/MineableReward.js

@@ -1,48 +0,0 @@
-import { networks, opcodes, script } from '@btc-vision/bitcoin';
-import { Generator } from '../Generator.js';
-export class MineableReward extends Generator {
-    constructor(senderPubKey, network = networks.bitcoin) {
-        super(senderPubKey, Buffer.alloc(0), network);
-    }
-    compile(preimage1) {
-        let compiledData;
-        if (this.isTestnet()) {
-            compiledData = [
-                preimage1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SWAP,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_EQUAL,
-            ];
-        }
-        else {
-            compiledData = [
-                preimage1,
-                opcodes.OP_SWAP,
-                opcodes.OP_2DUP,
-                opcodes.OP_EQUAL,
-                opcodes.OP_NOT,
-                opcodes.OP_VERIFY,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SWAP,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_EQUAL,
-            ];
-        }
-        const asm = compiledData.flat();
-        const compiled = script.compile(asm);
-        const decompiled = script.decompile(compiled);
-        if (!decompiled) {
-            throw new Error('Failed to decompile script??');
-        }
-        return compiled;
-    }
-    isTestnet() {
-        return (this.network.bech32 === networks.testnet.bech32 ||
-            this.network.bech32 === networks.regtest.bech32);
-    }
-}

package/build/transaction/mineable/ChallengeGenerator.d.ts

@@ -1,9 +0,0 @@
-import { Network } from '@btc-vision/bitcoin';
-export interface IMineableReward {
-    address: string;
-    p2shOutputScript: Buffer;
-    redeemScript: Buffer;
-}
-export declare class ChallengeGenerator {
-    static generateMineableReward(preimage1: Buffer, network: Network): IMineableReward;
-}

package/build/transaction/mineable/ChallengeGenerator.js

@@ -1,28 +0,0 @@
-import bitcoin from '@btc-vision/bitcoin';
-import { MineableReward } from '../../generators/builders/MineableReward.js';
-export class ChallengeGenerator {
-    static generateMineableReward(preimage1, network) {
-        const mineableReward = new MineableReward(Buffer.alloc(0), network);
-        const redeemScript = mineableReward.compile(preimage1);
-        const p2sh = bitcoin.payments.p2sh({
-            redeem: { output: redeemScript },
-            network,
-        });
-        const outputRedeem = p2sh.redeem?.output;
-        if (!outputRedeem) {
-            throw new Error('Output redeem is required');
-        }
-        if (!p2sh.address) {
-            throw new Error('P2SH address is required');
-        }
-        const p2shOutputScript = p2sh?.redeem?.output;
-        if (!p2shOutputScript) {
-            throw new Error('No redeem output');
-        }
-        return {
-            address: p2sh.address,
-            p2shOutputScript,
-            redeemScript: redeemScript,
-        };
-    }
-}

package/src/generators/builders/MineableReward.ts

@@ -1,66 +0,0 @@
-import { Network, networks, opcodes, script } from '@btc-vision/bitcoin';
-import { Generator } from '../Generator.js';
-
-/**
- * Class to generate bitcoin script for interaction transactions
- */
-export class MineableReward extends Generator {
-    constructor(senderPubKey: Buffer, network: Network = networks.bitcoin) {
-        super(senderPubKey, Buffer.alloc(0), network);
-    }
-
-    /**
-     * Compile an interaction bitcoin script
-     * @param {Buffer} preimage1 - Preimage 1
-     * @returns {Buffer} - The compiled script
-     * @throws {Error} - If something goes wrong
-     */
-    public compile(preimage1: Buffer): Buffer {
-        let compiledData: (number | Buffer)[];
-
-        if (this.isTestnet()) {
-            compiledData = [
-                preimage1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SWAP,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_EQUAL,
-            ];
-        } else {
-            compiledData = [
-                preimage1,
-                opcodes.OP_SWAP,
-                opcodes.OP_2DUP,
-                opcodes.OP_EQUAL,
-                opcodes.OP_NOT,
-                opcodes.OP_VERIFY,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_SWAP,
-                opcodes.OP_SHA1,
-                opcodes.OP_SHA1,
-                opcodes.OP_EQUAL,
-            ];
-        }
-
-        const asm = compiledData.flat();
-        const compiled = script.compile(asm);
-
-        /** Verify the validity of the script */
-        const decompiled = script.decompile(compiled);
-        if (!decompiled) {
-            throw new Error('Failed to decompile script??');
-        }
-
-        return compiled;
-    }
-
-    private isTestnet(): boolean {
-        return (
-            this.network.bech32 === networks.testnet.bech32 ||
-            this.network.bech32 === networks.regtest.bech32
-        );
-    }
-}

package/src/transaction/mineable/ChallengeGenerator.ts

@@ -1,39 +0,0 @@
-import bitcoin, { Network } from '@btc-vision/bitcoin';
-import { MineableReward } from '../../generators/builders/MineableReward.js';
-
-export interface IMineableReward {
-    address: string;
-    p2shOutputScript: Buffer;
-    redeemScript: Buffer;
-}
-
-export class ChallengeGenerator {
-    public static generateMineableReward(preimage1: Buffer, network: Network): IMineableReward {
-        const mineableReward = new MineableReward(Buffer.alloc(0), network);
-        const redeemScript = mineableReward.compile(preimage1);
-        const p2sh = bitcoin.payments.p2sh({
-            redeem: { output: redeemScript },
-            network,
-        });
-
-        const outputRedeem: Buffer | undefined = p2sh.redeem?.output;
-        if (!outputRedeem) {
-            throw new Error('Output redeem is required');
-        }
-
-        if (!p2sh.address) {
-            throw new Error('P2SH address is required');
-        }
-
-        const p2shOutputScript: Buffer | undefined = p2sh?.redeem?.output;
-        if (!p2shOutputScript) {
-            throw new Error('No redeem output');
-        }
-
-        return {
-            address: p2sh.address,
-            p2shOutputScript,
-            redeemScript: redeemScript,
-        };
-    }
-}