gun-eth 1.4.31 → 1.4.33

package/dist/gun-eth.mjs

@@ -1,10 +1,7 @@
 import Gun from 'gun';
-export { default } from 'gun';
-import SEA from 'gun/sea.js';
-import { verifyMessage, Contract, keccak256, ethers, Wallet, BrowserProvider, getBytes, concat } from 'ethers';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
-import { readFileSync } from 'fs';
+export { default as Gun, default } from 'gun';
+import { ethers } from 'ethers';
+import 'gun/sea.js';
 
 let contractAddresses$1 = {
   PROOF_OF_INTEGRITY_ADDRESS: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
@@ -430,37 +427,48 @@ const PROOF_OF_INTEGRITY_ABI = [
   }
 ];
 
-// =============================================
-// IMPORTS AND GLOBAL VARIABLES
-// =============================================
+const SEA = Gun.SEA; 
 
 let PROOF_CONTRACT_ADDRESS;
-let rpcUrl = "";
-let privateKey = "";
-
-const MESSAGE_TO_SIGN = "Access GunDB with Ethereum";
-
 let contractAddresses = {
-  PROOF_OF_INTEGRITY_ADDRESS: CHAIN_CONFIG.optimismSepolia.PROOF_OF_INTEGRITY_ADDRESS,
-  STEALTH_ANNOUNCER_ADDRESS: CHAIN_CONFIG.optimismSepolia.STEALTH_ANNOUNCER_ADDRESS
+  PROOF_OF_INTEGRITY_ADDRESS:
+    CHAIN_CONFIG.optimismSepolia.PROOF_OF_INTEGRITY_ADDRESS,
+  STEALTH_ANNOUNCER_ADDRESS:
+    CHAIN_CONFIG.optimismSepolia.STEALTH_ANNOUNCER_ADDRESS,
 };
 
