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

chore(submodule): update zerokit submodule to v0.5.1 #2782

Merged
merged 1 commit into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
path = vendor/zerokit
url = https://github.com/vacp2p/zerokit.git
ignore = dirty
branch = v0.3.4
branch = v0.5.1
[submodule "vendor/nim-regex"]
path = vendor/nim-regex
url = https://github.com/nitely/nim-regex.git
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ clean: | clean-libbacktrace
##################
## RLN ##
##################
.PHONY: librln shouldUseRLNV2
.PHONY: librln

LIBRLN_BUILDDIR := $(CURDIR)/vendor/zerokit
LIBRLN_VERSION := v0.4.4
LIBRLN_VERSION := v0.5.1

ifeq ($(OS),Windows_NT)
LIBRLN_FILE := rln.lib
Expand Down Expand Up @@ -311,7 +311,7 @@ endif

rebuild-nat-libs: | clean-cross nat-libs

libwaku-android-precheck: shouldUseRLNV2
libwaku-android-precheck:
ifndef ANDROID_NDK_HOME
$(error ANDROID_NDK_HOME is not set)
endif
Expand Down
6 changes: 3 additions & 3 deletions scripts/build_rln.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ host_triplet=$(rustc --version --verbose | awk '/host:/{print $2}')

tarball="${host_triplet}"

# use arkzkey feature for v0.4.4
# use arkzkey feature for v0.5.1
# TODO: update this script in the future when arkzkey is default
if [[ "${rln_version}" == "v0.4.4" ]]; then
if [[ "${rln_version}" == "v0.5.1" ]]; then
tarball+="-arkzkey-rln.tar.gz"
else
tarball+="-rln.tar.gz"
Expand Down Expand Up @@ -52,6 +52,6 @@ else
exit 1
fi
# if submodule version = version in Makefile, build rln
cargo build --release -p rln --manifest-path "${build_dir}/rln/Cargo.toml"
cargo build --release -p rln --manifest-path "${build_dir}/rln/Cargo.toml" --features arkzkey
cp "${build_dir}/target/release/librln.a" "${output_filename}"
fi
2 changes: 1 addition & 1 deletion vendor/zerokit
Submodule zerokit updated 44 files
+14 −13 .github/workflows/nightly-release.yml
+0 −4 .gitmodules
+801 −124 Cargo.lock
+1 −0 Cargo.toml
+8 −4 Makefile
+11 −1 README.md
+5 −1 rln-cli/src/main.rs
+4 −2 rln-wasm/Cargo.toml
+4 −0 rln-wasm/Makefile.toml
+29 −16 rln-wasm/tests/rln-wasm.rs
+13 −2 rln/Cargo.toml
+40 −24 rln/README.md
+14 −0 rln/benches/circuit_loading_benchmark.rs
+14 −2 rln/benches/pmtree_benchmark.rs
+79 −0 rln/benches/poseidon_tree_benchmark.rs
+ rln/resources/tree_height_15/rln.wasm
+ rln/resources/tree_height_15/rln_final.zkey
+0 −119 rln/resources/tree_height_15/verification_key.json
+ rln/resources/tree_height_19/rln.wasm
+ rln/resources/tree_height_19/rln_final.zkey
+0 −119 rln/resources/tree_height_19/verification_key.json
+ rln/resources/tree_height_20/rln.wasm
+ rln/resources/tree_height_20/rln_final.arkzkey
+ rln/resources/tree_height_20/rln_final.zkey
+35 −40 rln/resources/tree_height_20/verification_key.json
+49 −33 rln/src/circuit.rs
+2 −0 rln/src/lib.rs
+68 −15 rln/src/pm_tree_adapter.rs
+161 −143 rln/src/protocol.rs
+169 −936 rln/src/public.rs
+977 −0 rln/src/public_api_tests.rs
+23 −3 rln/src/utils.rs
+244 −523 rln/tests/ffi.rs
+105 −46 rln/tests/poseidon_tree.rs
+103 −367 rln/tests/protocol.rs
+84 −154 rln/tests/public.rs
+0 −1 rln/vendor/rln
+5 −5 utils/Cargo.toml
+63 −21 utils/benches/merkle_tree_benchmark.rs
+64 −22 utils/src/merkle_tree/full_merkle_tree.rs
+4 −2 utils/src/merkle_tree/merkle_tree.rs
+56 −19 utils/src/merkle_tree/optimal_merkle_tree.rs
+227 −54 utils/tests/merkle_tree.rs
+13 −19 utils/tests/poseidon_constants.rs
Loading