feature: add new token program feature #18780

joncinque · 2021-07-20T19:36:10Z

Problem

We need to deploy a new token program.

Summary of Changes

Add a feature for it! Since we already have a new token program id in the code, and that one was enabled at slot 66528004, and we're at 87877768 as of this writing, it felt ok to change this up.

On the other hand, I left the old feature in the feature set so it can still be queried. Let me know if you prefer to remove that too.

After, this will reuse the hack to the account db to force in the new token program for one of our validators: #15212 (comment) <--- this is more for me to remember

Fixes #

mvines

Removing/reusing the existing token upgrade infra makes sense to me

Pull request has been modified.

mvines · 2021-07-20T19:47:54Z

@joncinque - when we have the final SPL Token binary, let's make a SPL Token release over in SPL-land as well.

Then replace program-test/src/programs/spl_token-3.1.0.so and update fetch-spl.sh. These changes probably belong in this PR as well actually

CriesofCarrots · 2021-07-20T19:52:06Z

let's make a SPL Token release over in SPL-land as well

Yes, please! We need that for some ledger-app-solana changes I have cued. I'll probably also bump spl-token in solana-transaction-status to parse the new instruction.

joncinque · 2021-07-20T20:50:32Z

Ah yes, great call! Should this next release be version 3.2.0 then?

codecov · 2021-07-20T21:40:04Z

Codecov Report

Merging #18780 (60b133d) into master (b13caa1) will decrease coverage by 0.0%.
The diff coverage is 90.0%.

@@            Coverage Diff            @@
##           master   #18780     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         441      441             
  Lines      124988   125017     +29     
=========================================
+ Hits       103578   103586      +8     
- Misses      21410    21431     +21

joncinque · 2021-07-20T22:29:04Z

@CriesofCarrots I added the transaction parser with the upgrade, could you take a look at it?

Otherwise, just double-checking, is there a potential problem with backporting this to 1.6? spl-token v3.2.0 uses solana-program v1.7.4

CriesofCarrots · 2021-07-20T22:48:19Z

@CriesofCarrots I added the transaction parser with the upgrade, could you take a look at it?

Thank you! 😍 Looks great.

Otherwise, just double-checking, is there a potential problem with backporting this to 1.6? spl-token v3.2.0 uses solana-program v1.7.4

Oof. Correct, this likely won't be backportable to v1.6 for the reason you noted. I guess this would need to head to MNB on the v1.7 train. (Rolling back SPL to v1.6 doesn't seem very feasible to me.)

joncinque · 2021-07-20T23:03:21Z

Oof. Correct, this won't be backportable to v1.6 for the reason you noted.

Ah, beans. The program will soak on mainnet for a bit, so let's hope lines up with the timeline for 1.7.

CriesofCarrots · 2021-07-20T23:06:34Z

@joncinque , actually... while I believe I've had troubles in the past with spl dependencies bringing in newer minor-version solana-program crates, in this case it looks like if we release a new version of spl-associated-token-account and bump that as well, the backport will work. v1.6 builds with that setup, anyway. Will have to check to ensure there are no crates.io packaging issues.

CriesofCarrots · 2021-07-20T23:07:28Z

No harm in releasing a new solana-associated-token-account on spl-token v3.2 anyway, so let's give it a try!

joncinque · 2021-07-20T23:07:49Z

All right, let's roll the dice!

joncinque · 2021-07-20T23:43:49Z

That should be everything now 🤞

CriesofCarrots · 2021-07-20T23:44:31Z

@joncinque , alas, it does build fine with the new atoken, but doesn't please cargo package:

$ cargo package
   Packaging solana-account-decoder v1.6.19 (/solana/account-decoder)
   Verifying solana-account-decoder v1.6.19 (/solana/account-decoder)
    Updating crates.io index
    
error: failed to verify package tarball

Caused by:
  failed to select a version for `solana-program`.
      ... required by package `spl-token v3.2.0`
      ... which is depended on by `solana-account-decoder v1.6.19 (/solana/target/package/solana-account-decoder-1.6.19)`
  versions that meet the requirements `^1.7.4` are: 1.7.6, 1.7.5, 1.7.4

  all possible versions conflict with previously selected packages.

    previously selected package `solana-program v1.6.19`
      ... which is depended on by `solana-sdk v1.6.19`
      ... which is depended on by `solana-account-decoder v1.6.19 (/solana/target/package/solana-account-decoder-1.6.19)`

  failed to select a version for `solana-program` which could resolve this conflict

