Merge pull request #20 from ETHCF/eip7594

Eip7594

Author: holgerd77

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18, 20]
+        node-version: [20]
     steps:
       - uses: actions/checkout@v4
         with:

README.md

@@ -2,7 +2,7 @@
 
 This module implements a JS wrapper around a WASM compilation of the [`c-kzg-4844`](https://github.com/ethereum/c-kzg-4844) C library built for use with EIP-4844.
 
-This library is produced by building the original C code to WASM using the [`empscripten`](https://empscripten.org) toolchain in [this fork and branch](https://github.com/acolytec3/c-kzg-4844/tree/wasm) of `c-kzg-4844`.
+This library is produced by building the original C code to WASM using the [`empscripten`](https://empscripten.org) toolchain in [this fork](https://github.com/ETHCF/c-kzg-4844) of `c-kzg-4844`.
 
 ## Usage
 

browser/kzg.js

@@ -1,14 +1,14 @@
 {
   "name": "kzg-wasm",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "description": "a WASM compilation of c-kzg-4844",
   "scripts": {
-    "build": "npm run build:ts && npm run transpileCJS && npm run fixRequire",
+    "build": "npm run build:ts && npm run transpileCJS && npm run fixRequire ",
     "build:ts": "scripts/ts-build.sh",
     "transpileCJS": "rm dist/cjs/kzg.js && babel src/kzg.js -d dist/cjs",
     "fixRequire": "sed -i.bak \"s/\\_require('url')/require('url')/g\" dist/cjs/kzg.js && rm dist/cjs/kzg.js.bak",
-    "fixWasmDirInNode": "sed -i.bak 's#kzg.wasm#../wasm/kzg.wasm#g' src/kzg.js && rm src/kzg.js.bak",
-    "fixWasmDirInWeb": "sed -i.bak 's#kzg.wasm#../wasm/kzg.wasm#g' browser/kzg.js && rm browser/kzg.js.bak",
+    "fixWasmDirInNode": "sed -i.bak 's#kzg-node.wasm#kzg.wasm#g' src/kzg.js && rm src/kzg.js.bak && sed -i.bak 's#kzg.wasm#../wasm/kzg.wasm#g' src/kzg.js && rm src/kzg.js.bak",
+    "fixWasmDirInWeb": "sed -i.bak 's#kzg-web.wasm#../wasm/kzg.wasm#g' browser/kzg.js && rm browser/kzg.js.bak",
     "clean": "rm -rf dist && rm -rf node_modules",
     "test": "vitest run test/*",
     "test:browser": "npx vitest run -c vitest.config.browser.ts test/*",
@@ -25,21 +25,21 @@
       },
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
-    }    
+    }
   },
   "license": "MIT",
   "devDependencies": {
     "@babel/cli": "^7.23.9",
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
-    "@vitest/browser": "^1.3.1",
-    "@vitest/utils": "^1.3.1",
+    "@vitest/browser": "^3.2.4",
+    "@vitest/utils": "^3.2.4",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "prettier": "^3.2.5",
     "tsx": "^4.7.1",
     "typescript": "^5.3.3",
     "vite-plugin-wasm": "^3.3.0",
-    "vitest": "^1.3.1",
-    "webdriverio": "^8.32.3"
+    "vitest": "^3.2.4",
+    "webdriverio": "^9.20.0"
   }
 }

package-lock.json

@@ -78,10 +78,26 @@ build_esm() {
     "type": "module"
 }
 EOT
+        sed -i.bak 's#./loader.cjs#./loader.mjs#g' src/index.ts
+        
         echo "> tsc --build ./tsconfig.esm.json"
         printf "${BLUE}[ESM build] Working... "
 
         npx tsc --build ./tsconfig.esm.json
+        sed -i.bak 's#./loader.mjs#./loader.cjs#g' src/index.ts
+        rm ./src/index.ts.bak
+        cat <<EOT >> ./dist/esm/kzg.js.tmp
+import { createRequire } from 'node:module';
+import { dirname } from "path";
+import { fileURLToPath } from 'url';
+
+const require = createRequire(import.meta.url);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+EOT
+        cat ./dist/esm/kzg.js >> ./dist/esm/kzg.js.tmp
+        mv ./dist/esm/kzg.js.tmp ./dist/esm/kzg.js
         green "DONE"
     else
         echo "Skipping ESM build (no config available)."

package.json

@@ -0,0 +1,16 @@
+
+
+export async function loadWasmModule() {
+    let wasmBinary = undefined
+    if (typeof process !== 'undefined' && typeof process.cwd === 'function') {
+        // Dynamically import Node.js modules only when in Node.js environment
+        const { resolve } = await import('path')
+        const { readFileSync } = await import('fs')
+        const wasmPath = resolve(__dirname, '../wasm/kzg.wasm')
+        const buffer = readFileSync(wasmPath)
+        // Convert Node.js Buffer to ArrayBuffer
+        wasmBinary = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength)
+    }
+    return wasmBinary
+}
+

scripts/ts-build.sh

@@ -0,0 +1,18 @@
+import { fileURLToPath } from 'url';
+
+    
+export async function loadWasmModule() {
+    let wasmBinary = undefined
+    if (typeof process !== 'undefined' && typeof process.cwd === 'function') {
+        // Dynamically import Node.js modules only when in Node.js environment
+        const { resolve, dirname } = await import('path')
+        const { readFileSync } = await import('fs')
+        const __filename = fileURLToPath(import.meta.url);
+        const __dirname = dirname(__filename);
+        const wasmPath = resolve(__dirname, '../wasm/kzg.wasm')
+        const buffer = readFileSync(wasmPath)
+        // Convert Node.js Buffer to ArrayBuffer
+        wasmBinary = buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength)
+    }
+    return wasmBinary
+}