spl-token-minter/steel - use workspace, avoid conflict

solana-developers · Nov 2, 2024 · c244bd8 · c244bd8
1 parent 71f27ba
commit c244bd8
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 380 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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/spl-token-minter/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/spl-token-minter/steel/Cargo.toml b/tokens/spl-token-minter/steel/Cargo.toml
@@ -0,0 +1,3 @@
+[workspace]
+members = ["program"]
+resolver = "2"
diff --git a/tokens/spl-token-minter/steel/package.json b/tokens/spl-token-minter/steel/package.json
@@ -11,19 +11,19 @@
     "@solana/spl-token": "^0.4.9",
     "@solana/web3.js": "^1.95.4",
     "borsh": "^0.7.0",
-    "buffer": "^6.0.3",
-    "fs": "^0.0.1-security"
+    "buffer": "^6.0.3"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^22.8.6",
     "borsh": "0.7.0",
     "chai": "^4.3.4",
-    "mocha": "^9.0.3",
+    "mocha": "^10.8.2",
     "solana-bankrun": "^0.4.0",
     "ts-mocha": "^10.0.0",
-    "typescript": "^4.3.5",
+    "typescript": "^5.6.3",
     "zx": "^8.1.4"
   }
 }
diff --git a/tokens/spl-token-minter/steel/pnpm-lock.yaml b/tokens/spl-token-minter/steel/pnpm-lock.yaml
diff --git a/tokens/spl-token-minter/steel/program/src/borsh_instruction.rs b/tokens/spl-token-minter/steel/program/src/borsh_instruction.rs
@@ -1,4 +1,4 @@
-/// Helper for creating steel instruction with borsh. 
+/// Helper for creating steel instruction with borsh.
 /// Not required, but helpful with typing and CPI
 ///
 #[macro_export]
@@ -9,7 +9,7 @@ macro_rules! borsh_instruction {
                 $discriminator_name::$struct_name as u8
             }
         }
-        
+
         #[allow(dead_code)]
         // adds discriminator to the instruction data, helpful with cpis etc.
         impl $struct_name {

diff --git a/tokens/spl-token-minter/steel/program/src/instructions/mint.rs b/tokens/spl-token-minter/steel/program/src/instructions/mint.rs
@@ -13,7 +13,7 @@ pub struct MintTo {
 
 impl MintTo {
     pub fn process(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
-       let args = MintTo::try_from_bytes(data)?;
+        let args = MintTo::try_from_bytes(data)?;
 
         let [mint_account, mint_authority, associated_token_account, payer, system_program, token_program, associated_token_program] =
             accounts

diff --git a/tokens/spl-token-minter/steel/program/src/lib.rs b/tokens/spl-token-minter/steel/program/src/lib.rs
@@ -13,10 +13,6 @@ pub fn process_instruction(
     accounts: &[AccountInfo],
     data: &[u8],
 ) -> ProgramResult {
-    // Use `crate::ID` for program_id in your program 
-    // 
-    // e.g parse_instruction(&crate::ID, program_id, data)
-    //
     let (ix, data) = parse_instruction(&crate::ID, program_id, data)?;
 
     match ix {

diff --git a/tokens/spl-token-minter/steel/tsconfig.json b/tokens/spl-token-minter/steel/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "types": ["mocha", "chai"],
+    "types": ["mocha", "chai", "node"],
     "typeRoots": ["./node_modules/@types"],
     "lib": ["es2015"],
     "module": "commonjs",