Sorry for the hassle

joncinque · 2021-07-20T23:57:30Z

Ah bummer, oh well, it was worth a shot!

joncinque · 2021-07-21T12:35:19Z

Merging on not-really-red, the removal of the v1.6 label causes this to look failed, when it isn't

* feature: add new token program feature * Fixup test * Update to spl-token v3.2.0 * Update Cargo.lock + fmt * Update token program version in fetch-spl.sh * Bump associated token program to 1.0.3 * Add aToken so (cherry picked from commit 51f3b9a) # Conflicts: # Cargo.lock # account-decoder/Cargo.toml # accounts-cluster-bench/Cargo.toml # programs/bpf/Cargo.lock # rpc/Cargo.toml # sdk/src/feature_set.rs # tokens/Cargo.toml # transaction-status/Cargo.toml

* feature: add new token program feature (#18780) * feature: add new token program feature * Fixup test * Update to spl-token v3.2.0 * Update Cargo.lock + fmt * Update token program version in fetch-spl.sh * Bump associated token program to 1.0.3 * Add aToken so (cherry picked from commit 51f3b9a) # Conflicts: # Cargo.lock # account-decoder/Cargo.toml # accounts-cluster-bench/Cargo.toml # programs/bpf/Cargo.lock # rpc/Cargo.toml # sdk/src/feature_set.rs # tokens/Cargo.toml # transaction-status/Cargo.toml * Fix merge issues * Re-generate lock files Co-authored-by: Jon Cinque <jon.cinque@gmail.com>

) * feature: add new token program feature * Fixup test * Cargo fmt * Add back whitespace for cargo fmt * Revert file totally

feature: add new token program feature

76d54f2

joncinque added v1.6 labels Jul 20, 2021

joncinque requested a review from mvines July 20, 2021 19:36

Fixup test

9766280

mvines previously approved these changes Jul 20, 2021

View reviewed changes

joncinque added 2 commits July 21, 2021 00:24

Update to spl-token v3.2.0

0731784

Update Cargo.lock + fmt

87d6061

joncinque removed the v1.6 label Jul 20, 2021

Update token program version in fetch-spl.sh

224d182

Bump associated token program to 1.0.3

c83f795

joncinque added the v1.6 label Jul 20, 2021

Add aToken so

60b133d

joncinque removed the v1.6 label Jul 20, 2021

joncinque merged commit 51f3b9a into solana-labs:master Jul 21, 2021

mergify bot mentioned this pull request Jul 21, 2021

feature: add new token program feature (backport #18780) #18803

Merged

joncinque mentioned this pull request Jul 21, 2021

feature: add new token program feature (v1.6 backport of #18780) #18804

Merged

joncinque deleted the token-vx-feature branch July 21, 2021 12:55

joncinque added a commit that referenced this pull request Jul 21, 2021

feature: add new token program feature (v1.6 backport of #18780) (#18804

007c49f

) * feature: add new token program feature * Fixup test * Cargo fmt * Add back whitespace for cargo fmt * Revert file totally

This was referenced Aug 23, 2021

backport 19361 v16 #19379

Closed

backport 19361 v17 #19380

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: add new token program feature #18780

feature: add new token program feature #18780

joncinque commented Jul 20, 2021

mvines left a comment

mvines commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

joncinque commented Jul 20, 2021

codecov bot commented Jul 20, 2021 •

edited

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021 •

edited

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

joncinque commented Jul 20, 2021

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021 •

edited

joncinque commented Jul 20, 2021

joncinque commented Jul 21, 2021

feature: add new token program feature #18780

feature: add new token program feature #18780

Conversation

joncinque commented Jul 20, 2021

Problem

Summary of Changes

mvines left a comment

Choose a reason for hiding this comment

mvines commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

joncinque commented Jul 20, 2021

codecov bot commented Jul 20, 2021 • edited

Codecov Report

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021 • edited

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021

joncinque commented Jul 20, 2021

joncinque commented Jul 20, 2021

CriesofCarrots commented Jul 20, 2021 • edited

joncinque commented Jul 20, 2021

joncinque commented Jul 21, 2021

codecov bot commented Jul 20, 2021 •

edited

CriesofCarrots commented Jul 20, 2021 •

edited

CriesofCarrots commented Jul 20, 2021 •

edited