@augustdigital/sdk 4.24.5 → 4.24.7

package/lib/adapters/solana/utils.js

@@ -16,8 +16,8 @@ function isSolanaAddress(address) {
     if ((0, ethers_1.isAddress)(address))
         return false;
     try {
-        const pk = new web3_js_1.PublicKey(address);
-        return web3_js_1.PublicKey.isOnCurve(pk.toBytes());
+        new web3_js_1.PublicKey(address);
+        return true;
     }
     catch (_e) {
         return false;
@@ -28,14 +28,8 @@ function isSolana(signature) {
         return false;
     if ((0, ethers_1.isAddress)(signature))
         return false;
-    try {
-        const testKey = new web3_js_1.PublicKey(signature);
-        if (web3_js_1.PublicKey.isOnCurve(testKey.toBytes())) {
-            return false;
-        }
-    }
-    catch (error) {
-    }
+    if (isSolanaAddress(signature))
+        return false;
     const base58Chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
     const isValidBase58 = signature
         .split('')
@@ -117,34 +111,41 @@ function deriveShareMintPda(vaultProgramId) {
     const [pda] = web3_js_1.PublicKey.findProgramAddressSync([new TextEncoder().encode('mint')], _vaultProgramId);
     return pda;
 }
-function deriveVaultTokenAtaPda(vaultProgramId, depositMint) {
+function deriveVaultTokenAtaPda(vaultProgramId, depositMint, vaultVersion) {
     if (!(vaultProgramId && depositMint))
         throw new Error('Vault program ID or deposit mint missing');
     const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
-    const [pda] = web3_js_1.PublicKey.findProgramAddressSync([new TextEncoder().encode('token_vault'), depositMint.toBuffer()], _vaultProgramId);
+    const seeds = [
+        Buffer.from('token_vault'),
+        depositMint.toBuffer(),
+    ];
+    if (vaultVersion !== undefined) {
+        if (!Number.isInteger(vaultVersion) ||
+            vaultVersion < 0 ||
+            vaultVersion > 255) {
+            throw new Error(`Invalid vault version ${vaultVersion}: must be an integer between 0 and 255`);
+        }
+        seeds.push(Buffer.from([vaultVersion]));
+    }
+    const [pda] = web3_js_1.PublicKey.findProgramAddressSync(seeds, _vaultProgramId);
     return pda;
 }
-async function getVaultState({ provider, connection, vaultProgramId, idl, }) {
+async function getVaultState({ provider, connection, vaultProgramId, vaultAddress, idl, }) {
     const returnObj = {
         vaultState: null,
         depositMintDecimals: null,
-        vaultToken: {
-            balance: 0,
-            decimals: 0,
-            rawAmount: '0',
-            symbol: '',
-            name: '',
-        },
     };
     try {
-        const cacheKey = `vaultState-${vaultProgramId}`;
+        const cacheKey = `vaultState-${vaultAddress || vaultProgramId}`;
         const cachedData = await (0, core_1.getSafeCache)(cacheKey);
         if (cachedData)
             return cachedData;
         if (!vaultProgramId) {
             throw new Error('Please enter a vault program ID');
         }
-        const vaultStatePda = deriveVaultStatePda(vaultProgramId);
+        const vaultStatePda = vaultAddress
+            ? new web3_js_1.PublicKey(vaultAddress)
+            : deriveVaultStatePda(vaultProgramId);
         const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
         const program = getProgram({
             provider,
@@ -158,23 +159,11 @@ async function getVaultState({ provider, connection, vaultProgramId, idl, }) {
                 const mintInfo = await connection.getParsedAccountInfo(state.depositMint);
                 if (mintInfo.value) {
                     const parsedData = mintInfo.value.data;
-                    const { decimals } = parsedData.parsed.info;
-                    returnObj.depositMintDecimals = decimals;
-                }
-                const vaultTokenAtaPda = deriveVaultTokenAtaPda(vaultProgramId, state.depositMint);
-                const tokenAccountInfo = await connection.getTokenAccountBalance(vaultTokenAtaPda);
-                if (tokenAccountInfo.value) {
-                    returnObj.vaultToken = {
-                        balance: Number(tokenAccountInfo.value.uiAmount),
-                        decimals: Number(tokenAccountInfo.value.decimals),
-                        rawAmount: tokenAccountInfo.value.amount.toString(),
-                        symbol: '',
-                        name: '',
-                    };
+                    returnObj.depositMintDecimals = parsedData.parsed.info.decimals;
                 }
             }
-            catch (balanceError) {
-                console.error('Error fetching vault token balance:', balanceError);
+            catch (mintError) {
+                console.error('Error fetching deposit mint decimals:', mintError);
             }
         }
         await (0, core_1.setSafeCache)(cacheKey, returnObj);
@@ -186,20 +175,13 @@ async function getVaultState({ provider, connection, vaultProgramId, idl, }) {
         return returnObj;
     }
 }
-async function getVaultStateReadOnly({ vaultProgramId, connection, idl, }) {
+async function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connection, idl, }) {
     const returnObj = {
         vaultState: null,
         depositMintDecimals: null,
-        vaultToken: {
-            balance: 0,
-            decimals: 0,
-            rawAmount: '0',
-            symbol: '',
-            name: '',
-        },
     };
     try {
-        const cacheKey = `vaultState-${vaultProgramId}`;
+        const cacheKey = `vaultState-${vaultAddress || vaultProgramId}`;
         const cachedData = await (0, core_1.getSafeCache)(cacheKey);
         if (cachedData)
             return cachedData;
@@ -207,7 +189,9 @@ async function getVaultStateReadOnly({ vaultProgramId, connection, idl, }) {
             throw new Error('Please enter a vault program ID');
         }
         const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
-        const vaultStatePda = deriveVaultStatePda(_vaultProgramId);
+        const vaultStatePda = vaultAddress
+            ? new web3_js_1.PublicKey(vaultAddress)
+            : deriveVaultStatePda(_vaultProgramId);
         const accountInfo = await connection.getAccountInfo(vaultStatePda);
         if (!accountInfo) {
             console.warn('Vault state account not found');
@@ -227,23 +211,11 @@ async function getVaultStateReadOnly({ vaultProgramId, connection, idl, }) {
                     const mintInfo = await connection.getParsedAccountInfo(state.depositMint);
                     if (mintInfo.value) {
                         const parsedData = mintInfo.value.data;
-                        const { decimals } = parsedData.parsed.info;
-                        returnObj.depositMintDecimals = decimals;
-                    }
-                    const vaultTokenAtaPda = deriveVaultTokenAtaPda(_vaultProgramId, state.depositMint);
-                    const tokenAccountInfo = await connection.getTokenAccountBalance(vaultTokenAtaPda);
-                    if (tokenAccountInfo.value) {
-                        returnObj.vaultToken = {
-                            balance: Number(tokenAccountInfo.value.uiAmount),
-                            decimals: Number(tokenAccountInfo.value.decimals),
-                            rawAmount: tokenAccountInfo.value.amount.toString(),
-                            symbol: '',
-                            name: '',
-                        };
+                        returnObj.depositMintDecimals = parsedData.parsed.info.decimals;
                     }
                 }
-                catch (balanceError) {
-                    console.error('Error fetching vault token balance:', balanceError);
+                catch (mintError) {
+                    console.error('Error fetching deposit mint decimals:', mintError);
                 }
             }
         }
@@ -267,9 +239,9 @@ async function getVaultStateReadOnly({ vaultProgramId, connection, idl, }) {
         return returnObj;
     }
 }
-async function getVaultMints({ vaultProgramId, connection, idl, }) {
+async function getVaultMints({ vaultProgramId, vaultAddress, connection, idl, }) {
     try {
-        const cacheKey = `vaultMints-${vaultProgramId}`;
+        const cacheKey = `vaultMints-${vaultAddress || vaultProgramId}`;
         const cachedData = await (0, core_1.getSafeCache)(cacheKey);
         if (cachedData)
             return cachedData;
@@ -277,7 +249,9 @@ async function getVaultMints({ vaultProgramId, connection, idl, }) {
             throw new Error('Please enter a vault program ID');
         }
         const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
-        const vaultStatePda = deriveVaultStatePda(_vaultProgramId);
+        const vaultStatePda = vaultAddress
+            ? new web3_js_1.PublicKey(vaultAddress)
+            : deriveVaultStatePda(_vaultProgramId);
         const readOnlyProvider = getReadOnlyProvider({ connection });
         const program = getProgram({
             provider: readOnlyProvider,
@@ -288,16 +262,20 @@ async function getVaultMints({ vaultProgramId, connection, idl, }) {
         const returnObj = {
             depositMint: state.depositMint.toString(),
             shareMint: state.shareMint.toString(),
+            vaultVersion: Array.isArray(state.vaultVersion)
+                ? state.vaultVersion[0]
+                : undefined,
         };
         await (0, core_1.setSafeCache)(cacheKey, returnObj);
         return returnObj;
     }
     catch (e) {
         const error = e;
-        console.error('Error reading vault state:', error);
+        console.error('Error reading vault mints:', error);
         return {
             depositMint: '',
             shareMint: '',
+            vaultVersion: undefined,
         };
     }
 }
@@ -453,6 +431,9 @@ async function fetchUserShareBalance({ connection, publicKey, shareMint, network
         return 0;
     }
 }
+function resolveProgramId(vaultAddress, solanaMetadata) {
+    return solanaMetadata?.program_id || vaultAddress;
+}
 exports.SolanaUtils = {
     getExplorerLink,
     isSolanaAddress,
@@ -474,5 +455,6 @@ exports.SolanaUtils = {
     fallbackNetwork: constants_1.fallbackNetwork,
     programIds: constants_1.programIds,
     getVaultMints,
+    resolveProgramId,
 };
 //# sourceMappingURL=utils.js.map

package/lib/adapters/solana/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/utils.ts"],"names":[],"mappings":";;;AAAA,8CAAkE;AAClE,6CAAyD;AACzD,mCAAmC;AAMnC,2CAMqB;AACrB,qCAAwD;AAMxD,SAAS,eAAe,CAAC,EACvB,SAAS,EACT,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,2BAAe,GAIC;IAC1B,MAAM,OAAO,GAAG,oBAAoB,CAAC;IACrC,OAAO,GAAG,OAAO,IAAI,IAAI,IAAI,SAAS,YAAY,OAAO,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,IAAA,kBAAS,EAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,mBAAS,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB;IACjC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG9D,IAAI,IAAA,kBAAS,EAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IAIvC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,mBAAS,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;IAGjB,CAAC;IAID,MAAM,WAAW,GACf,4DAA4D,CAAC;IAC/D,MAAM,aAAa,GAAI,SAAoB;SACxC,KAAK,CAAC,EAAE,CAAC;SACT,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/C,IAAI,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IAGjC,OAAO,CACJ,SAAoB,CAAC,MAAM,IAAI,EAAE,IAAK,SAAoB,CAAC,MAAM,IAAI,GAAG,CAC1E,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,EAClB,QAAQ,EACR,GAAG,EACH,SAAS,EACT,OAAO,GAImB;IAC1B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,gBAAO,CAAC,oBAAQ,EAAE,QAAQ,CAAiB,CAAC;IACzD,CAAC;IAGD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,WAAW,GAAG;YAClB,GAAG,GAAG;YACN,OAAO,EAAE,SAAS;SACnB,CAAC;QACF,OAAO,IAAI,gBAAO,CAAC,WAAW,EAAE,QAAQ,CAAiB,CAAC;IAC5D,CAAC;IAED,OAAO,IAAI,gBAAO,CAAC,GAAG,EAAE,QAAQ,CAAiB,CAAC;AACpD,CAAC;AAKD,KAAK,UAAU,eAAe,CAAC,EAAE,UAAU,EAA4B;IACrE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,CAAC;QACtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,kBAAkB,CAAC,EAChC,QAAQ,EACR,OAAO,GAAG,2BAAe,EACzB,UAAU,GACe;IACzB,MAAM,eAAe,GAAG,QAAQ,CAAC;IACjC,MAAM,gBAAgB,GACpB,gCAAoB,CAAC,OAA4C,CAAC,CAAC;IAGrE,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1D,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,eAAe,CAAC;IACzB,CAAC;IAGD,OAAO,CAAC,IAAI,CACV,iDAAiD,EACjD,gBAAgB,CACjB,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,WAAW,CAAC,EACnB,UAAU,EACV,SAAS,EACT,eAAe,GAQW;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,eAAe,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,uBAAc,CACvB,UAAU,EACV;QACE,SAAS;QACT,eAAe;QACf,mBAAmB,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YAEtC,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAO,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAChD,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC;KACF,EACD,EAAE,UAAU,EAAE,WAAW,EAAE,CAC5B,CAAC;AACJ,CAAC;AAGD,SAAS,mBAAmB,CAAC,EAAE,UAAU,EAA4B;IAEnE,MAAM,WAAW,GAAG;QAClB,SAAS,EAAE,mBAAS,CAAC,OAAO;QAC5B,eAAe,EAAE,KAAK,EACpB,GAAM,EACM,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,mBAAmB,EAAE,KAAK,EAGxB,IAAS,EACK,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,uBAAc,CAAC,UAAU,EAAE,WAAW,EAAE;QACjD,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;AACL,CAAC;AAMD,SAAS,mBAAmB,CAAC,cAAkC;IAC7D,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EACzC,eAAe,CAChB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,kBAAkB,CAAC,cAAkC;IAC5D,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAClC,eAAe,CAChB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,sBAAsB,CAC7B,cAAkC,EAClC,WAAsB;IAEtB,IAAI,CAAC,CAAC,cAAc,IAAI,WAAW,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,EACjE,eAAe,CAChB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAMD,KAAK,UAAU,aAAa,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,cAAc,EACd,GAAG,GAIuB;IAK1B,MAAM,SAAS,GAIX;QACF,UAAU,EAAE,IAAI;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE;YACV,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,EAAE;SACT;KACF,CAAC;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,cAAc,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAIN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,UAAU,CAAC;YACzB,QAAQ;YACR,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;QACF,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;QAG7B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC;gBAEH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACpD,KAAK,CAAC,WAAW,CAClB,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAEjC,CAAC;oBACF,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC5C,SAAS,CAAC,mBAAmB,GAAG,QAAQ,CAAC;gBAC3C,CAAC;gBAED,MAAM,gBAAgB,GAAG,sBAAsB,CAC7C,cAAc,EACd,KAAK,CAAC,WAAW,CAClB,CAAC;gBACF,MAAM,gBAAgB,GACpB,MAAM,UAAU,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;gBAE5D,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;oBAC3B,SAAS,CAAC,UAAU,GAAG;wBACrB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;wBAChD,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;wBACjD,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;wBACnD,MAAM,EAAE,EAAE;wBACV,IAAI,EAAE,EAAE;qBACT,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,YAAY,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,YAAY,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,MAAM,IAAA,mBAAY,EAIf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,qBAAqB,CAAC,EACnC,cAAc,EACd,UAAU,EACV,GAAG,GAIuB;IAK1B,MAAM,SAAS,GAIX;QACF,UAAU,EAAE,IAAI;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE;YACV,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,EAAE;SACT;KACF,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,cAAc,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAIN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAG3D,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAEnE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC;QACnB,CAAC;QAGD,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,UAAU,CAAC;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,GAAG;gBACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;YACF,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;YAG7B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtB,IAAI,CAAC;oBAEH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACpD,KAAK,CAAC,WAAW,CAClB,CAAC;oBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;wBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAEjC,CAAC;wBACF,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;wBAC5C,SAAS,CAAC,mBAAmB,GAAG,QAAQ,CAAC;oBAC3C,CAAC;oBAED,MAAM,gBAAgB,GAAG,sBAAsB,CAC7C,eAAe,EACf,KAAK,CAAC,WAAW,CAClB,CAAC;oBACF,MAAM,gBAAgB,GACpB,MAAM,UAAU,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;oBAE5D,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;wBAC3B,SAAS,CAAC,UAAU,GAAG;4BACrB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAChD,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;4BACjD,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;4BACnD,MAAM,EAAE,EAAE;4BACV,IAAI,EAAE,EAAE;yBACT,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,YAAY,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACX,iDAAiD,EACjD,YAAY,CACb,CAAC;YAEF,SAAS,CAAC,UAAU,GAAG;gBACrB,OAAO,EAAE,aAAa,CAAC,QAAQ,EAAE;gBACjC,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,SAAS,EAAE,WAAW,CAAC,SAAS;aACjC,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,mBAAY,EAIf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,aAAa,CAAC,EAC3B,cAAc,EACd,UAAU,EACV,GAAG,GAIuB;IAI1B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,cAAc,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAGN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAE3D,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,UAAU,CAAC;YACzB,QAAQ,EAAE,gBAAgB;YAC1B,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;QAEF,MAAM,SAAS,GAAG;YAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;SACtC,CAAC;QACF,MAAM,IAAA,mBAAY,EAGf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO;YACL,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,EAAE;SACd,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,EACtB,WAAW,EACX,QAAQ,EACR,UAAU,GAGgB;IAO1B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,gBAAgB,WAAW,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YAAE,OAAO,UAA0B,CAAC;QAGlD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE;aACvC,CAAC;SACH,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAQ,CAAC;QAG5C,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO;gBACL,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;gBACvD,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ;gBAC3C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,IAAI,SAAS;gBACvD,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK;gBAC3C,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa;gBAC/C,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc;gBACtD,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB;gBAC1D,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM;aACxB,CAAC;QACpB,CAAC;QAID,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;gBAGlD,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC;oBAC7C,cAAc;oBACd,UAAU;oBACV,GAAG,EAAE,oBAAQ;iBACd,CAAC,CAAC;gBAGH,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;oBAGxD,MAAM,aAAa,GACjB,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;oBAEtD,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;wBACxB,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAEtC,CAAC;wBAGF,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;4BAC9C,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;6BACnC;4BACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACnB,OAAO,EAAE,KAAK;gCACd,EAAE,EAAE,MAAM;gCACV,MAAM,EAAE,UAAU;gCAClB,MAAM,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,EAAE,EAAE;6BACxC,CAAC;yBACH,CAAC,CAAC;wBACH,MAAM,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAQ,CAAC;wBAE9D,MAAM,SAAS,GAAG;4BAChB,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE;4BAC/B,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;4BAChE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ;4BACzC,IAAI,EACF,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI;gCAC7C,mBAAmB;4BACrB,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK;4BACrD,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa;4BACxD,aAAa,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc;4BAC/D,eAAe,EACb,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB;4BACpD,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM;4BACrC,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE;yBAC1B,CAAC;wBAClB,MAAM,IAAA,mBAAY,EAAe,QAAQ,EAAE,SAAS,CAAC,CAAC;wBACtD,OAAO,SAAS,CAAC;oBACnB,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBAEpB,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,UAAU,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,cAAc,CAAC,EAC5B,QAAQ,EACR,WAAW,GAGe;IAC1B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAChE,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,MAAM,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,EACnC,UAAU,EACV,SAAS,EACT,WAAW,GAIe;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW;QAAE,OAAO,GAAG,CAAC;IAE3C,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAClE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,OAAO,GACX,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW;iBAC5D,QAAQ,CAAC;YACd,OAAO,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC;QACpC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,EACnC,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,GAImB;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,YAAY,GAAG,kBAAkB,CACrC,IAAI,mBAAS,CAAC,sBAAU,CAAC,OAAkC,CAAC,CAAC,KAAK,CAAC,CACpE,CAAC;QAGF,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAC1E,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YACxE,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAEtC,CAAC;QACF,MAAM,aAAa,GACjB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,4BAAgB,GAAG,CAAC,CAAC;QAE1D,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAClE,UAAU,EACV;YACE,IAAI,EAAE,UAAU;SACjB,CACF,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,UAAU,GACd,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAEzE,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC;YACzD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAEY,QAAA,WAAW,GAAG;IACzB,eAAe;IACf,eAAe;IACf,QAAQ;IACR,UAAU;IACV,WAAW;IACX,mBAAmB;IACnB,kBAAkB;IAClB,mBAAmB;IACnB,sBAAsB;IACtB,aAAa;IACb,qBAAqB;IACrB,QAAQ;IACR,cAAc;IACd,qBAAqB;IACrB,qBAAqB;IACrB,kBAAkB;IAClB,gBAAgB,EAAhB,4BAAgB;IAChB,eAAe,EAAf,2BAAe;IACf,UAAU,EAAV,sBAAU;IACV,aAAa;CACd,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/utils.ts"],"names":[],"mappings":"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"}

package/lib/adapters/solana/vault.actions.d.ts

@@ -2,16 +2,18 @@ import { web3 } from '@coral-xyz/anchor';
 import { Connection, PublicKey, Transaction } from '@solana/web3.js';
 import { ISolanaConnectionOptions } from './types';
 import { SendTransactionOptions } from '@solana/wallet-adapter-base';
-export declare function handleSolanaDeposit({ provider, connection, network, vaultProgramId, depositAmount, publicKey, sendTransaction, idl, }: {
+export declare function handleSolanaDeposit({ provider, connection, network, vaultProgramId, vaultAddress, depositAmount, publicKey, sendTransaction, idl, }: {
     vaultProgramId: PublicKey | string;
+    vaultAddress?: PublicKey | string;
     idl: any;
     publicKey: PublicKey | string;
     depositAmount: number;
     sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>;
 } & ISolanaConnectionOptions): Promise<any>;
-export declare function handleSolanaRedeem({ provider, connection, vaultProgramId, publicKey, redeemShares, sendTransaction, idl, }: {
+export declare function handleSolanaRedeem({ provider, connection, vaultProgramId, vaultAddress, publicKey, redeemShares, sendTransaction, idl, }: {
     idl: any;
     vaultProgramId: PublicKey | string;
+    vaultAddress?: PublicKey | string;
     publicKey: PublicKey | string;
     redeemShares: number;
     sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>;

package/lib/adapters/solana/vault.actions.js

@@ -7,7 +7,7 @@ const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
-async function handleSolanaDeposit({ provider, connection, network = constants_1.fallbackNetwork, vaultProgramId, depositAmount, publicKey, sendTransaction, idl, }) {
+async function handleSolanaDeposit({ provider, connection, network = constants_1.fallbackNetwork, vaultProgramId, vaultAddress, depositAmount, publicKey, sendTransaction, idl, }) {
     try {
         if (!publicKey)
             throw new Error('Wallet not connected');
@@ -15,12 +15,16 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
             throw new Error('Please enter an amount to deposit');
         if (!vaultProgramId)
             throw new Error('Please enter a vault program ID');
-        const { depositMint } = await utils_1.SolanaUtils.getVaultMints({
+        const { depositMint, shareMint, vaultVersion } = await utils_1.SolanaUtils.getVaultMints({
             network,
             connection,
             vaultProgramId,
+            vaultAddress,
             idl,
         });
+        if (!depositMint || !shareMint) {
+            throw new Error('Failed to read vault mints from on-chain state');
+        }
         const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
         const _publicKey = new web3_js_1.PublicKey(publicKey);
         const _depositMint = new web3_js_1.PublicKey(depositMint);
@@ -30,12 +34,14 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
             programId: _vaultProgramId.toBase58(),
         });
         console.log('Program', program);
-        const vaultStatePda = utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
+        const vaultStatePda = vaultAddress
+            ? new web3_js_1.PublicKey(vaultAddress)
+            : utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
         console.log('Vault state PDA', vaultStatePda.toBase58());
-        const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint);
+        const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint, vaultVersion);
         console.log('Vault token ATA PDA', vaultTokenAtaPda.toBase58());
-        const shareMintPda = utils_1.SolanaUtils.deriveShareMintPda(_vaultProgramId);
-        console.log('Share mint PDA', shareMintPda.toBase58());
+        const shareMintAddr = new web3_js_1.PublicKey(shareMint);
+        console.log('Share mint', shareMintAddr.toBase58());
         const mintInfo = await connection.getParsedAccountInfo(_depositMint);
         if (!mintInfo.value) {
             throw new Error('Could not fetch mint info');
@@ -58,7 +64,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
         });
         console.log('User token accounts', userTokenAccounts);
         const userShareAccounts = await connection.getParsedTokenAccountsByOwner(_publicKey, {
-            mint: shareMintPda,
+            mint: shareMintAddr,
         });
         console.log('User share accounts', userShareAccounts);
         if (userTokenAccounts.value.length === 0) {
@@ -67,9 +73,9 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
         let senderShareAccount;
         if (userShareAccounts.value.length === 0) {
             console.log('Creating share account');
-            senderShareAccount = await (0, spl_token_1.getAssociatedTokenAddress)(shareMintPda, _publicKey);
+            senderShareAccount = await (0, spl_token_1.getAssociatedTokenAddress)(shareMintAddr, _publicKey);
             console.log('Sender share account', senderShareAccount.toBase58());
-            const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(_publicKey, senderShareAccount, _publicKey, shareMintPda);
+            const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(_publicKey, senderShareAccount, _publicKey, shareMintAddr);
             console.log('Create ATA Ix', createAtaIx.programId.toBase58());
             const transaction = new web3_js_1.Transaction().add(createAtaIx);
             const signature = await sendTransaction(transaction, connection);
@@ -86,7 +92,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
         console.log('Vault token ATA PDA', vaultTokenAtaPda.toBase58());
         console.log('Sender token account', senderTokenAccount?.toBase58());
         console.log('Sender share account', senderShareAccount?.toBase58());
-        console.log('Share mint PDA', shareMintPda.toBase58());
+        console.log('Share mint', shareMintAddr.toBase58());
         console.log('Deposit mint', _depositMint?.toBase58());
         console.log('Signer', _publicKey.toBase58());
         const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
@@ -97,7 +103,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
             vaultTokenAta: vaultTokenAtaPda,
             senderTokenAccount,
             senderShareAccount,
-            shareMint: shareMintPda,
+            shareMint: shareMintAddr,
             depositMint: depositMint,
             signer: publicKey,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -119,7 +125,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
         return null;
     }
 }
-async function handleSolanaRedeem({ provider, connection, vaultProgramId, publicKey, redeemShares, sendTransaction, idl, }) {
+async function handleSolanaRedeem({ provider, connection, vaultProgramId, vaultAddress, publicKey, redeemShares, sendTransaction, idl, }) {
     try {
         if (!publicKey)
             throw new Error('Wallet not connected');
@@ -127,14 +133,18 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, public
             throw new Error('Please enter shares to redeem');
         if (!vaultProgramId)
             throw new Error('Please enter a vault program ID');
-        const { depositMint } = await utils_1.SolanaUtils.getVaultMints({
+        const { depositMint, shareMint, vaultVersion } = await utils_1.SolanaUtils.getVaultMints({
             network: provider.connection.rpcEndpoint.includes('devnet')
                 ? 'devnet'
                 : 'mainnet-beta',
             connection,
             vaultProgramId,
+            vaultAddress,
             idl,
         });
+        if (!depositMint || !shareMint) {
+            throw new Error('Failed to read vault mints from on-chain state');
+        }
         const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
         const _depositMint = new web3_js_1.PublicKey(depositMint);
         const _publicKey = new web3_js_1.PublicKey(publicKey);
@@ -143,10 +153,12 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, public
             idl,
             programId: _vaultProgramId.toBase58(),
         });
-        const vaultStatePda = utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
-        const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint);
-        const shareMintPda = utils_1.SolanaUtils.deriveShareMintPda(_vaultProgramId);
-        const shareMintInfo = await connection.getParsedAccountInfo(shareMintPda);
+        const vaultStatePda = vaultAddress
+            ? new web3_js_1.PublicKey(vaultAddress)
+            : utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
+        const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint, vaultVersion);
+        const shareMintAddr = new web3_js_1.PublicKey(shareMint);
+        const shareMintInfo = await connection.getParsedAccountInfo(shareMintAddr);
         if (!shareMintInfo.value) {
             throw new Error('Could not fetch share mint info');
         }
@@ -169,7 +181,7 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, public
             mint: _depositMint,
         });
         const userShareAccounts = await connection.getParsedTokenAccountsByOwner(_publicKey, {
-            mint: shareMintPda,
+            mint: shareMintAddr,
         });
         if (userTokenAccounts.value.length === 0) {
             throw new Error('No token account found for deposit mint. Please create a token account first.');
@@ -207,7 +219,7 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, public
         console.log('Sender token account:', senderTokenAccount?.toBase58());
         console.log('Sender share account:', senderShareAccount?.toBase58());
         console.log('Fee recipient account:', feeRecipientTokenAccount.toBase58());
-        console.log('Share mint PDA:', shareMintPda.toBase58());
+        console.log('Share mint:', shareMintAddr.toBase58());
         console.log('Deposit mint:', _depositMint?.toBase58());
         console.log('Signer:', _publicKey.toBase58());
         const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
@@ -219,7 +231,7 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, public
             senderTokenAccount,
             senderShareAccount,
             feeRecipientAccount: feeRecipientTokenAccount,
-            shareMint: shareMintPda,
+            shareMint: shareMintAddr,
             depositMint: _depositMint,
             signer: _publicKey,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,

package/lib/adapters/solana/vault.actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"vault.actions.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/vault.actions.ts"],"names":[],"mappings":";;AAYA,kDAsLC;AAED,gDAmNC;AAvZD,8CAA6C;AAC7C,6CAAqE;AAGrE,iDAI2B;AAC3B,2CAA8C;AAC9C,mCAAsC;AAE/B,KAAK,UAAU,mBAAmB,CAAC,EACxC,QAAQ,EACR,UAAU,EACV,OAAO,GAAG,2BAAe,EACzB,cAAc,EACd,aAAa,EACb,SAAS,EACT,eAAe,EACf,GAAG,GAWuB;IAC1B,IAAI,CAAC;QACH,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAExE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,mBAAW,CAAC,aAAa,CAAC;YACtD,OAAO;YACP,UAAU;YACV,cAAc;YACd,GAAG;SACJ,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,mBAAW,CAAC,UAAU,CAAC;YACrC,QAAQ;YACR,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,mBAAW,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,mBAAW,CAAC,sBAAsB,CACzD,eAAe,EACf,YAAY,CACb,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,mBAAW,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QAGvD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,GAAI,QAAQ,CAAC,KAAK,CAAC,IAAY,CAAC,MAAM,CAAC,IAAI,CAAC;QAC9D,CAAC,CAAC;QAGF,MAAM,gBAAgB,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QAClD,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,EAAE,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAG3D,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,KAAK,GAAG,cAAc,CAAC;QAG5C,MAAM,gBAAgB,GAAG,IAAI,WAAE,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC;QAGxE,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAGD,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACtE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEtD,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACtE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEtD,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,IAAI,kBAAyC,CAAC;QAE9C,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAEtC,kBAAkB,GAAG,MAAM,IAAA,qCAAyB,EAClD,YAAY,EACZ,UAAU,CACX,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;YAGnE,MAAM,WAAW,GAAG,IAAA,mDAAuC,EACzD,UAAU,EACV,kBAAkB,EAClB,UAAU,EACV,YAAY,CACb,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE/D,MAAM,WAAW,GAAG,IAAI,qBAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YACjE,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,kBAAkB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAC1D,CAAC;QAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAAC;QAExD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAG7C,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,GACvC,MAAM,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,EAAE,GAAG,MAAO,OAAO,CAAC,OAAe;aACtC,OAAO,CAAC,IAAI,WAAE,CAAC,gBAAgB,CAAC,CAAC;aACjC,QAAQ,CAAC;YACR,UAAU,EAAE,aAAa;YACzB,aAAa,EAAE,gBAAgB;YAC/B,kBAAkB;YAClB,kBAAkB;YAClB,SAAS,EAAE,YAAY;YACvB,WAAW,EAAE,WAAW;YACxB,MAAM,EAAE,SAAS;YACjB,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,GAAG,CAAC;YACH,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,WAAW;SACjC,CAAC,CAAC;QAEL,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QAGvC,MAAM,UAAU,CAAC,kBAAkB,CACjC;YACE,SAAS,EAAE,EAAE;YACb,SAAS;YACT,oBAAoB;SACrB,EACD,WAAW,CACZ,CAAC;QAEF,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,EACvC,QAAQ,EACR,UAAU,EACV,cAAc,EACd,SAAS,EACT,YAAY,EACZ,eAAe,EACf,GAAG,GAWuB;IAC1B,IAAI,CAAC;QACH,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAExE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,mBAAW,CAAC,aAAa,CAAC;YACtD,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACzD,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,cAAc;YAClB,UAAU;YACV,cAAc;YACd,GAAG;SACJ,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,mBAAW,CAAC,UAAU,CAAC;YACrC,QAAQ;YACR,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,mBAAW,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,gBAAgB,GAAG,mBAAW,CAAC,sBAAsB,CACzD,eAAe,EACf,YAAY,CACb,CAAC;QACF,MAAM,YAAY,GAAG,mBAAW,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAGrE,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAC1E,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAI,aAAa,CAAC,KAAK,CAAC,IAAY,CAAC,MAAM,CAAC,IAAI;aAChE,QAAQ,CAAC;QAIZ,MAAM,eAAe,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAG1D,MAAM,cAAc,GAAG,QAAQ;aAC5B,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC;aAC1B,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QAC3B,MAAM,YAAY,GAAG,KAAK,GAAG,cAAc,CAAC;QAG5C,MAAM,eAAe,GAAG,QAAQ,CAC9B,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,EACtC,EAAE,CACH,CAAC;QAGF,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QAGD,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACtE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QAEF,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACtE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QAEF,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;QACJ,CAAC;QAED,MAAM,kBAAkB,GAAG,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAC/D,MAAM,kBAAkB,GAAG,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QAG/D,MAAM,gBAAgB,GAAG,mBAAW,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,mBAAW,CAAC,UAAU,CAAC;YAC7C,QAAQ,EAAE,gBAAgB;YAC1B,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MACrB,eAAe,CAAC,OACjB,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAGlC,MAAM,wBAAwB,GAAG,MAAM,IAAA,qCAAyB,EAC9D,YAAY,EACZ,cAAc,CAAC,YAAY,CAC5B,CAAC;QAGF,MAAM,uBAAuB,GAAG,MAAM,UAAU,CAAC,cAAc,CAC7D,wBAAwB,CACzB,CAAC;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC7B,MAAM,uBAAuB,GAAG,IAAA,mDAAuC,EACrE,UAAU,EACV,wBAAwB,EACxB,cAAc,CAAC,YAAY,EAC3B,YAAY,CACb,CAAC;YAEF,MAAM,eAAe,GAAG,IAAI,qBAAW,EAAE,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACvE,MAAM,sBAAsB,GAAG,MAAM,eAAe,CAClD,eAAe,EACf,UAAU,CACX,CAAC;YACF,OAAO,CAAC,GAAG,CACT,sCAAsC,EACtC,sBAAsB,CACvB,CAAC;YAGF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,eAAe,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,wBAAwB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QAG9C,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,GACvC,MAAM,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEnD,MAAM,EAAE,GAAG,MAAO,OAAO,CAAC,OAAe;aACtC,MAAM,CAAC,IAAI,WAAE,CAAC,eAAe,CAAC,CAAC;aAC/B,QAAQ,CAAC;YACR,UAAU,EAAE,aAAa;YACzB,eAAe,EAAE,gBAAgB;YACjC,kBAAkB;YAClB,kBAAkB;YAClB,mBAAmB,EAAE,wBAAwB;YAC7C,SAAS,EAAE,YAAY;YACvB,WAAW,EAAE,YAAY;YACzB,MAAM,EAAE,UAAU;YAClB,YAAY,EAAE,4BAAgB;SAC/B,CAAC;aACD,GAAG,CAAC;YACH,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,WAAW;SACjC,CAAC,CAAC;QAEL,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QAGtC,MAAM,UAAU,CAAC,kBAAkB,CACjC;YACE,SAAS,EAAE,EAAE;YACb,SAAS;YACT,oBAAoB;SACrB,EACD,WAAW,CACZ,CAAC;QAEF,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"vault.actions.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/vault.actions.ts"],"names":[],"mappings":"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"}

package/lib/adapters/sui/transformer.js

@@ -44,7 +44,11 @@ function transformEmberVaultToIVault(emberVault) {
                 constants_1.EMBER_DEFAULTS.BPS_TO_PERCENT,
             management: (0, utils_1.convertFromE9)(emberVault.managementFeePercentE9 || 0) * 100,
             isManagementWaived: false,
+            managementFeeWaivedUntilDate: null,
+            managementFeeWaivedUntilTvl: null,
             isPerformanceWaived: false,
+            performanceFeeWaivedUntilDate: null,
+            performanceFeeWaivedUntilTvl: null,
         },
         rewards: {
             points: '5x Upshift Points',

package/lib/adapters/sui/transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src.ts/adapters/sui/transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src.ts/adapters/sui/transformer.ts"],"names":[],"mappings":"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"}

package/lib/core/fetcher.js

@@ -17,7 +17,7 @@ const core_1 = require("./helpers/core");
 const ethers_1 = require("ethers");
 const abis_1 = require("../abis");
 const lru_cache_1 = require("lru-cache");
-const solana_1 = require("../adapters/solana");
+const utils_1 = require("../adapters/solana/utils");
 const fetcher_1 = require("../services/coingecko/fetcher");
 const logger_1 = require("./logger");
 const web3_1 = require("./helpers/web3");
@@ -253,7 +253,7 @@ async function fetchTokenizedVault(pool, headers, loadSubaccounts, loadSnapshots
         tokenizedVault = (await tokenizedVaultsResponse.json());
         exports.CACHE.set(key, tokenizedVault, { ttl: 1000 * 60 * 10 });
     }
-    if (pool && ((0, ethers_1.isAddress)(pool) || solana_1.Solana.utils.isSolanaAddress(pool))) {
+    if (pool && ((0, ethers_1.isAddress)(pool) || utils_1.SolanaUtils.isSolanaAddress(pool))) {
         return tokenizedVault ? [tokenizedVault] : [];
     }
     return [tokenizedVault];
@@ -291,7 +291,7 @@ async function fetchTokenizedVaults(pool, headers, loadSubaccounts, loadSnapshot
             (await tokenizedVaultsResponse.json());
         exports.CACHE.set(key, tokenizedVaults);
     }
-    if (pool && ((0, ethers_1.isAddress)(pool) || solana_1.Solana.utils.isSolanaAddress(pool))) {
+    if (pool && ((0, ethers_1.isAddress)(pool) || utils_1.SolanaUtils.isSolanaAddress(pool))) {
         const foundObj = tokenizedVaults.find((t) => t.address.toLowerCase() === pool.toLowerCase());
         return foundObj ? [foundObj] : [];
     }
@@ -342,19 +342,7 @@ async function fetchTokenPrice(symbol, provider, coinGeckoKey, headers) {
     return pricePromise;
 }
 async function _fetchTokenPriceInternal(symbol, provider, coinGeckoKey, headers) {
-    let tokenizedVaults;
-    if (exports.CACHE.get(core_2.WEBSERVER_ENDPOINTS.public.tokenizedVault.list)) {
-        tokenizedVaults = exports.CACHE.get(core_2.WEBSERVER_ENDPOINTS.public.tokenizedVault.list);
-    }
-    else {
-        const tokenizedVaultsResponse = await withRetry(async () => await fetchAugustPublic(core_2.WEBSERVER_ENDPOINTS.public.tokenizedVault.list, { headers: headers }), 5, 2000);
-        if (!tokenizedVaultsResponse.ok) {
-            throw new Error(`fetching tokenized vaults: ${tokenizedVaultsResponse?.statusText}`);
-        }
-        tokenizedVaults =
-            (await tokenizedVaultsResponse.json());
-        exports.CACHE.set(core_2.WEBSERVER_ENDPOINTS.public.tokenizedVault.list, tokenizedVaults);
-    }
+    const tokenizedVaults = await fetchTokenizedVaults(undefined, headers, false, false);
     const vaultArray = tokenizedVaults.map((vault) => ({
         vault: vault.address,
         symbol: vault.receipt_token_symbol,