@btc-vision/transaction 1.2.13 → 1.2.15

package/browser/transaction/TransactionFactory.d.ts

@@ -15,13 +15,6 @@ export interface DeploymentResult {
     readonly preimage: string;
     readonly utxos: UTXO[];
 }
-export interface WrapResult {
-    readonly transaction: [string, string];
-    readonly vaultAddress: string;
-    readonly amount: bigint;
-    readonly receiverAddress: string;
-    readonly utxos: UTXO[];
-}
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;

package/browser/transaction/browser/BrowserSignerBase.d.ts

@@ -11,6 +11,6 @@ export declare abstract class CustomKeypair implements Signer {
     abstract getPublicKey(): Buffer;
     abstract sign(hash: Buffer, lowR?: boolean): Buffer;
     abstract signSchnorr(hash: Buffer): Buffer;
-    abstract verify(hash: Buffer, signature: Buffer): boolean;
+    abstract verify(hash: Buffer, signature: Buffer): boolean | Buffer;
     abstract init(): Promise<void>;
 }

package/browser/transaction/interfaces/ITransactionParameters.d.ts

@@ -25,7 +25,7 @@ export interface IChallengeSolutionTransactionParameters extends ITransactionPar
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer;
     disableAutoRefund?: boolean;
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
     readonly randomBytes?: Buffer;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
@@ -36,5 +36,5 @@ export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'
     readonly bytecode: Buffer;
     readonly calldata?: Buffer;
     readonly randomBytes?: Buffer;
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
 }

package/browser/utxo/OPNetLimitedProvider.d.ts

@@ -7,6 +7,9 @@ export interface WalletUTXOs {
     readonly pending: RawUTXOResponse[];
     readonly spentTransactions: RawUTXOResponse[];
 }
