moar tests

Author: nkramer44

xrpl4j-client/src/main/java/org/xrpl/xrpl4j/client/XrplClient.java

@@ -68,6 +68,8 @@
 import org.xrpl.xrpl4j.model.client.ledger.LedgerEntryResult;
 import org.xrpl.xrpl4j.model.client.ledger.LedgerRequestParams;
 import org.xrpl.xrpl4j.model.client.ledger.LedgerResult;
+import org.xrpl.xrpl4j.model.client.mpt.MptHoldersRequestParams;
+import org.xrpl.xrpl4j.model.client.mpt.MptHoldersResponse;
 import org.xrpl.xrpl4j.model.client.nft.NftBuyOffersRequestParams;
 import org.xrpl.xrpl4j.model.client.nft.NftBuyOffersResult;
 import org.xrpl.xrpl4j.model.client.nft.NftInfoRequestParams;
@@ -873,6 +875,24 @@ public GetAggregatePriceResult getAggregatePrice(
     return jsonRpcClient.send(request, GetAggregatePriceResult.class);
   }
 
+  /**
+   * Get all holders of an MPT and their balance. The mpt_holders method is only available on Clio nodes.
+   *
+   * @param params An {@link MptHoldersRequestParams}.
+   *
+   * @return An {@link MptHoldersResponse}.
+   *
+   * @throws JsonRpcClientErrorException if {@code js nRpcClient} throws an error.
+   */
+  public MptHoldersResponse mptHolders(MptHoldersRequestParams params) throws JsonRpcClientErrorException {
+    JsonRpcRequest request = JsonRpcRequest.builder()
+      .method(XrplMethods.MPT_HOLDERS)
+      .addParams(params)
+      .build();
+
+    return jsonRpcClient.send(request, MptHoldersResponse.class);
+  }
+
   public JsonRpcClient getJsonRpcClient() {
     return jsonRpcClient;
   }

xrpl4j-client/src/test/java/org/xrpl/xrpl4j/client/XrplClientTest.java

@@ -42,8 +42,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.xrpl.xrpl4j.client.faucet.FaucetClient;
-import org.xrpl.xrpl4j.client.faucet.FundAccountRequest;
 import org.xrpl.xrpl4j.crypto.keys.KeyPair;
 import org.xrpl.xrpl4j.crypto.keys.Seed;
 import org.xrpl.xrpl4j.crypto.signing.MultiSignedTransaction;
@@ -83,6 +81,8 @@
 import org.xrpl.xrpl4j.model.client.ledger.LedgerEntryResult;
 import org.xrpl.xrpl4j.model.client.ledger.LedgerRequestParams;
 import org.xrpl.xrpl4j.model.client.ledger.LedgerResult;
+import org.xrpl.xrpl4j.model.client.mpt.MptHoldersRequestParams;
+import org.xrpl.xrpl4j.model.client.mpt.MptHoldersResponse;
 import org.xrpl.xrpl4j.model.client.nft.NftBuyOffersRequestParams;
 import org.xrpl.xrpl4j.model.client.nft.NftBuyOffersResult;
 import org.xrpl.xrpl4j.model.client.nft.NftInfoRequestParams;
@@ -116,7 +116,6 @@
 import org.xrpl.xrpl4j.model.ledger.LedgerObject;
 import org.xrpl.xrpl4j.model.transactions.Address;
 import org.xrpl.xrpl4j.model.transactions.Hash256;
-import org.xrpl.xrpl4j.model.transactions.Marker;
 import org.xrpl.xrpl4j.model.transactions.NfTokenId;
 import org.xrpl.xrpl4j.model.transactions.Payment;
 import org.xrpl.xrpl4j.model.transactions.Signer;
@@ -149,48 +148,6 @@ void setUp() {
     xrplClient = new XrplClient(jsonRpcClientMock);
   }
 
-  @Test
-  void name() throws JsonRpcClientErrorException {
-    xrplClient = new XrplClient(HttpUrl.get("https://stylish-powerful-glade.xrp-mainnet.quiknode.pro/33a542bf497c0d2b6c504387690bf8eafec57202/"));
-
-    int count = 0;
-    AccountLinesResult lines = xrplClient.accountLines(
-      AccountLinesRequestParams.builder()
-        .account(Address.of("rMxCKbEDwqr76QuheSUMdEGf4B9xJ8m5De"))
-        .ledgerSpecifier(LedgerSpecifier.VALIDATED)
-        .limit(UnsignedInteger.valueOf(500))
-        .build()
-    );
-    count += lines.lines().size();
-
-    lines.lines()
-      .forEach(line -> {
-        if (line.currency().length() == 1) {
-          System.out.println("FOUND: " + line);
-        }
-      });
-    while (lines.marker().isPresent()) {
-      lines = xrplClient.accountLines(
-        AccountLinesRequestParams.builder()
-          .account(Address.of("rMxCKbEDwqr76QuheSUMdEGf4B9xJ8m5De"))
-          .ledgerSpecifier(LedgerSpecifier.VALIDATED)
-          .limit(UnsignedInteger.valueOf(500))
-          .marker(lines.marker())
-          .build()
-      );
-      lines.lines()
-        .forEach(line -> {
-          if (line.currency().length() == 1) {
-            System.out.println("FOUND: " + line);
-          }
-        });
-      count += lines.lines().size();
-    }
-
-    System.out.println("Found trustlines: " + count);
-
-  }
-
   @Test
   public void depositAuthorized() throws JsonRpcClientErrorException {
     DepositAuthorizedRequestParams depositAuthorized = DepositAuthorizedRequestParams.builder()
@@ -1166,4 +1123,22 @@ void getAggregatePrice() throws JsonRpcClientErrorException {
 
     assertThat(result).isEqualTo(expectedResult);
   }
+
+  @Test
+  void mptHolders() throws JsonRpcClientErrorException {
+    MptHoldersRequestParams params = mock(MptHoldersRequestParams.class);
+    MptHoldersResponse expectedResult = mock(MptHoldersResponse.class);
+
+    when(jsonRpcClientMock.send(
+      JsonRpcRequest.builder()
+        .method(XrplMethods.MPT_HOLDERS)
+        .addParams(params)
+        .build(),
+      MptHoldersResponse.class
+    )).thenReturn(expectedResult);
+
+    MptHoldersResponse result = xrplClient.mptHolders(params);
+
+    assertThat(result).isEqualTo(expectedResult);
+  }
 }

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/client/XrplMethods.java

@@ -234,4 +234,5 @@ public class XrplMethods {
   public static final String PING = "ping";
 
   public static final String GET_AGGREGATE_PRICE = "get_aggregate_price";
+  public static final String MPT_HOLDERS = "mpt_holders";
 }

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/client/ledger/LedgerEntryRequestParams.java

@@ -28,6 +28,7 @@
 import org.xrpl.xrpl4j.model.transactions.Address;
 import org.xrpl.xrpl4j.model.transactions.Hash256;
 import org.xrpl.xrpl4j.model.transactions.MpTokenIssuanceId;
+import org.xrpl.xrpl4j.model.transactions.MpTokenObjectAmount;
 import org.xrpl.xrpl4j.model.transactions.XChainBridge;
 
 import java.util.Optional;
@@ -600,6 +601,14 @@ default Class<T> ledgerObjectClass() {
       return (Class<T>) OracleObject.class;
     }
 
+    if (mptIssuance().isPresent()) {
+      return (Class<T>) MpTokenIssuanceObject.class;
+    }
+
+    if (mpToken().isPresent()) {
+      return (Class<T>) MpTokenObject.class;
+    }
+
     return (Class<T>) LedgerObject.class;
   }
 }

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/client/mpt/MptHoldersMpToken.java

@@ -34,7 +34,7 @@ static ImmutableMptHoldersMpToken.Builder builder() {
   MpTokenObjectAmount mptAmount();
 
   @JsonProperty("locked_amount")
-  Optional<MpTokenAmount> lockedAmount();
+  Optional<MpTokenObjectAmount> lockedAmount();
 
   @JsonProperty("mptoken_index")
   Hash256 mpTokenIndex();

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/client/mpt/MptHoldersRequestParams.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.primitives.UnsignedInteger;
 import org.immutables.value.Value.Immutable;
+import org.xrpl.xrpl4j.model.client.XrplRequestParams;
 import org.xrpl.xrpl4j.model.client.common.LedgerSpecifier;
 import org.xrpl.xrpl4j.model.transactions.Marker;
 import org.xrpl.xrpl4j.model.transactions.MpTokenIssuanceId;
@@ -15,7 +16,7 @@
 @Immutable
 @JsonSerialize(as = ImmutableMptHoldersRequestParams.class)
 @JsonDeserialize(as = ImmutableMptHoldersRequestParams.class)
-public interface MptHoldersRequestParams {
+public interface MptHoldersRequestParams extends XrplRequestParams {
 
   /**
    * Construct a {@code MptHoldersRequestParams} builder.

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/client/mpt/MptHoldersResponse.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.primitives.UnsignedInteger;
 import org.immutables.value.Value.Immutable;
+import org.xrpl.xrpl4j.model.client.XrplResult;
 import org.xrpl.xrpl4j.model.client.common.LedgerIndex;
 import org.xrpl.xrpl4j.model.transactions.Marker;
 import org.xrpl.xrpl4j.model.transactions.MpTokenIssuanceId;
@@ -15,7 +16,7 @@
 @Immutable
 @JsonSerialize(as = ImmutableMptHoldersResponse.class)
 @JsonDeserialize(as = ImmutableMptHoldersResponse.class)
-public interface MptHoldersResponse {
+public interface MptHoldersResponse extends XrplResult {
 
   /**
    * Construct a {@code MptHoldersResponse} builder.
@@ -36,7 +37,6 @@ static ImmutableMptHoldersResponse.Builder builder() {
 
   Optional<UnsignedInteger> limit();
 
-  // FIXME: Is this always the field, or does clio also return `ledger_hash` and potentially `ledger_current_index`?
   @JsonProperty("ledger_index")
   LedgerIndex ledgerIndex();
 }

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/flags/MpTokenFlags.java

@@ -36,7 +36,7 @@ public class MpTokenFlags extends Flags {
    */
   public static final MpTokenFlags LOCKED = new MpTokenFlags(0x00000001);
   /**
-   * Constant {@link MpTokenFlags} for the {@code lsfMPTCanLock} account flag.
+   * Constant {@link MpTokenFlags} for the {@code lsfMPTAuthorized} account flag.
    */
   public static final MpTokenFlags AUTHORIZED = new MpTokenFlags(0x00000002);
 
@@ -49,6 +49,17 @@ private MpTokenFlags(final long value) {
     super(value);
   }
 
+  /**
+   * Construct {@link MpTokenFlags} with a given value.
+   *
+   * @param value The long-number encoded flags value of this {@link MpTokenFlags}.
+   *
+   * @return New {@link MpTokenFlags}.
+   */
+  public static MpTokenFlags of(long value) {
+    return new MpTokenFlags(value);
+  }
+
   /**
    * If set, indicates that all balances are locked.
    *

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/flags/MpTokenIssuanceCreateFlags.java

@@ -162,12 +162,12 @@ public boolean tfMptCanClawback() {
    */
   public static class Builder {
 
-    boolean tfMptCanLock = false;
-    boolean tfMptRequireAuth = false;
-    boolean tfMptCanEscrow = false;
-    boolean tfMptCanTrade = false;
-    boolean tfMptCanTransfer = false;
-    boolean tfMptCanClawback = false;
+    private boolean tfMptCanLock = false;
+    private boolean tfMptRequireAuth = false;
+    private boolean tfMptCanEscrow = false;
+    private boolean tfMptCanTrade = false;
+    private boolean tfMptCanTransfer = false;
+    private boolean tfMptCanClawback = false;
 
     /**
      * Set {@code tfMptCanLock} to the given value.

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/flags/MpTokenIssuanceFlags.java

@@ -69,6 +69,16 @@ private MpTokenIssuanceFlags(final long value) {
     super(value);
   }
 
+  /**
+   * Construct {@link MpTokenIssuanceFlags} with a given value.
+   *
+   * @param value The long-number encoded flags value of this {@link MpTokenIssuanceFlags}.
+   * @return New {@link MpTokenIssuanceFlags}.
+   */
+  public static MpTokenIssuanceFlags of(long value) {
+    return new MpTokenIssuanceFlags(value);
+  }
+
   /**
    * If set, indicates that all balances are locked.
    *