@aptos-labs/wallet-adapter-core - npm Package Compare versions

Comparing version 4.1.3 to 4.2.0

./dist/index.js

@@ -509,9 +509,27 @@ "use strict";
   }
-  async signAndSubmitTransaction(transactionInput, aptos, account, wallet) {
+  async signAndSubmitTransaction(transactionInput, aptos, account, wallet, standardWallets) {
+    var _a, _b, _c;
     try {
-      const transaction = await aptos.transaction.build.simple({
-        sender: account.address.toString(),
-        data: transactionInput.data,
-        options: transactionInput.options
-      });
+      const standardWallet = standardWallets.find(
+        (standardWallet2) => wallet.name === standardWallet2.name
+      );
+      if (((_a = standardWallet == null ? void 0 : standardWallet.features["aptos:signAndSubmitTransaction"]) == null ? void 0 : _a.version) !== "1.1.0") {
+        const transaction2 = await aptos.transaction.build.simple({
+          sender: account.address.toString(),
+          data: transactionInput.data,
+          options: transactionInput.options
+        });
+        const response2 = await wallet.signAndSubmitTransaction(
+          transaction2
+        );
+        if (response2.status === import_wallet_standard.UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
+        }
+        return response2.args;
+      }
+      const transaction = {
+        gasUnitPrice: (_b = transactionInput.options) == null ? void 0 : _b.gasUnitPrice,
+        maxGasAmount: (_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount,
+        payload: transactionInput.data
+      };
       const response = await wallet.signAndSubmitTransaction(
@@ -1003,3 +1021,4 @@ transaction
             this._account,
-            this._wallet
+            this._wallet,
+            this._standard_wallets
           );
@@ -1006,0 +1025,0 @@ return { hash, output };

dist/AIP62StandardWallets/WalletStandard.d.ts

@@ -1,3 +0,3 @@
-import { AptosSignTransactionOutput, AptosSignMessageOutput, AptosSignMessageInput, AptosWallet, AccountInfo as StandardAccountInfo } from "@aptos-labs/wallet-standard";
-import { AnyRawTransaction, PendingTransactionResponse, Aptos } from "@aptos-labs/ts-sdk";
+import { AptosSignTransactionOutput, AptosSignMessageOutput, AptosSignMessageInput, AptosWallet, AptosSignAndSubmitTransactionOutput, AccountInfo as StandardAccountInfo } from "@aptos-labs/wallet-standard";
+import { AnyRawTransaction, Aptos } from "@aptos-labs/ts-sdk";
 import { WalletReadyState } from "../constants";
@@ -16,3 +16,3 @@ import { AccountInfo, InputTransactionData, Wallet } from "../LegacyWalletPlugins";
      */
-    signAndSubmitTransaction(transactionInput: InputTransactionData, aptos: Aptos, account: AccountInfo, wallet: Wallet): Promise<PendingTransactionResponse>;
+    signAndSubmitTransaction(transactionInput: InputTransactionData, aptos: Aptos, account: AccountInfo, wallet: Wallet, standardWallets: ReadonlyArray<AptosStandardWallet>): Promise<AptosSignAndSubmitTransactionOutput>;
     /**
@@ -19,0 +19,0 @@ * Signs a transaction

dist/index.js

@@ -509,9 +509,27 @@ "use strict";
   }
-  async signAndSubmitTransaction(transactionInput, aptos, account, wallet) {
+  async signAndSubmitTransaction(transactionInput, aptos, account, wallet, standardWallets) {
+    var _a, _b, _c;
     try {
-      const transaction = await aptos.transaction.build.simple({
-        sender: account.address.toString(),
-        data: transactionInput.data,
-        options: transactionInput.options
-      });
+      const standardWallet = standardWallets.find(
+        (standardWallet2) => wallet.name === standardWallet2.name
+      );
+      if (((_a = standardWallet == null ? void 0 : standardWallet.features["aptos:signAndSubmitTransaction"]) == null ? void 0 : _a.version) !== "1.1.0") {
+        const transaction2 = await aptos.transaction.build.simple({
+          sender: account.address.toString(),
+          data: transactionInput.data,
+          options: transactionInput.options
+        });
+        const response2 = await wallet.signAndSubmitTransaction(
+          transaction2
+        );
+        if (response2.status === import_wallet_standard.UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request").message;
+        }
+        return response2.args;
+      }
+      const transaction = {
+        gasUnitPrice: (_b = transactionInput.options) == null ? void 0 : _b.gasUnitPrice,
+        maxGasAmount: (_c = transactionInput.options) == null ? void 0 : _c.maxGasAmount,
+        payload: transactionInput.data
+      };
       const response = await wallet.signAndSubmitTransaction(
@@ -1003,3 +1021,4 @@ transaction
             this._account,
-            this._wallet
+            this._wallet,
+            this._standard_wallets
           );
@@ -1006,0 +1025,0 @@ return { hash, output };

dist/LegacyWalletPlugins/types.d.ts

 import { Types } from "aptos";
 import { Network, InputGenerateTransactionOptions, InputSubmitTransactionData, PendingTransactionResponse, AccountAddressInput, InputGenerateTransactionPayloadData, AnyRawTransaction, Signature } from "@aptos-labs/ts-sdk";
 import { WalletReadyState } from "../constants";
-import { AptosSignAndSubmitTransactionOutput, AptosSignMessageOutput, UserResponse, AccountInfo as StandardAccountInfo, NetworkInfo as StandardNetworkInfo, AptosChangeNetworkMethod } from "@aptos-labs/wallet-standard";
+import { AptosSignAndSubmitTransactionOutput, AptosSignMessageOutput, UserResponse, AccountInfo as StandardAccountInfo, NetworkInfo as StandardNetworkInfo, AptosChangeNetworkMethod, AptosSignAndSubmitTransactionInput } from "@aptos-labs/wallet-standard";
 import { AptosStandardSupportedWallet } from "../AIP62StandardWallets/types";
@@ -78,3 +78,3 @@ export { TxnBuilderTypes, Types } from "aptos";
     network: () => Promise<any>;
-    signAndSubmitTransaction?(transaction: Types.TransactionPayload | InputTransactionData | AnyRawTransaction, options?: InputGenerateTransactionOptions): Promise<{
+    signAndSubmitTransaction?(transaction: Types.TransactionPayload | InputTransactionData | AnyRawTransaction | AptosSignAndSubmitTransactionInput, options?: InputGenerateTransactionOptions): Promise<{
         hash: Types.HexEncodedBytes;
@@ -81,0 +81,0 @@ output?: any;

package.json

 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "4.1.3",
+  "version": "4.2.0",
   "description": "Aptos Wallet Adapter Core",
@@ -38,7 +38,7 @@ "main": "./dist/index.js",
     "typescript": "^4.5.3",
-    "@aptos-labs/eslint-config-adapter": "0.0.1",
-    "@aptos-labs/wallet-adapter-tsconfig": "0.0.1"
+    "@aptos-labs/wallet-adapter-tsconfig": "0.0.1",
+    "@aptos-labs/eslint-config-adapter": "0.0.1"
   },
   "dependencies": {
-    "@aptos-labs/wallet-standard": "^0.0.11",
+    "@aptos-labs/wallet-standard": "^0.1.0",
     "buffer": "^6.0.3",
@@ -45,0 +45,0 @@ "eventemitter3": "^4.0.7",

src/AIP62StandardWallets/sdkWallets.ts

@@ -6,4 +6,6 @@ import { TWallet } from "@atomrigslab/aptos-wallet-adapter";
 
-sdkWallets.push(new TWallet());
+// TODO twallet uses @aptos-labs/wallet-standard at version 0.0.11 while adapter uses
+// a newer version (0.1.0) - this causes type mismatch. We should figure out how to handle it.
+sdkWallets.push(new TWallet() as any);
 
 export default sdkWallets;

src/AIP62StandardWallets/WalletStandard.ts

@@ -59,13 +59,46 @@ import {
     account: AccountInfo,
-    wallet: Wallet
-  ): Promise<PendingTransactionResponse> {
+    wallet: Wallet,
+    standardWallets: ReadonlyArray<AptosStandardWallet>
+  ): Promise<AptosSignAndSubmitTransactionOutput> {
     try {
-      const transaction = await aptos.transaction.build.simple({
-        sender: account.address.toString(),
-        data: transactionInput.data,
-        options: transactionInput.options,
-      });
+      // need to find the standard wallet type to do the
+      // next features check
+      const standardWallet = standardWallets.find(
+        (standardWallet: AptosStandardWallet) =>
+          wallet.name === standardWallet.name
+      );
+
+      // check for backward compatibility. before version 1.1.0 the standard expected
+      // AnyRawTransaction input so the adapter built the transaction before sending it to the wallet
+      if (
+        standardWallet?.features["aptos:signAndSubmitTransaction"]?.version !==
+        "1.1.0"
+      ) {
+        const transaction = await aptos.transaction.build.simple({
+          sender: account.address.toString(),
+          data: transactionInput.data,
+          options: transactionInput.options,
+        });
+        const response = (await wallet.signAndSubmitTransaction!(
+          transaction
+        )) as UserResponse<AptosSignAndSubmitTransactionOutput>;
+
+        if (response.status === UserResponseStatus.REJECTED) {
+          throw new WalletConnectionError("User has rejected the request")
+            .message;
+        }
+
+        return response.args;
+      }
+
+      // build standard json format
+      const transaction = {
+        gasUnitPrice: transactionInput.options?.gasUnitPrice,
+        maxGasAmount: transactionInput.options?.maxGasAmount,
+        payload: transactionInput.data,
+      };
       const response = (await wallet.signAndSubmitTransaction!(
         transaction
       )) as UserResponse<AptosSignAndSubmitTransactionOutput>;
+
       if (response.status === UserResponseStatus.REJECTED) {
@@ -72,0 +105,0 @@ throw new WalletConnectionError("User has rejected the request")

src/LegacyWalletPlugins/types.ts

@@ -11,2 +11,3 @@ import { Types } from "aptos";
   Signature,
+  AccountAuthenticator,
 } from "@aptos-labs/ts-sdk";
@@ -21,2 +22,3 @@ import { WalletReadyState } from "../constants";
   AptosChangeNetworkMethod,
+  AptosSignAndSubmitTransactionInput,
 } from "@aptos-labs/wallet-standard";
@@ -131,3 +133,4 @@ import { AptosStandardSupportedWallet } from "../AIP62StandardWallets/types";
       | InputTransactionData
-      | AnyRawTransaction,
+      | AnyRawTransaction
+      | AptosSignAndSubmitTransactionInput,
     options?: InputGenerateTransactionOptions
@@ -134,0 +137,0 @@ ): Promise<

src/WalletCore.ts

@@ -735,3 +735,4 @@ import { TxnBuilderTypes, Types, BCS } from "aptos";
               this._account,
-              this._wallet
+              this._wallet,
+              this._standard_wallets
             );
@@ -738,0 +739,0 @@ return { hash, output };

No alert changes

Improved metrics

Total package byte prevSize

476020

1.86%

Lines of code

6528

1.41%

Dependency changes

• + Added

  @aptos-labs/wallet-standard@0.1.0
  (transitive)

• + Added

  @wallet-standard/core@1.1.0
  (transitive)

• + Added

  @wallet-standard/errors@0.1.0
  (transitive)

• + Added

  chalk@5.4.1
  (transitive)

• Updated

  @aptos-labs/wallet-standard@^0.1.0