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

package/dist/index.mjs

@@ -1,7 +1,13 @@
 // src/WalletCore.ts
-import { HexString } from "aptos";
-import { AptosConfig, generateTransactionPayload } from "@aptos-labs/ts-sdk";
-import EventEmitter from "eventemitter3";
+import { HexString, TxnBuilderTypes as TxnBuilderTypes2, BCS as BCS2 } from "aptos";
+import {
+  AccountAuthenticatorEd25519,
+  Ed25519PublicKey,
+  Ed25519Signature,
+  AptosConfig,
+  generateTransactionPayload
+} from "@aptos-labs/ts-sdk";
+import EventEmitter2 from "eventemitter3";
 import nacl from "tweetnacl";
 import { Buffer } from "buffer";
 
@@ -174,6 +180,9 @@ function isRedirectable() {
     return false;
   return isMobile() && !isInAppBrowser();
 }
+function generalizedErrorMessage(error) {
+  return typeof error === "object" && "message" in error ? error.message : error;
+}
 
 // src/ans.ts
 var ChainIdToAnsContractAddressMap = {
@@ -196,7 +205,10 @@ var getNameByAddress = async (chainId, address) => {
 };
 
 // src/conversion.ts
-import { Network } from "@aptos-labs/ts-sdk";
+import {
+  Network,
+  TypeTag
+} from "@aptos-labs/ts-sdk";
 import { BCS, TxnBuilderTypes } from "aptos";
 function convertNetwork(networkInfo) {
   switch (networkInfo == null ? void 0 : networkInfo.name.toLowerCase()) {
@@ -210,19 +222,83 @@ function convertNetwork(networkInfo) {
       throw new Error("Invalid network name");
   }
 }
-function convertToBCSPayload(payload) {
+function convertV2TransactionPayloadToV1BCSPayload(payload) {
   const deserializer = new BCS.Deserializer(payload.bcsToBytes());
   return TxnBuilderTypes.TransactionPayload.deserialize(deserializer);
 }
+function convertV2PayloadToV1JSONPayload(payload) {
+  var _a;
+  if ("bytecode" in payload) {
+    throw new Error("script payload not supported");
+  } else {
+    const stringTypeTags = (_a = payload.typeArguments) == null ? void 0 : _a.map(
+      (typeTag) => {
+        if (typeTag instanceof TypeTag) {
+          return typeTag.toString();
+        }
+        return typeTag;
+      }
+    );
+    const newPayload = {
+      type: "entry_function_payload",
+      function: payload.function,
+      type_arguments: stringTypeTags || [],
+      arguments: payload.functionArguments
+    };
+    return newPayload;
+  }
+}
+
+// src/WalletCoreV1.ts
+import EventEmitter from "eventemitter3";
+var WalletCoreV1 = class extends EventEmitter {
+  async signAndSubmitTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signAndSubmitTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
+  async signAndSubmitBCSTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signAndSubmitBCSTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignAndSubmitMessageError(errMsg).message;
+    }
+  }
+  async signTransaction(transaction, wallet, options) {
+    try {
+      const response = await wallet.signTransaction(
+        transaction,
+        options
+      );
+      return response;
+    } catch (error) {
+      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      throw new WalletSignTransactionError(errMsg).message;
+    }
+  }
+};
 
 // src/WalletCore.ts
-var WalletCore = class extends EventEmitter {
+var WalletCore = class extends EventEmitter2 {
   constructor(plugins) {
     super();
     this._wallets = [];
     this._wallet = null;
     this._account = null;
     this._network = null;
+    this.waletCoreV1 = new WalletCoreV1();
     this._connecting = false;
     this._connected = false;
     this._wallets = plugins;
@@ -353,7 +429,7 @@ var WalletCore = class extends EventEmitter {
       this.emit("connect", account);
     } catch (error) {
       this.clearData();
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletConnectionError(errMsg).message;
     } finally {
       this._connecting = false;
@@ -367,99 +443,133 @@ var WalletCore = class extends EventEmitter {
       this.clearData();
       this.emit("disconnect");
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletDisconnectionError(errMsg).message;
     }
   }
-  async signAndSubmitTransaction(transaction, options) {
-    var _a;
-    try {
-      this.doesWalletExist();
-      const response = await ((_a = this._wallet) == null ? void 0 : _a.signAndSubmitTransaction(
-        transaction,
-        options
-      ));
-      return response;
-    } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
-      throw new WalletSignAndSubmitMessageError(errMsg).message;
-    }
-  }
-  async signAndSubmitBCSTransaction(transaction, options) {
-    var _a;
-    if (this._wallet && !("signAndSubmitBCSTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Submit a BCS Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
-      ).message;
-    }
+  async signAndSubmitTransaction(transactionInput, options) {
+    var _a, _b;
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signAndSubmitBCSTransaction(
-        transaction,
-        options
+      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
+        );
+        return response2;
+      }
+      const payloadData = transactionInput.data;
+      if (typeof payloadData.functionArguments[0] === "object") {
+        const aptosConfig = new AptosConfig({
+          network: convertNetwork(this._network)
+        });
+        const newPayload = await generateTransactionPayload({
+          ...payloadData,
+          aptosConfig
+        });
+        const oldTransactionPayload2 = convertV2TransactionPayloadToV1BCSPayload(newPayload);
+        const response2 = await this.waletCoreV1.signAndSubmitBCSTransaction(
+          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
+          }
+        );
+        const { hash: hash2, ...output2 } = response2;
+        return { hash: hash2, output: output2 };
+      }
+      const oldTransactionPayload = convertV2PayloadToV1JSONPayload(payloadData);
+      const response = await this.waletCoreV1.signAndSubmitTransaction(
+        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
+        }
       );
-      return response;
+      const { hash, ...output } = response;
+      return { hash, output };
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignAndSubmitMessageError(errMsg).message;
     }
   }
