Merge branch 'main' into feat/RA-60-Single-docker-container

Author: MarMarMot

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionService.java

@@ -35,14 +35,14 @@ public interface CardanoConstructionService {
   TransactionParsed parseTransaction(NetworkIdentifierType networkIdentifierType,
       String transaction, boolean signed);
 
-  Double checkOrReturnDefaultTtl(Integer relativeTtl);
+  Integer checkOrReturnDefaultTtl(Integer relativeTtl);
   Long updateTxSize(Long previousTxSize, Long previousTtl, Long updatedTtl);
   Long calculateTxMinimumFee(Long transactionSize, ProtocolParams protocolParameters);
 
   Signatures signatureProcessor(EraAddressType eraAddressType, AddressType addressType,
       String address);
 
-  Double calculateTxSize(NetworkIdentifierType networkIdentifierType, List<Operation> operations, int ttl, DepositParameters depositParameters);
+  Integer calculateTxSize(NetworkIdentifierType networkIdentifierType, List<Operation> operations, int ttl, DepositParameters depositParameters);
 
   String buildTransaction(String unsignedTransaction,
       List<Signatures> signaturesList, String transactionMetadata);

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/CardanoConstructionServiceImpl.java

@@ -112,8 +112,8 @@ public TransactionParsed parseTransaction(NetworkIdentifierType networkIdentifie
   }
 
   @Override
-  public Double checkOrReturnDefaultTtl(Integer relativeTtl) {
-    return relativeTtl == null ? Constants.DEFAULT_RELATIVE_TTL : relativeTtl.doubleValue();
+  public Integer checkOrReturnDefaultTtl(Integer relativeTtl) {
+    return relativeTtl == null ? Constants.DEFAULT_RELATIVE_TTL : relativeTtl;
   }
 
   @Override
@@ -194,7 +194,7 @@ public Signatures signatureProcessor(EraAddressType eraAddressType, AddressType
   }
 
   @Override
-  public Double calculateTxSize(NetworkIdentifierType networkIdentifierType,
+  public Integer calculateTxSize(NetworkIdentifierType networkIdentifierType,
       List<Operation> operations, int ttl, DepositParameters depositParameters) {
     UnsignedTransaction unsignedTransaction;
     try {
@@ -219,7 +219,9 @@ public Double calculateTxSize(NetworkIdentifierType networkIdentifierType,
 
     String transaction = buildTransaction(unsignedTransaction.bytes(), signaturesList,
         unsignedTransaction.metadata());
-    return ((double) transaction.length() / 2);
+    // the String transaction represents Hex encoded bytes of the transaction.
+    // To get the size of the transaction in bytes, we need to divide the length by two. Because every Hex character represents 4 bits.
+    return (transaction.length() / 2);
 
   }
 

api/src/main/java/org/cardanofoundation/rosetta/api/construction/service/ConstructionApiServiceImpl.java

@@ -100,7 +100,7 @@ public ConstructionPreprocessResponse constructionPreprocessService(
     NetworkIdentifier networkIdentifier = constructionPreprocessRequest.getNetworkIdentifier();
     Optional<ConstructionPreprocessMetadata> metadata = Optional.ofNullable(
         constructionPreprocessRequest.getMetadata());
-    Double relativeTtl;
+    int relativeTtl;
     DepositParameters depositParameters;
     if (metadata.isPresent()) {
       relativeTtl = cardanoConstructionService.checkOrReturnDefaultTtl(
@@ -112,10 +112,10 @@ public ConstructionPreprocessResponse constructionPreprocessService(
       depositParameters = cardanoConstructionService.getDepositParameters();
     }
 
-    Double transactionSize = cardanoConstructionService.calculateTxSize(
+    int transactionSize = cardanoConstructionService.calculateTxSize(
         NetworkIdentifierType.findByName(networkIdentifier.getNetwork()),
         constructionPreprocessRequest.getOperations(), 0, depositParameters);
-    Map<String, Double> response = Map.of(Constants.RELATIVE_TTL, relativeTtl,
+    Map<String, Integer> response = Map.of(Constants.RELATIVE_TTL, relativeTtl,
         Constants.TRANSACTION_SIZE,
         transactionSize);
     return new ConstructionPreprocessResponse(response, null);
@@ -160,13 +160,13 @@ public ConstructionPayloadsResponse constructionPayloadsService(
     int ttl;
     DepositParameters depositParameters;
     if (metadata.isPresent()) {
-      ttl = cardanoConstructionService.checkOrReturnDefaultTtl(metadata.get().getTtl()).intValue();
+      ttl = cardanoConstructionService.checkOrReturnDefaultTtl(metadata.get().getTtl());
       depositParameters = Optional.ofNullable(metadata.get().getProtocolParameters()).map(
           protocolParameters -> new DepositParameters(protocolParameters.getKeyDeposit(),
               protocolParameters.getPoolDeposit())).orElse(
           cardanoConstructionService.getDepositParameters());
     } else {
-      ttl = Constants.DEFAULT_RELATIVE_TTL.intValue();
+      ttl = Constants.DEFAULT_RELATIVE_TTL;
       depositParameters = cardanoConstructionService.getDepositParameters();
     }
 

api/src/main/java/org/cardanofoundation/rosetta/common/util/Constants.java

@@ -54,7 +54,7 @@ private Constants() {
   public static final String MAINNET = "Mainnet";
   public static final String VALID_CURVE_TYPE = CurveType.EDWARDS25519.getValue();
   public static final int PUBLIC_KEY_BYTES_LENGTH = 64;
-  public static final Double DEFAULT_RELATIVE_TTL = 1000.0;
+  public static final Integer DEFAULT_RELATIVE_TTL = 1000;
 
   public static final String EMPTY_HEX = "\\x";
 

api/src/test/java/org/cardanofoundation/rosetta/api/construction/service/PreprocessApiTest.java

@@ -52,7 +52,7 @@ private void assertPreprocessRequest(String constructionPayloadFile, int expecte
 
     ConstructionPreprocessResponse constructionPreprocessResponse = constructionApiService.constructionPreprocessService(
         preprocessRequest);
-    Map<String, Double> options = (Map<String, Double>) constructionPreprocessResponse.getOptions();
+    Map<String, Integer> options = (Map<String, Integer>) constructionPreprocessResponse.getOptions();
     assertEquals(expectedTtl, options.get("relative_ttl"));
     assertEquals(expectedTransactionSize, options.get("transaction_size"));
   }