@btc-vision/transaction 1.8.0-beta.1 → 1.8.0-beta.4

package/build/keypair/EcKeyPair.js

@@ -1,35 +1,73 @@
-import * as ecc from '@bitcoinerlab/secp256k1';
+import { backend, eccLib } from '../ecc/backend.js';
 import bip32, { BIP32Factory, MLDSASecurityLevel, QuantumBIP32Factory, } from '@btc-vision/bip32';
-import bitcoin, { address, fromOutputScript, initEccLib, networks, opcodes, payments, script, toXOnly, } from '@btc-vision/bitcoin';
-import { ECPairFactory } from 'ecpair';
-import { secp256k1 } from '@noble/curves/secp256k1';
-import { mod } from '@noble/curves/abstract/modular';
-import { sha256 } from '@noble/hashes/sha2';
-import { bytesToNumberBE, concatBytes, randomBytes, utf8ToBytes } from '@noble/curves/utils.js';
-import { Buffer } from 'buffer';
-initEccLib(ecc);
+import bitcoin, { address, concat, fromHex, fromOutputScript, initEccLib, networks, opcodes, payments, script, toHex, toXOnly, } from '@btc-vision/bitcoin';
+import { ECPairSigner } from '@btc-vision/ecpair';
+import { secp256k1 } from '@noble/curves/secp256k1.js';
+import { mod } from '@noble/curves/abstract/modular.js';
+import { sha256 } from '@noble/hashes/sha2.js';
+import { bytesToNumberBE, concatBytes, randomBytes } from '@noble/curves/utils.js';
+initEccLib(eccLib);
 const BIP32factory = typeof bip32 === 'function' ? bip32 : BIP32Factory;
 if (!BIP32factory) {
     throw new Error('Failed to load BIP32 library');
 }
 const Point = secp256k1.Point;
 const CURVE_N = Point.Fn.ORDER;
-const TAP_TAG = utf8ToBytes('TapTweak');
+const TAP_TAG = new Uint8Array([84, 97, 112, 84, 119, 101, 97, 107]); // 'TapTweak' in UTF-8
 const TAP_TAG_HASH = sha256(TAP_TAG);
 function tapTweakHash(x) {
     return sha256(concatBytes(TAP_TAG_HASH, TAP_TAG_HASH, x));
 }
+/**
+ * Class for handling EC key pairs
+ * @class EcKeyPair
+ * @module EcKeyPair
+ * @typicalname EcKeyPair
+ * @example import { EcKeyPair } from '@btc-vision/transaction';
+ */
 export class EcKeyPair {
+    static BIP32 = BIP32factory(backend);
+    static ECPairSigner = ECPairSigner;
+    // Initialize precomputation for better performance
+    static {
+        // Precompute tables for the base point for better performance
+        Point.BASE.precompute(8);
+    }
+    /**
+     * Generate a keypair from a WIF
+     * @param {string} wif - The WIF to use
+     * @param {Network} network - The network to use
+     * @returns {UniversalSigner} - The generated keypair
+     */
     static fromWIF(wif, network = networks.bitcoin) {
-        return this.ECPair.fromWIF(wif, network);
+        return ECPairSigner.fromWIF(backend, wif, network);
     }
+    /**
+     * Generate a keypair from a private key
+     * @param {Uint8Array} privateKey - The private key to use
+     * @param {Network} network - The network to use
+     * @returns {UniversalSigner} - The generated keypair
+     */
     static fromPrivateKey(privateKey, network = networks.bitcoin) {
-        return this.ECPair.fromPrivateKey(!Buffer.isBuffer(privateKey) ? Buffer.from(privateKey) : privateKey, { network });
+        return ECPairSigner.fromPrivateKey(backend, privateKey, network);
     }
+    /**
+     * Generate a keypair from a public key
+     * @param {Uint8Array} publicKey - The public key to use
+     * @param {Network} network - The network to use
+     * @returns {UniversalSigner} - The generated keypair
+     */
     static fromPublicKey(publicKey, network = networks.bitcoin) {
-        const buf = !Buffer.isBuffer(publicKey) ? Buffer.from(publicKey) : publicKey;
-        return this.ECPair.fromPublicKey(buf, { network });
+        return ECPairSigner.fromPublicKey(backend, publicKey, network);
     }
+    /**
+     * Generate a multi-sig address
+     * @param {Uint8Array[]} pubKeys - The public keys to use
+     * @param {number} minimumSignatureRequired - The minimum number of signatures required
+     * @param {Network} network - The network to use
+     * @returns {string} - The generated address
+     * @throws {Error} - If the address cannot be generated
+     */
     static generateMultiSigAddress(pubKeys, minimumSignatureRequired, network = networks.bitcoin) {
         const publicKeys = this.verifyPubKeys(pubKeys, network);
         if (publicKeys.length !== pubKeys.length)
@@ -46,37 +84,64 @@ export class EcKeyPair {
         }
         return address;
     }
+    /**
+     * Verify public keys and return the public keys
+     * @param {Uint8Array[]} pubKeys - The public keys to verify
+     * @param {Network} network - The network to use
+     * @returns {Uint8Array[]} - The verified public keys
+     * @throws {Error} - If the key cannot be regenerated
+     */
     static verifyPubKeys(pubKeys, network = networks.bitcoin) {
         return pubKeys.map((pubKey) => {
             const key = EcKeyPair.fromPublicKey(pubKey, network);
             if (!key) {
                 throw new Error('Failed to regenerate key');
             }
-            return Buffer.from(key.publicKey);
+            return key.publicKey;
         });
     }
+    /**
+     * Get a P2WPKH address from a keypair
+     * @param {UniversalSigner} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {string} - The address
+     */
     static getP2WPKHAddress(keyPair, network = networks.bitcoin) {
-        const res = payments.p2wpkh({ pubkey: Buffer.from(keyPair.publicKey), network: network });
+        const res = payments.p2wpkh({ pubkey: keyPair.publicKey, network: network });
         if (!res.address) {
             throw new Error('Failed to generate wallet');
         }
         return res.address;
     }
+    /**
+     * Get the address of a tweaked public key
+     * @param {string} tweakedPubKeyHex - The tweaked public key hex string
+     * @param {Network} network - The network to use
+     * @returns {string} - The address
+     * @throws {Error} - If the address cannot be generated
+     */
     static tweakedPubKeyToAddress(tweakedPubKeyHex, network) {
         if (tweakedPubKeyHex.startsWith('0x')) {
             tweakedPubKeyHex = tweakedPubKeyHex.slice(2);
         }
-        let tweakedPubKeyBuffer = Buffer.from(tweakedPubKeyHex, 'hex');
+        // Convert the tweaked public key hex string to a Uint8Array
+        let tweakedPubKeyBuffer = fromHex(tweakedPubKeyHex);
         if (tweakedPubKeyBuffer.length !== 32) {
             tweakedPubKeyBuffer = toXOnly(tweakedPubKeyBuffer);
         }
         return EcKeyPair.tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer, network);
     }
+    /**
+     * Get the address of a tweaked public key
+     * @param {Uint8Array} tweakedPubKeyBuffer - The tweaked public key buffer
+     * @param {Network} network - The network to use
+     * @returns {string} - The address
+     * @throws {Error} - If the address cannot be generated
+     */
     static tweakedPubKeyBufferToAddress(tweakedPubKeyBuffer, network) {
+        // Generate the Taproot address using the p2tr payment method
         const { address } = payments.p2tr({
-            pubkey: Buffer.isBuffer(tweakedPubKeyBuffer)
-                ? tweakedPubKeyBuffer
-                : Buffer.from(tweakedPubKeyBuffer),
+            pubkey: tweakedPubKeyBuffer,
             network: network,
         });
         if (!address) {
@@ -84,10 +149,18 @@ export class EcKeyPair {
         }
         return address;
     }
+    /**
+     * Generate a P2OP address
+     * @param bytes - The bytes to use for the P2OP address
+     * @param network - The network to use
+     * @param deploymentVersion - The deployment version (default is 0)
+     * @returns {string} - The generated P2OP address
+     */
     static p2op(bytes, network = networks.bitcoin, deploymentVersion = 0) {
-        const witnessProgram = Buffer.concat([
-            Buffer.from([deploymentVersion]),
-            bitcoin.crypto.hash160(Buffer.from(bytes)),
+        // custom opnet contract addresses
+        const witnessProgram = concat([
+            new Uint8Array([deploymentVersion]),
+            bitcoin.crypto.hash160(bytes),
         ]);
         if (witnessProgram.length < 2 || witnessProgram.length > 40) {
             throw new Error('Witness program must be 2-40 bytes.');
@@ -95,11 +168,23 @@ export class EcKeyPair {
         const scriptData = script.compile([opcodes.OP_16, witnessProgram]);
         return fromOutputScript(scriptData, network);
     }
+    /**
+     * Get the address of a xOnly tweaked public key
+     * @param {string} tweakedPubKeyHex - The xOnly tweaked public key hex string
+     * @param {Network} network - The network to use
+     * @returns {string} - The address
+     * @throws {Error} - If the address cannot be generated
+     */
     static xOnlyTweakedPubKeyToAddress(tweakedPubKeyHex, network) {
         if (tweakedPubKeyHex.startsWith('0x')) {
             tweakedPubKeyHex = tweakedPubKeyHex.slice(2);
         }
-        const tweakedPubKeyBuffer = Buffer.from(tweakedPubKeyHex, 'hex');
+        // Convert the tweaked public key hex string to a Uint8Array
+        const tweakedPubKeyBuffer = fromHex(tweakedPubKeyHex);
+        if (tweakedPubKeyBuffer.length !== 32) {
+            throw new Error('Invalid xOnly public key length');
+        }
+        // Generate the Taproot address using the p2tr payment method
         const { address } = payments.p2tr({
             pubkey: tweakedPubKeyBuffer,
             network: network,
@@ -109,64 +194,107 @@ export class EcKeyPair {
         }
         return address;
     }
+    /**
+     * Tweak a public key
+     * @param {Uint8Array | string} pub - The public key to tweak
+     * @returns {Uint8Array} - The tweaked public key
+     * @throws {Error} - If the public key cannot be tweaked
+     */
     static tweakPublicKey(pub) {
         if (typeof pub === 'string' && pub.startsWith('0x'))
             pub = pub.slice(2);
-        const P = Point.fromHex(pub);
+        const hexStr = typeof pub === 'string' ? pub : toHex(pub);
+        const P = Point.fromHex(hexStr);
         const Peven = (P.y & 1n) === 0n ? P : P.negate();
-        const xBytes = Buffer.from(Peven.toBytes(true).subarray(1));
+        const xBytes = Peven.toBytes(true).subarray(1);
         const tBytes = tapTweakHash(xBytes);
         const t = mod(bytesToNumberBE(tBytes), CURVE_N);
         const Q = Peven.add(Point.BASE.multiply(t));
-        return Buffer.from(Q.toBytes(true));
+        return Q.toBytes(true);
     }
+    /**
+     * Tweak a batch of public keys
+     * @param {readonly Uint8Array[]} pubkeys - The public keys to tweak
+     * @param {bigint} tweakScalar - The scalar to use for tweaking
+     * @returns {Uint8Array[]} - The tweaked public keys
+     */
     static tweakBatchSharedT(pubkeys, tweakScalar) {
         const T = Point.BASE.multiply(tweakScalar);
         return pubkeys.map((bytes) => {
-            const P = Point.fromHex(bytes);
+            const P = Point.fromHex(toHex(bytes));
             const P_even = P.y % 2n === 0n ? P : P.negate();
             const Q = P_even.add(T);
             return Q.toBytes(true);
         });
     }
+    /**
+     * Generate a random wallet with both classical and quantum keys
+     *
+     * @param network - The network to use
+     * @param securityLevel - The ML-DSA security level for quantum keys (default: LEVEL2/44)
+     * @returns An object containing both classical and quantum key information
+     */
     static generateWallet(network = networks.bitcoin, securityLevel = MLDSASecurityLevel.LEVEL2) {
-        const keyPair = this.ECPair.makeRandom({
-            network: network,
+        const keyPair = ECPairSigner.makeRandom(backend, network, {
             rng: (size) => {
-                const bytes = randomBytes(size);
-                return Buffer.from(bytes);
+                return randomBytes(size);
             },
         });
         const wallet = this.getP2WPKHAddress(keyPair, network);
         if (!wallet) {
             throw new Error('Failed to generate wallet');
         }
+        // Generate random quantum keypair with network
         const quantumKeyPair = this.generateQuantumKeyPair(securityLevel, network);
         return {
             address: wallet,
             privateKey: keyPair.toWIF(),
-            publicKey: Buffer.from(keyPair.publicKey).toString('hex'),
-            quantumPrivateKey: Buffer.from(quantumKeyPair.privateKey).toString('hex'),
-            quantumPublicKey: Buffer.from(quantumKeyPair.publicKey).toString('hex'),
+            publicKey: toHex(keyPair.publicKey),
+            quantumPrivateKey: toHex(quantumKeyPair.privateKey),
+            quantumPublicKey: toHex(quantumKeyPair.publicKey),
         };
     }
+    /**
+     * Generate a random quantum ML-DSA keypair
+     *
+     * This creates a standalone quantum-resistant keypair without using BIP32 derivation.
+     * The keys are generated using cryptographically secure random bytes.
+     *
+     * @param securityLevel - The ML-DSA security level (default: LEVEL2/44)
+     * @param network - The Bitcoin network (default: bitcoin mainnet)
+     * @returns A random ML-DSA keypair
+     */
     static generateQuantumKeyPair(securityLevel = MLDSASecurityLevel.LEVEL2, network = networks.bitcoin) {
+        // Generate random seed for quantum key generation
         const randomSeed = randomBytes(64);
-        const quantumRoot = QuantumBIP32Factory.fromSeed(Buffer.from(randomSeed), network, securityLevel);
+        // Create a quantum root from the random seed with network parameter
+        const quantumRoot = QuantumBIP32Factory.fromSeed(randomSeed, network, securityLevel);
         if (!quantumRoot.privateKey || !quantumRoot.publicKey) {
             throw new Error('Failed to generate quantum keypair');
         }
         return {
-            privateKey: Buffer.from(quantumRoot.privateKey),
-            publicKey: Buffer.from(quantumRoot.publicKey),
+            privateKey: new Uint8Array(quantumRoot.privateKey),
+            publicKey: new Uint8Array(quantumRoot.publicKey),
         };
     }
+    /**
+     * Verify that a contract address is a valid p2tr address
+     * @param {string} contractAddress - The contract address to verify
+     * @param {Network} network - The network to use
+     * @returns {boolean} - Whether the address is valid
+     */
     static verifyContractAddress(contractAddress, network = networks.bitcoin) {
         return !!address.toOutputScript(contractAddress, network);
     }
+    /**
+     * Get the legacy segwit address from a keypair
+     * @param {UniversalSigner} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {string} - The legacy address
+     */
     static getLegacySegwitAddress(keyPair, network = networks.bitcoin) {
         const wallet = payments.p2sh({
-            redeem: payments.p2wpkh({ pubkey: Buffer.from(keyPair.publicKey), network: network }),
+            redeem: payments.p2wpkh({ pubkey: keyPair.publicKey, network: network }),
             network: network,
         });
         if (!wallet.address) {
@@ -174,42 +302,75 @@ export class EcKeyPair {
         }
         return wallet.address;
     }
+    /**
+     * Get the legacy address from a keypair
+     * @param {UniversalSigner} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {string} - The legacy address
+     */
     static getLegacyAddress(keyPair, network = networks.bitcoin) {
-        const wallet = payments.p2pkh({ pubkey: Buffer.from(keyPair.publicKey), network: network });
+        const wallet = payments.p2pkh({ pubkey: keyPair.publicKey, network: network });
         if (!wallet.address) {
             throw new Error('Failed to generate wallet');
         }
         return wallet.address;
     }
+    /**
+     * Get the legacy address from a public key
+     * @param publicKey
+     * @param {Network} network - The network to use
+     * @returns {string} - The legacy address
+     */
     static getP2PKH(publicKey, network = networks.bitcoin) {
-        const wallet = payments.p2pkh({ pubkey: Buffer.from(publicKey), network: network });
+        const wallet = payments.p2pkh({ pubkey: publicKey, network: network });
         if (!wallet.address) {
             throw new Error('Failed to generate wallet');
         }
         return wallet.address;
     }
+    /**
+     * Get the P2PK output from a keypair
+     * @param {UniversalSigner} keyPair - The keypair to get the address for
+     * @param {Network} network - The network to use
+     * @returns {string} - The legacy address
+     */
     static getP2PKAddress(keyPair, network = networks.bitcoin) {
-        const wallet = payments.p2pk({ pubkey: Buffer.from(keyPair.publicKey), network: network });
+        const wallet = payments.p2pk({ pubkey: keyPair.publicKey, network: network });
         if (!wallet.output) {
             throw new Error('Failed to generate wallet');
         }
-        return '0x' + wallet.output.toString('hex');
+        return '0x' + toHex(wallet.output);
     }
+    /**
+     * Generate a random keypair
+     * @param {Network} network - The network to use
+     * @returns {UniversalSigner} - The generated keypair
+     */
     static generateRandomKeyPair(network = networks.bitcoin) {
-        return this.ECPair.makeRandom({
-            network: network,
+        return ECPairSigner.makeRandom(backend, network, {
             rng: (size) => {
-                const bytes = randomBytes(size);
-                return Buffer.from(bytes);
+                return randomBytes(size);
             },
         });
     }
+    /**
+     * Generate a BIP32 keypair from a seed
+     * @param {Uint8Array} seed - The seed to generate the keypair from
+     * @param {Network} network - The network to use
+     * @returns {BIP32Interface} - The generated keypair
+     */
     static fromSeed(seed, network = networks.bitcoin) {
         return this.BIP32.fromSeed(seed, network);
     }
+    /**
+     * Get taproot address from keypair
+     * @param {UniversalSigner | Signer} keyPair - The keypair to get the taproot address for
+     * @param {Network} network - The network to use
+     * @returns {string} - The taproot address
+     */
     static getTaprootAddress(keyPair, network = networks.bitcoin) {
         const { address } = payments.p2tr({
-            internalPubkey: toXOnly(Buffer.from(keyPair.publicKey)),
+            internalPubkey: toXOnly(keyPair.publicKey),
             network: network,
         });
         if (!address) {
@@ -217,6 +378,12 @@ export class EcKeyPair {
         }
         return address;
     }
+    /**
+     * Get taproot address from address
+     * @param {string} inAddr - The address to convert to taproot
+     * @param {Network} network - The network to use
+     * @returns {string} - The taproot address
+     */
     static getTaprootAddressFromAddress(inAddr, network = networks.bitcoin) {
         const { address } = payments.p2tr({
             address: inAddr,
@@ -227,16 +394,18 @@ export class EcKeyPair {
         }
         return address;
     }
+    /**
+     * Get a keypair from a given seed.
+     * @param {Uint8Array} seed - The seed to generate the key pair from
+     * @param {Network} network - The network to use
+     * @returns {UniversalSigner} - The generated key pair
+     */
     static fromSeedKeyPair(seed, network = networks.bitcoin) {
         const fromSeed = this.BIP32.fromSeed(seed, network);
         const privKey = fromSeed.privateKey;
         if (!privKey)
             throw new Error('Failed to generate key pair');
-        return this.ECPair.fromPrivateKey(Buffer.from(privKey), { network });
+        return ECPairSigner.fromPrivateKey(backend, privKey, network);
     }
 }
-EcKeyPair.BIP32 = BIP32factory(ecc);
-EcKeyPair.ECPair = ECPairFactory(ecc);
-(() => {
-    Point.BASE.precompute(8);
-})();
+//# sourceMappingURL=EcKeyPair.js.map

package/build/keypair/EcKeyPair.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EcKeyPair.js","sourceRoot":"","sources":["../../src/keypair/EcKeyPair.ts"],"names":[],"mappings":"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"}

package/build/keypair/MessageSigner.d.ts

@@ -1,6 +1,6 @@
-import { ECPairInterface } from 'ecpair';
-import { Network } from '@btc-vision/bitcoin';
-import { MLDSASecurityLevel, QuantumBIP32Interface } from '@btc-vision/bip32';
+import { type UniversalSigner } from '@btc-vision/ecpair';
+import { type Network } from '@btc-vision/bitcoin';
+import { MLDSASecurityLevel, type QuantumBIP32Interface } from '@btc-vision/bip32';
 export interface SignedMessage {
     readonly signature: Uint8Array;
     readonly message: Uint8Array;
@@ -12,22 +12,23 @@ export interface MLDSASignedMessage {
     readonly securityLevel: MLDSASecurityLevel;
 }
 declare class MessageSignerBase {
-    sha256(message: Buffer | Uint8Array): Buffer;
-    trySignSchnorrWithOPWallet(message: Uint8Array | Buffer | string): Promise<SignedMessage | null>;
-    trySignMLDSAWithOPWallet(message: Uint8Array | Buffer | string): Promise<MLDSASignedMessage | null>;
-    signMessageAuto(message: Uint8Array | Buffer | string, keypair?: ECPairInterface): Promise<SignedMessage>;
-    tweakAndSignMessageAuto(message: Uint8Array | Buffer | string, keypair?: ECPairInterface, network?: Network): Promise<SignedMessage>;
-    signMLDSAMessageAuto(message: Uint8Array | Buffer | string, mldsaKeypair?: QuantumBIP32Interface): Promise<MLDSASignedMessage>;
-    verifyMLDSAWithOPWallet(message: Uint8Array | Buffer | string, signature: MLDSASignedMessage): Promise<boolean | null>;
-    getMLDSAPublicKeyFromOPWallet(): Promise<Buffer | null>;
-    tweakAndSignMessage(keypair: ECPairInterface, message: Uint8Array | Buffer | string, network: Network): SignedMessage;
-    signMessage(keypair: ECPairInterface, message: Uint8Array | Buffer | string): SignedMessage;
-    verifySignature(publicKey: Uint8Array | Buffer, message: Uint8Array | Buffer | string, signature: Uint8Array | Buffer): boolean;
-    tweakAndVerifySignature(publicKey: Uint8Array | Buffer, message: Uint8Array | Buffer | string, signature: Uint8Array | Buffer): boolean;
-    signMLDSAMessage(mldsaKeypair: QuantumBIP32Interface, message: Uint8Array | Buffer | string): MLDSASignedMessage;
-    verifyMLDSASignature(mldsaKeypair: QuantumBIP32Interface, message: Uint8Array | Buffer | string, signature: Uint8Array | Buffer): boolean;
+    sha256(message: Uint8Array): Uint8Array;
+    trySignSchnorrWithOPWallet(message: Uint8Array | string): Promise<SignedMessage | null>;
+    trySignMLDSAWithOPWallet(message: Uint8Array | string): Promise<MLDSASignedMessage | null>;
+    signMessageAuto(message: Uint8Array | string, keypair?: UniversalSigner): Promise<SignedMessage>;
+    tweakAndSignMessageAuto(message: Uint8Array | string, keypair?: UniversalSigner, network?: Network): Promise<SignedMessage>;
+    signMLDSAMessageAuto(message: Uint8Array | string, mldsaKeypair?: QuantumBIP32Interface): Promise<MLDSASignedMessage>;
+    verifyMLDSAWithOPWallet(message: Uint8Array | string, signature: MLDSASignedMessage): Promise<boolean | null>;
+    getMLDSAPublicKeyFromOPWallet(): Promise<Uint8Array | null>;
+    tweakAndSignMessage(keypair: UniversalSigner, message: Uint8Array | string, network: Network): SignedMessage;
+    signMessage(keypair: UniversalSigner, message: Uint8Array | string): SignedMessage;
+    verifySignature(publicKey: Uint8Array, message: Uint8Array | string, signature: Uint8Array): boolean;
+    tweakAndVerifySignature(publicKey: Uint8Array, message: Uint8Array | string, signature: Uint8Array): boolean;
+    signMLDSAMessage(mldsaKeypair: QuantumBIP32Interface, message: Uint8Array | string): MLDSASignedMessage;
+    verifyMLDSASignature(mldsaKeypair: QuantumBIP32Interface, message: Uint8Array | string, signature: Uint8Array): boolean;
     isOPWalletAvailable(): boolean;
     private getOPWallet;
 }
 export declare const MessageSigner: MessageSignerBase;
 export {};
+//# sourceMappingURL=MessageSigner.d.ts.map

package/build/keypair/MessageSigner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageSigner.d.ts","sourceRoot":"","sources":["../../src/keypair/MessageSigner.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,eAAe,EACvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAmB,KAAK,OAAO,EAAkB,MAAM,qBAAqB,CAAC;AAGpF,OAAO,EAAE,kBAAkB,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAInF,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;CAC9C;AAMD,cAAM,iBAAiB;IACZ,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,UAAU;IAIjC,0BAA0B,CACnC,OAAO,EAAE,UAAU,GAAG,MAAM,GAC7B,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAmBnB,wBAAwB,CACjC,OAAO,EAAE,UAAU,GAAG,MAAM,GAC7B,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAqBxB,eAAe,CACxB,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,eAAe,GAC1B,OAAO,CAAC,aAAa,CAAC;IAYZ,uBAAuB,CAChC,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,eAAe,EACzB,OAAO,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,aAAa,CAAC;IAgBZ,oBAAoB,CAC7B,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,YAAY,CAAC,EAAE,qBAAqB,GACrC,OAAO,CAAC,kBAAkB,CAAC;IAYjB,uBAAuB,CAChC,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,SAAS,EAAE,kBAAkB,GAC9B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAqBb,6BAA6B,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAUjE,mBAAmB,CACtB,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,OAAO,EAAE,OAAO,GACjB,aAAa;IAKT,WAAW,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,GAAG,aAAa;IAqBlF,eAAe,CAClB,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,SAAS,EAAE,UAAU,GACtB,OAAO;IAsBH,uBAAuB,CAC1B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,SAAS,EAAE,UAAU,GACtB,OAAO;IAKH,gBAAgB,CACnB,YAAY,EAAE,qBAAqB,EACnC,OAAO,EAAE,UAAU,GAAG,MAAM,GAC7B,kBAAkB;IAoBd,oBAAoB,CACvB,YAAY,EAAE,qBAAqB,EACnC,OAAO,EAAE,UAAU,GAAG,MAAM,EAC5B,SAAS,EAAE,UAAU,GACtB,OAAO;IASH,mBAAmB,IAAI,OAAO;IAIrC,OAAO,CAAC,WAAW;CAYtB;AAED,eAAO,MAAM,aAAa,mBAA0B,CAAC"}