-  async signTransaction(transaction, options) {
-    var _a;
-    if (this._wallet && !("signTransaction" in this._wallet)) {
-      throw new WalletNotSupportedMethod(
-        `Sign Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
-      ).message;
-    }
+  async signTransaction(transactionOrPayload, asFeePayer, options) {
+    var _a, _b, _c;
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signTransaction(
-        transaction,
-        options
+      if ("rawTransaction" in transactionOrPayload) {
+        if (((_a = this._wallet) == null ? void 0 : _a.version) !== "v2") {
+          throw new WalletNotSupportedMethod(
+            `Sign Transaction V2 is not supported by ${(_b = this.wallet) == null ? void 0 : _b.name}`
+          ).message;
+        }
+        const accountAuthenticator2 = this._wallet.signTransaction(
+          transactionOrPayload,
+          asFeePayer
+        );
+        return accountAuthenticator2;
+      }
+      if (this._wallet && !("signTransaction" in this._wallet)) {
+        throw new WalletNotSupportedMethod(
+          `Sign Transaction is not supported by ${(_c = this.wallet) == null ? void 0 : _c.name}`
+        ).message;
+      }
+      const response = await this.waletCoreV1.signTransaction(
+        transactionOrPayload,
+        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
+        }
       );
-      return response;
+      if (!response) {
+        throw new Error("error");
+      }
+      const deserializer1 = new BCS2.Deserializer(response);
+      const deserializedSignature = TxnBuilderTypes2.SignedTransaction.deserialize(deserializer1);
+      const transactionAuthenticator = deserializedSignature.authenticator;
+      const publicKey = transactionAuthenticator.public_key.value;
+      const signature = transactionAuthenticator.signature.value;
+      const accountAuthenticator = new AccountAuthenticatorEd25519(
+        new Ed25519PublicKey(publicKey),
+        new Ed25519Signature(signature)
+      );
+      return accountAuthenticator;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignTransactionError(errMsg).message;
     }
   }
   async signMessage(message) {
-    var _a;
     try {
       this.doesWalletExist();
-      if (!this._wallet)
-        return null;
-      const response = await ((_a = this._wallet) == null ? void 0 : _a.signMessage(message));
+      const response = await this._wallet.signMessage(message);
       return response;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageError(errMsg).message;
     }
   }
-  async submitTransaction(transactionInput, options) {
-    const payloadData = transactionInput.data;
-    const aptosConfig = new AptosConfig({ network: convertNetwork(this._network) });
-    const newPayload = await generateTransactionPayload({ ...payloadData, aptosConfig });
-    const oldTransactionPayload = convertToBCSPayload(newPayload);
-    const response = await this.signAndSubmitBCSTransaction(oldTransactionPayload, options);
-    const { hash, ...output } = response;
-    return { hash, output };
-  }
-  async signMultiAgentTransaction(transaction) {
+  async submitTransaction(transaction) {
     var _a;
-    if (this._wallet && !("signMultiAgentTransaction" in this._wallet)) {
+    if (this._wallet && !("submitTransaction" in this._wallet)) {
       throw new WalletNotSupportedMethod(
-        `Multi-agent & sponsored transactions are not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
+        `Submit Transaction is not supported by ${(_a = this.wallet) == null ? void 0 : _a.name}`
       ).message;
     }
     try {
       this.doesWalletExist();
-      const response = await this._wallet.signMultiAgentTransaction(
+      const pendingTransaction = this._wallet.submitTransaction(
         transaction
       );
-      return response;
+      return pendingTransaction;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignTransactionError(errMsg).message;
     }
   }
@@ -473,7 +583,7 @@ var WalletCore = class extends EventEmitter {
         this.emit("accountChange", this._account);
       }));
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletAccountChangeError(errMsg).message;
     }
   }
@@ -487,7 +597,7 @@ var WalletCore = class extends EventEmitter {
         this.emit("networkChange", this._network);
       }));
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletNetworkChangeError(errMsg).message;
     }
   }
@@ -545,20 +655,21 @@ var WalletCore = class extends EventEmitter {
       }
       return verified;
     } catch (error) {
-      const errMsg = typeof error == "object" && "message" in error ? error.message : error;
+      const errMsg = generalizedErrorMessage(error);
       throw new WalletSignMessageAndVerifyError(errMsg).message;
     }
   }
 };
 
 // src/types.ts
-import { TxnBuilderTypes as TxnBuilderTypes3, Types as Types2 } from "aptos";
+import { TxnBuilderTypes as TxnBuilderTypes3, Types as Types3 } from "aptos";
 export {
   NetworkName,
   TxnBuilderTypes3 as TxnBuilderTypes,
-  Types2 as Types,
+  Types3 as Types,
   WalletCore,
   WalletReadyState,
+  generalizedErrorMessage,
   getLocalStorage,
   isInAppBrowser,
   isMobile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "2.6.0",
+  "version": "3.1.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -38,13 +38,13 @@
     "@aptos-labs/wallet-adapter-tsconfig": "0.0.0"
   },
   "dependencies": {
-    "@aptos-labs/ts-sdk": "^0.0.3",
     "buffer": "^6.0.3",
     "eventemitter3": "^4.0.7",
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
-    "aptos": "^1.19.0"
+    "aptos": "^1.20.0",
+    "@aptos-labs/ts-sdk": "^1.0.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",