@glamsystems/glam-sdk 1.0.14-alpha.1 → 1.0.14-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "1.0.14-alpha.1",
+  "version": "1.0.14-alpha.3",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/src/client/bridge.d.ts

@@ -3,7 +3,6 @@ import { AccountMeta, Keypair, PublicKey, TransactionInstruction, TransactionSig
 import { BaseClient, BaseTxBuilder, TxOptions } from "./base";
 import { LayerzeroOftRouteProfile } from "./bridgeRegistry";
 import { LayerzeroOftPolicy, LayerzeroOftRoute, RouteManagementMode } from "../deser/integrationPolicies";
-type BufferLike32 = Uint8Array | number[] | Buffer;
 type BufferLike = Uint8Array | number[] | Buffer;
 type RouteManagementModeArg = RouteManagementMode | number | {
     unmanagedOnly: Record<string, never>;
@@ -16,7 +15,7 @@ export type LayerzeroOftRouteInput = Omit<LayerzeroOftRoute, "managementMode"> &
     managementMode: RouteManagementModeArg;
 };
 export type OftTransferParams = {
-    transferId: BufferLike32;
+    transferId: PublicKey;
     sourceMint: PublicKey;
     sourceAmount: BN;
     providerInstructions: TransactionInstruction[];
@@ -28,7 +27,7 @@ export type OftTransferParams = {
     commitRemainingAccounts?: AccountMeta[];
 };
 export type LayerzeroOftSendParams = {
-    transferId?: BufferLike32;
+    transferId?: PublicKey;
     sourceMint: PublicKey;
     sourceAmount: BN;
     destinationChain: number;
@@ -43,9 +42,35 @@ export type LayerzeroOftSendParams = {
     managed?: boolean;
     providerProgram?: PublicKey;
 };
+type BridgeTransferStatusAccount = {
+    committed: Record<string, never>;
+} | {
+    validated: Record<string, never>;
+} | {
+    settled: Record<string, never>;
+};
+type BridgeTransferRecordAccount = {
+    glamState: PublicKey;
+    transferId: PublicKey;
+    protocol: number;
+    status: BridgeTransferStatusAccount;
+    managed: true;
+    receiptVerified: true;
+    sourceMint: PublicKey;
+    sourceDecimals: number;
+    providerProgram: PublicKey;
+    providerConfig: PublicKey;
+    sourceAmount: BN;
+    quotedOutAmount: BN;
+    destinationChain: number;
+    destinationRecipient: PublicKey;
+    providerEmitter: PublicKey;
+    providerSequence: BN;
+    committedSlot: BN;
+};
 export declare function deriveLayerzeroNoncePda(endpointProgram: PublicKey, sender: PublicKey, destinationChain: number, destinationRecipient: PublicKey): PublicKey;
-export declare function deriveOftAuxiliaryAccountSeed(glamState: PublicKey, transferId: BufferLike32): Promise<string>;
-export declare function deriveOftAuxiliaryAccount(glamSigner: PublicKey, glamState: PublicKey, transferId: BufferLike32, tokenProgram: PublicKey): Promise<{
+export declare function deriveOftAuxiliaryAccountSeed(glamState: PublicKey, transferId: PublicKey): Promise<string>;
+export declare function deriveOftAuxiliaryAccount(glamSigner: PublicKey, glamState: PublicKey, transferId: PublicKey, tokenProgram: PublicKey): Promise<{
     address: PublicKey;
     seed: string;
 }>;
@@ -57,10 +82,11 @@ declare class TxBuilder extends BaseTxBuilder<BridgeClient> {
         tx: VersionedTransaction;
         additionalSigners: Keypair[];
         sessionPda: PublicKey;
-        transferRecordPda: PublicKey;
         auxiliaryTokenAccount: PublicKey;
         sourceTokenAccount: PublicKey;
     }>;
+    priceManagedTransfersIxs(): Promise<TransactionInstruction[]>;
+    priceManagedTransfersTx(txOptions?: TxOptions): Promise<VersionedTransaction>;
 }
 declare class LayerzeroOftBridgeProtocolClient {
     readonly bridge: BridgeClient;
@@ -73,7 +99,6 @@ declare class LayerzeroOftBridgeProtocolClient {
         tx: VersionedTransaction;
         additionalSigners: Keypair[];
         sessionPda: PublicKey;
-        transferRecordPda: PublicKey;
         sourceTokenAccount: PublicKey;
     }>;
     send(params: LayerzeroOftSendParams, txOptions?: TxOptions): Promise<TransactionSignature>;
@@ -84,10 +109,9 @@ export declare class BridgeClient {
     readonly oft: LayerzeroOftBridgeProtocolClient;
     constructor(base: BaseClient);
     getRegistryPda(): PublicKey;
-    getSessionPda(transferId: BufferLike32): PublicKey;
-    getTransferRecordPda(transferId: BufferLike32): PublicKey;
+    getSessionPda(transferId: PublicKey): PublicKey;
     getLayerzeroNoncePda(endpointProgram: PublicKey, sender: PublicKey, destinationChain: number, destinationRecipient: PublicKey): PublicKey;
-    deriveOftAuxiliaryTokenAccount(transferId: BufferLike32, sourceMint: PublicKey, signer?: PublicKey): Promise<{
+    deriveOftAuxiliaryTokenAccount(transferId: PublicKey, sourceMint: PublicKey, signer?: PublicKey): Promise<{
         tokenProgram: PublicKey;
         address: PublicKey;
         seed: string;
@@ -100,16 +124,18 @@ export declare class BridgeClient {
     fetchLayerzeroOftPolicy(): Promise<LayerzeroOftPolicy | null>;
     fetchRegistry(): Promise<{
         glamState: PublicKey;
-        managedTransferCount: BN;
-        bump: number;
+        managedTransferCount: number;
+        reserved: number[];
+        transfers: any[];
     } | null>;
-    fetchSession(transferId: BufferLike32): Promise<{
+    fetchSession(transferId: PublicKey): Promise<{
         glamState: PublicKey;
         signer: PublicKey;
-        transferId: number[];
+        transferId: PublicKey;
         protocol: number;
         managed: boolean;
         sourceMint: PublicKey;
+        sourceDecimals: number;
         sourceTokenAccount: PublicKey;
         providerProgram: PublicKey;
         providerConfig: PublicKey;
@@ -128,30 +154,8 @@ export declare class BridgeClient {
         preparedSlot: BN;
         bump: number;
     } | null>;
-    fetchTransferRecord(transferId: BufferLike32): Promise<{
-        glamState: PublicKey;
-        transferId: number[];
-        protocol: number;
-        status: any;
-        managed: boolean;
-        receiptVerified: boolean;
-        sourceMint: PublicKey;
-        sourceTokenAccount: PublicKey;
-        providerProgram: PublicKey;
-        providerConfig: PublicKey;
-        sourceAmount: BN;
-        quotedOutAmount: BN;
-        destinationChain: number;
-        destinationRecipient: PublicKey;
-        providerTransferId: number[];
-        providerEmitter: PublicKey;
-        providerSequence: BN;
-        committedSlot: BN;
-        settledSlot: BN;
-        reconciledSlot: BN;
-        failureReason: number;
-        bump: number;
-    }>;
+    fetchTransferRecord(transferId: PublicKey): Promise<BridgeTransferRecordAccount>;
+    fetchTransferRecordNullable(transferId: PublicKey): Promise<BridgeTransferRecordAccount | null>;
     addLayerzeroOftRoute(route: LayerzeroOftRouteInput, txOptions?: TxOptions): Promise<TransactionSignature>;
     updateLayerzeroOftRoute(route: LayerzeroOftRouteInput, txOptions?: TxOptions): Promise<TransactionSignature>;
     deleteLayerzeroOftRoute(route: LayerzeroOftRouteInput, txOptions?: TxOptions): Promise<TransactionSignature>;
@@ -159,7 +163,6 @@ export declare class BridgeClient {
         tx: VersionedTransaction;
         additionalSigners: Keypair[];
         sessionPda: PublicKey;
-        transferRecordPda: PublicKey;
         auxiliaryTokenAccount: PublicKey;
         sourceTokenAccount: PublicKey;
     }>;
@@ -171,14 +174,12 @@ export declare class BridgeClient {
         tx: VersionedTransaction;
         additionalSigners: Keypair[];
         sessionPda: PublicKey;
-        transferRecordPda: PublicKey;
         sourceTokenAccount: PublicKey;
     }>;
     sendOft(params: OftTransferParams, txOptions?: TxOptions): Promise<TransactionSignature>;
     private extendLookupTables;
-    settleManagedTransfer(transferId: BufferLike32, txOptions?: TxOptions): Promise<string>;
-    reconcileManagedTransfer(transferId: BufferLike32, txOptions?: TxOptions): Promise<string>;
-    failManagedTransfer(transferId: BufferLike32, failureReason: number, txOptions?: TxOptions): Promise<string>;
-    cleanupTransferRecord(transferId: BufferLike32, txOptions?: TxOptions): Promise<string>;
+    settleManagedTransfer(transferId: PublicKey, txOptions?: TxOptions): Promise<string>;
+    validateManagedTransfer(transferId: PublicKey, txOptions?: TxOptions): Promise<string>;
+    priceManagedTransfers(txOptions?: TxOptions): Promise<string>;
 }
 export {};

package/src/client/price.d.ts

@@ -6,6 +6,7 @@ import { StateModel } from "../models";
 import { PkMap, PkSet } from "../utils";
 import { KVaultState, Reserve } from "../deser";
 import { JupiterApiClient, TokenListItem } from "../utils/jupiterApi";
+import { BridgeClient } from "./bridge";
 /**
  * Represents a single asset holding within a vault.
  *
@@ -55,12 +56,13 @@ export declare class PriceClient {
     readonly base: BaseClient;
     readonly klend: KaminoLendingClient;
     readonly kvaults: KaminoVaultsClient;
+    readonly bridge: BridgeClient;
     private readonly getJupiterApi;
     private _stateModel;
     private _lookupTables;
     private _kaminoVaults;
     private _priceVaultIxsQueue;
-    constructor(base: BaseClient, klend: KaminoLendingClient, kvaults: KaminoVaultsClient, getJupiterApi: () => JupiterApiClient);
+    constructor(base: BaseClient, klend: KaminoLendingClient, kvaults: KaminoVaultsClient, bridge: BridgeClient, getJupiterApi: () => JupiterApiClient);
     get jupiterApi(): JupiterApiClient;
     get cachedStateModel(): StateModel | null;
     set cachedStateModel(stateModel: StateModel);

package/src/models/state.d.ts

@@ -8,6 +8,7 @@ import type { RequestQueue } from "./types";
 import type { IntegrationAcl, DelegateAcl } from "./acl";
 export type StateAccount = IdlAccounts<GlamProtocol>["stateAccount"];
 export type StateModelType = IdlTypes<GlamProtocol>["stateModel"];
+export type OracleConfigsType = IdlTypes<GlamProtocol>["oracleConfigs"];
 /**
  * State model class as defined in the IDL.
  */
@@ -16,6 +17,7 @@ export declare class StateIdlModel implements StateModelType {
     name: number[] | null;
     uri: string | null;
     enabled: boolean | null;
+    oracleConfigs: OracleConfigsType | null;
     assets: PublicKey[] | null;
     created: CreatedModel | null;
     owner: PublicKey | null;