refactor: Revert AssetUtil package move to avoid breaking change (#468)

satran004 · web-flow · commit 2d0ef4446c2b · 2024-11-22T16:43:12.000+08:00
diff --git a/backend-modules/koios/src/main/java/com/bloxbean/cardano/client/backend/koios/KoiosAssetService.java b/backend-modules/koios/src/main/java/com/bloxbean/cardano/client/backend/koios/KoiosAssetService.java
@@ -3,7 +3,7 @@
 import com.bloxbean.cardano.client.api.common.OrderEnum;
 import com.bloxbean.cardano.client.api.exception.ApiException;
 import com.bloxbean.cardano.client.api.model.Result;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.backend.api.AssetService;
 import com.bloxbean.cardano.client.backend.model.Asset;
 import com.bloxbean.cardano.client.backend.model.AssetAddress;
diff --git a/core-api/src/main/java/com/bloxbean/cardano/client/api/model/Amount.java b/core-api/src/main/java/com/bloxbean/cardano/client/api/model/Amount.java
@@ -1,6 +1,6 @@
 package com.bloxbean.cardano.client.api.model;
 
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
diff --git a/core-api/src/main/java/com/bloxbean/cardano/client/api/model/Utxo.java b/core-api/src/main/java/com/bloxbean/cardano/client/api/model/Utxo.java
@@ -1,6 +1,6 @@
 package com.bloxbean.cardano.client.api.model;
 
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.transaction.spec.Asset;
 import com.bloxbean.cardano.client.transaction.spec.MultiAsset;
 import com.bloxbean.cardano.client.transaction.spec.Value;
diff --git a/core-api/src/main/java/com/bloxbean/cardano/client/api/util/AssetUtil.java b/core-api/src/main/java/com/bloxbean/cardano/client/api/util/AssetUtil.java
@@ -1,4 +1,4 @@
-package com.bloxbean.cardano.client.transaction.util;
+package com.bloxbean.cardano.client.api.util;
 
 import com.bloxbean.cardano.client.transaction.spec.Asset;
 import com.bloxbean.cardano.client.transaction.spec.MultiAsset;
diff --git a/core-api/src/main/java/com/bloxbean/cardano/client/api/util/Bech32.java b/core-api/src/main/java/com/bloxbean/cardano/client/api/util/Bech32.java
@@ -1,4 +1,4 @@
-package com.bloxbean.cardano.client.transaction.util;
+package com.bloxbean.cardano.client.api.util;
 
 /*
  * Copyright 2018 Coinomi Ltd
diff --git a/core-api/src/main/java/com/bloxbean/cardano/client/api/util/UtxoUtil.java b/core-api/src/main/java/com/bloxbean/cardano/client/api/util/UtxoUtil.java
@@ -6,7 +6,6 @@
 import com.bloxbean.cardano.client.transaction.spec.Asset;
 import com.bloxbean.cardano.client.transaction.spec.MultiAsset;
 import com.bloxbean.cardano.client.transaction.spec.TransactionOutput;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
 import com.bloxbean.cardano.client.util.HexUtil;
 import com.bloxbean.cardano.client.util.Tuple;
 import lombok.NonNull;
diff --git a/core-api/src/test/java/com/bloxbean/cardano/client/api/util/AssetUtilTest.java b/core-api/src/test/java/com/bloxbean/cardano/client/api/util/AssetUtilTest.java
@@ -2,7 +2,6 @@
 
 import com.bloxbean.cardano.client.transaction.spec.Asset;
 import com.bloxbean.cardano.client.transaction.spec.MultiAsset;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
 import com.bloxbean.cardano.client.util.HexUtil;
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/main/java/com/bloxbean/cardano/client/api/helper/impl/UtxoTransactionBodyBuilder.java b/core/src/main/java/com/bloxbean/cardano/client/api/helper/impl/UtxoTransactionBodyBuilder.java
@@ -4,7 +4,7 @@
 import com.bloxbean.cardano.client.api.model.Amount;
 import com.bloxbean.cardano.client.api.model.ProtocolParams;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.coinselection.UtxoSelectionStrategy;
 import com.bloxbean.cardano.client.common.CardanoConstants;
 import com.bloxbean.cardano.client.common.MinAdaCalculator;
diff --git a/core/src/main/java/com/bloxbean/cardano/client/util/AssetUtil.java b/core/src/main/java/com/bloxbean/cardano/client/util/AssetUtil.java
@@ -13,7 +13,7 @@
 
 @Deprecated(forRemoval = true)
 /**
- * @deprecated Use {@link com.bloxbean.cardano.client.transaction.util.AssetUtil} instead
+ * @deprecated Use {@link com.bloxbean.cardano.client.api.util.AssetUtil} instead
  */
 public class AssetUtil {
 
diff --git a/function/src/main/java/com/bloxbean/cardano/client/function/helper/InputBuilders.java b/function/src/main/java/com/bloxbean/cardano/client/function/helper/InputBuilders.java
@@ -3,7 +3,7 @@
 import com.bloxbean.cardano.client.api.exception.ApiException;
 import com.bloxbean.cardano.client.api.exception.ApiRuntimeException;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.api.util.UtxoUtil;
 import com.bloxbean.cardano.client.config.Configuration;
 import com.bloxbean.cardano.client.exception.CborRuntimeException;
diff --git a/function/src/test/java/com/bloxbean/cardano/client/function/helper/FeeCalculatorsTest.java b/function/src/test/java/com/bloxbean/cardano/client/function/helper/FeeCalculatorsTest.java
@@ -2,7 +2,7 @@
 
 import com.bloxbean.cardano.client.api.ScriptSupplier;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.function.BaseTest;
 import com.bloxbean.cardano.client.account.Account;
 import com.bloxbean.cardano.client.api.exception.ApiException;
diff --git a/function/src/test/java/com/bloxbean/cardano/client/function/helper/InputBuildersTest.java b/function/src/test/java/com/bloxbean/cardano/client/function/helper/InputBuildersTest.java
@@ -1,7 +1,7 @@
 package com.bloxbean.cardano.client.function.helper;
 
 import co.nstant.in.cbor.CborException;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.api.util.PolicyUtil;
 import com.bloxbean.cardano.client.function.BaseTest;
 import com.bloxbean.cardano.client.api.UtxoSupplier;
diff --git a/function/src/test/java/com/bloxbean/cardano/client/function/helper/SignerProvidersTest.java b/function/src/test/java/com/bloxbean/cardano/client/function/helper/SignerProvidersTest.java
@@ -1,7 +1,7 @@
 package com.bloxbean.cardano.client.function.helper;
 
 import com.bloxbean.cardano.client.account.Account;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.common.model.Networks;
 import com.bloxbean.cardano.client.crypto.KeyGenUtil;
 import com.bloxbean.cardano.client.crypto.SecretKey;
diff --git a/integration-test/src/it/java/com/bloxbean/cardano/client/backend/api/helper/BatchTransactionsIT.java b/integration-test/src/it/java/com/bloxbean/cardano/client/backend/api/helper/BatchTransactionsIT.java
@@ -9,7 +9,7 @@
 import com.bloxbean.cardano.client.api.helper.TransactionHelperService;
 import com.bloxbean.cardano.client.api.helper.model.TransactionResult;
 import com.bloxbean.cardano.client.api.model.Result;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.backend.api.*;
 import com.bloxbean.cardano.client.backend.model.Block;
 import com.bloxbean.cardano.client.backend.model.TransactionContent;
diff --git a/integration-test/src/it/java/com/bloxbean/cardano/client/backend/api/helper/ContractTransactionIT.java b/integration-test/src/it/java/com/bloxbean/cardano/client/backend/api/helper/ContractTransactionIT.java
@@ -11,7 +11,7 @@
 import com.bloxbean.cardano.client.api.model.Amount;
 import com.bloxbean.cardano.client.api.model.Result;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.backend.api.*;
 import com.bloxbean.cardano.client.backend.model.Block;
 import com.bloxbean.cardano.client.backend.model.TransactionContent;
diff --git a/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/AbstractTx.java b/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/AbstractTx.java
@@ -2,7 +2,7 @@
 
 import com.bloxbean.cardano.client.api.model.Amount;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.exception.CborRuntimeException;
 import com.bloxbean.cardano.client.exception.CborSerializationException;
 import com.bloxbean.cardano.client.function.TxBuilder;
diff --git a/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/Tx.java b/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/Tx.java
@@ -5,7 +5,7 @@
 import com.bloxbean.cardano.client.address.Credential;
 import com.bloxbean.cardano.client.api.model.Amount;
 import com.bloxbean.cardano.client.api.model.Utxo;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.function.TxBuilder;
 import com.bloxbean.cardano.client.function.exception.TxBuildException;
 import com.bloxbean.cardano.client.transaction.spec.Asset;
diff --git a/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/blueprint/extender/MintValidatorExtender.java b/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/blueprint/extender/MintValidatorExtender.java
@@ -1,7 +1,7 @@
 package com.bloxbean.cardano.client.quicktx.blueprint.extender;
 
 import com.bloxbean.cardano.client.api.model.Amount;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.exception.CborRuntimeException;
 import com.bloxbean.cardano.client.exception.CborSerializationException;
 import com.bloxbean.cardano.client.plutus.blueprint.model.Data;
diff --git a/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/verifiers/OutputAmountVerifier.java b/quicktx/src/main/java/com/bloxbean/cardano/client/quicktx/verifiers/OutputAmountVerifier.java
@@ -1,7 +1,7 @@
 package com.bloxbean.cardano.client.quicktx.verifiers;
 
 import com.bloxbean.cardano.client.api.model.Amount;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
+import com.bloxbean.cardano.client.api.util.AssetUtil;
 import com.bloxbean.cardano.client.quicktx.Verifier;
 import com.bloxbean.cardano.client.quicktx.VerifierException;
 import com.bloxbean.cardano.client.transaction.spec.Transaction;
diff --git a/transaction-spec/src/main/java/com/bloxbean/cardano/client/transaction/spec/Value.java b/transaction-spec/src/main/java/com/bloxbean/cardano/client/transaction/spec/Value.java
@@ -4,7 +4,6 @@
 import co.nstant.in.cbor.model.*;
 import com.bloxbean.cardano.client.common.cbor.CborSerializationUtil;
 import com.bloxbean.cardano.client.common.cbor.custom.SortedMap;
-import com.bloxbean.cardano.client.transaction.util.AssetUtil;
 import com.bloxbean.cardano.client.util.Tuple;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,8 +18,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.bloxbean.cardano.client.common.CardanoConstants.LOVELACE;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -171,26 +168,18 @@ public Value plus(Value that) {
         return this.add(that);
     }
 
-    public Value addLovelace(BigInteger amount) {
-        return this.add(fromLovelace(amount));
-    }
-
     public Value add(String policyId, String assetName, BigInteger amount) {
         return this.add(from(policyId, assetName, amount));
     }
 
     public Value add(String unit, BigInteger amount) {
-        if (unit == null || LOVELACE.equals(unit)) {
-            return add(fromLovelace(amount));
-        } else {
-            Tuple<String, String> policyAndAssetName = AssetUtil.getPolicyIdAndAssetName(unit);
-            return this.add(from(policyAndAssetName._1, policyAndAssetName._2, amount));
-        }
+        Tuple<String, String> policyAndAssetName = getPolicyAndAssetName(unit);
+        return this.add(from(policyAndAssetName._1, policyAndAssetName._2, amount));
     }
 
 
     public static Value from(String policyId, String assetName, BigInteger amount) {
-        if (policyId == null || policyId.isBlank()) {
+        if ((policyId != null && policyId.equals("lovelace")) || (assetName != null && assetName.equals("lovelace"))) {
             return fromLovelace(amount);
         } else {
             return Value.builder()
@@ -257,12 +246,8 @@ public Value subtract(String policyId, String assetName, BigInteger amount) {
     }
 
     public Value subtract(String unit, BigInteger amount) {
-        if (unit == null || LOVELACE.equals(unit)) {
-            return subtract(fromLovelace(amount));
-        } else {
-            Tuple<String, String> policyAndAssetName = AssetUtil.getPolicyIdAndAssetName(unit);
-            return subtract(from(policyAndAssetName._1, policyAndAssetName._2, amount));
-        }
+        Tuple<String, String> policyAndAssetName = getPolicyAndAssetName(unit);
+        return this.subtract(from(policyAndAssetName._1, policyAndAssetName._2, amount));
     }
 
 
@@ -279,10 +264,17 @@ public BigInteger amountOf(String policyId, String assetName) {
     }
 
     public BigInteger amountOf(String unit) {
-        Tuple<String, String> policyAndAssetName = AssetUtil.getPolicyIdAndAssetName(unit);
+        Tuple<String, String> policyAndAssetName = getPolicyAndAssetName(unit);
         return amountOf(policyAndAssetName._1, policyAndAssetName._2);
     }
 
+    private Tuple<String, String> getPolicyAndAssetName(String unit) {
+        String sanitisedUnit = unit.replace(".", "");
+        String policyId = sanitisedUnit.substring(0, 56);
+        String assetName = "0x" + sanitisedUnit.substring(56);
+        return new Tuple<>(policyId, assetName);
+    }
+
     public boolean isZero() {
         return (multiAssets == null || multiAssets.isEmpty()) && BigInteger.ZERO.equals(coin);
     }
@@ -295,7 +287,7 @@ public boolean isZero() {
     public boolean isPositive() {
         boolean isCoinPositive = coin.signum() >= 0;
         boolean allAssetsPositive = multiAssets == null || multiAssets.isEmpty() ||
-                multiAssets.stream().allMatch(multiAsset -> multiAsset.getAssets().stream().allMatch(asset -> asset.getValue().signum() >= 0));
+                multiAssets.stream().allMatch(multiAsset -> multiAsset.getAssets().stream().allMatch(asset -> asset.getValue().longValue() >= 0));
         return isCoinPositive && allAssetsPositive;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.bloxbean.cardano.client.transaction.util;`
	`1`	`+package com.bloxbean.cardano.client.api.util;`
`2`	`2`
`3`	`3`	`import com.bloxbean.cardano.client.transaction.spec.Asset;`
`4`	`4`	`import com.bloxbean.cardano.client.transaction.spec.MultiAsset;`