opnet 1.2.2 → 1.2.3

package/build/block/Block.js

@@ -22,7 +22,7 @@ export class Block {
     gasUsed;
     checksumProofs;
     transactions = [];
-    constructor(block) {
+    constructor(block, network) {
         this.height = BigInt(block.height.toString());
         this.hash = block.hash;
         this.previousBlockHash = block.previousBlockHash;
@@ -44,6 +44,6 @@ export class Block {
         this.storageRoot = block.storageRoot;
         this.receiptRoot = block.receiptRoot;
         this.checksumProofs = block.checksumProofs;
-        this.transactions = TransactionParser.parseTransactions(block.transactions);
+        this.transactions = TransactionParser.parseTransactions(block.transactions, network);
     }
 }

package/build/contracts/CallResult.d.ts

@@ -39,6 +39,7 @@ export declare class CallResult<T extends ContractDecodedObjectResult = {}> impl
     setGasEstimation(estimatedGas: bigint): void;
     setDecoded(decoded: DecodedOutput): void;
     setCalldata(calldata: Buffer): void;
+    private contractToString;
     private parseEvents;
     private base64ToUint8Array;
 }

package/build/contracts/CallResult.js

@@ -1,4 +1,4 @@
-import { BinaryReader, BufferHelper, NetEvent, TransactionFactory, } from '@btc-vision/transaction';
+import { Address, BinaryReader, BufferHelper, NetEvent, TransactionFactory, } from '@btc-vision/transaction';
 const factory = new TransactionFactory();
 export class CallResult {
     result;
@@ -13,9 +13,9 @@ export class CallResult {
     #rawEvents;
     #provider;
     constructor(callResult, provider) {
+        this.#provider = provider;
         this.#rawEvents = this.parseEvents(callResult.events);
         this.accessList = callResult.accessList;
-        this.#provider = provider;
         if (callResult.estimatedGas) {
             this.estimatedGas = BigInt(callResult.estimatedGas);
         }
@@ -107,6 +107,10 @@ export class CallResult {
         }
         return utxos;
     }
+    contractToString(contract) {
+        const addressCa = Address.fromString(contract);
+        return addressCa.p2tr(this.#provider.network);
+    }
     parseEvents(events) {
         const eventsList = {};
         for (const [contract, value] of Object.entries(events)) {
@@ -115,7 +119,7 @@ export class CallResult {
                 const eventData = new NetEvent(event.type, Buffer.from(event.data, 'base64'));
                 events.push(eventData);
             }
-            eventsList[contract] = events;
+            eventsList[this.contractToString(contract)] = events;
         }
         return eventsList;
     }

package/build/opnet.d.ts

@@ -9,6 +9,7 @@ export * from './transactions/Transaction.js';
 export * from './transactions/interfaces/transactions/ICommonTransaction.js';
 export * from './transactions/interfaces/transactions/IDeploymentTransaction.js';
 export * from './transactions/interfaces/transactions/IInteractionTransaction.js';
+export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
@@ -58,7 +59,7 @@ export * from './abi/shared/json/opnet/OP_20_ABI.js';
 export * from './abi/shared/json/opnet/OP_NET_ABI.js';
 export * from './abi/shared/json/generic/STAKING_ABI.js';
 export * from './abi/shared/json/tests/WBTC_ABI.js';
-export * from './abi/shared/json/motoswap/EWMA_ABI.js';
+export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapFactoryContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapPoolContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapRouterContract.js';
@@ -68,4 +69,4 @@ export * from './abi/shared/interfaces/opnet/IOP_20Contract.js';
 export * from './abi/shared/interfaces/opnet/IOP_NETContract.js';
 export * from './abi/shared/interfaces/generic/IStackingContract.js';
 export * from './abi/shared/interfaces/tests/IWBTCContract.js';
-export * from './abi/shared/interfaces/motoswap/IEwmaContract.js';
+export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';

package/build/opnet.js

@@ -9,6 +9,7 @@ export * from './transactions/Transaction.js';
 export * from './transactions/interfaces/transactions/ICommonTransaction.js';
 export * from './transactions/interfaces/transactions/IDeploymentTransaction.js';
 export * from './transactions/interfaces/transactions/IInteractionTransaction.js';
+export * from './transactions/interfaces/ProofOfWorkChallenge.js';
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
@@ -58,7 +59,7 @@ export * from './abi/shared/json/opnet/OP_20_ABI.js';
 export * from './abi/shared/json/opnet/OP_NET_ABI.js';
 export * from './abi/shared/json/generic/STAKING_ABI.js';
 export * from './abi/shared/json/tests/WBTC_ABI.js';
-export * from './abi/shared/json/motoswap/EWMA_ABI.js';
+export * from './abi/shared/json/motoswap/NATIVE_SWAP_ABI.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapFactoryContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapPoolContract.js';
 export * from './abi/shared/interfaces/motoswap/IMotoswapRouterContract.js';
@@ -68,4 +69,4 @@ export * from './abi/shared/interfaces/opnet/IOP_20Contract.js';
 export * from './abi/shared/interfaces/opnet/IOP_NETContract.js';
 export * from './abi/shared/interfaces/generic/IStackingContract.js';
 export * from './abi/shared/interfaces/tests/IWBTCContract.js';
-export * from './abi/shared/interfaces/motoswap/IEwmaContract.js';
+export * from './abi/shared/interfaces/motoswap/INativeSwapContract.js';

package/build/providers/AbstractRpcProvider.d.ts

@@ -21,7 +21,7 @@ import { JsonRpcCallResult, JsonRpcResult } from './interfaces/JSONRpcResult.js'
 import { AddressesInfo } from './interfaces/PublicKeyInfo.js';
 import { ReorgInformation } from './interfaces/ReorgInformation.js';
 export declare abstract class AbstractRpcProvider {
-    private readonly network;
+    readonly network: Network;
     private nextId;
     private chainId;
     protected constructor(network: Network);

package/build/providers/AbstractRpcProvider.js

@@ -61,7 +61,7 @@ export class AbstractRpcProvider {
         ]);
         const block = await this.callPayloadSingle(payload);
         const result = block.result;
-        return new Block(result);
+        return new Block(result, this.network);
     }
     async getBlocks(blockNumbers, prefetchTxs = false) {
         const payloads = blockNumbers.map((blockNumber) => {
@@ -80,7 +80,7 @@ export class AbstractRpcProvider {
                 throw new Error(`Error fetching block: ${block.error}`);
             }
             const result = block.result;
-            return new Block(result);
+            return new Block(result, this.network);
         });
     }
     async getBlockByHash(blockHash) {
@@ -106,12 +106,12 @@ export class AbstractRpcProvider {
         if ('error' in rawTransaction) {
             throw new Error(`Error fetching transaction: ${rawTransaction.error?.message || 'Unknown error'}`);
         }
-        return TransactionParser.parseTransaction(result);
+        return TransactionParser.parseTransaction(result, this.network);
     }
     async getTransactionReceipt(txHash) {
         const payload = this.buildJsonRpcPayload(JSONRpcMethods.GET_TRANSACTION_RECEIPT, [txHash]);
         const rawTransaction = await this.callPayloadSingle(payload);
-        return new TransactionReceipt(rawTransaction.result);
+        return new TransactionReceipt(rawTransaction.result, this.network);
     }
     getNetwork() {
         return this.network;

package/build/transactions/Transaction.d.ts

@@ -1,6 +1,8 @@
+import { Network } from '@btc-vision/bitcoin';
 import { BigNumberish } from '../common/CommonTypes.js';
 import { OPNetTransactionTypes } from '../interfaces/opnet/OPNetTransactionTypes.js';
 import { ITransactionBase } from './interfaces/ITransaction.js';
+import { ProofOfWorkChallenge } from './interfaces/ProofOfWorkChallenge.js';
 import { TransactionInput } from './metadata/TransactionInput.js';
 import { TransactionOutput } from './metadata/TransactionOutput.js';
 import { TransactionReceipt } from './metadata/TransactionReceipt.js';
@@ -13,5 +15,7 @@ export declare abstract class TransactionBase<T extends OPNetTransactionTypes> e
     readonly outputs: TransactionOutput[];
     readonly OPNetType: T;
     readonly gasUsed: bigint;
-    protected constructor(transaction: ITransactionBase<T>);
+    readonly pow?: ProofOfWorkChallenge;
+    protected constructor(transaction: ITransactionBase<T>, network: Network);
+    private decodeProofOfWorkChallenge;
 }

package/build/transactions/Transaction.js

@@ -10,13 +10,14 @@ export class TransactionBase extends TransactionReceipt {
     outputs;
     OPNetType;
     gasUsed;
-    constructor(transaction) {
+    pow;
+    constructor(transaction, network) {
         super({
             receipt: transaction.receipt,
             receiptProofs: transaction.receiptProofs,
             events: transaction.events,
             revert: transaction.revert,
-        });
+        }, network);
         this.id = transaction.id;
         this.hash = transaction.hash;
         this.index = transaction.index;
@@ -25,5 +26,16 @@ export class TransactionBase extends TransactionReceipt {
         this.outputs = transaction.outputs.map((output) => new TransactionOutput(output));
         this.OPNetType = transaction.OPNetType;
         this.gasUsed = BigInt(transaction.gasUsed || '0x00') || 0n;
+        if (transaction.pow) {
+            this.pow = this.decodeProofOfWorkChallenge(transaction.pow);
+        }
+    }
+    decodeProofOfWorkChallenge(challenge) {
+        return {
+            preimage: Buffer.from(challenge.preimage, 'base64'),
+            reward: BigInt(challenge.reward) || 0n,
+            difficulty: BigInt(challenge.difficulty || '0'),
+            version: challenge.version || 0,
+        };
     }
 }

package/build/transactions/TransactionParser.d.ts

@@ -1,7 +1,8 @@
+import { Network } from '@btc-vision/bitcoin';
 import { OPNetTransactionTypes } from '../interfaces/opnet/OPNetTransactionTypes.js';
 import { ITransaction } from './interfaces/ITransaction.js';
 import { TransactionBase } from './Transaction.js';
 export declare class TransactionParser {
-    static parseTransactions(transactions: ITransaction[]): TransactionBase<OPNetTransactionTypes>[];
-    static parseTransaction(transaction: ITransaction): TransactionBase<OPNetTransactionTypes>;
+    static parseTransactions(transactions: ITransaction[], network: Network): TransactionBase<OPNetTransactionTypes>[];
+    static parseTransaction(transaction: ITransaction, network: Network): TransactionBase<OPNetTransactionTypes>;
 }

package/build/transactions/TransactionParser.js

@@ -3,7 +3,7 @@ import { DeploymentTransaction } from './decoders/DeploymentTransaction.js';
 import { GenericTransaction } from './decoders/GenericTransaction.js';
 import { InteractionTransaction } from './decoders/InteractionTransaction.js';
 export class TransactionParser {
-    static parseTransactions(transactions) {
+    static parseTransactions(transactions, network) {
         if (!transactions) {
             return [];
         }
@@ -11,21 +11,21 @@ export class TransactionParser {
         for (const transaction of transactions) {
             if (!transaction)
                 throw new Error(`Something went wrong while parsing transactions`);
-            transactionArray.push(this.parseTransaction(transaction));
+            transactionArray.push(this.parseTransaction(transaction, network));
         }
         return transactionArray;
     }
-    static parseTransaction(transaction) {
+    static parseTransaction(transaction, network) {
         if (!transaction)
             throw new Error('Transaction is required');
         const opnetType = transaction.OPNetType;
         switch (opnetType) {
             case OPNetTransactionTypes.Generic:
-                return new GenericTransaction(transaction);
+                return new GenericTransaction(transaction, network);
             case OPNetTransactionTypes.Interaction:
-                return new InteractionTransaction(transaction);
+                return new InteractionTransaction(transaction, network);
             case OPNetTransactionTypes.Deployment:
-                return new DeploymentTransaction(transaction);
+                return new DeploymentTransaction(transaction, network);
             default:
                 throw new Error('Unknown transaction type');
         }

package/build/transactions/decoders/DeploymentTransaction.d.ts

@@ -1,3 +1,4 @@
+import { Network } from '@btc-vision/bitcoin';
 import { Address } from '@btc-vision/transaction';
 import { OPNetTransactionTypes } from '../../interfaces/opnet/OPNetTransactionTypes.js';
 import { IDeploymentTransaction } from '../interfaces/transactions/IDeploymentTransaction.js';
@@ -12,5 +13,5 @@ export declare class DeploymentTransaction extends TransactionBase<OPNetTransact
     readonly contractSeed?: Buffer;
     readonly contractSaltHash?: Buffer;
     readonly from?: Address;
-    constructor(transaction: IDeploymentTransaction);
+    constructor(transaction: IDeploymentTransaction, network: Network);
 }

package/build/transactions/decoders/DeploymentTransaction.js

@@ -10,8 +10,8 @@ export class DeploymentTransaction extends TransactionBase {
     contractSeed;
     contractSaltHash;
     from;
-    constructor(transaction) {
-        super(transaction);
+    constructor(transaction, network) {
+        super(transaction, network);
         try {
             this.from = new Address(Buffer.from(transaction.from, 'base64'));
             this.contractAddress = transaction.contractAddress;

package/build/transactions/decoders/GenericTransaction.d.ts

@@ -1,6 +1,7 @@
+import { Network } from '@btc-vision/bitcoin';
 import { OPNetTransactionTypes } from '../../interfaces/opnet/OPNetTransactionTypes.js';
 import { IGenericTransaction } from '../interfaces/ITransaction.js';
 import { TransactionBase } from '../Transaction.js';
 export declare class GenericTransaction extends TransactionBase<OPNetTransactionTypes.Generic> implements IGenericTransaction {
-    constructor(transaction: IGenericTransaction);
+    constructor(transaction: IGenericTransaction, network: Network);
 }

package/build/transactions/decoders/GenericTransaction.js

@@ -1,6 +1,6 @@
 import { TransactionBase } from '../Transaction.js';
 export class GenericTransaction extends TransactionBase {
-    constructor(transaction) {
-        super(transaction);
+    constructor(transaction, network) {
+        super(transaction, network);
     }
 }

package/build/transactions/decoders/InteractionTransaction.d.ts

@@ -1,3 +1,4 @@
+import { Network } from '@btc-vision/bitcoin';
 import { Address } from '@btc-vision/transaction';
 import { Buffer } from 'buffer';
 import { InteractionType } from '../../interfaces/opnet/OPNetTransactionTypes.js';
@@ -12,5 +13,5 @@ export declare class InteractionTransaction extends TransactionBase<InteractionT
     readonly from?: Address;
     readonly contractAddress?: string;
     readonly contractTweakedPublicKey: Address;
-    constructor(transaction: IInteractionTransaction);
+    constructor(transaction: IInteractionTransaction, network: Network);
 }

package/build/transactions/decoders/InteractionTransaction.js

@@ -10,8 +10,8 @@ export class InteractionTransaction extends TransactionBase {
     from;
     contractAddress;
     contractTweakedPublicKey;
-    constructor(transaction) {
-        super(transaction);
+    constructor(transaction, network) {
+        super(transaction, network);
         this.contractTweakedPublicKey = new Address(Buffer.from(transaction.contractTweakedPublicKey, 'base64'));
         if (transaction.calldata) {
             this.calldata = Buffer.from(transaction.calldata, 'base64');

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

@@ -3,6 +3,7 @@ import { OPNetTransactionTypes } from '../../interfaces/opnet/OPNetTransactionTy
 import { ITransactionInput, TransactionInput } from '../metadata/TransactionInput.js';
 import { ITransactionOutput, TransactionOutput } from '../metadata/TransactionOutput.js';
 import { ITransactionReceipt } from './ITransactionReceipt.js';
+import { ProofOfWorkChallenge, RawProofOfWorkChallenge } from './ProofOfWorkChallenge.js';
 import { IDeploymentTransaction } from './transactions/IDeploymentTransaction.js';
 import { IInteractionTransaction } from './transactions/IInteractionTransaction.js';
 export interface ITransactionBase<T extends OPNetTransactionTypes> extends ITransactionReceipt {
@@ -15,6 +16,7 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> extends ITran
     readonly outputs: ITransactionOutput[] | TransactionOutput[];
     readonly OPNetType: T;
     readonly gasUsed: string | bigint;
+    readonly pow?: RawProofOfWorkChallenge | ProofOfWorkChallenge;
 }
 export interface IGenericTransaction extends ITransactionBase<OPNetTransactionTypes.Generic> {
 }

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

@@ -0,0 +1,12 @@
+export interface ProofOfWorkChallenge {
+    readonly preimage: Buffer;
+    readonly reward: bigint;
+    readonly difficulty?: bigint;
+    readonly version?: number;
+}
+export interface RawProofOfWorkChallenge {
+    readonly preimage: string;
+    readonly reward: string;
+    readonly difficulty?: string;
+    readonly version?: number;
+}

package/build/transactions/interfaces/ProofOfWorkChallenge.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,9 +1,11 @@
 import { Address } from '@btc-vision/transaction';
 import { OPNetTransactionTypes } from '../../../interfaces/opnet/OPNetTransactionTypes.js';
 import { ITransactionBase } from '../ITransaction.js';
+import { ProofOfWorkChallenge } from '../ProofOfWorkChallenge.js';
 export interface ICommonTransaction<T extends OPNetTransactionTypes> extends ITransactionBase<T> {
     readonly contractAddress?: string;
     readonly contractTweakedPublicKey?: Address | string;
     readonly from?: Address | string;
     readonly wasCompressed?: boolean;
+    readonly pow?: ProofOfWorkChallenge;
 }

package/build/transactions/metadata/TransactionInput.d.ts

@@ -1,4 +1,4 @@
-import { ScriptSig } from '@btc-vision/bsi-bitcoin-rpc';
+import { ScriptSig } from '@btc-vision/bitcoin-rpc';
 export interface ITransactionInput {
     readonly originalTransactionId: string | undefined;
     readonly outputTransactionIndex: number | undefined;

package/build/transactions/metadata/TransactionOutput.d.ts

@@ -1,4 +1,4 @@
-import { ScriptPubKey } from '@btc-vision/bsi-bitcoin-rpc';
+import { ScriptPubKey } from '@btc-vision/bitcoin-rpc';
 export interface ITransactionOutput {
     readonly index: number;
     readonly scriptPubKey: {

package/build/transactions/metadata/TransactionReceipt.d.ts

@@ -1,10 +1,11 @@
+import { Network } from '@btc-vision/bitcoin';
 import { ContractEvents, ITransactionReceipt } from '../interfaces/ITransactionReceipt.js';
 export declare class TransactionReceipt implements ITransactionReceipt {
     readonly receipt?: Buffer;
     readonly receiptProofs: string[];
     readonly events: ContractEvents;
     readonly revert?: Buffer;
-    constructor(receipt: ITransactionReceipt);
+    constructor(receipt: ITransactionReceipt, network: Network);
     private parseEvents;
     private decodeEvent;
 }

package/build/transactions/metadata/TransactionReceipt.js

@@ -1,22 +1,24 @@
-import { NetEvent } from '@btc-vision/transaction';
+import { Address, NetEvent } from '@btc-vision/transaction';
 export class TransactionReceipt {
     receipt;
     receiptProofs;
     events;
     revert;
-    constructor(receipt) {
+    constructor(receipt, network) {
         this.receipt = receipt.receipt
             ? Buffer.from(receipt.receipt, 'base64')
             : undefined;
         this.receiptProofs = receipt.receiptProofs || [];
-        this.events = receipt.events ? this.parseEvents(receipt.events) : {};
+        this.events = receipt.events ? this.parseEvents(receipt.events, network) : {};
         this.revert = receipt.revert ? Buffer.from(receipt.revert, 'base64') : undefined;
     }
-    parseEvents(events) {
+    parseEvents(events, network) {
         const parsedEvents = {};
         if (!Array.isArray(events)) {
             for (const [key, value] of Object.entries(events)) {
-                parsedEvents[key] = value.map((event) => {
+                const ca = Address.fromString(key);
+                const caP2tr = ca.p2tr(network);
+                parsedEvents[caP2tr] = value.map((event) => {
                     return this.decodeEvent(event);
                 });
             }
@@ -25,10 +27,12 @@ export class TransactionReceipt {
             for (const event of events) {
                 const parsedEvent = this.decodeEvent(event);
                 const contractAddress = event.contractAddress;
-                if (!parsedEvents[contractAddress]) {
-                    parsedEvents[contractAddress] = [];
+                const ca = Address.fromString(contractAddress);
+                const caP2tr = ca.p2tr(network);
+                if (!parsedEvents[caP2tr]) {
+                    parsedEvents[caP2tr] = [];
                 }
-                parsedEvents[contractAddress].push(parsedEvent);
+                parsedEvents[caP2tr].push(parsedEvent);
             }
         }
         return parsedEvents;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opnet",
     "type": "module",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "author": "OP_NET",
     "description": "The perfect library for building Bitcoin-based applications.",
     "engines": {
@@ -66,17 +66,17 @@
         "@babel/plugin-transform-runtime": "^7.25.9",
         "@babel/preset-env": "^7.26.0",
         "@babel/preset-flow": "^7.25.9",
-        "@babel/preset-react": "^7.25.9",
+        "@babel/preset-react": "^7.26.3",
         "@babel/preset-typescript": "^7.26.0",
-        "@eslint/js": "^9.14.0",
-        "@types/node": "^22.10.2",
+        "@eslint/js": "^9.17.0",
+        "@types/node": "^22.10.5",
         "@types/ws": "^8.5.13",
         "assert": "^2.1.0",
         "babel-loader": "^9.2.1",
-        "babel-plugin-transform-import-meta": "^2.2.1",
+        "babel-plugin-transform-import-meta": "^2.3.2",
         "babel-preset-react": "^6.24.1",
         "babelify": "^10.0.0",
-        "eslint": "^9.14.0",
+        "eslint": "^9.17.0",
         "gulp": "^5.0.0",
         "gulp-cached": "^1.1.1",
         "gulp-clean": "^0.4.0",
@@ -85,7 +85,7 @@
         "gulp-typescript": "^6.0.0-alpha.1",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
-        "prettier": "^3.3.3",
+        "prettier": "^3.4.2",
         "process": "^0.11.10",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
@@ -94,15 +94,15 @@
         "typedoc": "^0.27.6",
         "typescript": "^5.7.2",
         "typescript-eslint": "^8.19.0",
-        "webpack": "^5.96.1",
-        "webpack-cli": "^5.1.4"
+        "webpack": "^5.97.1",
+        "webpack-cli": "^6.0.1"
     },
     "dependencies": {
-        "@bitcoinerlab/secp256k1": "^1.1.1",
-        "@btc-vision/bitcoin": "^6.3.2",
-        "@btc-vision/bsi-bitcoin-rpc": ">=1.0.29",
-        "@btc-vision/transaction": "^1.2.2",
-        "@noble/hashes": "^1.6.1",
+        "@bitcoinerlab/secp256k1": "^1.2.0",
+        "@btc-vision/bitcoin": "^6.3.3",
+        "@btc-vision/bitcoin-rpc": "^1.0.0",
+        "@btc-vision/transaction": "^1.2.3",
+        "@noble/hashes": "^1.7.0",
         "bignumber.js": "^9.1.2",
         "buffer": "^6.0.3",
         "ecpair": "^2.1.0",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.2.2';
+export const version = '1.2.3';