@haven-fi/solauto-sdk 1.0.650 → 1.0.652

package/dist/solautoPosition/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EAQf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG5E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAgC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EAQf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAI5E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAsC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}

package/dist/solautoPosition/utils.js

@@ -4,7 +4,6 @@ exports.createSolautoSettings = createSolautoSettings;
 exports.getPositionExBulk = getPositionExBulk;
 exports.getOrCreatePositionEx = getOrCreatePositionEx;
 exports.createFakePositionState = createFakePositionState;
-const web3_js_1 = require("@solana/web3.js");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generated_1 = require("../generated");
 const utils_1 = require("../utils");
@@ -37,9 +36,12 @@ async function getPositionExBulk(umi, publicKeys) {
 }
 async function getOrCreatePositionEx(umi, publicKey, customArgs, contextUpdates) {
     const data = await (0, generated_1.safeFetchSolautoPosition)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(publicKey));
+    if (!data && (!customArgs?.supplyMint || !customArgs.debtMint)) {
+        throw new Error("Must provide a supply & debt mint if creating a new position");
+    }
     const placeholderState = createFakePositionState({
-        mint: customArgs?.supplyMint ?? web3_js_1.PublicKey.default,
-    }, { mint: customArgs?.debtMint ?? web3_js_1.PublicKey.default }, 0, 0);
+        mint: customArgs.supplyMint,
+    }, { mint: customArgs.debtMint }, 0, 0);
     const lendingPlatform = data
         ? data.position.lendingPlatform
         : customArgs.lendingPlatform;

package/local/txSandbox.ts

@@ -13,8 +13,10 @@ import {
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   TransactionsManager,
+  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
+import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = false;
 const testProgram = true;
@@ -29,7 +31,7 @@ export async function main() {
 
   const signer = createSignerFromKeypair(
     umi,
-    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
+    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
   );
 
   const client = getClient(LendingPlatform.Marginfi, {
@@ -41,24 +43,25 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    positionId: 5,
+    supplyMint: NATIVE_MINT,
+    debtMint: new PublicKey(USDC)
   });
 
-  const transactionItems = [rebalance(client)];
+  // const transactionItems = [rebalance(client)];
 
-  const txManager = new TransactionsManager(
-    client,
-    undefined,
-    payForTransaction ? "normal" : "only-simulate",
-    PriorityFeeSetting.Min,
-    true,
-    undefined,
-    { totalRetries: 5 }
-  );
-  const statuses = await txManager.clientSend(transactionItems);
+  // const txManager = new TransactionsManager(
+  //   client,
+  //   undefined,
+  //   payForTransaction ? "normal" : "only-simulate",
+  //   PriorityFeeSetting.Min,
+  //   true,
+  //   undefined,
+  //   { totalRetries: 5 }
+  // );
+  // const statuses = await txManager.clientSend(transactionItems);
 
-  consoleLog(statuses);
+  // consoleLog(statuses);
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.650",
+  "version": "1.0.652",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/solautoPosition/utils.ts

@@ -24,6 +24,7 @@ import {
 } from "../utils";
 import { PositionCustomArgs, SolautoPositionEx } from "./solautoPositionEx";
 import { MarginfiSolautoPositionEx } from "./marginfiSolautoPositionEx";
+import { assert } from "console";
 
 export function createSolautoSettings(
   settings: SolautoSettingsParametersInpArgs
@@ -81,11 +82,17 @@ export async function getOrCreatePositionEx(
     fromWeb3JsPublicKey(publicKey)
   );
 
+  if (!data && (!customArgs?.supplyMint || !customArgs.debtMint)) {
+    throw new Error(
+      "Must provide a supply & debt mint if creating a new position"
+    );
+  }
+
   const placeholderState = createFakePositionState(
     {
-      mint: customArgs?.supplyMint ?? PublicKey.default,
+      mint: customArgs!.supplyMint!,
     },
-    { mint: customArgs?.debtMint ?? PublicKey.default },
+    { mint: customArgs!.debtMint! },
     0,
     0
   );