@onekeyfe/onekey-solana-provider 2.2.7-alpha.1 → 2.2.7-alpha.3

package/dist/ProviderSolana.js

@@ -153,18 +153,25 @@ class ProviderSolana extends ProviderSolanaBase {
     }
     signTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
+            const hasVersionedTx = 'version' in transaction;
             return this._handleSignTransaction({
                 message: encodeTransaction(transaction),
+            }, {
+                onlyVersionedTx: hasVersionedTx,
             });
         });
     }
-    _handleSignTransaction(params) {
+    _handleSignTransaction(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { onlyVersionedTx } = options || {};
             const result = yield this._callBridge({
                 method: 'signTransaction',
                 params,
             });
-            return decodeSignedTransaction(result);
+            return decodeSignedTransaction({
+                message: result,
+                onlyVersionedTx,
+            });
         });
     }
     signAllTransactions(transactions) {
@@ -180,7 +187,7 @@ class ProviderSolana extends ProviderSolanaBase {
                 method: 'signAllTransactions',
                 params,
             });
-            return result.map(decodeSignedTransaction);
+            return result.map((message) => decodeSignedTransaction({ message }));
         });
     }
     signMessage(message, display) {

package/dist/cjs/ProviderSolana.js

@@ -159,18 +159,25 @@ class ProviderSolana extends ProviderSolanaBase_1.ProviderSolanaBase {
     }
     signTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
+            const hasVersionedTx = 'version' in transaction;
             return this._handleSignTransaction({
                 message: (0, utils_1.encodeTransaction)(transaction),
+            }, {
+                onlyVersionedTx: hasVersionedTx,
             });
         });
     }
-    _handleSignTransaction(params) {
+    _handleSignTransaction(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { onlyVersionedTx } = options || {};
             const result = yield this._callBridge({
                 method: 'signTransaction',
                 params,
             });
-            return (0, utils_1.decodeSignedTransaction)(result);
+            return (0, utils_1.decodeSignedTransaction)({
+                message: result,
+                onlyVersionedTx,
+            });
         });
     }
     signAllTransactions(transactions) {
@@ -186,7 +193,7 @@ class ProviderSolana extends ProviderSolanaBase_1.ProviderSolanaBase {
                 method: 'signAllTransactions',
                 params,
             });
-            return result.map(utils_1.decodeSignedTransaction);
+            return result.map((message) => (0, utils_1.decodeSignedTransaction)({ message }));
         });
     }
     signMessage(message, display) {

package/dist/cjs/utils.js

@@ -14,8 +14,11 @@ const encodeTransaction = (transaction) => {
     return bs58_1.default.encode(transaction.serialize({ requireAllSignatures: false }));
 };
 exports.encodeTransaction = encodeTransaction;
-const decodeSignedTransaction = (message) => {
+const decodeSignedTransaction = ({ message, onlyVersionedTx, }) => {
     const txByte = bs58_1.default.decode(message);
+    if (onlyVersionedTx) {
+        return web3_js_1.VersionedTransaction.deserialize(txByte);
+    }
     try {
         return web3_js_1.Transaction.from(txByte);
     }

package/dist/utils.d.ts

@@ -4,7 +4,10 @@ interface Indexed<T> {
     [index: number]: T;
 }
 export declare const encodeTransaction: (transaction: Transaction | VersionedTransaction) => string;
-export declare const decodeSignedTransaction: (message: string) => Transaction | VersionedTransaction;
+export declare const decodeSignedTransaction: ({ message, onlyVersionedTx, }: {
+    message: string;
+    onlyVersionedTx?: boolean;
+}) => Transaction | VersionedTransaction;
 export declare function isWalletEventMethodMatch(method: string, name: string): boolean;
 export declare function bytesEqual(a: Uint8Array, b: Uint8Array): boolean;
 export declare function arraysEqual<T>(a: Indexed<T>, b: Indexed<T>): boolean;

package/dist/utils.js

@@ -3,8 +3,11 @@ import base58 from 'bs58';
 export const encodeTransaction = (transaction) => {
     return base58.encode(transaction.serialize({ requireAllSignatures: false }));
 };
-export const decodeSignedTransaction = (message) => {
+export const decodeSignedTransaction = ({ message, onlyVersionedTx, }) => {
     const txByte = base58.decode(message);
+    if (onlyVersionedTx) {
+        return VersionedTransaction.deserialize(txByte);
+    }
     try {
         return Transaction.from(txByte);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-solana-provider",
-  "version": "2.2.7-alpha.1",
+  "version": "2.2.7-alpha.3",
   "keywords": [
     "cross-inpage-provider",
     "solona"
@@ -29,17 +29,17 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.1",
-    "@onekeyfe/cross-inpage-provider-errors": "2.2.7-alpha.1",
-    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.1",
-    "@onekeyfe/extension-bridge-injected": "2.2.7-alpha.1",
+    "@onekeyfe/cross-inpage-provider-core": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-errors": "2.2.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-types": "2.2.7-alpha.3",
+    "@onekeyfe/extension-bridge-injected": "2.2.7-alpha.3",
     "@solana/wallet-standard-features": "^1.1.0",
-    "@solana/web3.js": "^1.41.3",
+    "@solana/web3.js": "^1.98.0",
     "@wallet-standard/base": "^1.0.1",
     "bs58": "^5.0.0"
   },
   "devDependencies": {
     "@types/bs58": "^4.0.1"
   },
-  "gitHead": "fd45c5d3afa44b7bfe1ca0642beb2b72557f0f73"
+  "gitHead": "4b4d54c686e1037fde71d9be5aca163160a5e816"
 }