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

Jump to bottom

allow ability to pass in feePayer to Provider methods [WIP] #2186

Merged
merged 12 commits into from Dec 5, 2022
Merged

allow ability to pass in feePayer to Provider methods [WIP] #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fdd6028
allow ability to pass in feePayer to Provider methods
surfertas Sep 16, 2022
d853891
align comments
surfertas Sep 16, 2022
01a2b22
prettier
surfertas Sep 16, 2022
0c17c4d
check if feePayer set, handle if not
surfertas Sep 17, 2022
d3958e0
remove unnecessary spaces in comments
surfertas Sep 17, 2022
966d205
update changelog
surfertas Sep 17, 2022
0e54fb6
strict equality check
surfertas Sep 17, 2022
e3a2896
use null check
surfertas Sep 26, 2022
71840b3
use logical or
surfertas Sep 27, 2022
204d13c
use logical or
surfertas Sep 27, 2022
f794163
Merge branch 'master' into surfertas/anchorts/add-feepayer
Henry-E Nov 22, 2022
a1bdde6
Merge branch 'master' into surfertas/anchorts/add-feepayer
Henry-E Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@ The minor version will be incremented upon a breaking change and the patch versi
- ts: Add ability to set args after setting accounts and retrieving pubkyes ([#2160](https://github.com/coral-xyz/anchor/pull/2160))
- ts: Add `.prepare()` to builder pattern ([#2160](https://github.com/coral-xyz/anchor/pull/2160))
- spl: Add `freeze_delegated_account` and `thaw_delegated_account` wrappers ([#2164](https://github.com/coral-xyz/anchor/pull/2164))
- ts: Add `feePayer` check to `AnchorProvider` methods, so that anchor writes the provider's wallet as fee payer if fee payer isn't already set ([#2186](https://github.com/coral-xyz/anchor/pull/2186))
- ts: Add nested PDA inference ([#2194](https://github.com/coral-xyz/anchor/pull/2194))
- ts: Add ability to resolve missing accounts with a custom resolver ([#2194](https://github.com/coral-xyz/anchor/pull/2194))
- ts: Update the Solana web3 library used by anchor ts to version 1.64.0 ([#2220](https://github.com/coral-xyz/anchor/issues/2220))
Expand Down
12 changes: 9 additions & 3 deletions ts/packages/anchor/src/provider.ts
View file
Open in desktop
Expand Up @@ -132,7 +132,8 @@ export class AnchorProvider implements Provider {
opts = this.opts;
}

tx.feePayer = this.wallet.publicKey;
tx.feePayer = tx.feePayer || this.wallet.publicKey;

tx.recentBlockhash = (
await this.connection.getLatestBlockhash(opts.preflightCommitment)
).blockhash;
Expand Down Expand Up @@ -172,6 +173,9 @@ export class AnchorProvider implements Provider {

/**
* Similar to `send`, but for an array of transactions and signers.
*
* @param txWithSigners Array of transactions and signers.
* @param opts Transaction confirmation options.
*/
async sendAll(
txWithSigners: { tx: Transaction; signers?: Signer[] }[],
Expand All @@ -188,7 +192,8 @@ export class AnchorProvider implements Provider {
let tx = r.tx;
let signers = r.signers ?? [];

tx.feePayer = this.wallet.publicKey;
tx.feePayer = tx.feePayer || this.wallet.publicKey;

tx.recentBlockhash = blockhash.blockhash;

signers.forEach((kp) => {
Expand Down Expand Up @@ -226,7 +231,8 @@ export class AnchorProvider implements Provider {
commitment?: Commitment,
includeAccounts?: boolean | PublicKey[]
): Promise<SuccessfulTxSimulationResponse> {
tx.feePayer = this.wallet.publicKey;
tx.feePayer = tx.feePayer || this.wallet.publicKey;

tx.recentBlockhash = (
await this.connection.getLatestBlockhash(
commitment ?? this.connection.commitment
Expand Down