+export interface PreimageData {
+    readonly preimage: Buffer;
+}
 export declare class OPNetLimitedProvider {
     private readonly opnetAPIUrl;
     private readonly utxoPath;
@@ -15,6 +18,7 @@ export declare class OPNetLimitedProvider {
     fetchUTXO(settings: FetchUTXOParams): Promise<UTXO[]>;
     fetchUTXOMultiAddr(settings: FetchUTXOParamsMultiAddress): Promise<UTXO[]>;
     broadcastTransaction(transaction: string, psbt: boolean): Promise<BroadcastResponse | undefined>;
+    getPreimage(): Promise<PreimageData | undefined>;
     splitUTXOs(wallet: Wallet, network: Network, splitInputsInto: number, amountPerUTXO: bigint): Promise<BroadcastResponse | {
         error: string;
     }>;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.2.13";
+export declare const version = "1.2.15";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.2.13';
+export const version = '1.2.15';

package/build/abi/ABICoder.d.ts

@@ -10,7 +10,6 @@ export declare enum ABIDataTypes {
     ADDRESS = "ADDRESS",
     STRING = "STRING",
     BYTES32 = "BYTES32",
-    TUPLE = "TUPLE",
     BYTES = "BYTES",
     ADDRESS_UINT256_TUPLE = "ADDRESS_UINT256_TUPLE",
     ARRAY_OF_ADDRESSES = "ARRAY_OF_ADDRESSES",

package/build/abi/ABICoder.js

@@ -14,7 +14,6 @@ export var ABIDataTypes;
     ABIDataTypes["ADDRESS"] = "ADDRESS";
     ABIDataTypes["STRING"] = "STRING";
     ABIDataTypes["BYTES32"] = "BYTES32";
-    ABIDataTypes["TUPLE"] = "TUPLE";
     ABIDataTypes["BYTES"] = "BYTES";
     ABIDataTypes["ADDRESS_UINT256_TUPLE"] = "ADDRESS_UINT256_TUPLE";
     ABIDataTypes["ARRAY_OF_ADDRESSES"] = "ARRAY_OF_ADDRESSES";
@@ -64,9 +63,6 @@ export class ABICoder {
                 case ABIDataTypes.INT128:
                     result.push(byteReader.readI128());
                     break;
-                case ABIDataTypes.TUPLE:
-                    result.push(byteReader.readTuple());
-                    break;
                 case ABIDataTypes.ADDRESS_UINT256_TUPLE:
                     result.push(byteReader.readAddressValueTuple());
                     break;

package/build/buffer/BinaryReader.d.ts

@@ -19,7 +19,6 @@ export declare class BinaryReader {
     readStringArray(): string[];
     readBytesArray(): Uint8Array[];
     readBytesWithLength(maxLength?: number): Uint8Array;
-    readTuple(): bigint[];
     readU8(): u8;
     readU16(): u16;
     readU32(le?: boolean): u32;

package/build/buffer/BinaryReader.js

@@ -106,14 +106,6 @@ export class BinaryReader {
         }
         return this.readBytes(length);
     }
-    readTuple() {
-        const length = this.readU32();
-        const result = new Array(length);
-        for (let i = 0; i < length; i++) {
-            result[i] = this.readU256();
-        }
-        return result;
-    }
     readU8() {
         this.verifyEnd(this.currentOffset + U8_BYTE_LENGTH);
         const value = this.buffer.getUint8(this.currentOffset);

package/build/buffer/BinaryWriter.d.ts

@@ -21,14 +21,13 @@ export declare class BinaryWriter {
     writeStringWithLength(value: string): void;
     getBuffer(clear?: boolean): Uint8Array;
     reset(): void;
-    writeTuple(values: bigint[]): void;
     toBytesReader(): BinaryReader;
     getOffset(): u32;
     setOffset(offset: u32): void;
     clear(): void;
     allocSafe(size: u32): void;
     writeABISelector(name: string, selector: Selector): void;
-    writeAddressValueTupleMap(map: AddressMap<bigint>): void;
+    writeAddressValueTuple(map: AddressMap<bigint>): void;
     writeLimitedAddressBytesMap(map: AddressMap<Uint8Array[]>): void;
     writeBytesWithLength(value: Uint8Array): void;
     writeAddressArray(value: Address[]): void;

package/build/buffer/BinaryWriter.js

@@ -114,13 +114,6 @@ export class BinaryWriter {
         this.currentOffset = 0;
         this.buffer = this.getDefaultBuffer(4);
     }
-    writeTuple(values) {
-        this.allocSafe(U32_BYTE_LENGTH + values.length * U256_BYTE_LENGTH);
-        this.writeU32(values.length);
-        for (let i = 0; i < values.length; i++) {
-            this.writeU256(values[i]);
-        }
-    }
     toBytesReader() {
         return new BinaryReader(this.getBuffer());
     }
@@ -143,7 +136,7 @@ export class BinaryWriter {
         this.writeStringWithLength(name);
         this.writeSelector(selector);
     }
-    writeAddressValueTupleMap(map) {
+    writeAddressValueTuple(map) {
         if (map.size > 65535)
             throw new Error('Map size is too large');
         this.writeU16(map.size);

package/build/transaction/TransactionFactory.d.ts

@@ -15,13 +15,6 @@ export interface DeploymentResult {
     readonly preimage: string;
     readonly utxos: UTXO[];
 }
-export interface WrapResult {
-    readonly transaction: [string, string];
-    readonly vaultAddress: string;
-    readonly amount: bigint;
-    readonly receiverAddress: string;
-    readonly utxos: UTXO[];
-}
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;

package/build/transaction/browser/BrowserSignerBase.d.ts

@@ -11,6 +11,6 @@ export declare abstract class CustomKeypair implements Signer {
     abstract getPublicKey(): Buffer;
     abstract sign(hash: Buffer, lowR?: boolean): Buffer;
     abstract signSchnorr(hash: Buffer): Buffer;
-    abstract verify(hash: Buffer, signature: Buffer): boolean;
+    abstract verify(hash: Buffer, signature: Buffer): boolean | Buffer;
     abstract init(): Promise<void>;
 }

package/build/transaction/browser/extensions/UnisatSigner.js

@@ -1,4 +1,4 @@
-import { crypto as bitCrypto, script as bitScript, networks, Psbt, toXOnly, } from '@btc-vision/bitcoin';
+import { crypto as bitCrypto, networks, Psbt, script as bitScript, toXOnly, } from '@btc-vision/bitcoin';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';

package/build/transaction/builders/DeploymentTransaction.js

@@ -41,8 +41,10 @@ export class DeploymentTransaction extends TransactionBuilder {
             this.calldata = parameters.calldata;
             this.verifyCalldata();
         }
+        if (!parameters.preimage)
+            throw new Error('Preimage is required');
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
-        this.preimage = parameters.preimage || BitcoinUtils.getSafeRandomValues(128);
+        this.preimage = parameters.preimage;
         this.rewardChallenge = ChallengeGenerator.generateMineableReward(this.preimage, this.network);
         this.contractSeed = this.getContractSeed();
         this.contractSigner = EcKeyPair.fromSeedKeyPair(this.contractSeed, this.network);

package/build/transaction/builders/SharedInteractionTransaction.js

@@ -28,7 +28,10 @@ export class SharedInteractionTransaction extends TransactionBuilder {
         if (!parameters.calldata) {
             throw new Error('Calldata is required');
         }
-        this.preimage = parameters.preimage || BitcoinUtils.getSafeRandomValues(128);
+        if (!parameters.preimage) {
+            throw new Error('Preimage is required');
+        }
+        this.preimage = parameters.preimage;
         this.disableAutoRefund = parameters.disableAutoRefund || false;
         this.rewardChallenge = ChallengeGenerator.generateMineableReward(this.preimage, this.network);
         this.calldata = Compressor.compress(parameters.calldata);

package/build/transaction/interfaces/ITransactionParameters.d.ts

@@ -25,7 +25,7 @@ export interface IChallengeSolutionTransactionParameters extends ITransactionPar
 export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer;
     disableAutoRefund?: boolean;
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
     readonly randomBytes?: Buffer;
 }
 export interface IInteractionParameters extends SharedInteractionParameters {
@@ -36,5 +36,5 @@ export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'
     readonly bytecode: Buffer;
     readonly calldata?: Buffer;
     readonly randomBytes?: Buffer;
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
 }

package/build/utxo/OPNetLimitedProvider.d.ts

@@ -7,6 +7,9 @@ export interface WalletUTXOs {
     readonly pending: RawUTXOResponse[];
     readonly spentTransactions: RawUTXOResponse[];
 }
+export interface PreimageData {
+    readonly preimage: Buffer;
+}
 export declare class OPNetLimitedProvider {
     private readonly opnetAPIUrl;
     private readonly utxoPath;
@@ -15,6 +18,7 @@ export declare class OPNetLimitedProvider {
     fetchUTXO(settings: FetchUTXOParams): Promise<UTXO[]>;
     fetchUTXOMultiAddr(settings: FetchUTXOParamsMultiAddress): Promise<UTXO[]>;
     broadcastTransaction(transaction: string, psbt: boolean): Promise<BroadcastResponse | undefined>;
+    getPreimage(): Promise<PreimageData | undefined>;
     splitUTXOs(wallet: Wallet, network: Network, splitInputsInto: number, amountPerUTXO: bigint): Promise<BroadcastResponse | {
         error: string;
     }>;

package/build/utxo/OPNetLimitedProvider.js

@@ -103,6 +103,13 @@ export class OPNetLimitedProvider {
         }
         return result;
     }
+    async getPreimage() {
+        const result = await this.rpcMethod('btc_preimage', []);
+        if (!result) {
+            return;
+        }
+        return result;
+    }
     async splitUTXOs(wallet, network, splitInputsInto, amountPerUTXO) {
         const utxoSetting = {
             addresses: [wallet.p2wpkh, wallet.p2tr],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.2.13",
+    "version": "1.2.15",
     "author": "BlobMaster41",
     "description": "OPNet transaction library allows you to create and sign transactions for the OPNet network.",
     "engines": {

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.2.13';
+export const version = '1.2.15';

package/src/abi/ABICoder.ts

@@ -15,7 +15,6 @@ export enum ABIDataTypes {
     ADDRESS = 'ADDRESS',
     STRING = 'STRING',
     BYTES32 = 'BYTES32',
-    TUPLE = 'TUPLE',
     BYTES = 'BYTES',
     ADDRESS_UINT256_TUPLE = 'ADDRESS_UINT256_TUPLE',
     ARRAY_OF_ADDRESSES = 'ARRAY_OF_ADDRESSES',
@@ -67,9 +66,6 @@ export class ABICoder {
                 case ABIDataTypes.INT128:
                     result.push(byteReader.readI128());
                     break;
-                case ABIDataTypes.TUPLE: // very basic for now, only contains uint256
-                    result.push(byteReader.readTuple());
-                    break;
                 case ABIDataTypes.ADDRESS_UINT256_TUPLE:
                     result.push(byteReader.readAddressValueTuple());
                     break;

package/src/buffer/BinaryReader.ts

@@ -152,17 +152,6 @@ export class BinaryReader {
         return this.readBytes(length);
     }
 
-    public readTuple(): bigint[] {
-        const length = this.readU32();
-        const result: bigint[] = new Array<bigint>(length);
-
-        for (let i = 0; i < length; i++) {
-            result[i] = this.readU256();
-        }
-
-        return result;
-    }
-
     public readU8(): u8 {
         this.verifyEnd(this.currentOffset + U8_BYTE_LENGTH);
 

package/src/buffer/BinaryWriter.ts

@@ -163,15 +163,6 @@ export class BinaryWriter {
         this.buffer = this.getDefaultBuffer(4);
     }
 
-    public writeTuple(values: bigint[]): void {
-        this.allocSafe(U32_BYTE_LENGTH + values.length * U256_BYTE_LENGTH);
-        this.writeU32(values.length);
-
-        for (let i = 0; i < values.length; i++) {
-            this.writeU256(values[i]);
-        }
-    }
-
     public toBytesReader(): BinaryReader {
         return new BinaryReader(this.getBuffer());
     }
@@ -200,7 +191,7 @@ export class BinaryWriter {
         this.writeSelector(selector);
     }
 
-    public writeAddressValueTupleMap(map: AddressMap<bigint>): void {
+    public writeAddressValueTuple(map: AddressMap<bigint>): void {
         if (map.size > 65535) throw new Error('Map size is too large');
 
         this.writeU16(map.size);

package/src/transaction/TransactionFactory.ts

@@ -33,14 +33,6 @@ export interface DeploymentResult {
     readonly utxos: UTXO[];
 }
 
-export interface WrapResult {
-    readonly transaction: [string, string];
-    readonly vaultAddress: string;
-    readonly amount: bigint;
-    readonly receiverAddress: string;
-    readonly utxos: UTXO[];
-}
-
 export interface FundingTransactionResponse {
     readonly tx: Transaction;
     readonly original: FundingTransaction;

package/src/transaction/browser/BrowserSignerBase.ts

@@ -30,7 +30,7 @@ export abstract class CustomKeypair implements Signer {
 
     public abstract signSchnorr(hash: Buffer): Buffer;
 
-    public abstract verify(hash: Buffer, signature: Buffer): boolean;
+    public abstract verify(hash: Buffer, signature: Buffer): boolean | Buffer;
 
     public abstract init(): Promise<void>;
 }

package/src/transaction/browser/extensions/UnisatSigner.ts

@@ -1,9 +1,9 @@
 import {
     crypto as bitCrypto,
-    script as bitScript,
     Network,
     networks,
     Psbt,
+    script as bitScript,
     TapScriptSig,
     toXOnly,
 } from '@btc-vision/bitcoin';

package/src/transaction/builders/DeploymentTransaction.ts

@@ -118,8 +118,10 @@ export class DeploymentTransaction extends TransactionBuilder<TransactionType.DE
             this.verifyCalldata();
         }
 
+        if(!parameters.preimage) throw new Error('Preimage is required');
+
         this.randomBytes = parameters.randomBytes || BitcoinUtils.rndBytes();
-        this.preimage = parameters.preimage || BitcoinUtils.getSafeRandomValues(128);
+        this.preimage = parameters.preimage;
 
         this.rewardChallenge = ChallengeGenerator.generateMineableReward(
             this.preimage,

package/src/transaction/builders/SharedInteractionTransaction.ts

@@ -67,7 +67,11 @@ export abstract class SharedInteractionTransaction<
             throw new Error('Calldata is required');
         }
 
-        this.preimage = parameters.preimage || BitcoinUtils.getSafeRandomValues(128);
+        if(!parameters.preimage) {
+            throw new Error('Preimage is required');
+        }
+
+        this.preimage = parameters.preimage;
 
         this.disableAutoRefund = parameters.disableAutoRefund || false;
         this.rewardChallenge = ChallengeGenerator.generateMineableReward(

package/src/transaction/interfaces/ITransactionParameters.ts

@@ -37,7 +37,7 @@ export interface SharedInteractionParameters extends ITransactionParameters {
     calldata?: Buffer;
     disableAutoRefund?: boolean;
 
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
     readonly randomBytes?: Buffer;
 }
 
@@ -52,5 +52,5 @@ export interface IDeploymentParameters extends Omit<ITransactionParameters, 'to'
     readonly calldata?: Buffer;
 
     readonly randomBytes?: Buffer;
-    readonly preimage?: Buffer;
+    readonly preimage: Buffer;
 }

package/src/utxo/OPNetLimitedProvider.ts

@@ -14,6 +14,10 @@ export interface WalletUTXOs {
     readonly spentTransactions: RawUTXOResponse[];
 }
 
+export interface PreimageData {
+    readonly preimage: Buffer;
+}
+
 /**
  * Allows to fetch UTXO data from any OPNET node
  */
@@ -177,6 +181,19 @@ export class OPNetLimitedProvider {
         return result as BroadcastResponse;
     }
 
+    /**
+     * Fetches the preimage from the OPNET node
+     * @returns {Promise<PreimageData | undefined>} - The preimage fetched
+     */
+    public async getPreimage(): Promise<PreimageData | undefined> {
+        const result = await this.rpcMethod('btc_preimage', []);
+        if (!result) {
+            return;
+        }
+
+        return result as PreimageData;
+    }
+
     /**
      * Splits UTXOs into smaller UTXOs
      * @param {Wallet} wallet - The wallet to split UTXOs