Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

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

Merged
mergify[bot] merged 1 commit intosolana-labs:masterfrom
mvines:spl
Sep 1, 2020
Merged

Ensure that the spl-token 2 native mint account is owned by the spl-token 2 program#11966
mergify[bot] merged 1 commit intosolana-labs:masterfrom
mvines:spl

Conversation

@mvines
Copy link
Copy Markdown
Contributor

@mvines mvines commented Sep 1, 2020

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

@mvines mvines force-pushed the spl branch 3 times, most recently from 880818a to 73d6df4 Compare September 1, 2020 05:20
@mvines mvines requested review from jackcmay and ryoqun September 1, 2020 05:21
@mvines
Copy link
Copy Markdown
Contributor Author

mvines commented Sep 1, 2020

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

@mvines mvines force-pushed the spl branch 2 times, most recently from 4f4d94e to 2e82dd6 Compare September 1, 2020 05:29
Comment thread runtime/src/bank.rs Outdated
Comment thread runtime/src/bank.rs Outdated
@mvines mvines force-pushed the spl branch 4 times, most recently from 3ead8c6 to d993400 Compare September 1, 2020 06:05
Comment thread core/src/rpc.rs
jackcmay
jackcmay previously approved these changes Sep 1, 2020
@mergify mergify Bot dismissed jackcmay’s stale review September 1, 2020 06:20

Pull request has been modified.

@mvines mvines force-pushed the spl branch 3 times, most recently from f46b450 to 10b17ca Compare September 1, 2020 07:17
Comment thread runtime/src/bank.rs
Comment thread runtime/src/bank.rs
Comment thread runtime/src/bank.rs Outdated
ryoqun
ryoqun previously approved these changes Sep 1, 2020
Copy link
Copy Markdown
Contributor

@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
Copy Markdown
Contributor 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
Copy Markdown

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     

Comment thread runtime/src/bank.rs
self.set_compute_budget(compute_budget);
}

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

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 subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants