From 42b1f9b052819cd560f88726dbe10f65c24f39c7 Mon Sep 17 00:00:00 2001
From: adpthegreat <adpthegreatanddefiant@gmail.com>
Date: Mon, 25 Nov 2024 09:28:17 +0100
Subject: [PATCH] feat:fixed strings, updated cargo.lock

---
 Cargo.lock                                    | 169 +++++++++++++-----
 .../ts-programs/src/close_account_program.ts  |   8 +-
 2 files changed, 131 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f54b45b7b..c8e52a0b1 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",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -219,7 +219,7 @@ dependencies = [
  "borsh 0.10.3",
  "bytemuck",
  "getrandom 0.2.15",
- "solana-program",
+ "solana-program 1.18.17",
  "thiserror",
 ]
 
@@ -451,6 +451,12 @@ 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"
@@ -738,7 +744,7 @@ dependencies = [
 name = "checking-accounts-program"
 version = "0.1.0"
 dependencies = [
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -765,7 +771,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -807,7 +813,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "shank",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -815,7 +821,7 @@ name = "counter-solana-native"
 version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -838,7 +844,7 @@ dependencies = [
 name = "create-account-program"
 version = "0.1.0"
 dependencies = [
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1154,7 +1160,7 @@ dependencies = [
 name = "hello-solana-program"
 version = "0.1.0"
 dependencies = [
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1571,7 +1577,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1674,7 +1680,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1683,7 +1689,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1692,7 +1698,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1830,7 +1836,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -1884,7 +1890,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -2202,13 +2208,59 @@ dependencies = [
  "sha3 0.10.8",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
- "solana-sdk-macro",
+ "solana-sdk-macro 1.18.17",
  "thiserror",
  "tiny-bip39",
  "wasm-bindgen",
  "zeroize",
 ]
 
+[[package]]
+name = "solana-program"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "676cb677930c71e989df31f34640e29c927f0bbc07ce85a1598ff549ef85cb5d"
+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.17",
+ "thiserror",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "solana-sdk"
 version = "1.18.17"
@@ -2257,8 +2309,8 @@ dependencies = [
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
- "solana-program",
- "solana-sdk-macro",
+ "solana-program 1.18.17",
+ "solana-sdk-macro 1.18.17",
  "thiserror",
  "uriparse",
  "wasm-bindgen",
@@ -2277,6 +2329,19 @@ dependencies = [
  "syn 2.0.72",
 ]
 
+[[package]]
+name = "solana-sdk-macro"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0768aa8d51ef38e559784ccd62f0523f3e6ed9ba8903f49fb1d961ee8aff4f3e"
+dependencies = [
+ "bs58 0.5.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "solana-security-txt"
 version = "1.1.1"
@@ -2305,7 +2370,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha3 0.9.1",
- "solana-program",
+ "solana-program 1.18.17",
  "solana-sdk",
  "subtle",
  "thiserror",
@@ -2322,7 +2387,7 @@ dependencies = [
  "borsh 0.10.3",
  "num-derive 0.4.2",
  "num-traits",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-token",
  "spl-token-2022 1.0.0",
  "thiserror",
@@ -2335,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator-derive",
 ]
 
@@ -2369,7 +2434,7 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
 dependencies = [
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -2378,7 +2443,7 @@ version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a49f49f95f2d02111ded31696ab38a081fab623d4c76bd4cb074286db4560836"
 dependencies = [
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
@@ -2389,7 +2454,7 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079"
 dependencies = [
  "borsh 0.10.3",
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "solana-zk-token-sdk",
  "spl-program-error 0.3.0",
 ]
@@ -2402,7 +2467,7 @@ checksum = "af92f74cd3b0fdfda59fef4b571a92123e4df0f67cc43f73163975d31118ef82"
 dependencies = [
  "num-derive 0.3.3",
  "num-traits",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-program-error-derive 0.2.0",
  "thiserror",
 ]
@@ -2415,7 +2480,7 @@ checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c"
 dependencies = [
  "num-derive 0.4.2",
  "num-traits",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-program-error-derive 0.3.2",
  "thiserror",
 ]
@@ -2450,7 +2515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82149a5a06b5f158d03904066375eaf0c8a2422557cc3d5a25d277260d9a3b16"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-program-error 0.2.0",
  "spl-type-length-value 0.2.0",
@@ -2463,7 +2528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2481,7 +2546,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_enum 0.7.3",
- "solana-program",
+ "solana-program 1.18.17",
  "thiserror",
 ]
 
@@ -2496,7 +2561,7 @@ dependencies = [
  "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
- "solana-program",
+ "solana-program 1.18.17",
  "solana-zk-token-sdk",
  "spl-memo 3.0.1",
  "spl-token",
@@ -2515,7 +2580,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "num_enum 0.7.3",
- "solana-program",
+ "solana-program 1.18.17",
  "solana-security-txt",
  "solana-zk-token-sdk",
  "spl-memo 4.0.4",
@@ -2535,7 +2600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2548,7 +2613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f"
 dependencies = [
  "borsh 0.10.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2566,7 +2631,7 @@ dependencies = [
  "num-derive 0.3.3",
  "num-traits",
  "num_enum 0.6.1",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-tlv-account-resolution 0.2.0",
  "spl-type-length-value 0.2.0",
@@ -2581,7 +2646,7 @@ checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259"
 dependencies = [
  "arrayref",
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error 0.3.0",
@@ -2596,7 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1d085f426b33b8365fb98383d1b8b3925e21bdfe579c851ceaa7f511dbec191"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-discriminator",
  "spl-program-error 0.2.0",
 ]
@@ -2608,12 +2673,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac"
 dependencies = [
  "bytemuck",
- "solana-program",
+ "solana-program 1.18.17",
  "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-hello-solana"
+version = "0.1.0"
+dependencies = [
+ "solana-program 2.0.17",
+ "steel",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2729,7 +2814,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2740,7 +2825,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2751,7 +2836,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2762,7 +2847,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2773,7 +2858,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.10.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
  "spl-associated-token-account",
  "spl-token-2022 0.7.0",
 ]
@@ -2856,7 +2941,7 @@ version = "0.1.0"
 dependencies = [
  "borsh 0.9.3",
  "borsh-derive 0.9.3",
- "solana-program",
+ "solana-program 1.18.17",
 ]
 
 [[package]]
diff --git a/basics/close-account/poseidon/close_account_program/ts-programs/src/close_account_program.ts b/basics/close-account/poseidon/close_account_program/ts-programs/src/close_account_program.ts
index ac15b9297..e6f92743d 100644
--- a/basics/close-account/poseidon/close_account_program/ts-programs/src/close_account_program.ts
+++ b/basics/close-account/poseidon/close_account_program/ts-programs/src/close_account_program.ts
@@ -1,10 +1,10 @@
-import { Account, String as PoseidonString, Pubkey, Result, Signer, u8 } from '@solanaturbine/poseidon';
+import { Account, String, Pubkey, Result, Signer, u8 } from '@solanaturbine/poseidon';
 
 export default class CloseAccount {
   static PROGRAM_ID = new Pubkey('AtUc6zMfozxrQoK4PbDUnd5daS86XCPuT2og1293P5XXo');
 
-  createUser(user: Signer, userState: UserState, name: PoseidonString<50>): Result {
-    userState.derive(['USER', user.key]).init();
+  createUser(user: Signer, userState: UserState, name: String<50>): Result {
+    userState.derive(['USER', user.key]).init(user);
 
     userState.userBump = userState.getBump();
 
@@ -19,6 +19,6 @@ export default class CloseAccount {
 
 export interface UserState extends Account {
   userBump: u8;
-  name: PoseidonString<50>;
+  name: String<50>;
   user: Pubkey;
 }