@cheny56/node-client 1.0.11 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheny56/node-client",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Client library for Quorum blockchain with Post-Quantum Cryptography (PQC) and Zero-Knowledge Proof (ZK) support",
   "main": "./src/index.js",
   "types": "src/index.d.ts",

package/src/contract.js

@@ -161,9 +161,7 @@ class ERC20Token extends Contract {
     async transferPQC(wallet, provider, to, amount, txOptions = {}) {
         const data = this.encodeFunctionData('transfer', [to, amount]);
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         const nonce = await provider.getTransactionCount(wallet.address, 'pending');
         
         const tx = new PQCLegacyTransaction({

package/src/transaction.js

@@ -122,9 +122,7 @@ class PQCLegacyTransaction extends BaseTransaction {
      */
     async sign(wallet) {
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         
         const hash = ethers.getBytes(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;
@@ -237,9 +235,7 @@ class HybridLegacyTransaction extends BaseTransaction {
      */
     async sign(ecdsaWallet, pqcWallet) {
         // Ensure PQC wallet is initialized
-        if (!pqcWallet._initialized) {
-            await pqcWallet._ensureKeyPair();
-        }
+        await pqcWallet._initPromise;
         
         const hash = this.getSigningHash();
         const hashBytes = ethers.getBytes(hash);
@@ -389,9 +385,7 @@ class PQCAccessListTransaction extends BaseTransaction {
 
     async sign(wallet) {
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         
         const hash = ethers.getBytes(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;
@@ -546,9 +540,7 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
 
     async sign(wallet) {
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         
         const hash = ethers.getBytes(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;

package/src/wallet.js

@@ -68,6 +68,7 @@ class PQCWallet {
             this.publicKey = publicKey instanceof Uint8Array ? publicKey : new Uint8Array(publicKey);
             this.address = derivePQCAddress(this.publicKey);
             this._initialized = true;
+            this._initPromise = Promise.resolve();
         } else {
             // Generate new key pair using dilithium-crystals
             // dilithium-crystals uses keyPair() which is async and returns { publicKey, secretKey }
@@ -75,9 +76,21 @@ class PQCWallet {
             this.publicKey = null;
             this.address = null;
             this._initialized = false;
+            // Start initialization immediately
+            this._initPromise = this._ensureKeyPair();
         }
     }
 
+    /**
+     * Create a new PQC wallet with initialized keys (static factory method)
+     * @returns {Promise<PQCWallet>} Initialized wallet
+     */
+    static async create() {
+        const wallet = new PQCWallet();
+        await wallet._initPromise;
+        return wallet;
+    }
+
     /**
      * Initialize key pair if not already done (async)
      * @private
@@ -98,6 +111,15 @@ class PQCWallet {
         this._initialized = true;
     }
 
+    /**
+     * Get address (will initialize keys if needed)
+     * @returns {Promise<string>} Wallet address
+     */
+    async getAddress() {
+        await this._initPromise;
+        return this.address;
+    }
+
     /**
      * Create wallet from secret key
      * Note: In practice, you would derive the public key from the secret key.
@@ -122,9 +144,7 @@ class PQCWallet {
      */
     async sign(hash) {
         // Ensure key pair is initialized
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
+        await this._initPromise;
         
         // dilithium-crystals API: sign(secretKey, message)
         // Some implementations may require context, but we'll try without first
@@ -146,9 +166,7 @@ class PQCWallet {
      */
     async verify(hash, signature) {
         // Ensure key pair is initialized
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
+        await this._initPromise;
         
         // dilithium-crystals API: verify(publicKey, message, signature)
         if (dilithium.verify) {
@@ -166,9 +184,7 @@ class PQCWallet {
      * @returns {Promise<string>} Public key (hex)
      */
     async getPublicKeyHex() {
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
+        await this._initPromise;
         return ethers.hexlify(this.publicKey);
     }
 
@@ -177,9 +193,7 @@ class PQCWallet {
      * @returns {Promise<string>} Secret key (hex)
      */
     async getSecretKeyHex() {
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
+        await this._initPromise;
         return ethers.hexlify(this.secretKey);
     }
 }
@@ -198,6 +212,24 @@ class HybridWallet {
         this._initialized = false;
     }
 
+    /**
+     * Create a new Hybrid wallet with initialized keys (static factory method)
+     * @param {ECDSAWallet|string} ecdsaWallet - ECDSA wallet or private key
+     * @returns {Promise<HybridWallet>} Initialized hybrid wallet
+     */
+    static async create(ecdsaWallet) {
+        const ecdsa = ecdsaWallet instanceof ECDSAWallet ? ecdsaWallet : new ECDSAWallet(ecdsaWallet);
+        const pqc = new PQCWallet();
+        await pqc._initPromise; // Wait for PQC keys to be generated
+        const wallet = new HybridWallet(ecdsa, pqc);
+        wallet.address = deriveHybridAddress(
+            ethers.getBytes(ecdsa.getPublicKey()),
+            pqc.publicKey
+        );
+        wallet._initialized = true;
+        return wallet;
+    }
+
     /**
      * Get the hybrid address (computed from ECDSA + PQC public keys)
      * @returns {Promise<string>} Hybrid address
@@ -208,9 +240,7 @@ class HybridWallet {
         }
         
         // Ensure PQC wallet has keys
-        if (!this.pqcWallet._initialized) {
-            await this.pqcWallet._ensureKeyPair();
-        }
+        await this.pqcWallet._initPromise;
         
         this.address = deriveHybridAddress(
             ethers.getBytes(this.ecdsaWallet.getPublicKey()),