extract pinocchio-cpi crate

Cargo.toml

@@ -4,6 +4,7 @@ members = [
     "programs/associated-token-account",
     "programs/system",
     "programs/token",
+    "sdk/cpi",
     "sdk/log/crate",
     "sdk/log/macro",
     "sdk/pinocchio",
@@ -18,10 +19,12 @@ repository = "https://github.com/anza-xyz/pinocchio"
 [workspace.dependencies]
 five8_const = "0.1.3"
 pinocchio = { path = "sdk/pinocchio", version = "0.7" }
+pinocchio-cpi = { path = "sdk/cpi", version = "0.1.0" }
 pinocchio-pubkey = { path = "sdk/pubkey", version = "0.2" }
 pinocchio-log-macro = { version = "0.3", path = "sdk/log/macro" }
 quote = "1.0"
 regex = "1"
+solana-define-syscall = "2.2"
 syn = "1.0"
 
 [workspace.metadata.cli]
@@ -32,3 +35,9 @@ build = "1.81.0"
 format = "nightly-2024-08-08"
 lint = "nightly-2024-08-08"
 test = "1.81.0"
+
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(target_os, values("solana"))',
+    'cfg(target_feature, values("static-syscalls"))',
+] }

programs/associated-token-account/Cargo.toml

@@ -12,4 +12,5 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
+pinocchio-cpi = { workspace = true }
 pinocchio-pubkey = { workspace = true }

programs/associated-token-account/src/instructions/create.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Creates an associated token account for the given wallet address and token mint.

programs/associated-token-account/src/instructions/create_idempotent.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Creates an associated token account for the given wallet address and

programs/associated-token-account/src/instructions/recover_nested.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Transfers from and closes a nested associated token account: an

programs/system/Cargo.toml

@@ -12,4 +12,5 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
+pinocchio-cpi = { workspace = true }
 pinocchio-pubkey = { workspace = true }

programs/system/src/instructions/advance_nonce_account.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Consumes a stored nonce, replacing it with a successor.

programs/system/src/instructions/allocate.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Allocate space in a (possibly new) account without funding.

programs/system/src/instructions/allocate_with_seed.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Allocate space for and assign an account at an address derived

programs/system/src/instructions/assign.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Assign account to a program

programs/system/src/instructions/assign_with_seed.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Assign account to a program based on a seed.

programs/system/src/instructions/authorize_nonce_account.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Change the entity authorized to execute nonce instructions on the account.

programs/system/src/instructions/create_account.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Create a new account.

programs/system/src/instructions/create_account_with_seed.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Create a new account at an address derived from a base pubkey and a seed.

programs/system/src/instructions/initialize_nonce_account.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Drive state of Uninitialized nonce account to Initialized, setting the nonce value.

programs/system/src/instructions/transfer.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Transfer lamports.

programs/system/src/instructions/transfer_with_seed.rs

@@ -1,9 +1,11 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    pubkey::Pubkey,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        pubkey::Pubkey,
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Transfer lamports from a derived address.

programs/system/src/instructions/update_nonce_account.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// One-time idempotent upgrade of legacy nonce versions in order to bump

programs/system/src/instructions/withdraw_nonce_account.rs

@@ -1,8 +1,10 @@
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 /// Withdraw funds from a nonce account.

programs/token/Cargo.toml

@@ -12,4 +12,5 @@ crate-type = ["rlib"]
 
 [dependencies]
 pinocchio = { workspace = true }
+pinocchio-cpi = { workspace = true }
 pinocchio-pubkey = { workspace = true }

programs/token/src/instructions/approve.rs

@@ -1,10 +1,12 @@
 use core::slice::from_raw_parts;
 
-use pinocchio::{
-    account_info::AccountInfo,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use {
+    pinocchio::{
+        account_info::AccountInfo,
+        instruction::{AccountMeta, Instruction, Signer},
+        ProgramResult,
+    },
+    pinocchio_cpi::invoke_signed,
 };
 
 use crate::{write_bytes, UNINIT_BYTE};