0cf1894ede
* issue #10831: added --with-memo option to all cli commands that submit (#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 364af3a3e0)
# Conflicts:
# cli-output/Cargo.toml
# cli/Cargo.toml
* Fix conflicts
Co-authored-by: bji <bryan@ischo.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
23 lines
620 B
Rust
23 lines
620 B
Rust
use solana_sdk::instruction::Instruction;
|
|
use solana_sdk::pubkey::Pubkey;
|
|
use spl_memo::id;
|
|
|
|
pub trait WithMemo {
|
|
fn with_memo<T: AsRef<str>>(self, memo: Option<T>) -> Self;
|
|
}
|
|
|
|
impl WithMemo for Vec<Instruction> {
|
|
fn with_memo<T: AsRef<str>>(mut self, memo: Option<T>) -> Self {
|
|
if let Some(memo) = &memo {
|
|
let memo = memo.as_ref();
|
|
let memo_ix = Instruction {
|
|
program_id: Pubkey::new(&id().to_bytes()),
|
|
accounts: vec![],
|
|
data: memo.as_bytes().to_vec(),
|
|
};
|
|
self.push(memo_ix);
|
|
}
|
|
self
|
|
}
|
|
}
|