Merge branch 'main' into MPT-XLS-82d-integration-DEX

Author: cybele-ripple

xrpl4j-integration-tests/src/test/java/org/xrpl/xrpl4j/tests/environment/RippledContainer.java

@@ -82,13 +82,13 @@ public class RippledContainer {
    * No-args constructor.
    */
   public RippledContainer() {
-    try (GenericContainer<?> container = new GenericContainer<>("rippleci/rippled:latest")) {
+    try (GenericContainer<?> container = new GenericContainer<>("rippleci/rippled:develop")) {
       this.rippledContainer = container.withCreateContainerCmdModifier((Consumer<CreateContainerCmd>) (cmd) ->
-          cmd.withEntrypoint("/opt/ripple/bin/rippled"))
-        .withCommand("-a --start --conf /config/rippled.cfg")
+          cmd.withEntrypoint("/opt/xrpld/bin/xrpld"))
+        .withCommand("-a --start --conf /config/xrpld.cfg")
         .withExposedPorts(5005)
         .withImagePullPolicy(PullPolicy.alwaysPull())
-        .withClasspathResourceMapping("rippled",
+        .withClasspathResourceMapping("xrpld",
           "/config",
           BindMode.READ_ONLY)
         .waitingFor(new LogMessageWaitStrategy().withRegEx(".*Application starting.*"));

…rc/test/resources/rippled/validators.txt …/src/test/resources/xrpld/validators.txtxrpl4j-integration-tests/src/test/resources/rippled/validators.txt renamed to xrpl4j-integration-tests/src/test/resources/xrpld/validators.txt xrpl4j-integration-tests/src/test/resources/rippled/validators.txt renamed to xrpl4j-integration-tests/src/test/resources/xrpld/validators.txt

@@ -144,7 +144,6 @@ validators.txt
 # Devnet amendments as of June 28th, 2023
 NegativeUNL
 fixRemoveNFTokenAutoTrustLine
-NonFungibleTokensV1
 CheckCashMakesTrustLine
 fixRmSmallIncreasedQOffers
 fixSTAmountCanonicalize