@cheny56/node-client 1.0.11 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheny56/node-client",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "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

@@ -93,15 +93,15 @@ class PQCLegacyTransaction extends BaseTransaction {
     getSigningHash() {
         const nonceBytes = this.nonce === 0n || this.nonce === 0 
             ? new Uint8Array(0) 
-            : ethers.getBytes(ethers.toBeHex(this.nonce));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.nonce));
         const gasLimitBytes = this.gasLimit === 0n || this.gasLimit === 0
             ? new Uint8Array(0)
-            : ethers.getBytes(ethers.toBeHex(this.gasLimit));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.gasLimit));
         const chainIdBytes = this.chainId === 0n || this.chainId === 0
             ? new Uint8Array(0)
-            : ethers.getBytes(ethers.toBeHex(this.chainId));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.chainId));
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             nonceBytes,
             this.gasPrice === 0n ? new Uint8Array(0) : ethers.getBytes(ethers.toBeHex(this.gasPrice)),
             gasLimitBytes,
@@ -112,7 +112,7 @@ class PQCLegacyTransaction extends BaseTransaction {
             new Uint8Array(0),
             new Uint8Array(0),
         ]);
-        return ethers.keccak256(encoded);
+        return ethers.utils.keccak256(encoded);
     }
 
     /**
@@ -122,11 +122,9 @@ 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());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;
         // Use wallet's sign method which handles the async properly
         this.pqcSig = await wallet.sign(hash);
@@ -138,7 +136,7 @@ class PQCLegacyTransaction extends BaseTransaction {
 
     async verify() {
         if (!this.pqcSig || !this.pqcPubKey) return false;
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         // Use dilithium verify directly
         if (dilithium.verify) {
             return dilithium.verify(this.pqcPubKey, hash, this.pqcSig);
@@ -165,7 +163,7 @@ class PQCLegacyTransaction extends BaseTransaction {
         const sHex = encodeSignature(this.s || '0x0');
         const pqcTypeHex = encodeUint64(this.pqcType);
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             nonceHex,
             gasPriceHex,
             gasLimitHex,
@@ -179,11 +177,11 @@ class PQCLegacyTransaction extends BaseTransaction {
             this.pqcPubKey,
             this.pqcSig,
         ]);
-        return ethers.getBytes(encoded);
+        return ethers.utils.arrayify(encoded);
     }
 
     getHex() {
-        return ethers.hexlify(this.serialize());
+        return ethers.utils.hexlify(this.serialize());
     }
 }
 
@@ -207,15 +205,15 @@ class HybridLegacyTransaction extends BaseTransaction {
     getSigningHash() {
         const nonceBytes = this.nonce === 0n || this.nonce === 0 
             ? new Uint8Array(0) 
-            : ethers.getBytes(ethers.toBeHex(this.nonce));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.nonce));
         const gasLimitBytes = this.gasLimit === 0n || this.gasLimit === 0
             ? new Uint8Array(0)
-            : ethers.getBytes(ethers.toBeHex(this.gasLimit));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.gasLimit));
         const chainIdBytes = this.chainId === 0n || this.chainId === 0
             ? new Uint8Array(0)
-            : ethers.getBytes(ethers.toBeHex(this.chainId));
+            : ethers.utils.arrayify(ethers.utils.hexlify(this.chainId));
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             nonceBytes,
             this.gasPrice === 0n ? new Uint8Array(0) : ethers.getBytes(ethers.toBeHex(this.gasPrice)),
             gasLimitBytes,
@@ -226,7 +224,7 @@ class HybridLegacyTransaction extends BaseTransaction {
             new Uint8Array(0),
             new Uint8Array(0),
         ]);
-        return ethers.keccak256(encoded);
+        return ethers.utils.keccak256(encoded);
     }
 
     /**
@@ -237,12 +235,10 @@ 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);
+        const hashBytes = ethers.utils.arrayify(hash);
 
         // ECDSA signature
         const ecdsaSig = ecdsaWallet.wallet.signingKey.sign(hash);
@@ -260,7 +256,7 @@ class HybridLegacyTransaction extends BaseTransaction {
 
     verify() {
         if (!this.pqcSig || !this.pqcPubKey) return false;
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         if (dilithium.verify) {
             return dilithium.verify(this.pqcPubKey, hash, this.pqcSig);
         } else if (dilithium.verifyWithContext) {
@@ -286,7 +282,7 @@ class HybridLegacyTransaction extends BaseTransaction {
         const sHex = encodeSignature(this.s);
         const pqcTypeHex = encodeUint64(this.pqcType);
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             nonceHex,
             gasPriceHex,
             gasLimitHex,
@@ -300,11 +296,11 @@ class HybridLegacyTransaction extends BaseTransaction {
             this.pqcPubKey,
             this.pqcSig,
         ]);
-        return ethers.getBytes(encoded);
+        return ethers.utils.arrayify(encoded);
     }
 
     getHex() {
-        return ethers.hexlify(this.serialize());
+        return ethers.utils.hexlify(this.serialize());
     }
 }
 
@@ -359,11 +355,11 @@ class PQCAccessListTransaction extends BaseTransaction {
     }
 
     getSigningHash() {
-        const chainIdHex = this.chainId === 0n || this.chainId === 0 ? '0x' : ethers.toBeHex(this.chainId);
-        const nonceHex = this.nonce === 0n || this.nonce === 0 ? '0x' : ethers.toBeHex(this.nonce);
-        const gasPriceHex = this.gasPrice === 0n || this.gasPrice === 0 ? '0x' : ethers.toBeHex(this.gasPrice);
-        const gasHex = this.gasLimit === 0n || this.gasLimit === 0 ? '0x' : ethers.toBeHex(this.gasLimit);
-        const valueHex = this.value === 0n || this.value === 0 ? '0x' : ethers.toBeHex(this.value);
+        const chainIdHex = this.chainId === 0n || this.chainId === 0 ? '0x' : ethers.utils.hexlify(this.chainId);
+        const nonceHex = this.nonce === 0n || this.nonce === 0 ? '0x' : ethers.utils.hexlify(this.nonce);
+        const gasPriceHex = this.gasPrice === 0n || this.gasPrice === 0 ? '0x' : ethers.utils.hexlify(this.gasPrice);
+        const gasHex = this.gasLimit === 0n || this.gasLimit === 0 ? '0x' : ethers.utils.hexlify(this.gasLimit);
+        const valueHex = this.value === 0n || this.value === 0 ? '0x' : ethers.utils.hexlify(this.value);
 
         const rlpData = [
             chainIdHex,
@@ -376,24 +372,22 @@ class PQCAccessListTransaction extends BaseTransaction {
             this.accessList || [],
         ];
 
-        const encodedHex = ethers.encodeRlp(rlpData);
-        const encoded = ethers.getBytes(encodedHex);
+        const encodedHex = ethers.utils.RLP.encode(rlpData);
+        const encoded = ethers.utils.arrayify(encodedHex);
 
         const typeByte = TX_TYPE.ACCESS_LIST;
         const prefixed = new Uint8Array(1 + encoded.length);
         prefixed[0] = typeByte;
         prefixed.set(encoded, 1);
 
-        return ethers.keccak256(ethers.hexlify(prefixed));
+        return ethers.utils.keccak256(ethers.utils.hexlify(prefixed));
     }
 
     async sign(wallet) {
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;
         this.pqcSig = await wallet.sign(hash);
         return this;
@@ -401,7 +395,7 @@ class PQCAccessListTransaction extends BaseTransaction {
 
     async verify() {
         if (!this.pqcSig || !this.pqcPubKey) return false;
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         if (dilithium.verify) {
             return dilithium.verify(this.pqcPubKey, hash, this.pqcSig);
         } else if (dilithium.verifyWithContext) {
@@ -429,7 +423,7 @@ class PQCAccessListTransaction extends BaseTransaction {
         const sHex = encodeSignature(this.s || '0x0');
         const pqcTypeHex = encodeUint64(this.pqcType);
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             chainIdHex,
             nonceHex,
             gasPriceHex,
@@ -446,7 +440,7 @@ class PQCAccessListTransaction extends BaseTransaction {
             this.pqcSig,
         ]);
 
-        const encodedBytes = ethers.getBytes(encoded);
+        const encodedBytes = ethers.utils.arrayify(encoded);
         const typeByte = new Uint8Array([TX_TYPE.ACCESS_LIST]);
         const prefixed = new Uint8Array(typeByte.length + encodedBytes.length);
         prefixed.set(typeByte, 0);
@@ -456,7 +450,7 @@ class PQCAccessListTransaction extends BaseTransaction {
     }
 
     getHex() {
-        return ethers.hexlify(this.serialize());
+        return ethers.utils.hexlify(this.serialize());
     }
 }
 
@@ -516,8 +510,8 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
     getSigningHash() {
         const chainIdHex = this.chainId === 0n || this.chainId === 0 ? '0x' : ethers.toBeHex(this.chainId);
         const nonceHex = this.nonce === 0n || this.nonce === 0 ? '0x' : ethers.toBeHex(this.nonce);
-        const gasTipCapHex = this.maxPriorityFeePerGas === 0n || this.maxPriorityFeePerGas === 0 ? '0x' : ethers.toBeHex(this.maxPriorityFeePerGas);
-        const gasFeeCapHex = this.maxFeePerGas === 0n || this.maxFeePerGas === 0 ? '0x' : ethers.toBeHex(this.maxFeePerGas);
+        const gasTipCapHex = this.maxPriorityFeePerGas === 0n || this.maxPriorityFeePerGas === 0 ? '0x' : ethers.utils.hexlify(this.maxPriorityFeePerGas);
+        const gasFeeCapHex = this.maxFeePerGas === 0n || this.maxFeePerGas === 0 ? '0x' : ethers.utils.hexlify(this.maxFeePerGas);
         const gasHex = this.gasLimit === 0n || this.gasLimit === 0 ? '0x' : ethers.toBeHex(this.gasLimit);
         const valueHex = this.value === 0n || this.value === 0 ? '0x' : ethers.toBeHex(this.value);
 
@@ -533,24 +527,22 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
             this.accessList || [],
         ];
 
-        const encodedHex = ethers.encodeRlp(rlpData);
-        const encoded = ethers.getBytes(encodedHex);
+        const encodedHex = ethers.utils.RLP.encode(rlpData);
+        const encoded = ethers.utils.arrayify(encodedHex);
 
         const typeByte = TX_TYPE.DYNAMIC_FEE;
         const prefixed = new Uint8Array(1 + encoded.length);
         prefixed[0] = typeByte;
         prefixed.set(encoded, 1);
 
-        return ethers.keccak256(ethers.hexlify(prefixed));
+        return ethers.utils.keccak256(ethers.utils.hexlify(prefixed));
     }
 
     async sign(wallet) {
         // Ensure wallet is initialized
-        if (!wallet._initialized) {
-            await wallet._ensureKeyPair();
-        }
+        await wallet._initPromise;
         
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         this.pqcPubKey = wallet.publicKey;
         this.pqcSig = await wallet.sign(hash);
         return this;
@@ -558,7 +550,7 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
 
     async verify() {
         if (!this.pqcSig || !this.pqcPubKey) return false;
-        const hash = ethers.getBytes(this.getSigningHash());
+        const hash = ethers.utils.arrayify(this.getSigningHash());
         if (dilithium.verify) {
             return dilithium.verify(this.pqcPubKey, hash, this.pqcSig);
         } else if (dilithium.verifyWithContext) {
@@ -587,7 +579,7 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
         const sHex = encodeSignature(this.s || '0x0');
         const pqcTypeHex = encodeUint64(this.pqcType);
 
-        const encoded = ethers.encodeRlp([
+        const encoded = ethers.utils.RLP.encode([
             chainIdHex,
             nonceHex,
             gasTipCapHex,
@@ -605,7 +597,7 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
             this.pqcSig,
         ]);
 
-        const encodedBytes = ethers.getBytes(encoded);
+        const encodedBytes = ethers.utils.arrayify(encoded);
         const typeByte = new Uint8Array([TX_TYPE.DYNAMIC_FEE]);
         const prefixed = new Uint8Array(typeByte.length + encodedBytes.length);
         prefixed.set(typeByte, 0);
@@ -615,7 +607,7 @@ class PQCDynamicFeeTransaction extends BaseTransaction {
     }
 
     getHex() {
-        return ethers.hexlify(this.serialize());
+        return ethers.utils.hexlify(this.serialize());
     }
 }
 

package/src/utils/address.js

@@ -11,8 +11,8 @@ const { ethers } = require('ethers');
  * @returns {string} Ethereum address
  */
 function derivePQCAddress(publicKey) {
-    const hash = ethers.keccak256(publicKey);
-    return ethers.getAddress('0x' + hash.slice(-40));
+    const hash = ethers.utils.keccak256(publicKey);
+    return ethers.utils.getAddress('0x' + hash.slice(-40));
 }
 
 /**
@@ -34,8 +34,8 @@ function deriveHybridAddress(ecdsaPublicKey, dilithiumPublicKey) {
     concat.set(dilithiumPublicKey, ecdsaBytes.length);
 
     // Hash and derive address
-    const hash = ethers.keccak256(concat);
-    return ethers.getAddress('0x' + hash.slice(-40));
+    const hash = ethers.utils.keccak256(concat);
+    return ethers.utils.getAddress('0x' + hash.slice(-40));
 }
 
 /**

package/src/utils/rlp.js

@@ -14,7 +14,7 @@ function encodeUint64(value) {
         return '0x';
     }
     const bigValue = typeof value === 'bigint' ? value : BigInt(value);
-    return ethers.toBeHex(bigValue);
+    return ethers.utils.hexlify(bigValue);
 }
 
 /**
@@ -26,7 +26,7 @@ function encodeBigInt(value) {
         return '0x';
     }
     const bigValue = typeof value === 'bigint' ? value : BigInt(value);
-    return ethers.toBeHex(bigValue);
+    return ethers.utils.hexlify(bigValue);
 }
 
 /**
@@ -39,7 +39,7 @@ function encodeSignature(value) {
     }
 
     const hex = value.startsWith('0x') ? value : '0x' + value;
-    let bytes = ethers.getBytes(hex);
+    let bytes = ethers.utils.arrayify(hex);
 
     // Remove leading zeros for canonical form
     let startIdx = 0;
@@ -52,7 +52,7 @@ function encodeSignature(value) {
     }
 
     bytes = bytes.slice(startIdx);
-    return ethers.hexlify(bytes);
+    return ethers.utils.hexlify(bytes);
 }
 
 module.exports = {

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.
@@ -110,8 +132,8 @@ class PQCWallet {
         if (!secretKey || !publicKey) {
             throw new Error('Both secretKey and publicKey are required');
         }
-        const secret = secretKey instanceof Uint8Array ? secretKey : ethers.getBytes(secretKey);
-        const pub = publicKey instanceof Uint8Array ? publicKey : ethers.getBytes(publicKey);
+        const secret = secretKey instanceof Uint8Array ? secretKey : ethers.utils.arrayify(secretKey);
+        const pub = publicKey instanceof Uint8Array ? publicKey : ethers.utils.arrayify(publicKey);
         return new PQCWallet(secret, pub);
     }
 
@@ -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,10 +184,8 @@ class PQCWallet {
      * @returns {Promise<string>} Public key (hex)
      */
     async getPublicKeyHex() {
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
-        return ethers.hexlify(this.publicKey);
+        await this._initPromise;
+        return ethers.utils.hexlify(this.publicKey);
     }
 
     /**
@@ -177,10 +193,8 @@ class PQCWallet {
      * @returns {Promise<string>} Secret key (hex)
      */
     async getSecretKeyHex() {
-        if (!this._initialized) {
-            await this._ensureKeyPair();
-        }
-        return ethers.hexlify(this.secretKey);
+        await this._initPromise;
+        return ethers.utils.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.utils.arrayify(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,12 +240,10 @@ 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()),
+            ethers.utils.arrayify(this.ecdsaWallet.getPublicKey()),
             this.pqcWallet.publicKey
         );
         this._initialized = true;
