Merge pull request #23 from bloxbean/jna_wrapper_0.6.0

Update dependencies to v0.6.0 and remove ScriptSupplier

build.gradle

@@ -11,13 +11,13 @@ repositories {
 sourceCompatibility = '11'
 
 dependencies {
-    implementation group: 'net.java.dev.jna', name: 'jna', version: '5.13.0'
-    implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.13.0'
+    implementation group: 'net.java.dev.jna', name: 'jna', version: '5.15.0'
+    implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.15.0'
 
-    compileOnly group: 'com.bloxbean.cardano', name: 'cardano-client-lib', version: '0.5.0'
+    compileOnly group: 'com.bloxbean.cardano', name: 'cardano-client-lib', version: '0.6.0'
 
-    compileOnly 'org.projectlombok:lombok:1.18.26'
-    annotationProcessor 'org.projectlombok:lombok:1.18.26'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
@@ -28,9 +28,9 @@ dependencies {
     testImplementation('org.assertj:assertj-core:3.24.2')
     testRuntimeOnly 'org.slf4j:slf4j-log4j12:2.0.5'
 
-    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-lib', version: '0.5.0'
-    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-backend-koios', version: '0.5.0'
-    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-backend-blockfrost', version: '0.5.0'
+    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-lib', version: '0.6.0'
+    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-backend-koios', version: '0.6.0'
+    testImplementation group: 'com.bloxbean.cardano', name: 'cardano-client-backend-blockfrost', version: '0.6.0'
 
     testCompileOnly 'org.projectlombok:lombok:1.18.30'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'

download_libs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tag=v0.5.0
+tag=v0.6.0
 
 mkdir -p native/linux-x86-64
 mkdir -p native/darwin-aarch64

gradle/wrapper/gradle-wrapper.properties

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

native/version

@@ -1 +1 @@
-v0.5.0
+v0.6.0

src/integrationTest/java/com/bloxbean/cardano/aiken/tx/evaluator/GuessSumContractIntegrationTest.java

@@ -65,7 +65,7 @@ public void invokeContract() throws Exception {
                 .feePayer(senderAddress2)
                 .withSigner(SignerProviders.signerFrom(sender2))
                 .withTxInspector(transaction -> System.out.println(JsonUtil.getPrettyJson(transaction)))
-                .withTxEvaluator(new AikenTransactionEvaluator(backendService, (scriptHash) -> sumScript))
+                .withTxEvaluator(new AikenTransactionEvaluator(backendService, (scriptHash) -> Optional.of(sumScript)))
                 .completeAndWait(System.out::println);
 
         System.out.println("Unlock Tx: " + result);

src/main/java/com/bloxbean/cardano/aiken/AikenTransactionEvaluator.java

@@ -18,6 +18,7 @@
 import com.bloxbean.cardano.client.transaction.spec.TransactionInput;
 import com.bloxbean.cardano.client.transaction.spec.TransactionWitnessSet;
 import com.bloxbean.cardano.client.util.JsonUtil;
+import com.bloxbean.cardano.client.api.ScriptSupplier;
 import lombok.NonNull;
 
 import java.util.*;
@@ -101,7 +102,7 @@ public Result<List<EvaluationResult>> evaluateTx(byte[] cbor, Set<Utxo> inputUtx
 
                 //Get reference input script
                 if (utxo.getReferenceScriptHash() != null && scriptSupplier != null) {
-                    additionalScripts.add(scriptSupplier.getScript(utxo.getReferenceScriptHash()));
+                    scriptSupplier.getScript(utxo.getReferenceScriptHash()).ifPresent(additionalScripts::add);
                 }
             }