program: extract the rest of the offchain API

Author: buffalojoec

Cargo.lock

@@ -1,10 +1,7 @@
 //! Program instruction helpers.
 
 use {
-    crate::{
-        id,
-        state::{ConfigKeys, ConfigState},
-    },
+    crate::{ConfigKeys, ShortVec, ID},
     bincode::serialized_size,
     solana_program::{
         instruction::{AccountMeta, Instruction},
@@ -13,10 +10,21 @@ use {
     },
 };
 
+/// Trait defining config state to be stored at the end of the account data.
+pub trait ConfigState: serde::Serialize + Default {
+    /// Maximum space that the serialized representation will require
+    fn max_space() -> u64;
+}
+
 fn initialize_account<T: ConfigState>(config_pubkey: &Pubkey) -> Instruction {
     let account_metas = vec![AccountMeta::new(*config_pubkey, true)];
-    let account_data = (ConfigKeys { keys: vec![] }, T::default());
-    Instruction::new_with_bincode(id(), &account_data, account_metas)
+    let account_data = (
+        ConfigKeys {
+            keys: ShortVec(vec![]),
+        },
+        T::default(),
+    );
+    Instruction::new_with_bincode(ID, &account_data, account_metas)
 }
 
 /// Create a new, empty configuration account
@@ -26,14 +34,19 @@ pub fn create_account<T: ConfigState>(
     lamports: u64,
     keys: Vec<(Pubkey, bool)>,
 ) -> Vec<Instruction> {
-    let space = T::max_space().saturating_add(serialized_size(&ConfigKeys { keys }).unwrap());
+    let space = T::max_space().saturating_add(
+        serialized_size(&ConfigKeys {
+            keys: ShortVec(keys),
+        })
+        .unwrap(),
+    );
     vec![
         system_instruction::create_account(
             from_account_pubkey,
             config_account_pubkey,
             lamports,
             space,
-            &id(),
+            &ID,
         ),
         initialize_account::<T>(config_account_pubkey),
     ]
@@ -52,6 +65,11 @@ pub fn store<T: ConfigState>(
             account_metas.push(AccountMeta::new(*signer_pubkey, true));
         }
     }
-    let account_data = (ConfigKeys { keys }, data);
-    Instruction::new_with_bincode(id(), &account_data, account_metas)
+    let account_data = (
+        ConfigKeys {
+            keys: ShortVec(keys),
+        },
+        data,
+    );
+    Instruction::new_with_bincode(ID, &account_data, account_metas)
 }

program/src/instruction.rs renamed to clients/rust/src/instruction_helpers.rs

@@ -1,6 +1,9 @@
 mod generated;
 mod hooked;
 
+#[cfg(feature = "serde")]
+pub mod instruction_helpers;
+
 pub use {
     generated::{programs::SOLANA_CONFIG_ID as ID, *},
     hooked::*,

clients/rust/src/lib.rs

@@ -26,6 +26,7 @@ thiserror = { workspace = true }
 [dev-dependencies]
 mollusk-svm = { workspace = true, features = ["fuzz-fd"] }
 mollusk-svm-bencher = { workspace = true }
+solana-config-program-client = { path = "../clients/rust", features = ["serde"] }
 solana-sdk = { workspace = true }
 
 [lib]

program/Cargo.toml

@@ -1,10 +1,8 @@
 use {
     mollusk_svm_bencher::Bench,
     serde::Serialize,
-    solana_config_program::{
-        instruction::store,
-        state::{ConfigKeys, ConfigState},
-    },
+    solana_config_program::state::ConfigKeys,
+    solana_config_program_client::instruction_helpers::{store, ConfigState},
     solana_sdk::{
         account::AccountSharedData,
         hash::Hash,

program/benches/setup.rs

@@ -3,7 +3,6 @@
 #[cfg(all(target_os = "solana", feature = "bpf-entrypoint"))]
 mod entrypoint;
 pub mod error;
-pub mod instruction;
 pub mod processor;
 pub mod state;
 

program/src/lib.rs

@@ -5,12 +5,6 @@ use {
     solana_program::{pubkey::Pubkey, short_vec},
 };
 
-/// Trait defining config state to be stored at the end of the account data.
-pub trait ConfigState: serde::Serialize + Default {
-    /// Maximum space that the serialized representation will require
-    fn max_space() -> u64;
-}
-
 /// A collection of keys to be stored in Config account data.
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct ConfigKeys {

program/src/state.rs

@@ -1,14 +1,12 @@
 #![cfg(feature = "test-sbf")]
+#![allow(clippy::arithmetic_side_effects)]
 
 use {
     bincode::serialized_size,
     mollusk_svm::{result::Check, Mollusk},
     serde::{Deserialize, Serialize},
-    solana_config_program::{
-        error::ConfigError,
-        instruction as config_instruction,
-        state::{ConfigKeys, ConfigState},
-    },
+    solana_config_program::{error::ConfigError, state::ConfigKeys},
+    solana_config_program_client::instruction_helpers::{self as config_instruction, ConfigState},
     solana_sdk::{
         account::AccountSharedData,
         instruction::{AccountMeta, Instruction},

program/tests/functional.rs

@@ -16,7 +16,6 @@ const lintArgs = [
   '--all-features',
   '--',
   '--deny=warnings',
-  '--deny=clippy::arithmetic_side_effects',
   ...cliArguments()
 ];