Merge pull request #1143 from dyne/feat/zk-circuit-lang

ZK circuit development language (DSL) for Longfellow-ZK

Author: jaromil

Dockerfile

@@ -1,5 +1,5 @@
-# Copyright 2017-2025 Dyne.org foundation
-# SPDX-FileCopyrightText: 2017-2025 Dyne.org foundation
+# Copyright 2017-2026 Dyne.org foundation
+# SPDX-FileCopyrightText: 2017-2026 Dyne.org foundation
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 

Makefile

@@ -123,6 +123,7 @@ clean:
 	$(MAKE) clean -C ${pwd}/lib/pqclean
 	$(MAKE) clean -C ${pwd}/lib/mlkem
 	$(MAKE) clean -C ${pwd}/lib/longfellow-zk
+	$(MAKE) clean -C ${pwd}/lib/zk-circuit-lang
 	rm -rf ${pwd}/lib/milagro-crypto-c/build
 	$(MAKE) clean -C ${pwd}/src
 	if [ -d "bindings" ]; then $(MAKE) clean -C ${pwd}/bindings; fi

README.md

@@ -132,7 +132,7 @@ There are various build targets, just type make to have a list:
 
 ## License
 
-Copyright (C) 2017-2025 Dyne.org foundation
+Copyright (C) 2017-2026 Dyne.org foundation
 
 Designed and written by Denis "[Jaromil](https://jaromil.dyne.org)"
 Roio with the help of [Puria](https://github.com/puria) Nafisi Azizi

REUSE.toml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2025 Dyne.org foundation
+# SPDX-FileCopyrightText: 2026 Dyne.org foundation
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -19,7 +19,13 @@ path = [
     "compile_flags.txt"
 ]
 precedence = "aggregate"
-SPDX-FileCopyrightText = "2017-2025 Dyne.org foundation"
+SPDX-FileCopyrightText = "2017-2026 Dyne.org foundation"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = ["lib/zk-circuit-lang/**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Dyne.org foundation"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]

bindings/javascript/README.md

@@ -164,7 +164,7 @@ console.log(introspection); // => an object described as https://dev.zenroom.org
 
 ## 😍 Acknowledgements
 
-Copyright (C) 2018-2025 by [Dyne.org](https://www.dyne.org) foundation, Amsterdam
+Copyright (C) 2018-2026 by [Dyne.org](https://www.dyne.org) foundation, Amsterdam
 
 Designed, written and maintained by Puria Nafisi Azizi.
 
@@ -190,7 +190,7 @@ Please first take a look at the [Dyne.org - Contributor License Agreement](CONTR
 ## 💼 License
 
       Zenroom js - a javascript wrapper of zenroom
-      Copyright (c) 2018-2025 Dyne.org foundation, Amsterdam
+      Copyright (c) 2018-2026 Dyne.org foundation, Amsterdam
 
       This program is free software: you can redistribute it and/or modify
       it under the terms of the GNU Affero General Public License as

build/deps.mk

@@ -66,6 +66,18 @@ longfellow-zk:
 	LDFLAGS="${ldflags}" \
 	${MAKE} -C ${pwd}/lib/longfellow-zk
 
+
+zk-circuit-lang:
+	$(info -- Building Longfellow ZK Circuit Lanuage bindings)
+	CXX="${zk-circuit-lang_cxx}" \
+	LD=${ld} \
+	AR=${ar} \
+	RANLIB=${ranlib} \
+	CXXFLAGS="${zk-circuit-lang_cxxflags} ${cflags}" \
+	LDFLAGS="${ldflags}" \
+	${MAKE} -C ${pwd}/lib/zk-circuit-lang
+
+
 check-milagro: milagro
 	CC=${cc} CFLAGS="${cflags}" $(MAKE) -C ${pwd}/lib/milagro-crypto-c test
 

build/init.mk

@@ -18,10 +18,11 @@ ZEN_SOURCES := src/zenroom.o src/zen_error.o src/lua_functions.o		\
 
 ZEN_INCLUDES += -Isrc -Ilib/lua54/src -Ilib -I/usr/local/include	\
 -Ilib/milagro-crypto-c/build/include -Ilib/milagro-crypto-c/include	\
--Ilib/ed25519-donna -Wall -Wextra
+-Ilib/ed25519-donna -Ilib/longfellow-zk -Wall -Wextra
 
 BUILD_DEPS ?= apply-patches milagro lua54 embed-lua mlkem	\
-				quantum-proof ed25519-donna longfellow-zk zstd
+				quantum-proof ed25519-donna longfellow-zk	\
+				zk-circuit-lang zstd
 
 pwd := $(shell pwd)
 mil := ${pwd}/build/milagro
@@ -46,6 +47,7 @@ ldadd += ${pwd}/lib/mlkem/test/build/libmlkem.a
 # ldadd += /usr/local/lib/libmdoc.a
 ldadd += ${pwd}/lib/longfellow-zk/liblongfellow-zk.a
 ldadd += ${pwd}/lib/zstd/libzstd.a
+ldadd += ${pwd}/lib/zk-circuit-lang/libzk-circuit-lang.a
 ldadd += -lstdc++
 
 # ----------------
@@ -119,6 +121,29 @@ ifeq ($(ARCH),armv7l)
     longfellow_cflags += -march=armv7-a -mfpu=neon
 endif
 
+
+#-----------------
+# zk circuit language settings
+zk-circuit-lang_cxx ?= ${cxx}
+zk-circuit-lang_cxxflags += -I ${pwd}/src -I. -I../zstd -fPIC -DLIBRARY
+zk-circuit-lang_cxxflags += -I ../lua54/src -I../longfellow-zk
+ARCH ?= $(shell uname -m)
+ifeq ($(shell uname -s),Darwin)
+    zk-circuit-lang_cxxflags += -Xarch_x86_64 -mpclmul -Xarch_arm64  ""
+endif
+ifeq ($(ARCH),x86_64)
+    zk-circuit-lang_cxxflags += -mpclmul
+endif
+ifeq ($(ARCH),i686)
+    zk-circuit-lang_cxxflags += -mpclmul
+endif
+ifeq ($(ARCH),aarch64)
+    zk-circuit-lang_cxxflags += -march=armv8-a+crypto
+endif
+ifeq ($(ARCH),armv7l)
+    zk-circuit-lang_cxxflags += -march=armv7-a -mfpu=neon
+endif
+
 #-----------------
 # zstd settings
 zstd_cc ?= ${cc}

build/meson.build

@@ -60,7 +60,7 @@ endif
 ## BATS tests in test/zencode
 if suite.contains('zencode')
   # excluded tests
-  exclude = 'bindings_exec bindings_logfmt cookbook_hash_pdf ethereum rsa'
+  exclude = 'bindings_exec bindings_logfmt cookbook_hash_pdf ethereum rsa longfellow'
   zencode_cmd = run_command(
     find_program('bash'),
     '-c',

build/plugins.mk

@@ -10,6 +10,7 @@ ed25519_cc := ${cc}
 lua_cc := ${cc}
 longfellow_cxx := ${cxx}
 zstd_cc := ${cc}
+zk-circuit-lang_cxx := ${cxx}
 
 ifdef RELEASE
 	cflags +=  -O3 ${cflags_protection}
@@ -35,4 +36,5 @@ ifdef CCACHE
 	lua_cc := ccache ${cc}
 	zstd_cc := ccache ${cc}
 	longfellow_cxx := ccache ${cxx}
+	zk-circuit-lang_cxx := ccache ${cxx}
 endif

build/wasm.mk

@@ -24,6 +24,7 @@ zenroom_cc := ${cc}
 zstd_cc := ${cc}
 longfellow_cxx := ${cxx}
 longfellow_cflags := -I ${pwd}/src -I. -I../zstd -fPIC -DLIBRARY -msimd128
+zk-circuit-lang_cxxflags := -I ${pwd}/src -I. -I../zstd -fPIC -DLIBRARY -msimd128 -I ../lua54/src -I../longfellow-zk
 
 system := Javascript
 ld_emsdk_settings := -I ${EMSCRIPTEN}/system/include/libc -DLIBRARY