opnet 1.7.2 → 1.7.4

package/browser/opnet.d.ts

@@ -13,6 +13,7 @@ export * from './transactions/interfaces/transactions/IInteractionTransaction.js
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
+export * from './providers/websocket/index.js';
 export * from './providers/interfaces/ReorgInformation.js';
 export * from './block/Block.js';
 export * from './block/BlockGasParameters.js';

package/browser/providers/AbstractRpcProvider.d.ts

@@ -24,7 +24,7 @@ import { UTXOsManager } from '../utxos/UTXOsManager.js';
 import { JsonRpcPayload } from './interfaces/JSONRpc.js';
 import { JSONRpcMethods } from './interfaces/JSONRpcMethods.js';
 import { JsonRpcCallResult, JsonRpcResult } from './interfaces/JSONRpcResult.js';
-import { AddressesInfo } from './interfaces/PublicKeyInfo.js';
+import { AddressesInfo, IPublicKeyInfoResult } from './interfaces/PublicKeyInfo.js';
 import { ReorgInformation } from './interfaces/ReorgInformation.js';
 export declare abstract class AbstractRpcProvider {
     readonly network: Network;
@@ -38,7 +38,7 @@ export declare abstract class AbstractRpcProvider {
     private _utxoManager;
     get utxoManager(): UTXOsManager;
     getCSV1ForAddress(address: Address): IP2WSHAddress;
-    getPublicKeyInfo(addressRaw: string | Address): Promise<Address>;
+    getPublicKeyInfo(addressRaw: string | Address, isContract: boolean): Promise<Address>;
     validateAddress(addr: string | Address, network: Network): AddressTypes | null;
     getBlockNumber(): Promise<bigint>;
     getBlockByChecksum(checksum: string, prefetchTxs?: boolean): Promise<Block>;
@@ -64,7 +64,8 @@ export declare abstract class AbstractRpcProvider {
     callPayloadSingle(payload: JsonRpcPayload): Promise<JsonRpcResult>;
     callMultiplePayloads(payloads: JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     buildJsonRpcPayload<T extends JSONRpcMethods>(method: T, params: unknown[]): JsonRpcPayload;
-    getPublicKeysInfo(addresses: string | string[] | Address | Address[], logErrors?: boolean): Promise<AddressesInfo>;
+    getPublicKeysInfoRaw(addresses: string | string[] | Address | Address[]): Promise<IPublicKeyInfoResult>;
+    getPublicKeysInfo(addresses: string | string[] | Address | Address[], isContract?: boolean, logErrors?: boolean): Promise<AddressesInfo>;
     getLatestEpoch(includeSubmissions: boolean): Promise<Epoch>;
     getEpochByNumber(epochNumber: BigNumberish, includeSubmissions?: boolean): Promise<Epoch | EpochWithSubmissions>;
     getEpochByHash(epochHash: string, includeSubmissions?: boolean): Promise<Epoch | EpochWithSubmissions>;

package/browser/providers/WebsocketRpcProvider.d.ts

@@ -2,9 +2,57 @@ import { Network } from '@btc-vision/bitcoin';
 import { AbstractRpcProvider } from './AbstractRpcProvider.js';
 import { JsonRpcPayload } from './interfaces/JSONRpc.js';
 import { JsonRpcCallResult } from './interfaces/JSONRpcResult.js';
+import { BlockNotification, ConnectionState, EpochNotification, EventHandler, SubscriptionHandler, SubscriptionType, WebSocketClientConfig, WebSocketClientEvent } from './websocket/index.js';
+export { BlockNotification, EpochNotification, EventHandler, SubscriptionHandler, WebSocketClientEvent, };
 export declare class WebSocketRpcProvider extends AbstractRpcProvider {
-    private readonly wsUrl;
-    constructor(url: string, network: Network);
-    _send(payload: JsonRpcPayload): Promise<JsonRpcCallResult>;
+    private readonly config;
+    private readonly pendingRequests;
+    private readonly subscriptions;
+    private readonly eventHandlers;
+    private socket;
+    private state;
+    private requestId;
+    private reconnectAttempt;
+    private pingTimeout;
+    private sessionId;
+    private userRequestedDisconnect;
+    private protoRoot;
+    private protoTypes;
+    constructor(url: string, network: Network, config?: Partial<Omit<WebSocketClientConfig, 'url'>>);
+    getState(): ConnectionState;
+    isReady(): boolean;
+    connect(): Promise<void>;
+    disconnect(): void;
+    on<T>(event: WebSocketClientEvent, handler: EventHandler<T>): void;
+    off<T>(event: WebSocketClientEvent, handler: EventHandler<T>): void;
+    subscribeBlocks(handler: SubscriptionHandler<BlockNotification>): Promise<void>;
+    subscribeEpochs(handler: SubscriptionHandler<EpochNotification>): Promise<void>;
+    unsubscribe(subscriptionType: SubscriptionType): Promise<void>;
+    clearCache(): void;
+    _send(payload: JsonRpcPayload | JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     protected providerUrl(url: string): string;
+    private sendJsonRpcRequest;
+    private translateJsonRpcParams;
+    private translateProtoResponse;
+    private connectWebSocket;
+    private buildWebSocketUrl;
+    private performHandshake;
+    private getType;
+    private nextRequestId;
+    private buildMessage;
+    private sendRequest;
+    private send;
+    private handleMessage;
+    private handleErrorResponse;
+    private handleBlockNotification;
+    private handleEpochNotification;
+    private handleClose;
+    private reconnect;
+    private resubscribe;
+    private cleanupPendingRequests;
+    private schedulePing;
+    private cancelPing;
+    private ping;
+    private emit;
+    private sleep;
 }

package/browser/providers/interfaces/PublicKeyInfo.d.ts

@@ -1,6 +1,5 @@
-import { Address } from '@btc-vision/transaction';
+import { Address, MLDSASecurityLevel } from '@btc-vision/transaction';
 export interface PublicKeyInfo {
-    readonly mldsaPublicKey: string;
     readonly mldsaAddress: string;
     readonly originalPubKey?: string;
     readonly tweakedPubkey: string;
@@ -11,6 +10,9 @@ export interface PublicKeyInfo {
     readonly p2pkhUncompressed?: string;
     readonly p2shp2wpkh?: string;
     readonly p2wpkh?: string;
+    readonly mldsaHashedPublicKey?: string;
+    readonly mldsaLevel?: MLDSASecurityLevel;
+    readonly mldsaPublicKey?: string | null;
 }
 export interface IPubKeyNotFoundError {
     readonly error: string;

package/browser/providers/websocket/OPNetError.d.ts

@@ -0,0 +1,6 @@
+import { WebSocketErrorCode } from './types/WebSocketErrorCodes.js';
+export declare class OPNetError extends Error {
+    readonly code: WebSocketErrorCode;
+    readonly data?: Uint8Array;
+    constructor(code: WebSocketErrorCode, message?: string, data?: Uint8Array);
+}

package/browser/providers/websocket/ProtobufLoader.d.ts

@@ -0,0 +1,4 @@
+import { Root, Type } from 'protobufjs';
+export declare function loadProtobufSchema(baseUrl: string): Promise<Root>;
+export declare function getProtobufType(root: Root, typeName: string): Type;
+export declare function clearProtobufCache(): void;

package/browser/providers/websocket/index.d.ts

@@ -0,0 +1,3 @@
+export * from './OPNetError.js';
+export * from './ProtobufLoader.js';
+export * from './types/index.js';

package/browser/providers/websocket/types/ConnectionState.d.ts

@@ -0,0 +1,10 @@
+export declare enum ConnectionState {
+    DISCONNECTED = 0,
+    CONNECTING = 1,
+    CONNECTED = 2,
+    HANDSHAKING = 3,
+    READY = 4,
+    RECONNECTING = 5,
+    CLOSING = 6
+}
+export declare function getConnectionStateName(state: ConnectionState): string;

package/browser/providers/websocket/types/PendingRequest.d.ts

@@ -0,0 +1,9 @@
+import { WebSocketRequestOpcode } from './WebSocketOpcodes.js';
+export interface PendingRequest<T = unknown> {
+    readonly requestId: number;
+    readonly opcode: WebSocketRequestOpcode;
+    readonly resolve: (value: T) => void;
+    readonly reject: (error: Error) => void;
+    readonly timeout: ReturnType<typeof setTimeout>;
+    readonly createdAt: number;
+}

package/browser/providers/websocket/types/SubscriptionType.d.ts

@@ -0,0 +1,5 @@
+export declare enum SubscriptionType {
+    BLOCKS = 0,
+    EPOCHS = 1
+}
+export declare function getSubscriptionTypeName(type: SubscriptionType): string;

package/browser/providers/websocket/types/WebSocketClientConfig.d.ts

@@ -0,0 +1,13 @@
+export interface WebSocketClientConfig {
+    readonly url: string;
+    readonly connectTimeout?: number;
+    readonly requestTimeout?: number;
+    readonly handshakeTimeout?: number;
+    readonly pingInterval?: number;
+    readonly autoReconnect?: boolean;
+    readonly maxReconnectAttempts?: number;
+    readonly reconnectBaseDelay?: number;
+    readonly reconnectMaxDelay?: number;
+    readonly maxPendingRequests?: number;
+}
+export declare const DEFAULT_CONFIG: Required<Omit<WebSocketClientConfig, 'url'>>;

package/browser/providers/websocket/types/WebSocketErrorCodes.d.ts

@@ -0,0 +1,63 @@
+export declare enum ProtocolError {
+    MALFORMED_MESSAGE = 1,
+    UNKNOWN_OPCODE = 2,
+    HANDSHAKE_REQUIRED = 3,
+    HANDSHAKE_ALREADY_COMPLETED = 4,
+    UNSUPPORTED_PROTOCOL_VERSION = 5,
+    PAYLOAD_TOO_LARGE = 6,
+    INVALID_REQUEST_ID = 7,
+    CONNECTION_CLOSING = 8,
+    RATE_LIMIT_EXCEEDED = 9,
+    TOO_MANY_PENDING_REQUESTS = 10,
+    REQUEST_TIMEOUT = 11,
+    INVALID_MESSAGE_FORMAT = 12
+}
+export declare enum AuthError {
+    AUTHENTICATION_REQUIRED = 1000,
+    INVALID_CREDENTIALS = 1001,
+    SESSION_EXPIRED = 1002,
+    PERMISSION_DENIED = 1003,
+    INVALID_CLIENT_INFO = 1004
+}
+export declare enum ResourceError {
+    NOT_FOUND = 2000,
+    BLOCK_NOT_FOUND = 2001,
+    TRANSACTION_NOT_FOUND = 2002,
+    ADDRESS_NOT_FOUND = 2003,
+    CONTRACT_NOT_FOUND = 2004,
+    EPOCH_NOT_FOUND = 2005,
+    SUBSCRIPTION_NOT_FOUND = 2006,
+    ALREADY_EXISTS = 2100,
+    SUBSCRIPTION_ALREADY_EXISTS = 2101,
+    MAX_SUBSCRIPTIONS_REACHED = 2102
+}
+export declare enum ValidationError {
+    INVALID_PARAMS = 3000,
+    MISSING_REQUIRED_FIELD = 3001,
+    VALUE_OUT_OF_RANGE = 3002,
+    INVALID_ADDRESS = 3003,
+    INVALID_HASH = 3004,
+    INVALID_BLOCK_IDENTIFIER = 3005,
+    INVALID_TRANSACTION_DATA = 3006,
+    INVALID_SIGNATURE = 3007,
+    INVALID_CALLDATA = 3008,
+    INVALID_BLOCK_HEIGHT = 3009,
+    INVALID_EPOCH_NUMBER = 3010,
+    INVALID_POINTER = 3011,
+    INVALID_PUBLIC_KEY = 3012
+}
+export declare enum InternalError {
+    INTERNAL_ERROR = 4000,
+    DATABASE_ERROR = 4001,
+    STORAGE_ERROR = 4002,
+    SERIALIZATION_ERROR = 4003,
+    DESERIALIZATION_ERROR = 4004,
+    VM_ERROR = 4005,
+    NETWORK_ERROR = 4006,
+    SERVICE_UNAVAILABLE = 4007,
+    NOT_IMPLEMENTED = 4008,
+    TIMEOUT = 4009
+}
+export type WebSocketErrorCode = ProtocolError | AuthError | ResourceError | ValidationError | InternalError;
+export declare const ErrorMessages: Readonly<Record<WebSocketErrorCode, string>>;
+export declare function getErrorMessage(code: WebSocketErrorCode): string;

package/browser/providers/websocket/types/WebSocketOpcodes.d.ts

@@ -0,0 +1,59 @@
+export declare enum WebSocketRequestOpcode {
+    PING = 0,
+    HANDSHAKE = 1,
+    GET_BLOCK_NUMBER = 16,
+    GET_BLOCK_BY_NUMBER = 17,
+    GET_BLOCK_BY_HASH = 18,
+    GET_BLOCK_BY_CHECKSUM = 19,
+    GET_BLOCK_WITNESS = 20,
+    GET_GAS = 21,
+    GET_TRANSACTION_BY_HASH = 32,
+    GET_TRANSACTION_RECEIPT = 33,
+    BROADCAST_TRANSACTION = 34,
+    GET_PREIMAGE = 35,
+    GET_BALANCE = 48,
+    GET_UTXOS = 49,
+    GET_PUBLIC_KEY_INFO = 50,
+    GET_CHAIN_ID = 64,
+    GET_REORG = 65,
+    GET_CODE = 80,
+    GET_STORAGE_AT = 81,
+    CALL = 82,
+    GET_LATEST_EPOCH = 96,
+    GET_EPOCH_BY_NUMBER = 97,
+    GET_EPOCH_BY_HASH = 98,
+    GET_EPOCH_TEMPLATE = 99,
+    SUBMIT_EPOCH = 100,
+    SUBSCRIBE_BLOCKS = 112,
+    SUBSCRIBE_EPOCHS = 113,
+    UNSUBSCRIBE = 127
+}
+export declare enum WebSocketResponseOpcode {
+    ERROR = 128,
+    PONG = 129,
+    HANDSHAKE_ACK = 130,
+    BLOCK_NUMBER = 144,
+    BLOCK = 145,
+    BLOCK_WITNESS = 146,
+    GAS = 147,
+    TRANSACTION = 160,
+    TRANSACTION_RECEIPT = 161,
+    BROADCAST_RESULT = 162,
+    PREIMAGE = 163,
+    BALANCE = 176,
+    UTXOS = 177,
+    PUBLIC_KEY_INFO = 178,
+    CHAIN_ID = 192,
+    REORG = 193,
+    CODE = 208,
+    STORAGE = 209,
+    CALL_RESULT = 210,
+    EPOCH = 224,
+    EPOCH_TEMPLATE = 225,
+    EPOCH_SUBMIT_RESULT = 226,
+    SUBSCRIPTION_CREATED = 240,
+    UNSUBSCRIBE_RESULT = 241,
+    NEW_BLOCK_NOTIFICATION = 248,
+    NEW_EPOCH_NOTIFICATION = 249
+}
+export type WebSocketOpcode = WebSocketRequestOpcode | WebSocketResponseOpcode;

package/browser/providers/websocket/types/WebSocketProviderTypes.d.ts

@@ -0,0 +1,32 @@
+import { WebSocketRequestOpcode, WebSocketResponseOpcode } from './WebSocketOpcodes.js';
+export declare enum WebSocketClientEvent {
+    CONNECTED = "connected",
+    DISCONNECTED = "disconnected",
+    ERROR = "error",
+    BLOCK = "block",
+    EPOCH = "epoch"
+}
+export type EventHandler<T = unknown> = (data: T) => void;
+export type SubscriptionHandler<T = unknown> = (data: T) => void;
+export interface BlockNotification {
+    readonly blockNumber: bigint;
+    readonly blockHash: string;
+    readonly previousBlockHash: string;
+    readonly timestamp: bigint;
+}
+export interface EpochNotification {
+    readonly epochNumber: bigint;
+    readonly epochHash: string;
+    readonly timestamp: bigint;
+}
+export interface InternalPendingRequest {
+    readonly resolve: (value: Uint8Array) => void;
+    readonly reject: (error: Error) => void;
+    readonly timeout: ReturnType<typeof setTimeout>;
+}
+export interface MethodMapping {
+    readonly requestOpcode: WebSocketRequestOpcode;
+    readonly responseOpcode: WebSocketResponseOpcode;
+    readonly requestType: string;
+    readonly responseType: string;
+}

package/browser/providers/websocket/types/index.d.ts

@@ -0,0 +1,7 @@
+export * from './ConnectionState.js';
+export * from './PendingRequest.js';
+export * from './SubscriptionType.js';
+export * from './WebSocketClientConfig.js';
+export * from './WebSocketErrorCodes.js';
+export * from './WebSocketOpcodes.js';
+export * from './WebSocketProviderTypes.js';

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

@@ -9,7 +9,7 @@ export declare class DeploymentTransaction extends TransactionBase<OPNetTransact
     readonly bytecode?: Buffer;
     readonly wasCompressed?: boolean;
     readonly deployerPubKey?: Buffer;
-    readonly deployerClassicPubKey?: Buffer;
+    readonly deployerHashedPublicKey?: Buffer;
     readonly deployerAddress?: Address;
     readonly contractSeed?: Buffer;
     readonly contractSaltHash?: Buffer;

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

@@ -6,7 +6,7 @@ export interface ICommonTransaction<T extends OPNetTransactionTypes> extends ITr
     readonly contractAddress?: string;
     readonly contractPublicKey?: Address | string;
     readonly from?: Address | string;
-    readonly classicFrom?: Address | string;
+    readonly fromLegacy?: Address | string;
     readonly wasCompressed?: boolean;
     readonly pow?: ProofOfWorkChallenge;
 }

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

@@ -6,7 +6,6 @@ export interface IDeploymentTransaction extends ICommonTransaction<OPNetTransact
     readonly contractPublicKey?: Address | string;
     readonly bytecode?: Buffer | string;
     readonly deployerPubKey?: Buffer | string;
-    readonly deployerClassicPubKey?: Buffer | string;
     readonly contractSeed?: Buffer | string;
     readonly contractSaltHash?: Buffer | string;
     readonly deployerAddress?: Address | string;

package/browser/utxos/UTXOsManager.d.ts

@@ -13,5 +13,6 @@ export declare class UTXOsManager {
     private getAddressData;
     private maybeFetchUTXOs;
     private fetchUTXOs;
+    private parseUTXO;
     private syncPendingDepthWithFetched;
 }

package/browser/utxos/interfaces/IUTXOsManager.d.ts

@@ -1,14 +1,19 @@
-import { IUTXO } from '../../bitcoin/interfaces/IUTXO.js';
+import { ISpentUTXO, RawIUTXO } from '../../bitcoin/interfaces/IUTXO.js';
 import { UTXOs } from '../../bitcoin/UTXOs.js';
+export interface SpentUTXORef {
+    readonly transactionId: string;
+    readonly outputIndex: number;
+}
 export interface IUTXOsData {
     readonly pending: UTXOs;
-    readonly spentTransactions: UTXOs;
+    readonly spentTransactions: SpentUTXORef[];
     readonly confirmed: UTXOs;
 }
 export interface RawIUTXOsData {
-    readonly pending: IUTXO[];
-    readonly spentTransactions: IUTXO[];
-    readonly confirmed: IUTXO[];
+    readonly pending: RawIUTXO[];
+    readonly spentTransactions: ISpentUTXO[];
+    readonly confirmed: RawIUTXO[];
+    readonly raw: string[];
 }
 export interface RequestUTXOsParams {
     readonly address: string;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.7.2";
+export declare const version = "1.7.4";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.7.2';
+export const version = '1.7.4';

package/build/bitcoin/UTXOs.js

@@ -13,9 +13,6 @@ export class UTXO {
         this.isCSV = isCSV || false;
         this.value = BigInt(iUTXO.value);
         this.scriptPubKey = iUTXO.scriptPubKey;
-        if (!iUTXO.raw) {
-            throw new Error('Missing nonWitnessUtxo field in UTXO');
-        }
         this.nonWitnessUtxo = Buffer.from(iUTXO.raw, 'base64');
     }
 }

package/build/bitcoin/interfaces/IUTXO.d.ts

@@ -1,8 +1,15 @@
 import { ScriptPubKey } from '@btc-vision/bitcoin-rpc';
-export interface IUTXO {
+export interface RawIUTXO {
     readonly transactionId: string;
     readonly outputIndex: number;
     readonly value: bigint | string;
     readonly scriptPubKey: ScriptPubKey;
+    readonly raw?: number;
+}
+export interface IUTXO extends Omit<RawIUTXO, 'raw'> {
     readonly raw: string;
 }
+export interface ISpentUTXO {
+    readonly transactionId: string;
+    readonly outputIndex: number;
+}

package/build/block/BlockWitness.js

@@ -13,9 +13,7 @@ export class BlockWitnessAPI {
         this.timestamp = data.timestamp;
         this.proofs = Object.freeze(data.proofs.map((proof) => stringBase64ToBuffer(proof)));
         this.identity = data.identity ? stringBase64ToBuffer(data.identity) : undefined;
-        this.publicKey = data.mldsaPublicKey
-            ? Address.fromString(data.mldsaPublicKey, data.classicPublicKey)
-            : undefined;
+        this.publicKey = data.publicKey ? Address.fromString(data.publicKey) : undefined;
     }
 }
 export class BlockWitness {

package/build/block/interfaces/IBlockWitness.d.ts

@@ -13,8 +13,7 @@ export interface RawBlockWitnessAPI {
     readonly timestamp: number;
     readonly proofs: readonly string[];
     readonly identity?: string;
-    readonly mldsaPublicKey?: string;
-    readonly classicPublicKey?: string;
+    readonly publicKey?: string;
 }
 export interface IBlockWitness {
     blockNumber: bigint;

package/build/contracts/CallResult.d.ts

@@ -8,8 +8,10 @@ import { ContractDecodedObjectResult, DecodedOutput } from './Contract.js';
 import { IAccessList } from './interfaces/IAccessList.js';
 import { EventList, ICallResultData } from './interfaces/ICallResult.js';
 import { OPNetEvent } from './OPNetEvent.js';
+import { QuantumBIP32Interface } from '@btc-vision/bip32';
 export interface TransactionParameters {
-    readonly signer?: Signer | ECPairInterface;
+    readonly signer: Signer | ECPairInterface | null;
+    readonly mldsaSigner: QuantumBIP32Interface | null;
     readonly refundTo: string;
     readonly sender?: string;
     readonly priorityFee?: bigint;
@@ -28,6 +30,8 @@ export interface TransactionParameters {
     readonly dontUseCSVUtxos?: boolean;
     readonly maxUTXOs?: number;
     readonly throwIfUTXOsLimitReached?: boolean;
+    readonly linkMLDSAPublicKeyToAddress?: boolean;
+    readonly revealMLDSAPublicKey?: boolean;
 }
 export interface InteractionTransactionReceipt {
     readonly transactionId: string;

package/build/contracts/CallResult.js

@@ -137,6 +137,9 @@ export class CallResult {
                 note: interactionParams.note,
                 anchor: interactionParams.anchor || false,
                 txVersion: interactionParams.txVersion || 2,
+                mldsaSigner: interactionParams.mldsaSigner,
+                linkMLDSAPublicKeyToAddress: interactionParams.linkMLDSAPublicKeyToAddress ?? true,
+                revealMLDSAPublicKey: interactionParams.revealMLDSAPublicKey ?? false,
             };
             const transaction = await factory.signInteraction(params);
             if (!interactionParams.p2wda) {

package/build/contracts/Contract.d.ts

@@ -35,7 +35,7 @@ export declare abstract class IBaseContract<T extends BaseContractProperties> im
     private accessList;
     private _rlAddress;
     protected constructor(address: string | Address, abi: BitcoinInterface | BitcoinInterfaceAbi, provider: AbstractRpcProvider, network: Network, from?: Address);
-    get p2opOrTweaked(): string;
+    get p2op(): string;
     get contractAddress(): Promise<Address>;
     setSender(sender: Address): void;
     decodeEvents(events: NetEvent[] | ContractEvents): OPNetEvent<ContractDecodedObjectResult>[];

package/build/contracts/Contract.js

@@ -34,7 +34,7 @@ export class IBaseContract {
         Object.defineProperty(this, internal, { value: {} });
         this.defineInternalFunctions();
     }
-    get p2opOrTweaked() {
+    get p2op() {
         if (typeof this.address !== 'string') {
             return this.address.p2op(this.network);
         }
@@ -43,7 +43,7 @@ export class IBaseContract {
     get contractAddress() {
         if (typeof this.address === 'string') {
             if (!this._rlAddress) {
-                this._rlAddress = this.provider.getPublicKeyInfo(this.address);
+                this._rlAddress = this.provider.getPublicKeyInfo(this.address, true);
             }
             return this._rlAddress;
         }
@@ -56,7 +56,7 @@ export class IBaseContract {
         const decodedEvents = [];
         if (!Array.isArray(events)) {
             const tempEvents = events;
-            events = tempEvents[this.p2opOrTweaked];
+            events = tempEvents[this.p2op];
             if (!Array.isArray(events) &&
                 typeof this.address === 'string' &&
                 this.address.startsWith('0x')) {
@@ -498,7 +498,7 @@ export class IBaseContract {
             const decoded = element.outputs
                 ? this.decodeOutput(element.outputs, response.result)
                 : { values: [], obj: {} };
-            response.setTo(this.p2opOrTweaked, address);
+            response.setTo(this.p2op, address);
             response.setFromAddress(this.from);
             response.setDecoded(decoded);
             response.setCalldata(buffer);

package/build/contracts/ContractData.d.ts

@@ -8,7 +8,7 @@ export declare class ContractData implements Omit<IRawContract, 'contractPublicK
     readonly deployedTransactionId: string;
     readonly deployedTransactionHash: string;
     readonly deployerPubKey: Buffer;
-    readonly deployerClassicPublicKey: Buffer;
+    readonly deployerHashedPublicKey: Buffer;
     readonly contractSeed: Buffer;
     readonly contractSaltHash: Buffer;
     readonly deployerAddress: Address;

package/build/contracts/ContractData.js

@@ -7,7 +7,7 @@ export class ContractData {
     deployedTransactionId;
     deployedTransactionHash;
     deployerPubKey;
-    deployerClassicPublicKey;
+    deployerHashedPublicKey;
     contractSeed;
     contractSaltHash;
     deployerAddress;
@@ -25,9 +25,9 @@ export class ContractData {
         this.deployerPubKey = Buffer.isBuffer(raw.deployerPubKey)
             ? raw.deployerPubKey
             : Buffer.from(raw.deployerPubKey, 'base64');
-        this.deployerClassicPublicKey = Buffer.isBuffer(raw.deployerClassicPublicKey)
-            ? raw.deployerClassicPublicKey
-            : Buffer.from(raw.deployerClassicPublicKey, 'base64');
+        this.deployerHashedPublicKey = Buffer.isBuffer(raw.deployerAddress)
+            ? raw.deployerAddress
+            : Buffer.from(raw.deployerAddress.replace('0x', ''), 'hex');
         this.contractSeed = Buffer.isBuffer(raw.contractSeed)
             ? raw.contractSeed
             : Buffer.from(raw.contractSeed, 'base64');
@@ -36,7 +36,7 @@ export class ContractData {
             : Buffer.from(raw.contractSaltHash, 'base64');
         this.deployerAddress =
             !raw.deployerAddress && this.deployerPubKey
-                ? new Address(this.deployerPubKey, this.deployerClassicPublicKey)
+                ? new Address(this.deployerHashedPublicKey, this.deployerPubKey)
                 : raw.deployerAddress;
     }
 }

package/build/contracts/interfaces/IContract.d.ts

@@ -6,7 +6,7 @@ import { IAccessList } from './IAccessList.js';
 import { ParsedSimulatedTransaction } from './SimulatedTransaction.js';
 export interface IContract {
     readonly address: Address | string;
-    get p2opOrTweaked(): string;
+    get p2op(): string;
     currentGasParameters(): Promise<BlockGasParameters>;
     setSender(sender: Address): void;
     decodeEvents(events: NetEvent[] | ContractEvents): OPNetEvent[];

package/build/contracts/interfaces/IRawContract.d.ts

@@ -7,7 +7,6 @@ export interface IRawContract {
     readonly deployedTransactionId: string;
     readonly deployedTransactionHash: string;
     readonly deployerPubKey: Buffer | string;
-    readonly deployerClassicPublicKey: Buffer | string;
     readonly contractSeed: Buffer | string;
     readonly contractSaltHash: Buffer | string;
     readonly deployerAddress: Address;

package/build/epoch/Epoch.js

@@ -7,7 +7,7 @@ export class EpochMiner {
     graffiti;
     constructor(data) {
         this.solution = stringToBuffer(data.solution);
-        this.publicKey = Address.fromString(data.publicKey, data.classicPublicKey);
+        this.publicKey = Address.fromString(data.publicKey, data.legacyPublicKey);
         this.salt = stringToBuffer(data.salt);
         this.graffiti = data.graffiti ? stringToBuffer(data.graffiti) : undefined;
     }

package/build/epoch/interfaces/IEpoch.d.ts

@@ -20,7 +20,7 @@ export interface IEpoch {
 export interface RawEpochMiner {
     readonly solution: string;
     readonly publicKey: string;
-    readonly classicPublicKey: string;
+    readonly legacyPublicKey: string;
     readonly salt: string;
     readonly graffiti?: string;
 }

package/build/opnet.d.ts

@@ -13,6 +13,7 @@ export * from './transactions/interfaces/transactions/IInteractionTransaction.js
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
+export * from './providers/websocket/index.js';
 export * from './providers/interfaces/ReorgInformation.js';
 export * from './block/Block.js';
 export * from './block/BlockGasParameters.js';

package/build/opnet.js

@@ -13,6 +13,7 @@ export * from './transactions/interfaces/transactions/IInteractionTransaction.js
 export * from './providers/AbstractRpcProvider.js';
 export * from './providers/JSONRpcProvider.js';
 export * from './providers/WebsocketRpcProvider.js';
+export * from './providers/websocket/index.js';
 export * from './providers/interfaces/ReorgInformation.js';
 export * from './block/Block.js';
 export * from './block/BlockGasParameters.js';