From 4a766f0f717250a07442c3bdf69d192bda8bb3f6 Mon Sep 17 00:00:00 2001 From: Oleg Lomaka Date: Fri, 24 May 2024 05:20:00 -0400 Subject: [PATCH] Add no_jwz build tag to prevent depencency on librapidsnark library --- .github/workflows/tests-c.yaml | 4 ++-- Makefile | 18 +++++++++--------- examples/CMakeLists.txt | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests-c.yaml b/.github/workflows/tests-c.yaml index 32184e2..a0da82d 100644 --- a/.github/workflows/tests-c.yaml +++ b/.github/workflows/tests-c.yaml @@ -33,7 +33,7 @@ jobs: # without this line `git status` does not work on containers # 1.19.5 and upper git config --global --add safe.directory `pwd` - go build -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid + go build -tags no_jwz -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid cp ios/libpolygonid.h ios/libpolygonid-darwin-arm64.h mkdir examples/build cd examples/build @@ -59,7 +59,7 @@ jobs: ${{ runner.os }}-go- - name: Run ctests run: | - go build -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid + go build -tags no_jwz -buildmode=c-archive -o ios/libpolygonid.a ./cmd/polygonid cp ios/libpolygonid.h ios/libpolygonid-darwin-arm64.h brew install cjson mkdir examples/build diff --git a/Makefile b/Makefile index 1e7582e..ea4752f 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ios-arm64: TARGET=arm64-apple-ios16 \ CC=$(PWD)/clangwrap.sh \ CGO_CFLAGS="-fembed-bitcode" \ - go build -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios.a ./cmd/polygonid + go build -tags no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios.a ./cmd/polygonid cp $(IOS_OUT)/libpolygonid-ios.h $(IOS_OUT)/libpolygonid.h @@ -20,7 +20,7 @@ ios-simulator-x86_64: TARGET=x86-64-apple-ios16-simulator \ CC=$(PWD)/clangwrap.sh \ CGO_CFLAGS="-fembed-bitcode" \ - go build -tags ios -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.a ./cmd/polygonid + go build -tags ios,no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.a ./cmd/polygonid cp $(IOS_OUT)/libpolygonid-ios-simulator-x86_64.h $(IOS_OUT)/libpolygonid.h ios-simulator-arm64: @@ -31,14 +31,14 @@ ios-simulator-arm64: TARGET=arm64-apple-ios16-simulator \ CC=$(PWD)/clangwrap.sh \ CGO_CFLAGS="-fembed-bitcode" \ - go build -tags ios -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-arm64.a ./cmd/polygonid + go build -tags ios,no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-ios-simulator-arm64.a ./cmd/polygonid cp $(IOS_OUT)/libpolygonid-ios-simulator-arm64.h $(IOS_OUT)/libpolygonid.h darwin-arm64: GOOS=darwin \ GOARCH=arm64 \ CGO_ENABLED=1 \ - go build -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-darwin-arm64.a ./cmd/polygonid + go build -tags no_jwz -buildmode=c-archive -o $(IOS_OUT)/libpolygonid-darwin-arm64.a ./cmd/polygonid cp $(IOS_OUT)/libpolygonid-darwin-arm64.h $(IOS_OUT)/libpolygonid.h # Build a legacy multi-architecture version of libpolygonid.a with iOS Device arm64 & iOS Simulator x86_64 @@ -53,7 +53,7 @@ ios-simulator: ios-simulator-x86_64 ios-simulator-arm64 ios: ios-old ios-arm64 ios-simulator dylib: - go build -buildmode=c-shared -o $(IOS_OUT)/libpolygonid.dylib ./cmd/polygonid + go build -tags no_jwz -buildmode=c-shared -o $(IOS_OUT)/libpolygonid.dylib ./cmd/polygonid ANDROID_OUT=android ANDROID_NDK_HOME?=$(ANDROID_HOME)/ndk/22.1.7171670 @@ -63,28 +63,28 @@ android-armeabi-v7a: GOARCH=arm \ CGO_ENABLED=1 \ CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi21-clang \ - go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/armeabi-v7a/libpolygonid.so ./cmd/polygonid + go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/armeabi-v7a/libpolygonid.so ./cmd/polygonid android-arm64-v8a: GOOS=android \ GOARCH=arm64 \ CGO_ENABLED=1 \ CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android21-clang \ - go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/arm64-v8a/libpolygonid.so ./cmd/polygonid + go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/arm64-v8a/libpolygonid.so ./cmd/polygonid android-x86: GOOS=android \ GOARCH=386 \ CGO_ENABLED=1 \ CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android21-clang \ - go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86/libpolygonid.so ./cmd/polygonid + go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86/libpolygonid.so ./cmd/polygonid android-x86-64: GOOS=android \ GOARCH=amd64 \ CGO_ENABLED=1 \ CC=$(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang \ - go build -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86-64/libpolygonid.so ./cmd/polygonid + go build -tags no_jwz -buildmode=c-shared -o $(ANDROID_OUT)/jnilibs/x86-64/libpolygonid.so ./cmd/polygonid android: android-armeabi-v7a android-arm64-v8a android-x86 android-x86-64 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 898a534..fe71ad4 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -21,7 +21,7 @@ endif() # include_directories(${cJSON_SOURCE_DIR}) # add_executable(json_functions_tests json_functions_tests.c ${cJSON_SOURCE_DIR}/cJSON.c) -## Compaly with system installed cJSON +## Compile with system installed cJSON find_package(cJSON REQUIRED) include_directories(${CJSON_INCLUDE_DIRS}) diff --git a/go.mod b/go.mod index e33bf34..97b0dff 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/iden3/go-merkletree-sql/v2 v2.0.6 github.com/iden3/go-onchain-credential-adapter v0.0.0-20240425110009-4004ac8da50c github.com/iden3/go-schema-processor/v2 v2.3.4 - github.com/iden3/iden3comm/v2 v2.3.3 + github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c github.com/iden3/merkletree-proof v0.1.1 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 9743c0b..35e9a0b 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,8 @@ github.com/iden3/go-rapidsnark/witness/wazero v0.0.0-20230524142950-0986cf057d4e github.com/iden3/go-rapidsnark/witness/wazero v0.0.0-20230524142950-0986cf057d4e/go.mod h1:UEBifEzw62T6VzIHJeHuUgeLg2U/J9ttf7hOwQEqnYk= github.com/iden3/go-schema-processor/v2 v2.3.4 h1:zWE9NrY7dm9Il8c0u3XcJfenptmxbvIaNDOqkq5uQ0A= github.com/iden3/go-schema-processor/v2 v2.3.4/go.mod h1:tuz/iuqU13NdpCY1Ovsh7n6KTZnJnfhqjB0MUgxbcA4= -github.com/iden3/iden3comm/v2 v2.3.3 h1:lH2v/hZeZYvKQAgfpi/hyzugDjvCTxJo/Y0pyMVWHFQ= -github.com/iden3/iden3comm/v2 v2.3.3/go.mod h1:14aZgYjCi0XIZ/wkQrWIhLkQT20nwQMyWEIeLXY0Klg= +github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c h1:MKEvtiDyk/ByXHhQoIsQuXSy74oQgHOmJtHQFfF2EVw= +github.com/iden3/iden3comm/v2 v2.3.4-0.20240524090357-f348cd28df8c/go.mod h1:14aZgYjCi0XIZ/wkQrWIhLkQT20nwQMyWEIeLXY0Klg= github.com/iden3/merkletree-proof v0.1.1 h1:NwuaW/t0HTwZpmxWSxqeh/hYRjAQt/uIvw5QeW5GE8I= github.com/iden3/merkletree-proof v0.1.1/go.mod h1:ul0HDU6/eVNX++u/PWScY7pTXiFjqM5kA6vl1wEoTUU= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=