From b3c8e31e0948d1e625e3348445f25eaf9d0ce33e Mon Sep 17 00:00:00 2001
From: chizor iwuh <thisischizor@gmail.com>
Date: Sat, 2 Nov 2024 23:56:40 +0100
Subject: [PATCH] create-token/steel - use workspaces, avoid conflicts

---
 Cargo.lock                                   | 209 ++++---------------
 Cargo.toml                                   |   1 -
 tokens/create-token/steel/Cargo.toml         |   3 +
 tokens/create-token/steel/program/Cargo.toml |   4 +-
 tokens/create-token/steel/program/src/lib.rs |   1 -
 5 files changed, 47 insertions(+), 171 deletions(-)
 create mode 100644 tokens/create-token/steel/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index 182187cd..f54b45b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15,7 +15,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -219,7 +219,7 @@ dependencies = [
  "borsh 0.10.3",
  "bytemuck",
  "getrandom 0.2.15",
- "solana-program 1.18.17",
+ "solana-program",
  "thiserror",
 ]
 
@@ -451,12 +451,6 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -744,7 +738,7 @@ dependencies = [
 name = "checking-accounts-program"
 version = "0.1.0"
 dependencies = [
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -771,7 +765,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -813,7 +807,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "shank",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -821,7 +815,7 @@ name = "counter-solana-native"
 version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -844,7 +838,7 @@ dependencies = [
 name = "create-account-program"
 version = "0.1.0"
 dependencies = [
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -854,19 +848,6 @@ dependencies = [
  "anchor-lang",
 ]
 
-[[package]]
-name = "create-token-steel-program"
-version = "0.1.0"
-dependencies = [
- "borsh 1.5.1",
- "bytemuck",
- "mpl-token-metadata",
- "num_enum 0.7.3",
- "solana-program 1.18.17",
- "spl-token",
- "steel 2.1.1",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -1173,7 +1154,7 @@ dependencies = [
 name = "hello-solana-program"
 version = "0.1.0"
 dependencies = [
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1426,19 +1407,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "mpl-token-metadata"
-version = "4.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf0f61b553e424a6234af1268456972ee66c2222e1da89079242251fa7479e5"
-dependencies = [
- "borsh 0.10.3",
- "num-derive 0.3.3",
- "num-traits",
- "solana-program 1.18.17",
- "thiserror",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -1603,7 +1571,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1706,7 +1674,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1715,7 +1683,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1724,7 +1692,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1862,7 +1830,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -1916,7 +1884,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -2234,59 +2202,13 @@ dependencies = [
  "sha3 0.10.8",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
- "solana-sdk-macro 1.18.17",
+ "solana-sdk-macro",
  "thiserror",
  "tiny-bip39",
  "wasm-bindgen",
  "zeroize",
 ]
 
-[[package]]
-name = "solana-program"
-version = "2.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2625a23c3813b620141ee447819b08d1b9a5f1c69a309754834e3f35798a21fb"
-dependencies = [
- "ark-bn254",
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "base64 0.22.1",
- "bincode",
- "bitflags",
- "blake3",
- "borsh 0.10.3",
- "borsh 1.5.1",
- "bs58 0.5.1",
- "bv",
- "bytemuck",
- "bytemuck_derive",
- "console_error_panic_hook",
- "console_log",
- "curve25519-dalek",
- "getrandom 0.2.15",
- "js-sys",
- "lazy_static",
- "libsecp256k1",
- "log",
- "memoffset",
- "num-bigint",
- "num-derive 0.4.2",
- "num-traits",
- "parking_lot",
- "rand 0.8.5",
- "rustc_version",
- "rustversion",
- "serde",
- "serde_bytes",
- "serde_derive",
- "sha2 0.10.8",
- "sha3 0.10.8",
- "solana-sdk-macro 2.0.14",
- "thiserror",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "solana-sdk"
 version = "1.18.17"
@@ -2335,8 +2257,8 @@ dependencies = [
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
- "solana-program 1.18.17",
- "solana-sdk-macro 1.18.17",
+ "solana-program",
+ "solana-sdk-macro",
  "thiserror",
  "uriparse",
  "wasm-bindgen",
@@ -2355,19 +2277,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "solana-sdk-macro"
-version = "2.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93a5a1eabc890415d326707afe62cd7a2009236e8d899c1519566fc8f7e3977b"
-dependencies = [
- "bs58 0.5.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.72",
-]
-
 [[package]]
 name = "solana-security-txt"
 version = "1.1.1"
@@ -2396,7 +2305,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha3 0.9.1",
- "solana-program 1.18.17",
+ "solana-program",
  "solana-sdk",
  "subtle",
  "thiserror",
@@ -2413,7 +2322,7 @@ dependencies = [
  "borsh 0.10.3",
  "num-derive 0.4.2",
  "num-traits",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-token",
  "spl-token-2022 1.0.0",
  "thiserror",
@@ -2426,7 +2335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator-derive",
 ]
 
@@ -2460,7 +2369,7 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
 dependencies = [
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -2469,7 +2378,7 @@ version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a49f49f95f2d02111ded31696ab38a081fab623d4c76bd4cb074286db4560836"
 dependencies = [
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
@@ -2480,7 +2389,7 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079"
 dependencies = [
  "borsh 0.10.3",
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "solana-zk-token-sdk",
  "spl-program-error 0.3.0",
 ]
@@ -2493,7 +2402,7 @@ checksum = "af92f74cd3b0fdfda59fef4b571a92123e4df0f67cc43f73163975d31118ef82"
 dependencies = [
  "num-derive 0.3.3",
  "num-traits",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-program-error-derive 0.2.0",
  "thiserror",
 ]
@@ -2506,7 +2415,7 @@ checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c"
 dependencies = [
  "num-derive 0.4.2",
  "num-traits",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-program-error-derive 0.3.2",
  "thiserror",
 ]
@@ -2541,7 +2450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82149a5a06b5f158d03904066375eaf0c8a2422557cc3d5a25d277260d9a3b16"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-program-error 0.2.0",
  "spl-type-length-value 0.2.0",
@@ -2554,7 +2463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2572,7 +2481,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_enum 0.7.3",
- "solana-program 1.18.17",
+ "solana-program",
  "thiserror",
 ]
 
@@ -2587,7 +2496,7 @@ dependencies = [
  "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
- "solana-program 1.18.17",
+ "solana-program",
  "solana-zk-token-sdk",
  "spl-memo 3.0.1",
  "spl-token",
@@ -2606,7 +2515,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_enum 0.7.3",
- "solana-program 1.18.17",
+ "solana-program",
  "solana-security-txt",
  "solana-zk-token-sdk",
  "spl-memo 4.0.4",
@@ -2626,7 +2535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2639,7 +2548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f"
 dependencies = [
  "borsh 0.10.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2657,7 +2566,7 @@ dependencies = [
  "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-tlv-account-resolution 0.2.0",
  "spl-type-length-value 0.2.0",
@@ -2672,7 +2581,7 @@ checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259"
 dependencies = [
  "arrayref",
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2687,7 +2596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1d085f426b33b8365fb98383d1b8b3925e21bdfe579c851ceaa7f511dbec191"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-program-error 0.2.0",
 ]
@@ -2699,46 +2608,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac"
 dependencies = [
  "bytemuck",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
 ]
 
-[[package]]
-name = "steel"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88c610ca9fd5e4e51bdb6e9964114133a42f006713fe38aff37266fac91e1be"
-dependencies = [
- "bytemuck",
- "num_enum 0.7.3",
- "solana-program 1.18.17",
- "thiserror",
-]
-
-[[package]]
-name = "steel"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ca3cc310b7b71ce7944af64fb4fdaa5d0c2848ac79616d75e401913b6f781"
-dependencies = [
- "bytemuck",
- "num_enum 0.7.3",
- "solana-program 1.18.17",
- "spl-associated-token-account",
- "spl-token",
- "thiserror",
-]
-
-[[package]]
-name = "steel-hello-solana"
-version = "0.1.0"
-dependencies = [
- "solana-program 2.0.14",
- "steel 1.3.0",
-]
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2854,7 +2729,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2865,7 +2740,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2876,7 +2751,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2887,7 +2762,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2898,7 +2773,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.10.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2981,7 +2856,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program 1.18.17",
+ "solana-program",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index fda15222..c13e8b8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,6 @@ members = [
     "basics/repository-layout/anchor/programs/*",
     "basics/transfer-sol/native/program",
     "basics/transfer-sol/anchor/programs/*",
-    "tokens/create-token/steel/program",
     "tokens/token-2022/mint-close-authority/native/program",
     "tokens/token-2022/non-transferable/native/program",
     "tokens/token-2022/default-account-state/native/program",
diff --git a/tokens/create-token/steel/Cargo.toml b/tokens/create-token/steel/Cargo.toml
new file mode 100644
index 00000000..39fc8ab6
--- /dev/null
+++ b/tokens/create-token/steel/Cargo.toml
@@ -0,0 +1,3 @@
+[workspace]
+members = ["program"]
+resolver = "2"
diff --git a/tokens/create-token/steel/program/Cargo.toml b/tokens/create-token/steel/program/Cargo.toml
index e6d67baa..a34e9531 100644
--- a/tokens/create-token/steel/program/Cargo.toml
+++ b/tokens/create-token/steel/program/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-solana-program = "=1.18.17"
-steel = {version = "2.0", features = ["spl"]}
+solana-program = "1.18.17"
+steel = {version = "2.1", features = ["spl"]}
 bytemuck = "1.4"
 num_enum = "0.7"
 borsh = "1.5.1"
diff --git a/tokens/create-token/steel/program/src/lib.rs b/tokens/create-token/steel/program/src/lib.rs
index dee61d2e..eb3406cc 100644
--- a/tokens/create-token/steel/program/src/lib.rs
+++ b/tokens/create-token/steel/program/src/lib.rs
@@ -33,7 +33,6 @@ fn process_instruction(
 
     // First create the account for the Mint
     //
-
     msg!("Creating mint account...");
     msg!("Mint: {}", mint_account.key);
     invoke(