@glamsystems/glam-sdk 1.1.0-alpha.0 → 1.1.0-alpha.1

package/index.esm.js

@@ -27126,116 +27126,6 @@ var instructions$9 = [
         ],
         args: []
     },
-    {
-        name: "initialize_permissioned_bundle_depositor",
-        docs: [
-            "Initialize a permissioned Neutral user bundle account for the GLAM vault.",
-            "",
-            "- Permission: `InitializePermissionedBundleDepositor`.",
-            "- Policy: `bundle_account` must be present in `NeutralPolicy::bundles_allowlist`."
-        ],
-        discriminator: [
-            157,
-            162,
-            213,
-            42,
-            205,
-            201,
-            37,
-            255
-        ],
-        accounts: [
-            {
-                name: "glam_state",
-                writable: true
-            },
-            {
-                name: "glam_vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "glam_state"
-                        }
-                    ],
-                    program: {
-                        kind: "account",
-                        path: "glam_protocol_program"
-                    }
-                }
-            },
-            {
-                name: "glam_signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "integration_authority",
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                105,
-                                110,
-                                116,
-                                101,
-                                103,
-                                114,
-                                97,
-                                116,
-                                105,
-                                111,
-                                110,
-                                45,
-                                97,
-                                117,
-                                116,
-                                104,
-                                111,
-                                114,
-                                105,
-                                116,
-                                121
-                            ]
-                        }
-                    ]
-                }
-            },
-            {
-                name: "cpi_program",
-                address: "BUNDDh4P5XviMm1f3gCvnq2qKx6TGosAGnoUK12e7cXU"
-            },
-            {
-                name: "glam_protocol_program",
-                address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            },
-            {
-                name: "bundle_account",
-                writable: true
-            },
-            {
-                name: "user_bundle_account",
-                writable: true
-            }
-        ],
-        args: []
-    },
     {
         name: "request_deposit",
         docs: [
@@ -27372,8 +27262,7 @@ var instructions$9 = [
                 writable: true
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "token_program"
             }
         ],
         args: [
@@ -28654,27 +28543,22 @@ var constants$9 = [
     {
         name: "PROTO_NEUTRAL_PERM_CLOSE_USER_BUNDLE_ACCOUNT",
         type: "u64",
-        value: "16"
+        value: "8"
     },
     {
         name: "PROTO_NEUTRAL_PERM_INITIALIZE_BUNDLE_DEPOSITOR",
         type: "u64",
         value: "1"
     },
-    {
-        name: "PROTO_NEUTRAL_PERM_INITIALIZE_PERMISSIONED_BUNDLE_DEPOSITOR",
-        type: "u64",
-        value: "2"
-    },
     {
         name: "PROTO_NEUTRAL_PERM_REQUEST_DEPOSIT",
         type: "u64",
-        value: "4"
+        value: "2"
     },
     {
         name: "PROTO_NEUTRAL_PERM_REQUEST_WITHDRAWAL",
         type: "u64",
-        value: "8"
+        value: "4"
     }
 ];
 var ExtNeutralIdlJson = {
@@ -36125,19 +36009,26 @@ var instructions$7 = [
         args: []
     },
     {
-        name: "price_single_asset_vault",
+        name: "price_neutral_bundle_depositors",
         docs: [
-            "Prices a single asset vault."
+            "Price neutral bundle depositors",
+            "",
+            "Remaining accounts:",
+            "- 4 * N neutral bundle depositor account tuples:",
+            "1. User bundle account",
+            "2. Bundle account",
+            "3. Bundle oracle data account",
+            "4. Bundle asset oracle account"
         ],
         discriminator: [
+            202,
             93,
-            213,
-            219,
-            25,
-            38,
-            74,
-            9,
-            167
+            205,
+            29,
+            37,
+            180,
+            127,
+            102
         ],
         accounts: [
             {
@@ -36208,7 +36099,10 @@ var instructions$7 = [
                 signer: true
             },
             {
-                name: "base_asset_ata"
+                name: "sol_usd_oracle"
+            },
+            {
+                name: "base_asset_oracle"
             },
             {
                 name: "integration_authority",
@@ -36243,6 +36137,68 @@ var instructions$7 = [
                     ]
                 }
             },
+            {
+                name: "glam_config",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                103,
+                                108,
+                                111,
+                                98,
+                                97,
+                                108,
+                                45,
+                                99,
+                                111,
+                                110,
+                                102,
+                                105,
+                                103
+                            ]
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            11,
+                            0,
+                            83,
+                            72,
+                            16,
+                            46,
+                            144,
+                            46,
+                            42,
+                            79,
+                            22,
+                            157,
+                            123,
+                            21,
+                            242,
+                            192,
+                            146,
+                            1,
+                            78,
+                            88,
+                            59,
+                            102,
+                            9,
+                            190,
+                            226,
+                            92,
+                            189,
+                            187,
+                            232,
+                            83,
+                            220
+                        ]
+                    }
+                }
+            },
             {
                 name: "glam_protocol",
                 address: "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz"
@@ -36286,16 +36242,19 @@ var instructions$7 = [
         args: []
     },
     {
-        name: "price_stake_accounts",
+        name: "price_single_asset_vault",
+        docs: [
+            "Prices a single asset vault."
+        ],
         discriminator: [
-            119,
-            137,
+            93,
+            213,
+            219,
+            25,
+            38,
+            74,
             9,
-            15,
-            196,
-            73,
-            30,
-            27
+            167
         ],
         accounts: [
             {
@@ -36366,10 +36325,7 @@ var instructions$7 = [
                 signer: true
             },
             {
-                name: "sol_usd_oracle"
-            },
-            {
-                name: "base_asset_oracle"
+                name: "base_asset_ata"
             },
             {
                 name: "integration_authority",
@@ -36404,68 +36360,229 @@ var instructions$7 = [
                     ]
                 }
             },
-            {
-                name: "glam_config",
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                103,
-                                108,
-                                111,
-                                98,
-                                97,
-                                108,
-                                45,
-                                99,
-                                111,
-                                110,
-                                102,
-                                105,
-                                103
-                            ]
-                        }
-                    ],
-                    program: {
-                        kind: "const",
-                        value: [
-                            10,
-                            11,
-                            0,
-                            83,
-                            72,
-                            16,
-                            46,
-                            144,
-                            46,
-                            42,
-                            79,
-                            22,
-                            157,
-                            123,
-                            21,
-                            242,
-                            192,
-                            146,
-                            1,
-                            78,
-                            88,
-                            59,
-                            102,
-                            9,
-                            190,
-                            226,
-                            92,
-                            189,
-                            187,
-                            232,
-                            83,
-                            220
-                        ]
-                    }
-                }
-            },
+            {
+                name: "glam_protocol",
+                address: "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz"
+            },
+            {
+                name: "event_authority",
+                optional: true,
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                95,
+                                95,
+                                101,
+                                118,
+                                101,
+                                110,
+                                116,
+                                95,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "event_program",
+                optional: true,
+                address: "gstgm1M39mhgnvgyScGUDRwNn5kNVSd97hTtyow1Et5"
+            }
+        ],
+        args: []
+    },
+    {
+        name: "price_stake_accounts",
+        discriminator: [
+            119,
+            137,
+            9,
+            15,
+            196,
+            73,
+            30,
+            27
+        ],
+        accounts: [
+            {
+                name: "glam_state",
+                writable: true
+            },
+            {
+                name: "glam_vault",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                118,
+                                97,
+                                117,
+                                108,
+                                116
+                            ]
+                        },
+                        {
+                            kind: "account",
+                            path: "glam_state"
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            55,
+                            49,
+                            193,
+                            142,
+                            247,
+                            75,
+                            193,
+                            33,
+                            61,
+                            5,
+                            218,
+                            254,
+                            219,
+                            143,
+                            206,
+                            156,
+                            138,
+                            14,
+                            32,
+                            89,
+                            232,
+                            248,
+                            173,
+                            46,
+                            77,
+                            46,
+                            206,
+                            189,
+                            171,
+                            68,
+                            237
+                        ]
+                    }
+                }
+            },
+            {
+                name: "signer",
+                writable: true,
+                signer: true
+            },
+            {
+                name: "sol_usd_oracle"
+            },
+            {
+                name: "base_asset_oracle"
+            },
+            {
+                name: "integration_authority",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                105,
+                                110,
+                                116,
+                                101,
+                                103,
+                                114,
+                                97,
+                                116,
+                                105,
+                                111,
+                                110,
+                                45,
+                                97,
+                                117,
+                                116,
+                                104,
+                                111,
+                                114,
+                                105,
+                                116,
+                                121
+                            ]
+                        }
+                    ]
+                }
+            },
+            {
+                name: "glam_config",
+                pda: {
+                    seeds: [
+                        {
+                            kind: "const",
+                            value: [
+                                103,
+                                108,
+                                111,
+                                98,
+                                97,
+                                108,
+                                45,
+                                99,
+                                111,
+                                110,
+                                102,
+                                105,
+                                103
+                            ]
+                        }
+                    ],
+                    program: {
+                        kind: "const",
+                        value: [
+                            10,
+                            11,
+                            0,
+                            83,
+                            72,
+                            16,
+                            46,
+                            144,
+                            46,
+                            42,
+                            79,
+                            22,
+                            157,
+                            123,
+                            21,
+                            242,
+                            192,
+                            146,
+                            1,
+                            78,
+                            88,
+                            59,
+                            102,
+                            9,
+                            190,
+                            226,
+                            92,
+                            189,
+                            187,
+                            232,
+                            83,
+                            220
+                        ]
+                    }
+                }
+            },
             {
                 name: "glam_protocol",
                 address: "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz"
@@ -53716,116 +53833,6 @@ var instructions = [
         ],
         args: []
     },
