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

Update spl-token to v2.0 (bp #11884)#11896

Merged
mergify[bot] merged 5 commits intov1.2from
mergify/bp/v1.2/pr-11884
Aug 29, 2020
Merged

Update spl-token to v2.0 (bp #11884)#11896
mergify[bot] merged 5 commits intov1.2from
mergify/bp/v1.2/pr-11884

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 28, 2020

This is an automated backport of pull request #11884 done by Mergify

Cherry-pick of 76be36c has failed:

On branch mergify/bp/v1.2/pr-11884
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit 76be36c9c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   account-decoder/src/parse_account_data.rs
	modified:   account-decoder/src/parse_token.rs
	modified:   core/src/rpc_subscriptions.rs
	modified:   transaction-status/src/parse_instruction.rs
	modified:   transaction-status/src/parse_token.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   account-decoder/Cargo.toml
	both modified:   core/Cargo.toml
	both modified:   core/src/rpc.rs
	both modified:   transaction-status/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 28, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 28, 2020

automerge label removed due to a CI failure

Tyera Eulberg and others added 4 commits August 28, 2020 17:32
    * Update account-decoder to spl-token v2.0

    * Update transaction-status to spl-token v2.0

    * Update rpc to spl-token v2.0

    * Update getTokenSupply to pull from Mint directly

    * Fixup to spl-token v2.0.1

    (cherry picked from commit 76be36c)

    # Conflicts:
    #       Cargo.lock
    #       account-decoder/Cargo.toml
    #       core/Cargo.toml
    #       core/src/rpc.rs
    #       transaction-status/Cargo.toml
* Add failing test

* Use deserialize_from to enable limit
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.2/pr-11884 branch from 1fd2501 to 5ca9e75 Compare August 28, 2020 23:56
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 28, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 28, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 28, 2020
* chore(deps): bump bincode from 1.2.1 to 1.3.1

Bumps [bincode](https://github.com/servo/bincode) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/servo/bincode/releases)
- [Commits](https://github.com/servo/bincode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [auto-commit] Update all Cargo lock files

* Switch from deprecated method

* Add options to maintain behavior with bincode::options()

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <dependabot-buildkite@noreply.solana.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.2/pr-11884 branch from 5ca9e75 to eacd6c6 Compare August 29, 2020 00:02
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 29, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 29, 2020

Codecov Report

Merging #11896 into v1.2 will increase coverage by 0.0%.
The diff coverage is 95.4%.

@@           Coverage Diff           @@
##            v1.2   #11896    +/-   ##
=======================================
  Coverage   81.9%    82.0%            
=======================================
  Files        320      321     +1     
  Lines      76608    77025   +417     
=======================================
+ Hits       62811    63183   +372     
- Misses     13797    13842    +45     

@mergify mergify Bot merged commit 5828d2c into v1.2 Aug 29, 2020
@mergify mergify Bot deleted the mergify/bp/v1.2/pr-11884 branch August 29, 2020 01:27
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.

1 participant