Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 35 additions & 21 deletions src/main/java/org/p2p/solanaj/rpc/types/ConfirmedTransaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,34 +77,48 @@ public static class TokenBalance {
private TokenResultObjects.TokenAmountInfo uiTokenAmount;
}

@Getter
@ToString
public static class Meta {
@Getter
@ToString
public static class LoadedAddresses {

@Json(name = "err")
private Object err;
@Json(name = "readonly")
public List<String> readOnly;

@Json(name = "fee")
private long fee;
@Json(name = "writable")
public List<String> writable;
}

@Json(name = "innerInstructions")
private List<Object> innerInstructions;
@Getter
@ToString
public static class Meta {

@Json(name = "preTokenBalances")
private List<TokenBalance> preTokenBalances;
@Json(name = "err")
private Object err;

@Json(name = "postTokenBalances")
private List<TokenBalance> postTokenBalances;
@Json(name = "fee")
private long fee;

@Json(name = "postBalances")
private List<Long> postBalances;
@Json(name = "innerInstructions")
private List<Object> innerInstructions;

@Json(name = "preBalances")
private List<Long> preBalances;
@Json(name = "preTokenBalances")
private List<TokenBalance> preTokenBalances;

@Json(name = "status")
private Status status;
}
@Json(name = "postTokenBalances")
private List<TokenBalance> postTokenBalances;

@Json(name = "postBalances")
private List<Long> postBalances;

@Json(name = "preBalances")
private List<Long> preBalances;

@Json(name = "status")
private Status status;

@Json(name = "loadedAddresses")
private LoadedAddresses loadedAddresses;
}

@Getter
@ToString
Expand All @@ -116,7 +130,7 @@ public static class Transaction {
@Json(name = "signatures")
private List<String> signatures;


@Json(name = "blockTime")
private String blocktime;

Expand Down
21 changes: 19 additions & 2 deletions src/test/java/org/p2p/solanaj/core/MainnetTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public void getToken2022Metadata() throws RpcException {

Optional<String> symbol = token2022AccountInfo.getTokenSymbol();
assertTrue(symbol.isPresent());
assertEquals("ai16z", symbol.get());
assertEquals("ai16z", symbol.get());

Optional<String> uri = token2022AccountInfo.getTokenUri();
assertTrue(uri.isPresent());
Expand Down Expand Up @@ -994,4 +994,21 @@ public void testGetBlocksWithLimitAndCommitment() throws RpcException {
assertTrue(blocks.get(0) >= startSlot);
assertTrue(blocks.size() <= limit);
}
}

@Test
public void getTransactionLoadedAccounts() throws RpcException {
String transactionSignature =
"5CZPX2R1Sjg7m6y79buiXah3QYcrrBBQ3WuTigqUcmKYScHGUiFvJ1UuCZaG63kB2ivwpUrHNSbvQf7N1riBaeUC";

ConfirmedTransaction transactionInfo = client.getApi().getTransaction(transactionSignature);

String fromKey = transactionInfo.getTransaction().getMessage().getAccountKeys().get(0);
String toKey = transactionInfo.getTransaction().getMessage().getAccountKeys().get(1);

assertEquals("7Xa3P2XCmyasD3vQEz8igWM2KAhQyTSiPd2zKcrgFvBd", fromKey.toBase58());
assertEquals("3L4BCuZ8YzHzMoCLQ6wnp1Y7SDjzVQckq6xpGWkU3CJ8", toKey.toBase58());

assertEquals("SysvarRent111111111111111111111111111111111",transactionInfo.getMeta().getLoadedAddresses().getReadOnly().get(0));
assertEquals("5Q544fKrFoe6tsEbD7S8EmxGTJYAKtTVhAW5Q5pge4j1",transactionInfo.getMeta().getLoadedAddresses().getReadOnly().get(3));
}
}