project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ts: add `accountsStrict` for non-resolvable accounts input (#2019)

This commit is contained in:
Matthew Callens 2022-07-01 18:26:09 -04:00 committed by GitHub
parent f76112a41a
commit 2ad00678b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ com/project-serum/anchor/pull/1841)).
* client: Add send_with_spinner_and_config function to RequestBuilder ([#1926](https://github.com/coral-xyz/anchor/pull/1926)).
* ts: Implement a coder for SPL associated token program ([#1939](https://github.com/coral-xyz/anchor/pull/1939)).
* ts: verbose error for missing `ANCHOR_WALLET` variable when using `NodeWallet.local()` ([#1958](https://github.com/coral-xyz/anchor/pull/1958)).
* ts: Add `MethodsBuilder#accountsStrict` for strict typing on ix account input ([#2019](https://github.com/coral-xyz/anchor/pull/2019)).
### Fixes

4
ts/src/program/accounts-resolver.ts
View File

@ -11,10 +11,10 @@ import { coder } from "../spl/token";
// Populates a given accounts context with PDAs and common missing accounts.
export class AccountsResolver<IDL extends Idl, I extends AllInstructions<IDL>> {
static readonly CONST_ACCOUNTS = {
systemProgram: SystemProgram.programId,
tokenProgram: TOKEN_PROGRAM_ID,
associatedTokenProgram: ASSOCIATED_PROGRAM_ID,
rent: SYSVAR_RENT_PUBKEY,
systemProgram: SystemProgram.programId,
tokenProgram: TOKEN_PROGRAM_ID,
};
private _accountStore: AccountStore<IDL>;

40
ts/src/program/namespace/methods.ts
View File

@ -65,6 +65,7 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
private _preInstructions: Array<TransactionInstruction> = [];
private _postInstructions: Array<TransactionInstruction> = [];
private _accountsResolver: AccountsResolver<IDL, I>;
private _autoResolveAccounts: boolean = true;
constructor(
private _args: Array<any>,
@ -91,13 +92,24 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
public async pubkeys(): Promise<
Partial<InstructionAccountAddresses<IDL, I>>
> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
return this._accounts as Partial<InstructionAccountAddresses<IDL, I>>;
}
public accounts(
accounts: Partial<Accounts<I["accounts"][number]>>
): MethodsBuilder<IDL, I> {
this._autoResolveAccounts = true;
Object.assign(this._accounts, accounts);
return this;
}
public accountsStrict(
accounts: Accounts<I["accounts"][number]>
): MethodsBuilder<IDL, I> {
this._autoResolveAccounts = false;
Object.assign(this._accounts, accounts);
return this;
}
@ -129,7 +141,10 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
}
public async rpc(options?: ConfirmOptions): Promise<TransactionSignature> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
// @ts-ignore
return this._rpcFn(...this._args, {
accounts: this._accounts,
@ -142,10 +157,14 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
}
public async view(options?: ConfirmOptions): Promise<any> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
if (!this._viewFn) {
throw new Error("Method does not support views");
}
// @ts-ignore
return this._viewFn(...this._args, {
accounts: this._accounts,
@ -160,7 +179,10 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
public async simulate(
options?: ConfirmOptions
): Promise<SimulateResponse<any, any>> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
// @ts-ignore
return this._simulateFn(...this._args, {
accounts: this._accounts,
@ -173,7 +195,10 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
}
public async instruction(): Promise<TransactionInstruction> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
// @ts-ignore
return this._ixFn(...this._args, {
accounts: this._accounts,
@ -185,7 +210,10 @@ export class MethodsBuilder<IDL extends Idl, I extends AllInstructions<IDL>> {
}
public async transaction(): Promise<Transaction> {
await this._accountsResolver.resolve();
if (this._autoResolveAccounts) {
await this._accountsResolver.resolve();
}
// @ts-ignore
return this._txFn(...this._args, {
accounts: this._accounts,