Use solana version in templates

template/clients/rust/clients/rust/Cargo.toml.njk

@@ -15,10 +15,10 @@ num-derive = "^0.3"
 num-traits = "^0.2"
 serde = { version = "^1.0", features = ["derive"], optional = true }
 serde_with = { version = "^3.0", optional = true }
-solana-program = "~1.18"
+solana-program = "~{{ solanaVersion }}"
 thiserror = "^1.0"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-solana-program-test = "~1.18"
-solana-sdk = "~1.18"
+solana-program-test = "~{{ solanaVersion }}"
+solana-sdk = "~{{ solanaVersion }}"

template/programs/counter-shank/program/Cargo.toml.njk

@@ -18,5 +18,5 @@ borsh = "^0.10"
 shank = "^0.4.2"
 num-derive = "^0.3"
 num-traits = "^0.2"
-solana-program = "~1.18"
+solana-program = "~{{ solanaVersion }}"
 thiserror = "^1.0"

utils/objectHelpers.ts

@@ -1,5 +1,5 @@
 const isObject = (val: unknown): val is object =>
-  val && typeof val === "object";
+  !!val && typeof val === "object";
 
 const mergeArrayWithDedupe = (a: any[], b: any[]) =>
   Array.from(new Set([...a, ...b]));
@@ -7,14 +7,19 @@ const mergeArrayWithDedupe = (a: any[], b: any[]) =>
 /** Recursively merge the content of the new object to the existing one. */
 export function deepMerge(target: object, obj: object): object {
   for (const key of Object.keys(obj)) {
+    // @ts-ignore
     const oldVal = target[key];
+    // @ts-ignore
     const newVal = obj[key];
 
     if (Array.isArray(oldVal) && Array.isArray(newVal)) {
+      // @ts-ignore
       target[key] = mergeArrayWithDedupe(oldVal, newVal);
     } else if (isObject(oldVal) && isObject(newVal)) {
+      // @ts-ignore
       target[key] = deepMerge(oldVal, newVal);
     } else {
+      // @ts-ignore
       target[key] = newVal;
     }
   }
@@ -33,12 +38,16 @@ export function sortDependencies<T extends object = object>(packageJson: T): T {
   ];
 
   for (const depType of depTypes) {
+    // @ts-ignore
     if (packageJson[depType]) {
+      // @ts-ignore
       sorted[depType] = {};
 
+      // @ts-ignore
       Object.keys(packageJson[depType])
         .sort()
         .forEach((name) => {
+          // @ts-ignore
           sorted[depType][name] = packageJson[depType][name];
         });
     }