Skip to content

Commit 0f64cdd

Browse files
shlegershleger
authored
feat: RA-43 fix naming (#87)
* feat: RA-43 fix naming * feat: RA-43 reformat
1 parent 75b6d16 commit 0f64cdd

35 files changed

+527
-477
lines changed

‎api/src/main/java/org/cardanofoundation/rosetta/api/account/service/impl/AccountServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import lombok.extern.slf4j.Slf4j;
77
import org.cardanofoundation.rosetta.common.exception.ExceptionFactory;
88
import org.cardanofoundation.rosetta.common.mapper.DataMapper;
9-
import org.cardanofoundation.rosetta.api.block.model.dto.BlockDto;
9+
import org.cardanofoundation.rosetta.api.block.model.domain.Block;
1010
import org.cardanofoundation.rosetta.api.account.model.dto.UtxoDto;
1111
import org.cardanofoundation.rosetta.api.account.service.AccountService;
1212
import org.cardanofoundation.rosetta.api.block.service.BlockService;
@@ -63,7 +63,7 @@ public AccountCoinsResponse getAccountCoins(AccountCoinsRequest accountCoinsRequ
6363
}
6464
List<Currency> currenciesRequested = Validations.filterRequestedCurrencies(currencies);
6565
log.debug("[accountCoins] Filter currency is {}", currenciesRequested);
66-
BlockDto latestBlock = ledgerDataProviderService.findLatestBlock();
66+
Block latestBlock = ledgerDataProviderService.findLatestBlock();
6767
log.debug("[accountCoins] Latest block is {}", latestBlock);
6868
List<UtxoDto> utxos = ledgerDataProviderService.findUtxoByAddressAndCurrency(accountAddress, currenciesRequested);
6969
log.debug("[accountCoins] found {} Utxos for Address {}", utxos.size(), accountAddress);

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/Block.java

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import java.util.List;
4+
5+
import lombok.AllArgsConstructor;
6+
import lombok.Builder;
7+
import lombok.Data;
8+
import lombok.NoArgsConstructor;
9+
10+
import org.cardanofoundation.rosetta.api.block.model.entity.BlockEntity;
11+
12+
@Data
13+
@AllArgsConstructor
14+
@NoArgsConstructor
15+
@Builder
16+
public class Block {
17+
18+
private String hash;
19+
private Long number;
20+
private Long createdAt;
21+
private String previousBlockHash;
22+
private Long previousBlockNumber;
23+
private Long transactionsCount;
24+
private String createdBy;
25+
private Integer size;
26+
private Integer epochNo;
27+
private Long slotNo;
28+
private List<Transaction> transactions;
29+
30+
public static Block fromBlock(BlockEntity block) {
31+
return Block.builder()
32+
.number(block.getNumber())
33+
.hash(block.getHash())
34+
.createdAt(block.getBlockTime())
35+
.previousBlockHash(block.getPrev() != null ? block.getPrev().getHash() : "")
36+
.previousBlockNumber(block.getPrev() != null ? block.getPrev().getNumber() : -1)
37+
.transactionsCount(block.getNoOfTxs())
38+
.size(Math.toIntExact(block.getBlockBodySize()))
39+
.createdBy(
40+
block.getIssuerVkey()) // TODO probably need to change this, in typescript rosetta there is something like Pool-[HASH]
41+
.epochNo(block.getEpochNumber())
42+
.slotNo(block.getSlot())
43+
.transactions(
44+
block.getTransactions().stream().map(txnEntity -> Transaction.fromTx(txnEntity))
45+
.toList())
46+
.build();
47+
}
48+
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/dto/BlockUtxos.java renamed to ‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/BlockUtxos.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package org.cardanofoundation.rosetta.api.block.model.dto;
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
22

33
import java.util.List;
4+
45
import lombok.AllArgsConstructor;
56
import lombok.Data;
67
import lombok.NoArgsConstructor;
78
import lombok.experimental.SuperBuilder;
9+
810
import org.cardanofoundation.rosetta.api.account.model.dto.UtxoDto;
911

1012
@Data
@@ -13,6 +15,6 @@
1315
@SuperBuilder
1416
public class BlockUtxos {
1517

16-
BlockDto block;
18+
Block block;
1719
List<UtxoDto> utxos;
1820
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/BlockVersion.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
5+
import lombok.EqualsAndHashCode;
6+
import lombok.Getter;
7+
import lombok.NoArgsConstructor;
8+
import lombok.ToString;
9+
10+
@Getter
11+
@AllArgsConstructor
12+
@NoArgsConstructor
13+
@ToString
14+
@EqualsAndHashCode
15+
@Builder
16+
public class BlockVersion {
17+
18+
private short major;
19+
private short minor;
20+
private byte alt;
21+
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/Delegation.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
import org.cardanofoundation.rosetta.api.block.model.entity.DelegationEntity;
7+
8+
@Data
9+
@Builder
10+
public class Delegation {
11+
12+
private String txHash;
13+
14+
private long certIndex;
15+
16+
private String poolId;
17+
18+
private String credential;
19+
20+
private String address;
21+
22+
private Integer epoch;
23+
24+
private Long slot;
25+
26+
private String blockHash;
27+
28+
public static Delegation fromEntity(DelegationEntity entity) {
29+
return Delegation.builder()
30+
.txHash(entity.getTxHash())
31+
.certIndex(entity.getCertIndex())
32+
.poolId(entity.getPoolId())
33+
.credential(entity.getCredential())
34+
.address(entity.getAddress())
35+
.epoch(entity.getEpoch())
36+
.slot(entity.getSlot())
37+
.blockHash(entity.getBlockHash())
38+
.build();
39+
}
40+
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/dto/GenesisBlockDto.java renamed to ‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/GenesisBlock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.cardanofoundation.rosetta.api.block.model.dto;
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Builder;
@@ -9,7 +9,7 @@
99
@NoArgsConstructor
1010
@AllArgsConstructor
1111
@Builder
12-
public class GenesisBlockDto {
12+
public class GenesisBlock {
1313

1414
private String hash;
1515
private Long number;

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/dto/NetworkStatusDTO.java renamed to ‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/NetworkStatus.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
package org.cardanofoundation.rosetta.api.block.model.dto;
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import java.util.List;
24

35
import lombok.AllArgsConstructor;
46
import lombok.Builder;
57
import lombok.Data;
68
import lombok.NoArgsConstructor;
7-
import org.openapitools.client.model.Peer;
89

9-
import java.util.List;
10+
import org.openapitools.client.model.Peer;
1011

1112
@Data
1213
@Builder
1314
@NoArgsConstructor
1415
@AllArgsConstructor
15-
public class NetworkStatusDTO {
16-
private BlockDto latestBlock;
17-
private GenesisBlockDto genesisBlock;
16+
public class NetworkStatus {
17+
18+
private Block latestBlock;
19+
private GenesisBlock genesisBlock;
1820
private List<Peer> peers;
1921
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/PoolRegistration.java

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import java.util.List;
4+
import java.util.Set;
5+
6+
import lombok.Builder;
7+
import lombok.Data;
8+
9+
import org.cardanofoundation.rosetta.api.block.model.entity.PoolRegistrationEnity;
10+
import org.cardanofoundation.rosetta.common.model.cardano.Relay;
11+
12+
@Data
13+
@Builder
14+
public class PoolRegistration {
15+
16+
private String txHash;
17+
private long certIndex;
18+
private String poolId;
19+
private String vrfKeyHash;
20+
private String pledge;
21+
private String margin;
22+
private String cost;
23+
private String rewardAccount;
24+
private Set<String> owners;
25+
private List<Relay> relays;
26+
private Integer epoch;
27+
private Long slot;
28+
private String blockHash;
29+
30+
public static PoolRegistration fromEntity(PoolRegistrationEnity entity) {
31+
return PoolRegistration.builder()
32+
.txHash(entity.getTxHash())
33+
.certIndex(entity.getCertIndex())
34+
.poolId(entity.getPoolId())
35+
.vrfKeyHash(entity.getVrfKeyHash())
36+
.pledge(entity.getPledge().toString())
37+
.margin(entity.getMargin().toString())
38+
.cost(entity.getCost().toString())
39+
.rewardAccount(entity.getRewardAccount())
40+
.relays(entity.getRelays().stream().map(
41+
relay -> new Relay("", relay.getIpv4(), relay.getIpv6(), relay.getDnsName(),
42+
relay.getPort().toString())).toList()) // TODO check type
43+
.owners(entity.getPoolOwners())
44+
.epoch(entity.getEpoch())
45+
.slot(entity.getSlot())
46+
.blockHash(entity.getBlockHash())
47+
.build();
48+
}
49+
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/dto/PoolRegistrationParams.java renamed to ‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/PoolRegistrationParams.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package org.cardanofoundation.rosetta.api.block.model.dto;
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
22

33
import java.util.List;
4+
45
import lombok.AllArgsConstructor;
56
import lombok.Builder;
67
import lombok.Data;
78
import lombok.NoArgsConstructor;
9+
810
import org.cardanofoundation.rosetta.common.model.cardano.PoolMargin;
911
import org.cardanofoundation.rosetta.common.model.cardano.PoolMetadata;
1012
import org.cardanofoundation.rosetta.common.model.cardano.Relay;
@@ -16,13 +18,13 @@
1618
@Builder
1719
public class PoolRegistrationParams {
1820

19-
private String vrfKeyHash;
20-
private String rewardAddress;
21-
private String pledge;
22-
private String cost;
23-
private List<String> poolOwners;
24-
private List<Relay> relays;
25-
private PoolMargin margin;
26-
private String marginPercentage;
27-
private PoolMetadata poolMetadata;
21+
private String vrfKeyHash;
22+
private String rewardAddress;
23+
private String pledge;
24+
private String cost;
25+
private List<String> poolOwners;
26+
private List<Relay> relays;
27+
private PoolMargin margin;
28+
private String marginPercentage;
29+
private PoolMetadata poolMetadata;
2830
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/dto/PoolRelay.java renamed to ‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/PoolRelay.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package org.cardanofoundation.rosetta.api.block.model.dto;
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
23
import lombok.AllArgsConstructor;
34
import lombok.Builder;
45
import lombok.Data;
@@ -10,10 +11,10 @@
1011
@Builder
1112
public class PoolRelay {
1213

13-
private String ipv4;
14-
private String ipv6;
15-
private String dnsName;
16-
private String port;
17-
private String type;
14+
private String ipv4;
15+
private String ipv6;
16+
private String dnsName;
17+
private String port;
18+
private String type;
1819

1920
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/PoolRetirement.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
import org.cardanofoundation.rosetta.api.block.model.entity.PoolRetirementEntity;
7+
8+
@Data
9+
@Builder
10+
public class PoolRetirement {
11+
12+
private String txHash;
13+
14+
private long certIndex;
15+
16+
private String poolId;
17+
18+
private Integer epoch;
19+
20+
private Long slot;
21+
22+
private String blockHash;
23+
24+
public static PoolRetirement fromEntity(PoolRetirementEntity entity) {
25+
return PoolRetirement.builder()
26+
.txHash(entity.getTxHash())
27+
.certIndex(entity.getCertIndex())
28+
.poolId(entity.getPoolId())
29+
.epoch(entity.getEpoch())
30+
.slot(entity.getSlot())
31+
.blockHash(entity.getBlockHash())
32+
.build();
33+
}
34+
}

‎api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/ProcessOperations.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.cardanofoundation.rosetta.api.block.model.domain;
2+
3+
import java.util.ArrayList;
4+
5+
import lombok.AllArgsConstructor;
6+
import lombok.Getter;
7+
import lombok.NoArgsConstructor;
8+
import lombok.Setter;
9+
10+
import com.bloxbean.cardano.client.transaction.spec.AuxiliaryData;
11+
import com.bloxbean.cardano.client.transaction.spec.TransactionInput;
12+
import com.bloxbean.cardano.client.transaction.spec.TransactionOutput;
13+
import com.bloxbean.cardano.client.transaction.spec.Withdrawal;
14+
import com.bloxbean.cardano.client.transaction.spec.cert.Certificate;
15+
16+
@Getter
17+
@Setter
18+
@AllArgsConstructor
19+
@NoArgsConstructor
20+
public class ProcessOperations {
21+
22+
private ArrayList<TransactionInput> transactionInputs = new ArrayList<>();
23+
private ArrayList<TransactionOutput> transactionOutputs = new ArrayList<>();
24+
private ArrayList<Certificate> certificates = new ArrayList<>();
25+
private ArrayList<Withdrawal> withdrawals = new ArrayList<>();
26+
private ArrayList<String> addresses = new ArrayList<>();
27+
private ArrayList<String> inputAmounts = new ArrayList<>();
28+
private ArrayList<String> outputAmounts = new ArrayList<>();
29+
private ArrayList<Long> withdrawalAmounts = new ArrayList<>();
30+
private double stakeKeyRegistrationsCount = 0.0;
31+
private double stakeKeyDeRegistrationsCount = 0.0;
32+
private double poolRegistrationsCount = 0.0;
33+
private AuxiliaryData voteRegistrationMetadata = null;
34+
}

0 commit comments

Comments
 (0)