chore: Fix ContractKeysHTSSuite records

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/FullResult.java

@@ -123,4 +123,9 @@
                 gasRequirement,
                 null);
     }
+
+    public static FullResult haltResult(final long gasRequirement) {
+        return new FullResult(
+                PrecompiledContract.PrecompileContractResult.halt(Bytes.EMPTY, Optional.empty()), gasRequirement, null);
+    }
 }

hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/HtsSystemContract.java

@@ -18,7 +18,6 @@
 
 import static com.hedera.hapi.node.base.ResponseCodeEnum.SUCCESS;
 import static com.hedera.node.app.service.contract.impl.exec.systemcontracts.FullResult.haltResult;
-import static com.hedera.node.app.service.contract.impl.exec.systemcontracts.FullResult.revertResult;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.contractsConfigOf;
 import static com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils.unqualifiedDelegateDetected;
 import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.asNumberedContractId;
@@ -73,8 +72,9 @@
             attempt = callFactory.createCallAttemptFrom(input, frame);
             call = requireNonNull(attempt.asExecutableCall());
             if (frame.isStatic() && !call.allowsStaticFrame()) {
-                return revertResult(
-                        STATIC_CALL_REVERT_REASON, contractsConfigOf(frame).precompileHtsDefaultGasCost());
+                // FUTURE - we should really set an explicit halt reason here; instead we just halt the frame
+                // without setting a halt reason to simulate mono-service for differential testing
+                return haltResult(contractsConfigOf(frame).precompileHtsDefaultGasCost());
             }
         } catch (final RuntimeException e) {
             log.debug("Failed to create HTS call from input {}", input, e);

hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/RecordFinalizerBase.java

@@ -189,7 +189,7 @@ protected Map<TokenID, List<NftTransfer>> nftChangesFrom(
             AccountID receiverAccountId = null;
             final var builder = NftTransfer.newBuilder();
             if (modifiedNft != null) {
-                if (modifiedNft.hasOwnerId()) {
+                if (modifiedNft.hasOwnerId() && !AccountID.DEFAULT.equals(modifiedNft.ownerId())) {
                     receiverAccountId = modifiedNft.ownerId();
                 } else {
                     receiverAccountId = token.treasuryAccountId();

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/records/SnapshotMatchMode.java

@@ -40,6 +40,11 @@ public enum SnapshotMatchMode {
      * Allows for non-deterministic amounts.
      */
     NONDETERMINISTIC_TRANSACTION_FEES,
+    /**
+     * Allows for non-deterministic nonce. This can happen when there is a NodeStakeUpdate transaction in the
+     * mix.
+     */
+    NONDETERMINISTIC_NONCE,
     /**
      * Lets a spec advertise itself as being non-deterministic.
      *

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/records/SnapshotModeOp.java

@@ -29,6 +29,7 @@
 import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_CONSTRUCTOR_PARAMETERS;
 import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_CONTRACT_CALL_RESULTS;
 import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_FUNCTION_PARAMETERS;
+import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_NONCE;
 import static com.hedera.services.bdd.spec.utilops.records.SnapshotMatchMode.NONDETERMINISTIC_TRANSACTION_FEES;
 import static com.hedera.services.bdd.suites.TargetNetworkType.STANDALONE_MONO_NETWORK;
 import static com.hedera.services.bdd.suites.contract.Utils.asInstant;
@@ -172,8 +173,8 @@ public class SnapshotModeOp extends UtilOp implements SnapshotOp {
 
     public static void main(String... args) throws IOException {
         // Helper to review the snapshot saved for a particular HapiSuite-HapiSpec combination
-        final var snapshotFileMeta =
-                new SnapshotFileMeta("CryptoTransferHTS", "hapiTransferFromForFungibleTokenToSystemAccountsFails");
+        final var snapshotFileMeta = new SnapshotFileMeta(
+                "ContractKeysHTS", "DissociatePrecompileWithDelegateContractKeyForNonFungibleVanilla");
         final var maybeSnapshot = suiteSnapshotsFrom(
                         resourceLocOf(PROJECT_ROOT_SNAPSHOT_RESOURCES_LOC, snapshotFileMeta.suiteName()))
                 .flatMap(
@@ -739,6 +740,8 @@ private boolean shouldSkip(@NonNull final String expectedName, @NonNull final Cl
             return matchModes.contains(NONDETERMINISTIC_CONTRACT_CALL_RESULTS);
         } else if ("constructorParameters".equals(expectedName)) {
             return matchModes.contains(NONDETERMINISTIC_CONSTRUCTOR_PARAMETERS);
+        } else if ("nonce".equals(expectedName)) {
+            return matchModes.contains(NONDETERMINISTIC_NONCE);
         } else if ("gas".equals(expectedName) || "gasUsed".equals(expectedName)) {
             return matchModes.contains(ACCEPTED_MONO_GAS_CALCULATION_DIFFERENCE);
         } else {