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

Bump spl-token #12395

Merged
merged 1 commit into from
Sep 22, 2020
Merged

Bump spl-token #12395

merged 1 commit into from
Sep 22, 2020

Conversation

CriesofCarrots
Copy link
Contributor

@CriesofCarrots CriesofCarrots commented Sep 22, 2020

Problem

New spl-token depends on solana-sdk::{program_option, program_pack}, and renames some TokenInstructions.

Summary of Changes

Bump spl-token and accommodate changes

Fixes #12391

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

codecov bot commented Sep 22, 2020

Codecov Report

Merging #12395 into master will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##           master   #12395     +/-   ##
=========================================
- Coverage    82.2%    82.2%   -0.1%     
=========================================
  Files         347      347             
  Lines       81626    81608     -18     
=========================================
- Hits        67128    67106     -22     
- Misses      14498    14502      +4     

@CriesofCarrots CriesofCarrots merged commit e1a212f into solana-labs:master Sep 22, 2020
mergify bot pushed a commit that referenced this pull request Sep 22, 2020
(cherry picked from commit e1a212f)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	core/Cargo.toml
#	transaction-status/Cargo.toml
@mergify mergify bot mentioned this pull request Sep 22, 2020
mergify bot pushed a commit that referenced this pull request Sep 22, 2020
(cherry picked from commit e1a212f)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	core/Cargo.toml
@mergify mergify bot mentioned this pull request Sep 22, 2020
mergify bot added a commit that referenced this pull request Sep 23, 2020
* Bump spl-token (#12395)

(cherry picked from commit e1a212f)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	core/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
mergify bot added a commit that referenced this pull request Sep 23, 2020
* Bump spl-token (#12395)

(cherry picked from commit e1a212f)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	core/Cargo.toml
#	transaction-status/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
@CriesofCarrots CriesofCarrots deleted the bump-token branch September 24, 2020 19:11
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.

Update TokenInstruction variants
2 participants