@@ -232,7 +262,7 @@ class HybridWallet {
         const pqcWallet = new PQCWallet(pqcSecretKey, pqcPublicKey);
         const wallet = new HybridWallet(ecdsaWallet, pqcWallet);
         wallet.address = deriveHybridAddress(
-            ethers.getBytes(ecdsaWallet.getPublicKey()),
+            ethers.utils.arrayify(ecdsaWallet.getPublicKey()),
             pqcWallet.publicKey
         );
         wallet._initialized = true;

package/src/zk-transaction.js

@@ -51,27 +51,27 @@ class ZKTransaction {
         };
 
         if (this.to) args.to = this.to;
-        if (this.value) args.value = ethers.toBeHex(this.value);
-        if (this.gasLimit) args.gas = ethers.toBeHex(this.gasLimit);
-        if (this.gasPrice) args.gasPrice = ethers.toBeHex(this.gasPrice);
+        if (this.value) args.value = ethers.utils.hexlify(this.value);
+        if (this.gasLimit) args.gas = ethers.utils.hexlify(this.gasLimit);
+        if (this.gasPrice) args.gasPrice = ethers.utils.hexlify(this.gasPrice);
         if (this.data) args.data = this.data;
-        if (this.nonce) args.nonce = ethers.toBeHex(this.nonce);
-        if (this.chainId) args.chainId = ethers.toBeHex(this.chainId);
+        if (this.nonce) args.nonce = ethers.utils.hexlify(this.nonce);
+        if (this.chainId) args.chainId = ethers.utils.hexlify(this.chainId);
         if (this.accessList && this.accessList.length > 0) args.accessList = this.accessList;
         if (this.zkPublicInputs && this.zkPublicInputs.length > 0) {
             args.zkPublicInputs = this.zkPublicInputs.map(pi => 
-                typeof pi === 'string' ? pi : ethers.hexlify(pi)
+                typeof pi === 'string' ? pi : ethers.utils.hexlify(pi)
             );
         }
         if (this.zkVerificationKeyHash) {
             args.zkVerificationKeyHash = typeof this.zkVerificationKeyHash === 'string' 
                 ? this.zkVerificationKeyHash 
-                : ethers.hexlify(this.zkVerificationKeyHash);
+                : ethers.utils.hexlify(this.zkVerificationKeyHash);
         }
         if (this.encryptedPayload) {
             args.encryptedPayload = typeof this.encryptedPayload === 'string'
                 ? this.encryptedPayload
-                : ethers.hexlify(this.encryptedPayload);
+                : ethers.utils.hexlify(this.encryptedPayload);
         }
         if (this.recipients && this.recipients.length > 0) {
             args.recipients = this.recipients;