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.

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

Ensure that the spl-token 2 native mint account is owned by the spl-token 2 program #11966

Merged
merged 1 commit into from
Sep 1, 2020

Conversation

mvines
Copy link
Member

@mvines mvines commented Sep 1, 2020

Workaround for solana-labs/solana-program-library#374 until spl-token 3 is shipped

@mvines
Copy link
Member Author

mvines commented Sep 1, 2020

@ryoqun - I'd appreciate your careful eye here too. We want to ship this to 1.2 ASAP

runtime/src/bank.rs Outdated Show resolved Hide resolved
runtime/src/bank.rs Outdated Show resolved Hide resolved
core/src/rpc.rs Show resolved Hide resolved
jackcmay
jackcmay previously approved these changes Sep 1, 2020
runtime/src/bank.rs Outdated Show resolved Hide resolved
ryoqun
ryoqun previously approved these changes Sep 1, 2020
Copy link
Member

@ryoqun ryoqun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm with nits.

I also lightly tested this locally. there is no problem.

However, ci is failing...

@mvines
Copy link
Member Author

mvines commented Sep 1, 2020

However, ci is failing...

Sorry, was trying to get this wrapped up before 🛏️. There's a number of tests that get angry about the new mint account that gets added automatically when in development operating mode. Flipping those tests to use the stable operating mode makes them happy again

@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Sep 1, 2020
@codecov
Copy link

codecov bot commented Sep 1, 2020

Codecov Report

Merging #11966 into master will increase coverage by 0.0%.
The diff coverage is 98.6%.

@@           Coverage Diff           @@
##           master   #11966   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         333      333           
  Lines       78106    78175   +69     
=======================================
+ Hits        64151    64237   +86     
+ Misses      13955    13938   -17     

@@ -3257,6 +3283,49 @@ impl Bank {
self.set_compute_budget(compute_budget);
}

fn reconfigure_token2_native_mint(self: &mut Bank) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Lichtso 👋

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants