Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to v0.6.0 and remove ScriptSupplier #23

Merged
merged 2 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion download_libs.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Binary file modified native/darwin-aarch64/libaiken_jna_wrapper.dylib
Binary file not shown.
Binary file modified native/darwin-x86-64/libaiken_jna_wrapper.dylib
Binary file not shown.
Binary file modified native/linux-x86-64/libaiken_jna_wrapper.so
Binary file not shown.
2 changes: 1 addition & 1 deletion native/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.5.0
v0.6.0
Binary file modified native/win32-aarch64/aiken_jna_wrapper.dll
Binary file not shown.
Binary file modified native/win32-x86-64/aiken_jna_wrapper.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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);
}
}

Expand Down
10 changes: 0 additions & 10 deletions src/main/java/com/bloxbean/cardano/aiken/ScriptSupplier.java

This file was deleted.

Loading