@aptos-labs/wallet-adapter-core 3.1.0 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.2.0
+
+### Minor Changes
+
+- 12163ca: Updated SDK dependencies
+
+### Patch Changes
+
+- a6f0e46: Fix is bcs argument types check
+
+## 3.1.1
+
+### Patch Changes
+
+- 6266a29: Consolidate options argument on signAndSubmitTransaction
+
 ## 3.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Types } from 'aptos';
 export { TxnBuilderTypes, Types } from 'aptos';
-import { Network, InputGenerateTransactionData, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, AnyRawTransaction, AccountAuthenticator } from '@aptos-labs/ts-sdk';
+import { Network, InputGenerateTransactionData, InputGenerateTransactionOptions, PendingTransactionResponse, InputSubmitTransactionData, AccountAddressInput, InputGenerateTransactionPayloadData, AnyRawTransaction, AccountAuthenticator } from '@aptos-labs/ts-sdk';
 export { AccountAuthenticator, AnyRawTransaction, InputGenerateTransactionData, InputGenerateTransactionOptions, InputSubmitTransactionData, PendingTransactionResponse } from '@aptos-labs/ts-sdk';
 import EventEmitter from 'eventemitter3';
 
@@ -112,8 +112,10 @@ interface TransactionOptions {
     max_gas_amount?: bigint;
     gas_unit_price?: bigint;
 }
