@aptos-labs/wallet-adapter-core 3.4.0 → 3.6.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.6.0
+
+### Minor Changes
+
+- 8ebd4c7: Upgrade Aptos ts sdk version to 1.6.0
+
+## 3.5.0
+
+### Minor Changes
+
+- 4ca4201: Export PluginProvider type
+
 ## 3.4.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -97,7 +97,7 @@ interface AdapterPluginProps<Name extends string = string> {
     connect(): Promise<any>;
     disconnect: () => Promise<any>;
     network: () => Promise<any>;
-    signAndSubmitTransaction<V>(transaction: Types.TransactionPayload | InputGenerateTransactionData, options?: InputGenerateTransactionOptions): Promise<{
+    signAndSubmitTransaction(transaction: Types.TransactionPayload | InputGenerateTransactionData, options?: InputGenerateTransactionOptions): Promise<{
         hash: Types.HexEncodedBytes;
         output?: any;
     } | PendingTransactionResponse>;
@@ -117,6 +117,18 @@ type InputTransactionData = {
     data: InputGenerateTransactionPayloadData;
     options?: InputGenerateTransactionOptions;
 };
+interface PluginProvider {
+    connect: () => Promise<AccountInfo>;
+    account: () => Promise<AccountInfo>;
+    disconnect: () => Promise<void>;
+    signAndSubmitTransaction: (transaction: any, options?: any) => Promise<{
+        hash: Types.HexEncodedBytes;
+    } | AptosWalletErrorResult>;
+    signMessage: (message: SignMessagePayload) => Promise<SignMessageResponse>;
+    network: () => Promise<NetworkInfo>;
+    onAccountChange: (listener: (newAddress: AccountInfo) => Promise<void>) => Promise<void>;
+    onNetworkChange: OnNetworkChange;
+}
 
 declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private _wallets;
@@ -239,4 +251,4 @@ declare function isRedirectable(): boolean;
 declare function generalizedErrorMessage(error: any): string;
 declare const areBCSArguments: (args: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>) => boolean;
 
-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 };
+export { AccountInfo, AdapterPlugin, AdapterPluginEvents, AdapterPluginProps, AptosWalletErrorResult, InputTransactionData, NetworkInfo, NetworkName, OnAccountChange, OnNetworkChange, PluginProvider, SignMessagePayload, SignMessageResponse, TransactionOptions, Wallet, WalletCore, WalletCoreEvents, WalletInfo, WalletName, WalletReadyState, areBCSArguments, generalizedErrorMessage, getLocalStorage, isInAppBrowser, isMobile, isRedirectable, removeLocalStorage, scopePollingDetectionStrategy, setLocalStorage };

package/dist/index.js

