From 86b9d659d7ca853f55aafa1f0ec8e51cd53a6d6f Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 29 Dec 2023 12:02:38 +0100 Subject: [PATCH 1/3] Remove old wasm leftovers --- .cargo/config | 10 ---------- .gitignore | 2 -- README.md | 11 ++++------- package.json | 4 +--- rust-toolchain | 5 ----- utils/download-tlsn.sh | 22 ---------------------- 6 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 .cargo/config delete mode 100644 rust-toolchain delete mode 100755 utils/download-tlsn.sh diff --git a/.cargo/config b/.cargo/config deleted file mode 100644 index 4d6052d5..00000000 --- a/.cargo/config +++ /dev/null @@ -1,10 +0,0 @@ -[target.wasm32-unknown-unknown] -rustflags = [ - "-C", - "target-feature=+atomics,+bulk-memory,+mutable-globals", - "-C", - "link-arg=--max-memory=4294967296" -] - -[unstable] -build-std = ["panic_abort", "std"] \ No newline at end of file diff --git a/.gitignore b/.gitignore index c716510e..0aaad78d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,9 @@ **/*.rs.bk Cargo.lock bin/ -wasm-pack.log **/node_modules **/.DS_Store .idea build tlsn/ zip -wasm/prover/target/ \ No newline at end of file diff --git a/README.md b/README.md index fe83ceb3..b0938aeb 100755 --- a/README.md +++ b/README.md @@ -9,14 +9,13 @@ 1. Check if your [Node.js](https://nodejs.org/) version is >= **18**. 2. Clone this repository. 3. Run `npm install` to install the dependencies. -4. Run `npm run build:wasm` -5. Run `npm run dev` -6. Load your extension on Chrome following: +4. Run `npm run dev` +5. Load your extension on Chrome following: 1. Access `chrome://extensions/` 2. Check `Developer mode` 3. Click on `Load unpacked extension` 4. Select the `build` folder. -7. Happy hacking. +6. Happy hacking. ## Building Websockify Docker Image ``` @@ -44,6 +43,4 @@ Now, the content of `build` folder will be the extension ready to be submitted t ## Resources: - [Webpack documentation](https://webpack.js.org/concepts/) -- [Chrome Extension documentation](https://developer.chrome.com/extensions/getstarted) -- [wasm-bindgen-rayon](https://github.com/GoogleChromeLabs/wasm-bindgen-rayon) -- [wasm-unsafe-eval CSP](https://bugs.chromium.org/p/chromium/issues/detail?id=1173354#c60) +- [Chrome Extension documentation](https://developer.chrome.com/extensions/getstarted) \ No newline at end of file diff --git a/package.json b/package.json index 49d045b8..c1b5b4be 100755 --- a/package.json +++ b/package.json @@ -8,8 +8,6 @@ }, "scripts": { "clone:tlsn": "bash ./utils/download-tlsn.sh", - "build:wasm": "wasm-pack build --target web wasm/prover", - "update:wasm": "cargo update --manifest-path wasm/prover/Cargo.toml", "build": "NODE_ENV=production node utils/build.js", "build:webpack": "NODE_ENV=production webpack --config webpack.config.js", "websockify": "docker run -it --rm -p 55688:80 -v $(pwd):/app novnc/websockify 80 --target-config /app/websockify_config", @@ -91,4 +89,4 @@ "webpack-dev-server": "^4.11.1", "zip-webpack-plugin": "^4.0.1" } -} +} \ No newline at end of file diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 43ad591a..00000000 --- a/rust-toolchain +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -# channel = "nightly-2022-12-12" -# channel = "stable" -# channel = "nightly-x86_64-apple-darwin" -channel = "nightly" diff --git a/utils/download-tlsn.sh b/utils/download-tlsn.sh deleted file mode 100755 index ee6ac52f..00000000 --- a/utils/download-tlsn.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Set the directory path where you want to clone the repository -target_directory="tlsn" - -# GitHub repository URL -github_url="https://github.com/tlsnotary/tlsn.git" - -# Check if the target directory exists -if [ -d "$target_directory" ]; then - echo "tlsn already exists." -else - # Clone the repository if the directory doesn't exist - git clone "$github_url" "$target_directory" - - # Check if the cloning was successful - if [ $? -eq 0 ]; then - echo "tlsn cloned successfully." - else - echo "Error cloning repository." - fi -fi \ No newline at end of file From 9a26f08bf66b58b29e3754d78ca3c5470abb4062 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 29 Dec 2023 12:03:14 +0100 Subject: [PATCH 2/3] use wildcard for tlsn-js wasm entry --- webpack.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 5579dace..3708b44b 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -38,8 +38,8 @@ const isDevelopment = process.env.NODE_ENV !== "production"; var options = { mode: process.env.NODE_ENV || "development", ignoreWarnings: [ - /Circular dependency between chunks with runtime/, - /ResizeObserver loop completed with undelivered notifications/ + /Circular dependency between chunks with runtime/, + /ResizeObserver loop completed with undelivered notifications/ ], entry: { @@ -209,7 +209,7 @@ var options = { force: true, }, { - from: "node_modules/tlsn-js/build/26f00cc36bec9d635c39.wasm", + from: "node_modules/tlsn-js/build/*.wasm", to: path.join(__dirname, "build"), force: true, }, From 16adce156324eba51e94da8c4defef1099c4ec47 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 29 Dec 2023 12:03:39 +0100 Subject: [PATCH 3/3] Remove unused ttlcache dependency --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c1b5b4be..12379a49 100755 --- a/package.json +++ b/package.json @@ -80,7 +80,6 @@ "style-loader": "^3.3.1", "terser-webpack-plugin": "^5.3.6", "ts-loader": "^9.4.2", - "ttlcache": "@types/@isaacs/ttlcache", "type-fest": "^3.5.2", "typescript": "^4.9.4", "webextension-polyfill": "^0.10.0",