Publish test

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"

.github/workflows/release.yml

@@ -0,0 +1,155 @@
+name: Publish artifacts to Sonatype Repo
+
+on:
+  push:
+    branches:
+      - master
+      - version-[0-9].[0-9]+.x
+    tags:
+      - v[0-9].[0-9]+.[0-9]+
+  pull_request:
+
+env:
+  NATIVE_DIR: zwaves_jni/javalib/src/main/resources/META-INF/native
+  GRADLE_EXTRA_ARGS: --console=plain -Ppr=${{ github.event.number }} -PrefName=${{ github.head_ref }}
+  # GITHUB_CONTEXT: ${{ toJson(github) }} # For debugging purposes
+
+jobs:
+  build-native:
+    name: ${{ matrix.platform }}/${{ matrix.arch }} library
+    runs-on: ${{ matrix.os }}
+    env:
+      # Where a library should be
+      target-path: ${{ matrix.jni-platform }}/${{ matrix.arch }}
+
+      # Rust build target
+      build-target: ${{ matrix.build-arch }}-${{ matrix.build-platform }}
+
+      # Rust target directory
+      TARGET_DIR: ./target
+
+      # Emit backtraces on panics.
+      RUST_BACKTRACE: 1
+    strategy:
+      matrix:
+#        platform: [ linux, osx, windows ]
+#        arch: [ aarch64, amd64, x86 ]
+        platform: [ linux ]
+        arch: [ amd64 ]
+        exclude:
+          - platform: osx
+            arch: x86
+          - platform: windows
+            arch: aarch64
+
+        include:
+          - platform: linux
+            os: ubuntu-20.04
+            build-platform: unknown-linux-gnu
+            artifact: libzwaves_jni.so
+            jni-platform: linux64
+
+#          - platform: linux
+#            arch: aarch64
+#            extra-packages: gcc-aarch64-linux-gnu
+#
+#          - platform: linux
+#            arch: x86
+#            extra-packages: gcc-multilib
+#            jni-platform: linux32
+#
+#          - platform: osx
+#            os: macos-latest
+#            build-platform: apple-darwin
+#            artifact: libzwaves_jni.dylib
+#            jni-platform: osx64
+#
+#          - platform: windows
+#            os: windows-2019
+#            build-platform: pc-windows-msvc # x86 and gcc lead to "undefined reference to _Unwind_Resume"
+#            artifact: zwaves_jni.dll
+#            jni-platform: windows64
+#
+#          - platform: windows
+#            arch: x86
+#            jni-platform: windows32
+#
+#          - arch: aarch64
+#            build-arch: aarch64
+
+          - arch: amd64
+            build-arch: x86_64
+
+#          - arch: x86
+#            build-arch: i686
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Print debug information
+        run: |
+          echo "Build target: ${{ env.build-target }}"
+          echo "Target path:  ${{ env.target-path }}"
+
+      - name: Install build tools
+        if: ${{ matrix.extra-packages }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ${{ matrix.extra-packages }}
+
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          target: ${{ env.build-target }}
+
+      - name: Enable Rust dependencies caching
+        uses: Swatinem/rust-cache@v2
+
+      - name: Run Rust tests
+        # Architecture is always x86-64: https://stackoverflow.com/a/71220337
+        if: matrix.arch == 'amd64'
+        run: |
+          cd zwaves_jni
+          cargo test --lib --target ${{ env.build-target }}
+
+      - name: Build native libraries
+        run: |
+          cd zwaves_jni
+          cargo build --release --target ${{ env.build-target }}
+          cd ..
+
+          cp target/${{ env.build-target }}/release/${{ matrix.artifact }} ${{ env.NATIVE_DIR }}/${{ env.target-path }}
+
+      - name: Upload result
+        uses: actions/upload-artifact@v3
+        with:
+          name: native-libraries
+          path: ${{ env.NATIVE_DIR }}/**/*
+
+  build-jni:
+    name: Build JNI library
+    runs-on: ubuntu-20.04
+    needs: build-native
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: temurin
+          cache: gradle
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: native-libraries
+          path: ${{ env.NATIVE_DIR }}
+
+      - name: Publish version
+        run: |
+          cd zwaves_jni/javalib
+          ./gradlew ${GRADLE_EXTRA_ARGS} publishToSonatype \
+            -PsonatypeUsername='${{ secrets.OSSRH_USERNAME }}' \
+            -PsonatypePassword='${{ secrets.OSSRH_PASSWORD }}' \
+            -PgpgKey='${{ secrets.OSSRH_GPG_KEY_ASCII }}' \
+            -PgpgPassphrase='${{ secrets.OSSRH_GPG_PASSPHRASE }}'

.gitignore

@@ -5,4 +5,6 @@ bin/
 pkg/
 wasm-pack.log
 .vscode
+.idea
+!zwaves_jni/src/bn256/bin
 !zwaves_setup/src/bin

rustfmt.toml

@@ -0,0 +1,7 @@
+edition = "2018"
+
+max_width = 120
+hard_tabs = false
+newline_style = "Unix"
+
+imports_granularity = "Crate"

zwaves_jni/Cargo.toml

@@ -1,21 +1,35 @@
 [package]
 name = "zwaves_jni"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Igor Gulamov <igor.gulamov@gmail.com>"]
 edition = "2018"
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "rlib"]
 name = "zwaves_jni"
 
