Make the rust portion more modular

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-unknown-unknown"

.github/workflows/ci.yaml

@@ -71,7 +71,11 @@ jobs:
         tar zxvf binaryen-version_100-x86_64-linux.tar.gz binaryen-version_100/bin/wasm-opt
 
     - name: Build wasm
-      run: export PATH=$PATH:./binaryen-version_100/bin/ && make build-wasm
+      run: |
+        export PATH=$PATH:./binaryen-version_100/bin/
+        make build-wasm
+        shasum -a 256 lib/secp256k1.wasm
+        rustc --version --verbose
 
     - name: Build JS
       run: make build-js
@@ -123,18 +127,19 @@ jobs:
         path: lib
 
     - name: Create package
-      run: npm pack
+      run: npm pack && shasum -a 256 tiny-secp256k1-*.tgz
 
     - name: Upload package
       uses: actions/upload-artifact@v2
       with:
         name: package
-        path: tiny-secp256k1-*
+        path: tiny-secp256k1-*.tgz
 
   benchmark:
     name: Benchmark
     needs: [test]
     continue-on-error: true
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
     - name: Fetch code

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "rust-analyzer.check.targets": [
+        "wasm32-unknown-unknown",
+    ],
+    "rust-analyzer.check.command": "clippy"
+}

Cargo.toml

@@ -1,24 +1,12 @@
-[package]
-name = "secp256k1-wasm"
-version = "0.0.0"
-authors = ["Kirill Fomichev <[email protected]>"]
-edition = "2021"
-description = "A Rust library for building tiny-secp256k1 WASM."
-license = "MIT"
-publish = false
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies.secp256k1-sys]
-version = "=0.8.1"
-default-features = false
-features=[
-    "recovery",
-    "lowmemory"
+[workspace]
+resolver = "2"
+members = [
+    "tiny-secp256k1",
+    "tiny-secp256k1-wasm",
 ]
 
 [profile.release]
+opt-level = "z"
 lto = true
 panic = "abort"
 codegen-units = 1

Makefile

@@ -18,14 +18,14 @@ build-js:
 
 .PHONY: build-wasm
 build-wasm:
-	RUSTFLAGS="-C link-args=-zstack-size=655360" cargo build --target wasm32-unknown-unknown --release
-	mkdir -p lib && cp -f target/wasm32-unknown-unknown/release/secp256k1_wasm.wasm lib/secp256k1.wasm
+	RUSTFLAGS="-C link-args=-zstack-size=655360" cargo build --target wasm32-unknown-unknown -p tiny-secp256k1-wasm --release
+	mkdir -p lib && cp -f target/wasm32-unknown-unknown/release/tiny_secp256k1_wasm.wasm lib/secp256k1.wasm
 	wasm-opt -O4 --strip-debug --strip-producers --output lib/secp256k1.wasm lib/secp256k1.wasm
 
 .PHONY: build-wasm-debug
 build-wasm-debug:
-	RUSTFLAGS="-C link-args=-zstack-size=655360" cargo build --target wasm32-unknown-unknown
-	mkdir -p lib && cp -f target/wasm32-unknown-unknown/debug/secp256k1_wasm.wasm lib/secp256k1.wasm
+	RUSTFLAGS="-C link-args=-zstack-size=655360" cargo build --target wasm32-unknown-unknown -p tiny-secp256k1-wasm
+	mkdir -p lib && cp -f target/wasm32-unknown-unknown/debug/tiny_secp256k1_wasm.wasm lib/secp256k1.wasm
 
 .PHONY: clean
 clean: clean-deps clean-built
@@ -68,7 +68,8 @@ install-js-deps:
 .PHONY: lint
 lint:
 	cargo fmt -- --check
-	cargo clippy --target wasm32-unknown-unknown
+	cargo clippy -p tiny-secp256k1-wasm --target wasm32-unknown-unknown --no-default-features
+	cargo clippy -p tiny-secp256k1 --target x86_64-unknown-linux-gnu --no-default-features
 	npx eslint $(eslint_files)
 
 .PHONY: test

benches/index.js

@@ -12,6 +12,8 @@ import {
   fschnorrTweak,
 } from "./fixtures.js";
 
+const WASM_ONLY = !!process.env.WASM_ONLY;
+
 // import { loadAddon as _loadAddon } from "../lib/addon.js";
 // function loadAddon(location) {
 //   const path = new URL(location, import.meta.url).pathname;
@@ -27,26 +29,30 @@ const modules = [
     name: "tiny-secp256k1 (WASM)",
     secp256k1: tiny_secp256k1,
   },
-  {
-    name: "[email protected] (C++ addon, NAN/V8)",
-    secp256k1: tiny_secp256k1_prev_native,
-  },
-  {
-    name: "[email protected] (elliptic)",
-    secp256k1: tiny_secp256k1_prev_js,
-  },
-  {
-    name: "[email protected] (C++ addon, N-API)",
-    secp256k1: cryptocoinjs_secp256k1.native,
-  },
-  {
-    name: "[email protected] (elliptic)",
-    secp256k1: cryptocoinjs_secp256k1.js,
-  },
-  {
-    name: "[email protected] (BigInt)",
-    secp256k1: noble_secp256k1,
-  },
+  ...(WASM_ONLY
+    ? []
+    : [
+        {
+          name: "[email protected] (C++ addon, NAN/V8)",
+          secp256k1: tiny_secp256k1_prev_native,
+        },
+        {
+          name: "[email protected] (elliptic)",
+          secp256k1: tiny_secp256k1_prev_js,
+        },
+        {
+          name: "[email protected] (C++ addon, N-API)",
+          secp256k1: cryptocoinjs_secp256k1.native,
+        },
+        {
+          name: "[email protected] (elliptic)",
+          secp256k1: cryptocoinjs_secp256k1.js,
+        },
+        {
+          name: "[email protected] (BigInt)",
+          secp256k1: noble_secp256k1,
+        },
+      ]),
 ];
 
 const benchmarks = [