@btc-vision/transaction 1.1.12 → 1.1.14

package/src/buffer/BinaryReader.ts

@@ -1,6 +1,15 @@
-import { ADDRESS_BYTE_LENGTH, BufferLike, i32, Selector, u16, u32, u8 } from '../utils/types.js';
-import { Address } from '../keypair/Address.js';
 import { AddressMap } from '../deterministic/AddressMap.js';
+import { Address } from '../keypair/Address.js';
+import {
+    ADDRESS_BYTE_LENGTH,
+    U128_BYTE_LENGTH,
+    U16_BYTE_LENGTH,
+    U256_BYTE_LENGTH,
+    U32_BYTE_LENGTH,
+    U64_BYTE_LENGTH,
+    U8_BYTE_LENGTH,
+} from '../utils/lengths.js';
+import { BufferLike, i32, Selector, u16, u32, u8 } from '../utils/types.js';
 
 export class BinaryReader {
     private buffer: DataView;
@@ -154,34 +163,34 @@ export class BinaryReader {
     }
 
     public readU8(): u8 {
-        this.verifyEnd(this.currentOffset + 1);
+        this.verifyEnd(this.currentOffset + U8_BYTE_LENGTH);
 
-        return this.buffer.getUint8(this.currentOffset++);
+        return this.buffer.getUint8(this.currentOffset + U8_BYTE_LENGTH);
     }
 
     public readU16(): u16 {
-        this.verifyEnd(this.currentOffset + 2);
+        this.verifyEnd(this.currentOffset + U16_BYTE_LENGTH);
 
         const value = this.buffer.getUint16(this.currentOffset, true);
-        this.currentOffset += 2;
+        this.currentOffset += U16_BYTE_LENGTH;
 
         return value;
     }
 
     public readU32(le: boolean = true): u32 {
-        this.verifyEnd(this.currentOffset + 4);
+        this.verifyEnd(this.currentOffset + U32_BYTE_LENGTH);
 
         const value = this.buffer.getUint32(this.currentOffset, le);
-        this.currentOffset += 4;
+        this.currentOffset += U32_BYTE_LENGTH;
 
         return value;
     }
 
     public readU64(): bigint {
-        this.verifyEnd(this.currentOffset + 8);
+        this.verifyEnd(this.currentOffset + U64_BYTE_LENGTH);
 
         const value: bigint = this.buffer.getBigUint64(this.currentOffset, true);
-        this.currentOffset += 8;
+        this.currentOffset += U64_BYTE_LENGTH;
 
         return value;
     }
@@ -203,7 +212,7 @@ export class BinaryReader {
     }
 
     public readU128(): bigint {
-        const next16Bytes = this.readBytes(16);
+        const next16Bytes = this.readBytes(U128_BYTE_LENGTH);
 
         return BigInt(
             '0x' + next16Bytes.reduce((acc, byte) => acc + byte.toString(16).padStart(2, '0'), ''),
@@ -211,7 +220,7 @@ export class BinaryReader {
     }
 
     public readU256(): bigint {
-        const next32Bytes = this.readBytes(32);
+        const next32Bytes = this.readBytes(U256_BYTE_LENGTH);
 
         return BigInt(
             '0x' + next32Bytes.reduce((acc, byte) => acc + byte.toString(16).padStart(2, '0'), ''),

package/src/buffer/BinaryWriter.ts

@@ -1,8 +1,17 @@
-import { BufferHelper } from '../utils/BufferHelper.js';
-import { ADDRESS_BYTE_LENGTH, i32, Selector, u16, u32, u64, u8 } from '../utils/types.js';
+import { AddressMap } from '../deterministic/AddressMap.js';
 import { Address } from '../keypair/Address.js';
+import { BufferHelper } from '../utils/BufferHelper.js';
+import {
+    ADDRESS_BYTE_LENGTH,
+    U128_BYTE_LENGTH,
+    U16_BYTE_LENGTH,
+    U256_BYTE_LENGTH,
+    U32_BYTE_LENGTH,
+    U64_BYTE_LENGTH,
+    U8_BYTE_LENGTH,
+} from '../utils/lengths.js';
+import { i32, Selector, u16, u32, u64, u8 } from '../utils/types.js';
 import { BinaryReader } from './BinaryReader.js';
-import { AddressMap } from '../deterministic/AddressMap.js';
 
 export class BinaryWriter {
     private currentOffset: u32 = 0;
@@ -15,14 +24,14 @@ export class BinaryWriter {
     public writeU8(value: u8): void {
         if (value > 255) throw new Error('Value is too large.');
 
-        this.allocSafe(1);
+        this.allocSafe(U8_BYTE_LENGTH);
         this.buffer.setUint8(this.currentOffset++, value);
     }
 
     public writeU16(value: u16): void {
         if (value > 65535) throw new Error('Value is too large.');
 
-        this.allocSafe(2);
+        this.allocSafe(U16_BYTE_LENGTH);
         this.buffer.setUint16(this.currentOffset, value, true);
         this.currentOffset += 2;
     }
@@ -30,7 +39,7 @@ export class BinaryWriter {
     public writeU32(value: u32, le: boolean = true): void {
         if (value > 4294967295) throw new Error('Value is too large.');
 
-        this.allocSafe(4);
+        this.allocSafe(U32_BYTE_LENGTH);
         this.buffer.setUint32(this.currentOffset, value, le);
         this.currentOffset += 4;
     }
@@ -38,7 +47,7 @@ export class BinaryWriter {
     public writeU64(value: u64): void {
         if (value > 18446744073709551615n) throw new Error('Value is too large.');
 
-        this.allocSafe(8);
+        this.allocSafe(U64_BYTE_LENGTH);
         this.buffer.setBigUint64(this.currentOffset, value, true);
         this.currentOffset += 8;
     }
@@ -59,10 +68,10 @@ export class BinaryWriter {
             throw new Error('Value is too large.');
         }
 
-        this.allocSafe(32);
+        this.allocSafe(U256_BYTE_LENGTH);
 
         const bytesToHex = BufferHelper.valueToUint8Array(bigIntValue);
-        if (bytesToHex.byteLength !== 32) {
+        if (bytesToHex.byteLength !== U256_BYTE_LENGTH) {
             throw new Error(`Invalid u256 value: ${bigIntValue}`);
         }
 
@@ -76,10 +85,10 @@ export class BinaryWriter {
             throw new Error('Value is too large.');
         }
 
-        this.allocSafe(16);
+        this.allocSafe(U128_BYTE_LENGTH);
 
-        const bytesToHex = BufferHelper.valueToUint8Array(bigIntValue, 16);
-        if (bytesToHex.byteLength !== 16) {
+        const bytesToHex = BufferHelper.valueToUint8Array(bigIntValue, U128_BYTE_LENGTH);
+        if (bytesToHex.byteLength !== U128_BYTE_LENGTH) {
             throw new Error(`Invalid u128 value: ${bigIntValue}`);
         }
 
@@ -111,7 +120,7 @@ export class BinaryWriter {
     }
 
     public writeStringWithLength(value: string): void {
-        this.allocSafe(value.length + 2);
+        this.allocSafe(U16_BYTE_LENGTH + value.length);
 
         this.writeU16(value.length);
         this.writeString(value);
@@ -134,7 +143,7 @@ export class BinaryWriter {
     }
 
     public writeTuple(values: bigint[]): void {
-        this.allocSafe(4 + values.length * 32);
+        this.allocSafe(U32_BYTE_LENGTH + values.length * U256_BYTE_LENGTH);
         this.writeU32(values.length);
 
         for (let i = 0; i < values.length; i++) {
@@ -248,7 +257,6 @@ export class BinaryWriter {
         if (value.length > 65535) throw new Error('Array size is too large');
 
         this.writeU16(value.length);
-
         for (let i = 0; i < value.length; i++) {
             this.writeU128(value[i]);
         }

package/src/deterministic/AddressMap.ts

@@ -4,7 +4,7 @@ import { Map } from './Map.js';
 
 export class AddressMap<V> extends Map<Address, V> {
     public set(key: Address, value: V): void {
-        const index: i32 = this._keys.indexOf(key);
+        const index: i32 = this.indexOf(key);
         if (index == -1) {
             this._keys.push(key);
             this._values.push(value);

package/src/keypair/Address.ts

@@ -1,8 +1,9 @@
 import { Network } from '@btc-vision/bitcoin';
-import { EcKeyPair } from './EcKeyPair.js';
+import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
 import { ECPairInterface } from 'ecpair';
+import { ADDRESS_BYTE_LENGTH } from '../utils/lengths.js';
 import { AddressVerificator } from './AddressVerificator.js';
-import { toXOnly } from '@btc-vision/bitcoin/src/psbt/bip371.js';
+import { EcKeyPair } from './EcKeyPair.js';
 
 const hexPattern = /^[0-9a-fA-F]+$/;
 const isHexadecimal = (input: string): boolean => {
@@ -20,7 +21,7 @@ export class Address extends Uint8Array {
     #keyPair: ECPairInterface | undefined;
 
     public constructor(bytes?: ArrayLike<number>) {
-        super(32);
+        super(ADDRESS_BYTE_LENGTH);
 
         if (!bytes) {
             return;
@@ -126,7 +127,7 @@ export class Address extends Uint8Array {
     public lessThan(a: Address): boolean {
         const b: Address = this as Address;
 
-        for (let i = 0; i < 32; i++) {
+        for (let i = 0; i < ADDRESS_BYTE_LENGTH; i++) {
             const thisByte = b[i];
             const aByte = a[i];
 
@@ -148,7 +149,7 @@ export class Address extends Uint8Array {
         // Compare the two addresses byte-by-byte, treating them as big-endian uint256
         const b = this as Address;
 
-        for (let i = 0; i < 32; i++) {
+        for (let i = 0; i < ADDRESS_BYTE_LENGTH; i++) {
             const thisByte = b[i];
             const aByte = a[i];
 
@@ -168,12 +169,13 @@ export class Address extends Uint8Array {
      * @returns {void}
      */
     public override set(publicKey: ArrayLike<number>): void {
-        if (publicKey.length !== 33 && publicKey.length !== 32 && publicKey.length !== 65) {
+        const validLengths = [ADDRESS_BYTE_LENGTH, 33, 65];
+        if (!validLengths.includes(publicKey.length)) {
             throw new Error(`Invalid public key length ${publicKey.length}`);
         }
 
-        if (publicKey.length === 32) {
-            const buf = Buffer.alloc(32);
+        if (publicKey.length === ADDRESS_BYTE_LENGTH) {
+            const buf = Buffer.alloc(ADDRESS_BYTE_LENGTH);
             buf.set(publicKey);
 
             super.set(publicKey);
@@ -228,7 +230,7 @@ export class Address extends Uint8Array {
     public toString(): string {
         return this.toHex();
     }
-    
+
     /**
      * Convert the address to a JSON string
      */

package/src/opnet.ts

@@ -4,24 +4,24 @@ export { version } from './_version.js';
 export * from './bytecode/Compressor.js';
 
 /** Generators */
-export * from './generators/Generator.js';
 export * from './generators/builders/CalldataGenerator.js';
-export * from './generators/builders/LegacyCalldataGenerator.js';
-export * from './generators/builders/DeploymentGenerator.js';
 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/Features.js';
+export * from './generators/Generator.js';
 
 /** Address */
 export * from './generators/AddressGenerator.js';
 export * from './verification/TapscriptVerificator.js';
 
 /** Key Pair */
+export * from './keypair/AddressVerificator.js';
 export * from './keypair/EcKeyPair.js';
-export * from './keypair/Wallet.js';
 export * from './keypair/interfaces/IWallet.js';
-export * from './keypair/AddressVerificator.js';
 export * from './keypair/MessageSigner.js';
+export * from './keypair/Wallet.js';
 
 /** Metadata */
 export * from './metadata/ContractBaseMetadata.js';
@@ -31,19 +31,19 @@ export * from './network/ChainId.js';
 export * from './signer/TweakedSigner.js';
 
 /** Transaction */
-export * from './transaction/TransactionFactory.js';
+export * from './transaction/enums/TransactionType.js';
 export * from './transaction/interfaces/ITransactionParameters.js';
 export * from './transaction/interfaces/Tap.js';
-export * from './transaction/enums/TransactionType.js';
+export * from './transaction/TransactionFactory.js';
 
 /** Builders */
-export * from './transaction/builders/InteractionTransaction.js';
-export * from './transaction/builders/FundingTransaction.js';
-export * from './transaction/builders/TransactionBuilder.js';
-export * from './transaction/builders/SharedInteractionTransaction.js';
-export * from './transaction/builders/DeploymentTransaction.js';
 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/MultiSignTransaction.js';
+export * from './transaction/builders/SharedInteractionTransaction.js';
+export * from './transaction/builders/TransactionBuilder.js';
 
 /** Utils */
 export * from './utils/BitcoinUtils.js';
@@ -56,34 +56,36 @@ export * from './utxo/OPNetLimitedProvider.js';
 export * from './transaction/processor/PsbtTransaction.js';
 
 /** Shared */
+export * from './transaction/psbt/PSBTTypes.js';
 export * from './transaction/shared/TweakedTransaction.js';
 export * from './utxo/interfaces/BroadcastResponse.js';
-export * from './transaction/psbt/PSBTTypes.js';
 
 export * from './transaction/shared/P2TR_MS.js';
 
 /** Consensus */
-export * from './consensus/ConsensusConfig.js';
 export * from './consensus/Consensus.js';
+export * from './consensus/ConsensusConfig.js';
 export * from './consensus/metadata/RoswellConsensus.js';
 
 /** Binary */
-export * from './utils/BufferHelper.js';
-export * from './utils/types.js';
-export * from './keypair/Address.js';
-export * from './event/NetEvent.js';
-export * from './deterministic/DeterministicMap.js';
-export * from './deterministic/DeterministicSet.js';
-export * from './deterministic/AddressMap.js';
-export * from './deterministic/AddressSet.js';
 export * from './abi/ABICoder.js';
-export * from './buffer/BinaryWriter.js';
 export * from './buffer/BinaryReader.js';
+export * from './buffer/BinaryWriter.js';
+export * from './deterministic/AddressMap.js';
+export * from './deterministic/AddressSet.js';
+export * from './deterministic/DeterministicMap.js';
+export * from './deterministic/DeterministicSet.js';
+export * from './event/NetEvent.js';
+export * from './keypair/Address.js';
+export * from './utils/BufferHelper.js';
+export * from './utils/types.js';
 
 /** Custom signers */
 export * from './transaction/browser/BrowserSignerBase.js';
 export * from './transaction/browser/extensions/UnisatSigner.js';
+export * from './transaction/browser/extensions/XverseSigner.js';
 export * from './transaction/browser/types/Unisat.js';
+export * from './transaction/browser/types/Xverse.js';
 
-export * from './transaction/browser/Web3Provider.js';
 export * from './metadata/tokens.js';
+export * from './transaction/browser/Web3Provider.js';

package/src/transaction/TransactionFactory.ts

@@ -91,7 +91,8 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(interactionParameters);
+            this.getPriorityFee(interactionParameters) +
+            preTransaction.getOptionalOutputValue();
 
         const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
         if (!feeEstimationFundingTransaction) {
@@ -145,13 +146,16 @@ export class TransactionFactory {
             throw new Error('Field "from" not provided.');
         }
 
+        if (!interactionParameters.utxos[0]) {
+            throw new Error('Missing at least one UTXO.');
+        }
+
         const preTransaction: InteractionTransaction = new InteractionTransaction({
             ...interactionParameters,
             utxos: [interactionParameters.utxos[0]], // we simulate one input here.
         });
 
         // we don't sign that transaction, we just need the parameters.
-
         await preTransaction.generateTransactionMinimalSignatures();
 
         const parameters: IFundingTransactionParameters =
@@ -160,16 +164,23 @@ export class TransactionFactory {
         parameters.utxos = interactionParameters.utxos;
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(interactionParameters);
+            this.getPriorityFee(interactionParameters) +
+            preTransaction.getOptionalOutputValue();
 
-        const feeEstimationFundingTransaction = await this.createFundTransaction({ ...parameters });
+        const feeEstimationFundingTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+        });
         if (!feeEstimationFundingTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
 
         parameters.estimatedFees = feeEstimationFundingTransaction.estimatedFees;
 
-        const signedTransaction = await this.createFundTransaction(parameters);
+        const signedTransaction = await this.createFundTransaction({
+            ...parameters,
+            optionalOutputs: [],
+        });
         if (!signedTransaction) {
             throw new Error('Could not sign funding transaction.');
         }
@@ -219,7 +230,8 @@ export class TransactionFactory {
 
         parameters.amount =
             (await preTransaction.estimateTransactionFees()) +
-            this.getPriorityFee(deploymentParameters);
+            this.getPriorityFee(deploymentParameters) +
+            preTransaction.getOptionalOutputValue();
 
         const fundingTransaction: FundingTransaction = new FundingTransaction(parameters);
         const signedTransaction: Transaction = await fundingTransaction.signTransaction();