Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZK-559: Remove "/crypto" package from shielder-sdk #81

Merged
merged 32 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
22d941a
ZK-559: Add shielder-sdk-crypto package
kroist Jan 6, 2025
fee1b6a
add other packages to workspace
kroist Jan 7, 2025
e9ef3f1
ZK-559: Add WASM implementation of shielder-sdk-crypto
kroist Jan 7, 2025
1d8b114
separate cryptoClient interface
kroist Jan 7, 2025
1cf65dc
upd
kroist Jan 7, 2025
473b8cf
upd to new interface
kroist Jan 7, 2025
c2cf81f
Merge remote-tracking branch 'origin/main' into crypto-wasm
kroist Jan 8, 2025
29177ca
move lint config to workspace
kroist Jan 8, 2025
5e81347
comply with linter
kroist Jan 8, 2025
936d806
return single-threaded
kroist Jan 8, 2025
471a420
ZK-559: fix vite workers (wasm generation part)
kroist Jan 8, 2025
0abb655
Merge remote-tracking branch 'origin/ZK-559-workers-vite-fix' into cr…
kroist Jan 8, 2025
3973738
create patched version for vite
kroist Jan 8, 2025
b13140b
return to normal
kroist Jan 8, 2025
78ae484
add vite patch
kroist Jan 8, 2025
3e7f04e
add readme
kroist Jan 8, 2025
e04a43a
rm all about wasm
kroist Jan 9, 2025
7926432
rm /__internal
kroist Jan 9, 2025
b33159e
integrate into client
kroist Jan 9, 2025
0b011d0
finish
kroist Jan 9, 2025
9a37573
rm tests from CI
kroist Jan 9, 2025
2fd71b8
upd README
kroist Jan 9, 2025
298f56f
module loader
kroist Jan 9, 2025
9335dc7
worker docs
kroist Jan 9, 2025
170ea2e
rm comments
kroist Jan 9, 2025
44f396b
license and authors
kroist Jan 9, 2025
71b060b
Merge branch 'crypto-wasm' into shielder-sdk-rm-impl
kroist Jan 9, 2025
2b16902
add workspace build scripts
kroist Jan 9, 2025
d3b7bbe
upd CI
kroist Jan 9, 2025
bd3eaf3
Merge remote-tracking branch 'origin/main' into shielder-sdk-rm-impl
kroist Jan 10, 2025
77cc8fb
unused args in abstract method
kroist Jan 13, 2025
ec3956a
slight changes to README
kroist Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/_ts-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ jobs:
with:
version: latest

- name: Install dependencies (shielder-sdk)
run: pnpm install --frozen-lockfile
working-directory: ts/shielder-sdk
- name: Install dependencies (workspace)
run: pnpm install-deps
working-directory: ts

- name: Build shielder-sdk
- name: Build all (workspace)
run: pnpm build
working-directory: ts/shielder-sdk
working-directory: ts

- name: Run lint checks (shielder-sdk)
- name: Run lint checks (workspace)
run: pnpm lint
working-directory: ts/shielder-sdk
working-directory: ts
237 changes: 0 additions & 237 deletions .github/workflows/_ts-sdk-playwright-tests.yml

This file was deleted.

9 changes: 1 addition & 8 deletions .github/workflows/on-pull-request-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ concurrency:
cancel-in-progress: true

jobs:

check-vars-and-secrets:
name: Check vars and secrets
uses: ./.github/workflows/_check-vars-and-secrets.yml
Expand Down Expand Up @@ -46,18 +45,12 @@ jobs:
uses: ./.github/workflows/_ts-checks.yml
secrets: inherit

ts-sdk-playwright-tests:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we removing the workflow entirely? Playwright is needed for testing the smaller shielder-sdk-crypto-wasm package.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can add it later

name: Typescript shielder-sdk Playwright tests
needs: [build-contracts, build-wasm-packages]
uses: ./.github/workflows/_ts-sdk-playwright-tests.yml
secrets: inherit

clean-wasm-artifact:
name: Clean wasm artifact
runs-on: ubuntu-22.04
if: ${{ always() }}
# dependencies should include all jobs, which interact with wasm artifact
needs: [build-wasm-packages, ts-checks, ts-sdk-playwright-tests]
needs: [build-wasm-packages, ts-checks]
steps:
- uses: geekyeggo/delete-artifact@v5
with:
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/testnet-nightly-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ concurrency:
cancel-in-progress: true

jobs:

e2e-tests:
name: Run E2E tests on testnet
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -67,39 +66,6 @@ jobs:
shell: bash
run: make compile-contracts

- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

- name: Build shielder-wasm
run: cd crates/shielder-wasm && make all

- name: Build Rust-TS conversions binary
run: cargo build --manifest-path crates/test-ts-conversions/Cargo.toml

- uses: pnpm/action-setup@v4
with:
version: latest

- name: Install dependencies (shielder-sdk)
run: pnpm install --frozen-lockfile
working-directory: ts/shielder-sdk

- name: Build shielder-sdk
run: pnpm build
working-directory: ts/shielder-sdk

- name: Install dependencies (shielder-sdk-tests)
pmikolajczyk41 marked this conversation as resolved.
Show resolved Hide resolved
run: pnpm install --frozen-lockfile
working-directory: ts/shielder-sdk-tests

- name: Install Playwright dependencies (shielder-sdk-tests)
run: pnpm postinstall
working-directory: ts/shielder-sdk-tests

- name: Build shielder-sdk-tests
run: pnpm build
working-directory: ts/shielder-sdk-tests

- name: Run e2e tooling tests
env:
DEPLOYER_PRIVATE_KEY: ${{ secrets.CI_TESTNET_DEPLOYER_PRIVATE_KEY }}
Expand All @@ -119,7 +85,6 @@ jobs:
NO_FORMATTING=true TESTNET=true ./tooling-e2e-tests/full_scenario.sh
NO_FORMATTING=true TESTNET=true ./tooling-e2e-tests/recovery_scenario.sh
NO_FORMATTING=true TESTNET=true ./tooling-e2e-tests/many_actors.sh
NO_FORMATTING=true TESTNET=true ./tooling-e2e-tests/ts_sdk_tests.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider removing shielder-sdk-tests code entirely. We have repo history, not having dead code seems preferrable.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not removing it now, as it would be refactored soon. tests are disabled for CI purposes


slack-notification:
name: Slack notification
Expand Down
1 change: 1 addition & 0 deletions ts/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default tseslint.config(
{
ignores: [
"**/dist/",
"**/dist-vite/",
"**/src/_generated/",
"eslint.config.mjs",
"**/update-imports.mjs"
Expand Down
9 changes: 9 additions & 0 deletions ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
"keywords": [],
"author": "Cardinal",
"license": "Apache-2.0",
"packageManager": "pnpm@8.15.1",
"scripts": {
"build": "pnpm build:crypto && pnpm build:crypto-wasm && pnpm build:sdk",
"build:crypto": "pnpm --filter shielder-sdk-crypto build",
"build:crypto-wasm": "pnpm --filter shielder-sdk-crypto-wasm build",
"build:sdk": "pnpm --filter shielder-sdk build",
"lint": "pnpm -r lint",
"install-deps": "pnpm install --frozen-lockfile"
},
"devDependencies": {
"@eslint/js": "^9.15.0",
"@types/node": "^22.10.0",
Expand Down
Loading