+[[bin]]
+path = "src/bn256/bin/show_test_vectors.rs"
+name="show_test_vectors"
+
 [dependencies]
 bellman = { version = "0.1.0" }
 zwaves_primitives = { path = "../zwaves_primitives"}
 sapling-crypto = { path = "../sapling-crypto" }
 pairing = "0.14"
+pairing_ce = "0.18" # for bn256
 num = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 base64 = "0.11.0"
 jni = "0.14.0"
 byteorder = "1"
 rand = "0.4"
+
+# for bn256
+[dependencies.ff]
+version = "=0.7"
+features = ["derive"]
+package = "ff_ce"
+
+[dev-dependencies]
+test-case = "3.2.1"

zwaves_jni/build_all.sh

@@ -1,12 +1,3 @@
-if [ ! -d "osxcross" ]; then
-    git clone https://github.com/tpoechtrager/osxcross
-    pushd osxcross
-    wget -nc https://s3.dockerproject.org/darwin/v2/MacOSX10.10.sdk.tar.xz
-    mv MacOSX10.10.sdk.tar.xz tarballs/
-    UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh
-    popd
-fi
-
 cargo build --target=i686-unknown-linux-gnu --release
 cp ../target/i686-unknown-linux-gnu/release/libzwaves_jni.so javalib/src/main/resources/META-INF/native/linux32
 

zwaves_jni/javalib/build.gradle

@@ -1,37 +1,55 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java Library project to get you started.
- * For more details take a look at the Java Libraries chapter in the Gradle
- * User Manual available at https://docs.gradle.org/5.4.1/userguide/java_library_plugin.html
- */
-
 plugins {
-    // Apply the java-library plugin to add support for Java Library
-    id 'java-library'
+    id "java-library"
+    id "maven-publish"
+    id "signing"
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
 }
 
+group = "com.wavesplatform"
+version = "0.2.0"
+
 repositories {
-    // Use jcenter for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    // This dependency is exported to consumers, that is to say found on their compile classpath.
-    api 'org.apache.commons:commons-math3:3.6.1'
-
-    // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:27.0.1-jre'
-
-    // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
 }
 
-
 test {
     useJUnit()
-
     maxHeapSize = '1G'
 }
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+
+            pom {
+                licenses {
+                    license {
+                        name.set("MIT License")
+                        url.set("LICENSE")
+                    }
+                }
+                scm {
+                    connection.set("scm:git:git://github.com/wavesplatform/zwaves.git")
+                    developerConnection.set("scm:git:git@github.com:wavesplatform/zwaves.git")
+                    url.set("https://github.com/wavesplatform/zwaves")
+                }
+            }
+        }
+    }
+}
+
+signing {
+    useInMemoryPgpKeys(gpgKey, gpgPassphrase)
+    sign configurations.archives
+}
+
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}

zwaves_jni/javalib/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

zwaves_jni/javalib/settings.gradle

@@ -1,10 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/5.4.1/userguide/multi_project_builds.html
- */
-
 rootProject.name = 'zwaves'

zwaves_jni/javalib/src/main/java/com/wavesplatform/zwaves/bls12/JNILibrary.java → zwaves_jni/javalib/src/main/java/com/wavesplatform/zwaves/JNILibrary.java

@@ -7,7 +7,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package com.wavesplatform.zwaves.bls12;
+package com.wavesplatform.zwaves;
 
 import java.io.*;
 import java.lang.reflect.Method;
@@ -538,4 +538,4 @@ private boolean loadLibrary(ArrayList<Throwable> errors, String lib) {
         return false;
     }
 
-}
+}

zwaves_jni/javalib/src/main/java/com/wavesplatform/zwaves/ZWavesJNILibrary.java

@@ -0,0 +1,9 @@
+package com.wavesplatform.zwaves;
+
+public class ZWavesJNILibrary {
+    static {
+        new JNILibrary("zwaves_jni", ZWavesJNILibrary.class).load();
+    }
+
+    public static void init() {}
+}

zwaves_jni/javalib/src/main/java/com/wavesplatform/zwaves/bls12/Groth16.java

@@ -4,6 +4,6 @@ public class Groth16 {
     public static native boolean verify(byte[] vk, byte[] proof, byte[] inputs);
 
     static {
-        new JNILibrary("zwaves_jni", Groth16.class).load();
+        com.wavesplatform.zwaves.ZWavesJNILibrary.init();
     }
-}
+}

zwaves_jni/javalib/src/main/java/com/wavesplatform/zwaves/bn256/Groth16.java

@@ -0,0 +1,9 @@
+package com.wavesplatform.zwaves.bn256;
+
+public class Groth16 {
+    public static native boolean verify(byte[] vk, byte[] proof, byte[] inputs);
+
+    static {
+        com.wavesplatform.zwaves.ZWavesJNILibrary.init();
+    }
+}

zwaves_jni/javalib/src/main/resources/META-INF/native/linux64/amd64/.gitkeep

@@ -0,0 +1 @@
+place here libzwaves_jni.so file

zwaves_jni/javalib/src/main/resources/META-INF/native/osx64/aarch64/.gitkeep

@@ -0,0 +1 @@
+place here libzwaves_jni.dylib for Apple ARM file

zwaves_jni/javalib/src/main/resources/META-INF/native/windows32/x86/.gitkeep

@@ -0,0 +1 @@
+place here zwaves_jni.dll file

zwaves_jni/javalib/src/main/resources/META-INF/native/windows64/amd64/.gitkeep

@@ -0,0 +1 @@
+place here zwaves_jni.dll file