gun-eth 1.4.29 → 1.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gun-eth",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "description": "A GunDB plugin for Ethereum, and Web3",
   "main": "dist/gun-eth.cjs.js",
   "module": "dist/gun-eth.mjs",
@@ -16,7 +16,7 @@
         "import": "./dist/gun-eth.esm.js",
         "require": "./dist/gun-eth.min.js"
       },
-      "default": "./dist/gun-eth.mjs"
+      "default": "./dist/gun-eth.cjs.js"
     }
   },
   "type": "module",
@@ -58,7 +58,7 @@
     "@types/mocha": "^10.0.1",
     "chai": "^4.2.0",
     "cross-env": "^7.0.3",
-    "ethers": "^6.7.1",
+    "ethers": "^6.13.4",
     "gun": "^0.2020.1239",
     "hardhat": "^2.17.0",
     "hardhat-gas-reporter": "^1.0.8",

package/src/index.js

@@ -3,20 +3,7 @@
 // =============================================
 import Gun from "gun";
 import SEA from "gun/sea.js";
-import { 
-  ethers,
-  JsonRpcProvider,
-  BrowserProvider,
-  Contract,
-  Wallet,
-  getBytes,
-  concat,
-  toUtf8Bytes,
-  keccak256,
-  verifyMessage,
-  randomBytes,
-  hexlify
-} from "ethers/lib/ethers.js";
+import { ethers } from "ethers";
 import { 
   PROOF_OF_INTEGRITY_ABI, 
   STEALTH_ANNOUNCER_ABI, 
@@ -25,6 +12,19 @@ import {
   CHAIN_CONFIG
 } from "./abis/abis.js";
 import { LOCAL_CONFIG } from "./config/local.js";
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+import { readFileSync } from 'fs';
+import { 
+  JsonRpcProvider, 
+  BrowserProvider, 
+  Wallet,
+  Contract,
+  concat,
+  keccak256,
+  verifyMessage,
+  getBytes
+} from 'ethers';
 
 let PROOF_CONTRACT_ADDRESS;
 let rpcUrl = "";
@@ -39,20 +39,19 @@ let contractAddresses = {
 
 // Solo per Node.js
 if (typeof window === 'undefined') {
-  const { fileURLToPath } = require('url');
-  const { dirname } = require('path');
-  const { readFileSync } = require('fs');
-  const path = require('path');
-  
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-
   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');
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = dirname(__filename);
+
+    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');
+    }
+  } catch (error) {
+    console.error('Error loading Node.js modules:', error);
   }
 }
 
@@ -64,8 +63,8 @@ if (typeof window === 'undefined') {
  * @returns {string} A random hexadecimal string
  */
 export function generateRandomId() {
-  const bytes = randomBytes(32);
-  return hexlify(bytes).slice(2);
+  const randomBytes = ethers.randomBytes(32);
+  return ethers.hexlify(randomBytes).slice(2);
 }
 
 /**
@@ -75,8 +74,8 @@ export function generateRandomId() {
  */
 export function generatePassword(signature) {
   try {
-    const signatureBytes = getBytes(signature);
-    const hash = keccak256(signatureBytes);
+    const signatureBytes = ethers.getBytes(signature);
+    const hash = ethers.keccak256(signatureBytes);
     console.log("Generated password:", hash);
     return hash;
   } catch (error) {
@@ -124,7 +123,7 @@ export function gunToEthAccount(gunPrivateKey) {
  */
 export const getSigner = async () => {
   if (rpcUrl && privateKey) {
-    const provider = new JsonRpcProvider(rpcUrl, {
+    const provider = new ethers.JsonRpcProvider(rpcUrl, {
       chainId: LOCAL_CONFIG.CHAIN_ID,
       name: "localhost"
     });