@@ -309,6 +309,11 @@ var WalletCoreV1 = class extends import_eventemitter3.default {
     }
   }
   async signAndSubmitBCSTransaction(transaction, wallet, options) {
+    if (!("signAndSubmitBCSTransaction" in wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${wallet.name}`
+      ).message;
+    }
     try {
       const response = await wallet.signAndSubmitBCSTransaction(
         transaction,
@@ -549,7 +554,7 @@ var WalletCore = class extends import_eventemitter32.default {
             `Sign Transaction V2 is not supported by ${(_b = this.wallet) == null ? void 0 : _b.name}`
           ).message;
         }
-        const accountAuthenticator2 = this._wallet.signTransaction(
+        const accountAuthenticator2 = await this._wallet.signTransaction(
           transactionOrPayload,
           asFeePayer
         );
@@ -597,15 +602,25 @@ var WalletCore = class extends import_eventemitter32.default {
     }
   }
   async submitTransaction(transaction) {
-    var _a;
-    if (this._wallet && !("submitTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Submit Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
-      ).message;
-    }
     try {
       this.doesWalletExist();
-      const pendingTransaction = this._wallet.submitTransaction(
+      if (this._wallet && !("submitTransaction" in this._wallet)) {
+        const { additionalSignersAuthenticators } = transaction;
+        const aptosConfig = new import_ts_sdk3.AptosConfig({
+          network: convertNetwork(this.network)
+        });
+        const aptos = new import_ts_sdk3.Aptos(aptosConfig);
+        if (additionalSignersAuthenticators !== void 0) {
+          const multiAgentTxn = {
+            ...transaction,
+            additionalSignersAuthenticators
+          };
+          return aptos.transaction.submit.multiAgent(multiAgentTxn);
+        } else {
+          return aptos.transaction.submit.simple(transaction);
+        }
+      }
+      const pendingTransaction = await this._wallet.submitTransaction(
         transaction
       );
       return pendingTransaction;

package/dist/index.mjs

@@ -5,7 +5,8 @@ import {
   Ed25519PublicKey,
   Ed25519Signature,
   AptosConfig,
-  generateTransactionPayload
+  generateTransactionPayload,
+  Aptos
 } from "@aptos-labs/ts-sdk";
 import EventEmitter2 from "eventemitter3";
 import nacl from "tweetnacl";
@@ -275,6 +276,11 @@ var WalletCoreV1 = class extends EventEmitter {
     }
   }
   async signAndSubmitBCSTransaction(transaction, wallet, options) {
+    if (!("signAndSubmitBCSTransaction" in wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${wallet.name}`
+      ).message;
+    }
     try {
       const response = await wallet.signAndSubmitBCSTransaction(
         transaction,
@@ -515,7 +521,7 @@ var WalletCore = class extends EventEmitter2 {
             `Sign Transaction V2 is not supported by ${(_b = this.wallet) == null ? void 0 : _b.name}`
           ).message;
         }
-        const accountAuthenticator2 = this._wallet.signTransaction(
+        const accountAuthenticator2 = await this._wallet.signTransaction(
           transactionOrPayload,
           asFeePayer
         );
@@ -563,15 +569,25 @@ var WalletCore = class extends EventEmitter2 {
     }
   }
   async submitTransaction(transaction) {
-    var _a;
-    if (this._wallet && !("submitTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Submit Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
-      ).message;
-    }
     try {
       this.doesWalletExist();
-      const pendingTransaction = this._wallet.submitTransaction(
+      if (this._wallet && !("submitTransaction" in this._wallet)) {
+        const { additionalSignersAuthenticators } = transaction;
+        const aptosConfig = new AptosConfig({
+          network: convertNetwork(this.network)
+        });
+        const aptos = new Aptos(aptosConfig);
+        if (additionalSignersAuthenticators !== void 0) {
+          const multiAgentTxn = {
+            ...transaction,
+            additionalSignersAuthenticators
+          };
+          return aptos.transaction.submit.multiAgent(multiAgentTxn);
+        } else {
+          return aptos.transaction.submit.simple(transaction);
+        }
+      }
+      const pendingTransaction = await this._wallet.submitTransaction(
         transaction
       );
       return pendingTransaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "aptos": "^1.21.0",
-    "@aptos-labs/ts-sdk": "^1.3.0"
+    "@aptos-labs/ts-sdk": "^1.6.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/WalletCore.ts

@@ -10,7 +10,7 @@ import {
   generateTransactionPayload,
   InputSubmitTransactionData,
   PendingTransactionResponse,
-  InputEntryFunctionDataWithRemoteABI,
+  InputEntryFunctionDataWithRemoteABI, Aptos,
 } from "@aptos-labs/ts-sdk";
 import EventEmitter from "eventemitter3";
 import nacl from "tweetnacl";
@@ -385,7 +385,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
             `Sign Transaction V2 is not supported by ${this.wallet?.name}`
           ).message;
         }
-        const accountAuthenticator = (this._wallet as any).signTransaction(
+        const accountAuthenticator = await (this._wallet as any).signTransaction(
           transactionOrPayload,
           asFeePayer
         );
@@ -457,14 +457,26 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   async submitTransaction(
     transaction: InputSubmitTransactionData
   ): Promise<PendingTransactionResponse> {
-    if (this._wallet && !("submitTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Submit Transaction is not supported by ${this.wallet?.name}`
-      ).message;
-    }
     try {
       this.doesWalletExist();
-      const pendingTransaction = (this._wallet as any).submitTransaction(
+      if (this._wallet && !("submitTransaction" in this._wallet)) {
+        const { additionalSignersAuthenticators } = transaction;
+        const aptosConfig = new AptosConfig({
+          network: convertNetwork(this.network),
+        });
+        const aptos = new Aptos(aptosConfig);
+        if (additionalSignersAuthenticators !== undefined) {
+          const multiAgentTxn = {
+            ...transaction,
+            additionalSignersAuthenticators,
+          };
+          return aptos.transaction.submit.multiAgent(multiAgentTxn);
+        } else {
+          return aptos.transaction.submit.simple(transaction);
+        }
+      }
+
+      const pendingTransaction = await (this._wallet as any).submitTransaction(
         transaction
       );
 

package/src/WalletCoreV1.ts

@@ -2,6 +2,7 @@ import { TxnBuilderTypes, Types } from "aptos";
 import EventEmitter from "eventemitter3";
 
 import {
+  WalletNotSupportedMethod,
   WalletSignAndSubmitMessageError,
   WalletSignTransactionError,
 } from "./error";
@@ -45,6 +46,11 @@ export class WalletCoreV1 extends EventEmitter<WalletCoreEvents> {
     wallet: Wallet,
     options?: TransactionOptions
   ): Promise<any> {
+    if (!("signAndSubmitBCSTransaction" in wallet)) {
+      throw new WalletNotSupportedMethod(
+        `Submit a BCS Transaction is not supported by ${wallet.name}`
+      ).message;
+    }
     try {
       const response = await (wallet as any).signAndSubmitBCSTransaction(
         transaction,

package/src/types.ts

@@ -103,7 +103,7 @@ export interface AdapterPluginProps<Name extends string = string> {
   connect(): Promise<any>;
   disconnect: () => Promise<any>;
   network: () => Promise<any>;
-  signAndSubmitTransaction<V>(
+  signAndSubmitTransaction(
     transaction: Types.TransactionPayload | InputGenerateTransactionData,
     options?: InputGenerateTransactionOptions
   ): Promise<
@@ -134,3 +134,20 @@ export type InputTransactionData = {
   data: InputGenerateTransactionPayloadData;
   options?: InputGenerateTransactionOptions;
 };
+
+// To be used by a wallet plugin
+export interface PluginProvider {
+  connect: () => Promise<AccountInfo>;
+  account: () => Promise<AccountInfo>;
+  disconnect: () => Promise<void>;
+  signAndSubmitTransaction: (
+    transaction: any,
+    options?: any
+  ) => Promise<{ hash: Types.HexEncodedBytes } | AptosWalletErrorResult>;
+  signMessage: (message: SignMessagePayload) => Promise<SignMessageResponse>;
+  network: () => Promise<NetworkInfo>;
+  onAccountChange: (
+    listener: (newAddress: AccountInfo) => Promise<void>
+  ) => Promise<void>;
+  onNetworkChange: OnNetworkChange;
+}