opnet 1.2.16 → 1.2.18

package/browser/opnet.d.ts

@@ -29,6 +29,7 @@ export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
 export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/TypeToStr.js';
 export * from './abi/BitcoinAbiTypes.js';
 export * from './abi/BitcoinInterface.js';
 export * from './abi/interfaces/BaseContractProperties.js';

package/browser/transactions/Transaction.d.ts

@@ -11,6 +11,7 @@ export declare abstract class TransactionBase<T extends OPNetTransactionTypes> e
     readonly hash: string;
     readonly index: number;
     readonly burnedBitcoin: BigNumberish;
+    readonly priorityFee: BigNumberish;
     readonly inputs: TransactionInput[];
     readonly outputs: TransactionOutput[];
     readonly OPNetType: T;

package/browser/transactions/interfaces/ITransaction.d.ts

@@ -11,6 +11,7 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> extends ITran
     readonly hash: string;
     readonly index: number;
     readonly burnedBitcoin: string | BigNumberish;
+    readonly priorityFee: string | BigNumberish;
     readonly revert?: string | Buffer;
     readonly inputs: ITransactionInput[] | TransactionInput[];
     readonly outputs: ITransactionOutput[] | TransactionOutput[];

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.2.16";
+export declare const version = "1.2.18";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.2.16';
+export const version = '1.2.18';

package/build/contracts/CallResult.js

