From 8b1e288d7955483329d06744f76265bc6ff7d2fa Mon Sep 17 00:00:00 2001 From: Satya Date: Sat, 11 Nov 2023 13:09:45 +0800 Subject: [PATCH 1/3] feat: Added assetName bytes to Amount object --- .../java/com/bloxbean/cardano/yaci/core/model/Amount.java | 1 + .../core/model/serializers/TransactionBodySerializer.java | 4 ++-- .../core/model/serializers/TransactionOutputSerializer.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/Amount.java b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/Amount.java index e7d1e2b..9baf698 100644 --- a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/Amount.java +++ b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/Amount.java @@ -15,5 +15,6 @@ public class Amount { private String policyId; //utf-8 assetname private String assetName; + private byte[] assetNameBytes; private BigInteger quantity; } diff --git a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionBodySerializer.java b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionBodySerializer.java index fca0475..9e82912 100644 --- a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionBodySerializer.java +++ b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionBodySerializer.java @@ -1,7 +1,7 @@ package com.bloxbean.cardano.yaci.core.model.serializers; -import co.nstant.in.cbor.model.*; import co.nstant.in.cbor.model.Map; +import co.nstant.in.cbor.model.*; import com.bloxbean.cardano.client.api.util.AssetUtil; import com.bloxbean.cardano.yaci.core.config.YaciConfig; import com.bloxbean.cardano.yaci.core.model.*; @@ -11,7 +11,6 @@ import com.bloxbean.cardano.yaci.core.model.serializers.governance.ProposalProcedureSerializer; import com.bloxbean.cardano.yaci.core.model.serializers.governance.VotingProceduresSerializer; import com.bloxbean.cardano.yaci.core.protocol.Serializer; -import com.bloxbean.cardano.yaci.core.util.CborSerializationUtil; import com.bloxbean.cardano.yaci.core.util.HexUtil; import com.bloxbean.cardano.yaci.core.util.StringUtil; import com.bloxbean.cardano.yaci.core.util.TxUtil; @@ -137,6 +136,7 @@ public TransactionBody deserializeDI(DataItem di, byte[] txBytes) { .unit(policyId + "." + hexName) .policyId(policyId) .assetName(assetName) + .assetNameBytes(assetNameBS.getBytes()) .quantity(value).build(); mintAssets.add(amount); diff --git a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionOutputSerializer.java b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionOutputSerializer.java index 2a56c33..778c663 100644 --- a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionOutputSerializer.java +++ b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/TransactionOutputSerializer.java @@ -3,14 +3,14 @@ import co.nstant.in.cbor.model.Number; import co.nstant.in.cbor.model.*; import com.bloxbean.cardano.client.address.util.AddressUtil; -import com.bloxbean.cardano.client.util.AssetUtil; +import com.bloxbean.cardano.client.api.util.AssetUtil; import com.bloxbean.cardano.yaci.core.exception.CborRuntimeException; import com.bloxbean.cardano.yaci.core.model.Amount; import com.bloxbean.cardano.yaci.core.model.TransactionOutput; import com.bloxbean.cardano.yaci.core.protocol.Serializer; import com.bloxbean.cardano.yaci.core.util.CborSerializationUtil; -import com.bloxbean.cardano.yaci.core.util.StringUtil; import com.bloxbean.cardano.yaci.core.util.HexUtil; +import com.bloxbean.cardano.yaci.core.util.StringUtil; import java.math.BigInteger; import java.nio.charset.StandardCharsets; @@ -167,6 +167,7 @@ private List parseValue(DataItem valueItem) { .unit(policyId + "." + hexName) .policyId(policyId) .assetName(assetName) + .assetNameBytes(assetNameBS.getBytes()) .quantity(value).build(); amounts.add(amount); From 007fedd9e584cd13ee790c1c55ba44fc9d2ebdf0 Mon Sep 17 00:00:00 2001 From: Satya Date: Sat, 11 Nov 2023 13:10:23 +0800 Subject: [PATCH 2/3] chore: Bump version for next release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c130b52..6686492 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = com.bloxbean.cardano artifactId = yaci -version = 0.3.0-beta5-SNAPSHOT +version = 0.3.0-beta5 From fa4dd7f3e3ab0a790dfadd8f5fed4c50df35975a Mon Sep 17 00:00:00 2001 From: Satya Date: Sat, 11 Nov 2023 13:12:03 +0800 Subject: [PATCH 3/3] chore: Auto close and release --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9e444bf..78bdb8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,8 +30,8 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} -# - name: Close And Release Repository -# run: ./gradlew closeAndReleaseRepository -# env: -# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} -# MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + - name: Close And Release Repository + run: ./gradlew closeAndReleaseRepository + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}