Skip to content

Make Provider require publicKey instead of wallet in accounts resolver #3613

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

Merged
acheroncrypto merged 4 commits into from
Mar 23, 2025
Merged

Make Provider require publicKey instead of wallet in accounts resolver #3613

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0056940
Remove provider with wallet enforcement
badalya1 Mar 21, 2025
1affa2a
Lint remove extra whitespace
badalya1 Mar 23, 2025
1ff427c
Add an entry in changelog
badalya1 Mar 23, 2025
9aac25b
Move changelog entry to features
badalya1 Mar 23, 2025
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
12 changes: 6 additions & 6 deletions ts/packages/anchor/src/program/accounts-resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class AccountsResolver<IDL extends Idl> {
let depth = 0;
while (
(await this.resolvePdasAndRelations(this._idlIx.accounts)) +
(await this.resolveCustom()) >
(await this.resolveCustom()) >
0
) {
depth++;
Expand Down Expand Up @@ -279,12 +279,12 @@ export class AccountsResolver<IDL extends Idl> {
if ((account.signer || account.address) && !this.get([...path, name])) {
// Default signers to the provider
if (account.signer) {
if (!this._provider.wallet) {
if (!this._provider.publicKey) {
throw new Error(
"This function requires the `Provider` interface implementor to have a `wallet` field."
"This function requires the `Provider` interface implementor to have a `publicKey` field."
);
}
this.set([...path, name], this._provider.wallet.publicKey);
this.set([...path, name], this._provider.publicKey);
}

// Set based on `address` field
Expand Down Expand Up @@ -334,7 +334,7 @@ export class AccountsResolver<IDL extends Idl> {

this.set([...path, name], pubkey);
}
} catch {}
} catch { }

try {
if (account.relations) {
Expand All @@ -346,7 +346,7 @@ export class AccountsResolver<IDL extends Idl> {
this.set([...path, name], account[name]);
}
}
} catch {}
} catch { }
}
}
}
Expand Down