Skip to content

Commit

Permalink
sync working
Browse files Browse the repository at this point in the history
  • Loading branch information
willemolding committed Sep 26, 2024
1 parent 68e2c7a commit 1811c93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tracing = "0.1.40"
rayon = { version = "1.8", features = ["web_spin_lock"] }
subtle = "2.6.1"
wasm_thread = { git = "https://github.com/ec2/wasm_thread", rev = "eb41bcc0d98ce0620a313687c0344341391b9d78", default-features = false, features = ["keep_worker_alive", "es_modules"] }
wasm_thread = { git = "https://github.com/ec2/wasm_thread", rev = "9e432077948d927d49373d1d039c23447d3648df", default-features = false, features = ["keep_worker_alive", "es_modules"] }

wasm_sync = "0.1.2"
http = { version = "1.1.0", default-features = false }
Expand All @@ -117,6 +117,9 @@ wasm-bindgen-rayon = { git = "https://github.com/9SMTM6/wasm-bindgen-rayon", rev
shardtree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }
incrementalmerkletree = { git = "https://github.com/ec2/incrementalmerkletree.git", rev = "16eff253ad2575d48feec04f7387e6507a7dd698" }

# [patch.'https://github.com/WilsonGramer/wasm_thread']
# wasm_thread = { git = "https://github.com/ec2/wasm_thread", rev = "9e432077948d927d49373d1d039c23447d3648df" }

#[patch.'https://github.com/chainsafe/librustzcash']
#zcash_address = { path = "../librustzcash/components/zcash_address" }
#zcash_client_backend = { path = "../librustzcash/zcash_client_backend" }
Expand Down
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{
"scripts": {
"preinstall": "npx only-allow pnpm",
<<<<<<< HEAD
"start:dev": "parcel --no-autoinstall packages/demo-wallet",
"build": "parcel build --no-cache --no-autoinstall packages/demo-wallet"
=======
"start:dev": "pnpm --stream -r run start:dev",
"build": "parcel build --no-autoinstall --no-cache packages/demo-wallet"
>>>>>>> fa1d590219078a46ae59c0e85e0207362217b311
},
"dependencies": {
"@webzjs/webz-core": "workspace:^",
Expand Down

0 comments on commit 1811c93

Please sign in to comment.