@btc-vision/transaction 1.2.5 → 1.2.6

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

@@ -1,6 +1,6 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { Unisat } from '../types/Unisat.js';
+import { SignatureType, Unisat } from '../types/Unisat.js';
 declare global {
     interface Window {
         unisat?: Unisat;
@@ -21,6 +21,7 @@ export declare class UnisatSigner extends CustomKeypair {
     _network: Network | undefined;
     get network(): Network;
     get unisat(): Unisat;
+    signData(data: Buffer, type: SignatureType): Promise<Buffer>;
     init(): Promise<void>;
     getPublicKey(): Buffer;
     sign(_hash: Buffer, _lowR?: boolean): Buffer;

package/browser/transaction/browser/extensions/XverseSigner.d.ts

@@ -1,6 +1,6 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { Xverse } from '../types/Xverse.js';
+import { SigningProtocol, Xverse } from '../types/Xverse.js';
 declare global {
     interface Window {
         BitcoinProvider?: Xverse;
@@ -21,6 +21,7 @@ export declare class XverseSigner extends CustomKeypair {
     get network(): Network;
     get BitcoinProvider(): Xverse;
     init(): Promise<void>;
+    signData(data: Buffer, address: string, protocol: SigningProtocol): Promise<Buffer>;
     getPublicKey(): Buffer;
     sign(_hash: Buffer, _lowR?: boolean): Buffer;
     signSchnorr(_hash: Buffer): Buffer;

package/browser/transaction/browser/types/Unisat.d.ts

@@ -27,6 +27,10 @@ export declare enum MessageType {
     ecdsa = "ecdsa",
     bip322 = "bip322-simple"
 }
+export declare enum SignatureType {
+    ecdsa = "ecdsa",
+    schnorr = "schnorr"
+}
 interface ToSignInputBase {
     readonly index: number;
     readonly sighashTypes?: number[];
@@ -60,6 +64,7 @@ export interface Unisat {
     getPublicKey(): Promise<string>;
     getBalance(): Promise<Balance>;
     signMessage(message: string, type?: MessageType): Promise<string>;
+    signData(hex: string, type?: SignatureType): Promise<string>;
     pushTx(options: {
         rawtx: string;
     }): Promise<string>;

package/browser/transaction/browser/types/Xverse.d.ts

@@ -76,18 +76,22 @@ interface SignedTransactionResult {
     txid: string;
     raw: string;
 }
+export declare enum SigningProtocol {
+    ECDSA = "ECDSA",
+    BIP322 = "BIP322"
+}
 export interface Xverse {
-    request(method: string, params: unknown): Promise<XverseRPCResponse>;
-    request(method: 'wallet_connect' | 'wallet_getAccount', params: null): Promise<XverseRPCGetAccountResponse>;
-    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
-    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
-    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
     addListener: (event: string, callback: (...args: unknown[]) => void) => void;
     createInscription: (data: InscriptionData) => Promise<InscriptionResult>;
     createRepeatInscriptions: (data: RepeatInscriptionsData) => Promise<InscriptionResult[]>;
     sendBtcTransaction: (transaction: BtcTransaction) => Promise<TransactionResult>;
-    signMessage: (message: string) => Promise<SignedMessageResult>;
+    signMessage: (address: string, message: string, protocol: SigningProtocol) => Promise<SignedMessageResult>;
     signMultipleTransactions: (transactions: BtcTransaction[]) => Promise<SignedTransactionResult[]>;
     signTransaction: (transaction: BtcTransaction) => Promise<SignedTransactionResult>;
+    request(method: string, params: unknown): Promise<XverseRPCResponse>;
+    request(method: 'wallet_connect' | 'wallet_getAccount', params: null): Promise<XverseRPCGetAccountResponse>;
+    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
+    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
+    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
 }
 export {};

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.2.5";
+export declare const version = "1.2.6";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.2.5';
+export const version = '1.2.6';

package/build/transaction/TransactionFactory.js

@@ -208,7 +208,10 @@ export class TransactionFactory {
             return null;
         }
         const opnet = window.opnet.web3;
-        const interaction = await opnet.signInteraction(interactionParameters);
+        const interaction = await opnet.signInteraction({
+            ...interactionParameters,
+            signer: undefined,
+        });
         if (!interaction) {
             throw new Error('Could not sign interaction transaction.');
         }

package/build/transaction/browser/extensions/UnisatSigner.d.ts

@@ -1,6 +1,6 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { Unisat } from '../types/Unisat.js';
+import { SignatureType, Unisat } from '../types/Unisat.js';
 declare global {
     interface Window {
         unisat?: Unisat;
@@ -21,6 +21,7 @@ export declare class UnisatSigner extends CustomKeypair {
     _network: Network | undefined;
     get network(): Network;
     get unisat(): Unisat;
+    signData(data: Buffer, type: SignatureType): Promise<Buffer>;
     init(): Promise<void>;
     getPublicKey(): Buffer;
     sign(_hash: Buffer, _lowR?: boolean): Buffer;

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';
@@ -48,6 +48,11 @@ export class UnisatSigner extends CustomKeypair {
         }
         return module;
     }
+    async signData(data, type) {
+        const str = data.toString('hex');
+        const signature = await this.unisat.signData(str, type);
+        return Buffer.from(signature, 'hex');
+    }
     async init() {
         if (this.isInitialized) {
             return;

package/build/transaction/browser/extensions/XverseSigner.d.ts

@@ -1,6 +1,6 @@
 import { Network, Psbt } from '@btc-vision/bitcoin';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { Xverse } from '../types/Xverse.js';
+import { SigningProtocol, Xverse } from '../types/Xverse.js';
 declare global {
     interface Window {
         BitcoinProvider?: Xverse;
@@ -21,6 +21,7 @@ export declare class XverseSigner extends CustomKeypair {
     get network(): Network;
     get BitcoinProvider(): Xverse;
     init(): Promise<void>;
+    signData(data: Buffer, address: string, protocol: SigningProtocol): Promise<Buffer>;
     getPublicKey(): Buffer;
     sign(_hash: Buffer, _lowR?: boolean): Buffer;
     signSchnorr(_hash: Buffer): Buffer;

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

@@ -71,6 +71,23 @@ export class XverseSigner extends CustomKeypair {
         this._addresses = [this._p2wpkh, this._p2tr];
         this.isInitialized = true;
     }
+    async signData(data, address, protocol) {
+        if (!this.isInitialized) {
+            throw new Error('UnisatSigner not initialized');
+        }
+        const callSign = await this.BitcoinProvider.request('signMessage', {
+            address,
+            message: data.toString(),
+            protocol,
+        });
+        if ('error' in callSign)
+            throw new Error(callSign.error.message);
+        const res = callSign.result;
+        if (!res.signature) {
+            throw new Error('Signature not found');
+        }
+        return Buffer.from(res.signature, 'hex');
+    }
     getPublicKey() {
         if (!this.isInitialized) {
             throw new Error('UnisatSigner not initialized');

package/build/transaction/browser/types/Unisat.d.ts

@@ -27,6 +27,10 @@ export declare enum MessageType {
     ecdsa = "ecdsa",
     bip322 = "bip322-simple"
 }
+export declare enum SignatureType {
+    ecdsa = "ecdsa",
+    schnorr = "schnorr"
+}
 interface ToSignInputBase {
     readonly index: number;
     readonly sighashTypes?: number[];
@@ -60,6 +64,7 @@ export interface Unisat {
     getPublicKey(): Promise<string>;
     getBalance(): Promise<Balance>;
     signMessage(message: string, type?: MessageType): Promise<string>;
+    signData(hex: string, type?: SignatureType): Promise<string>;
     pushTx(options: {
         rawtx: string;
     }): Promise<string>;

package/build/transaction/browser/types/Unisat.js

@@ -19,3 +19,8 @@ export var MessageType;
     MessageType["ecdsa"] = "ecdsa";
     MessageType["bip322"] = "bip322-simple";
 })(MessageType || (MessageType = {}));
+export var SignatureType;
+(function (SignatureType) {
+    SignatureType["ecdsa"] = "ecdsa";
+    SignatureType["schnorr"] = "schnorr";
+})(SignatureType || (SignatureType = {}));

package/build/transaction/browser/types/Xverse.d.ts

@@ -76,18 +76,22 @@ interface SignedTransactionResult {
     txid: string;
     raw: string;
 }
+export declare enum SigningProtocol {
+    ECDSA = "ECDSA",
+    BIP322 = "BIP322"
+}
 export interface Xverse {
-    request(method: string, params: unknown): Promise<XverseRPCResponse>;
-    request(method: 'wallet_connect' | 'wallet_getAccount', params: null): Promise<XverseRPCGetAccountResponse>;
-    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
-    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
-    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
     addListener: (event: string, callback: (...args: unknown[]) => void) => void;
     createInscription: (data: InscriptionData) => Promise<InscriptionResult>;
     createRepeatInscriptions: (data: RepeatInscriptionsData) => Promise<InscriptionResult[]>;
     sendBtcTransaction: (transaction: BtcTransaction) => Promise<TransactionResult>;
-    signMessage: (message: string) => Promise<SignedMessageResult>;
+    signMessage: (address: string, message: string, protocol: SigningProtocol) => Promise<SignedMessageResult>;
     signMultipleTransactions: (transactions: BtcTransaction[]) => Promise<SignedTransactionResult[]>;
     signTransaction: (transaction: BtcTransaction) => Promise<SignedTransactionResult>;
+    request(method: string, params: unknown): Promise<XverseRPCResponse>;
+    request(method: 'wallet_connect' | 'wallet_getAccount', params: null): Promise<XverseRPCGetAccountResponse>;
+    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
+    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
+    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
 }
 export {};

package/build/transaction/browser/types/Xverse.js

@@ -4,3 +4,8 @@ export var XverseNetwork;
     XverseNetwork["testnet"] = "testnet";
     XverseNetwork["signet"] = "Signet";
 })(XverseNetwork || (XverseNetwork = {}));
+export var SigningProtocol;
+(function (SigningProtocol) {
+    SigningProtocol["ECDSA"] = "ECDSA";
+    SigningProtocol["BIP322"] = "BIP322";
+})(SigningProtocol || (SigningProtocol = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@btc-vision/transaction",
     "type": "module",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "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.5';
+export const version = '1.2.6';

package/src/transaction/TransactionFactory.ts

@@ -397,7 +397,13 @@ export class TransactionFactory {
         }
 
         const opnet = window.opnet.web3;
-        const interaction = await opnet.signInteraction(interactionParameters);
+        const interaction = await opnet.signInteraction({
+            ...interactionParameters,
+
+            // @ts-expect-error no, this is ok
+            signer: undefined,
+        });
+
         if (!interaction) {
             throw new Error('Could not sign interaction transaction.');
         }

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';
@@ -12,7 +12,7 @@ import { ECPairInterface } from 'ecpair';
 import { EcKeyPair } from '../../../keypair/EcKeyPair.js';
 import { canSignNonTaprootInput, isTaprootInput } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
-import { PsbtSignatureOptions, Unisat, UnisatNetwork } from '../types/Unisat.js';
+import { PsbtSignatureOptions, SignatureType, Unisat, UnisatNetwork } from '../types/Unisat.js';
 
 declare global {
     interface Window {
@@ -91,11 +91,18 @@ export class UnisatSigner extends CustomKeypair {
         return module;
     }
 
+    public async signData(data: Buffer, type: SignatureType): Promise<Buffer> {
+        const str = data.toString('hex');
+        const signature = await this.unisat.signData(str, type);
+
+        return Buffer.from(signature, 'hex');
+    }
+
     public async init(): Promise<void> {
         if (this.isInitialized) {
             return;
         }
-
+        
         const network = await this.unisat.getNetwork();
         switch (network) {
             case UnisatNetwork.mainnet:

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

@@ -9,7 +9,7 @@ import {
 } from '../../../signer/SignerUtils.js';
 import { CustomKeypair } from '../BrowserSignerBase.js';
 import { PsbtSignatureOptions } from '../types/Unisat.js';
-import { Xverse } from '../types/Xverse.js';
+import { SigningProtocol, Xverse } from '../types/Xverse.js';
 
 declare global {
     interface Window {
@@ -123,6 +123,36 @@ export class XverseSigner extends CustomKeypair {
         this.isInitialized = true;
     }
 
+    public async signData(
+        data: Buffer,
+        address: string,
+        protocol: SigningProtocol,
+    ): Promise<Buffer> {
+        if (!this.isInitialized) {
+            throw new Error('UnisatSigner not initialized');
+        }
+
+        const callSign = await this.BitcoinProvider.request('signMessage', {
+            address,
+            message: data.toString(),
+            protocol,
+        });
+
+        if ('error' in callSign) throw new Error(callSign.error.message);
+
+        const res = callSign.result as {
+            signature: string;
+            messageHash: string;
+            address: string;
+        };
+
+        if (!res.signature) {
+            throw new Error('Signature not found');
+        }
+
+        return Buffer.from(res.signature, 'hex');
+    }
+
     public getPublicKey(): Buffer {
         if (!this.isInitialized) {
             throw new Error('UnisatSigner not initialized');

package/src/transaction/browser/types/Unisat.ts

@@ -33,6 +33,11 @@ export enum MessageType {
     bip322 = 'bip322-simple',
 }
 
+export enum SignatureType {
+    ecdsa = 'ecdsa',
+    schnorr = 'schnorr',
+}
+
 interface ToSignInputBase {
     readonly index: number;
     readonly sighashTypes?: number[];
@@ -56,7 +61,7 @@ export interface PsbtSignatureOptions {
 
 export interface Unisat {
     web3?: Web3Provider;
-    
+
     disconnect: () => void;
     connect: () => void;
 
@@ -82,6 +87,8 @@ export interface Unisat {
 
     signMessage(message: string, type?: MessageType): Promise<string>;
 
+    signData(hex: string, type?: SignatureType): Promise<string>;
+
     pushTx(options: { rawtx: string }): Promise<string>;
 
     signPsbt(psbtHex: string, psbtOptions: PsbtSignatureOptions): Promise<string>;

package/src/transaction/browser/types/Xverse.ts

@@ -93,26 +93,36 @@ interface SignedTransactionResult {
     raw: string;
 }
 
-export interface Xverse {
-    request(method: string, params: unknown): Promise<XverseRPCResponse>;
-    request(
-        method: 'wallet_connect' | 'wallet_getAccount',
-        params: null,
-    ): Promise<XverseRPCGetAccountResponse>;
-    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
-    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
-    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
+export enum SigningProtocol {
+    ECDSA = 'ECDSA',
+    BIP322 = 'BIP322',
+}
 
+export interface Xverse {
     addListener: (event: string, callback: (...args: unknown[]) => void) => void;
-
     createInscription: (data: InscriptionData) => Promise<InscriptionResult>;
     createRepeatInscriptions: (data: RepeatInscriptionsData) => Promise<InscriptionResult[]>;
-
     sendBtcTransaction: (transaction: BtcTransaction) => Promise<TransactionResult>;
-
-    signMessage: (message: string) => Promise<SignedMessageResult>;
+    signMessage: (
+        address: string,
+        message: string,
+        protocol: SigningProtocol,
+    ) => Promise<SignedMessageResult>;
     signMultipleTransactions: (
         transactions: BtcTransaction[],
     ) => Promise<SignedTransactionResult[]>;
     signTransaction: (transaction: BtcTransaction) => Promise<SignedTransactionResult>;
+
+    request(method: string, params: unknown): Promise<XverseRPCResponse>;
+
+    request(
+        method: 'wallet_connect' | 'wallet_getAccount',
+        params: null,
+    ): Promise<XverseRPCGetAccountResponse>;
+
+    request(method: 'wallet_disconnect', params: null): Promise<XverseRPCResponse<null>>;
+
+    request(method: 'getBalance', params: null): Promise<XverseRPCGetBalanceResponse>;
+
+    request(method: 'signPsbt', params: XVersePSBTInput): Promise<XverseRPCSignPsbtResponse>;
 }