@onekeyfe/onekey-solana-provider
Advanced tools
Comparing version 1.1.56-alpha.1 to 1.1.56
@@ -6,3 +6,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.arraysEqual = exports.bytesEqual = exports.isWalletEventMethodMatch = exports.decodeSignedTransaction = exports.encodeTransaction = void 0; | ||
exports.parseToNativeTx = exports.arraysEqual = exports.bytesEqual = exports.isWalletEventMethodMatch = exports.decodeSignedTransaction = exports.encodeTransaction = void 0; | ||
const web3_js_1 = require("@solana/web3.js"); | ||
@@ -45,1 +45,10 @@ const bs58_1 = __importDefault(require("bs58")); | ||
exports.arraysEqual = arraysEqual; | ||
function parseToNativeTx(txByte) { | ||
try { | ||
return web3_js_1.Transaction.from(txByte); | ||
} | ||
catch (e) { | ||
return web3_js_1.VersionedTransaction.deserialize(txByte); | ||
} | ||
} | ||
exports.parseToNativeTx = parseToNativeTx; |
@@ -29,3 +29,2 @@ "use strict"; | ||
const wallet_standard_features_1 = require("@solana/wallet-standard-features"); | ||
const web3_js_1 = require("@solana/web3.js"); | ||
const features_1 = require("@wallet-standard/features"); | ||
@@ -100,3 +99,3 @@ const bs58_1 = __importDefault(require("bs58")); | ||
throw new Error('invalid chain'); | ||
const { signature } = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAndSendTransaction(web3_js_1.VersionedTransaction.deserialize(transaction), { | ||
const { signature } = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAndSendTransaction((0, utils_1.parseToNativeTx)(transaction), { | ||
preflightCommitment, | ||
@@ -127,3 +126,3 @@ minContextSlot, | ||
throw new Error('invalid chain'); | ||
const signedTransaction = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signTransaction(web3_js_1.VersionedTransaction.deserialize(transaction)); | ||
const signedTransaction = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signTransaction((0, utils_1.parseToNativeTx)(transaction)); | ||
outputs.push({ signedTransaction: signedTransaction.serialize({ requireAllSignatures: false }) }); | ||
@@ -148,3 +147,3 @@ } | ||
} | ||
const transactions = inputs.map(({ transaction }) => web3_js_1.Transaction.from(transaction)); | ||
const transactions = inputs.map(({ transaction }) => (0, utils_1.parseToNativeTx)(transaction)); | ||
const signedTransactions = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAllTransactions(transactions); | ||
@@ -151,0 +150,0 @@ outputs.push(...signedTransactions.map((signedTransaction) => ({ signedTransaction: signedTransaction.serialize({ requireAllSignatures: false }) }))); |
@@ -11,2 +11,3 @@ import { Transaction, VersionedTransaction } from '@solana/web3.js'; | ||
export declare function arraysEqual<T>(a: Indexed<T>, b: Indexed<T>): boolean; | ||
export declare function parseToNativeTx(txByte: Uint8Array): Transaction | VersionedTransaction; | ||
export {}; |
@@ -33,1 +33,9 @@ import { Transaction, VersionedTransaction } from '@solana/web3.js'; | ||
} | ||
export function parseToNativeTx(txByte) { | ||
try { | ||
return Transaction.from(txByte); | ||
} | ||
catch (e) { | ||
return VersionedTransaction.deserialize(txByte); | ||
} | ||
} |
@@ -23,3 +23,2 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
import { SolanaSignAndSendTransaction, SolanaSignMessage, SolanaSignTransaction, } from '@solana/wallet-standard-features'; | ||
import { Transaction, VersionedTransaction } from '@solana/web3.js'; | ||
import { StandardConnect, StandardDisconnect, StandardEvents, } from '@wallet-standard/features'; | ||
@@ -29,3 +28,3 @@ import bs58 from 'bs58'; | ||
import { SOLANA_CHAINS, isSolanaChain } from './solana'; | ||
import { bytesEqual } from '../utils'; | ||
import { bytesEqual, parseToNativeTx } from '../utils'; | ||
export const OneKeyNamespace = 'onekey:'; | ||
@@ -95,3 +94,3 @@ export class OneKeySolanaStandardWallet { | ||
throw new Error('invalid chain'); | ||
const { signature } = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAndSendTransaction(VersionedTransaction.deserialize(transaction), { | ||
const { signature } = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAndSendTransaction(parseToNativeTx(transaction), { | ||
preflightCommitment, | ||
@@ -122,3 +121,3 @@ minContextSlot, | ||
throw new Error('invalid chain'); | ||
const signedTransaction = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signTransaction(VersionedTransaction.deserialize(transaction)); | ||
const signedTransaction = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signTransaction(parseToNativeTx(transaction)); | ||
outputs.push({ signedTransaction: signedTransaction.serialize({ requireAllSignatures: false }) }); | ||
@@ -143,3 +142,3 @@ } | ||
} | ||
const transactions = inputs.map(({ transaction }) => Transaction.from(transaction)); | ||
const transactions = inputs.map(({ transaction }) => parseToNativeTx(transaction)); | ||
const signedTransactions = yield __classPrivateFieldGet(this, _OneKeySolanaStandardWallet_provider, "f").signAllTransactions(transactions); | ||
@@ -146,0 +145,0 @@ outputs.push(...signedTransactions.map((signedTransaction) => ({ signedTransaction: signedTransaction.serialize({ requireAllSignatures: false }) }))); |
{ | ||
"name": "@onekeyfe/onekey-solana-provider", | ||
"version": "1.1.56-alpha.1", | ||
"version": "1.1.56", | ||
"keywords": [ | ||
@@ -32,6 +32,6 @@ "cross-inpage-provider", | ||
"dependencies": { | ||
"@onekeyfe/cross-inpage-provider-core": "1.1.56-alpha.1", | ||
"@onekeyfe/cross-inpage-provider-errors": "1.1.56-alpha.1", | ||
"@onekeyfe/cross-inpage-provider-types": "1.1.56-alpha.1", | ||
"@onekeyfe/extension-bridge-injected": "1.1.56-alpha.1", | ||
"@onekeyfe/cross-inpage-provider-core": "1.1.56", | ||
"@onekeyfe/cross-inpage-provider-errors": "1.1.56", | ||
"@onekeyfe/cross-inpage-provider-types": "1.1.56", | ||
"@onekeyfe/extension-bridge-injected": "1.1.56", | ||
"@solana/wallet-standard-features": "^1.1.0", | ||
@@ -45,3 +45,3 @@ "@solana/web3.js": "^1.41.3", | ||
}, | ||
"gitHead": "62db81c6ca67732dbe5d7f5e76e61e2541291e2a" | ||
"gitHead": "e5b2de0f922fef14159954e86603a1ba7fced260" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
93847
1619
1
+ Added@onekeyfe/cross-inpage-provider-core@1.1.56(transitive)
+ Added@onekeyfe/cross-inpage-provider-errors@1.1.56(transitive)
+ Added@onekeyfe/cross-inpage-provider-events@1.1.56(transitive)
+ Added@onekeyfe/cross-inpage-provider-types@1.1.56(transitive)
+ Added@onekeyfe/extension-bridge-injected@1.1.56(transitive)
- Removed@onekeyfe/cross-inpage-provider-core@1.1.56-alpha.1(transitive)
- Removed@onekeyfe/cross-inpage-provider-errors@1.1.56-alpha.1(transitive)
- Removed@onekeyfe/cross-inpage-provider-events@1.1.56-alpha.1(transitive)
- Removed@onekeyfe/cross-inpage-provider-types@1.1.56-alpha.1(transitive)
- Removed@onekeyfe/extension-bridge-injected@1.1.56-alpha.1(transitive)