-type InputTransactionData = Omit<InputGenerateTransactionData, "sender"> & {
+type InputTransactionData = {
     sender?: AccountAddressInput;
+    data: InputGenerateTransactionPayloadData;
+    options?: InputGenerateTransactionOptions;
 };
 
 declare class WalletCore extends EventEmitter<WalletCoreEvents> {
@@ -182,7 +184,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
      * @param options optional. A configuration object to generate a transaction by
      * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
      */
-    signAndSubmitTransaction(transactionInput: InputTransactionData, options?: InputGenerateTransactionOptions): Promise<{
+    signAndSubmitTransaction(transactionInput: InputTransactionData): Promise<{
         hash: Types.HexEncodedBytes;
         output?: any;
     } | PendingTransactionResponse>;
@@ -235,5 +237,6 @@ declare function isMobile(): boolean;
 declare function isInAppBrowser(): boolean;
 declare function isRedirectable(): boolean;
 declare function generalizedErrorMessage(error: any): string;
+declare const areBCSArguments: (args: any) => boolean;
 
-export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, InputTransactionData, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, generalizedErrorMessage, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, InputTransactionData, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, areBCSArguments, generalizedErrorMessage, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };

package/dist/index.js

@@ -31,6 +31,7 @@ __export(src_exports, {
   Types: () => import_aptos3.Types,
   WalletCore: () => WalletCore,
   WalletReadyState: () => WalletReadyState,
+  areBCSArguments: () => areBCSArguments,
   generalizedErrorMessage: () => generalizedErrorMessage,
   getLocalStorage: () => getLocalStorage,
   isInAppBrowser: () => isInAppBrowser,
@@ -44,7 +45,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/WalletCore.ts
 var import_aptos2 = require("aptos");
-var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
+var import_ts_sdk3 = require("@aptos-labs/ts-sdk");
 var import_eventemitter32 = __toESM(require("eventemitter3"));
 var import_tweetnacl = __toESM(require("tweetnacl"));
 var import_buffer = require("buffer");
@@ -199,6 +200,7 @@ function getLocalStorage() {
 }
 
 // src/utils/helpers.ts
+var import_ts_sdk = require("@aptos-labs/ts-sdk");
 function isMobile() {
   return /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(
     navigator.userAgent
@@ -221,6 +223,9 @@ function isRedirectable() {
 function generalizedErrorMessage(error) {
   return typeof error === "object" && "message" in error ? error.message : error;
 }
+var areBCSArguments = (args) => {
+  return args.every((arg) => arg instanceof import_ts_sdk.Serializable);
+};
 
 // src/ans.ts
 var ChainIdToAnsContractAddressMap = {
@@ -243,16 +248,16 @@ var getNameByAddress = async (chainId, address) => {
 };
 
 // src/conversion.ts
-var import_ts_sdk = require("@aptos-labs/ts-sdk");
+var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
 var import_aptos = require("aptos");
 function convertNetwork(networkInfo) {
   switch (networkInfo == null ? void 0 : networkInfo.name.toLowerCase()) {
     case "mainnet":
-      return import_ts_sdk.Network.MAINNET;
+      return import_ts_sdk2.Network.MAINNET;
     case "testnet":
-      return import_ts_sdk.Network.TESTNET;
+      return import_ts_sdk2.Network.TESTNET;
     case "devnet":
-      return import_ts_sdk.Network.DEVNET;
+      return import_ts_sdk2.Network.DEVNET;
     default:
       throw new Error("Invalid network name");
   }
@@ -268,7 +273,7 @@ function convertV2PayloadToV1JSONPayload(payload) {
   } else {
     const stringTypeTags = (_a = payload.typeArguments) == null ? void 0 : _a.map(
       (typeTag) => {
-        if (typeTag instanceof import_ts_sdk.TypeTag) {
+        if (typeTag instanceof import_ts_sdk2.TypeTag) {
           return typeTag.toString();
         }
         return typeTag;
@@ -482,26 +487,23 @@ var WalletCore = class extends import_eventemitter32.default {
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transactionInput, options) {
-    var _a, _b;
+  async signAndSubmitTransaction(transactionInput) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       this.doesWalletExist();
       if (((_a = this._wallet) == null ? void 0 : _a.version) === "v2") {
-        const response2 = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: (_b = transactionInput.sender) != null ? _b : this._account.address
-          },
-          options
-        );
+        const response2 = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: (_b = transactionInput.sender) != null ? _b : this._account.address
+        });
         return response2;
       }
       const payloadData = transactionInput.data;
-      if (typeof payloadData.functionArguments[0] === "object") {
-        const aptosConfig = new import_ts_sdk2.AptosConfig({
+      if (areBCSArguments(payloadData.functionArguments)) {
+        const aptosConfig = new import_ts_sdk3.AptosConfig({
           network: convertNetwork(this._network)
         });
-        const newPayload = await (0, import_ts_sdk2.generateTransactionPayload)({
+        const newPayload = await (0, import_ts_sdk3.generateTransactionPayload)({
           ...payloadData,
           aptosConfig
         });
@@ -510,8 +512,8 @@ var WalletCore = class extends import_eventemitter32.default {
           oldTransactionPayload2,
           this._wallet,
           {
-            max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-            gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+            max_gas_amount: ((_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount) ? BigInt((_d = transactionInput.options) == null ? void 0 : _d.maxGasAmount) : void 0,
+            gas_unit_price: ((_e = transactionInput.options) == null ? void 0 : _e.gasUnitPrice) ? BigInt((_f = transactionInput.options) == null ? void 0 : _f.gasUnitPrice) : void 0
           }
         );
         const { hash: hash2, ...output2 } = response2;
@@ -522,8 +524,8 @@ var WalletCore = class extends import_eventemitter32.default {
         oldTransactionPayload,
         this._wallet,
         {
-          max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-          gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+          max_gas_amount: ((_g = transactionInput.options) == null ? void 0 : _g.maxGasAmount) ? BigInt((_h = transactionInput.options) == null ? void 0 : _h.maxGasAmount) : void 0,
+          gas_unit_price: ((_i = transactionInput.options) == null ? void 0 : _i.gasUnitPrice) ? BigInt((_j = transactionInput.options) == null ? void 0 : _j.gasUnitPrice) : void 0
         }
       );
       const { hash, ...output } = response;
@@ -570,9 +572,9 @@ var WalletCore = class extends import_eventemitter32.default {
       const transactionAuthenticator = deserializedSignature.authenticator;
       const publicKey = transactionAuthenticator.public_key.value;
       const signature = transactionAuthenticator.signature.value;
-      const accountAuthenticator = new import_ts_sdk2.AccountAuthenticatorEd25519(
-        new import_ts_sdk2.Ed25519PublicKey(publicKey),
-        new import_ts_sdk2.Ed25519Signature(signature)
+      const accountAuthenticator = new import_ts_sdk3.AccountAuthenticatorEd25519(
+        new import_ts_sdk3.Ed25519PublicKey(publicKey),
+        new import_ts_sdk3.Ed25519Signature(signature)
       );
       return accountAuthenticator;
     } catch (error) {
@@ -705,6 +707,7 @@ var import_aptos3 = require("aptos");
   Types,
   WalletCore,
   WalletReadyState,
+  areBCSArguments,
   generalizedErrorMessage,
   getLocalStorage,
   isInAppBrowser,

package/dist/index.mjs

@@ -161,6 +161,7 @@ function getLocalStorage() {
 }
 
 // src/utils/helpers.ts
+import { Serializable } from "@aptos-labs/ts-sdk";
 function isMobile() {
   return /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(
     navigator.userAgent
@@ -183,6 +184,9 @@ function isRedirectable() {
 function generalizedErrorMessage(error) {
   return typeof error === "object" && "message" in error ? error.message : error;
 }
+var areBCSArguments = (args) => {
+  return args.every((arg) => arg instanceof Serializable);
+};
 
 // src/ans.ts
 var ChainIdToAnsContractAddressMap = {
@@ -447,22 +451,19 @@ var WalletCore = class extends EventEmitter2 {
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transactionInput, options) {
-    var _a, _b;
+  async signAndSubmitTransaction(transactionInput) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       this.doesWalletExist();
       if (((_a = this._wallet) == null ? void 0 : _a.version) === "v2") {
-        const response2 = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: (_b = transactionInput.sender) != null ? _b : this._account.address
-          },
-          options
-        );
+        const response2 = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: (_b = transactionInput.sender) != null ? _b : this._account.address
+        });
         return response2;
       }
       const payloadData = transactionInput.data;
-      if (typeof payloadData.functionArguments[0] === "object") {
+      if (areBCSArguments(payloadData.functionArguments)) {
         const aptosConfig = new AptosConfig({
           network: convertNetwork(this._network)
         });
@@ -475,8 +476,8 @@ var WalletCore = class extends EventEmitter2 {
           oldTransactionPayload2,
           this._wallet,
           {
-            max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-            gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+            max_gas_amount: ((_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount) ? BigInt((_d = transactionInput.options) == null ? void 0 : _d.maxGasAmount) : void 0,
+            gas_unit_price: ((_e = transactionInput.options) == null ? void 0 : _e.gasUnitPrice) ? BigInt((_f = transactionInput.options) == null ? void 0 : _f.gasUnitPrice) : void 0
           }
         );
         const { hash: hash2, ...output2 } = response2;
@@ -487,8 +488,8 @@ var WalletCore = class extends EventEmitter2 {
         oldTransactionPayload,
         this._wallet,
         {
-          max_gas_amount: (options == null ? void 0 : options.maxGasAmount) ? BigInt(options == null ? void 0 : options.maxGasAmount) : void 0,
-          gas_unit_price: (options == null ? void 0 : options.gasUnitPrice) ? BigInt(options == null ? void 0 : options.gasUnitPrice) : void 0
+          max_gas_amount: ((_g = transactionInput.options) == null ? void 0 : _g.maxGasAmount) ? BigInt((_h = transactionInput.options) == null ? void 0 : _h.maxGasAmount) : void 0,
+          gas_unit_price: ((_i = transactionInput.options) == null ? void 0 : _i.gasUnitPrice) ? BigInt((_j = transactionInput.options) == null ? void 0 : _j.gasUnitPrice) : void 0
         }
       );
       const { hash, ...output } = response;
@@ -669,6 +670,7 @@ export {
   Types3 as Types,
   WalletCore,
   WalletReadyState,
+  areBCSArguments,
   generalizedErrorMessage,
   getLocalStorage,
   isInAppBrowser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -43,8 +43,8 @@
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
-    "aptos": "^1.20.0",
-    "@aptos-labs/ts-sdk": "^1.0.0"
+    "aptos": "^1.21.0",
+    "@aptos-labs/ts-sdk": "^1.2.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/WalletCore.ts

@@ -49,6 +49,7 @@ import {
   scopePollingDetectionStrategy,
   isRedirectable,
   generalizedErrorMessage,
+  areBCSArguments,
 } from "./utils";
 import { getNameByAddress } from "./ans";
 import {
@@ -290,8 +291,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @returns The pending transaction hash (V1 output) | PendingTransactionResponse (V2 output)
    */
   async signAndSubmitTransaction(
-    transactionInput: InputTransactionData,
-    options?: InputGenerateTransactionOptions
+    transactionInput: InputTransactionData
   ): Promise<
     { hash: Types.HexEncodedBytes; output?: any } | PendingTransactionResponse
   > {
@@ -300,13 +300,10 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
       // wallet supports sdk v2
       if (this._wallet?.version === "v2") {
-        const response = await this._wallet.signAndSubmitTransaction(
-          {
-            ...transactionInput,
-            sender: transactionInput.sender ?? this._account!.address,
-          },
-          options
-        );
+        const response = await this._wallet.signAndSubmitTransaction({
+          ...transactionInput,
+          sender: transactionInput.sender ?? this._account!.address,
+        });
         // response should be PendingTransactionResponse
         return response;
       }
@@ -314,9 +311,8 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
       // get the payload piece from the input
       const payloadData = transactionInput.data;
 
-      // if first function arguments is an object (i.e a bcs serialized argument)
-      // we assume the transaction should be a bcs serialized transaction
-      if (typeof payloadData.functionArguments[0] === "object") {
+      // first check if each argument is a BCS serialized argument
+      if (areBCSArguments(payloadData.functionArguments)) {
         const aptosConfig = new AptosConfig({
           network: convertNetwork(this._network),
         });
@@ -330,18 +326,17 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
           oldTransactionPayload,
           this._wallet!,
           {
-            max_gas_amount: options?.maxGasAmount
-              ? BigInt(options?.maxGasAmount)
+            max_gas_amount: transactionInput.options?.maxGasAmount
+              ? BigInt(transactionInput.options?.maxGasAmount)
               : undefined,
-            gas_unit_price: options?.gasUnitPrice
-              ? BigInt(options?.gasUnitPrice)
+            gas_unit_price: transactionInput.options?.gasUnitPrice
+              ? BigInt(transactionInput.options?.gasUnitPrice)
               : undefined,
           }
         );
         const { hash, ...output } = response;
         return { hash, output };
       }
-
       // if it is not a bcs serialized arguments transaction, convert to the old
       // json format
       const oldTransactionPayload =
@@ -350,11 +345,11 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         oldTransactionPayload,
         this._wallet!,
         {
-          max_gas_amount: options?.maxGasAmount
-            ? BigInt(options?.maxGasAmount)
+          max_gas_amount: transactionInput.options?.maxGasAmount
+            ? BigInt(transactionInput.options?.maxGasAmount)
             : undefined,
-          gas_unit_price: options?.gasUnitPrice
-            ? BigInt(options?.gasUnitPrice)
+          gas_unit_price: transactionInput.options?.gasUnitPrice
+            ? BigInt(transactionInput.options?.gasUnitPrice)
             : undefined,
         }
       );

package/src/types.ts

@@ -6,6 +6,7 @@ import {
   InputSubmitTransactionData,
   PendingTransactionResponse,
   AccountAddressInput,
+  InputGenerateTransactionPayloadData,
 } from "@aptos-labs/ts-sdk";
 import { WalletReadyState } from "./constants";
 
@@ -128,8 +129,8 @@ export interface TransactionOptions {
   gas_unit_price?: bigint;
 }
 
-// Omit the ts-sdk InputGenerateTransactionData type to make "sender" optional
-export type InputTransactionData = Omit<
-  InputGenerateTransactionData,
-  "sender"
-> & { sender?: AccountAddressInput };
+export type InputTransactionData = {
+  sender?: AccountAddressInput;
+  data: InputGenerateTransactionPayloadData;
+  options?: InputGenerateTransactionOptions;
+};

package/src/utils/helpers.ts

@@ -1,3 +1,5 @@
+import { Serializable } from "@aptos-labs/ts-sdk";
+
 export function isMobile(): boolean {
   return /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(
     navigator.userAgent
@@ -30,3 +32,11 @@ export function generalizedErrorMessage(error: any): string {
     ? error.message
     : error;
 }
+
+// Helper function to check if input arguments are BCS serialized arguments.
+// In @aptos-labs/ts-sdk each move representative class extends
+// Serializable, so if each argument is of an instance of a class
+// the extends Serializable - we know these are BCS arguments
+export const areBCSArguments = (args: any): boolean => {
+  return args.every((arg: any) => arg instanceof Serializable);
+};