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

package/index.cjs.js

@@ -18891,6 +18891,7 @@ var instructions$8 = [
             },
             {
                 name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -19160,6 +19161,7 @@ var instructions$8 = [
             },
             {
                 name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -47097,19 +47099,51 @@ class BaseClient {
             this._assetMetasPromise = undefined;
         }
         const fetchPromise = this.fetchGlobalConfig(options).then(async (globalConfig)=>{
-            // FIX: this could be perf bottleneck if there are many assets
-            const mintInfos = await fetchMintsAndTokenPrograms(this.connection, globalConfig.assetMetas.map((am)=>am.asset));
-            // Transforms onchain asset meta to client asset meta
-            const assetMetaMap = new Map(globalConfig.assetMetas.map(({ asset, decimals, oracle, oracleSource }, i)=>[
-                    asset.toBase58(),
-                    {
-                        asset,
-                        decimals,
-                        oracle,
-                        oracleSource,
-                        programId: mintInfos[i].tokenProgram
+            const assets = globalConfig.assetMetas.map((am)=>am.asset);
+            const tokenProgramsByAsset = new Map();
+            try {
+                // Fast path when every global-config mint account is available.
+                const mintInfos = await fetchMintsAndTokenPrograms(this.connection, assets);
+                assets.forEach((asset, i)=>{
+                    tokenProgramsByAsset.set(asset.toBase58(), mintInfos[i].tokenProgram);
+                });
+            } catch  {
+                // Local validators may clone a newer global config than the set of
+                // mint accounts they have available. Resolve what we can and let
+                // downstream callers request only the assets they actually use.
+                const accountsInfo = await this.connection.getMultipleAccountsInfo(assets, "confirmed");
+                accountsInfo.forEach((accountInfo, i)=>{
+                    const asset = assets[i];
+                    const assetKey = asset.toBase58();
+                    if (accountInfo) {
+                        tokenProgramsByAsset.set(assetKey, parseMintAccountInfo(accountInfo, asset).tokenProgram);
+                        return;
+                    }
+                    const fallback = ASSETS_MAINNET.get(assetKey);
+                    if (fallback) {
+                        tokenProgramsByAsset.set(assetKey, fallback.programId);
                     }
-                ]));
+                });
+            }
+            // Transforms onchain asset meta to client asset meta
+            const assetMetaMap = new Map(globalConfig.assetMetas.flatMap(({ asset, decimals, oracle, oracleSource })=>{
+                const programId = tokenProgramsByAsset.get(asset.toBase58());
+                if (!programId) {
+                    return [];
+                }
+                return [
+                    [
+                        asset.toBase58(),
+                        {
+                            asset,
+                            decimals,
+                            oracle,
+                            oracleSource,
+                            programId
+                        }
+                    ]
+                ];
+            }));
             if (useCache) {
                 this._assetMetas = assetMetaMap;
             }
@@ -53498,10 +53532,9 @@ let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
         }).instruction();
     }
     async deleteLayerzeroOftRouteIx(route, signer) {
-        return await this.client.base.extBridgeProgram.methods.deleteLayerzeroOftRoute(normalizeRoute(route)).accountsPartial({
+        return await this.client.base.extBridgeProgram.methods.deleteLayerzeroOftRoute(normalizeRoute(route)).accounts({
             glamState: this.client.base.statePda,
-            glamSigner: signer || this.client.base.signer,
-            glamProtocolProgram: this.client.base.protocolProgram.programId
+            glamSigner: signer || this.client.base.signer
         }).instruction();
     }
     async buildOftTransferTx(params, txOptions = {}) {
@@ -53879,10 +53912,17 @@ class BridgeClient {
         return await this.base.sendAndConfirm(tx);
     }
     async reconcileManagedTransfer(transferId, txOptions = {}) {
-        const ix = await this.base.extBridgeProgram.methods.reconcileManagedTransfer().accountsPartial({
+        web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from(SEED_INTEGRATION_AUTHORITY)
+        ], this.base.extBridgeProgram.programId)[0];
+        const ix = await this.base.extBridgeProgram.methods.reconcileManagedTransfer().accounts({
             glamState: this.base.statePda,
+            // glamVault: this.base.vaultPda,
             glamSigner: txOptions.signer || this.base.signer,
-            glamProtocolProgram: this.base.protocolProgram.programId,
+            // integrationAuthority,
+            // glamProtocolProgram: this.base.protocolProgram.programId,
+            // systemProgram: SystemProgram.programId,
+            // bridgeRegistry: this.getRegistryPda(),
             transferRecord: this.getTransferRecordPda(transferId)
         }).instruction();
         const tx = await this.txBuilder.buildVersionedTx([

package/index.esm.js

@@ -18871,6 +18871,7 @@ var instructions$8 = [
             },
             {
                 name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -19140,6 +19141,7 @@ var instructions$8 = [
             },
             {
                 name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -47077,19 +47079,51 @@ class BaseClient {
             this._assetMetasPromise = undefined;
         }
         const fetchPromise = this.fetchGlobalConfig(options).then(async (globalConfig)=>{
-            // FIX: this could be perf bottleneck if there are many assets
-            const mintInfos = await fetchMintsAndTokenPrograms(this.connection, globalConfig.assetMetas.map((am)=>am.asset));
-            // Transforms onchain asset meta to client asset meta
-            const assetMetaMap = new Map(globalConfig.assetMetas.map(({ asset, decimals, oracle, oracleSource }, i)=>[
-                    asset.toBase58(),
-                    {
-                        asset,
-                        decimals,
-                        oracle,
-                        oracleSource,
-                        programId: mintInfos[i].tokenProgram
+            const assets = globalConfig.assetMetas.map((am)=>am.asset);
+            const tokenProgramsByAsset = new Map();
+            try {
+                // Fast path when every global-config mint account is available.
+                const mintInfos = await fetchMintsAndTokenPrograms(this.connection, assets);
+                assets.forEach((asset, i)=>{
+                    tokenProgramsByAsset.set(asset.toBase58(), mintInfos[i].tokenProgram);
+                });
+            } catch  {
+                // Local validators may clone a newer global config than the set of
+                // mint accounts they have available. Resolve what we can and let
+                // downstream callers request only the assets they actually use.
+                const accountsInfo = await this.connection.getMultipleAccountsInfo(assets, "confirmed");
+                accountsInfo.forEach((accountInfo, i)=>{
+                    const asset = assets[i];
+                    const assetKey = asset.toBase58();
+                    if (accountInfo) {
+                        tokenProgramsByAsset.set(assetKey, parseMintAccountInfo(accountInfo, asset).tokenProgram);
+                        return;
+                    }
+                    const fallback = ASSETS_MAINNET.get(assetKey);
+                    if (fallback) {
+                        tokenProgramsByAsset.set(assetKey, fallback.programId);
                     }
-                ]));
+                });
+            }
+            // Transforms onchain asset meta to client asset meta
+            const assetMetaMap = new Map(globalConfig.assetMetas.flatMap(({ asset, decimals, oracle, oracleSource })=>{
+                const programId = tokenProgramsByAsset.get(asset.toBase58());
+                if (!programId) {
+                    return [];
+                }
+                return [
+                    [
+                        asset.toBase58(),
+                        {
+                            asset,
+                            decimals,
+                            oracle,
+                            oracleSource,
+                            programId
+                        }
+                    ]
+                ];
+            }));
             if (useCache) {
                 this._assetMetas = assetMetaMap;
             }
@@ -53478,10 +53512,9 @@ let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
         }).instruction();
     }
     async deleteLayerzeroOftRouteIx(route, signer) {
-        return await this.client.base.extBridgeProgram.methods.deleteLayerzeroOftRoute(normalizeRoute(route)).accountsPartial({
+        return await this.client.base.extBridgeProgram.methods.deleteLayerzeroOftRoute(normalizeRoute(route)).accounts({
             glamState: this.client.base.statePda,
-            glamSigner: signer || this.client.base.signer,
-            glamProtocolProgram: this.client.base.protocolProgram.programId
+            glamSigner: signer || this.client.base.signer
         }).instruction();
     }
     async buildOftTransferTx(params, txOptions = {}) {
@@ -53859,10 +53892,17 @@ class BridgeClient {
         return await this.base.sendAndConfirm(tx);
     }
     async reconcileManagedTransfer(transferId, txOptions = {}) {
-        const ix = await this.base.extBridgeProgram.methods.reconcileManagedTransfer().accountsPartial({
+        PublicKey.findProgramAddressSync([
+            Buffer.from(SEED_INTEGRATION_AUTHORITY)
+        ], this.base.extBridgeProgram.programId)[0];
+        const ix = await this.base.extBridgeProgram.methods.reconcileManagedTransfer().accounts({
             glamState: this.base.statePda,
+            // glamVault: this.base.vaultPda,
             glamSigner: txOptions.signer || this.base.signer,
-            glamProtocolProgram: this.base.protocolProgram.programId,
+            // integrationAuthority,
+            // glamProtocolProgram: this.base.protocolProgram.programId,
+            // systemProgram: SystemProgram.programId,
+            // bridgeRegistry: this.getRegistryPda(),
             transferRecord: this.getTransferRecordPda(transferId)
         }).instruction();
         const tx = await this.txBuilder.buildVersionedTx([

package/package.json

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

package/target/types/ext_bridge.d.ts

@@ -104,6 +104,7 @@ export type ExtBridge = {
                 },
                 {
                     "name": "glamVault";
+                    "writable": true;
                     "pda": {
                         "seeds": [
                             {
@@ -373,6 +374,7 @@ export type ExtBridge = {
                 },
                 {
                     "name": "glamVault";
+                    "writable": true;
                     "pda": {
                         "seeds": [
                             {