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

issue #10831: added --with-memo option to all cli commands that submit (bp #16291) #16386

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2021

This is an automatic backport of pull request #16291 done by Mergify.

Cherry-pick of 364af3a has failed:

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

You are currently cherry-picking commit 364af3a3e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   clap-utils/src/lib.rs
	new file:   clap-utils/src/memo.rs
	modified:   cli/src/cli.rs
	modified:   cli/src/lib.rs
	new file:   cli/src/memo.rs
	modified:   cli/src/nonce.rs
	modified:   cli/src/stake.rs
	modified:   cli/src/vote.rs
	modified:   cli/tests/nonce.rs
	modified:   cli/tests/stake.rs
	modified:   cli/tests/vote.rs
	modified:   docs/src/developing/programming-model/transactions.md
	modified:   programs/bpf/Cargo.lock
	modified:   transaction-status/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cli-output/Cargo.toml
	both modified:   cli-output/src/display.rs
	both modified:   cli/Cargo.toml
	both modified:   cli/tests/transfer.rs

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 config editor.

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

#16291)

* issue #10831: added --with-memo option to all cli commands that submit
transactions.  Also, improve the block command to show UTF-8 string instead
of integer values for memo program data.

* Fixed tests and changed some syntax according to feedback.

* Use spl_memo id (all versions where applicable) instead of hardcoding id.

* Update Cargo.toml in programs/bpf.

* Update formatting via cargo fmt.

* Update to use spl_memo version 3.0.1, which simplifies package imports

(cherry picked from commit 364af3a)

# Conflicts:
#	cli-output/Cargo.toml
#	cli-output/src/display.rs
#	cli/Cargo.toml
#	cli/tests/transfer.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@CriesofCarrots
Copy link
Contributor

I think this will have to ride the v1.6 train to mainnet-beta, since spl-memo v3.0.1 depends on solana-program v1.6
Unless you know any version tricks I've missed @mvines ?

@mvines
Copy link
Contributor

mvines commented Apr 6, 2021

I think this will have to ride the v1.6 train to mainnet-beta, since spl-memo v3.0.1 depends on solana-program v1.6
Unless you know any version tricks I've missed @mvines ?

1.6 train seems fine. It's just a short solana-install init beta command away

@mergify mergify bot deleted the mergify/bp/v1.5/pr-16291 branch April 6, 2021 01:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants