Fixes

README.md

@@ -12,7 +12,7 @@ See the [Program documentation](/programs/solauto/README.md) for more info on th
 - PNPM
 
 ```
-crate install shank-idl
+cargo install shank-cli
 rustup component add rustfmt
 pnpm install -g ts-node
 ```
@@ -64,6 +64,7 @@ pnpm add @haven-fi/solauto-sdk
 
 ```typescript
 import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
 import * as solauto from "@haven-fi/solauto-sdk";
 
 // Create new Solauto client
@@ -73,8 +74,8 @@ const client = solauto.getClient(solauto.LendingPlatform.MARGINFI, {
 });
 
 // Initialize the client
-const supplyMint = new PublicKey(NATIVE_MINT);
-const debtMint = new PublicKey(USDC);
+const supplyMint = NATIVE_MINT;
+const debtMint = new PublicKey(solauto.USDC);
 await client.initializeNewSolautoPosition({
   positionId: 1,
   lpPoolAccount: solauto.getMarginfiAccounts().defaultGroup,
@@ -133,7 +134,6 @@ const statuses = txManager.send(transactionItems);
 ## Rebalancing an existing position
 
 ```typescript
-import { PublicKey } from "@solana/web3.js";
 import * as solauto from "@haven-fi/solauto-sdk";
 
 // Create new Solauto client

generateClients.cjs

@@ -28,6 +28,49 @@ function fixAnchorIDL(idlFilename, programId) {
     origin: "anchor",
     address: programId,
   };
+
+  function flattenDefined(data) {
+    if (typeof data === "object" && data !== null) {
+      if (Array.isArray(data)) {
+        return data.map(flattenDefined);
+      } else if (data.defined && typeof data.defined === "object") {
+        return { ...data, defined: data.defined.name };
+      } else {
+        return Object.keys(data).reduce((acc, key) => {
+          acc[key] = flattenDefined(data[key]);
+          return acc;
+        }, {});
+      }
+    }
+    return data;
+  }
+
+  data = flattenDefined(data);
+
+  function replacePubkeyWithPublicKey(data) {
+    if (typeof data === "object" && data !== null) {
+      if (Array.isArray(data)) {
+        return data.map(replacePubkeyWithPublicKey);
+      } else {
+        return Object.keys(data).reduce((acc, key) => {
+          if (key === "pubkey") {
+            acc["publicKey"] = data[key];
+          } else if (typeof data[key] === "string" && data[key] === "pubkey") {
+            acc[key] = "publicKey";
+          } else {
+            acc[key] = replacePubkeyWithPublicKey(data[key]);
+          }
+          return acc;
+        }, {});
+      }
+    } else if (data === "pubkey") {
+      return "publicKey";
+    }
+    return data;
+  }
+
+  data = replacePubkeyWithPublicKey(data);
+
   fs.writeFileSync(idlFilePath, JSON.stringify(data, null, 2), "utf8");
 }
 
@@ -50,7 +93,9 @@ function generateTypescriptSDKForAnchorIDL(sdkDirName, idlFilename, programId) {
   const kinobi = k.createFromIdls([idlFilePath]);
 
   kinobi.accept(
-    new k.renderJavaScriptVisitor(path.join(typescriptSdkDir, sdkDirName))
+    new k.renderJavaScriptVisitor(
+      path.join(typescriptSdkDir, "externalSdks", sdkDirName)
+    )
   );
 }
 
@@ -92,29 +137,29 @@ async function cleanJupiterTsSDK(exclusions = []) {
 
 generateSolautoSDK();
 
-// generateRustSDKForAnchorIDL(
-//   "marginfi-sdk",
-//   "marginfi.json",
-//   "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
-// );
-// generateTypescriptSDKForAnchorIDL(
-//   "marginfi-sdk",
-//   "marginfi.json",
-//   "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
-// );
+generateRustSDKForAnchorIDL(
+  "marginfi-sdk",
+  "marginfi.json",
+  "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
+);
+generateTypescriptSDKForAnchorIDL(
+  "marginfi",
+  "marginfi.json",
+  "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
+);
 
 // generateRustSDKForAnchorIDL(
 //   "jupiter-sdk",
 //   "jupiter.json",
 //   "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"
 // );
 // generateTypescriptSDKForAnchorIDL(
-//   "jupiter-sdk",
+//   "jupiter",
 //   "jupiter.json",
 //   "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"
 // );
 // generateTypescriptSDKForAnchorIDL(
-//   "pyth-sdk",
+//   "pyth",
 //   "pyth.json",
 //   "pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT"
 // );

idls/marginfi.json

@@ -883,7 +883,7 @@
       "accounts": [
         {
           "name": "marginfiGroup",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {

idls/solauto.json

@@ -559,7 +559,7 @@
         },
         {
           "name": "marginfiGroup",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -697,7 +697,7 @@
         },
         {
           "name": "marginfiGroup",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {

package.json

@@ -3,6 +3,7 @@
     "push": "git add . && git commit -m 'wip' && git push",
     "format:rust": "find ./programs/* -name '*.rs' -exec rustfmt {} +",
     "build:rs:local": "cargo build-sbf -- --package solauto --features local",
+    "build:rs:staging": "cargo build-sbf -- --package solauto --features \"test staging\"",
     "build:rs:test": "cargo build-sbf -- --package solauto --features test",
     "build:rs:prod": "solana-verify build --library-name solauto --base-image solanafoundation/solana-verifiable-build@sha256:f3d3a4adaa8008644fc4535373c6818275c7e35a0b07660890b4a95ef434221e",
     "build:ts": "cd solauto-sdk && npm run build",
@@ -25,6 +26,7 @@
     "sandbox": "cd solauto-sdk && npx ts-node local/txSandbox.ts",
     "update-lut:solauto": "cd solauto-sdk && npx ts-node local/updateSolautoLUT.ts",
     "update-lut:marginfi": "cd solauto-sdk && npx ts-node local/updateMarginfiLUT.ts",
+    "patch-lut": "cd solauto-sdk && npx ts-node local/patchLUT.ts",
     "create-token-accounts": "cd solauto-sdk && npx ts-node local/createTokenAccounts.ts",
     "prepare-accounts": "pnpm create-token-accounts && pnpm update-lut:solauto && pnpm update-lut:marginfi",
     "log-pos": "cd solauto-sdk && npx ts-node local/logPositions.ts",
@@ -34,7 +36,8 @@
     "@metaplex-foundation/kinobi": "^0.18.5",
     "@mrgnlabs/marginfi-client-v2": "^6.0.1",
     "@mrgnlabs/mrgn-common": "^2.0.2",
-    "borsh": "^2.0.0"
+    "borsh": "^2.0.0",
+    "cross-env": "^10.0.0"
   },
   "devDependencies": {
     "solauto-sdk": "file:solauto-sdk",