@@ -41,16 +41,18 @@ export class CallResult {
         if (this.revert) {
             throw new Error(`Can not send transaction! Simulation reverted: ${this.revert}`);
         }
-        const priorityFee = this.estimatedSatGas + (interactionParams.priorityFee || 0n);
+        const priorityFee = interactionParams.priorityFee || 0n;
+        const totalFee = this.estimatedSatGas + priorityFee;
         try {
             const UTXOs = interactionParams.utxos ||
-                (await this.#fetchUTXOs(priorityFee + interactionParams.maximumAllowedSatToSpend, interactionParams));
+                (await this.#fetchUTXOs(totalFee + interactionParams.maximumAllowedSatToSpend, interactionParams));
             if (!UTXOs || UTXOs.length === 0) {
                 throw new Error('No UTXOs found');
             }
             const params = {
                 calldata: this.calldata,
                 priorityFee: priorityFee,
+                gasSatFee: this.estimatedSatGas,
                 feeRate: interactionParams.feeRate || 10,
                 from: interactionParams.refundTo,
                 signer: interactionParams.signer,

package/build/contracts/Contract.d.ts

@@ -45,6 +45,7 @@ export declare abstract class IBaseContract<T extends BaseContractProperties> im
     setSimulatedHeight(height: bigint | undefined): void;
     protected getFunction(name: symbol | string): CallResult | undefined | string | number | symbol | Address | Network | (() => Promise<BlockGasParameters>) | ((functionName: string, args: unknown[]) => Buffer);
     private defineInternalFunctions;
+    private getSelector;
     private encodeFunctionData;
     private encodeInput;
     private decodeOutput;

package/build/contracts/Contract.js

@@ -2,6 +2,7 @@ import { ABICoder, ABIDataTypes, AddressVerificator, BinaryReader, BinaryWriter,
 import { BitcoinAbiTypes } from '../abi/BitcoinAbiTypes.js';
 import { BitcoinInterface } from '../abi/BitcoinInterface.js';
 import { OPNetEvent } from './OPNetEvent.js';
+import { AbiTypeToStr } from './TypeToStr.js';
 const internal = Symbol.for('_btc_internal');
 const bitcoinAbiCoder = new ABICoder();
 export class IBaseContract {
@@ -121,9 +122,29 @@ export class IBaseContract {
             }
         }
     }
+    getSelector(element) {
+        let name = element.name;
+        if (element.inputs && element.inputs.length) {
+            name += '(';
+            for (let i = 0; i < element.inputs.length; i++) {
+                const input = element.inputs[i];
+                const str = AbiTypeToStr[input.type];
+                if (!str) {
+                    throw new Error(`Unsupported type: ${input.type}`);
+                }
+                if (i > 0) {
+                    name += ',';
+                }
+                name += str;
+            }
+            name += ')';
+        }
+        return name;
+    }
     encodeFunctionData(element, args) {
         const writer = new BinaryWriter();
-        const selector = Number('0x' + bitcoinAbiCoder.encodeSelector(element.name));
+        const selectorStr = this.getSelector(element);
+        const selector = Number('0x' + bitcoinAbiCoder.encodeSelector(selectorStr));
         writer.writeSelector(selector);
         if (args.length !== (element.inputs?.length ?? 0)) {
             throw new Error('Invalid number of arguments provided');

package/build/contracts/TypeToStr.d.ts

@@ -0,0 +1,4 @@
+import { ABIDataTypes } from '@btc-vision/transaction';
+export declare const AbiTypeToStr: {
+    [key in ABIDataTypes]: string;
+};

package/build/contracts/TypeToStr.js

@@ -0,0 +1,25 @@
+import { ABIDataTypes } from '@btc-vision/transaction';
+export const AbiTypeToStr = {
+    [ABIDataTypes.ADDRESS]: 'address',
+    [ABIDataTypes.BOOL]: 'bool',
+    [ABIDataTypes.BYTES]: 'bytes',
+    [ABIDataTypes.UINT256]: 'uint256',
+    [ABIDataTypes.UINT128]: 'uint128',
+    [ABIDataTypes.UINT64]: 'uint64',
+    [ABIDataTypes.UINT32]: 'uint32',
+    [ABIDataTypes.UINT16]: 'uint16',
+    [ABIDataTypes.UINT8]: 'uint8',
+    [ABIDataTypes.STRING]: 'string',
+    [ABIDataTypes.BYTES32]: 'bytes32',
+    [ABIDataTypes.ADDRESS_UINT256_TUPLE]: 'tuple(address,uint256)',
+    [ABIDataTypes.ARRAY_OF_ADDRESSES]: 'address[]',
+    [ABIDataTypes.ARRAY_OF_UINT256]: 'uint256[]',
+    [ABIDataTypes.ARRAY_OF_UINT128]: 'uint128[]',
+    [ABIDataTypes.ARRAY_OF_UINT64]: 'uint64[]',
+    [ABIDataTypes.ARRAY_OF_UINT32]: 'uint32[]',
+    [ABIDataTypes.ARRAY_OF_UINT16]: 'uint16[]',
+    [ABIDataTypes.ARRAY_OF_UINT8]: 'uint8[]',
+    [ABIDataTypes.ARRAY_OF_BYTES]: 'bytes[]',
+    [ABIDataTypes.ARRAY_OF_STRING]: 'string[]',
+    [ABIDataTypes.TUPLE]: 'tuple256',
+};

package/build/opnet.d.ts

@@ -29,6 +29,7 @@ export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
 export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/TypeToStr.js';
 export * from './abi/BitcoinAbiTypes.js';
 export * from './abi/BitcoinInterface.js';
 export * from './abi/interfaces/BaseContractProperties.js';

package/build/opnet.js

@@ -29,6 +29,7 @@ export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
 export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/TypeToStr.js';
 export * from './abi/BitcoinAbiTypes.js';
 export * from './abi/BitcoinInterface.js';
 export * from './abi/interfaces/BaseContractProperties.js';

package/build/transactions/Transaction.d.ts

@@ -11,6 +11,7 @@ export declare abstract class TransactionBase<T extends OPNetTransactionTypes> e
     readonly hash: string;
     readonly index: number;
     readonly burnedBitcoin: BigNumberish;
+    readonly priorityFee: BigNumberish;
     readonly inputs: TransactionInput[];
     readonly outputs: TransactionOutput[];
     readonly OPNetType: T;

package/build/transactions/Transaction.js

@@ -6,6 +6,7 @@ export class TransactionBase extends TransactionReceipt {
     hash;
     index;
     burnedBitcoin;
+    priorityFee;
     inputs;
     outputs;
     OPNetType;
@@ -22,6 +23,7 @@ export class TransactionBase extends TransactionReceipt {
         this.hash = transaction.hash;
         this.index = transaction.index;
         this.burnedBitcoin = BigInt(transaction.burnedBitcoin) || 0n;
+        this.priorityFee = BigInt(transaction.priorityFee) || 0n;
         this.inputs = transaction.inputs.map((input) => new TransactionInput(input));
         this.outputs = transaction.outputs.map((output) => new TransactionOutput(output));
         this.OPNetType = transaction.OPNetType;

package/build/transactions/interfaces/ITransaction.d.ts

@@ -11,6 +11,7 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> extends ITran
     readonly hash: string;
     readonly index: number;
     readonly burnedBitcoin: string | BigNumberish;
+    readonly priorityFee: string | BigNumberish;
     readonly revert?: string | Buffer;
     readonly inputs: ITransactionInput[] | TransactionInput[];
     readonly outputs: ITransactionOutput[] | TransactionOutput[];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opnet",
     "type": "module",
-    "version": "1.2.16",
+    "version": "1.2.18",
     "author": "OP_NET",
     "description": "The perfect library for building Bitcoin-based applications.",
     "engines": {
@@ -70,6 +70,7 @@
         "@babel/preset-typescript": "^7.26.0",
         "@eslint/js": "^9.17.0",
         "@types/node": "^22.10.5",
+        "@types/sha.js": "^2.4.4",
         "@types/ws": "^8.5.13",
         "assert": "^2.1.0",
         "babel-loader": "^9.2.1",
@@ -101,7 +102,7 @@
         "@bitcoinerlab/secp256k1": "^1.2.0",
         "@btc-vision/bitcoin": "^6.3.3",
         "@btc-vision/bitcoin-rpc": "^1.0.0",
-        "@btc-vision/transaction": "^1.2.6",
+        "@btc-vision/transaction": "^1.2.7",
         "@noble/hashes": "^1.7.0",
         "bignumber.js": "^9.1.2",
         "buffer": "^6.0.3",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.2.16';
+export const version = '1.2.18';

package/src/contracts/CallResult.ts

@@ -110,12 +110,13 @@ export class CallResult<
             throw new Error(`Can not send transaction! Simulation reverted: ${this.revert}`);
         }
 
-        const priorityFee: bigint = this.estimatedSatGas + (interactionParams.priorityFee || 0n);
+        const priorityFee = interactionParams.priorityFee || 0n;
+        const totalFee: bigint = this.estimatedSatGas + priorityFee;
         try {
             const UTXOs: UTXO[] =
                 interactionParams.utxos ||
                 (await this.#fetchUTXOs(
-                    priorityFee + interactionParams.maximumAllowedSatToSpend,
+                    totalFee + interactionParams.maximumAllowedSatToSpend,
                     interactionParams,
                 ));
 
@@ -126,6 +127,7 @@ export class CallResult<
             const params: IInteractionParameters | InteractionParametersWithoutSigner = {
                 calldata: this.calldata,
                 priorityFee: priorityFee,
+                gasSatFee: this.estimatedSatGas,
                 feeRate: interactionParams.feeRate || 10,
                 from: interactionParams.refundTo,
                 signer: interactionParams.signer,

package/src/contracts/Contract.ts

@@ -27,6 +27,7 @@ import { IAccessList } from './interfaces/IAccessList.js';
 import { IContract } from './interfaces/IContract.js';
 import { ParsedSimulatedTransaction } from './interfaces/SimulatedTransaction.js';
 import { OPNetEvent } from './OPNetEvent.js';
+import { AbiTypeToStr } from './TypeToStr.js';
 
 const internal = Symbol.for('_btc_internal');
 const bitcoinAbiCoder = new ABICoder();
@@ -286,9 +287,36 @@ export abstract class IBaseContract<T extends BaseContractProperties> implements
         }
     }
 
+    private getSelector(element: FunctionBaseData): string {
+        let name = element.name;
+
+        if (element.inputs && element.inputs.length) {
+            name += '(';
+            for (let i = 0; i < element.inputs.length; i++) {
+                const input = element.inputs[i];
+                const str = AbiTypeToStr[input.type];
+
+                if (!str) {
+                    throw new Error(`Unsupported type: ${input.type}`);
+                }
+
+                if (i > 0) {
+                    name += ',';
+                }
+
+                name += str;
+            }
+            name += ')';
+        }
+
+        return name;
+    }
+
     private encodeFunctionData(element: FunctionBaseData, args: unknown[]): BinaryWriter {
         const writer = new BinaryWriter();
-        const selector = Number('0x' + bitcoinAbiCoder.encodeSelector(element.name));
+
+        const selectorStr = this.getSelector(element);
+        const selector = Number('0x' + bitcoinAbiCoder.encodeSelector(selectorStr));
         writer.writeSelector(selector);
 
         if (args.length !== (element.inputs?.length ?? 0)) {

package/src/contracts/TypeToStr.ts

@@ -0,0 +1,26 @@
+import { ABIDataTypes } from '@btc-vision/transaction';
+
+export const AbiTypeToStr: { [key in ABIDataTypes]: string } = {
+    [ABIDataTypes.ADDRESS]: 'address',
+    [ABIDataTypes.BOOL]: 'bool',
+    [ABIDataTypes.BYTES]: 'bytes',
+    [ABIDataTypes.UINT256]: 'uint256',
+    [ABIDataTypes.UINT128]: 'uint128',
+    [ABIDataTypes.UINT64]: 'uint64',
+    [ABIDataTypes.UINT32]: 'uint32',
+    [ABIDataTypes.UINT16]: 'uint16',
+    [ABIDataTypes.UINT8]: 'uint8',
+    [ABIDataTypes.STRING]: 'string',
+    [ABIDataTypes.BYTES32]: 'bytes32',
+    [ABIDataTypes.ADDRESS_UINT256_TUPLE]: 'tuple(address,uint256)',
+    [ABIDataTypes.ARRAY_OF_ADDRESSES]: 'address[]',
+    [ABIDataTypes.ARRAY_OF_UINT256]: 'uint256[]',
+    [ABIDataTypes.ARRAY_OF_UINT128]: 'uint128[]',
+    [ABIDataTypes.ARRAY_OF_UINT64]: 'uint64[]',
+    [ABIDataTypes.ARRAY_OF_UINT32]: 'uint32[]',
+    [ABIDataTypes.ARRAY_OF_UINT16]: 'uint16[]',
+    [ABIDataTypes.ARRAY_OF_UINT8]: 'uint8[]',
+    [ABIDataTypes.ARRAY_OF_BYTES]: 'bytes[]',
+    [ABIDataTypes.ARRAY_OF_STRING]: 'string[]',
+    [ABIDataTypes.TUPLE]: 'tuple256',
+};

package/src/opnet.ts

@@ -47,6 +47,7 @@ export * from './contracts/interfaces/ICallResult.js';
 export * from './contracts/interfaces/IContract.js';
 export * from './contracts/OPNetEvent.js';
 export * from './contracts/interfaces/SimulatedTransaction.js';
+export * from './contracts/TypeToStr.js';
 
 /** Abi */
 export * from './abi/BitcoinAbiTypes.js';

package/src/transactions/Transaction.ts

@@ -39,6 +39,11 @@ export abstract class TransactionBase<T extends OPNetTransactionTypes>
      */
     public readonly burnedBitcoin: BigNumberish;
 
+    /**
+     * @description The priority fee of the transaction.
+     */
+    public readonly priorityFee: BigNumberish;
+
     /**
      * @description The inputs of the transaction.
      */
@@ -80,6 +85,7 @@ export abstract class TransactionBase<T extends OPNetTransactionTypes>
         this.index = transaction.index;
 
         this.burnedBitcoin = BigInt(transaction.burnedBitcoin) || 0n;
+        this.priorityFee = BigInt(transaction.priorityFee) || 0n;
 
         this.inputs = transaction.inputs.map((input) => new TransactionInput(input));
         this.outputs = transaction.outputs.map(

package/src/transactions/interfaces/ITransaction.ts

@@ -34,6 +34,11 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> extends ITran
      */
     readonly burnedBitcoin: string | BigNumberish;
 
+    /**
+     * @description The priority fee of the transaction.
+     */
+    readonly priorityFee: string | BigNumberish;
+
     /**
      * @description If the transaction was reverted, this field will contain the revert message.
      */