Skip to content

add sendTransaction in TokenPocket wallet #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions packages/wallets/tokenpocket/src/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import type { EventEmitter, WalletName } from '@solana/wallet-adapter-base';
import type { EventEmitter,SendTransactionOptions, WalletName } from '@solana/wallet-adapter-base';
import {
BaseMessageSignerWalletAdapter,
scopePollingDetectionStrategy,
isVersionedTransaction,
WalletAccountError,
WalletConnectionError,
WalletDisconnectedError,
WalletError,
WalletNotConnectedError,
WalletNotReadyError,
WalletPublicKeyError,
WalletReadyState,
WalletSendTransactionError,
WalletSignMessageError,
WalletSignTransactionError,
} from '@solana/wallet-adapter-base';
import type { Transaction } from '@solana/web3.js';
import type { Connection,Transaction, SendOptions, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
import { PublicKey } from '@solana/web3.js';

interface TokenPocketWalletEvents {
Expand All @@ -24,8 +27,12 @@ interface TokenPocketWallet extends EventEmitter<TokenPocketWalletEvents> {
isTokenPocket?: boolean;
publicKey?: { toBytes(): Uint8Array };
isConnected: boolean;
signTransaction(transaction: Transaction): Promise<Transaction>;
signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
signAndSendTransaction<T extends Transaction | VersionedTransaction>(
transaction: T,
options?: SendOptions
): Promise<{ signature: TransactionSignature }>;
signMessage(message: Uint8Array): Promise<{ signature: Uint8Array }>;
connect(): Promise<void>;
disconnect(): Promise<void>;
Expand Down Expand Up @@ -141,7 +148,40 @@ export class TokenPocketWalletAdapter extends BaseMessageSignerWalletAdapter {
}
}

async signTransaction<T extends Transaction>(transaction: T): Promise<T> {
async sendTransaction<T extends Transaction | VersionedTransaction>(
transaction: T,
connection: Connection,
options: SendTransactionOptions = {}
): Promise<TransactionSignature> {
try {
const wallet = this._wallet;
if (!wallet) throw new WalletNotConnectedError();

try {
const { signers, ...sendOptions } = options;

if (isVersionedTransaction(transaction)) {
signers?.length && transaction.sign(signers);
} else {
transaction = (await this.prepareTransaction(transaction, connection, sendOptions)) as T;
signers?.length && (transaction as Transaction).partialSign(...signers);
}

sendOptions.preflightCommitment = sendOptions.preflightCommitment || connection.commitment;

const { signature } = await wallet.signAndSendTransaction(transaction, sendOptions);
return signature;
} catch (error: any) {
if (error instanceof WalletError) throw error;
throw new WalletSendTransactionError(error?.message, error);
}
} catch (error: any) {
this.emit('error', error);
throw error;
}
}

async signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T> {
try {
const wallet = this._wallet;
if (!wallet) throw new WalletNotConnectedError();
Expand All @@ -157,7 +197,7 @@ export class TokenPocketWalletAdapter extends BaseMessageSignerWalletAdapter {
}
}

async signAllTransactions<T extends Transaction>(transactions: T[]): Promise<T[]> {
async signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]> {
try {
const wallet = this._wallet;
if (!wallet) throw new WalletNotConnectedError();
Expand Down