fix: Serialize ByteString DI and return instead of internal bytes

bloxbean · Feb 27, 2024 · 627cb58 · 627cb58
1 parent c45d8bd
commit 627cb58
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 48 deletions.
diff --git a/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/WitnessesSerializer.java b/core/src/main/java/com/bloxbean/cardano/yaci/core/model/serializers/WitnessesSerializer.java
@@ -8,13 +8,13 @@
 import com.bloxbean.cardano.yaci.core.model.NativeScript;
 import com.bloxbean.cardano.yaci.core.model.*;
 import com.bloxbean.cardano.yaci.core.protocol.Serializer;
-import com.bloxbean.cardano.yaci.core.util.HexUtil;
+import com.bloxbean.cardano.yaci.core.util.CborSerializationUtil;
 import lombok.SneakyThrows;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.bloxbean.cardano.yaci.core.util.CborSerializationUtil.toHex;
+import static com.bloxbean.cardano.yaci.core.util.HexUtil.encodeHexString;
 
 //TODO -- More testing required for deserialization --> serialization
 public enum WitnessesSerializer implements Serializer<Witnesses> {
@@ -81,7 +81,7 @@ public Witnesses deserializeDI(DataItem di) {
                     if (plutusV1ScriptDI == Special.BREAK)
                         continue;
 
-                    String scriptCborHex = toHex(plutusV1ScriptDI);
+                    String scriptCborHex = encodeHexString(CborSerializationUtil.serialize(plutusV1ScriptDI, false));
 
                     PlutusScript plutusScript = new PlutusScript(PlutusScriptType.PlutusScriptV1, scriptCborHex);
                     plutusV1Scripts.add(plutusScript);
@@ -134,7 +134,7 @@ public Witnesses deserializeDI(DataItem di) {
                 for (DataItem plutusV2ScriptDI : plutusV2ScriptDIList) {
                     if (plutusV2ScriptDI == Special.BREAK) continue;
 
-                    String scriptCborHex = toHex(plutusV2ScriptDI);
+                    String scriptCborHex = encodeHexString(CborSerializationUtil.serialize(plutusV2ScriptDI, false));
 
                     PlutusScript plutusScript = new PlutusScript(PlutusScriptType.PlutusScriptV2, scriptCborHex);
                     plutusV2Scripts.add(plutusScript);
@@ -152,7 +152,8 @@ public Witnesses deserializeDI(DataItem di) {
             try {
                 for (DataItem plutusV3ScriptDI : plutusV3ScriptDIList) {
                     if (plutusV3ScriptDI == Special.BREAK) continue;
-                    String scriptCborHex = toHex(plutusV3ScriptDI);
+
+                    String scriptCborHex = encodeHexString(CborSerializationUtil.serialize(plutusV3ScriptDI, false));
 
                     PlutusScript plutusScript = new PlutusScript(PlutusScriptType.PlutusScriptV3, scriptCborHex);
                     plutusV3Scripts.add(plutusScript);
@@ -175,10 +176,10 @@ private BootstrapWitness deserializeBootstrapWitness(Array bootstrapWitnessDI) {
         DataItem chainCodeDI = dataItemList.get(2);
         DataItem attributesDI = dataItemList.get(3);
 
-        String pubKey = HexUtil.encodeHexString(((ByteString) vkeyDI).getBytes());
-        String signature = HexUtil.encodeHexString(((ByteString) sigDI).getBytes());
-        String chainCode = HexUtil.encodeHexString(((ByteString) chainCodeDI).getBytes());
-        String attributes = HexUtil.encodeHexString(((ByteString) attributesDI).getBytes());
+        String pubKey = encodeHexString(((ByteString) vkeyDI).getBytes());
+        String signature = encodeHexString(((ByteString) sigDI).getBytes());
+        String chainCode = encodeHexString(((ByteString) chainCodeDI).getBytes());
+        String attributes = encodeHexString(((ByteString) attributesDI).getBytes());
 
         return new BootstrapWitness(pubKey, signature, chainCode, attributes);
     }
@@ -191,8 +192,8 @@ private VkeyWitness deserializeVkWitness(Array vkWitness) {
         DataItem vkeyDI = dataItemList.get(0);
         DataItem sigDI = dataItemList.get(1);
 
-        String key = HexUtil.encodeHexString(((ByteString) vkeyDI).getBytes());
-        String signature = HexUtil.encodeHexString(((ByteString) sigDI).getBytes());
+        String key = encodeHexString(((ByteString) vkeyDI).getBytes());
+        String signature = encodeHexString(((ByteString) sigDI).getBytes());
 
         return new VkeyWitness(key, signature);
     }

diff --git a/helper/src/integrationTest/java/com/bloxbean/cardano/yaci/helper/BlockFetcherIT.java b/helper/src/integrationTest/java/com/bloxbean/cardano/yaci/helper/BlockFetcherIT.java
@@ -3,6 +3,7 @@
 import com.bloxbean.cardano.client.util.JsonUtil;
 import com.bloxbean.cardano.yaci.core.common.Constants;
 import com.bloxbean.cardano.yaci.core.model.Block;
+import com.bloxbean.cardano.yaci.core.model.PlutusScript;
 import com.bloxbean.cardano.yaci.core.model.Redeemer;
 import com.bloxbean.cardano.yaci.core.model.byron.ByronMainBlock;
 import com.bloxbean.cardano.yaci.core.protocol.blockfetch.BlockfetchAgentListener;
@@ -162,41 +163,75 @@ public void fetchBlock_verifyRedeemerCbor_whenSerDeserMismatch() throws Interrup
         assertThat(redeemer.getData().getCbor()).isEqualTo("d8799fbfff01ff");
     }
 
-    /** Not able to fetch block 0
-     @Test
-     public void fetchGenesisBlockByron() throws InterruptedException {
-     BlockFetcher blockFetcher = new BlockFetcher(node, nodePort, protocolMagic);
-
-     CountDownLatch countDownLatch = new CountDownLatch(2);
-     List<ByronBlock> blocks = new ArrayList<>();
-     blockFetcher.addBlockFetchListener(new BlockfetchAgentListener() {
-     @Override
-     public void byronBlockFound(ByronMainBlock byronBlock) {
-     System.out.println("Byron Block >> " + byronBlock.getHeader().getConsensusData());
-     blocks.add(byronBlock);
-     countDownLatch.countDown();
-     }
-
-     @Override
-     public void byronEbBlockFound(ByronEbBlock byronEbBlock) {
-     System.out.println("Byron Block >> " + byronEbBlock.getHeader().getConsensusData());
-     blocks.add(byronEbBlock);
-     countDownLatch.countDown();
-     }
-     });
-
-     blockFetcher.start();
-
-     Point from = new Point(0, "9ad7ff320c9cf74e0f5ee78d22a85ce42bb0a487d0506bf60cfb5a91ea4497d2");
-     Point to = new Point(1, "1d031daf47281f69cd95ab929c269fd26b1434a56a5bbbd65b7afe85ef96b233");
-     blockFetcher.fetch(from, to);
-
-     countDownLatch.await(100, TimeUnit.SECONDS);
-     blockFetcher.shutdown();
-
-     assertThat(blocks).hasSize(3);
-     assertThat(blocks.get(0).getHeader().getBlockHash()).isEqualTo("9ad7ff320c9cf74e0f5ee78d22a85ce42bb0a487d0506bf60cfb5a91ea4497d2");
-     assertThat(blocks.get(1).getHeader().getBlockHash()).isEqualTo("ab0a64eaf8bc9e96e4df7161d3ace4d32e88cab2315f952665807509e49892eb");
-     }
-     **/
+
+    @Test
+    public void fetchBlock_comparePlutusV1ScriptContent() throws InterruptedException {
+        VersionTable versionTable = N2NVersionTableConstant.v4AndAbove(protocolMagic);
+        BlockFetcher blockFetcher = new BlockFetcher(node, nodePort, versionTable);
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        List<PlutusScript> plutusScripts = new ArrayList<>();
+        blockFetcher.addBlockFetchListener(new BlockfetchAgentListener() {
+            @Override
+            public void byronBlockFound(ByronMainBlock byronBlock) {
+
+            }
+
+            @Override
+            public void blockFound(Block block) {
+                plutusScripts.add(block.getTransactionWitness().get(0).getPlutusV1Scripts().get(0));
+                countDownLatch.countDown();
+            }
+        });
+        blockFetcher.start();
+
+        Point from = new Point(25909468, "9721fed79df1ac1af39b844e9e0f2c89bf8d25655c5c155223da4ada91f5deab");
+        Point to = new Point(25909468, "9721fed79df1ac1af39b844e9e0f2c89bf8d25655c5c155223da4ada91f5deab");
+
+        blockFetcher.fetch(from, to);
+
+        countDownLatch.await(10, TimeUnit.SECONDS);
+        blockFetcher.shutdown();
+
+        assertThat(plutusScripts).hasSize(1);
+        assertThat(plutusScripts.get(0).getContent()).isEqualTo("59088f59088c01000033233223232323233223232323232323232323232323232323232323222232232325335001102013263201b33573892103505435000203500622222353232323232323333332222221233333300100700600500400300235742a00a6ae854010d5d0a8019aba1500235742a0026ae84d5d1280089aba250011357446ae88d5d1280089aba235744a00226ae8940044d55cf1baa00135742a00c4444464464646a6040026444646a6464646002012640026aa06c44a66a0022c464426a6a664424660020060046ae854008d4c08cd5d09aba250022223330290030020012212330010030022235001222323253353029005215335333573466ebc0200380f00ec54cd4ccd5cd19b87003480080f00ec448c0040084c00926130024984c0052625335333573466e24009200003a03b161300c00833302900c025002135573c6ea8004c8c94cd4ccd5cd19b8735573aa002900101801789aba135573ca0022c26ea8004d5d09aba25014500125335333573466e3cdd7299a999ab9a357466ae8940240b80b44d5d0a8048b0088170168a99a9999ab9a3370ea02c9001109100111999ab9a3370ea02e9000109100091931901799ab9c03103402d02c15335333573466e20ccc0794008068031200002e02d13301b001006102d153350061622135301f0022223253353022004215335333573466e3c0040200d40d04d4c0b0c8c8c004dd6008990009aa81e91191999aab9f0022625335333573466ebcd5d0a80100281d01c89aba135744a004260086ae8800c0f44d55cf1baa35742002a66a666ae68cdc39aab9d5002480000d40d04d5d09aab9e500216222350022223500322350042253353253353335734666e54090cdc51919b8a303535001220023371466e2d204a488100303535001220013303a005004337146a006446a0084466e28cdc5a416c0207466e28c0dc010cdc519b8b481600e8cdc5181b80119b8b482e8040e801802c1000fc54cd4ccd5cd19b8900533704008900001f8200a99a999ab9a3371e04200c08007e26a00644a666a004426a00a44a666a004426a00e446a00444a666a004426a00844a666a00442a66a666ae68cdc48060020270268a99a999ab9a3371200201209c09a2666ae68cdc399b8100900c03004e04d104d104d1616161616161616103f103f103f33503a75a0382a66a666ae68cdc79bae008501303f03e13501522235002223500122533553335002213500e2235002225333500221333573466e20cdc0000a4181f82a00c0960982c2c2c2c2666ae68cdc399981b280d01900aa400408c08a208a207c207c2c2c26ea800440b44dd700098159bac0073029375800e26eb00044d55cf1baa001135573a6ea800522010d446a65644f7261636c654e4654003200135501a222533500110162213535300700222233300d00300200122253353009003215335333573466e3c00402007006c406c4cc0240200144cc02001c0108c94cd4ccd5cd19b8735573aa002900100a00989909118010019bae357426aae79400444880044dd51aba135573c6ea80048c8c8ccc88848ccc00401000c008d5d0a8011aba15001357426ae8940044d5d1280089aab9e37540024464460046eac004c8004d5406488c8cccd55cf8011240004a66a666ae68cdc79bae35573aa00400c02c02a26600e00a6eacd55cf2801098021aba2003019135742002640026aa02c444646666aae7c0089200025335333573466e3cdd71aab9d50020040140131375a6aae7940084cc014010d5d100180b89aba1001222123330010040030022333500123003001489042d496e66004881042b496e660025335333573466e20005200000d00c1337169001180119b8148000cdc0000a4004266e2d2000300200132001355012225335333573466e2000520800400d00c133716002006266e2ccdc3000a410008600466e0c005208004489002323233335573ea0044c4646464246660020080060046ae84d5d128021919191999aab9f500226232323212333001004003002375c6ae84d5d1280219a8073ad35742a00664646464a66a666ae68cdc380080700b00a8b0a99a999ab9a3371000201c02c02a26601e66e04038008cdc08070008998078010009bad357426ae894008dd69aba15001135573c6ea8004d5d0a80180a89aba25001135573c6ea8004d5d0a8019bae35742a00602026ae8940044d55cf1baa0014800088cc00c0080048848cc00400c008488c8c8cccd5cd19b8735573aa00490001199109198008018011919191999ab9a3370e6aae754009200023322123300100300233500a00935742a00460166ae84d5d1280111931900699ab9c00f01200b135573ca00226ea8004d5d0a8011919191999ab9a3370e6aae754009200023322123300100300233500a00935742a00460166ae84d5d1280111931900699ab9c00f01200b135573ca00226ea8004d5d09aba2500223263200933573801601c00e26aae7940044dd500089119191999ab9a3370ea00290021091100091999ab9a3370ea00490011190911180180218031aba135573ca00846666ae68cdc3a801a400042444004464c6401466ae7003003c02001c0184d55cea80089baa0012323333573466e1d40052002200623333573466e1d40092000200623263200633573801001600800626aae74dd5000a4c2440042440029210350543100320013550052233335573e0024a00e466a00c6ae84008c00cd5d1001002190009aa802111999aab9f0012500623350053574200460066ae8800800c480044488008488488cc00401000c448c8c00400488cc00cc008008004cd4488cd4488ccccc008cc011220120a8f62061488f074f1a0f8f8c57a37633717eaffd4dd091d85049e959cb4960930048009221205e3537791bd5c62dcf54be6a438615186566fafe543571b18066f5552902a8b90048811cc98a2f16a5800847a3c027fafc3f63a8442b92836773533d74cbf2080048203776c052210355534400222221233333001006005004003002200122123300100300220011");
+    }
+
+        /** Not able to fetch block 0
+         @Test
+         public void fetchGenesisBlockByron() throws InterruptedException {
+         BlockFetcher blockFetcher = new BlockFetcher(node, nodePort, protocolMagic);
+
+         CountDownLatch countDownLatch = new CountDownLatch(2);
+         List<ByronBlock> blocks = new ArrayList<>();
+         blockFetcher.addBlockFetchListener(new BlockfetchAgentListener() {
+         @Override
+         public void byronBlockFound(ByronMainBlock byronBlock) {
+         System.out.println("Byron Block >> " + byronBlock.getHeader().getConsensusData());
+         blocks.add(byronBlock);
+         countDownLatch.countDown();
+         }
+
+         @Override
+         public void byronEbBlockFound(ByronEbBlock byronEbBlock) {
+         System.out.println("Byron Block >> " + byronEbBlock.getHeader().getConsensusData());
+         blocks.add(byronEbBlock);
+         countDownLatch.countDown();
+         }
+         });
+
+         blockFetcher.start();
+
+         Point from = new Point(0, "9ad7ff320c9cf74e0f5ee78d22a85ce42bb0a487d0506bf60cfb5a91ea4497d2");
+         Point to = new Point(1, "1d031daf47281f69cd95ab929c269fd26b1434a56a5bbbd65b7afe85ef96b233");
+         blockFetcher.fetch(from, to);
+
+         countDownLatch.await(100, TimeUnit.SECONDS);
+         blockFetcher.shutdown();
+
+         assertThat(blocks).hasSize(3);
+         assertThat(blocks.get(0).getHeader().getBlockHash()).isEqualTo("9ad7ff320c9cf74e0f5ee78d22a85ce42bb0a487d0506bf60cfb5a91ea4497d2");
+         assertThat(blocks.get(1).getHeader().getBlockHash()).isEqualTo("ab0a64eaf8bc9e96e4df7161d3ace4d32e88cab2315f952665807509e49892eb");
+         }
+         **/
 }