@pushchain/ui-kit 4.0.11 → 4.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseWalletProvider } from '../BaseWalletProvider';
|
|
2
2
|
import { ChainType, ITypedData } from '../../../types/wallet.types';
|
|
3
|
-
import { Transaction } from '@solana/web3.js';
|
|
3
|
+
import { Transaction, VersionedTransaction } from '@solana/web3.js';
|
|
4
4
|
declare global {
|
|
5
5
|
interface Window {
|
|
6
6
|
phantom?: {
|
|
@@ -23,7 +23,7 @@ declare global {
|
|
|
23
23
|
signMessage: (message: Uint8Array, encoding: string) => Promise<{
|
|
24
24
|
signature: Uint8Array;
|
|
25
25
|
}>;
|
|
26
|
-
signAndSendTransaction: (txn: Transaction) => Promise<string>;
|
|
26
|
+
signAndSendTransaction: (txn: Transaction | VersionedTransaction) => Promise<string>;
|
|
27
27
|
};
|
|
28
28
|
};
|
|
29
29
|
ethereum?: any;
|
|
@@ -126,7 +126,17 @@ class PhantomProvider extends BaseWalletProvider_1.BaseWalletProvider {
|
|
|
126
126
|
if (this.connectedChainType === wallet_types_1.ChainType.SOLANA && ((_a = window.phantom) === null || _a === void 0 ? void 0 : _a.solana)) {
|
|
127
127
|
try {
|
|
128
128
|
const provider = (_b = window.phantom) === null || _b === void 0 ? void 0 : _b.solana;
|
|
129
|
-
|
|
129
|
+
// VersionedTransaction.deserialize handles both legacy and v0 transactions.
|
|
130
|
+
// Check the deserialized message version to decide the appropriate type
|
|
131
|
+
// for Phantom's signAndSendTransaction.
|
|
132
|
+
const deserialized = web3_js_1.VersionedTransaction.deserialize(txn);
|
|
133
|
+
let transaction;
|
|
134
|
+
if (deserialized.message.version === 'legacy') {
|
|
135
|
+
transaction = web3_js_1.Transaction.from(txn);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
transaction = deserialized;
|
|
139
|
+
}
|
|
130
140
|
const signedTransaction = yield provider.signAndSendTransaction(transaction);
|
|
131
141
|
return bytes_1.bs58.decode(signedTransaction.signature);
|
|
132
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phantom.js","sourceRoot":"","sources":["../../../../../../../../packages/ui-kit/src/lib/providers/walletProviders/solana/phantom.ts"],"names":[],"mappings":";;;;AAAA,mCAAoC;AACpC,8DAA2D;AAC3D,8DAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"phantom.js","sourceRoot":"","sources":["../../../../../../../../packages/ui-kit/src/lib/providers/walletProviders/solana/phantom.ts"],"names":[],"mappings":"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"}
|