Merge pull request #20 from iosis-tech/swiftness

ci fix

.github/workflows/npm_publish.yaml

@@ -2,11 +2,6 @@ name: Manual Publish to npm
 
 on:
   workflow_dispatch:
-    inputs:
-      npm_version:
-        description: 'Version to publish'
-        required: true
-        default: 'patch'  # could be 'patch', 'minor', 'major', or a specific version
 
 jobs:
   publish:
@@ -18,8 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        layout: ["starknet_with_keccak"]
-        hash: ["blake2s"]
+        layout: ["dex", "recursive", "recursive_with_poseidon", "small", "starknet", "starknet_with_keccak"]
+        hash: ["blake2s", "keccak"]
 
     steps:
       - name: Checkout repository
@@ -30,29 +25,42 @@ jobs:
         with:
           node-version: '18'  # specify your desired Node.js version
 
-      - name: Install dependencies
-        run: npm install
-        working-directory: ${{ env.WORKING_DIR }}
-
-      - name: Update version
-        run: npm version ${{ github.event.inputs.npm_version }} --no-git-tag-version
-        working-directory: ${{ env.WORKING_DIR }}
-
       - name: Configure npm
         run: npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
         working-directory: ${{ env.WORKING_DIR }}
+
+      - name: Cache Cargo registry
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-registry-
+  
+      - name: Cache Cargo build
+        uses: actions/cache@v2
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-
       
       - name: Install wasm-pack
         run: cargo install wasm-pack
 
       - name: Build package
-        run: wasm-pack build --target web --workspace --features ${{ matrix.layout }},${{ matrix.hash }} --no-default-features --out-dir pkg
+        run: wasm-pack build --out-dir pkg --target web --workspace --features ${{ matrix.layout }},${{ matrix.hash }} --no-default-features
         working-directory: ${{ env.WORKING_DIR }}
 
       - name: Rename package
-        run: jq '.name = "swiftness-${{ matrix.layout }}-${{ matrix.hash }}"' package.json > tmp.json && mv tmp.json package.json
+        run: |
+          jq --arg layout "${{ matrix.layout }}" --arg hash "${{ matrix.hash }}" \
+            '.name = "swiftness-\($layout | gsub("_"; "-"))-\($hash | gsub("_"; "-"))"' \
+            package.json > tmp.json && mv tmp.json package.json
         working-directory: ${{ env.WORKING_DIR }}/pkg
 
       - name: Publish to npm
-        run: npm publish --dry-run
+        run: npm publish
         working-directory: ${{ env.WORKING_DIR }}/pkg

Cargo.toml

@@ -21,6 +21,7 @@ edition = "2021"
 license-file = "LICENSE"
 readme = "README.md"
 repository = "https://github.com/iosis-tech/swiftness"
+version = "0.0.4"
 
 [workspace.dependencies]
 bail-out = "0.2.0"
@@ -37,10 +38,10 @@ num-bigint = { version = "0.4.4", features = ["serde"] }
 blake2 = "0.10.6"
 wasm-bindgen = "0.2"
 
-swiftness_air = { path = "crates/air", default-features = false, version = "0.0.3" }
-swiftness_commitment = { path = "crates/commitment", default-features = false, version = "0.0.3" }
-swiftness_fri = { path = "crates/fri", default-features = false, version = "0.0.3" }
-swiftness_pow = { path = "crates/pow", default-features = false, version = "0.0.3" }
-swiftness_stark = { path = "crates/stark", default-features = false, version = "0.0.3" }
-swiftness_transcript = { path = "crates/transcript", default-features = false, version = "0.0.3" }
-swiftness_proof_parser = { path = "proof-parser", default-features = false, version = "0.0.3" }
+swiftness_air = { path = "crates/air", default-features = false, version = "0.0.4" }
+swiftness_commitment = { path = "crates/commitment", default-features = false, version = "0.0.4" }
+swiftness_fri = { path = "crates/fri", default-features = false, version = "0.0.4" }
+swiftness_pow = { path = "crates/pow", default-features = false, version = "0.0.4" }
+swiftness_stark = { path = "crates/stark", default-features = false, version = "0.0.4" }
+swiftness_transcript = { path = "crates/transcript", default-features = false, version = "0.0.4" }
+swiftness_proof_parser = { path = "proof-parser", default-features = false, version = "0.0.4" }

cli/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme.workspace = true
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 clap = { version = "4.4.4", features = ["derive"] }

crates/air/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 bail-out.workspace = true

crates/commitment/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 serde_with.workspace = true

crates/fri/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 serde_with.workspace = true

crates/pow/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 bail-out.workspace = true

crates/stark/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 bail-out.workspace = true

crates/transcript/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 starknet-crypto.workspace = true

proof-parser/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license-file.workspace = true
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 serde.workspace = true

wasm-binding/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 license = "Apache-2.0"
 readme = "README.md"
 repository.workspace = true
-version = "0.0.3"
+version.workspace = true
 
 [dependencies]
 serde_json.workspace = true