chore: Publishing PeerDAS KZG (java) (#30)

kevaundray · web-flow · commit 9cf6c5324c38 · 2024-06-27T18:28:50.000+01:00
diff --git a/.github/scripts/install_all_targets.sh b/.github/scripts/install_all_targets.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+rustup target add x86_64-apple-darwin aarch64-apple-darwin x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu x86_64-pc-windows-gnu
diff --git a/.github/workflows/release-csharp-bindings.yml b/.github/workflows/release-csharp-bindings.yml
@@ -20,6 +20,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@1.74.1
 
+      - name: Install all of the relevant targets
+        run: |
+          chmod +x .github/scripts/install_all_targets.sh
+          .github/scripts/install_all_targets.sh
+
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:
@@ -58,8 +63,8 @@ jobs:
 
       - name: Run compile script
         run: |
-          chmod +x scripts/compile_all_targets_c_sharp.sh
-          scripts/compile_all_targets_c_sharp.sh
+          chmod +x .github/scripts/compile_all_targets_c_sharp.sh
+          .github/scripts/compile_all_targets_c_sharp.sh
 
       - name: Restore NuGet packages
         working-directory: bindings/csharp/csharp_code/PeerDASKZG.bindings
diff --git a/.github/workflows/release-java-bindings.yml b/.github/workflows/release-java-bindings.yml
@@ -15,11 +15,16 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
         with:
-          ref: master
+          ref: ${{ inputs.ref }}
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@1.74.1
 
+      - name: Install all of the relevant targets
+        run: |
+          chmod +x .github/scripts/install_all_targets.sh
+          .github/scripts/install_all_targets.sh
+        
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -63,10 +68,11 @@ jobs:
 
       - name: Run compile script
         run: |
-          chmod +x scripts/compile_all_targets_java.sh
-          scripts/compile_all_targets_java.sh
+          chmod +x .github/scripts/compile_all_targets_java.sh
+          .github/scripts/compile_all_targets_java.sh
 
       - name: Publish Java package to Maven Central
+        working-directory: bindings/java/java_code
         env:
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.CENTRAL_PORTAL_TOKEN_USERNAME }}
           JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.CENTRAL_PORTAL_TOKEN_PASSWORD }}
@@ -83,5 +89,5 @@ jobs:
         with:
           name: jreleaser-logs
           path: |
-            build/jreleaser/trace.log
-            build/jreleaser/output.properties
+            bindings/java/java_code/build/jreleaser/trace.log
+            bindings/java/java_code/build/jreleaser/output.properties
diff --git a/bindings/java/java_code/build.gradle b/bindings/java/java_code/build.gradle
@@ -7,8 +7,8 @@ plugins {
     id 'org.jreleaser' version '1.12.0'
 }
 
