Skip to content

fix perf bug for finalize_vote_result_unlisted #75

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.

Sign up for GitHub

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

Merged
HaoXuan40404 merged 5 commits into from
Apr 26, 2024
Merged

fix perf bug for finalize_vote_result_unlisted #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1222b3b
fix release.yml
cyjseagull Jan 17, 2023
923470d
Merge remote-tracking branch 'wedpr/master' into dev-1.6.0
cyjseagull Apr 13, 2024
1cf44bf
upgrade wedpr_l_crypto_zkp_utils
cyjseagull Apr 13, 2024
6dbc0bc
upgrade toolchain
cyjseagull Apr 13, 2024
7cae84b
fix perf bug for finalize_vote_result_unlisted
cyjseagull Apr 26, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: install rust language
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-07-28
toolchain: nightly-2024-01-10
override: true
- name: install CentOS dependencies
run: |
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
- name: install rust language
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-07-28
toolchain: nightly-2024-01-10
override: true
- run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
- run: vcpkg install openssl:x64-windows-static-md
Expand Down Expand Up @@ -268,4 +268,4 @@ jobs:
asset_name: ffi_java_sm_acv.dll
file: D:\a\WeDPR-Lab-Core\WeDPR-Lab-Core\target\release\ffi_java_sm_acv.dll
tag: ${{ github.ref }}
overwrite: true
overwrite: true
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: install rust language
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-07-28
toolchain: nightly-2024-01-10
override: true
- name: install CentOS dependencies
run: |
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- name: install rust language
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2022-07-28
toolchain: nightly-2024-01-10
override: true
- run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
- run: vcpkg install openssl:x64-windows-static-md
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2022-07-28
nightly-2024-01-10
5 changes: 3 additions & 2 deletions solution/anonymous_ciphertext_voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ sm = ["wedpr_s_protos/wedpr_f_sm_signature"]
[dependencies]
curve25519-dalek = { version = "1", features = [ "serde" ] }
lazy_static = "1.4.0"
wedpr_l_crypto_zkp_discrete_logarithm_proof = {version = "1.3.0", git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", tag = "v1.3.0"}
wedpr_l_crypto_zkp_discrete_logarithm_proof = {version = "1.3.0", git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", rev = "ffeaaab822dabae3d75b2be7a8a587b0a937a918"}
wedpr_l_crypto_zkp_range_proof = "1.2.0"
wedpr_l_crypto_zkp_utils = {version = "1.3.0", git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", tag = "v1.3.0"}
# feature-fix-acv
wedpr_l_crypto_zkp_utils = {version = "1.3.0", git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", rev = "ffeaaab822dabae3d75b2be7a8a587b0a937a918"}
wedpr_l_macros = "1.0.0"
wedpr_l_utils = "1.1.0"
wedpr_s_protos = { path = "../../protos", default-features = false}
Expand Down
1 change: 1 addition & 0 deletions solution/anonymous_ciphertext_voting/src/coordinator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ pub fn decrypt_unlisted_candidate_ballot(
decrypted_unlisted_candidate_ballot_result
.insert(candidate, i as u64);
}
break;
}
}
Ok(true)
Expand Down