@aptos-labs/wallet-adapter-core 3.7.0 → 3.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @aptos-labs/wallet-adapter-core
 
+## 3.9.0
+
+### Minor Changes
+
+- 6be2a06: Convert uppercase network name to lowercase in NetworkInfo
+
+## 3.8.0
+
+### Minor Changes
+
+- 4127cfb: Support AIP-62 connect wallet method response
+
 ## 3.7.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -141,6 +141,7 @@ type AptosStandardWallet = AptosWallet & {
     readyState?: WalletReadyState;
 };
 declare class WalletStandardCore {
+    connect(wallet: Wallet): Promise<AccountInfo$1>;
     /**
      * Signs and submits a transaction to chain
      *

package/dist/index.js

@@ -284,6 +284,10 @@ var import_buffer = require("buffer");
 var import_ts_sdk3 = require("@aptos-labs/ts-sdk");
 var import_tweetnacl = __toESM(require("tweetnacl"));
 var WalletCoreV1 = class extends import_eventemitter3.default {
+  async connect(wallet) {
+    const account = await wallet.connect();
+    return account;
+  }
   async resolveSignAndSubmitTransaction(payloadData, network, wallet, transactionInput) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (areBCSArguments(payloadData.functionArguments)) {
@@ -417,6 +421,13 @@ var import_wallet_standard2 = require("@aptos-labs/wallet-standard");
 var import_wallet_standard = require("@aptos-labs/wallet-standard");
 var import_ts_sdk4 = require("@aptos-labs/ts-sdk");
 var WalletStandardCore = class {
+  async connect(wallet) {
+    const response = await wallet.connect();
+    if (response.status === import_wallet_standard.UserResponseStatus.REJECTED) {
+      throw new WalletConnectionError("User has rejected the request").message;
+    }
+    return response.args;
+  }
   async signAndSubmitTransaction(transactionInput, aptos, account, wallet) {
     try {
       const transaction = await aptos.transaction.build.simple({
@@ -680,13 +691,13 @@ var WalletCore = class extends import_eventemitter32.default {
     if ((_a = this._wallet) == null ? void 0 : _a.isAIP62Standard) {
       const standardizeNetwork = network;
       this._network = {
-        name: standardizeNetwork.name,
+        name: standardizeNetwork.name.toLowerCase(),
         chainId: standardizeNetwork.chainId.toString(),
         url: standardizeNetwork.url
       };
       return;
     }
-    this._network = { ...network };
+    this._network = { ...network, name: network.name.toLowerCase() };
   }
   isConnected() {
     return this._connected;
@@ -761,7 +772,12 @@ var WalletCore = class extends import_eventemitter32.default {
     try {
       this._connecting = true;
       this.setWallet(selectedWallet);
-      const account = await selectedWallet.connect();
+      let account;
+      if (selectedWallet.isAIP62Standard) {
+        account = await this.walletStandardCore.connect(selectedWallet);
+      } else {
+        account = await this.walletCoreV1.connect(selectedWallet);
+      }
       this.setAccount(account);
       const network = await selectedWallet.network();
       this.setNetwork(network);
@@ -836,7 +852,7 @@ var WalletCore = class extends import_eventemitter32.default {
     var _a, _b;
     try {
       this.ensureWalletExists(this._wallet);
-      this.ensureAccountExists(this._account);
+      console.log("this._account", this._account);
       if (this._wallet.signTransaction) {
         if (this._wallet.isAIP62Standard) {
           if ("rawTransaction" in transactionOrPayload) {

package/dist/index.mjs

@@ -251,6 +251,10 @@ import {
 } from "@aptos-labs/ts-sdk";
 import nacl from "tweetnacl";
 var WalletCoreV1 = class extends EventEmitter {
+  async connect(wallet) {
+    const account = await wallet.connect();
+    return account;
+  }
   async resolveSignAndSubmitTransaction(payloadData, network, wallet, transactionInput) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (areBCSArguments(payloadData.functionArguments)) {
@@ -392,6 +396,13 @@ import {
   MultiEd25519PublicKey
 } from "@aptos-labs/ts-sdk";
 var WalletStandardCore = class {
+  async connect(wallet) {
+    const response = await wallet.connect();
+    if (response.status === UserResponseStatus.REJECTED) {
+      throw new WalletConnectionError("User has rejected the request").message;
+    }
+    return response.args;
+  }
   async signAndSubmitTransaction(transactionInput, aptos, account, wallet) {
     try {
       const transaction = await aptos.transaction.build.simple({
@@ -655,13 +666,13 @@ var WalletCore = class extends EventEmitter2 {
     if ((_a = this._wallet) == null ? void 0 : _a.isAIP62Standard) {
       const standardizeNetwork = network;
       this._network = {
-        name: standardizeNetwork.name,
+        name: standardizeNetwork.name.toLowerCase(),
         chainId: standardizeNetwork.chainId.toString(),
         url: standardizeNetwork.url
       };
       return;
     }
-    this._network = { ...network };
+    this._network = { ...network, name: network.name.toLowerCase() };
   }
   isConnected() {
     return this._connected;
@@ -736,7 +747,12 @@ var WalletCore = class extends EventEmitter2 {
     try {
       this._connecting = true;
       this.setWallet(selectedWallet);
-      const account = await selectedWallet.connect();
+      let account;
+      if (selectedWallet.isAIP62Standard) {
+        account = await this.walletStandardCore.connect(selectedWallet);
+      } else {
+        account = await this.walletCoreV1.connect(selectedWallet);
+      }
       this.setAccount(account);
       const network = await selectedWallet.network();
       this.setNetwork(network);
@@ -811,7 +827,7 @@ var WalletCore = class extends EventEmitter2 {
     var _a, _b;
     try {
       this.ensureWalletExists(this._wallet);
-      this.ensureAccountExists(this._account);
+      console.log("this._account", this._account);
       if (this._wallet.signTransaction) {
         if (this._wallet.isAIP62Standard) {
           if ("rawTransaction" in transactionOrPayload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/AIP62StandardWallets/WalletStandard.ts

@@ -7,6 +7,7 @@ import {
   UserResponseStatus,
   AptosSignAndSubmitTransactionOutput,
   AccountInfo as StandardAccountInfo,
+  AptosConnectOutput,
 } from "@aptos-labs/wallet-standard";
 import {
   AnyRawTransaction,
@@ -35,6 +36,16 @@ export type AptosStandardWallet = AptosWallet & {
 };
 
 export class WalletStandardCore {
+  async connect(wallet: Wallet) {
+    const response =
+      (await wallet.connect()) as UserResponse<AptosConnectOutput>;
+
+    if (response.status === UserResponseStatus.REJECTED) {
+      throw new WalletConnectionError("User has rejected the request").message;
+    }
+    return response.args;
+  }
+
   /**
    * Signs and submits a transaction to chain
    *

package/src/LegacyWalletPlugins/WalletCoreV1.ts

@@ -33,6 +33,11 @@ import {
 import { areBCSArguments, generalizedErrorMessage } from "../utils";
 
 export class WalletCoreV1 extends EventEmitter<WalletCoreEvents> {
+  async connect(wallet: Wallet) {
+    const account = await wallet.connect();
+    return account;
+  }
+
   /**
    * Resolve the transaction type (BCS arguments or Simple arguments)
    *

package/src/WalletCore.ts

@@ -1,5 +1,6 @@
 import { TxnBuilderTypes, Types, BCS } from "aptos";
 import {
+  Network,
   AnyRawTransaction,
   AccountAuthenticator,
   AccountAuthenticatorEd25519,
@@ -383,13 +384,13 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     if (this._wallet?.isAIP62Standard) {
       const standardizeNetwork = network as StandardNetworkInfo;
       this._network = {
-        name: standardizeNetwork.name,
+        name: standardizeNetwork.name.toLowerCase() as Network,
         chainId: standardizeNetwork.chainId.toString(),
         url: standardizeNetwork.url,
       };
       return;
     }
-    this._network = { ...(network as NetworkInfo) };
+    this._network = { ...(network as NetworkInfo), name: network.name.toLowerCase() as Network };
   }
 
   /**
@@ -530,7 +531,12 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     try {
       this._connecting = true;
       this.setWallet(selectedWallet);
-      const account = await selectedWallet.connect();
+      let account;
+      if (selectedWallet.isAIP62Standard) {
+        account = await this.walletStandardCore.connect(selectedWallet);
+      } else {
+        account = await this.walletCoreV1.connect(selectedWallet);
+      }
       this.setAccount(account);
       const network = await selectedWallet.network();
       this.setNetwork(network);
@@ -653,8 +659,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   ): Promise<AccountAuthenticator> {
     try {
       this.ensureWalletExists(this._wallet);
-      this.ensureAccountExists(this._account);
-
+      console.log("this._account", this._account);
       // Make sure wallet supports signTransaction
       if (this._wallet.signTransaction) {
         // If current connected wallet is AIP-62 standard compatible