p-memo: Replace v3 implementation with v4 (#381)

* Move p-memo implementation

* Remove not needed

* Add interface dependency

* Update test return values

* Remove pinocchio references

* Fix merge

Author: febo

.github/workflows/main.yml

@@ -8,9 +8,9 @@ on:
 
 env:
   JS_PACKAGES: "['clients-js', 'clients-js-legacy']"
-  SBPF_PROGRAM_PACKAGES: "['program', 'pinocchio']"
-  RUST_PACKAGES: "['clients-rust', 'interface', 'pinocchio', 'program']"
-  WASM_PACKAGES: "['clients-rust', 'interface', 'pinocchio', 'program']"
+  SBPF_PROGRAM_PACKAGES: "['program']"
+  RUST_PACKAGES: "['clients-rust', 'interface', 'program']"
+  WASM_PACKAGES: "['clients-rust', 'interface', 'program']"
 
 jobs:
   set_env:

.github/workflows/publish-rust.yml

@@ -11,7 +11,6 @@ on:
         options:
           - clients/rust
           - interface
-          - pinocchio
           - program
       level:
         description: Level
@@ -73,7 +72,7 @@ jobs:
     needs: set_env
     uses: solana-program/actions/.github/workflows/publish-rust.yml@main
     with:
-      sbpf-program-packages: "program pinocchio"
+      sbpf-program-packages: "program"
       solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
       clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
       rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["clients/rust", "interface", "pinocchio", "program"]
+members = ["clients/rust", "interface", "program"]
 
 [workspace.lints.rust.unexpected_cfgs]
 level = "warn"

Cargo.toml

@@ -1,36 +1,31 @@
 [package]
-name = "spl-memo"
-version = "7.0.0"
-description = "Solana Program Library Memo"
+name = "pinocchio-memo-program"
+version = "1.0.0"
+description = "A pinocchio-based Memo program"
 authors = ["Anza Maintainers <maintainers@anza.xyz>"]
 repository = "https://github.com/solana-program/memo"
 license = "Apache-2.0"
 edition = "2021"
+readme = "./README.md"
 
-[features]
-no-entrypoint = []
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.solana]
+program-id = "Memo4c2pN8afCj432Lb7RMVKi9PbQnnW7ewFFaV3oAH"
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = ['cfg(target_os, values("solana"))']
 
 [dependencies]
-solana-account-info = "3.1.1"
-solana-instruction = "3.4.0"
-solana-msg = "3.1.0"
-solana-program-entrypoint = "3.1.1"
-solana-program-error = "3.0.1"
-solana-pubkey = "4.2.0"
-spl-memo-interface = { version = "2.0.0", path = "../interface" }
+pinocchio = { version = "0.11", default-features = false }
+solana-program-log = "1.2"
 
 [dev-dependencies]
-mollusk-svm = "0.12.0"
+mollusk-svm = "0.12"
 solana-account = "3.4.0"
-
-[lib]
-crate-type = ["cdylib", "lib"]
-
-[lints]
-workspace = true
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[package.metadata.solana]
-program-id = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"
+solana-instruction = "3.4.0"
+solana-program-error = "3.0.1"
+solana-pubkey = "4.2.0"
+spl-memo-interface = { path = "../interface" }