address comments

aptos-labs · Oct 9, 2024 · 5fc34d5 · 5fc34d5
1 parent 23a1a79
commit 5fc34d5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 27 deletions.
diff --git a/examples/typescript-esm/multisig_v2.ts b/examples/typescript-esm/multisig_v2.ts
@@ -142,8 +142,7 @@ const createMultiSigTransferTransaction = async () => {
     aptosConfig: config,
   });
 
-  // The simulation enhancement feature is not enabled on the devnet yet.
-  const isSimulationEnhancementFeatureEnabled = false;
+  const isSimulationEnhancementFeatureEnabled = true;
   if (!isSimulationEnhancementFeatureEnabled) {
     // Simulate the transfer transaction to make sure it passes
     const transactionToSimulate = await generateRawTransaction({

diff --git a/src/transactions/transactionBuilder/transactionBuilder.ts b/src/transactions/transactionBuilder/transactionBuilder.ts
@@ -395,20 +395,11 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
       transaction.secondarySignerAddresses ?? [],
       transaction.feePayerAddress,
     );
-    let secondaryAccountAuthenticators: Array<AccountAuthenticator> = [];
-    if (transaction.secondarySignerAddresses) {
-      if (secondarySignersPublicKeys) {
-        secondaryAccountAuthenticators = secondarySignersPublicKeys.map((publicKey) =>
-          getAuthenticatorForSimulation(publicKey),
-        );
-      } else {
-        secondaryAccountAuthenticators = new Array(transaction.secondarySignerAddresses.length)
-          .fill(undefined)
-          .map((publicKey) => getAuthenticatorForSimulation(publicKey));
-      }
-    }
-
-    const feePayerAuthenticator = getAuthenticatorForSimulation(feePayerPublicKey);
+    const secondaryAccountAuthenticators: Array<AccountAuthenticator> = secondaryAccountAuthenticatorsForSimulation(
+      secondarySignersPublicKeys,
+      transaction.secondarySignerAddresses?.length ?? 0,
+    );
+    const feePayerAuthenticator = getAuthenticatorForSimulation(feePayerPublicKey!);
 
     const transactionAuthenticator = new TransactionAuthenticatorFeePayer(
       accountAuthenticator,
@@ -429,17 +420,10 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
       transaction.secondarySignerAddresses,
     );
 
-    let secondaryAccountAuthenticators: Array<AccountAuthenticator> = [];
-
-    if (secondarySignersPublicKeys) {
-      secondaryAccountAuthenticators = secondarySignersPublicKeys.map((publicKey) =>
-        getAuthenticatorForSimulation(publicKey),
-      );
-    } else {
-      secondaryAccountAuthenticators = new Array(transaction.secondarySignerAddresses.length)
-        .fill(undefined)
-        .map((publicKey) => getAuthenticatorForSimulation(publicKey));
-    }
+    const secondaryAccountAuthenticators: Array<AccountAuthenticator> = secondaryAccountAuthenticatorsForSimulation(
+      secondarySignersPublicKeys,
+      transaction.secondarySignerAddresses.length,
+    );
 
     const transactionAuthenticator = new TransactionAuthenticatorMultiAgent(
       accountAuthenticator,
@@ -467,6 +451,16 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
   return new SignedTransaction(transaction.rawTransaction, transactionAuthenticator).bcsToBytes();
 }
 
+function secondaryAccountAuthenticatorsForSimulation(
+  secondarySignersPublicKeys: Array<PublicKey | undefined> | undefined,
+  numSecondarySigners: number,
+): Array<AccountAuthenticatorNoAccountAuthenticator | AccountAuthenticatorEd25519 | AccountAuthenticatorSingleKey> {
+  if (secondarySignersPublicKeys) {
+    return secondarySignersPublicKeys.map((publicKey) => getAuthenticatorForSimulation(publicKey));
+  }
+  return new Array(numSecondarySigners).fill(undefined).map((publicKey) => getAuthenticatorForSimulation(publicKey));
+}
+
 export function getAuthenticatorForSimulation(publicKey?: PublicKey) {
   if (!publicKey) {
     return new AccountAuthenticatorNoAccountAuthenticator();