From e70881d85ad20c6ed4ab177febfe371f6afc5614 Mon Sep 17 00:00:00 2001 From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:32:56 +0530 Subject: [PATCH] chore(submodule): update zerokit submodule to v0.5.1 (#2782) --- .gitmodules | 2 +- Makefile | 6 +++--- scripts/build_rln.sh | 6 +++--- vendor/zerokit | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index b829df294..0a1488063 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Makefile b/Makefile index faad25ea9..98517e3aa 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 diff --git a/scripts/build_rln.sh b/scripts/build_rln.sh index 2a7d9ed38..d4843ca5e 100755 --- a/scripts/build_rln.sh +++ b/scripts/build_rln.sh @@ -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" @@ -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 diff --git a/vendor/zerokit b/vendor/zerokit index 0ad1ed296..85d71a542 160000 --- a/vendor/zerokit +++ b/vendor/zerokit @@ -1 +1 @@ -Subproject commit 0ad1ed296d49e85598e0ec0bae7c220885e47912 +Subproject commit 85d71a5427ee78528d6420c04b67c7825e3c6e91