Skip to content
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.

Sign up for GitHub

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

Include signInFeature in the features for SolanaWalletAdapterWallet #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include signInFeature in the features for SolanaWalletAdapterWallet #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0739a2a
Include `signInFeature` in the features for `SolanaWalletAdapterWallet`
alex-fung Apr 30, 2024
a0e6169
use util function to compare account equality
alex-fung Apr 30, 2024
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
17 changes: 11 additions & 6 deletions packages/wallet-adapter/base/src/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
type StandardEventsNames,
type StandardEventsOnMethod,
} from '@wallet-standard/features';
import { arraysEqual, bytesEqual, ReadonlyWalletAccount } from '@wallet-standard/wallet';
import { arraysEqual, bytesEqual, ReadonlyWalletAccount, walletAccountsEqual } from '@wallet-standard/wallet';
import bs58 from 'bs58';

/** TODO: docs */
Expand Down Expand Up @@ -162,7 +162,12 @@ export class SolanaWalletAdapterWallet implements Wallet {
};
}

return { ...features, ...signTransactionFeature, ...signMessageFeature };
return {
...features,
...signTransactionFeature,
...signMessageFeature,
...signInFeature,
};
}

get accounts() {
Expand Down Expand Up @@ -272,7 +277,7 @@ export class SolanaWalletAdapterWallet implements Wallet {
if (inputs.length === 1) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const input = inputs[0]!;
if (input.account !== this.#account) throw new Error('invalid account');
if (!walletAccountsEqual(input.account, this.#account)) throw new Error('invalid account');
if (!isSolanaChain(input.chain)) throw new Error('invalid chain');
const transaction = this.#deserializeTransaction(input.transaction);
const { commitment, preflightCommitment, skipPreflight, maxRetries, minContextSlot } = input.options || {};
Expand Down Expand Up @@ -321,7 +326,7 @@ export class SolanaWalletAdapterWallet implements Wallet {
if (inputs.length === 1) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const input = inputs[0]!;
if (input.account !== this.#account) throw new Error('invalid account');
if (!walletAccountsEqual(input.account, this.#account)) throw new Error('invalid account');
if (input.chain && !isSolanaChain(input.chain)) throw new Error('invalid chain');
const transaction = this.#deserializeTransaction(input.transaction);

Expand All @@ -339,7 +344,7 @@ export class SolanaWalletAdapterWallet implements Wallet {
outputs.push({ signedTransaction: serializedTransaction });
} else if (inputs.length > 1) {
for (const input of inputs) {
if (input.account !== this.#account) throw new Error('invalid account');
if (!walletAccountsEqual(input.account, this.#account)) throw new Error('invalid account');
if (input.chain && !isSolanaChain(input.chain)) throw new Error('invalid chain');
}
const transactions = inputs.map(({ transaction }) => this.#deserializeTransaction(transaction));
Expand Down Expand Up @@ -372,7 +377,7 @@ export class SolanaWalletAdapterWallet implements Wallet {
if (inputs.length === 1) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const input = inputs[0]!;
if (input.account !== this.#account) throw new Error('invalid account');
if (!walletAccountsEqual(input.account, this.#account)) throw new Error('invalid account');

const signature = await this.#adapter.signMessage(input.message);

Expand Down