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.

Sign up for GitHub

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

Jump to bottom

Json deserialization issue #32

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Json deserialization issue #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8dd9e3
fix: #31 Define customer serializer/deserializer for Voter, GovActionId
satran004 Oct 6, 2023
4d025b0
chore: Fixed integration tests
satran004 Oct 6, 2023
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
15 changes: 14 additions & 1 deletion core/src/main/java/com/bloxbean/cardano/yaci/core/model/certs/Certificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,20 @@
@JsonSubTypes.Type(value = PoolRetirement.class, name = "POOL_RETIREMENT"),
@JsonSubTypes.Type(value = StakeDelegation.class, name = "STAKE_DELEGATION"),
@JsonSubTypes.Type(value = StakeDeregistration.class, name = "STAKE_DEREGISTRATION"),
@JsonSubTypes.Type(value = StakeRegistration.class, name = "STAKE_REGISTRATION")
@JsonSubTypes.Type(value = StakeRegistration.class, name = "STAKE_REGISTRATION"),
@JsonSubTypes.Type(value = RegCert.class, name = "REG_CERT"),
@JsonSubTypes.Type(value = UnregCert.class, name = "UNREG_CERT"),
@JsonSubTypes.Type(value = VoteDelegCert.class, name = "VOTE_DELEG_CERT"),
@JsonSubTypes.Type(value = StakeVoteDelegCert.class, name = "STAKE_VOTE_DELEG_CERT"),
@JsonSubTypes.Type(value = StakeRegDelegCert.class, name = "STAKE_REG_DELEG_CERT"),
@JsonSubTypes.Type(value = VoteRegDelegCert.class, name = "VOTE_REG_DELEG_CERT"),
@JsonSubTypes.Type(value = StakeVoteRegDelegCert.class, name = "STAKE_VOTE_REG_DELEG_CERT"),
@JsonSubTypes.Type(value = AuthCommitteeHotCert.class, name = "AUTH_COMMITTEE_HOT_CERT"),
@JsonSubTypes.Type(value = ResignCommitteeColdCert.class, name = "RESIGN_COMMITTEE_COLD_CERT"),
@JsonSubTypes.Type(value = RegDrepCert.class, name = "REG_DREP_CERT"),
@JsonSubTypes.Type(value = UnregDrepCert.class, name = "UNREG_DREP_CERT"),
@JsonSubTypes.Type(value = UpdateDrepCert.class, name = "UPDATE_DREP_CERT")

})
public interface Certificate {
CertificateType getType();
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/governance/GovActionId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.bloxbean.cardano.yaci.core.model.governance;

import com.bloxbean.cardano.yaci.core.model.jackson.GovActionIdDeserializer;
import com.bloxbean.cardano.yaci.core.model.jackson.GovActionIdSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.*;

@Getter
Expand All @@ -8,6 +12,8 @@
@ToString
@EqualsAndHashCode
@Builder
@JsonDeserialize(keyUsing = GovActionIdDeserializer.class)
@JsonSerialize(keyUsing = GovActionIdSerializer.class)
public class GovActionId {
private String transactionId;
private Integer gov_action_index;
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/governance/Voter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package com.bloxbean.cardano.yaci.core.model.governance;

import com.bloxbean.cardano.yaci.core.model.jackson.VoterDeserializer;
import com.bloxbean.cardano.yaci.core.model.jackson.VoterSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.*;

@Getter
Expand All @@ -8,6 +12,8 @@
@ToString
@EqualsAndHashCode
@Builder
@JsonDeserialize(keyUsing = VoterDeserializer.class)
@JsonSerialize(keyUsing = VoterSerializer.class)
public class Voter {
private VoterType type;
private String hash; //key hash or script hash
Expand Down
18 changes: 18 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/jackson/GovActionIdDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.bloxbean.cardano.yaci.core.model.jackson;

import com.bloxbean.cardano.yaci.core.model.governance.GovActionId;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;

public class GovActionIdDeserializer extends KeyDeserializer {
private ObjectMapper objectMapper = new ObjectMapper();

@Override
public Object deserializeKey(String s, DeserializationContext deserializationContext)
throws IOException {
return objectMapper.readValue(s, GovActionId.class);
}
}
17 changes: 17 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/jackson/GovActionIdSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.bloxbean.cardano.yaci.core.model.jackson;

import com.bloxbean.cardano.yaci.core.model.governance.GovActionId;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.IOException;

public class GovActionIdSerializer extends JsonSerializer<GovActionId> {
@Override
public void serialize(GovActionId govActionId, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
ObjectMapper mapper = new ObjectMapper();
jsonGenerator.writeFieldName(mapper.writeValueAsString(govActionId));
}
}
18 changes: 18 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/jackson/VoterDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.bloxbean.cardano.yaci.core.model.jackson;

import com.bloxbean.cardano.yaci.core.model.governance.Voter;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;

public class VoterDeserializer extends KeyDeserializer {
private ObjectMapper objectMapper = new ObjectMapper();

@Override
public Object deserializeKey(String s, DeserializationContext deserializationContext)
throws IOException {
return objectMapper.readValue(s, Voter.class);
}
}
17 changes: 17 additions & 0 deletions core/src/main/java/com/bloxbean/cardano/yaci/core/model/jackson/VoterSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.bloxbean.cardano.yaci.core.model.jackson;

import com.bloxbean.cardano.yaci.core.model.governance.Voter;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.IOException;

public class VoterSerializer extends JsonSerializer<Voter> {
@Override
public void serialize(Voter voter, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
ObjectMapper mapper = new ObjectMapper();
jsonGenerator.writeFieldName(mapper.writeValueAsString(voter));
}
}
2 changes: 1 addition & 1 deletion helper/src/integrationTest/java/com/bloxbean/cardano/yaci/helper/BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ public class BaseTest {
protected long protocolMagic = Constants.PREPROD_PROTOCOL_MAGIC;
protected Point knownPoint = new Point(13003663, "b896e43a25de269cfc47be7afbcbf00cad41a5011725c2732393f1b4508cf41d");

protected String nodeSocketFile = "/Users/satya/work/cardano-node/preprod/db/node.socket";
protected String nodeSocketFile = "/Users/satya/work/cardano-node/preprod-8.1.2/db/node.socket";
}
44 changes: 22 additions & 22 deletions helper/src/integrationTest/java/com/bloxbean/cardano/yaci/helper/ConwayEraIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,30 @@
import org.junit.jupiter.api.Test;

import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;

@Slf4j
public class ConwayEraIT extends BaseTest{

@Test
void syncTest() throws Exception {
//BlockSync blockSync = new BlockSync(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.SANCHONET_PROTOCOL_MAGIC, Constants.WELL_KNOWN_SANCHONET_POINT);
BlockSync blockSync = new BlockSync(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.SANCHONET_PROTOCOL_MAGIC, Constants.WELL_KNOWN_SANCHONET_POINT);
// BlockSync blockSync = new BlockSync("localhost", 30000, Constants.PREPROD_PROTOCOL_MAGIC, Constants.WELL_KNOWN_PREPROD_POINT);
CountDownLatch countDownLatch = new CountDownLatch(5);
List<Block> blocks = new ArrayList<>();
blockSync.startSync(Point.ORIGIN, new BlockChainDataListener() {
public void onBlock(Era era, Block block, List<Transaction> transactions) {
System.out.println(block.getHeader().getHeaderBody().getBlockNumber());
System.out.println(block.getHeader().getHeaderBody().getBlockHash());
System.out.println(block.getHeader().getHeaderBody().getSlot());
System.out.println("# of transactions >> " + transactions.size());
blocks.add(block);
countDownLatch.countDown();
}

@Override
Expand All @@ -45,15 +50,16 @@ public void onByronEbBlock(ByronEbBlock byronEbBlock) {
}
});

while (true)
Thread.sleep(5000);
countDownLatch.await(30, TimeUnit.SECONDS);
assertThat(blocks).hasSize(5);
}

@Test
void syncFromTip() throws Exception {
//BlockSync blockSync = new BlockSync(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.SANCHONET_PROTOCOL_MAGIC, Constants.WELL_KNOWN_SANCHONET_POINT);
BlockSync blockSync = new BlockSync(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.SANCHONET_PROTOCOL_MAGIC, Constants.WELL_KNOWN_SANCHONET_POINT);
// BlockSync blockSync = new BlockSync("localhost", 30000, Constants.PREPROD_PROTOCOL_MAGIC, Constants.WELL_KNOWN_PREPROD_POINT);

CountDownLatch countDownLatch = new CountDownLatch(1);
List<Block> blocks = new ArrayList<>();
blockSync.startSyncFromTip(new BlockChainDataListener() {
public void onBlock(Era era, Block block, List<Transaction> transactions) {
System.out.println(block.getHeader().getHeaderBody().getBlockNumber());
Expand All @@ -64,6 +70,8 @@ public void onBlock(Era era, Block block, List<Transaction> transactions) {
System.out.println("Proposal Procedures: " + transactions.stream().map(t -> t.getBody().getProposalProcedures()).collect(Collectors.toList()));
System.out.println("Current Treasury Value: " + transactions.stream().map(t -> t.getBody().getCurrentTreasuryValue()).collect(Collectors.toList()));
System.out.println("Dontation: " + transactions.stream().map(t -> t.getBody().getDonation()).collect(Collectors.toList()));
blocks.add(block);
countDownLatch.countDown();
}

@Override
Expand All @@ -77,44 +85,36 @@ public void onByronEbBlock(ByronEbBlock byronEbBlock) {
}
});

while (true)
Thread.sleep(5000);
countDownLatch.await(60, TimeUnit.SECONDS);
assertThat(blocks).hasSize(1);
}

@Test
public void fetchBlock() throws InterruptedException {
BlockFetcher blockFetcher = new BlockFetcher(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.SANCHONET_PROTOCOL_MAGIC);

CountDownLatch countDownLatch = new CountDownLatch(1);

AtomicInteger count = new AtomicInteger(0);

// List<Block> blocks = new ArrayList<>();
blockFetcher.start(block -> {
if (count.get() % 1000 == 0)
log.info("Block >>> {} -- {} -- {} -- {}", block.getHeader().getHeaderBody().getBlockNumber(),
block.getHeader().getHeaderBody().getBlockHash(),
block.getHeader().getHeaderBody().getSlot(), block.getEra());

count.incrementAndGet();
// countDownLatch.countDown();

countDownLatch.countDown();
});
Point knownPoint = new Point(20, "6a7d97aae2a65ca790fd14802808b7fce00a3362bd7b21c4ed4ccb4296783b98");

TipFinder tipFinder = new TipFinder(Constants.SANCHONET_PUBLIC_RELAY_ADDR, Constants.SANCHONET_PUBLIC_RELAY_PORT, Constants.WELL_KNOWN_SANCHONET_POINT, Constants.SANCHONET_PROTOCOL_MAGIC);
Tip tip = tipFinder.find().block(Duration.ofSeconds(5));
//Byron blocks
// Point from = new Point(0, "f0f7892b5c333cffc4b3c4344de48af4cc63f55e44936196f365a9ef2244134f");
// Point to = new Point(5, "365201e928da50760fce4bdad09a7338ba43a43aff1c0e8d3ec458388c932ec8");

Point from = Constants.WELL_KNOWN_SANCHONET_POINT;
Point to = tip.getPoint();//new Point(8569937, "8264c74dcdf7afc02e0c176090af367b2662326d623a478710d54e22bf749ebd");
Point to = tip.getPoint();
blockFetcher.fetch(from, to);

while (true)
Thread.sleep(5000);
// blockFetcher.shutdown();
countDownLatch.await(30, TimeUnit.SECONDS);

// assertThat(blocks.get(0).getHeader().getHeaderBody().getBlockNumber()).isEqualTo(287622);
blockFetcher.shutdown();
assertThat(count.get()).isGreaterThanOrEqualTo(1);
}
}
114 changes: 114 additions & 0 deletions helper/src/test/java/com/bloxbean/cardano/yaci/helper/JsonSerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
package com.bloxbean.cardano.yaci.helper;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import com.bloxbean.cardano.yaci.helper.model.Transaction;

public class JsonSerializationTest {

@Test
void deserTransaction() throws JsonProcessingException {
String txnJson = " {\n" +
" \"blockNumber\" : 283100,\n" +
" \"slot\" : 12912862,\n" +
" \"txHash\" : \"b9ebe459c3ba8e890f951dacb50cba6fa02cf099c6308c7abd26cf616bf26ca5\",\n" +
" \"body\" : {\n" +
" \"txHash\" : \"b9ebe459c3ba8e890f951dacb50cba6fa02cf099c6308c7abd26cf616bf26ca5\",\n" +
" \"cbor\" : null,\n" +
" \"inputs\" : [ {\n" +
" \"transactionId\" : \"6d2174d3956d8eb2b3e1e198e817ccf1332a599d5d7320400bfd820490d706be\",\n" +
" \"index\" : 0\n" +
" } ],\n" +
" \"outputs\" : [ {\n" +
" \"address\" : \"addr_test1qpe6s9amgfwtu9u6lqj998vke6uncswr4dg88qqft5d7f67kfjf77qy57hqhnefcqyy7hmhsygj9j38rj984hn9r57fswc4wg0\",\n" +
" \"amounts\" : [ {\n" +
" \"unit\" : \"lovelace\",\n" +
" \"policyId\" : null,\n" +
" \"assetName\" : \"lovelace\",\n" +
" \"quantity\" : 48000000\n" +
" } ],\n" +
" \"datumHash\" : null,\n" +
" \"inlineDatum\" : null,\n" +
" \"scriptRef\" : null\n" +
" } ],\n" +
" \"fee\" : 2000000,\n" +
" \"ttl\" : 0,\n" +
" \"certificates\" : [ ],\n" +
" \"withdrawals\" : null,\n" +
" \"update\" : null,\n" +
" \"auxiliaryDataHash\" : null,\n" +
" \"validityIntervalStart\" : 0,\n" +
" \"mint\" : [ ],\n" +
" \"scriptDataHash\" : \"192d0c0c2c2320e843e080b5f91a9ca35155bc50f3ef3bfdbc72c1711b86367e\",\n" +
" \"collateralInputs\" : [ {\n" +
" \"transactionId\" : \"99c2ef8e340d5991b1acfcb2a3bf06145ab139f0b10837fb8862cf0ec2324d03\",\n" +
" \"index\" : 0\n" +
" } ],\n" +
" \"requiredSigners\" : null,\n" +
" \"netowrkId\" : 0,\n" +
" \"collateralReturn\" : {\n" +
" \"address\" : \"addr_test1qpe6s9amgfwtu9u6lqj998vke6uncswr4dg88qqft5d7f67kfjf77qy57hqhnefcqyy7hmhsygj9j38rj984hn9r57fswc4wg0\",\n" +
" \"amounts\" : [ {\n" +
" \"unit\" : \"lovelace\",\n" +
" \"policyId\" : null,\n" +
" \"assetName\" : \"lovelace\",\n" +
" \"quantity\" : 7000000\n" +
" } ],\n" +
" \"datumHash\" : null,\n" +
" \"inlineDatum\" : null,\n" +
" \"scriptRef\" : null\n" +
" },\n" +
" \"totalCollateral\" : 3000000,\n" +
" \"referenceInputs\" : null,\n" +
" \"votingProcedures\" : null,\n" +
" \"proposalProcedures\" : null,\n" +
" \"currentTreasuryValue\" : null,\n" +
" \"donation\" : null\n" +
" },\n" +
" \"utxos\" : [ ],\n" +
" \"collateralReturnUtxo\" : {\n" +
" \"txHash\" : \"b9ebe459c3ba8e890f951dacb50cba6fa02cf099c6308c7abd26cf616bf26ca5\",\n" +
" \"index\" : 1,\n" +
" \"address\" : \"addr_test1qpe6s9amgfwtu9u6lqj998vke6uncswr4dg88qqft5d7f67kfjf77qy57hqhnefcqyy7hmhsygj9j38rj984hn9r57fswc4wg0\",\n" +
" \"amounts\" : [ {\n" +
" \"unit\" : \"lovelace\",\n" +
" \"policyId\" : null,\n" +
" \"assetName\" : \"lovelace\",\n" +
" \"quantity\" : 7000000\n" +
" } ],\n" +
" \"datumHash\" : null,\n" +
" \"inlineDatum\" : null,\n" +
" \"scriptRef\" : null\n" +
" },\n" +
" \"witnesses\" : {\n" +
" \"vkeyWitnesses\" : [ {\n" +
" \"key\" : \"53442c73a8bdbd7bdb59d033bd35bfb3968784eb85be3955dc025de491744f92\",\n" +
" \"signature\" : \"6f4815ac017228d22290a1276134c34e1a2f970e9816a9a0df0bcaa5fdcc0d636e4d13f7572ce8f826d5302a7a12fd5cfd3ca306970b714c632ddd338db96b08\"\n" +
" } ],\n" +
" \"nativeScripts\" : [ ],\n" +
" \"bootstrapWitnesses\" : [ ],\n" +
" \"plutusV1Scripts\" : [ ],\n" +
" \"datums\" : [ {\n" +
" \"cbor\" : \"19077a\",\n" +
" \"json\" : \"\"\n" +
" } ],\n" +
" \"redeemers\" : [ {\n" +
" \"cbor\" : \"840000187b820a0a\"\n" +
" } ],\n" +
" \"plutusV2Scripts\" : [ {\n" +
" \"type\" : \"2\",\n" +
" \"content\" : \"4746010000222601\"\n" +
" } ],\n" +
" \"plutusV3Scripts\" : [ ]\n" +
" },\n" +
" \"auxData\" : null,\n" +
" \"invalid\" : true\n" +
" }\n";

ObjectMapper objectMapper = new ObjectMapper();
Transaction transaction = objectMapper.readValue(txnJson, Transaction.class);
System.out.println(transaction);

}
}