@aptos-labs/wallet-adapter-core
Advanced tools
Comparing version 3.1.1 to 3.2.0
# @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 | ||
@@ -4,0 +14,0 @@ |
@@ -240,3 +240,4 @@ import { Types } from 'aptos'; | ||
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 }; |
@@ -34,2 +34,3 @@ "use strict"; | ||
WalletReadyState: () => WalletReadyState, | ||
areBCSArguments: () => areBCSArguments, | ||
generalizedErrorMessage: () => generalizedErrorMessage, | ||
@@ -48,3 +49,3 @@ getLocalStorage: () => getLocalStorage, | ||
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")); | ||
@@ -204,2 +205,3 @@ var import_tweetnacl = __toESM(require("tweetnacl")); | ||
// src/utils/helpers.ts | ||
var import_ts_sdk = require("@aptos-labs/ts-sdk"); | ||
function isMobile() { | ||
@@ -227,2 +229,5 @@ 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( | ||
} | ||
var areBCSArguments = (args) => { | ||
return args.every((arg) => arg instanceof import_ts_sdk.Serializable); | ||
}; | ||
@@ -250,3 +255,3 @@ // src/ans.ts | ||
// 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"); | ||
@@ -256,7 +261,7 @@ function convertNetwork(networkInfo) { | ||
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: | ||
@@ -277,3 +282,3 @@ throw new Error("Invalid network name"); | ||
(typeTag) => { | ||
if (typeTag instanceof import_ts_sdk.TypeTag) { | ||
if (typeTag instanceof import_ts_sdk2.TypeTag) { | ||
return typeTag.toString(); | ||
@@ -504,7 +509,7 @@ } | ||
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, | ||
@@ -578,5 +583,5 @@ aptosConfig | ||
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) | ||
); | ||
@@ -714,2 +719,3 @@ return accountAuthenticator; | ||
WalletReadyState, | ||
areBCSArguments, | ||
generalizedErrorMessage, | ||
@@ -716,0 +722,0 @@ getLocalStorage, |
{ | ||
"name": "@aptos-labs/wallet-adapter-core", | ||
"version": "3.1.1", | ||
"version": "3.2.0", | ||
"description": "Aptos Wallet Adapter Core", | ||
@@ -46,4 +46,4 @@ "main": "./dist/index.js", | ||
"peerDependencies": { | ||
"aptos": "^1.20.0", | ||
"@aptos-labs/ts-sdk": "^1.0.0" | ||
"aptos": "^1.21.0", | ||
"@aptos-labs/ts-sdk": "^1.2.0" | ||
}, | ||
@@ -50,0 +50,0 @@ "scripts": { |
@@ -0,1 +1,3 @@ | ||
import { Serializable } from "@aptos-labs/ts-sdk"; | ||
export function isMobile(): boolean { | ||
@@ -33,1 +35,9 @@ 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( | ||
} | ||
// 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); | ||
}; |
@@ -52,2 +52,3 @@ import { HexString, TxnBuilderTypes, Types, BCS } from "aptos"; | ||
generalizedErrorMessage, | ||
areBCSArguments, | ||
} from "./utils"; | ||
@@ -314,5 +315,4 @@ import { getNameByAddress } from "./ans"; | ||
// 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({ | ||
@@ -342,3 +342,2 @@ network: convertNetwork(this._network), | ||
} | ||
// if it is not a bcs serialized arguments transaction, convert to the old | ||
@@ -345,0 +344,0 @@ // json format |
Sorry, the diff of this file is not supported yet
98690
2735