@glamsystems/glam-cli 1.0.8 → 1.0.9

package/main.js

@@ -196,7 +196,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"address":"GLAMpaME8wdTEzxtiYEAa5yD8f
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"address":"gConFzxKL9USmwTdJoeQJvfKmqhJ2CyUaXTyQ8v9TGX","metadata":{"name":"glam_config","version":"1.0.0","spec":"0.1.0","description":"GLAM config program"},"instructions":[{"name":"close","discriminator":[98,165,201,177,108,65,206,96],"accounts":[{"name":"global_config","writable":true},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[]},{"name":"delete_asset_meta","discriminator":[108,173,149,99,144,203,21,115],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"asset","type":"pubkey"},{"name":"oracle","type":"pubkey"}]},{"name":"initialize","discriminator":[175,175,109,31,13,152,155,237],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"payer","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"admin","type":"pubkey"},{"name":"fee_authority","type":"pubkey"},{"name":"referrer","type":"pubkey"},{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"}]},{"name":"update_admin","discriminator":[161,176,40,213,60,184,179,228],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"new_admin","type":"pubkey"}]},{"name":"update_protocol_fees","discriminator":[158,219,253,143,54,45,113,182],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"fee_authority","signer":true}],"args":[{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"}]},{"name":"update_referrer","discriminator":[208,225,56,15,244,21,195,34],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"fee_authority","signer":true}],"args":[{"name":"referrer","type":"pubkey"}]},{"name":"upsert_asset_meta","discriminator":[29,40,115,194,215,146,222,212],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"asset_meta","type":{"defined":{"name":"AssetMeta"}}}]}],"accounts":[{"name":"GlobalConfig","discriminator":[149,8,156,202,160,252,176,217]}],"errors":[{"code":6000,"name":"InvalidAuthority","msg":"Invalid authority"},{"code":6001,"name":"InvalidAssetMeta","msg":"Invalid asset meta"},{"code":6002,"name":"InvalidParameters","msg":"Invalid parameters"},{"code":6003,"name":"InvalidOracleSource","msg":"Invalid oracle source"},{"code":6004,"name":"InvalidGlobalConfig","msg":"Invalid global config"}],"types":[{"name":"AssetMeta","type":{"kind":"struct","fields":[{"name":"asset","type":"pubkey"},{"name":"decimals","type":"u8"},{"name":"oracle","type":"pubkey"},{"name":"oracle_source","type":{"defined":{"name":"OracleSource"}}},{"name":"max_age_seconds","type":"u16"},{"name":"priority","type":"u8"},{"name":"padding","type":{"array":["u8",3]}}]}},{"name":"GlobalConfig","type":{"kind":"struct","fields":[{"name":"admin","docs":["The authority that can modify the config"],"type":"pubkey"},{"name":"fee_authority","docs":["The authority that can modify fee structure of individual glam state and claim protocol fees"],"type":"pubkey"},{"name":"referrer","type":"pubkey"},{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"},{"name":"asset_metas","type":{"vec":{"defined":{"name":"AssetMeta"}}}}]}},{"name":"OracleSource","type":{"kind":"enum","variants":[{"name":"Pyth"},{"name":"Switchboard"},{"name":"QuoteAsset"},{"name":"Pyth1K"},{"name":"Pyth1M"},{"name":"PythStableCoin"},{"name":"Prelaunch"},{"name":"PythPull"},{"name":"Pyth1KPull"},{"name":"Pyth1MPull"},{"name":"PythStableCoinPull"},{"name":"SwitchboardOnDemand"},{"name":"PythLazer"},{"name":"PythLazer1K"},{"name":"PythLazer1M"},{"name":"PythLazerStableCoin"},{"name":"NotSet"},{"name":"LstPoolState"},{"name":"MarinadeState"},{"name":"BaseAsset"},{"name":"ChainlinkRWA"}]}}]}');
+module.exports = /*#__PURE__*/JSON.parse('{"address":"gConFzxKL9USmwTdJoeQJvfKmqhJ2CyUaXTyQ8v9TGX","metadata":{"name":"glam_config","version":"1.0.0","spec":"0.1.0","description":"GLAM config program"},"instructions":[{"name":"close","discriminator":[98,165,201,177,108,65,206,96],"accounts":[{"name":"global_config","writable":true},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[]},{"name":"deprecate_asset_meta","docs":["Marks an asset meta as deprecated"],"discriminator":[138,242,230,22,21,151,149,19],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"asset","type":"pubkey"},{"name":"oracle","type":"pubkey"}]},{"name":"initialize","discriminator":[175,175,109,31,13,152,155,237],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"payer","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"admin","type":"pubkey"},{"name":"fee_authority","type":"pubkey"},{"name":"referrer","type":"pubkey"},{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"}]},{"name":"update_admin","discriminator":[161,176,40,213,60,184,179,228],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"new_admin","type":"pubkey"}]},{"name":"update_protocol_fees","discriminator":[158,219,253,143,54,45,113,182],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"fee_authority","signer":true}],"args":[{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"}]},{"name":"update_referrer","discriminator":[208,225,56,15,244,21,195,34],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"fee_authority","signer":true}],"args":[{"name":"referrer","type":"pubkey"}]},{"name":"upsert_asset_meta","discriminator":[29,40,115,194,215,146,222,212],"accounts":[{"name":"global_config","writable":true,"pda":{"seeds":[{"kind":"const","value":[103,108,111,98,97,108,45,99,111,110,102,105,103]}]}},{"name":"admin","writable":true,"signer":true},{"name":"asset"},{"name":"oracle"},{"name":"system_program","address":"11111111111111111111111111111111"}],"args":[{"name":"asset_meta","type":{"defined":{"name":"AssetMeta"}}}]}],"accounts":[{"name":"GlobalConfig","discriminator":[149,8,156,202,160,252,176,217]}],"errors":[{"code":6000,"name":"InvalidAuthority","msg":"Invalid authority"},{"code":6001,"name":"InvalidAssetMeta","msg":"Invalid asset meta"},{"code":6002,"name":"InvalidParameters","msg":"Invalid parameters"},{"code":6003,"name":"InvalidOracleSource","msg":"Invalid oracle source"},{"code":6004,"name":"InvalidGlobalConfig","msg":"Invalid global config"}],"types":[{"name":"AssetMeta","type":{"kind":"struct","fields":[{"name":"asset","type":"pubkey"},{"name":"decimals","type":"u8"},{"name":"oracle","type":"pubkey"},{"name":"oracle_source","type":{"defined":{"name":"OracleSource"}}},{"name":"max_age_seconds","type":"u16"},{"name":"priority","type":"i8"},{"name":"padding","type":{"array":["u8",3]}}]}},{"name":"GlobalConfig","type":{"kind":"struct","fields":[{"name":"admin","docs":["The authority that can modify the config"],"type":"pubkey"},{"name":"fee_authority","docs":["The authority that can modify fee structure of individual glam state and claim protocol fees"],"type":"pubkey"},{"name":"referrer","type":"pubkey"},{"name":"base_fee_bps","type":"u16"},{"name":"flow_fee_bps","type":"u16"},{"name":"asset_metas","type":{"vec":{"defined":{"name":"AssetMeta"}}}}]}},{"name":"OracleSource","type":{"kind":"enum","variants":[{"name":"Pyth"},{"name":"Switchboard"},{"name":"QuoteAsset"},{"name":"Pyth1K"},{"name":"Pyth1M"},{"name":"PythStableCoin"},{"name":"Prelaunch"},{"name":"PythPull"},{"name":"Pyth1KPull"},{"name":"Pyth1MPull"},{"name":"PythStableCoinPull"},{"name":"SwitchboardOnDemand"},{"name":"PythLazer"},{"name":"PythLazer1K"},{"name":"PythLazer1M"},{"name":"PythLazerStableCoin"},{"name":"NotSet"},{"name":"LstPoolState"},{"name":"MarinadeState"},{"name":"BaseAsset"},{"name":"ChainlinkRWA"}]}}]}');
 
 /***/ }),
 /* 8 */
