transfer-tokens/steel - add api

solana-developers · Nov 8, 2024 · 67540bc · 67540bc
1 parent 8332368
commit 67540bc
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 16 deletions.
diff --git a/tokens/transfer-tokens/steel/Cargo.toml b/tokens/transfer-tokens/steel/Cargo.toml
@@ -1,3 +1,13 @@
 [workspace]
-members = ["program"]
+members = ["api","program"]
 resolver = "2"
+
+[workspace.dependencies]
+solana-program = "1.18.17"
+steel = {version = "2.1", features = ["spl"]}
+bytemuck = "1.4"
+num_enum = "0.7"
+borsh = "1.5.1"
+spl-token = { version = "4.0.0", features = [ "no-entrypoint" ] }
+spl-associated-token-account = { version = "3.0.4", features = [ "no-entrypoint" ] }
+mpl-token-metadata = { version = "4.1.2" }
diff --git a/tokens/transfer-tokens/steel/api/Cargo.toml b/tokens/transfer-tokens/steel/api/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "transfer-tokens-steel-api"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+
+[dependencies]
+solana-program.workspace = true
+steel.workspace = true
+bytemuck.workspace = true
+num_enum.workspace = true
+borsh.workspace = true
+spl-token.workspace = true
+spl-associated-token-account.workspace = true
+mpl-token-metadata.workspace = true
diff --git a/.../steel/program/src/instructions/create.rs → ...okens/steel/api/src/instruction/create.rs b/.../steel/program/src/instructions/create.rs → ...okens/steel/api/src/instruction/create.rs
diff --git a/...teel/program/src/instructions/mint_nft.rs → ...ens/steel/api/src/instruction/mint_nft.rs b/...teel/program/src/instructions/mint_nft.rs → ...ens/steel/api/src/instruction/mint_nft.rs
diff --git a/...teel/program/src/instructions/mint_spl.rs → ...ens/steel/api/src/instruction/mint_spl.rs b/...teel/program/src/instructions/mint_spl.rs → ...ens/steel/api/src/instruction/mint_spl.rs
diff --git a/...ens/steel/program/src/instructions/mod.rs → ...r-tokens/steel/api/src/instruction/mod.rs b/...ens/steel/program/src/instructions/mod.rs → ...r-tokens/steel/api/src/instruction/mod.rs
diff --git a/...teel/program/src/instructions/transfer.rs → ...ens/steel/api/src/instruction/transfer.rs b/...teel/program/src/instructions/transfer.rs → ...ens/steel/api/src/instruction/transfer.rs
diff --git a/tokens/transfer-tokens/steel/api/src/lib.rs b/tokens/transfer-tokens/steel/api/src/lib.rs
@@ -0,0 +1,12 @@
+pub mod instruction;
+pub mod macros;
+
+use instruction::*;
+use steel::*;
+
+pub mod prelude {
+    pub use crate::instruction::*;
+}
+
+// TODO Set program id
+declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35");
diff --git a/...ns/steel/program/src/borsh_instruction.rs → ...s/transfer-tokens/steel/api/src/macros.rs b/...ns/steel/program/src/borsh_instruction.rs → ...s/transfer-tokens/steel/api/src/macros.rs
@@ -10,7 +10,6 @@ macro_rules! borsh_instruction {
             }
         }
 
-        #[allow(dead_code)]
         // adds discriminator to the instruction data, helpful with cpis etc.
         impl $struct_name {
             pub fn to_bytes(&self) -> Result<Vec<u8>, solana_program::program_error::ProgramError> {

diff --git a/tokens/transfer-tokens/steel/program/Cargo.toml b/tokens/transfer-tokens/steel/program/Cargo.toml
@@ -7,11 +7,5 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-solana-program = "1.18.17"
 steel = {version = "2.1", features = ["spl"]}
-bytemuck = "1.4"
-num_enum = "0.7"
-borsh = "1.5.1"
-spl-token = { version = "4.0.0", features = [ "no-entrypoint" ] }
-spl-associated-token-account = { version = "3.0.4", features = [ "no-entrypoint" ] }
-mpl-token-metadata = { version = "4.1.2" }
+transfer-tokens-steel-api = {path = "../api"}
diff --git a/tokens/transfer-tokens/steel/program/src/lib.rs b/tokens/transfer-tokens/steel/program/src/lib.rs
@@ -1,10 +1,5 @@
-mod borsh_instruction;
-mod instructions;
-
-use instructions::*;
 use steel::*;
-
-declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35");
+use transfer_tokens_steel_api::prelude::*;
 
 entrypoint!(process_instruction);
 
@@ -13,7 +8,7 @@ pub fn process_instruction(
     accounts: &[AccountInfo],
     data: &[u8],
 ) -> ProgramResult {
-    let (ix, data) = parse_instruction(&crate::ID, program_id, data)?;
+    let (ix, data) = parse_instruction(&transfer_tokens_steel_api::ID, program_id, data)?;
 
     match ix {
         SteelInstruction::Create => Create::process(accounts, data)?,