@onekeyfe/onekey-solana-provider 1.1.23 → 1.1.24

package/dist/ProviderSolana.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction } from '@solana/web3.js';
 import type { SendOptions, Transaction } from '@solana/web3.js';
 import { IInpageProviderConfig } from '@onekeyfe/cross-inpage-provider-core';
 import { IJsonRpcRequest } from '@onekeyfe/cross-inpage-provider-types';
@@ -76,18 +76,18 @@ interface IProviderSolana extends ProviderSolanaBase {
      * Sign multiple transactions
      * @returns Transaction[]
      */
-    signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
     /**
      * @deprecated
      * Sign one transaction
      * @returns Transaction
      */
-    signTransaction(transaction: Transaction): Promise<Transaction>;
+    signTransaction(transaction: Transaction | VersionedTransaction): Promise<Transaction | VersionedTransaction>;
     /**
      * Sign and send a transaction
      * @returns {Object} Signature and public key
      */
-    signAndSendTransaction(transaction: Transaction, options?: SendOptions): Promise<{
+    signAndSendTransaction(transaction: Transaction | VersionedTransaction, options?: SendOptions): Promise<{
         publicKey: string;
         signature: string;
     }>;
@@ -122,14 +122,14 @@ declare class ProviderSolana extends ProviderSolanaBase implements IProviderSola
     private _handleDisconnected;
     isAccountsChanged(account: SolanaAccountInfo | undefined): boolean;
     private _handleAccountChange;
-    signAndSendTransaction(transaction: Transaction, options?: Partial<SendOptions>): Promise<{
+    signAndSendTransaction(transaction: Transaction | VersionedTransaction, options?: Partial<SendOptions>): Promise<{
         publicKey: string;
         signature: string;
     }>;
     private _handleSignAndSendTransaction;
-    signTransaction(transaction: Transaction): Promise<Transaction>;
+    signTransaction(transaction: Transaction | VersionedTransaction): Promise<Transaction | VersionedTransaction>;
     private _handleSignTransaction;
-    signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
+    signAllTransactions(transactions: (Transaction | VersionedTransaction)[]): Promise<(Transaction | VersionedTransaction)[]>;
     private _handleSignAllTransactions;
     signMessage(message: Uint8Array, display?: DisplayEncoding): Promise<{
         signature: Uint8Array;

package/dist/cjs/utils.js

@@ -11,7 +11,13 @@ const encodeTransaction = (transaction) => {
 };
 exports.encodeTransaction = encodeTransaction;
 const decodeSignedTransaction = (message) => {
-    return web3_js_1.Transaction.from(bs58_1.default.decode(message));
+    const txByte = bs58_1.default.decode(message);
+    try {
+        return web3_js_1.Transaction.from(txByte);
+    }
+    catch (_a) {
+        return web3_js_1.VersionedTransaction.deserialize(txByte);
+    }
 };
 exports.decodeSignedTransaction = decodeSignedTransaction;
 function isWalletEventMethodMatch(method, name) {

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { Transaction } from '@solana/web3.js';
-export declare const encodeTransaction: (transaction: Transaction) => string;
-export declare const decodeSignedTransaction: (message: string) => Transaction;
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
+export declare const encodeTransaction: (transaction: Transaction | VersionedTransaction) => string;
+export declare const decodeSignedTransaction: (message: string) => Transaction | VersionedTransaction;
 export declare function isWalletEventMethodMatch(method: string, name: string): boolean;

package/dist/utils.js

@@ -1,10 +1,16 @@
-import { Transaction } from '@solana/web3.js';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 import base58 from 'bs58';
 export const encodeTransaction = (transaction) => {
     return base58.encode(transaction.serialize({ requireAllSignatures: false }));
 };
 export const decodeSignedTransaction = (message) => {
-    return Transaction.from(base58.decode(message));
+    const txByte = base58.decode(message);
+    try {
+        return Transaction.from(txByte);
+    }
+    catch (_a) {
+        return VersionedTransaction.deserialize(txByte);
+    }
 };
 export function isWalletEventMethodMatch(method, name) {
     return method === `metamask_${name}` || method === `wallet_events_${name}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-solana-provider",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "keywords": [
     "cross-inpage-provider",
     "solona"
@@ -29,15 +29,15 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "1.1.23",
-    "@onekeyfe/cross-inpage-provider-errors": "1.1.23",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.23",
-    "@onekeyfe/extension-bridge-injected": "1.1.23",
+    "@onekeyfe/cross-inpage-provider-core": "1.1.24",
+    "@onekeyfe/cross-inpage-provider-errors": "1.1.24",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.24",
+    "@onekeyfe/extension-bridge-injected": "1.1.24",
     "@solana/web3.js": "^1.41.3",
     "bs58": "^5.0.0"
   },
   "devDependencies": {
     "@types/bs58": "^4.0.1"
   },
-  "gitHead": "5c8056c76c982d7d4a8eda4cf4acc6d72cf10025"
+  "gitHead": "77715c206f3369f7a0c294d2706d471d7339212e"
 }