@@ -6525,12 +6525,13 @@ exports.USDC_ORACLE = exports.ASSETS_MAINNET.get("EPjFWdd5AufqSSqeM2qN1xzybapC8G
  * @returns Metadata of the asset
  */
 function getAssetMeta(assetMint, cluster = clientConfig_1.ClusterNetwork.Mainnet) {
-    let assetMeta = exports.ASSETS_MAINNET.get(assetMint);
+    const mint = assetMint instanceof web3_js_1.PublicKey ? assetMint.toBase58() : assetMint;
+    let assetMeta = exports.ASSETS_MAINNET.get(mint);
     if (!assetMeta && cluster !== clientConfig_1.ClusterNetwork.Mainnet) {
-        assetMeta = exports.ASSETS_TESTS.get(assetMint);
+        assetMeta = exports.ASSETS_TESTS.get(mint);
     }
     if (!assetMeta) {
-        throw new Error("Invalid asset: " + assetMint);
+        throw new Error("Asset not supported: " + assetMint);
     }
     return assetMeta;
 }
@@ -47761,11 +47762,7 @@ function installKaminoLendCommands(klend, context) {
         .option("-y, --yes", "Skip confirmation prompt", false)
         .description("Deposit to Kamino Lending market")
         .action(async (market, asset, amount, options) => {
-        const decimals = glam_sdk_1.ASSETS_MAINNET.get(asset)?.decimals;
-        if (!decimals) {
-            console.error(`Asset ${asset} not supported`);
-            process.exit(1);
-        }
+        const { decimals } = (0, glam_sdk_1.getAssetMeta)(asset);
         await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.kaminoLending.deposit(market, asset, amount * 10 ** decimals, context.txOptions), {
             skip: options?.yes,
             message: `Confirm depositing ${amount} ${asset}?`,
@@ -47779,11 +47776,7 @@ function installKaminoLendCommands(klend, context) {
         .option("-y, --yes", "Skip confirmation prompt", false)
         .description("Withdraw asset from Kamino Lending market")
         .action(async (market, asset, amount, options) => {
-        const decimals = glam_sdk_1.ASSETS_MAINNET.get(asset)?.decimals;
-        if (!decimals) {
-            console.error(`Asset ${asset} not supported`);
-            process.exit(1);
-        }
+        const { decimals } = (0, glam_sdk_1.getAssetMeta)(asset);
         await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.kaminoLending.withdraw(market, asset, amount * 10 ** decimals, context.txOptions), {
             skip: options?.yes,
             message: `Confirm withdrawing ${amount} ${asset}`,
@@ -47797,11 +47790,7 @@ function installKaminoLendCommands(klend, context) {
         .option("-y, --yes", "Skip confirmation prompt", false)
         .description("Borrow from Kamino Lending market")
         .action(async (market, asset, amount, options) => {
-        const decimals = glam_sdk_1.ASSETS_MAINNET.get(asset)?.decimals;
-        if (!decimals) {
-            console.error(`Asset ${asset} not supported`);
-            process.exit(1);
-        }
+        const { decimals } = (0, glam_sdk_1.getAssetMeta)(asset);
         await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.kaminoLending.borrow(market, asset, amount * 10 ** decimals, context.txOptions), {
             skip: options?.yes,
             message: `Confirm borrowing ${amount} ${asset}`,
@@ -47815,11 +47804,7 @@ function installKaminoLendCommands(klend, context) {
         .option("-y, --yes", "Skip confirmation prompt", false)
         .description("Repay loan from Kamino Lending market")
         .action(async (market, asset, amount, options) => {
-        const decimals = glam_sdk_1.ASSETS_MAINNET.get(asset)?.decimals;
-        if (!decimals) {
-            console.error(`Asset ${asset} not supported`);
-            process.exit(1);
-        }
+        const { decimals } = (0, glam_sdk_1.getAssetMeta)(asset);
         await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.kaminoLending.repay(market, asset, amount * 10 ** decimals, context.txOptions), {
             skip: options?.yes,
             message: `Confirm repaying ${amount} ${asset}`,
@@ -49738,7 +49723,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.8");
+    .version("1.0.9");
 program
     .command("env")
     .description("Display current environment setup")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-cli",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "CLI for interacting with the GLAM Protocol",
   "main": "./main.js",
   "bin": {
@@ -21,7 +21,7 @@
     "node": ">=20.20.0"
   },
   "dependencies": {
-    "@glamsystems/glam-sdk": "1.0.8",
+    "@glamsystems/glam-sdk": "1.0.9",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",