-group = 'io.github.crate-crypto.peerdas-kzg'
-version = '0.0.1' // x-release-please-version
+group = 'io.github.crate-crypto'
+version = '0.0.7' // x-release-please-version
 
 
 java {
@@ -84,6 +84,14 @@ publishing {
 }
         
 jreleaser {
+  // Jreleaser will look for .git and its at the top level repository
+  gitRootSearch = true
+  release {
+    // Skip releases as this is handled by release-please
+    github {
+      skipRelease = true
+    }
+  }
   signing {
     active = 'ALWAYS'
     armored = true
diff --git a/bindings/java/java_code/settings.gradle b/bindings/java/java_code/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'java-peerdas-ij'
+rootProject.name = 'peerdas-kzg'
 
diff --git a/bindings/java/java_code/src/main/java/ethereum/cryptography/LibPeerDASKZG.java b/bindings/java/java_code/src/main/java/ethereum/cryptography/LibPeerDASKZG.java
@@ -59,34 +59,49 @@ public void destroy() {
         }
     }
 
+    // TODO: we could move this to the rust code but it requires a double pointer
+    // TODO: add this code to all bindings
+    private void checkContextHasNotBeenFreed() {
+        if (contextPtr == 0) {
+            throw new IllegalStateException("PeerDAS context has been destroyed");
+        }
+    }
+
     public byte[] blobToKZGCommitment(byte[] blob) {
+        checkContextHasNotBeenFreed();
         return blobToKZGCommitment(contextPtr, blob);
     }
     
     public CellsAndProofs computeCellsAndKZGProofs(byte[] blob) {
+        checkContextHasNotBeenFreed();
         CellsAndProofs cellsAndProofs = computeCellsAndKZGProofs(contextPtr, blob);
         return cellsAndProofs;
     }
 
     public byte[][] computeCells(byte[] blob) {
+        checkContextHasNotBeenFreed();
         CellsAndProofs cellsAndProofs = computeCellsAndKZGProofs(blob);
         return cellsAndProofs.cells;
     }
 
     public boolean verifyCellKZGProof(byte[] commitment, long cellID, byte[] cell, byte[] proof) {
+        checkContextHasNotBeenFreed();
         return verifyCellKZGProof(contextPtr, commitment, cellID, cell, proof);
     }
 
     public boolean verifyCellKZGProofBatch(byte[][] commitmentsArr, long[] rowIndices, long[] columnIndices, byte[][] cellsArr,
             byte[][] proofsArr) {
+                checkContextHasNotBeenFreed();
         return verifyCellKZGProofBatch(contextPtr, commitmentsArr, rowIndices, columnIndices, cellsArr, proofsArr);
     }
     
     public byte[][] recoverAllCells(long[] cellIDs, byte[][] cellsArr) {
+        checkContextHasNotBeenFreed();
         return recoverCellsAndProofs(cellIDs, cellsArr).cells;
     }
     
     public CellsAndProofs recoverCellsAndProofs(long[] cellIDs, byte[][] cellsArr) {
+        checkContextHasNotBeenFreed();
         return recoverCellsAndProof(contextPtr, cellIDs, cellsArr);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+rustup target add x86_64-apple-darwin aarch64-apple-darwin x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu x86_64-pc-windows-gnu`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-rootProject.name = 'java-peerdas-ij'`
	`1`	`+rootProject.name = 'peerdas-kzg'`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -59,34 +59,49 @@ public void destroy() {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ // TODO: we could move this to the rust code but it requires a double pointer`
	`63`	`+ // TODO: add this code to all bindings`
	`64`	`+ private void checkContextHasNotBeenFreed() {`
	`65`	`+ if (contextPtr == 0) {`
	`66`	`+ throw new IllegalStateException("PeerDAS context has been destroyed");`
	`67`	`+ }`
	`68`	`+ }`
	`69`	`+`
`62`	`70`	`public byte[] blobToKZGCommitment(byte[] blob) {`
	`71`	`+ checkContextHasNotBeenFreed();`
`63`	`72`	`return blobToKZGCommitment(contextPtr, blob);`
`64`	`73`	`}`
`65`	`74`
`66`	`75`	`public CellsAndProofs computeCellsAndKZGProofs(byte[] blob) {`
	`76`	`+ checkContextHasNotBeenFreed();`
`67`	`77`	`CellsAndProofs cellsAndProofs = computeCellsAndKZGProofs(contextPtr, blob);`
`68`	`78`	`return cellsAndProofs;`
`69`	`79`	`}`
`70`	`80`
`71`	`81`	`public byte[][] computeCells(byte[] blob) {`
	`82`	`+ checkContextHasNotBeenFreed();`
`72`	`83`	`CellsAndProofs cellsAndProofs = computeCellsAndKZGProofs(blob);`
`73`	`84`	`return cellsAndProofs.cells;`
`74`	`85`	`}`
`75`	`86`
`76`	`87`	`public boolean verifyCellKZGProof(byte[] commitment, long cellID, byte[] cell, byte[] proof) {`
	`88`	`+ checkContextHasNotBeenFreed();`
`77`	`89`	`return verifyCellKZGProof(contextPtr, commitment, cellID, cell, proof);`
`78`	`90`	`}`
`79`	`91`
`80`	`92`	`public boolean verifyCellKZGProofBatch(byte[][] commitmentsArr, long[] rowIndices, long[] columnIndices, byte[][] cellsArr,`
`81`	`93`	`byte[][] proofsArr) {`
	`94`	`+ checkContextHasNotBeenFreed();`
`82`	`95`	`return verifyCellKZGProofBatch(contextPtr, commitmentsArr, rowIndices, columnIndices, cellsArr, proofsArr);`
`83`	`96`	`}`
`84`	`97`
`85`	`98`	`public byte[][] recoverAllCells(long[] cellIDs, byte[][] cellsArr) {`
	`99`	`+ checkContextHasNotBeenFreed();`
`86`	`100`	`return recoverCellsAndProofs(cellIDs, cellsArr).cells;`
`87`	`101`	`}`
`88`	`102`
`89`	`103`	`public CellsAndProofs recoverCellsAndProofs(long[] cellIDs, byte[][] cellsArr) {`
	`104`	`+ checkContextHasNotBeenFreed();`
`90`	`105`	`return recoverCellsAndProof(contextPtr, cellIDs, cellsArr);`
`91`	`106`	`}`
`92`	`107`