@aptos-labs/ts-sdk 1.14.0 → 1.15.0

package/src/api/table.ts

@@ -0,0 +1,108 @@
+import { getTableItem, getTableItemsData, getTableItemsMetadata } from "../internal/table";
+import {
+  TableItemRequest,
+  LedgerVersionArg,
+  AnyNumber,
+  PaginationArgs,
+  WhereArg,
+  OrderByArg,
+  GetTableItemsDataResponse,
+  GetTableItemsMetadataResponse,
+} from "../types";
+import { TableItemsBoolExp, TableMetadatasBoolExp } from "../types/generated/types";
+import { ProcessorType } from "../utils";
+import { AptosConfig } from "./aptosConfig";
+import { waitForIndexerOnVersion } from "./utils";
+
+/**
+ * A class to query all `Table` Aptos related queries
+ */
+export class Table {
+  readonly config: AptosConfig;
+
+  constructor(config: AptosConfig) {
+    this.config = config;
+  }
+
+  /**
+   * Queries for a table item for a table identified by the handle and the key for the item.
+   * Key and value types need to be passed in to help with key serialization and value deserialization.
+   *
+   * Note, this query calls the fullnode server
+   *
+   * @example https://api.devnet.aptoslabs.com/v1/accounts/0x1/resource/0x1::coin::CoinInfo%3C0x1::aptos_coin::AptosCoin%3E
+   * const tableItem = await aptos.getTableItem({
+   *  handle: "0x1b854694ae746cdbd8d44186ca4929b2b337df21d1c74633be19b2710552fdca",
+   *  data: {
+   *   key_type: "address", // Move type of table key
+   *   value_type: "u128", // Move type of table value
+   *   key: "0x619dc29a0aac8fa146714058e8dd6d2d0f3bdf5f6331907bf91f3acd81e6935" // Value of table key
+   *  },
+   * })
+   *
+   * @param args.handle A pointer to where that table is stored
+   * @param args.data Object that describes table item
+   * @param args.options.ledgerVersion The ledger version to query, if not provided it will get the latest version
+   *
+   * @returns Table item value rendered in JSON
+   */
+  async getTableItem<T>(args: { handle: string; data: TableItemRequest; options?: LedgerVersionArg }): Promise<T> {
+    return getTableItem<T>({ aptosConfig: this.config, ...args });
+  }
+
+  /**
+   * Queries for a table items data.
+   *
+   * Optional `options.where` param can be passed to filter the response.
+   *
+   * Note, this query calls the indexer server
+   *
+   * @example
+   * const data = await aptos.getTableItemsData({
+   *  options: { where: {
+   *      table_handle: { _eq: "0x1b854694ae746cdbd8d44186ca4929b2b337df21d1c74633be19b2710552fdca" },
+   *      transaction_version: { _eq: "0" }
+   *    }
+   *  },
+   * });
+   *
+   * @returns GetTableItemsDataResponse
+   */
+  async getTableItemsData(args: {
+    minimumLedgerVersion?: AnyNumber;
+    options?: PaginationArgs & WhereArg<TableItemsBoolExp> & OrderByArg<GetTableItemsDataResponse[0]>;
+  }): Promise<GetTableItemsDataResponse> {
+    await waitForIndexerOnVersion({
+      config: this.config,
+      minimumLedgerVersion: args.minimumLedgerVersion,
+      processorType: ProcessorType.DEFAULT,
+    });
+    return getTableItemsData({ aptosConfig: this.config, ...args });
+  }
+
+  /**
+   * Queries for a table items metadata.
+   *
+   * Optional `options.where` param can be passed to filter the response.
+   *
+   * Note, this query calls the indexer server
+   *
+   * @example
+   * const data = await aptos.getTableItemsMetadata({
+   *  options: { where: { handle: { _eq: "0x1b854694ae746cdbd8d44186ca4929b2b337df21d1c74633be19b2710552fdca" } } },
+   * });
+   *
+   * @returns GetTableItemsMetadataResponse
+   */
+  async getTableItemsMetadata(args: {
+    minimumLedgerVersion?: AnyNumber;
+    options?: PaginationArgs & WhereArg<TableMetadatasBoolExp> & OrderByArg<GetTableItemsMetadataResponse[0]>;
+  }): Promise<GetTableItemsMetadataResponse> {
+    await waitForIndexerOnVersion({
+      config: this.config,
+      minimumLedgerVersion: args.minimumLedgerVersion,
+      processorType: ProcessorType.DEFAULT,
+    });
+    return getTableItemsMetadata({ aptosConfig: this.config, ...args });
+  }
+}

