feat: Implement nonzero shard/realm for yahcli DAB transactions (#19166)

Signed-off-by: Matt Hess <[email protected]>

Author: mhess-swl

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/commands/nodes/CreateCommand.java

@@ -84,11 +84,11 @@ public Integer call() throws Exception {
         var config = ConfigUtils.configFrom(yahcli);
 
         validateAdminKeyLoc(adminKeyPath);
-        final var accountId = validatedAccountId(accountNum);
-        final var feeAccountKeyFile = keyFileFor(config.keysLoc(), "account" + accountId.getAccountNum());
+        final var accountId = Long.parseLong(accountNum);
+        final var feeAccountKeyFile = keyFileFor(config.keysLoc(), "account" + accountId);
         final var maybeFeeAccountKeyPath = feeAccountKeyFile.map(File::getPath).orElse(null);
         if (maybeFeeAccountKeyPath == null) {
-            COMMON_MESSAGES.warn("No key on disk for account 0.0." + accountId.getAccountNum()
+            COMMON_MESSAGES.warn("No key on disk for account " + accountId
                     + ", payer and admin key signatures must meet its signing requirements");
         }
 
@@ -97,7 +97,7 @@ public Integer call() throws Exception {
         // Throws if the cert is not valid
         validatedX509Cert(hapiCertificatePath, null, null, yahcli);
         final var delegate = new CreateNodeSuite(
-                config.asSpecConfig(),
+                config,
                 accountId,
                 Optional.ofNullable(description).orElse(""),
                 asCsServiceEndpoints(gossipEndpoints),

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/commands/nodes/DeleteCommand.java

@@ -42,7 +42,7 @@ public Integer call() throws Exception {
             NodesCommand.validateKeyAt(adminKeyPath, yahcli);
         }
 
-        final var delegate = new DeleteNodeSuite(config.asSpecConfig(), targetId, adminKeyPath);
+        final var delegate = new DeleteNodeSuite(config, targetId, adminKeyPath);
         delegate.runSuiteSync();
 
         if (delegate.getFinalSpecs().getFirst().getStatus() == HapiSpec.SpecStatus.PASSED) {

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/commands/nodes/UpdateCommand.java

@@ -3,6 +3,7 @@
 
 import static com.hedera.node.app.hapi.utils.CommonUtils.noThrowSha384HashOf;
 import static com.hedera.services.bdd.spec.HapiPropertySource.asCsServiceEndpoints;
+import static com.hedera.services.bdd.spec.HapiPropertySource.asEntityString;
 import static com.hedera.services.yahcli.commands.nodes.CreateCommand.allBytesAt;
 import static com.hedera.services.yahcli.commands.nodes.NodesCommand.validateKeyAt;
 import static com.hedera.services.yahcli.commands.nodes.NodesCommand.validatedX509Cert;
@@ -102,11 +103,12 @@ public Integer call() throws Exception {
             newAccountId = null;
             feeAccountKeyLoc = null;
         } else {
-            newAccountId = validatedAccountId(accountId);
+            newAccountId = validatedAccountId(
+                    config.shard().getShardNum(), config.realm().getRealmNum(), accountId);
             final var feeAccountKeyFile = keyFileFor(config.keysLoc(), "account" + newAccountId.getAccountNum());
             feeAccountKeyLoc = feeAccountKeyFile.map(File::getPath).orElse(null);
             if (feeAccountKeyLoc == null) {
-                COMMON_MESSAGES.warn("No key on disk for account 0.0." + newAccountId.getAccountNum()
+                COMMON_MESSAGES.warn("No key on disk for account " + newAccountId.getAccountNum()
                         + ", payer and admin key signatures must meet its signing requirements");
             }
         }
@@ -144,7 +146,7 @@ public Integer call() throws Exception {
             newHapiCertificateHash = null;
         }
         final var delegate = new UpdateNodeSuite(
-                config.asSpecConfig(),
+                config,
                 targetNodeId,
                 newAccountId,
                 feeAccountKeyLoc,
@@ -176,14 +178,17 @@ private long validatedNodeId(@NonNull final String nodeId) {
         }
     }
 
-    private AccountID validatedAccountId(@NonNull final String accountNum) {
+    private AccountID validatedAccountId(final long shard, final long realm, @NonNull final String accountNum) {
         try {
             return AccountID.newBuilder()
+                    .setShardNum(shard)
+                    .setRealmNum(realm)
                     .setAccountNum(Long.parseLong(accountNum))
                     .build();
         } catch (NumberFormatException e) {
             throw new CommandLine.ParameterException(
-                    nodesCommand.getYahcli().getSpec().commandLine(), "Invalid account number '" + accountNum + "'");
+                    nodesCommand.getYahcli().getSpec().commandLine(),
+                    "Invalid account number '" + asEntityString(shard, realm, accountNum) + "'");
         }
     }
 }

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/suites/CreateNodeSuite.java

@@ -2,19 +2,22 @@
 package com.hedera.services.yahcli.suites;
 
 import static com.hedera.node.app.hapi.utils.CommonPbjConverters.fromPbj;
+import static com.hedera.services.bdd.spec.HapiPropertySource.asAccount;
 import static com.hedera.services.bdd.spec.transactions.TxnVerbs.nodeCreate;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.keyFromFile;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.noOp;
 import static java.util.Objects.requireNonNull;
 
 import com.hedera.hapi.node.base.ServiceEndpoint;
 import com.hedera.services.bdd.spec.HapiSpec;
+import com.hedera.services.bdd.spec.SpecOperation;
+import com.hedera.services.bdd.spec.props.MapPropertySource;
 import com.hedera.services.bdd.suites.HapiSuite;
-import com.hederahashgraph.api.proto.java.AccountID;
+import com.hedera.services.yahcli.config.ConfigManager;
+import com.hedera.services.yahcli.util.HapiSpecUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -23,8 +26,8 @@
 public class CreateNodeSuite extends HapiSuite {
     private static final Logger log = LogManager.getLogger(CreateNodeSuite.class);
 
-    private final Map<String, String> specConfig;
-    private final AccountID accountId;
+    private final ConfigManager configManager;
+    private final long accountId;
     private final String description;
     private final String adminKeyLoc;
 
@@ -40,17 +43,17 @@ public class CreateNodeSuite extends HapiSuite {
     private Long createdId;
 
     public CreateNodeSuite(
-            @NonNull final Map<String, String> specConfig,
-            @NonNull final AccountID accountId,
+            @NonNull final ConfigManager configManager,
+            final long accountId,
             @NonNull final String description,
             @NonNull final List<ServiceEndpoint> gossipEndpoints,
             @NonNull final List<ServiceEndpoint> serviceEndpoints,
             @NonNull final byte[] gossipCaCertificate,
             @NonNull final byte[] grpcCertificateHash,
             @NonNull final String adminKeyLoc,
             @Nullable final String feeAccountKeyLoc) {
-        this.specConfig = requireNonNull(specConfig);
-        this.accountId = requireNonNull(accountId);
+        this.configManager = requireNonNull(configManager);
+        this.accountId = accountId;
         this.description = requireNonNull(description);
         this.gossipEndpoints = requireNonNull(gossipEndpoints);
         this.serviceEndpoints = requireNonNull(serviceEndpoints);
@@ -72,25 +75,28 @@ public List<Stream<DynamicTest>> getSpecsInSuite() {
     final Stream<DynamicTest> createNode() {
         final var adminKey = "adminKey";
         final var feeAccountKey = "feeAccountKey";
-        return HapiSpec.customHapiSpec("CreateNode")
-                .withProperties(specConfig)
-                .given(
-                        keyFromFile(adminKey, adminKeyLoc).yahcliLogged(),
-                        feeAccountKeyLoc == null
-                                ? noOp()
-                                : keyFromFile(feeAccountKey, feeAccountKeyLoc).yahcliLogged())
-                .when()
-                .then(nodeCreate("node")
-                        .signedBy(availableSigners())
-                        .accountId(accountId)
-                        .description(description)
-                        .gossipEndpoint(fromPbj(gossipEndpoints))
-                        .serviceEndpoint(fromPbj(serviceEndpoints))
-                        .gossipCaCertificate(gossipCaCertificate)
-                        .grpcCertificateHash(grpcCertificateHash)
-                        .adminKey(adminKey)
-                        .advertisingCreation()
-                        .exposingCreatedIdTo(createdId -> this.createdId = createdId));
+        final var fqAcctId = asAccount(
+                configManager.shard().getShardNum(), configManager.realm().getRealmNum(), accountId);
+
+        final var spec =
+                new HapiSpec("CreateNode", new MapPropertySource(configManager.asSpecConfig()), new SpecOperation[] {
+                    keyFromFile(adminKey, adminKeyLoc).yahcliLogged(),
+                    feeAccountKeyLoc == null
+                            ? noOp()
+                            : keyFromFile(feeAccountKey, feeAccountKeyLoc).yahcliLogged(),
+                    nodeCreate("node")
+                            .signedBy(availableSigners())
+                            .accountId(fqAcctId)
+                            .description(description)
+                            .gossipEndpoint(fromPbj(gossipEndpoints))
+                            .serviceEndpoint(fromPbj(serviceEndpoints))
+                            .gossipCaCertificate(gossipCaCertificate)
+                            .grpcCertificateHash(grpcCertificateHash)
+                            .adminKey(adminKey)
+                            .advertisingCreation()
+                            .exposingCreatedIdTo(createdId -> this.createdId = createdId)
+                });
+        return HapiSpecUtils.targeted(spec, configManager);
     }
 
     private String[] availableSigners() {

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/suites/DeleteNodeSuite.java

@@ -6,11 +6,14 @@
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.noOp;
 
 import com.hedera.services.bdd.spec.HapiSpec;
+import com.hedera.services.bdd.spec.SpecOperation;
+import com.hedera.services.bdd.spec.props.MapPropertySource;
 import com.hedera.services.bdd.suites.HapiSuite;
+import com.hedera.services.yahcli.config.ConfigManager;
+import com.hedera.services.yahcli.util.HapiSpecUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -19,15 +22,15 @@
 public class DeleteNodeSuite extends HapiSuite {
     private static final Logger log = LogManager.getLogger(DeleteNodeSuite.class);
 
-    private final Map<String, String> specConfig;
+    private final ConfigManager configManager;
     private final long nodeId;
 
     @Nullable
     private final String adminKeyLoc;
 
     public DeleteNodeSuite(
-            @NonNull final Map<String, String> specConfig, final long nodeId, @Nullable final String adminKeyLoc) {
-        this.specConfig = specConfig;
+            @NonNull final ConfigManager configManager, final long nodeId, @Nullable final String adminKeyLoc) {
+        this.configManager = configManager;
         this.nodeId = nodeId;
         this.adminKeyLoc = adminKeyLoc;
     }
@@ -39,11 +42,12 @@ public List<Stream<DynamicTest>> getSpecsInSuite() {
 
     final Stream<DynamicTest> doDelete() {
         final var adminKey = "adminKey";
-        return HapiSpec.customHapiSpec("DeleteNode")
-                .withProperties(specConfig)
-                .given(adminKeyLoc == null ? noOp() : keyFromFile(adminKey, adminKeyLoc))
-                .when()
-                .then(nodeDelete("" + nodeId).signedBy(availableSigners()));
+        final var spec =
+                new HapiSpec("NodeDelete", new MapPropertySource(configManager.asSpecConfig()), new SpecOperation[] {
+                    adminKeyLoc == null ? noOp() : keyFromFile(adminKey, adminKeyLoc),
+                    nodeDelete("" + nodeId).signedBy(availableSigners())
+                });
+        return HapiSpecUtils.targeted(spec, configManager);
     }
 
     private String[] availableSigners() {

hedera-node/test-clients/src/yahcli/java/com/hedera/services/yahcli/suites/UpdateNodeSuite.java

@@ -1,21 +1,25 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.services.yahcli.suites;
 
-import static com.hedera.services.bdd.spec.HapiSpec.customHapiSpec;
+import static com.hedera.services.bdd.spec.HapiPropertySource.asEntityString;
 import static com.hedera.services.bdd.spec.transactions.TxnVerbs.nodeUpdate;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.keyFromFile;
 import static com.hedera.services.bdd.spec.utilops.UtilVerbs.noOp;
 import static java.util.Objects.requireNonNull;
 
 import com.hedera.hapi.node.base.ServiceEndpoint;
+import com.hedera.services.bdd.spec.HapiSpec;
+import com.hedera.services.bdd.spec.SpecOperation;
+import com.hedera.services.bdd.spec.props.MapPropertySource;
 import com.hedera.services.bdd.spec.transactions.node.HapiNodeUpdate;
 import com.hedera.services.bdd.suites.HapiSuite;
+import com.hedera.services.yahcli.config.ConfigManager;
+import com.hedera.services.yahcli.util.HapiSpecUtils;
 import com.hederahashgraph.api.proto.java.AccountID;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -24,7 +28,7 @@
 public class UpdateNodeSuite extends HapiSuite {
     private static final Logger log = LogManager.getLogger(UpdateNodeSuite.class);
 
-    private final Map<String, String> specConfig;
+    private final ConfigManager configManager;
     private final long nodeId;
 
     @Nullable
@@ -55,7 +59,7 @@ public class UpdateNodeSuite extends HapiSuite {
     private final byte[] hapiCertificateHash;
 
     public UpdateNodeSuite(
-            @NonNull final Map<String, String> specConfig,
+            @NonNull final ConfigManager configManager,
             final long nodeId,
             @Nullable final AccountID accountId,
             @Nullable final String feeAccountKeyLoc,
@@ -66,7 +70,7 @@ public UpdateNodeSuite(
             @Nullable final List<ServiceEndpoint> hapiEndpoints,
             @Nullable final byte[] gossipCaCertificate,
             @Nullable final byte[] hapiCertificateHash) {
-        this.specConfig = requireNonNull(specConfig);
+        this.configManager = requireNonNull(configManager);
         this.nodeId = nodeId;
         this.accountId = accountId;
         this.feeAccountKeyLoc = feeAccountKeyLoc;
@@ -88,26 +92,26 @@ final Stream<DynamicTest> doUpdate() {
         final var adminKey = "adminKey";
         final var newAdminKey = "newAdminKey";
         final var feeAccountKey = "feeAccountKey";
-        return customHapiSpec("UpdateNode")
-                .withProperties(specConfig)
-                .given(
-                        feeAccountKeyLoc == null
-                                ? noOp()
-                                : keyFromFile(feeAccountKey, feeAccountKeyLoc).yahcliLogged(),
-                        adminKeyLoc == null
-                                ? noOp()
-                                : keyFromFile(adminKey, adminKeyLoc).yahcliLogged(),
-                        newAdminKeyLoc == null
-                                ? noOp()
-                                : keyFromFile(newAdminKey, newAdminKeyLoc).yahcliLogged())
-                .when()
-                .then(updateOp());
+        final var spec =
+                new HapiSpec("UpdateNode", new MapPropertySource(configManager.asSpecConfig()), new SpecOperation[] {
+                    feeAccountKeyLoc == null
+                            ? noOp()
+                            : keyFromFile(feeAccountKey, feeAccountKeyLoc).yahcliLogged(),
+                    adminKeyLoc == null
+                            ? noOp()
+                            : keyFromFile(adminKey, adminKeyLoc).yahcliLogged(),
+                    newAdminKeyLoc == null
+                            ? noOp()
+                            : keyFromFile(newAdminKey, newAdminKeyLoc).yahcliLogged(),
+                    updateOp()
+                });
+        return HapiSpecUtils.targeted(spec, configManager);
     }
 
     private HapiNodeUpdate updateOp() {
         final var op = nodeUpdate("" + nodeId);
         if (accountId != null) {
-            op.accountId("0.0." + accountId.getAccountNum());
+            op.accountId(asEntityString(accountId));
         }
         if (newAdminKeyLoc != null) {
             op.adminKey("newAdminKey");

hedera-node/test-clients/yahcli/run/build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-TAG=${1:-'0.7.4'}
+TAG=${1:-'0.7.5'}
 SCRIPT_SOURCE="${BASH_SOURCE[0]}"
 
 READLINK_OPTS=""

hedera-node/test-clients/yahcli/run/publish.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-TAG=${1:-'0.7.4'}
+TAG=${1:-'0.7.5'}
 SCRIPT_SOURCE="${BASH_SOURCE[0]}"
 
 READLINK_OPTS=""