From 793b161eb7531c1b5773b6f1db4af3499f12d79c Mon Sep 17 00:00:00 2001 From: Jordan Sexton Date: Tue, 13 Sep 2022 19:00:46 -0500 Subject: [PATCH] check out wallets from master --- packages/wallets/alpha/src/adapter.ts | 7 +++---- packages/wallets/avana/src/adapter.ts | 8 ++------ packages/wallets/backpack/src/adapter.ts | 15 ++------------- packages/wallets/blocto/src/adapter.ts | 9 ++------- packages/wallets/brave/src/adapter.ts | 8 ++------ packages/wallets/coinbase/src/adapter.ts | 8 ++------ packages/wallets/exodus/src/adapter.ts | 8 ++------ packages/wallets/fake/src/adapter.ts | 6 ++---- packages/wallets/glow/src/adapter.ts | 8 ++------ packages/wallets/magiceden/src/adapter.ts | 8 ++------ packages/wallets/nufi/src/adapter.ts | 8 ++------ packages/wallets/phantom/src/adapter.ts | 8 ++------ packages/wallets/saifu/src/adapter.ts | 8 ++------ packages/wallets/sky/src/adapter.ts | 8 ++------ packages/wallets/strike/src/adapter.ts | 9 ++------- packages/wallets/tokenary/src/adapter.ts | 8 ++------ packages/wallets/torus/src/adapter.ts | 11 +++-------- packages/wallets/trust/src/adapter.ts | 15 +++++---------- packages/wallets/walletconnect/src/adapter.ts | 7 +++---- packages/wallets/xdefi/src/adapter.ts | 13 +++++++------ 20 files changed, 51 insertions(+), 129 deletions(-) diff --git a/packages/wallets/alpha/src/adapter.ts b/packages/wallets/alpha/src/adapter.ts index f1eae61ff..56d4857dd 100644 --- a/packages/wallets/alpha/src/adapter.ts +++ b/packages/wallets/alpha/src/adapter.ts @@ -49,11 +49,10 @@ export interface AlphaWalletAdapterConfig {} export const AlphaWalletName = 'Alpha' as WalletName<'Alpha'>; export class AlphaWalletAdapter extends BaseMessageSignerWalletAdapter { - readonly name = AlphaWalletName; - readonly url = 'https://github.com/babilu-online/alpha-wallet'; - readonly icon = + name = AlphaWalletName; + url = 'https://github.com/babilu-online/alpha-wallet'; + icon = 'data:image/svg+xml;base64,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'; - readonly supportedTransactionVersions = null; private _connecting: boolean; private _wallet: AlphaWallet | null; diff --git a/packages/wallets/avana/src/adapter.ts b/packages/wallets/avana/src/adapter.ts index b720b3e85..a6c9ecd8d 100644 --- a/packages/wallets/avana/src/adapter.ts +++ b/packages/wallets/avana/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface AvanaWalletEvents { @@ -158,7 +158,7 @@ export class AvanaWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -166,10 +166,6 @@ export class AvanaWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/backpack/src/adapter.ts b/packages/wallets/backpack/src/adapter.ts index 6974a1d4d..d38daa6f5 100644 --- a/packages/wallets/backpack/src/adapter.ts +++ b/packages/wallets/backpack/src/adapter.ts @@ -14,14 +14,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { - Connection, - SendOptions, - Signer, - Transaction, - TransactionSignature, - VersionedTransaction, -} from '@solana/web3.js'; +import type { Connection, SendOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface BackpackWalletEvents { @@ -163,7 +156,7 @@ export class BackpackWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -171,10 +164,6 @@ export class BackpackWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - const { signers, ...sendOptions } = options; try { diff --git a/packages/wallets/blocto/src/adapter.ts b/packages/wallets/blocto/src/adapter.ts index 01fee6ce1..ba0ac5f74 100644 --- a/packages/wallets/blocto/src/adapter.ts +++ b/packages/wallets/blocto/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletReadyState, WalletSendTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; export interface BloctoWalletAdapterConfig { @@ -29,7 +29,6 @@ export class BloctoWalletAdapter extends BaseWalletAdapter { url = 'https://blocto.app'; icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0ibTE5LjQ4MzggMTUuMjQ5Yy4yNzY5IDAgLjUwNDguMjA5OS41MzI1LjQ3ODhsLjAwMjIuMDQyOS0uMDA0My4xMTQyYy0uMzM1IDMuOTgzMy0zLjc5MDQgNy4xMTUxLTguMDAzNyA3LjExNTEtNC4xNzA2IDAtNy41OTg2My0zLjA2ODctNy45OTI2OS02Ljk5NDZsLS4wMTYzOC0uMTgxMS0uMDAxMDYtLjA1MzIuMDAxNzgtLjAzOThjLjAyNTk4LS4yNzA2LjI1NDg3LS40ODIzLjUzMjg5LS40ODIzeiIgZmlsbD0iI2FmZDhmNyIvPjxwYXRoIGQ9Im00LjMwMDA5IDFjMy43ODc1NSAwIDYuODI1ODEgMi45MDkxMSA2LjgyNTgxIDYuNTAyNzd2Ni4zNTM0M2MtLjAwMDQuMjkxNy0uMjM5Mi41Mjg0LS41MzQuNTI4OGwtNi4wNTc1OC4wMDMyYy0uMjk1MTEuMDAwNy0uNTM0MzItLjIzNjEtLjUzNDMyLS41Mjc4bC4wMDAzNi0xMi41NjM3NWMwLS4xNTE0OS4xMTQyNi0uMjc2MjIuMjYxOTktLjI5NDE4eiIgZmlsbD0iIzE4MmE3MSIvPjxwYXRoIGQ9Im0xOS42OTIxIDEyLjIzODMuMDM4OC4xMjgzLS4wMjg4LS4wODQ2Yy4xNjE2LjQ1MzQuMjY2Ni43NzY5LjMxNTMgMS4zNDEzLjAzMzUuMzg3OS0uMjU3LjcyODktLjY0ODUuNzYybC0uMDMwMy4wMDIyLTMuMDgwOS4wMDA3Yy0yLjEwNjMgMC0zLjgyMDQtMS40NzQxLTMuODc1Mi0zLjU0MjNsLS4wMDE0LS4xMDIxdi0zLjQ2NThjMC0uMjAxNTMuMTY5NC0uMzY5NTkuMzc0MS0uMzYwMDcgMy4zMDAzLjE1NDY2IDUuOTk3OCAyLjM0MTUxIDYuOTM2OSA1LjMyMDM3eiIgZmlsbD0iIzM0ODVjNCIvPjwvZz48L3N2Zz4='; - supportedTransactionVersions = null; private _connecting: boolean; private _wallet: SolanaProviderInterface | null; @@ -130,7 +129,7 @@ export class BloctoWalletAdapter extends BaseWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -138,10 +137,6 @@ export class BloctoWalletAdapter extends BaseWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/brave/src/adapter.ts b/packages/wallets/brave/src/adapter.ts index ba7b134a4..8c0f6f674 100644 --- a/packages/wallets/brave/src/adapter.ts +++ b/packages/wallets/brave/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface BraveWalletEvents { @@ -156,7 +156,7 @@ export class BraveWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -164,10 +164,6 @@ export class BraveWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/coinbase/src/adapter.ts b/packages/wallets/coinbase/src/adapter.ts index 993c795b2..cebc0d890 100644 --- a/packages/wallets/coinbase/src/adapter.ts +++ b/packages/wallets/coinbase/src/adapter.ts @@ -14,7 +14,7 @@ import { WalletSendTransactionError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface CoinbaseWalletEvents { @@ -147,7 +147,7 @@ export class CoinbaseWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -155,10 +155,6 @@ export class CoinbaseWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/exodus/src/adapter.ts b/packages/wallets/exodus/src/adapter.ts index 134f8db08..e883ce59d 100644 --- a/packages/wallets/exodus/src/adapter.ts +++ b/packages/wallets/exodus/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface ExodusWalletEvents { @@ -158,7 +158,7 @@ export class ExodusWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -166,10 +166,6 @@ export class ExodusWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/fake/src/adapter.ts b/packages/wallets/fake/src/adapter.ts index 3b00c80e5..d0ad0496b 100644 --- a/packages/wallets/fake/src/adapter.ts +++ b/packages/wallets/fake/src/adapter.ts @@ -1,6 +1,6 @@ import type { SendTransactionOptions, WalletName } from '@solana/wallet-adapter-base'; import { BaseWalletAdapter, WalletReadyState } from '@solana/wallet-adapter-base'; -import type { Connection, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; export const FakeWalletName = 'Fake Wallet' as WalletName<'Fake Wallet'>; @@ -10,8 +10,6 @@ export class FakeWalletAdapter extends BaseWalletAdapter { url = 'https://github.com/solana-labs/wallet-adapter#usage'; icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQiIGhlaWdodD0iMzAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zNCAxMC42djIuN2wtOS41IDE2LjVoLTQuNmw2LTEwLjVhMi4xIDIuMSAwIDEgMCAyLTMuNGw0LjgtOC4zYTQgNCAwIDAgMSAxLjMgM1ptLTQuMyAxOS4xaC0uNmw0LjktOC40djQuMmMwIDIuMy0yIDQuMy00LjMgNC4zWm0yLTI4LjRjLS4zLS44LTEtMS4zLTItMS4zaC0xLjlsLTIuNCA0LjNIMzBsMS43LTNabS0zIDVoLTQuNkwxMC42IDI5LjhoNC43TDI4LjggNi40Wk0xOC43IDBoNC42bC0yLjUgNC4zaC00LjZMMTguNiAwWk0xNSA2LjRoNC42TDYgMjkuOEg0LjJjLS44IDAtMS43LS4zLTIuNC0uOEwxNSA2LjRaTTE0IDBIOS40TDcgNC4zaDQuNkwxNCAwWm0tMy42IDYuNEg1LjdMMCAxNi4ydjhMMTAuMyA2LjRaTTQuMyAwaC40TDAgOC4ydi00QzAgMiAxLjkgMCA0LjMgMFoiIGZpbGw9IiM5OTQ1RkYiLz48L3N2Zz4='; - supportedTransactionVersions = null; - private _publicKey: PublicKey | null = null; constructor() { @@ -47,7 +45,7 @@ export class FakeWalletAdapter extends BaseWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { diff --git a/packages/wallets/glow/src/adapter.ts b/packages/wallets/glow/src/adapter.ts index e0fbd9600..84a2d76c0 100644 --- a/packages/wallets/glow/src/adapter.ts +++ b/packages/wallets/glow/src/adapter.ts @@ -20,7 +20,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface GlowWalletEvents { @@ -178,7 +178,7 @@ export class GlowWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -186,10 +186,6 @@ export class GlowWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/magiceden/src/adapter.ts b/packages/wallets/magiceden/src/adapter.ts index 2904a6f12..1fc830221 100644 --- a/packages/wallets/magiceden/src/adapter.ts +++ b/packages/wallets/magiceden/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface MagicEdenWalletEvents { @@ -158,7 +158,7 @@ export class MagicEdenWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -166,10 +166,6 @@ export class MagicEdenWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/nufi/src/adapter.ts b/packages/wallets/nufi/src/adapter.ts index 40bb5424b..5b5e37088 100644 --- a/packages/wallets/nufi/src/adapter.ts +++ b/packages/wallets/nufi/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface NufiWalletEvents { @@ -150,7 +150,7 @@ export class NufiWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -158,10 +158,6 @@ export class NufiWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/phantom/src/adapter.ts b/packages/wallets/phantom/src/adapter.ts index b3846a6f4..0693cafaa 100644 --- a/packages/wallets/phantom/src/adapter.ts +++ b/packages/wallets/phantom/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface PhantomWalletEvents { @@ -163,7 +163,7 @@ export class PhantomWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -171,10 +171,6 @@ export class PhantomWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/saifu/src/adapter.ts b/packages/wallets/saifu/src/adapter.ts index da8002eca..3e64b9be7 100644 --- a/packages/wallets/saifu/src/adapter.ts +++ b/packages/wallets/saifu/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface SaifuWalletEvents { @@ -156,7 +156,7 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -164,10 +164,6 @@ export class SaifuWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - if (wallet.signAndSendTransaction) { try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/sky/src/adapter.ts b/packages/wallets/sky/src/adapter.ts index 8bd2aeea0..d9bf6bd39 100644 --- a/packages/wallets/sky/src/adapter.ts +++ b/packages/wallets/sky/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface SkyWalletEvents { @@ -153,7 +153,7 @@ export class SkyWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -161,10 +161,6 @@ export class SkyWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/strike/src/adapter.ts b/packages/wallets/strike/src/adapter.ts index e12c77a0c..efe4703a9 100644 --- a/packages/wallets/strike/src/adapter.ts +++ b/packages/wallets/strike/src/adapter.ts @@ -8,10 +8,9 @@ import { WalletNotConnectedError, WalletNotReadyError, WalletReadyState, - WalletSendTransactionError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, PublicKey, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, PublicKey, Transaction, TransactionSignature } from '@solana/web3.js'; import type { StrikeWallet } from '@strike-protocols/solana-wallet-adapter'; interface StrikeWindow extends Window { @@ -118,7 +117,7 @@ export class StrikeWalletAdapter extends BaseSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -126,10 +125,6 @@ export class StrikeWalletAdapter extends BaseSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { return await wallet.sendTransaction(transaction, connection, options); } catch (error: any) { diff --git a/packages/wallets/tokenary/src/adapter.ts b/packages/wallets/tokenary/src/adapter.ts index a00964572..1c29782d6 100644 --- a/packages/wallets/tokenary/src/adapter.ts +++ b/packages/wallets/tokenary/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface TokenaryWalletEvents { @@ -154,7 +154,7 @@ export class TokenaryWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -162,10 +162,6 @@ export class TokenaryWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/torus/src/adapter.ts b/packages/wallets/torus/src/adapter.ts index 9d26cfe0a..a7400b639 100644 --- a/packages/wallets/torus/src/adapter.ts +++ b/packages/wallets/torus/src/adapter.ts @@ -1,21 +1,20 @@ import type { SendTransactionOptions, WalletName } from '@solana/wallet-adapter-base'; +import { WalletError, WalletSendTransactionError } from '@solana/wallet-adapter-base'; import { BaseMessageSignerWalletAdapter, WalletAccountError, WalletConfigError, WalletConnectionError, WalletDisconnectionError, - WalletError, WalletLoadError, WalletNotConnectedError, WalletNotReadyError, WalletPublicKeyError, WalletReadyState, - WalletSendTransactionError, WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; import type { default as Torus, TorusParams } from '@toruslabs/solana-embed'; @@ -145,7 +144,7 @@ export class TorusWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -153,10 +152,6 @@ export class TorusWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/trust/src/adapter.ts b/packages/wallets/trust/src/adapter.ts index 0261a20a1..2f63e40ce 100644 --- a/packages/wallets/trust/src/adapter.ts +++ b/packages/wallets/trust/src/adapter.ts @@ -15,7 +15,7 @@ import { WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { Connection, SendOptions, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface TrustWalletEvents { @@ -51,11 +51,10 @@ export interface TrustWalletAdapterConfig {} export const TrustWalletName = 'Trust' as WalletName<'Trust'>; export class TrustWalletAdapter extends BaseMessageSignerWalletAdapter { - readonly name = TrustWalletName; - readonly url = 'https://trustwallet.com'; - readonly icon = + name = TrustWalletName; + url = 'https://trustwallet.com'; + icon = 'data:image/svg+xml;base64,<svg width="402" height="402" viewBox="0 0 402 402" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect width="402" height="402" fill="url(#pattern0)"/>
<defs>
<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
<use xlink:href="#image0_1694_18967" transform="scale(0.00248756)"/>
</pattern>
<image id="image0_1694_18967" width="402" height="402" xlink:href="data:image/jpeg;base64,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uPr9NmzbqTbNaebBscTjscAarV0FuQaLxP14yCQClOIDNm3Um2bLQYsgIsRiMQlaEcjods9mQPvRTwF7Ysygwu/HOm3Um2ccYfSxSK0MQWX3zQEh6lQC/wDtziASWESnEm7udNupNs6Qiz2O6DYxe9eAa6GhqsdRqLjKcGNgGC5VjANBbgskR1O+fNupNs95BhfqKOhhiDwAoB1JkUREftwhko6lxOndr12TvGP2TrwgIyRcoEOgEwA0z5t1JtyGg9I0UGQaBI8L1ZSRTGId5/4gQQ4Lg4NRjoNTZP7nlf8AFM8J4Mzh+jIdAZgBpyE26k25E+MMwU4rUej0KLBXMAx4S4D8SGyZwdiJ/Do0OOp4eqrCBM9nICw5KbflBnstJCOqebCJemqIILGByHOzXYJnovJ/1AQAJAcnHHdCZ5USe6j7RuipH1wi5hpAByUwmZ1upQuAdA5QzKQXtywCABB0Kf2NXSbbI7LngcJBOcj7U4ROYeWOgwk5gZCMSkI6p0qWCh8QUgAwHLiJHEQh8eSwQDDE77fHzNuGRp8adhNSHDNDY/FksgO/GQ6B0M/iSWQGpnkkOnaff4d9BNAd8xml2T7w+DdlE0Us9tinOo7Jm/Os3T7BMTM9kA3KAAJKoVUKqFVCqhVQqoVUKqFVCqhVQqoVUKqFVCqhVQqoVUKqFVCqhVQqoVUKinHN/9oADAMBAAIAAwAAABDzzzRTzzzzzzzzzzzzzzzzTzzzzzyRzzzzzzzzzzzzzzzzzzwzTzzyTzzzzzzzzzzzzzzzzzzzzyjzyhzzzzzzzzzzzzzzzzzzzzzzxzwzzzzzzzzzzzzzzzzzzzzzzzyzzzzzzzzzzzzz9PfzzzzzzzzzzzDzzzzzzzzzQoMMOD7HzzzzzzzzLzzzzzyuAAMM9+4sMPOL3zzzzwLzzzzzyEIWY3zzw200wP8A88888C888888KQ8888888886D088888C888888qE888888888rDd88888C888888qG888888888gDW88888C888888jS888888888JGV88888C888888pA/88888888CH888888C888888MD188888888JH888888C888888oDb88888885DD888888C888888/CC/8APPPPPwR9/PPPPPAvPPPPPPOCAft/PO8AyvPPPPPPAvPPPPPPPDjQ40qAxT3PPPPPPPAvPPPPPPPPLfQAwDj/ADzzzzzzzzPzzzzzzzzzzy2K/wA88888888888888888888888888888888888E88U8888888888888888888880c88sw8888888888888888888s888888c88888888888888888E888888888jBBBBBBBBBBBBB/8APPPPPP/EACYRAQACAQMEAgIDAQAAAAAAAAEAESEQMDFAQWFxIKFRcIGRsfD/2gAIAQMBAT8Q/Ro1wlsanYB6VHJnf79TGGoqrdcQ5JyWJyS+gbl4J5vhkOCY4uZTIiKp1EcMWsZS/nu8vvSQdxILlOAfAuhcZyqdnA176fYZxdTJj7mf8PW1x/lp9LdFQdbQ8j3oaDwbppRUnk2ngeNBQG6KL4g03BsvZVrxBSeegixbPujfhf8AjOli/HYuNF63qCUxlUcx89CgWy72DSmHnfr9wiVhiFqYTB+oI5NcLyzluPxo67HQ5QwxuholliXDBmOwNEVCVf4zjogFMFz/AEjtCtcjifcHo7Vbh9CWcsTNcv6P/8QAJhEBAAIABQQDAAMBAAAAAAAAAQARECEwMVFBYXGhIECxYHCB8P/aAAgBAgEBPxD+jX62cwlEudZT6uwFzoteZmSuAKDHMzJnKps5PoDGrWdr4ZGNspRqZZlfUAWOKm5CahdcdX1idMUHsMb0vi4tbqbUGdSR9NfvWJv/AOful6WHvarvwkF/9ddI5rxg78jqu/FDfi0hkvGCtO7qu/8Ab9hsuzpHM98FaurcjhiWVEprRoLzLngfQCmd9Hw5ryqu+WFYHXQr8FHJ1hVZBM9YKyqD8gVonMDhcjbpr8wIN5kHpuZ/mPcRGnHPNjmbTvzgZ67v9HP2ZBreBOTPmbkDmZvncAbVEv8A0m/0kVqmMfrDbLMerj6jdu9K9Rq2OyG5kexx/OjWfn//xAAqEAEAAQICCQUBAQEAAAAAAAABEQAhMaEQMEFRYXGBkfEgQLHB8FDR4f/aAAgBAQABPxDUWRb7jGpcIc1SYvoRW8l5rXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VXiq8VW4I5MVMw616k4hyWokhlbn2AqMXcVGIhuP9oBYj+CgkJJU8WODcovgSydbLdfi1BgP4qCQkjUYM7ja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"/>
</defs>
</svg>
'; - readonly supportedTransactionVersions = null; private _connecting: boolean; private _wallet: TrustWallet | null; @@ -159,7 +158,7 @@ export class TrustWalletAdapter extends BaseMessageSignerWalletAdapter { } async sendTransaction( - transaction: VersionedTransaction | Transaction, + transaction: Transaction, connection: Connection, options: SendTransactionOptions = {} ): Promise { @@ -167,10 +166,6 @@ export class TrustWalletAdapter extends BaseMessageSignerWalletAdapter { const wallet = this._wallet; if (!wallet) throw new WalletNotConnectedError(); - if ('message' in transaction) { - throw new WalletSendTransactionError(`Sending versioned transactions isn't supported by this wallet`); - } - try { const { signers, ...sendOptions } = options; diff --git a/packages/wallets/walletconnect/src/adapter.ts b/packages/wallets/walletconnect/src/adapter.ts index fd814f4e6..c9d51f6d9 100644 --- a/packages/wallets/walletconnect/src/adapter.ts +++ b/packages/wallets/walletconnect/src/adapter.ts @@ -27,11 +27,10 @@ export type WalletConnectWalletAdapterConfig = { } & Pick; export class WalletConnectWalletAdapter extends BaseSignerWalletAdapter { - readonly name = WalletConnectWalletName; - readonly url = 'https://walletconnect.org'; - readonly icon = + name = WalletConnectWalletName; + url = 'https://walletconnect.org'; + icon = 'data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjE4NSIgdmlld0JveD0iMCAwIDMwMCAxODUiIHdpZHRoPSIzMDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0ibTYxLjQzODU0MjkgMzYuMjU2MjYxMmM0OC45MTEyMjQxLTQ3Ljg4ODE2NjMgMTI4LjIxMTk4NzEtNDcuODg4MTY2MyAxNzcuMTIzMjA5MSAwbDUuODg2NTQ1IDUuNzYzNDE3NGMyLjQ0NTU2MSAyLjM5NDQwODEgMi40NDU1NjEgNi4yNzY1MTEyIDAgOC42NzA5MjA0bC0yMC4xMzY2OTUgMTkuNzE1NTAzYy0xLjIyMjc4MSAxLjE5NzIwNTEtMy4yMDUzIDEuMTk3MjA1MS00LjQyODA4MSAwbC04LjEwMDU4NC03LjkzMTE0NzljLTM0LjEyMTY5Mi0zMy40MDc5ODE3LTg5LjQ0Mzg4Ni0zMy40MDc5ODE3LTEyMy41NjU1Nzg4IDBsLTguNjc1MDU2MiA4LjQ5MzYwNTFjLTEuMjIyNzgxNiAxLjE5NzIwNDEtMy4yMDUzMDEgMS4xOTcyMDQxLTQuNDI4MDgwNiAwbC0yMC4xMzY2OTQ5LTE5LjcxNTUwMzFjLTIuNDQ1NTYxMi0yLjM5NDQwOTItMi40NDU1NjEyLTYuMjc2NTEyMiAwLTguNjcwOTIwNHptMjE4Ljc2Nzc5NjEgNDAuNzczNzQ0OSAxNy45MjE2OTcgMTcuNTQ2ODk3YzIuNDQ1NTQ5IDIuMzk0Mzk2OSAyLjQ0NTU2MyA2LjI3NjQ3NjkuMDAwMDMxIDguNjcwODg5OWwtODAuODEwMTcxIDc5LjEyMTEzNGMtMi40NDU1NDQgMi4zOTQ0MjYtNi40MTA1ODIgMi4zOTQ0NTMtOC44NTYxNi4wMDAwNjItLjAwMDAxLS4wMDAwMS0uMDAwMDIyLS4wMDAwMjItLjAwMDAzMi0uMDAwMDMybC01Ny4zNTQxNDMtNTYuMTU0NTcyYy0uNjExMzktLjU5ODYwMi0xLjYwMjY1LS41OTg2MDItMi4yMTQwNCAwLS4wMDAwMDQuMDAwMDA0LS4wMDAwMDcuMDAwMDA4LS4wMDAwMTEuMDAwMDExbC01Ny4zNTI5MjEyIDU2LjE1NDUzMWMtMi40NDU1MzY4IDIuMzk0NDMyLTYuNDEwNTc1NSAyLjM5NDQ3Mi04Ljg1NjE2MTIuMDAwMDg3LS4wMDAwMTQzLS4wMDAwMTQtLjAwMDAyOTYtLjAwMDAyOC0uMDAwMDQ0OS0uMDAwMDQ0bC04MC44MTI0MTk0My03OS4xMjIxODVjLTIuNDQ1NTYwMjEtMi4zOTQ0MDgtMi40NDU1NjAyMS02LjI3NjUxMTUgMC04LjY3MDkxOTdsMTcuOTIxNzI5NjMtMTcuNTQ2ODY3M2MyLjQ0NTU2MDItMi4zOTQ0MDgyIDYuNDEwNTk4OS0yLjM5NDQwODIgOC44NTYxNjAyIDBsNTcuMzU0OTc3NSA1Ni4xNTUzNTdjLjYxMTM5MDguNTk4NjAyIDEuNjAyNjQ5LjU5ODYwMiAyLjIxNDAzOTggMCAuMDAwMDA5Mi0uMDAwMDA5LjAwMDAxNzQtLjAwMDAxNy4wMDAwMjY1LS4wMDAwMjRsNTcuMzUyMTAzMS01Ni4xNTUzMzNjMi40NDU1MDUtMi4zOTQ0NjMzIDYuNDEwNTQ0LTIuMzk0NTUzMSA4Ljg1NjE2MS0uMDAwMi4wMDAwMzQuMDAwMDMzNi4wMDAwNjguMDAwMDY3My4wMDAxMDEuMDAwMTAxbDU3LjM1NDkwMiA1Ni4xNTU0MzJjLjYxMTM5LjU5ODYwMSAxLjYwMjY1LjU5ODYwMSAyLjIxNDA0IDBsNTcuMzUzOTc1LTU2LjE1NDMyNDljMi40NDU1NjEtMi4zOTQ0MDkyIDYuNDEwNTk5LTIuMzk0NDA5MiA4Ljg1NjE2IDB6IiBmaWxsPSIjM2I5OWZjIi8+PC9zdmc+'; - readonly supportedTransactionVersions = null; private _publicKey: PublicKey | null; private _connecting: boolean; diff --git a/packages/wallets/xdefi/src/adapter.ts b/packages/wallets/xdefi/src/adapter.ts index 32a03c55e..c9b8242f2 100644 --- a/packages/wallets/xdefi/src/adapter.ts +++ b/packages/wallets/xdefi/src/adapter.ts @@ -1,4 +1,4 @@ -import type { EventEmitter, WalletName } from '@solana/wallet-adapter-base'; +import type { EventEmitter, SendTransactionOptions, WalletName } from '@solana/wallet-adapter-base'; import { BaseMessageSignerWalletAdapter, scopePollingDetectionStrategy, @@ -6,14 +6,16 @@ import { WalletConnectionError, WalletDisconnectedError, WalletDisconnectionError, + WalletError, WalletNotConnectedError, WalletNotReadyError, WalletPublicKeyError, WalletReadyState, + WalletSendTransactionError, WalletSignMessageError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; -import type { SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; +import type { Connection, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; import { PublicKey } from '@solana/web3.js'; interface XDEFIWalletEvents { @@ -49,11 +51,10 @@ export interface XDEFIWalletAdapterConfig {} export const XDEFIWalletName = 'XDEFI' as WalletName<'XDEFI'>; export class XDEFIWalletAdapter extends BaseMessageSignerWalletAdapter { - readonly name = XDEFIWalletName; - readonly url = 'https://xdefi.io'; - readonly icon = + name = XDEFIWalletName; + url = 'https://xdefi.io'; + icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE0LjI2MjggMTMuNDAxM0MxMi40MjI4IDE0LjUzMDcgOS45NTk5NyAxNS4xMTI0IDcuNDY1NjkgMTQuOTg4MUM1LjM2ODU1IDE0Ljg4NjUgMy42NDg1NSAxNC4xNDExIDIuNjA4NTUgMTIuOTE1N0MxLjY5NDI2IDExLjgyMDEgMS4zMzk5OCAxMC4zNzQ1IDEuNTc5OTggOC43MTE0M0MxLjY2MTMyIDguMTU4NzQgMS44MjgwMiA3LjYyMTY2IDIuMDc0MjYgNy4xMTg5NkwyLjEwODU1IDcuMDQ4MzdDMi45NzE4IDUuNDA1OTUgNC4yNTI5MyA0LjAxMzk3IDUuODI1ODQgMy4wMDk0MkM3LjM5ODc1IDIuMDA0ODYgOS4yMDkyNCAxLjQyMjM2IDExLjA3OTEgMS4zMTkyNEMxMi45NDkgMS4yMTYxMSAxNC44MTM4IDEuNTk1OTIgMTYuNDkwMSAyLjQyMTI4QzE4LjE2NjMgMy4yNDY2NSAxOS41OTYyIDQuNDg5MTIgMjAuNjM5IDYuMDI2NDFDMjEuNjgxOSA3LjU2MzcxIDIyLjMwMTcgOS4zNDI4NSAyMi40Mzc0IDExLjE4ODdDMjIuNTczMiAxMy4wMzQ2IDIyLjIyMDMgMTQuODgzNiAyMS40MTM0IDE2LjU1MzhDMjAuNjA2NSAxOC4yMjQgMTkuMzczNSAxOS42NTc3IDE3LjgzNTYgMjAuNzE0QzE2LjI5NzggMjEuNzcwMiAxNC41MDgxIDIyLjQxMjYgMTIuNjQyOCAyMi41Nzc4TDEyLjc1NzEgMjMuODczOEMxNC44NTE0IDIzLjY4OTQgMTYuODYxIDIyLjk2OTEgMTguNTg3OCAyMS43ODM3QzIwLjMxNDcgMjAuNTk4NCAyMS42OTkzIDE4Ljk4ODkgMjIuNjA1MiAxNy4xMTM4QzIzLjUxMTEgMTUuMjM4NyAyMy45MDcxIDEzLjE2MjcgMjMuNzU0MiAxMS4wOTA0QzIzLjYwMTIgOS4wMTgwOCAyMi45MDQ2IDcuMDIwODggMjEuNzMyOSA1LjI5NTU1QzIwLjU2MTMgMy41NzAyMiAxOC45NTUgMi4xNzYzIDE3LjA3MjQgMS4yNTExMUMxNS4xODk4IDAuMzI1OTA5IDEzLjA5NTcgLTAuMDk4NjQxMSAxMC45OTY1IDAuMDE5Mjc4N0M4Ljg5NzMzIDAuMTM3MTk4IDYuODY1NDQgMC43OTM1MiA1LjEwMTAyIDEuOTIzNTlDMy4zMzY2IDMuMDUzNjUgMS45MDA1MyA0LjYxODQ4IDAuOTM0MjY0IDYuNDYzOUwwLjg4ODU0OCA2LjU1NzA3QzAuNTgzMDgzIDcuMTgwOSAwLjM3Njg0NyA3Ljg0NzU2IDAuMjc3MTIgOC41MzM1NEMtMC4wMDg1OTQ1IDEwLjU2MDggMC40MzQyNiAxMi4zNjUxIDEuNTkxNCAxMy43NTQyQzIuODU3MTIgMTUuMjczMyA0LjkxNzEyIDE2LjE3NjggNy4zODg1NSAxNi4yOTU0QzEwLjM5NzEgMTYuNDQ1MSAxMy4zODg1IDE1LjYzNDcgMTUuNTExNCAxNC4xNDM5TDE0LjI2MjggMTMuNDAxM1oiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik0xNi43OCAxNC44NzUxQzE1LjU4MjkgMTUuOTAyOSAxMi44IDE3Ljc2NjQgOC4xODI4NiAxOC4wMjA1QzMuMDE0MjkgMTguMzAyOSAwLjg2MDAwMSAxNi42NDI3IDAuODQwMDAxIDE2LjYyNTdMMC40MjI4NTYgMTcuMTMzOUwwLjg0Mjg1NiAxNi42MzQyTDAgMTcuNjMzN0MwLjA5MTQyODYgMTcuNzA5OSAyLjE1NzE0IDE5LjM1ODkgNy4wMDg1NyAxOS4zNTg5QzcuNDA1NzEgMTkuMzU4OSA3LjgyMjg2IDE5LjM1ODkgOC4yNTcxNCAxOS4zMjVDMTMuODM3MSAxOS4wMTcyIDE2LjkwMjkgMTYuNjExNiAxNy45NzE0IDE1LjU4MzhMMTYuNzggMTQuODc1MVoiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik0xOS4wMiAxNi4yMTkyQzE4LjMxMjEgMTcuMTM4NyAxNy40NDA4IDE3LjkyMzMgMTYuNDQ4NiAxOC41MzQ1QzEyLjk1MTUgMjAuNzY1IDguNTAyODkgMjEuMDUzIDUuMzg4NiAyMC44OTc4TDUuMzIyODkgMjIuMTk5NEM1Ljg0NTc1IDIyLjIyNDggNi4zNDg2MSAyMi4yMzYxIDYuODM3MTggMjIuMjM2MUMxNS42MiAyMi4yMzYxIDE5LjE2ODYgMTguMjgzMiAyMC4xNiAxNi44NzE0TDE5LjAxNzIgMTYuMjA3OSIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTE4LjY4NTcgMTEuMjkyMkMxOS4yNjggMTEuMjkyMiAxOS43NCAxMC44MjU3IDE5Ljc0IDEwLjI1MDNDMTkuNzQgOS42NzQ4OSAxOS4yNjggOS4yMDg0MiAxOC42ODU3IDkuMjA4NDJDMTguMTAzNCA5LjIwODQyIDE3LjYzMTQgOS42NzQ4OSAxNy42MzE0IDEwLjI1MDNDMTcuNjMxNCAxMC44MjU3IDE4LjEwMzQgMTEuMjkyMiAxOC42ODU3IDExLjI5MjJaIiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K'; - readonly supportedTransactionVersions = null; private _connecting: boolean; private _wallet: XDEFIWallet | null;