-// Solo per Node.js
-if (typeof window === 'undefined') {
-  try {
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = dirname(__filename);
-
+// Funzione di inizializzazione per Node.js
+const initNodeEnvironment = async () => {
+  if (typeof window === "undefined") {
     try {
-      const rawdata = readFileSync(path.join(__dirname, 'contract-address.json'), 'utf8');
-      contractAddresses = JSON.parse(rawdata);
-      console.log('Loaded contract addresses:', contractAddresses);
-    } catch (err) {
-      console.warn('Warning: contract-address.json not found or invalid');
+      // Importazioni dinamiche
+      const { fileURLToPath } = await import('url');
+      const { dirname } = await import('path');
+      const { readFile } = await import('fs/promises');
+      const { join } = await import('path');
+
+      const __filename = fileURLToPath(import.meta.url);
+      const __dirname = dirname(__filename);
+
+      try {
+        const rawdata = await readFile(
+          join(__dirname, "contract-address.json"),
+          "utf8"
+        );
+        contractAddresses = JSON.parse(rawdata);
+        console.log("Loaded contract addresses:", contractAddresses);
+      } catch (err) {
+        console.warn("Warning: contract-address.json not found or invalid");
+      }
+    } catch (error) {
+      console.error("Error loading Node.js modules:", error);
     }
-  } catch (error) {
-    console.error('Error loading Node.js modules:', error);
   }
+};
+
+// Inizializza solo in ambiente Node.js
+if (typeof window === "undefined") {
+  initNodeEnvironment();
 }
 
 // =============================================
@@ -482,7 +490,7 @@ function generateRandomId() {
  */
 function generatePassword(signature) {
   try {
-    const signatureBytes = ethers.getBytes(signature);
+    const signatureBytes = ethers.toUtf8Bytes(signature);
     const hash = ethers.keccak256(signatureBytes);
     console.log("Generated password:", hash);
     return hash;
@@ -533,7 +541,7 @@ const getSigner = async () => {
   if (rpcUrl && privateKey) {
     const provider = new ethers.JsonRpcProvider(rpcUrl, {
       chainId: LOCAL_CONFIG.CHAIN_ID,
-      name: "localhost"
+      name: "localhost",
     });
     return new Wallet(privateKey, provider);
   } else if (
@@ -541,7 +549,7 @@ const getSigner = async () => {
     typeof window.ethereum !== "undefined"
   ) {
     await window.ethereum.request({ method: "eth_requestAccounts" });
-    const provider = new BrowserProvider(window.ethereum);
+    const provider = new ethers.BrowserProvider(window.ethereum);
     return provider.getSigner();
   } else {
     throw new Error("No valid Ethereum provider found");
@@ -556,29 +564,26 @@ const getSigner = async () => {
  */
 function deriveStealthAddress(sharedSecret, spendingPublicKey) {
   try {
-    const sharedSecretBytes = getBytes(sharedSecret);
-    const spendingPublicKeyBytes = getBytes(spendingPublicKey);
-    
-    const stealthPrivateKey = keccak256(
-      concat([
-        sharedSecretBytes,
-        spendingPublicKeyBytes
-      ])
+    const sharedSecretBytes = ethers.toUtf8Bytes(sharedSecret);
+    const spendingPublicKeyBytes = ethers.toUtf8Bytes(spendingPublicKey);
+
+    const stealthPrivateKey = ethers.keccak256(
+      ethers.concat([sharedSecretBytes, spendingPublicKeyBytes])
     );
-    
+
     const stealthWallet = new Wallet(stealthPrivateKey);
 
     console.log("Debug deriveStealthAddress:", {
       sharedSecretHex: stealthPrivateKey,
       spendingPublicKey,
       stealthPrivateKey,
-      stealthAddress: stealthWallet.address
+      stealthAddress: stealthWallet.address,
     });
 
     return {
       stealthPrivateKey,
       stealthAddress: stealthWallet.address,
-      wallet: stealthWallet
+      wallet: stealthWallet,
     };
   } catch (error) {
     console.error("Error in deriveStealthAddress:", error);
@@ -616,7 +621,7 @@ Gun.chain.getSigner = getSigner();
  */
 Gun.chain.verifySignature = async function (message, signature) {
   try {
-    const recoveredAddress = verifyMessage(message, signature);
+    const recoveredAddress = ethers.verifyMessage(message, signature);
     return recoveredAddress;
   } catch (error) {
     console.error("Error verifying signature:", error);
@@ -680,17 +685,21 @@ Gun.chain.createAndStoreEncryptedPair = async function (address, signature) {
     const viewingAccount = gunToEthAccount(v_pair.priv);
     const spendingAccount = gunToEthAccount(s_pair.priv);
 
-    gun.get("gun-eth").get("users").get(address).put({
-      pair: encryptedPair,
-      v_pair: encryptedV_pair,
-      s_pair: encryptedS_pair,
-      publicKeys: {
-        viewingPublicKey: v_pair.epub, // Use SEA encryption public key
-        viewingPublicKey: v_pair.epub, // Use SEA encryption public key
-        spendingPublicKey: spendingAccount.publicKey, // Use Ethereum address
-        ethViewingAddress: viewingAccount.publicKey // Also save Ethereum address
-      }
-    });
+    gun
+      .get("gun-eth")
+      .get("users")
+      .get(address)
+      .put({
+        pair: encryptedPair,
+        v_pair: encryptedV_pair,
+        s_pair: encryptedS_pair,
+        publicKeys: {
+          viewingPublicKey: v_pair.epub, // Use SEA encryption public key
+          viewingPublicKey: v_pair.epub, // Use SEA encryption public key
+          spendingPublicKey: spendingAccount.publicKey, // Use Ethereum address
+          ethViewingAddress: viewingAccount.publicKey, // Also save Ethereum address
+        },
+      });
 
     console.log("Encrypted pairs and public keys stored for:", address);
   } catch (error) {
@@ -748,13 +757,13 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
 
   try {
     // Se siamo in localhost e in development, usa automaticamente la chain locale
-    const targetChain = isLocalEnvironment() ? 'localhost' : chain;
+    const targetChain = isLocalEnvironment() ? "localhost" : chain;
     const chainConfig = getAddressesForChain(targetChain);
-    
+
     console.log(`Using ${targetChain} configuration:`, chainConfig);
 
     // Usa gli indirizzi dalla configurazione
-    const contract = new Contract(
+    const contract = new ethers.Contract(
       chainConfig.PROOF_OF_INTEGRITY_ADDRESS,
       PROOF_OF_INTEGRITY_ABI,
       signer
@@ -770,7 +779,7 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
         signer
       );
       const [isValid, timestamp, updater] = await contract.verifyData(
-        toUtf8Bytes(nodeId),
+        ethers.toUtf8Bytes(nodeId),
         contentHash
       );
       console.log("Verification result:", { isValid, timestamp, updater });
@@ -786,10 +795,7 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
         PROOF_OF_INTEGRITY_ABI,
         signer
       );
-      const tx = await contract.updateData(
-        toUtf8Bytes(nodeId),
-        contentHash
-      );
+      const tx = await contract.updateData(toUtf8Bytes(nodeId), contentHash);
       console.log("Transaction sent:", tx.hash);
       const receipt = await tx.wait();
       console.log("Transaction confirmed:", receipt);
@@ -816,7 +822,6 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
       return { contentHash, timestamp, updater };
     };
 
-    
     if (nodeId && !data) {
       // Case 1: User passes only node
       gun.get(nodeId).once(async (existingData) => {
@@ -832,7 +837,8 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
         console.log("contentHash", contentHash);
 
         if (!contentHash) {
-          if (callback) callback({ err: "No content hash found for this node" });
+          if (callback)
+            callback({ err: "No content hash found for this node" });
           return;
         }
 
@@ -868,7 +874,7 @@ Gun.chain.proof = function (chain, nodeId, data, callback) {
       // Case 2: User passes only text (data)
       const newNodeId = generateRandomId();
       const dataString = JSON.stringify(data);
-      const contentHash = keccak256(toUtf8Bytes(dataString));
+      const contentHash = ethers.keccak256(ethers.toUtf8Bytes(dataString));
 
       gun
         .get(newNodeId)
@@ -924,10 +930,13 @@ Gun.chain.gunToEthAccount = function (gunPrivateKey) {
  * @param {string} signature - The sender's signature to access their keys
  * @returns {Promise<Object>} Object containing stealth addresses and keys
  */
-Gun.chain.generateStealthAddress = async function (recipientAddress, signature) {
+Gun.chain.generateStealthAddress = async function (
+  recipientAddress,
+  signature
+) {
   try {
     const gun = this;
-    
+
     // Get recipient's public keys
     const recipientData = await gun
       .get("gun-eth")
@@ -936,14 +945,21 @@ Gun.chain.generateStealthAddress = async function (recipientAddress, signature)
       .get("publicKeys")
       .then();
 
-    if (!recipientData || !recipientData.viewingPublicKey || !recipientData.spendingPublicKey) {
+    if (
+      !recipientData ||
+      !recipientData.viewingPublicKey ||
+      !recipientData.spendingPublicKey
+    ) {
       throw new Error("Recipient's public keys not found");
     }
 
     // Get sender's keys
-    const senderAddress = await this.verifySignature(MESSAGE_TO_SIGN, signature);
+    const senderAddress = await this.verifySignature(
+      MESSAGE_TO_SIGN,
+      signature
+    );
     const password = generatePassword(signature);
-    
+
     const senderData = await gun
       .get("gun-eth")
       .get("users")
@@ -958,16 +974,20 @@ Gun.chain.generateStealthAddress = async function (recipientAddress, signature)
     let spendingKeyPair;
     try {
       const decryptedData = await SEA.decrypt(senderData.s_pair, password);
-      spendingKeyPair = typeof decryptedData === 'string' ? 
-        JSON.parse(decryptedData) : 
-        decryptedData;
+      spendingKeyPair =
+        typeof decryptedData === "string"
+          ? JSON.parse(decryptedData)
+          : decryptedData;
     } catch (error) {
       console.error("Error decrypting spending pair:", error);
       throw new Error("Unable to decrypt spending pair");
     }
 
     // Generate shared secret using SEA ECDH with encryption public key
-    const sharedSecret = await SEA.secret(recipientData.viewingPublicKey, spendingKeyPair);
+    const sharedSecret = await SEA.secret(
+      recipientData.viewingPublicKey,
+      spendingKeyPair
+    );
 
     if (!sharedSecret) {
       throw new Error("Unable to generate shared secret");
@@ -983,9 +1003,8 @@ Gun.chain.generateStealthAddress = async function (recipientAddress, signature)
     return {
       stealthAddress,
       senderPublicKey: spendingKeyPair.epub, // Use encryption public key
-      spendingPublicKey: recipientData.spendingPublicKey
+      spendingPublicKey: recipientData.spendingPublicKey,
     };
-
   } catch (error) {
     console.error("Error generating stealth address:", error);
     throw error;
@@ -1073,10 +1092,14 @@ Gun.chain.recoverStealthFunds = async function (
     // Decrypt viewing and spending pairs
     let viewingKeyPair;
     try {
-      const decryptedViewingData = await SEA.decrypt(encryptedData.v_pair, password);
-      viewingKeyPair = typeof decryptedViewingData === 'string' ? 
-        JSON.parse(decryptedViewingData) : 
-        decryptedViewingData;
+      const decryptedViewingData = await SEA.decrypt(
+        encryptedData.v_pair,
+        password
+      );
+      viewingKeyPair =
+        typeof decryptedViewingData === "string"
+          ? JSON.parse(decryptedViewingData)
+          : decryptedViewingData;
     } catch (error) {
       console.error("Error decrypting keys:", error);
       throw new Error("Unable to decrypt keys");
@@ -1101,7 +1124,7 @@ Gun.chain.recoverStealthFunds = async function (
       console.error("Mismatch:", {
         recovered: recoveredAddress,
         expected: stealthAddress,
-        sharedSecret
+        sharedSecret,
       });
       throw new Error("Recovered stealth address does not match");
     }
@@ -1129,11 +1152,14 @@ Gun.chain.announceStealthPayment = async function (
   senderPublicKey,
   spendingPublicKey,
   signature,
-  options = { onChain: false, chain: 'optimismSepolia' }
+  options = { onChain: false, chain: "optimismSepolia" }
 ) {
   try {
     const gun = this;
-    const senderAddress = await this.verifySignature(MESSAGE_TO_SIGN, signature);
+    const senderAddress = await this.verifySignature(
+      MESSAGE_TO_SIGN,
+      signature
+    );
 
     if (options.onChain) {
       // On-chain announcement
@@ -1160,24 +1186,21 @@ Gun.chain.announceStealthPayment = async function (
         stealthAddress,
         { value: devFee }
       );
-      
+
       console.log("Transaction sent:", tx.hash);
       const receipt = await tx.wait();
       console.log("Transaction confirmed:", receipt.hash);
-      
+
       console.log("Stealth payment announced on-chain (dev fee paid)");
     } else {
       // Off-chain announcement (GunDB)
-      gun
-        .get("gun-eth")
-        .get("stealth-payments")
-        .set({
-          stealthAddress,
-          senderAddress,
-          senderPublicKey,
-          spendingPublicKey,
-          timestamp: Date.now(),
-        });
+      gun.get("gun-eth").get("stealth-payments").set({
+        stealthAddress,
+        senderAddress,
+        senderPublicKey,
+        spendingPublicKey,
+        timestamp: Date.now(),
+      });
       console.log("Stealth payment announced off-chain");
     }
   } catch (error) {
@@ -1192,13 +1215,18 @@ Gun.chain.announceStealthPayment = async function (
  * @param {string} signature - The signature to authenticate the user
  * @returns {Promise<Array>} List of stealth payments
  */
-Gun.chain.getStealthPayments = async function (signature, options = { source: 'both' }) {
+Gun.chain.getStealthPayments = async function (
+  signature,
+  options = { source: "both" }
+) {
   try {
     const payments = [];
 
-    if (options.source === 'onChain' || options.source === 'both') {
+    if (options.source === "onChain" || options.source === "both") {
       const signer = await getSigner();
-      const chainConfig = getAddressesForChain(options.chain || 'optimismSepolia');
+      const chainConfig = getAddressesForChain(
+        options.chain || "optimismSepolia"
+      );
       const contractAddress = chainConfig.STEALTH_ANNOUNCER_ADDRESS;
 
       const contract = new Contract(
@@ -1206,28 +1234,32 @@ Gun.chain.getStealthPayments = async function (signature, options = { source: 'b
         STEALTH_ANNOUNCER_ABI,
         signer
       );
-      
+
       try {
         // Get total number of announcements
         const totalAnnouncements = await contract.getAnnouncementsCount();
         const totalCount = Number(totalAnnouncements.toString());
         console.log("Total on-chain announcements:", totalCount);
-        
+
         if (totalCount > 0) {
           // Get announcements in batches of 100
           const batchSize = 100;
           const lastIndex = totalCount - 1;
-          
-          for(let i = 0; i <= lastIndex; i += batchSize) {
+
+          for (let i = 0; i <= lastIndex; i += batchSize) {
             const toIndex = Math.min(i + batchSize - 1, lastIndex);
             const batch = await contract.getAnnouncementsInRange(i, toIndex);
-            
+
             // For each announcement, try to decrypt
-            for(const announcement of batch) {
+            for (const announcement of batch) {
               try {
                 // Verify announcement is valid
-                if (!announcement || !announcement.stealthAddress || 
-                    !announcement.senderPublicKey || !announcement.spendingPublicKey) {
+                if (
+                  !announcement ||
+                  !announcement.stealthAddress ||
+                  !announcement.senderPublicKey ||
+                  !announcement.spendingPublicKey
+                ) {
                   console.log("Invalid announcement:", announcement);
                   continue;
                 }
@@ -1239,20 +1271,21 @@ Gun.chain.getStealthPayments = async function (signature, options = { source: 'b
                   signature,
                   announcement.spendingPublicKey
                 );
-                
+
                 // If no errors thrown, announcement is for us
                 payments.push({
                   stealthAddress: announcement.stealthAddress,
                   senderPublicKey: announcement.senderPublicKey,
                   spendingPublicKey: announcement.spendingPublicKey,
                   timestamp: Number(announcement.timestamp),
-                  source: 'onChain',
-                  wallet: recoveredWallet
+                  source: "onChain",
+                  wallet: recoveredWallet,
                 });
-
               } catch (e) {
                 // Not for us, continue
-                console.log(`Announcement not for us: ${announcement.stealthAddress}`);
+                console.log(
+                  `Announcement not for us: ${announcement.stealthAddress}`
+                );
                 continue;
               }
             }
@@ -1263,7 +1296,7 @@ Gun.chain.getStealthPayments = async function (signature, options = { source: 'b
       }
     }
 
-    if (options.source === 'offChain' || options.source === 'both') {
+    if (options.source === "offChain" || options.source === "both") {
       // Get off-chain payments
       const gun = this;
       const offChainPayments = await new Promise((resolve) => {
@@ -1275,12 +1308,12 @@ Gun.chain.getStealthPayments = async function (signature, options = { source: 'b
           .map()
           .once((payment, id) => {
             if (payment?.stealthAddress) {
-              p.push({ ...payment, id, source: 'offChain' });
+              p.push({ ...payment, id, source: "offChain" });
             }
           });
         setTimeout(() => resolve(p), 2000);
       });
-      
+
       payments.push(...offChainPayments);
     }
 
@@ -1297,7 +1330,7 @@ Gun.chain.getStealthPayments = async function (signature, options = { source: 'b
  * @param {string} recipientAddress - The recipient's address
  * @returns {Promise<void>}
  */
-Gun.chain.cleanStealthPayments = async function(recipientAddress) {
+Gun.chain.cleanStealthPayments = async function (recipientAddress) {
   try {
     const gun = this;
     const payments = await gun
@@ -1312,7 +1345,12 @@ Gun.chain.cleanStealthPayments = async function(recipientAddress) {
     if (payments) {
       Object.keys(payments).forEach(async (key) => {
         const payment = payments[key];
-        if (!payment || !payment.stealthAddress || !payment.senderPublicKey || !payment.spendingPublicKey) {
+        if (
+          !payment ||
+          !payment.stealthAddress ||
+          !payment.senderPublicKey ||
+          !payment.spendingPublicKey
+        ) {
           await gun
             .get("gun-eth")
             .get("stealth-payments")
@@ -1339,7 +1377,7 @@ class GunEth {
   static gunToEthAccount = gunToEthAccount;
   static getSigner = getSigner;
   static deriveStealthAddress = deriveStealthAddress;
-  
+
   // Chain methods
   static chainMethods = {
     setSigner: Gun.chain.setSigner,
@@ -1356,7 +1394,7 @@ class GunEth {
     recoverStealthFunds: Gun.chain.recoverStealthFunds,
     announceStealthPayment: Gun.chain.announceStealthPayment,
     getStealthPayments: Gun.chain.getStealthPayments,
-    cleanStealthPayments: Gun.chain.cleanStealthPayments
+    cleanStealthPayments: Gun.chain.cleanStealthPayments,
   };
 
   // Constants
@@ -1365,5 +1403,4 @@ class GunEth {
   static LOCAL_CONFIG = LOCAL_CONFIG;
 }
 
-export { GunEth, MESSAGE_TO_SIGN, deriveStealthAddress, generatePassword, generateRandomId, getSigner, gunToEthAccount };
-//# sourceMappingURL=gun-eth.mjs.map
+export { GunEth, deriveStealthAddress, generatePassword, generateRandomId, getSigner, gunToEthAccount, initNodeEnvironment };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "gun-eth",
-  "version": "1.4.31",
+  "version": "1.4.33",
   "description": "A GunDB plugin for Ethereum, and Web3",
   "main": "dist/gun-eth.cjs.js",
   "module": "dist/gun-eth.mjs",
-  "browser": "dist/gun-eth.min.js",
+  "browser": "dist/browser/gun-eth.min.js",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
@@ -13,13 +14,12 @@
         "require": "./dist/gun-eth.cjs.js"
       },
       "browser": {
-        "import": "./dist/gun-eth.esm.js",
-        "require": "./dist/gun-eth.min.js"
+        "import": "./dist/browser/gun-eth.min.js",
+        "require": "./dist/browser/gun-eth.min.js"
       },
-      "default": "./dist/gun-eth.cjs.js"
+      "default": "./dist/gun-eth.mjs"
     }
   },
-  "type": "module",
   "typesVersions": {
     "*": {
       "*": [
@@ -40,7 +40,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "express": "^4.21.1"
+    "express": "^4.21.1",
+    "rollup-plugin-polyfill-node": "^0.13.0"
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
@@ -59,7 +60,7 @@
     "chai": "^4.2.0",
     "cross-env": "^7.0.3",
     "ethers": "^6.13.4",
-    "gun": "^0.2020.1239",
+    "gun": "^0.2020.1240",
     "hardhat": "^2.17.0",
     "hardhat-gas-reporter": "^1.0.8",
     "rollup": "^3.0.0",