@sanctumso/inf1 0.0.1-dev-2 → 0.0.1-dev-4

package/README.md

@@ -6,8 +6,9 @@ Typescript + WASM SDK for Sanctum Infinity program V1.
 
 ```ts
 import {
+  assertAccountsExist,
   createSolanaRpc,
-  getBase64Encoder,
+  fetchEncodedAccounts,
   type Address,
   type IInstruction,
   type Rpc,
@@ -52,22 +53,14 @@ async function fetchAccountMap(
   rpc: Rpc<SolanaRpcApi>,
   accounts: string[]
 ): Promise<AccountMap> {
-  const map = new Map<string, Account>();
-  await Promise.all(
-    accounts.map(async (account) => {
-      const accountInfo = await rpc
-        .getAccountInfo(account as Address, {
-          encoding: "base64",
-        })
-        .send();
-      const acc = accountInfo.value!;
-      map.set(account, {
-        data: new Uint8Array(getBase64Encoder().encode(acc.data[0])),
-        owner: acc.owner,
-      });
-    })
+  const fetched = await fetchEncodedAccounts(rpc, accounts);
+  assertAccountsExist(fetched);
+  return new Map(
+    fetched.map(({ address, data, programAddress }) => [
+      address,
+      { data, owner: programAddress },
+    ])
   );
-  return map;
 }
 
 const rpc = createSolanaRpc("https://api.mainnet-beta.solana.com");

package/index.d.ts

@@ -1,35 +1,43 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
- * @throws
+ * Returns the array of all possible {@link InfErr}s
  */
-export function tradeExactInIx(inf: Inf, arg1: TradeArgs): Instruction;
+export function allInfErrs(): AllInfErrs;
 /**
- * @throws
+ * @throws if no valid PDA found
  */
-export function tradeExactOutIx(inf: Inf, arg1: TradeArgs): Instruction;
+export function findPoolReservesAta(arg0: Bs58Array): FoundPda;
 /**
- * Returns the pubkeys of the accounts that need ot be fetched to initialize
- * a new {@link Inf} object
+ * @throws if no valid PDA found
  */
-export function initPks(): Bs58Array[];
+export function findProtocolFeeAccumulatorAta(arg0: Bs58Array): FoundPda;
 /**
- * Initialize a new {@link Inf} object.
+ * Add SPL LSTs auxiliary data to support new SPL LSTs that may have previously not been covered
+ */
+export function appendSplLsts(inf: Inf, arg1: SplPoolAccounts): void;
+/**
+ * Returns if the given SPL LST mints have their {@link SplPoolAccounts} present in the object.
  *
- * The returned object must be updated for a mint pair before it is ready to
- * quote and operate for trades involving that pair
+ * Returns a byte array where ret[i] corresponds to the result for `mints[i]`.
+ * 0 - false, 1 - true.
  *
- * @throws
+ * If false is returned, then the data needs to be added via {@link appendSplLsts}
+ *
+ * This fn returns a byte array instead of `boolean` array because wasm_bindgen's type
+ * conversion doesnt work with bool arrays.
  */
-export function init(arg0: AccountMap, arg1: SplPoolAccounts): Inf;
+export function hasSplData(inf: Inf, mints: Bs58Array[]): Uint8Array;
 /**
- * @throws if not valid PDA found
+ * Returned accounts are deduped
+ *
+ * @throws
  */
-export function findPoolReservesAta(arg0: Bs58Array): FoundPda;
+export function accountsToUpdateForTrade(inf: Inf, arg1: PkPair): Bs58Array[];
 /**
- * @throws if not valid PDA found
+ * @throws
  */
-export function findProtocolFeeAccumulatorAta(arg0: Bs58Array): FoundPda;
+export function updateForTrade(inf: Inf, arg1: PkPair, account_map: AccountMap): void;
 /**
  * @throws
  */
@@ -39,47 +47,56 @@ export function quoteTradeExactIn(inf: Inf, arg1: QuoteArgs): Quote;
  */
 export function quoteTradeExactOut(inf: Inf, arg1: QuoteArgs): Quote;
 /**
- * Add SPL LSTs auxiliary data to support new SPL LSTs that may have previously not been covered
+ * Returns the pubkeys of the accounts that need ot be fetched to initialize
+ * a new {@link Inf} object
  */
-export function appendSplLsts(inf: Inf, arg1: SplPoolAccounts): void;
+export function initPks(): Bs58Array[];
 /**
- * Returns if the given SPL LST mints have their {@link SplPoolAccounts} present in the object.
- *
- * Returns a byte array where ret[i] corresponds to the result for `mints[i]`.
- * 0 - false, 1 - true.
+ * Initialize a new {@link Inf} object.
  *
- * If false is returned, then the data needs to be added via {@link appendSplLsts}
+ * The returned object must be updated for a mint pair before it is ready to
+ * quote and operate for trades involving that pair
  *
- * This fn returns a byte array instead of `boolean` array because wasm_bindgen's type
- * conversion doesnt work with bool arrays.
+ * @throws
  */
-export function hasSplData(inf: Inf, mints: Bs58Array[]): Uint8Array;
+export function init(arg0: AccountMap, arg1: SplPoolAccounts): Inf;
 /**
- * Returned accounts are deduped
- *
  * @throws
  */
-export function accountsToUpdateForTrade(inf: Inf, arg1: PkPair): Bs58Array[];
+export function tradeExactInIx(inf: Inf, arg1: TradeArgs): Instruction;
 /**
  * @throws
  */
-export function updateForTrade(inf: Inf, arg1: PkPair, arg2: AccountMap): void;
-export interface TradeArgs {
-    amt: bigint;
-    limit: bigint;
-    mints: PkPair;
-    signer: B58PK;
-    tokenAccs: PkPair;
-}
+export function tradeExactOutIx(inf: Inf, arg1: TradeArgs): Instruction;
 
-export type FoundPda = [B58PK, number];
+export type ERR_CODE_MSG_SEP = ":";
 
-export interface Pair<T> {
-    inp: T;
-    out: T;
-}
+/**
+ * All {@link Error} objects thrown by the SDK have messages of this format
+ */
+export type InfErrMsg = `${InfErr}${ERR_CODE_MSG_SEP}${string}`;
 
-export type PkPair = Pair<B58PK>;
+
+/**
+ * All {@link Error} objects thrown by SDK functions will start with
+ * `{InfErr}:`, so that the `InfErr` error code can be
+ * extracted by splitting on the first colon `:`
+ */
+export type InfErr = "AccDeserErr" | "InternalErr" | "MissingAccErr" | "MissingSplDataErr" | "MissingSvcDataErr" | "NoValidPdaErr" | "PoolErr" | "UnknownPpErr" | "UnknownSvcErr" | "UnsupportedMintErr" | "SizeTooSmallErr" | "SizeTooLargeErr";
+
+export type AllInfErrs = [
+        "AccDeserErr",
+        "InternalErr",
+        "MissingAccErr",
+        "MissingSplDataErr",
+        "MissingSvcDataErr",
+        "NoValidPdaErr",
+        "PoolErr",
+        "UnknownSvcErr",
+        "UnsupportedMintErr",
+        "SizeTooSmallErr",
+        "SizeTooLargeErr",
+    ];
 
 export interface AccountMeta {
     address: B58PK;
@@ -139,6 +156,16 @@ export interface Quote {
     mints: PkPair;
 }
 
+export type FoundPda = [B58PK, number];
+
+export interface TradeArgs {
+    amt: bigint;
+    limit: bigint;
+    mints: PkPair;
+    signer: B58PK;
+    tokenAccs: PkPair;
+}
+
 export interface Account {
     data: Uint8Array;
     owner: B58PK;
@@ -155,6 +182,11 @@ export type SplPoolAccounts = Map<B58PK, B58PK>;
 
 export type AccountMap = Map<B58PK, Account>;
 
+export interface PkPair {
+    inp: B58PK;
+    out: B58PK;
+}
+
 export type B58PK = Bs58Array;
 
 export type Bs58Array = string
@@ -168,18 +200,19 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly tradeExactInIx: (a: number, b: any) => [number, number, number];
-  readonly tradeExactOutIx: (a: number, b: any) => [number, number, number];
-  readonly initPks: () => [number, number];
-  readonly init: (a: any, b: any) => [number, number, number];
+  readonly allInfErrs: () => any;
   readonly findPoolReservesAta: (a: any) => [number, number, number];
   readonly findProtocolFeeAccumulatorAta: (a: any) => [number, number, number];
-  readonly quoteTradeExactIn: (a: number, b: any) => [number, number, number];
-  readonly quoteTradeExactOut: (a: number, b: any) => [number, number, number];
   readonly appendSplLsts: (a: number, b: any) => void;
   readonly hasSplData: (a: number, b: number, c: number) => [number, number];
   readonly accountsToUpdateForTrade: (a: number, b: any) => [number, number, number, number];
   readonly updateForTrade: (a: number, b: any, c: any) => [number, number];
+  readonly quoteTradeExactIn: (a: number, b: any) => [number, number, number];
+  readonly quoteTradeExactOut: (a: number, b: any) => [number, number, number];
+  readonly initPks: () => [number, number];
+  readonly init: (a: any, b: any) => [number, number, number];
+  readonly tradeExactInIx: (a: number, b: any) => [number, number, number];
+  readonly tradeExactOutIx: (a: number, b: any) => [number, number, number];
   readonly __wbg_inf_free: (a: number, b: number) => void;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
@@ -187,8 +220,8 @@ export interface InitOutput {
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_export_4: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
-  readonly __externref_drop_slice: (a: number, b: number) => void;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
+  readonly __externref_drop_slice: (a: number, b: number) => void;
   readonly __wbindgen_start: () => void;
 }