-    {
-        name: "initialize_permissioned_bundle_depositor",
-        docs: [
-            "Initialize a permissioned Neutral user bundle account for the GLAM vault.",
-            "",
-            "- Permission: `InitializePermissionedBundleDepositor`.",
-            "- Policy: `bundle_account` must be present in `NeutralPolicy::bundles_allowlist`."
-        ],
-        discriminator: [
-            157,
-            162,
-            213,
-            42,
-            205,
-            201,
-            37,
-            255
-        ],
-        accounts: [
-            {
-                name: "glam_state",
-                writable: true
-            },
-            {
-                name: "glam_vault",
-                writable: true,
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                118,
-                                97,
-                                117,
-                                108,
-                                116
-                            ]
-                        },
-                        {
-                            kind: "account",
-                            path: "glam_state"
-                        }
-                    ],
-                    program: {
-                        kind: "account",
-                        path: "glam_protocol_program"
-                    }
-                }
-            },
-            {
-                name: "glam_signer",
-                writable: true,
-                signer: true
-            },
-            {
-                name: "integration_authority",
-                pda: {
-                    seeds: [
-                        {
-                            kind: "const",
-                            value: [
-                                105,
-                                110,
-                                116,
-                                101,
-                                103,
-                                114,
-                                97,
-                                116,
-                                105,
-                                111,
-                                110,
-                                45,
-                                97,
-                                117,
-                                116,
-                                104,
-                                111,
-                                114,
-                                105,
-                                116,
-                                121
-                            ]
-                        }
-                    ]
-                }
-            },
-            {
-                name: "cpi_program",
-                address: "BUNDDh4P5XviMm1f3gCvnq2qKx6TGosAGnoUK12e7cXU"
-            },
-            {
-                name: "glam_protocol_program",
-                address: "gstgptmbgJVi5f8ZmSRVZjZkDQwqKa3xWuUtD5WmJHz"
-            },
-            {
-                name: "system_program",
-                address: "11111111111111111111111111111111"
-            },
-            {
-                name: "bundle_account",
-                writable: true
-            },
-            {
-                name: "user_bundle_account",
-                writable: true
-            }
-        ],
-        args: []
-    },
     {
         name: "request_deposit",
         docs: [
@@ -53962,8 +53969,7 @@ var instructions = [
                 writable: true
             },
             {
-                name: "token_program",
-                address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                name: "token_program"
             }
         ],
         args: [
@@ -55244,27 +55250,22 @@ var constants = [
     {
         name: "PROTO_NEUTRAL_PERM_CLOSE_USER_BUNDLE_ACCOUNT",
         type: "u64",
-        value: "16"
+        value: "8"
     },
     {
         name: "PROTO_NEUTRAL_PERM_INITIALIZE_BUNDLE_DEPOSITOR",
         type: "u64",
         value: "1"
     },
-    {
-        name: "PROTO_NEUTRAL_PERM_INITIALIZE_PERMISSIONED_BUNDLE_DEPOSITOR",
-        type: "u64",
-        value: "2"
-    },
     {
         name: "PROTO_NEUTRAL_PERM_REQUEST_DEPOSIT",
         type: "u64",
-        value: "4"
+        value: "2"
     },
     {
         name: "PROTO_NEUTRAL_PERM_REQUEST_WITHDRAWAL",
         type: "u64",
-        value: "8"
+        value: "4"
     }
 ];
 var ExtNeutralIdlJsonStaging = {
@@ -63516,6 +63517,244 @@ class BridgeClient {
     }
 }
 
+const NEUTRAL_PROTOCOL = 0b1;
+const NEUTRAL_BUNDLE_DISCRIMINATOR = Buffer.from([
+    15,
+    82,
+    167,
+    230,
+    37,
+    214,
+    82,
+    80
+]);
+class NeutralBundleAccount {
+    static decode(address, buffer) {
+        const data = NeutralBundleAccount._layout.decode(buffer);
+        if (!Buffer.from(data.discriminator).equals(NEUTRAL_BUNDLE_DISCRIMINATOR)) {
+            throw new Error("Account is not a Neutral Bundle account");
+        }
+        const account = new NeutralBundleAccount();
+        Object.assign(account, {
+            _address: address,
+            ...data
+        });
+        return account;
+    }
+    getAddress() {
+        return this._address;
+    }
+    get permissioned() {
+        return this.permissionned;
+    }
+    toView() {
+        return {
+            treasuryAccount: this.treasuryAccount,
+            assetAddress: this.assetAddress,
+            assetDecimals: this.assetDecimals,
+            permissioned: this.permissioned
+        };
+    }
+}
+NeutralBundleAccount._layout = struct([
+    array(u8(), 8, "discriminator"),
+    array(u8(), 32, "name"),
+    publicKey("manager"),
+    publicKey("keeper"),
+    publicKey("treasuryAccount"),
+    vec(publicKey(), "allocatedReceivers"),
+    u64("bundleUnderlyingBalance"),
+    u64("maxDepositAmount"),
+    u64("withdrawalDelay"),
+    u32("performanceFee"),
+    u32("managementFeeBps"),
+    u32("depositFee"),
+    u32("withdrawalFee"),
+    u128("managerPfeeShares"),
+    u32("currentAllocationBps"),
+    u64("oracleBuffer"),
+    u128("totalShares"),
+    u64("assetPrecision"),
+    publicKey("assetAddress"),
+    u8("assetDecimals"),
+    i64("withdrawalTMin"),
+    i64("withdrawalTMax"),
+    f32("withdrawalCurve"),
+    bool("permissionned"),
+    u128("managerMfeeShares"),
+    u64("minDepositAmount"),
+    i64("oracleUpdateTimeLimit"),
+    i64("oracleMaxAge"),
+    i64("withdrawalRedemptionRequestCutoffTs"),
+    i64("withdrawalRedemptionUnlockCurrentCycleTs"),
+    i64("withdrawalRedemptionUnlockNextCycleTs"),
+    array(u8(), 207, "padding")
+]);
+function toBn$1(value) {
+    if (BN.isBN(value)) {
+        return value;
+    }
+    return new BN(value.toString());
+}
+function getNeutralUserBundlePda(authority, bundle) {
+    return PublicKey.findProgramAddressSync([
+        Buffer.from("USER_BUNDLE"),
+        authority.toBuffer(),
+        bundle.toBuffer()
+    ], NTBUNDLE_PROGRAM_ID)[0];
+}
+function getNeutralOracleDataPda(bundle) {
+    return PublicKey.findProgramAddressSync([
+        Buffer.from("ORACLE"),
+        bundle.toBuffer()
+    ], NTBUNDLE_PROGRAM_ID)[0];
+}
+function getNeutralBundleTempDataPda(bundle) {
+    return PublicKey.findProgramAddressSync([
+        Buffer.from("BUNDLE_TEMP_DATA"),
+        bundle.toBuffer()
+    ], NTBUNDLE_PROGRAM_ID)[0];
+}
+function getNeutralPendingBundleAssetAuthorityPda(bundle) {
+    return PublicKey.findProgramAddressSync([
+        Buffer.from("PENDING_BUNDLE_ASSET_AUTHORITY"),
+        bundle.toBuffer()
+    ], NTBUNDLE_PROGRAM_ID)[0];
+}
+function getNeutralPendingDepositTokenAccountPda(pendingBundleAssetAuthority, assetAddress) {
+    return getAssociatedTokenAddressSync(assetAddress, pendingBundleAssetAuthority, true, TOKEN_PROGRAM_ID);
+}
+let TxBuilder$8 = class TxBuilder extends BaseTxBuilder {
+    async setNeutralPolicyIx(policy, signer) {
+        return await this.client.base.extNeutralProgram.methods.setNeutralPolicy(policy).accountsPartial({
+            glamState: this.client.base.statePda,
+            glamSigner: signer || this.client.base.signer,
+            glamProtocolProgram: this.client.base.protocolProgram.programId
+        }).instruction();
+    }
+    async setNeutralPolicyTx(policy, txOptions = {}) {
+        const ix = await this.setNeutralPolicyIx(policy, txOptions.signer);
+        return await this.buildVersionedTx([
+            ix
+        ], txOptions);
+    }
+    async initializeBundleDepositorIx(accounts, signer) {
+        const bundle = await this.client.fetchBundle(accounts.bundle);
+        if (bundle.permissioned) {
+            throw new Error("Bundle is permissioned. Use initializePermissionedBundleDepositor instead.");
+        }
+        return await this.client.base.extNeutralProgram.methods.initializeBundleDepositor().accountsPartial({
+            ...this.client.baseAccounts(signer),
+            bundleAccount: accounts.bundle,
+            userBundleAccount: accounts.userBundleAccount || this.client.getUserBundlePda(accounts.bundle)
+        }).instruction();
+    }
+    async initializeBundleDepositorTx(accounts, txOptions = {}) {
+        const ix = await this.initializeBundleDepositorIx(accounts, txOptions.signer);
+        return await this.buildVersionedTx([
+            ix
+        ], txOptions);
+    }
+    async requestDepositIx(accounts, amount, signer) {
+        const bundle = await this.client.fetchBundle(accounts.bundle);
+        const tokenProgram = accounts.tokenProgram || TOKEN_PROGRAM_ID;
+        const assetAddress = accounts.assetAddress || bundle.assetAddress;
+        const pendingBundleAssetAuthority = accounts.pendingBundleAssetAuthority || this.client.getPendingBundleAssetAuthorityPda(accounts.bundle);
+        return await this.client.base.extNeutralProgram.methods.requestDeposit(toBn$1(amount)).accountsPartial({
+            ...this.client.baseAccounts(signer),
+            userTokenAccount: accounts.userTokenAccount || this.client.base.getVaultAta(assetAddress, tokenProgram),
+            pendingDepositTokenAccount: accounts.pendingDepositTokenAccount || getNeutralPendingDepositTokenAccountPda(pendingBundleAssetAuthority, assetAddress),
+            treasuryAccount: accounts.treasuryAccount || bundle.treasuryAccount,
+            userBundleAccount: accounts.userBundleAccount || this.client.getUserBundlePda(accounts.bundle),
+            assetAddress,
+            oracleData: accounts.oracleData || this.client.getOracleDataPda(accounts.bundle),
+            bundleTempData: accounts.bundleTempData || this.client.getBundleTempDataPda(accounts.bundle),
+            bundleAccount: accounts.bundle,
+            pendingBundleAssetAuthority,
+            tokenProgram
+        }).instruction();
+    }
+    async requestDepositTx(accounts, amount, txOptions = {}) {
+        const ix = await this.requestDepositIx(accounts, amount, txOptions.signer);
+        return await this.buildVersionedTx([
+            ix
+        ], txOptions);
+    }
+};
+class NeutralClient {
+    baseAccounts(signer) {
+        return {
+            glamState: this.base.statePda,
+            glamVault: this.base.vaultPda,
+            glamSigner: signer || this.base.signer,
+            integrationAuthority: this.getIntegrationAuthorityPda(),
+            cpiProgram: NTBUNDLE_PROGRAM_ID,
+            glamProtocolProgram: this.base.protocolProgram.programId,
+            systemProgram: SystemProgram.programId
+        };
+    }
+    getIntegrationAuthorityPda() {
+        return getIntegrationAuthorityPda(this.base.extNeutralProgram.programId);
+    }
+    getUserBundlePda(bundle) {
+        return getNeutralUserBundlePda(this.base.vaultPda, bundle);
+    }
+    getOracleDataPda(bundle) {
+        return getNeutralOracleDataPda(bundle);
+    }
+    getBundleTempDataPda(bundle) {
+        return getNeutralBundleTempDataPda(bundle);
+    }
+    getPendingBundleAssetAuthorityPda(bundle) {
+        return getNeutralPendingBundleAssetAuthorityPda(bundle);
+    }
+    async fetchBundle(bundle) {
+        const account = await this.base.connection.getAccountInfo(bundle);
+        if (!account) {
+            throw new Error(`Neutral bundle account not found: ${bundle}`);
+        }
+        if (!account.owner.equals(NTBUNDLE_PROGRAM_ID)) {
+            throw new Error(`Neutral bundle ${bundle} is owned by ${account.owner}, expected ${NTBUNDLE_PROGRAM_ID}`);
+        }
+        return NeutralBundleAccount.decode(bundle, account.data);
+    }
+    async fetchPolicy() {
+        return await this.base.fetchProtocolPolicy(this.base.extNeutralProgram.programId, NEUTRAL_PROTOCOL, NeutralPolicy);
+    }
+    async setPolicy(policy, txOptions = {}) {
+        const tx = await this.txBuilder.setNeutralPolicyTx(policy, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async allowlistBundle(bundle, txOptions = {}) {
+        const policy = await this.fetchPolicy() ?? new NeutralPolicy([]);
+        if (policy.bundlesAllowlist.find((b)=>b.equals(bundle))) {
+            throw new Error(`Neutral bundle ${bundle} is already in the allowlist`);
+        }
+        policy.bundlesAllowlist.push(bundle);
+        return await this.setPolicy(policy, txOptions);
+    }
+    async initializeBundleDepositor(bundle, txOptions = {}) {
+        const tx = await this.txBuilder.initializeBundleDepositorTx({
+            bundle
+        }, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async requestDeposit(bundle, amount, txOptions = {}) {
+        const tx = await this.txBuilder.requestDepositTx({
+            bundle
+        }, amount, txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async requestDepositUiAmount(bundle, amount, txOptions = {}) {
+        const bundleAccount = await this.fetchBundle(bundle);
+        return await this.requestDeposit(bundle, fromUiAmount(amount, bundleAccount.assetDecimals), txOptions);
+    }
+    constructor(base){
+        this.base = base;
+        this.txBuilder = new TxBuilder$8(this);
+    }
+}
+
 /**
  * Represents a single asset holding within a vault.
  *
@@ -64150,6 +64389,76 @@ class PriceClient {
             kaminoReserves: Array.from(kaminoReserves)
         };
     }
+    async priceNeutralBundleDepositorsIx() {
+        const stateModel = this.cachedStateModel ?? await this.base.fetchStateModel();
+        const externalPositions = new PkSet(stateModel.externalPositions ?? []);
+        const policy = await this.base.fetchProtocolPolicy(this.base.extNeutralProgram.programId, NEUTRAL_PROTOCOL, NeutralPolicy);
+        if (!policy || policy.bundlesAllowlist.length === 0) {
+            return {
+                ixs: [],
+                kaminoReserves: []
+            };
+        }
+        const positions = policy.bundlesAllowlist.map((bundle)=>({
+                bundle,
+                userBundle: getNeutralUserBundlePda(this.base.vaultPda, bundle)
+            })).filter(({ userBundle })=>externalPositions.has(userBundle));
+        if (positions.length === 0) {
+            return {
+                ixs: [],
+                kaminoReserves: []
+            };
+        }
+        const bundleInfos = await this.base.connection.getMultipleAccountsInfo(positions.map(({ bundle })=>bundle), "confirmed");
+        const [solUsdOracle, baseAssetOracle, baseAssetMeta] = await Promise.all([
+            this.base.getSolOracle(),
+            this.getBaseAssetOracle(),
+            this.base.getAssetMeta(stateModel.baseAssetMint)
+        ]);
+        const kaminoReserves = new PkSet();
+        if (baseAssetMeta.oracleSource === "KaminoReserve") {
+            kaminoReserves.add(baseAssetMeta.oracle);
+        }
+        const remainingAccounts = [];
+        for(let i = 0; i < positions.length; i++){
+            const { bundle, userBundle } = positions[i];
+            const bundleInfo = bundleInfos[i];
+            if (!bundleInfo) {
+                throw new Error(`Neutral bundle account not found: ${bundle}`);
+            }
+            if (!bundleInfo.owner.equals(NTBUNDLE_PROGRAM_ID)) {
+                throw new Error(`Neutral bundle ${bundle} is owned by ${bundleInfo.owner}, expected ${NTBUNDLE_PROGRAM_ID}`);
+            }
+            const bundleAccount = NeutralBundleAccount.decode(bundle, bundleInfo.data);
+            const bundleAssetMeta = await this.base.getAssetMeta(bundleAccount.assetAddress);
+            if (bundleAssetMeta.oracleSource === "KaminoReserve") {
+                kaminoReserves.add(bundleAssetMeta.oracle);
+            }
+            [
+                userBundle,
+                bundle,
+                getNeutralOracleDataPda(bundle),
+                bundleAssetMeta.oracle
+            ].forEach((pubkey)=>{
+                remainingAccounts.push({
+                    pubkey,
+                    isSigner: false,
+                    isWritable: false
+                });
+            });
+        }
+        const ix = await this.base.mintProgram.methods.priceNeutralBundleDepositors().accounts({
+            glamState: this.base.statePda,
+            solUsdOracle,
+            baseAssetOracle
+        }).remainingAccounts(remainingAccounts).instruction();
+        return {
+            ixs: [
+                ix
+            ],
+            kaminoReserves: Array.from(kaminoReserves)
+        };
+    }
     async priceEpiValidatedPositionsIx() {
         const observationState = await this.epi.fetchObservationState();
         if (!observationState) {
@@ -64221,6 +64530,10 @@ class PriceClient {
             if (bridgeIntegrationAcl) {
                 chunks.push(await this.priceManagedTransfersIxs());
             }
+            const neutralIntegrationAcl = integrationAcls.find((acl)=>acl.integrationProgram.equals(this.base.extNeutralProgram.programId) && (acl.protocolsBitmask & NEUTRAL_PROTOCOL) !== 0);
+            if (neutralIntegrationAcl) {
+                chunks.push(await this.priceNeutralBundleDepositorsIx());
+            }
         }
         // Coalesce all kamino reserve refreshes into a single front-loaded ix.
         const allReserves = new PkSet();
@@ -64291,7 +64604,7 @@ class PriceClient {
     }
 }
 
-let TxBuilder$8 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$7 = class TxBuilder extends BaseTxBuilder {
     async crystallizeFeesIxs(glamSigner) {
         const glamState = this.client.base.statePda;
         const glamMint = this.client.base.mintPda;
@@ -64449,11 +64762,11 @@ class FeesClient {
     constructor(base, price){
         this.base = base;
         this.price = price;
-        this.txBuilder = new TxBuilder$8(this);
+        this.txBuilder = new TxBuilder$7(this);
     }
 }
 
-let TxBuilder$7 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$6 = class TxBuilder extends BaseTxBuilder {
     async emergencyAccessUpdateIx(args, signer) {
         return await this.client.base.protocolProgram.methods.emergencyAccessUpdate(new EmergencyAccessUpdateArgs(args)).accounts({
             glamState: this.client.base.statePda,
@@ -64618,11 +64931,11 @@ class AccessClient {
     }
     constructor(base){
         this.base = base;
-        this.txBuilder = new TxBuilder$7(this);
+        this.txBuilder = new TxBuilder$6(this);
     }
 }
 
-let TxBuilder$6 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$5 = class TxBuilder extends BaseTxBuilder {
     async applyStateTimelockIx(glamSigner) {
         return await this.client.base.protocolProgram.methods.updateStateApplyTimelock().accounts({
             glamState: this.client.base.statePda,
@@ -64700,11 +65013,11 @@ class TimelockClient {
     constructor(base, stateClient){
         this.base = base;
         this.stateClient = stateClient;
-        this.txBuilder = new TxBuilder$6(this);
+        this.txBuilder = new TxBuilder$5(this);
     }
 }
 
-let TxBuilder$5 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$4 = class TxBuilder extends BaseTxBuilder {
     async initializeAndDelegateStakeIxs(vote, amount, glamSigner) {
         const [stakeAccount, createStakeAccountIx] = await this.client.createStakeAccount(glamSigner);
         const glamState = this.client.base.statePda;
@@ -64917,11 +65230,11 @@ class StakeClient {
     }
     constructor(base){
         this.base = base;
-        this.txBuilder = new TxBuilder$5(this);
+        this.txBuilder = new TxBuilder$4(this);
     }
 }
 
-let TxBuilder$4 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$3 = class TxBuilder extends BaseTxBuilder {
     async depositSolIxs(stakePool, lamports, glamSigner) {
         const { programId: stakePoolProgram, poolMint, withdrawAuthority, feeAccount, tokenProgramId: tokenProgram, reserveStake } = await this.client.getStakePoolAccountData(stakePool);
         const glamVault = this.client.base.vaultPda;
@@ -65119,7 +65432,7 @@ class StakePoolClient {
         this.base = base;
         this.stake = stake;
         this.marinade = marinade;
-        this.txBuilder = new TxBuilder$4(this);
+        this.txBuilder = new TxBuilder$3(this);
     }
 }
 
@@ -65169,7 +65482,7 @@ class CctpBridgeEvent {
         this.uiAmount = toUiAmount(this.amount, 6);
     }
 }
-let TxBuilder$3 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$2 = class TxBuilder extends BaseTxBuilder {
     /**
    * Returns a transaction that calls CCTP's `depositForBurn` instruction that bridges USDC to another chain.
    * A keypair is generated for the message sent event account, which must be included as a transaction signer.
@@ -65700,7 +66013,7 @@ class CctpClient {
     }
     constructor(base){
         this.base = base;
-        this.txBuilder = new TxBuilder$3(this);
+        this.txBuilder = new TxBuilder$2(this);
     }
 }
 
@@ -65718,7 +66031,7 @@ function toReservedBytes(value) {
     }
     return bytes;
 }
-let TxBuilder$2 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
     async upsertExternalPositionIx(params, signer) {
         return await this.client.base.extEpiProgram.methods.upsertExternalPosition({
             positionId: toFixedArray32(params.positionId, "positionId"),
@@ -65827,12 +66140,12 @@ class EpiClient {
     }
     constructor(base){
         this.base = base;
-        this.txBuilder = new TxBuilder$2(this);
+        this.txBuilder = new TxBuilder$1(this);
     }
 }
 
 const LOOPSCALE_BS_AUTH = new PublicKey("CyNKPfqsSLAejjZtEeNG3pR4SkPhSPHXdGhuNTyudrNs");
-function toBn$1(value) {
+function toBn(value) {
     if (BN.isBN(value)) {
         return value;
     }
@@ -65846,10 +66159,10 @@ function getLoopscaleEventAuthorityPda(programId = LOOPSCALE_PROGRAM_ID) {
 function getLoopscaleLoanPda(borrower, nonce, programId = LOOPSCALE_PROGRAM_ID) {
     return PublicKey.findProgramAddressSync([
         borrower.toBuffer(),
-        toBn$1(nonce).toArrayLike(Buffer, "le", 8)
+        toBn(nonce).toArrayLike(Buffer, "le", 8)
     ], programId)[0];
 }
-let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
+let TxBuilder = class TxBuilder extends BaseTxBuilder {
     async createLoanIx(params, accounts, signer) {
         return await this.client.base.extLoopscaleProgram.methods.createLoan({
             nonce: params.nonce
@@ -66002,267 +66315,6 @@ class LoopscaleClient {
         const tx = await this.txBuilder.borrowPrincipalTx(params, accounts, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    constructor(base){
-        this.base = base;
-        this.txBuilder = new TxBuilder$1(this);
-    }
-}
-
-const NEUTRAL_PROTOCOL = 0b1;
-const NEUTRAL_BUNDLE_DISCRIMINATOR = Buffer.from([
-    15,
-    82,
-    167,
-    230,
-    37,
-    214,
-    82,
-    80
-]);
-class NeutralBundleAccount {
-    static decode(address, buffer) {
-        const data = NeutralBundleAccount._layout.decode(buffer);
-        if (!Buffer.from(data.discriminator).equals(NEUTRAL_BUNDLE_DISCRIMINATOR)) {
-            throw new Error("Account is not a Neutral Bundle account");
-        }
-        const account = new NeutralBundleAccount();
-        Object.assign(account, {
-            _address: address,
-            ...data
-        });
-        return account;
-    }
-    getAddress() {
-        return this._address;
-    }
-    get permissioned() {
-        return this.permissionned;
-    }
-    toView() {
-        return {
-            treasuryAccount: this.treasuryAccount,
-            assetAddress: this.assetAddress,
-            assetDecimals: this.assetDecimals,
-            permissioned: this.permissioned
-        };
-    }
-}
-NeutralBundleAccount._layout = struct([
-    array(u8(), 8, "discriminator"),
-    array(u8(), 32, "name"),
-    publicKey("manager"),
-    publicKey("keeper"),
-    publicKey("treasuryAccount"),
-    vec(publicKey(), "allocatedReceivers"),
-    u64("bundleUnderlyingBalance"),
-    u64("maxDepositAmount"),
-    u64("withdrawalDelay"),
-    u32("performanceFee"),
-    u32("managementFeeBps"),
-    u32("depositFee"),
-    u32("withdrawalFee"),
-    u128("managerPfeeShares"),
-    u32("currentAllocationBps"),
-    u64("oracleBuffer"),
-    u128("totalShares"),
-    u64("assetPrecision"),
-    publicKey("assetAddress"),
-    u8("assetDecimals"),
-    i64("withdrawalTMin"),
-    i64("withdrawalTMax"),
-    f32("withdrawalCurve"),
-    bool("permissionned"),
-    u128("managerMfeeShares"),
-    u64("minDepositAmount"),
-    i64("oracleUpdateTimeLimit"),
-    i64("oracleMaxAge"),
-    i64("withdrawalRedemptionRequestCutoffTs"),
-    i64("withdrawalRedemptionUnlockCurrentCycleTs"),
-    i64("withdrawalRedemptionUnlockNextCycleTs"),
-    array(u8(), 207, "padding")
-]);
-function toBn(value) {
-    if (BN.isBN(value)) {
-        return value;
-    }
-    return new BN(value.toString());
-}
-function getNeutralUserBundlePda(authority, bundle) {
-    return PublicKey.findProgramAddressSync([
-        Buffer.from("USER_BUNDLE"),
-        authority.toBuffer(),
-        bundle.toBuffer()
-    ], NTBUNDLE_PROGRAM_ID)[0];
-}
-function getNeutralOracleDataPda(bundle) {
-    return PublicKey.findProgramAddressSync([
-        Buffer.from("ORACLE"),
-        bundle.toBuffer()
-    ], NTBUNDLE_PROGRAM_ID)[0];
-}
-function getNeutralBundleTempDataPda(bundle) {
-    return PublicKey.findProgramAddressSync([
-        Buffer.from("BUNDLE_TEMP_DATA"),
-        bundle.toBuffer()
-    ], NTBUNDLE_PROGRAM_ID)[0];
-}
-function getNeutralPendingBundleAssetAuthorityPda(bundle) {
-    return PublicKey.findProgramAddressSync([
-        Buffer.from("PENDING_BUNDLE_ASSET_AUTHORITY"),
-        bundle.toBuffer()
-    ], NTBUNDLE_PROGRAM_ID)[0];
-}
-function getNeutralPendingDepositTokenAccountPda(pendingBundleAssetAuthority, assetAddress) {
-    return getAssociatedTokenAddressSync(assetAddress, pendingBundleAssetAuthority, true, TOKEN_PROGRAM_ID);
-}
-let TxBuilder = class TxBuilder extends BaseTxBuilder {
-    async setNeutralPolicyIx(policy, signer) {
-        return await this.client.base.extNeutralProgram.methods.setNeutralPolicy(policy).accountsPartial({
-            glamState: this.client.base.statePda,
-            glamSigner: signer || this.client.base.signer,
-            glamProtocolProgram: this.client.base.protocolProgram.programId
-        }).instruction();
-    }
-    async setNeutralPolicyTx(policy, txOptions = {}) {
-        const ix = await this.setNeutralPolicyIx(policy, txOptions.signer);
-        return await this.buildVersionedTx([
-            ix
-        ], txOptions);
-    }
-    async initializeBundleDepositorIx(accounts, signer) {
-        const bundle = await this.client.fetchBundle(accounts.bundle);
-        if (bundle.permissioned) {
-            throw new Error("Bundle is permissioned. Use initializePermissionedBundleDepositor instead.");
-        }
-        return await this.client.base.extNeutralProgram.methods.initializeBundleDepositor().accountsPartial({
-            ...this.client.baseAccounts(signer),
-            bundleAccount: accounts.bundle,
-            userBundleAccount: accounts.userBundleAccount || this.client.getUserBundlePda(accounts.bundle)
-        }).instruction();
-    }
-    async initializeBundleDepositorTx(accounts, txOptions = {}) {
-        const ix = await this.initializeBundleDepositorIx(accounts, txOptions.signer);
-        return await this.buildVersionedTx([
-            ix
-        ], txOptions);
-    }
-    async initializePermissionedBundleDepositorIx(accounts, signer) {
-        const bundle = await this.client.fetchBundle(accounts.bundle);
-        if (!bundle.permissioned) {
-            throw new Error("Bundle is not permissioned. Use initializeBundleDepositor instead.");
-        }
-        return await this.client.base.extNeutralProgram.methods.initializePermissionedBundleDepositor().accountsPartial({
-            ...this.client.baseAccounts(signer),
-            bundleAccount: accounts.bundle,
-            userBundleAccount: accounts.userBundleAccount || this.client.getUserBundlePda(accounts.bundle)
-        }).instruction();
-    }
-    async initializePermissionedBundleDepositorTx(accounts, txOptions = {}) {
-        const ix = await this.initializePermissionedBundleDepositorIx(accounts, txOptions.signer);
-        return await this.buildVersionedTx([
-            ix
-        ], txOptions);
-    }
-    async requestDepositIx(accounts, amount, signer) {
-        const bundle = await this.client.fetchBundle(accounts.bundle);
-        const tokenProgram = accounts.tokenProgram || TOKEN_PROGRAM_ID;
-        const assetAddress = accounts.assetAddress || bundle.assetAddress;
-        const pendingBundleAssetAuthority = accounts.pendingBundleAssetAuthority || this.client.getPendingBundleAssetAuthorityPda(accounts.bundle);
-        return await this.client.base.extNeutralProgram.methods.requestDeposit(toBn(amount)).accountsPartial({
-            ...this.client.baseAccounts(signer),
-            userTokenAccount: accounts.userTokenAccount || this.client.base.getVaultAta(assetAddress, tokenProgram),
-            pendingDepositTokenAccount: accounts.pendingDepositTokenAccount || getNeutralPendingDepositTokenAccountPda(pendingBundleAssetAuthority, assetAddress),
-            treasuryAccount: accounts.treasuryAccount || bundle.treasuryAccount,
-            userBundleAccount: accounts.userBundleAccount || this.client.getUserBundlePda(accounts.bundle),
-            assetAddress,
-            oracleData: accounts.oracleData || this.client.getOracleDataPda(accounts.bundle),
-            bundleTempData: accounts.bundleTempData || this.client.getBundleTempDataPda(accounts.bundle),
-            bundleAccount: accounts.bundle,
-            pendingBundleAssetAuthority,
-            tokenProgram
-        }).instruction();
-    }
-    async requestDepositTx(accounts, amount, txOptions = {}) {
-        const ix = await this.requestDepositIx(accounts, amount, txOptions.signer);
-        return await this.buildVersionedTx([
-            ix
-        ], txOptions);
-    }
-};
-class NeutralClient {
-    baseAccounts(signer) {
-        return {
-            glamState: this.base.statePda,
-            glamVault: this.base.vaultPda,
-            glamSigner: signer || this.base.signer,
-            integrationAuthority: this.getIntegrationAuthorityPda(),
-            cpiProgram: NTBUNDLE_PROGRAM_ID,
-            glamProtocolProgram: this.base.protocolProgram.programId,
-            systemProgram: SystemProgram.programId
-        };
-    }
-    getIntegrationAuthorityPda() {
-        return getIntegrationAuthorityPda(this.base.extNeutralProgram.programId);
-    }
-    getUserBundlePda(bundle) {
-        return getNeutralUserBundlePda(this.base.vaultPda, bundle);
-    }
-    getOracleDataPda(bundle) {
-        return getNeutralOracleDataPda(bundle);
-    }
-    getBundleTempDataPda(bundle) {
-        return getNeutralBundleTempDataPda(bundle);
-    }
-    getPendingBundleAssetAuthorityPda(bundle) {
-        return getNeutralPendingBundleAssetAuthorityPda(bundle);
-    }
-    async fetchBundle(bundle) {
-        const account = await this.base.connection.getAccountInfo(bundle);
-        if (!account) {
-            throw new Error(`Neutral bundle account not found: ${bundle}`);
-        }
-        if (!account.owner.equals(NTBUNDLE_PROGRAM_ID)) {
-            throw new Error(`Neutral bundle ${bundle} is owned by ${account.owner}, expected ${NTBUNDLE_PROGRAM_ID}`);
-        }
-        return NeutralBundleAccount.decode(bundle, account.data);
-    }
-    async fetchPolicy() {
-        return await this.base.fetchProtocolPolicy(this.base.extNeutralProgram.programId, NEUTRAL_PROTOCOL, NeutralPolicy);
-    }
-    async setPolicy(policy, txOptions = {}) {
-        const tx = await this.txBuilder.setNeutralPolicyTx(policy, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async allowlistBundle(bundle, txOptions = {}) {
-        const policy = await this.fetchPolicy() ?? new NeutralPolicy([]);
-        if (policy.bundlesAllowlist.find((b)=>b.equals(bundle))) {
-            throw new Error(`Neutral bundle ${bundle} is already in the allowlist`);
-        }
-        policy.bundlesAllowlist.push(bundle);
-        return await this.setPolicy(policy, txOptions);
-    }
-    async initializeBundleDepositor(bundle, txOptions = {}) {
-        const tx = await this.txBuilder.initializeBundleDepositorTx({
-            bundle
-        }, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async initializePermissionedBundleDepositor(bundle, txOptions = {}) {
-        const tx = await this.txBuilder.initializePermissionedBundleDepositorTx({
-            bundle
-        }, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async requestDeposit(bundle, amount, txOptions = {}) {
-        const tx = await this.txBuilder.requestDepositTx({
-            bundle
-        }, amount, txOptions);
-        return await this.base.sendAndConfirm(tx);
-    }
-    async requestDepositUiAmount(bundle, amount, txOptions = {}) {
-        const bundleAccount = await this.fetchBundle(bundle);
-        return await this.requestDeposit(bundle, fromUiAmount(amount, bundleAccount.assetDecimals), txOptions);
-    }
     constructor(base){
         this.base = base;
         this.txBuilder = new TxBuilder(this);