Reuse rationalized sig meta

hedera-node/src/main/java/com/hedera/services/ServicesState.java

@@ -25,7 +25,7 @@
 import com.hedera.services.context.properties.BootstrapProperties;
 import com.hedera.services.context.properties.StandardizedPropertySources;
 import com.hedera.services.exceptions.ContextNotFoundException;
-import com.hedera.services.sigs.sourcing.ScopedSigBytesProvider;
+import com.hedera.services.sigs.sourcing.SigMapPubKeyToSigBytes;
 import com.hedera.services.state.merkle.MerkleAccount;
 import com.hedera.services.state.merkle.MerkleBlobMeta;
 import com.hedera.services.state.merkle.MerkleDiskFs;
@@ -284,11 +284,8 @@ public synchronized void handleTransaction(
 	public void expandSignatures(SwirldTransaction platformTxn) {
 		try {
 			final var accessor = ctx.expandHandleSpan().track(platformTxn);
-			expandIn(
-					accessor,
-					ctx.lookupRetryingKeyOrder(),
-					new ScopedSigBytesProvider(accessor),
-					ctx.sigFactoryCreator()::createScopedFactory);
+			final var pkToSigFn = new SigMapPubKeyToSigBytes(accessor.getSigMap());
+			expandIn(accessor, ctx.lookupRetryingKeyOrder(), pkToSigFn);
 		} catch (InvalidProtocolBufferException e) {
 			log.warn("expandSignatures called with non-gRPC txn!", e);
 		} catch (Exception race) {

hedera-node/src/main/java/com/hedera/services/context/ServicesContext.java

@@ -189,10 +189,9 @@
 import com.hedera.services.records.TxnAwareRecordsHistorian;
 import com.hedera.services.records.TxnIdRecentHistory;
 import com.hedera.services.security.ops.SystemOpPolicies;
-import com.hedera.services.sigs.factories.SigFactoryCreator;
 import com.hedera.services.sigs.metadata.DelegatingSigMetadataLookup;
 import com.hedera.services.sigs.order.HederaSigningOrder;
-import com.hedera.services.sigs.sourcing.DefaultSigBytesProvider;
+import com.hedera.services.sigs.sourcing.SigMapPubKeyToSigBytes;
 import com.hedera.services.sigs.verification.PrecheckKeyReqs;
 import com.hedera.services.sigs.verification.PrecheckVerifier;
 import com.hedera.services.sigs.verification.SyncVerifier;
@@ -309,11 +308,9 @@
 import com.hedera.services.usage.crypto.CryptoOpsUsage;
 import com.hedera.services.usage.file.FileOpsUsage;
 import com.hedera.services.usage.schedule.ScheduleOpsUsage;
-import com.hedera.services.utils.JvmSystemExits;
 import com.hedera.services.utils.MiscUtils;
 import com.hedera.services.utils.Pause;
 import com.hedera.services.utils.SleepingPause;
-import com.hedera.services.utils.SystemExits;
 import com.hederahashgraph.api.proto.java.AccountID;
 import com.hederahashgraph.api.proto.java.HederaFunctionality;
 import com.hederahashgraph.api.proto.java.TokenID;
@@ -424,8 +421,6 @@
 public class ServicesContext {
 	private static final Logger log = LogManager.getLogger(ServicesContext.class);
 
-	private SystemExits systemExits = new JvmSystemExits();
-
 	/* Injected dependencies. */
 	ServicesState state;
 
@@ -443,7 +438,6 @@ public class ServicesContext {
 	private HederaFs hfs;
 	private NodeInfo nodeInfo;
 	private StateView currentView;
-	private AccountID accountId;
 	private AnswerFlow answerFlow;
 	private HcsAnswers hcsAnswers;
 	private FileNumbers fileNums;
@@ -501,7 +495,6 @@ public class ServicesContext {
 	private NetworkController networkGrpc;
 	private GrpcServerManager grpc;
 	private TxnResponseHelper txnResponseHelper;
-	private SigFactoryCreator sigFactoryCreator;
 	private BlobStorageSource bytecodeDb;
 	private HapiOpPermissions hapiOpPermissions;
 	private EntityAutoRenewal entityAutoRenewal;
@@ -622,13 +615,6 @@ public void rebuildStoreViewsIfPresent() {
 		}
 	}
 
-	public SigFactoryCreator sigFactoryCreator() {
-		if (sigFactoryCreator == null) {
-			sigFactoryCreator = new SigFactoryCreator();
-		}
-		return sigFactoryCreator;
-	}
-
 	public NonBlockingHandoff nonBlockingHandoff() {
 		if (nonBlockingHandoff == null) {
 			nonBlockingHandoff = new NonBlockingHandoff(recordStreamManager(), nodeLocalProperties());
@@ -754,10 +740,7 @@ public LedgerValidator ledgerValidator() {
 
 	public InHandleActivationHelper activationHelper() {
 		if (activationHelper == null) {
-			activationHelper = new InHandleActivationHelper(
-					backedKeyOrder(),
-					characteristics(),
-					txnCtx()::accessor);
+			activationHelper = new InHandleActivationHelper(characteristics(), txnCtx()::accessor);
 		}
 		return activationHelper;
 	}
@@ -1172,7 +1155,8 @@ public PrecheckVerifier precheckVerifier() {
 		if (precheckVerifier == null) {
 			Predicate<TransactionBody> isQueryPayment = queryPaymentTestFor(effectiveNodeAccount());
 			PrecheckKeyReqs reqs = new PrecheckKeyReqs(keyOrder(), lookupRetryingKeyOrder(), isQueryPayment);
-			precheckVerifier = new PrecheckVerifier(syncVerifier(), reqs, DefaultSigBytesProvider.DEFAULT_SIG_BYTES);
+			precheckVerifier = new PrecheckVerifier(
+					syncVerifier(), reqs, accessor -> new SigMapPubKeyToSigBytes(accessor.getSigMap()));
 		}
 		return precheckVerifier;
 	}
@@ -2124,10 +2108,6 @@ public void setScheduleStore(ScheduleStore scheduleStore) {
 		this.scheduleStore = scheduleStore;
 	}
 
-	void setSystemExits(SystemExits systemExits) {
-		this.systemExits = systemExits;
-	}
-
 	private AccountID effectiveNodeAccount() {
 		final var info = nodeInfo();
 		/* If we do not have a self account, we must be zero-stake and will never process a query payment. */

hedera-node/src/main/java/com/hedera/services/contracts/execution/TxnAwareSoliditySigsVerifier.java

@@ -26,6 +26,7 @@
 import com.hedera.services.legacy.core.jproto.JKey;
 import com.hedera.services.sigs.PlatformSigOps;
 import com.hedera.services.sigs.factories.BodySigningSigFactory;
+import com.hedera.services.sigs.sourcing.SigMapPubKeyToSigBytes;
 import com.hedera.services.sigs.verification.SyncVerifier;
 import com.hedera.services.state.merkle.MerkleAccount;
 import com.hedera.services.state.merkle.MerkleEntityId;
@@ -39,7 +40,6 @@
 
 import static com.hedera.services.keys.HederaKeyActivation.ONLY_IF_SIG_IS_VALID;
 import static com.hedera.services.keys.HederaKeyActivation.isActive;
-import static com.hedera.services.sigs.sourcing.DefaultSigBytesProvider.DEFAULT_SIG_BYTES;
 import static com.hedera.services.state.merkle.MerkleEntityId.fromAccountId;
 import static java.util.stream.Collectors.toList;
 
@@ -71,12 +71,13 @@ public boolean allRequiredKeysAreActive(Set<AccountID> touched) {
 		if (requiredKeys.isEmpty()) {
 			return true;
 		} else {
+			final var accessor = txnCtx.accessor();
 			return check.allKeysAreActive(
 					requiredKeys,
 					syncVerifier,
-					txnCtx.accessor(),
+					accessor,
 					PlatformSigOps::createEd25519PlatformSigsFrom,
-					DEFAULT_SIG_BYTES::allPartiesSigBytesFor,
+					new SigMapPubKeyToSigBytes(accessor.getSigMap()),
 					BodySigningSigFactory::new,
 					(key, sigsFn) -> isActive(key, sigsFn, ONLY_IF_SIG_IS_VALID),
 					HederaKeyActivation::pkToSigMapFrom);

hedera-node/src/main/java/com/hedera/services/keys/HederaKeyActivation.java

@@ -23,10 +23,6 @@
 import com.hedera.services.legacy.core.jproto.JKey;
 import com.hedera.services.legacy.core.jproto.JKeyList;
 import com.hedera.services.legacy.core.jproto.JThresholdKey;
-import com.hedera.services.legacy.crypto.SignatureStatus;
-import com.hedera.services.sigs.order.HederaSigningOrder;
-import com.hedera.services.sigs.order.SigningOrderResult;
-import com.hedera.services.sigs.order.SigningOrderResultFactory;
 import com.hedera.services.utils.TxnAccessor;
 import com.swirlds.common.crypto.TransactionSignature;
 import com.swirlds.common.crypto.VerificationStatus;
@@ -62,21 +58,19 @@ private HederaKeyActivation(){
 	 * taken together, activate the payer's Hedera key.
 	 *
 	 * @param accessor the txn to evaluate.
-	 * @param keyOrder a resource to determine the payer's Hedera key.
-	 * @param summaryFactory a resource to summarize the result of the key determination.
-	 * @return whether the payer's Hedera key is active.
+	 * @return whether the payer's Hedera key is active
 	 */
-	public static boolean payerSigIsActive(
-			TxnAccessor accessor,
-			HederaSigningOrder keyOrder,
-			SigningOrderResultFactory<SignatureStatus> summaryFactory
-	) {
-		SigningOrderResult<SignatureStatus> payerSummary = keyOrder.keysForPayer(accessor.getTxn(), summaryFactory);
+	public static boolean payerSigIsActive(TxnAccessor accessor) {
+		final var sigMeta = accessor.getSigMeta();
+
+		if (sigMeta == null) {
+			throw new IllegalArgumentException("Cannot test payer sig activation without rationalized sig meta");
+		}
+		if (!sigMeta.couldRationalizePayer()) {
+			return false;
+		}
 
-		return isActive(
-				payerSummary.getPayerKey(),
-				pkToSigMapFrom(accessor.getPlatformTxn().getSignatures()),
-				ONLY_IF_SIG_IS_VALID);
+		return isActive(sigMeta.payerKey(), sigMeta.pkToVerifiedSigFn(), ONLY_IF_SIG_IS_VALID);
 	}
 
 	/**

hedera-node/src/main/java/com/hedera/services/keys/InHandleActivationHelper.java

@@ -21,12 +21,9 @@
  */
 
 import com.hedera.services.legacy.core.jproto.JKey;
-import com.hedera.services.sigs.order.HederaSigningOrder;
 import com.hedera.services.utils.TxnAccessor;
 import com.hederahashgraph.api.proto.java.TransactionBody;
 import com.swirlds.common.crypto.TransactionSignature;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.util.Collections;
 import java.util.List;
@@ -36,7 +33,6 @@
 import java.util.function.Supplier;
 
 import static com.hedera.services.keys.HederaKeyTraversal.visitSimpleKeys;
-import static com.hedera.services.sigs.Rationalization.IN_HANDLE_SUMMARY_FACTORY;
 
 /**
  * Provides information about the Ed25519 keys that compose the Hedera keys
@@ -49,36 +45,24 @@
  * @author Michael Tinker
  */
 public class InHandleActivationHelper {
-	private static final Logger log = LogManager.getLogger(InHandleActivationHelper.class);
-
 	private static final List<JKey> NO_OTHER_PARTIES = null;
 	private static final TxnAccessor NO_LAST_ACCESSOR = null;
 	private static final Function<byte[], TransactionSignature> NO_LAST_SIGS_FN = null;
 
 	static Activation activation = HederaKeyActivation::isActive;
-	static Function<
-			List<TransactionSignature>,
-			Function<byte[], TransactionSignature>> sigsFnSource = HederaKeyActivation::pkToSigMapFrom;
 
-	private final HederaSigningOrder keyOrderer;
 	private final CharacteristicsFactory characteristics;
 	private final Supplier<TxnAccessor> accessorSource;
 
 	private List<JKey> otherParties = NO_OTHER_PARTIES;
 	private TxnAccessor accessor = NO_LAST_ACCESSOR;
 	private Function<byte[], TransactionSignature> sigsFn = NO_LAST_SIGS_FN;
 
-	public InHandleActivationHelper(
-			HederaSigningOrder keyOrderer,
-			CharacteristicsFactory characteristics,
-			Supplier<TxnAccessor> accessorSource
-	) {
-		this.keyOrderer = keyOrderer;
+	public InHandleActivationHelper(CharacteristicsFactory characteristics, Supplier<TxnAccessor> accessorSource) {
 		this.characteristics = characteristics;
 		this.accessorSource = accessorSource;
 	}
 
-
 	/**
 	 * Returns true if the set of Ed25519 signing keys for the active transaction
 	 * suffice to meet the signing requirements of all Hedera keys prerequisite
@@ -150,16 +134,13 @@ private boolean arePartiesActive(
 	private void ensureUpToDate() {
 		var current = accessorSource.get();
 		if (accessor != current) {
-			var otherOrderingResult = keyOrderer.keysForOtherParties(current.getTxn(), IN_HANDLE_SUMMARY_FACTORY);
-			if (otherOrderingResult.hasErrorReport()) {
-				var errorReport = otherOrderingResult.getErrorReport();
-				log.debug("Allowing active other-party sigs: {} ({})!", errorReport, errorReport.getResponseCode());
-				otherParties = Collections.emptyList();
+			final var sigMeta = current.getSigMeta();
+			if (sigMeta.couldRationalizeOthers()) {
+				otherParties = sigMeta.othersReqSigs();
 			} else {
-				otherParties = otherOrderingResult.getOrderedKeys();
+				otherParties = Collections.emptyList();
 			}
-			var sigs = current.getPlatformTxn().getSignatures();
-			sigsFn = sigsFnSource.apply(sigs);
+			sigsFn = sigMeta.pkToVerifiedSigFn();
 			accessor = current;
 		}
 	}

hedera-node/src/main/java/com/hedera/services/keys/StandardSyncActivationCheck.java

@@ -26,7 +26,6 @@
 import com.hedera.services.sigs.sourcing.PubKeyToSigBytes;
 import com.hedera.services.sigs.verification.SyncVerifier;
 import com.hedera.services.utils.TxnAccessor;
-import com.hederahashgraph.api.proto.java.Transaction;
 import com.swirlds.common.crypto.TransactionSignature;
 
 import java.util.List;
@@ -39,13 +38,12 @@ public static boolean allKeysAreActive(
 			SyncVerifier syncVerifier,
 			TxnAccessor accessor,
 			PlatformSigsFactory sigsFactory,
-			Function<Transaction, PubKeyToSigBytes> sigBytesProvider,
+			PubKeyToSigBytes sigBytes,
 			Function<TxnAccessor, TxnScopedPlatformSigFactory> scopedSigProvider,
 			BiPredicate<JKey, Function<byte[], TransactionSignature>> isActive,
 			Function<List<TransactionSignature>, Function<byte[], TransactionSignature>> sigsFnProvider
 	) {
 		var sigFactory = scopedSigProvider.apply(accessor);
-		var sigBytes = sigBytesProvider.apply(accessor.getSignedTxnWrapper());
 
 		var creationResult = sigsFactory.createEd25519From(keys, sigBytes, sigFactory);
 		if (creationResult.hasFailed()) {

hedera-node/src/main/java/com/hedera/services/keys/SyncActivationCheck.java

@@ -26,7 +26,6 @@
 import com.hedera.services.sigs.sourcing.PubKeyToSigBytes;
 import com.hedera.services.sigs.verification.SyncVerifier;
 import com.hedera.services.utils.TxnAccessor;
-import com.hederahashgraph.api.proto.java.Transaction;
 import com.swirlds.common.crypto.TransactionSignature;
 
 import java.util.List;
@@ -40,7 +39,7 @@ boolean allKeysAreActive(
 			SyncVerifier syncVerifier,
 			TxnAccessor accessor,
 			PlatformSigsFactory sigsFactory,
-			Function<Transaction, PubKeyToSigBytes> sigBytesProvider,
+			PubKeyToSigBytes pkToSigFn,
 			Function<TxnAccessor, TxnScopedPlatformSigFactory> scopedSigProvider,
 			BiPredicate<JKey, Function<byte[], TransactionSignature>> isActive,
 			Function<List<TransactionSignature>, Function<byte[], TransactionSignature>> sigsFnProvider);

hedera-node/src/main/java/com/hedera/services/legacy/services/state/AwareProcessLogic.java

@@ -23,7 +23,8 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.hedera.services.context.ServicesContext;
 import com.hedera.services.legacy.crypto.SignatureStatus;
-import com.hedera.services.sigs.sourcing.ScopedSigBytesProvider;
+import com.hedera.services.sigs.factories.BodySigningSigFactory;
+import com.hedera.services.sigs.sourcing.SigMapPubKeyToSigBytes;
 import com.hedera.services.state.logic.ServicesTxnManager;
 import com.hedera.services.state.submerkle.ExpirableTxnRecord;
 import com.hedera.services.stream.RecordStreamObject;
@@ -42,7 +43,6 @@
 import static com.hedera.services.keys.HederaKeyActivation.payerSigIsActive;
 import static com.hedera.services.legacy.crypto.SignatureStatusCode.SUCCESS_VERIFY_ASYNC;
 import static com.hedera.services.sigs.HederaToPlatformSigOps.rationalizeIn;
-import static com.hedera.services.sigs.Rationalization.IN_HANDLE_SUMMARY_FACTORY;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.FAIL_INVALID;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID;
 import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_CONTRACT_ID;
@@ -200,21 +200,20 @@ private void process(TxnAccessor accessor) {
 
 	private boolean hasActivePayerSig(TxnAccessor accessor) {
 		try {
-			return payerSigIsActive(accessor, ctx.backedKeyOrder(), IN_HANDLE_SUMMARY_FACTORY);
+			return payerSigIsActive(accessor);
 		} catch (Exception edgeCase) {
 			log.warn("Almost inconceivably, when testing payer sig activation:", edgeCase);
 		}
 		return false;
 	}
 
 	private SignatureStatus rationalizeWithPreConsensusSigs(TxnAccessor accessor) {
-		var sigProvider = new ScopedSigBytesProvider(accessor);
 		var sigStatus = rationalizeIn(
 				accessor,
 				ctx.syncVerifier(),
 				ctx.backedKeyOrder(),
-				sigProvider,
-				ctx.sigFactoryCreator()::createScopedFactory);
+				new SigMapPubKeyToSigBytes(accessor.getSigMap()),
+				new BodySigningSigFactory(accessor));
 		if (!sigStatus.isError()) {
 			if (sigStatus.getStatusCode() == SUCCESS_VERIFY_ASYNC) {
 				ctx.speedometers().cycleAsyncVerifications();