package/src/api/transaction.ts

@@ -33,7 +33,8 @@ import {
   InputGenerateTransactionOptions,
   InputGenerateTransactionPayloadData,
 } from "../transactions";
-import { AccountAddressInput, Account, PrivateKey } from "../core";
+import { AccountAddressInput, PrivateKey } from "../core";
+import { Account } from "../account";
 import { Build } from "./transactionSubmission/build";
 import { Simulate } from "./transactionSubmission/simulate";
 import { Submit } from "./transactionSubmission/submit";

package/src/api/transactionSubmission/management.ts

@@ -2,7 +2,7 @@ import EventEmitter from "eventemitter3";
 import { TransactionWorkerEvents, TransactionWorker, TransactionWorkerEventsEnum } from "../../transactions/management";
 import { InputGenerateTransactionPayloadData, InputGenerateTransactionOptions } from "../../transactions";
 import { AptosConfig } from "../aptosConfig";
-import { Account } from "../../core";
+import { Account } from "../../account";
 
 export class TransactionManagement extends EventEmitter<TransactionWorkerEvents> {
   account!: Account;

package/src/api/transactionSubmission/sign.ts

@@ -1,7 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-import { Account } from "../../core";
+import { Account } from "../../account";
 import { signTransaction } from "../../internal/transactionSubmission";
 import { AccountAuthenticator, AnyRawTransaction } from "../../transactions";
 import { AptosConfig } from "../aptosConfig";

package/src/core/account/index.ts

@@ -1,4 +1 @@
-export * from "./Ed25519Account";
-export * from "./Account";
-export * from "./SingleKeyAccount";
 export * from "./utils";

package/src/core/crypto/multiKey.ts

@@ -139,6 +139,22 @@ export class MultiKey extends AccountPublicKey {
 
     return bitmap;
   }
+
+  /**
+   * Get the index of the provided public key.
+   *
+   * @param publicKey array of the index mapping to the matching public keys
+   * @returns the corresponding index of the publicKey, if it exists
+   */
+  getIndex(publicKey: PublicKey): number {
+    const anyPublicKey = publicKey instanceof AnyPublicKey ? publicKey : new AnyPublicKey(publicKey);
+    const index = this.publicKeys.findIndex((pk) => pk.toString() === anyPublicKey.toString());
+
+    if (index !== -1) {
+      return index;
+    }
+    throw new Error("Public key not found in MultiKey");
+  }
 }
 
 export class MultiKeySignature extends Signature {
@@ -266,13 +282,8 @@ export class MultiKeySignature extends Signature {
   }
 
   static deserialize(deserializer: Deserializer): MultiKeySignature {
+    const signatures = deserializer.deserializeVector(AnySignature);
     const bitmap = deserializer.deserializeBytes();
-    const nSignatures = bitmap.reduce((acc, byte) => acc + bitCount(byte), 0);
-    const signatures: AnySignature[] = [];
-    for (let i = 0; i < nSignatures; i += 1) {
-      const signature = AnySignature.deserialize(deserializer);
-      signatures.push(signature);
-    }
     return new MultiKeySignature({ signatures, bitmap });
   }
 

package/src/core/index.ts

@@ -1,7 +1,6 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-export * from "./account";
 export * from "./accountAddress";
 export * from "./authenticationKey";
 export * from "./common";

package/src/index.ts

@@ -1,6 +1,7 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
+export * from "./account";
 export * from "./api";
 export * from "./bcs";
 export * from "./client";

package/src/internal/account.ts

@@ -11,9 +11,9 @@
 import { AptosConfig } from "../api/aptosConfig";
 import { AptosApiError, getAptosFullNode, paginateWithCursor } from "../client";
 import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
-import { Account } from "../core/account";
+import { Account } from "../account";
 import { AnyPublicKey, Ed25519PublicKey, PrivateKey } from "../core/crypto";
-import { getTableItem, queryIndexer } from "./general";
+import { queryIndexer } from "./general";
 import {
   AccountData,
   GetAccountCoinsDataResponse,
@@ -54,6 +54,7 @@ import {
 import { memoizeAsync } from "../utils/memoize";
 import { Secp256k1PrivateKey, AuthenticationKey, Ed25519PrivateKey } from "../core";
 import { CurrentFungibleAssetBalancesBoolExp } from "../types/generated/types";
+import { getTableItem } from "./table";
 
 export async function getInfo(args: {
   aptosConfig: AptosConfig;

package/src/internal/ans.ts

@@ -9,7 +9,8 @@
  */
 
 import { AptosConfig } from "../api/aptosConfig";
-import { Account, AccountAddress, AccountAddressInput } from "../core";
+import { Account } from "../account";
+import { AccountAddress, AccountAddressInput } from "../core";
 import { InputGenerateTransactionOptions } from "../transactions/types";
 import { GetANSNameResponse, MoveAddressType, OrderByArg, PaginationArgs, WhereArg } from "../types";
 import { GetNamesQuery } from "../types/generated/operations";

package/src/internal/digitalAsset.ts

@@ -10,7 +10,8 @@
 
 import { AptosConfig } from "../api/aptosConfig";
 import { Bool, MoveString, MoveVector, U64 } from "../bcs";
-import { Account, AccountAddress, AccountAddressInput } from "../core";
+import { AccountAddress, AccountAddressInput } from "../core";
+import { Account } from "../account";
 import { EntryFunctionABI, InputGenerateTransactionOptions } from "../transactions/types";
 import {
   AnyNumber,

package/src/internal/fungibleAsset.ts

@@ -33,7 +33,8 @@ import {
   FungibleAssetActivitiesBoolExp,
   FungibleAssetMetadataBoolExp,
 } from "../types/generated/types";
-import { Account, AccountAddressInput } from "../core";
+import { AccountAddressInput } from "../core";
+import { Account } from "../account";
 import {
   EntryFunctionABI,
   InputGenerateTransactionOptions,

package/src/internal/general.ts

@@ -9,7 +9,7 @@
  */
 
 import { AptosConfig } from "../api/aptosConfig";
-import { getAptosFullNode, postAptosFullNode, postAptosIndexer } from "../client";
+import { getAptosFullNode, postAptosIndexer } from "../client";
 import {
   AnyNumber,
   Block,
@@ -17,8 +17,6 @@ import {
   GetProcessorStatusResponse,
   GraphqlQuery,
   LedgerInfo,
-  LedgerVersionArg,
-  TableItemRequest,
 } from "../types";
 import { GetChainTopUserTransactionsQuery, GetProcessorStatusQuery } from "../types/generated/operations";
 import { GetChainTopUserTransactions, GetProcessorStatus } from "../types/generated/queries";
@@ -64,23 +62,6 @@ export async function getBlockByHeight(args: {
   return data;
 }
 
-export async function getTableItem<T>(args: {
-  aptosConfig: AptosConfig;
-  handle: string;
-  data: TableItemRequest;
-  options?: LedgerVersionArg;
-}): Promise<T> {
-  const { aptosConfig, handle, data, options } = args;
-  const response = await postAptosFullNode<TableItemRequest, any>({
-    aptosConfig,
-    originMethod: "getTableItem",
-    path: `tables/${handle}/item`,
-    params: { ledger_version: options?.ledgerVersion },
-    body: data,
-  });
-  return response.data as T;
-}
-
 export async function getChainTopUserTransactions(args: {
   aptosConfig: AptosConfig;
   limit: number;

package/src/internal/queries/currentTokenOwnershipFieldsFragment.graphql

@@ -25,6 +25,7 @@ fragment CurrentTokenOwnershipFields on current_token_ownerships_v2 {
     token_properties
     token_standard
     token_uri
+    decimals
     current_collection {
       collection_id
       collection_name

package/src/internal/queries/getTableItemsData.graphql

@@ -0,0 +1,15 @@
+query getTableItemsData(
+  $where_condition: table_items_bool_exp!
+  $offset: Int
+  $limit: Int
+  $order_by: [table_items_order_by!]
+) {
+  table_items(where: $where_condition, offset: $offset, limit: $limit, order_by: $order_by){
+    decoded_key
+    decoded_value
+    key
+    table_handle
+    transaction_version
+    write_set_change_index
+  }
+}

package/src/internal/queries/getTableItemsMetadata.graphql

@@ -0,0 +1,12 @@
+query getTableItemsMetadata(
+  $where_condition: table_metadatas_bool_exp!
+  $offset: Int
+  $limit: Int
+  $order_by: [table_metadatas_order_by!]
+) {
+  table_metadatas(where: $where_condition, offset: $offset, limit: $limit, order_by: $order_by){
+     handle
+    key_type
+    value_type
+  }
+}

package/src/internal/table.ts

@@ -0,0 +1,82 @@
+import { AptosConfig } from "../api/aptosConfig";
+import { postAptosFullNode } from "../client";
+import {
+  TableItemRequest,
+  LedgerVersionArg,
+  PaginationArgs,
+  WhereArg,
+  OrderByArg,
+  GetTableItemsDataResponse,
+  GetTableItemsMetadataResponse,
+} from "../types";
+import { GetTableItemsDataQuery, GetTableItemsMetadataQuery } from "../types/generated/operations";
+import { GetTableItemsData, GetTableItemsMetadata } from "../types/generated/queries";
+import { TableItemsBoolExp, TableMetadatasBoolExp } from "../types/generated/types";
+import { queryIndexer } from "./general";
+
+export async function getTableItem<T>(args: {
+  aptosConfig: AptosConfig;
+  handle: string;
+  data: TableItemRequest;
+  options?: LedgerVersionArg;
+}): Promise<T> {
+  const { aptosConfig, handle, data, options } = args;
+  const response = await postAptosFullNode<TableItemRequest, any>({
+    aptosConfig,
+    originMethod: "getTableItem",
+    path: `tables/${handle}/item`,
+    params: { ledger_version: options?.ledgerVersion },
+    body: data,
+  });
+  return response.data as T;
+}
+
+export async function getTableItemsData(args: {
+  aptosConfig: AptosConfig;
+  options?: PaginationArgs & WhereArg<TableItemsBoolExp> & OrderByArg<GetTableItemsDataResponse[0]>;
+}) {
+  const { aptosConfig, options } = args;
+
+  const graphqlQuery = {
+    query: GetTableItemsData,
+    variables: {
+      where_condition: options?.where,
+      offset: options?.offset,
+      limit: options?.limit,
+      order_by: options?.orderBy,
+    },
+  };
+
+  const data = await queryIndexer<GetTableItemsDataQuery>({
+    aptosConfig,
+    query: graphqlQuery,
+    originMethod: "getTableItemsData",
+  });
+
+  return data.table_items;
+}
+
+export async function getTableItemsMetadata(args: {
+  aptosConfig: AptosConfig;
+  options?: PaginationArgs & WhereArg<TableMetadatasBoolExp> & OrderByArg<GetTableItemsMetadataResponse[0]>;
+}): Promise<GetTableItemsMetadataResponse> {
+  const { aptosConfig, options } = args;
+
+  const graphqlQuery = {
+    query: GetTableItemsMetadata,
+    variables: {
+      where_condition: options?.where,
+      offset: options?.offset,
+      limit: options?.limit,
+      order_by: options?.orderBy,
+    },
+  };
+
+  const data = await queryIndexer<GetTableItemsMetadataQuery>({
+    aptosConfig,
+    query: graphqlQuery,
+    originMethod: "getTableItemsMetadata",
+  });
+
+  return data.table_metadatas;
+}

package/src/internal/transactionSubmission.ts

@@ -8,7 +8,7 @@
 import { AptosConfig } from "../api/aptosConfig";
 import { MoveVector, U8 } from "../bcs";
 import { postAptosFullNode } from "../client";
-import { Account } from "../core/account";
+import { Account } from "../account";
 import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
 import { PrivateKey } from "../core/crypto";
 import { AccountAuthenticator } from "../transactions/authenticator/account";
@@ -18,8 +18,6 @@ import {
   generateTransactionPayload,
   generateSignedTransactionForSimulation,
   generateSignedTransaction,
-  sign,
-  generateSigningMessage,
 } from "../transactions/transactionBuilder/transactionBuilder";
 import {
   InputGenerateTransactionData,
@@ -35,7 +33,7 @@ import {
 } from "../transactions/types";
 import { getInfo } from "./account";
 import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput, TransactionResponse } from "../types";
-import { TypeTagU8, TypeTagVector } from "../transactions";
+import { TypeTagU8, TypeTagVector, generateSigningMessageForTransaction } from "../transactions";
 import { SimpleTransaction } from "../transactions/instances/simpleTransaction";
 import { MultiAgentTransaction } from "../transactions/instances/multiAgentTransaction";
 
@@ -185,7 +183,7 @@ function isMultiAgentTransactionInput(
  */
 export function getSigningMessage(args: { transaction: AnyRawTransaction }): Uint8Array {
   const { transaction } = args;
-  return generateSigningMessage(transaction);
+  return generateSigningMessageForTransaction(transaction);
 }
 
 /**
@@ -204,8 +202,8 @@ export function getSigningMessage(args: { transaction: AnyRawTransaction }): Uin
  * @return The signer AccountAuthenticator
  */
 export function signTransaction(args: { signer: Account; transaction: AnyRawTransaction }): AccountAuthenticator {
-  const accountAuthenticator = sign({ ...args });
-  return accountAuthenticator;
+  const { signer, transaction } = args;
+  return signer.signTransactionWithAuthenticator(transaction);
 }
 
 /**

package/src/transactions/authenticator/account.ts

@@ -7,7 +7,7 @@ import { Serializer, Deserializer, Serializable } from "../../bcs";
 import { AnyPublicKey, AnySignature } from "../../core/crypto";
 import { Ed25519PublicKey, Ed25519Signature } from "../../core/crypto/ed25519";
 import { MultiEd25519PublicKey, MultiEd25519Signature } from "../../core/crypto/multiEd25519";
-import { MultiKey } from "../../core/crypto/multiKey";
+import { MultiKey, MultiKeySignature } from "../../core/crypto/multiKey";
 import { AccountAuthenticatorVariant } from "../../types";
 
 export abstract class AccountAuthenticator extends Serializable {
@@ -149,28 +149,23 @@ export class AccountAuthenticatorSingleKey extends AccountAuthenticator {
 export class AccountAuthenticatorMultiKey extends AccountAuthenticator {
   public readonly public_keys: MultiKey;
 
-  public readonly signatures: Array<AnySignature>;
+  public readonly signatures: MultiKeySignature;
 
-  public readonly signatures_bitmap: Uint8Array;
-
-  constructor(public_keys: MultiKey, signatures: Array<AnySignature>, signatures_bitmap: Uint8Array) {
+  constructor(public_keys: MultiKey, signatures: MultiKeySignature) {
     super();
     this.public_keys = public_keys;
     this.signatures = signatures;
-    this.signatures_bitmap = signatures_bitmap;
   }
 
   serialize(serializer: Serializer): void {
     serializer.serializeU32AsUleb128(AccountAuthenticatorVariant.MultiKey);
     this.public_keys.serialize(serializer);
-    serializer.serializeVector<AnySignature>(this.signatures);
-    serializer.serializeBytes(this.signatures_bitmap);
+    this.signatures.serialize(serializer);
   }
 
   static load(deserializer: Deserializer): AccountAuthenticatorMultiKey {
     const public_keys = MultiKey.deserialize(deserializer);
-    const signatures = deserializer.deserializeVector(AnySignature);
-    const signatures_bitmap = deserializer.deserializeBytes();
-    return new AccountAuthenticatorMultiKey(public_keys, signatures, signatures_bitmap);
+    const signatures = MultiKeySignature.deserialize(deserializer);
+    return new AccountAuthenticatorMultiKey(public_keys, signatures);
   }
 }

package/src/transactions/management/accountSequenceNumber.ts

@@ -24,7 +24,7 @@
  */
 
 import { AptosConfig } from "../../api/aptosConfig";
-import { Account } from "../../core";
+import { Account } from "../../account";
 import { getInfo } from "../../internal/account";
 import { sleep } from "../../utils/helpers";
 

package/src/transactions/management/transactionWorker.ts

@@ -2,7 +2,7 @@
 
 import EventEmitter from "eventemitter3";
 import { AptosConfig } from "../../api/aptosConfig";
-import { Account } from "../../core";
+import { Account } from "../../account";
 import { waitForTransaction } from "../../internal/transaction";
 import { generateTransaction, signAndSubmitTransaction } from "../../internal/transactionSubmission";
 import { PendingTransactionResponse, TransactionResponse } from "../../types";

package/src/transactions/transactionBuilder/index.ts

@@ -4,3 +4,4 @@
 export * from "./helpers";
 export * from "./transactionBuilder";
 export * from "./remoteAbi";
+export * from "./signingMessage";

package/src/transactions/transactionBuilder/signingMessage.ts

@@ -0,0 +1,93 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * This file handles the generation of the signing message.
+ */
+import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
+import { RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT } from "../../utils/const";
+import { FeePayerRawTransaction, MultiAgentRawTransaction } from "../instances";
+import { AnyRawTransaction, AnyRawTransactionInstance } from "../types";
+import { Serializable } from "../../bcs";
+
+/**
+ * Derive the raw transaction type - FeePayerRawTransaction or MultiAgentRawTransaction or RawTransaction
+ *
+ * @param transaction A aptos transaction type
+ *
+ * @returns FeePayerRawTransaction | MultiAgentRawTransaction | RawTransaction
+ */
+export function deriveTransactionType(transaction: AnyRawTransaction): AnyRawTransactionInstance {
+  if (transaction.feePayerAddress) {
+    return new FeePayerRawTransaction(
+      transaction.rawTransaction,
+      transaction.secondarySignerAddresses ?? [],
+      transaction.feePayerAddress,
+    );
+  }
+  if (transaction.secondarySignerAddresses) {
+    return new MultiAgentRawTransaction(transaction.rawTransaction, transaction.secondarySignerAddresses);
+  }
+
+  return transaction.rawTransaction;
+}
+
+/**
+ * Generates the 'signing message' form of a message to be signed.
+ *
+ * @param bytes The byte representation of the message to be signed and sent to the chain
+ * @param domainSeparator A domain separator that starts with 'APTOS::'
+ *
+ * @returns The Uint8Array of the signing message
+ */
+export function generateSigningMessage(bytes: Uint8Array, domainSeparator: string): Uint8Array {
+  const hash = sha3Hash.create();
+
+  if (!domainSeparator.startsWith("APTOS::")) {
+    throw new Error(`Domain separator needs to start with 'APTOS::'.  Provided - ${domainSeparator}`);
+  }
+
+  hash.update(domainSeparator);
+
+  const prefix = hash.digest();
+
+  const body = bytes;
+
+  const mergedArray = new Uint8Array(prefix.length + body.length);
+  mergedArray.set(prefix);
+  mergedArray.set(body, prefix.length);
+
+  return mergedArray;
+}
+
+/**
+ * Generates the 'signing message' form of a serilizable value. It bcs serializes the value and uses the name of
+ * its constructor as the domain separator.
+ *
+ * @param serializable An object that has a bcs serialized form
+ *
+ * @returns The Uint8Array of the signing message
+ */
+export function generateSigningMessageForSerializable(serializable: Serializable): Uint8Array {
+  return generateSigningMessage(serializable.bcsToBytes(), `APTOS::${serializable.constructor.name}`);
+}
+
+/**
+ * Generates the 'signing message' form of a transaction. It derives the type of transaction and
+ * applies the appropriate domain separator based on if there is extra data such as a fee payer or
+ * secondary signers.
+ *
+ * @param transaction A transaction that is to be signed
+ *
+ * @returns The Uint8Array of the signing message
+ */
+export function generateSigningMessageForTransaction(transaction: AnyRawTransaction): Uint8Array {
+  const rawTxn = deriveTransactionType(transaction);
+  if (transaction.feePayerAddress) {
+    return generateSigningMessage(rawTxn.bcsToBytes(), RAW_TRANSACTION_WITH_DATA_SALT);
+  }
+  if (transaction.secondarySignerAddresses) {
+    return generateSigningMessage(rawTxn.bcsToBytes(), RAW_TRANSACTION_WITH_DATA_SALT);
+  }
+  return generateSigningMessage(rawTxn.bcsToBytes(), RAW_TRANSACTION_SALT);
+}