@metamask-previews/perps-controller 11.0.0-preview-9efd0b754 → 12.0.0-preview-4e64b66e8

package/dist/providers/HyperLiquidProvider.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HyperLiquidProvider_instances, _HyperLiquidProvider_deps, _HyperLiquidProvider_clientService, _HyperLiquidProvider_walletService, _HyperLiquidProvider_subscriptionService, _HyperLiquidProvider_symbolToAssetId, _HyperLiquidProvider_userFeeCache, _HyperLiquidProvider_maxLeverageCache, _HyperLiquidProvider_cachedMetaByDex, _HyperLiquidProvider_cachedMarketDataWithPrices, _HyperLiquidProvider_cachedSpotMeta, _HyperLiquidProvider_dexDiscoveryCache, _HyperLiquidProvider_referralCheckCache, _HyperLiquidProvider_builderFeeCheckCache, _HyperLiquidProvider_ensureReadyPromise, _HyperLiquidProvider_pendingBuilderFeeApprovals, _HyperLiquidProvider_compiledAllowlistPatterns, _HyperLiquidProvider_compiledBlocklistPatterns, _HyperLiquidProvider_userFeeDiscountBips, _HyperLiquidProvider_hip3Enabled, _HyperLiquidProvider_allowlistMarkets, _HyperLiquidProvider_blocklistMarkets, _HyperLiquidProvider_useUnifiedAccount, _HyperLiquidProvider_dexDiscoveryComplete, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, _HyperLiquidProvider_pendingValidatedDexsPromise, _HyperLiquidProvider_cachedUsdcTokenId, _HyperLiquidProvider_errorMappings, _HyperLiquidProvider_scaleOrderGroups, _HyperLiquidProvider_chaseSessions, _HyperLiquidProvider_chasePlacementsInFlight, _HyperLiquidProvider_chaseGeneration, _HyperLiquidProvider_clientsInitialized, _HyperLiquidProvider_initializationPromise, _HyperLiquidProvider_messenger, _HyperLiquidProvider_builderAddressTestnet, _HyperLiquidProvider_builderAddressMainnet, _HyperLiquidProvider_priceDeviationLimit, _HyperLiquidProvider_compilePatternsSafely, _HyperLiquidProvider_ensureClientsInitialized, _HyperLiquidProvider_isWalletOnHyperliquid, _HyperLiquidProvider_isHyperliquidMultiSigAccount, _HyperLiquidProvider_ensureUnifiedAccountEnabled, _HyperLiquidProvider_ensureReady, _HyperLiquidProvider_tradingSetupPromise, _HyperLiquidProvider_tradingSetupComplete, _HyperLiquidProvider_ensureReadyForTrading, _HyperLiquidProvider_getOrFetchPrice, _HyperLiquidProvider_filterFills, _HyperLiquidProvider_getAllAvailableDexs, _HyperLiquidProvider_getValidatedDexs, _HyperLiquidProvider_fetchValidatedDexsInternal, _HyperLiquidProvider_getCachedMeta, _HyperLiquidProvider_backfillAssetMapForDex, _HyperLiquidProvider_getAssetIdWithRepair, _HyperLiquidProvider_getCachedSpotMeta, _HyperLiquidProvider_getCachedPerpDexs, _HyperLiquidProvider_calculateHip3FeeMultiplier, _HyperLiquidProvider_getCacheKey, _HyperLiquidProvider_fetchMarketsForDex, _HyperLiquidProvider_getUsdcTokenId, _HyperLiquidProvider_isUsdcCollateralDex, _HyperLiquidProvider_buildAssetMapping, _HyperLiquidProvider_queryUserDataAcrossDexs, _HyperLiquidProvider_mapError, _HyperLiquidProvider_getErrorContext, _HyperLiquidProvider_isMappedAccountModeExchangeError, _HyperLiquidProvider_getTradingErrorContext, _HyperLiquidProvider_checkBuilderFeeApproval, _HyperLiquidProvider_ensureBuilderFeeApproval, _HyperLiquidProvider_checkBuilderFeeStatus, _HyperLiquidProvider_getBalanceForDex, _HyperLiquidProvider_findSourceDexWithBalance, _HyperLiquidProvider_autoTransferForHip3Order, _HyperLiquidProvider_autoTransferBackAfterClose, _HyperLiquidProvider_calculateHip3RequiredMargin, _HyperLiquidProvider_handleHip3PostOrderRebalance, _HyperLiquidProvider_handleHip3OrderRollback, _HyperLiquidProvider_validateOrderBeforePlacement, _HyperLiquidProvider_getAssetInfo, _HyperLiquidProvider_prepareAssetForTrading, _HyperLiquidProvider_handleHip3PreOrder, _HyperLiquidProvider_submitOrderWithRollback, _HyperLiquidProvider_handleOrderError, _HyperLiquidProvider_placeStrategyOrder, _HyperLiquidProvider_prepareStrategyPlacement, _HyperLiquidProvider_getMinimumOrderSize, _HyperLiquidProvider_buildScaleLadder, _HyperLiquidProvider_placeTwapOrder, _HyperLiquidProvider_placeScaleOrder, _HyperLiquidProvider_startChaseSession, _HyperLiquidProvider_getChaseQuotePrice, _HyperLiquidProvider_restChaseOrder, _HyperLiquidProvider_scheduleChaseTick, _HyperLiquidProvider_recoverFailedChaseTick, _HyperLiquidProvider_runChaseTick, _HyperLiquidProvider_resolveOwnRestingSizes, _HyperLiquidProvider_readOrderRemainder, _HyperLiquidProvider_cancelChaseChild, _HyperLiquidProvider_retractOrphanedChaseOrder, _HyperLiquidProvider_stopChaseSession, _HyperLiquidProvider_cancelStrategyOrder, _HyperLiquidProvider_cancelTwapOrder, _HyperLiquidProvider_cancelScaleOrder, _HyperLiquidProvider_cancelChaseOrder, _HyperLiquidProvider_readOrderIdFromStatus, _HyperLiquidProvider_getDiscountedBuilderFee, _HyperLiquidProvider_fetchOpenOrders, _HyperLiquidProvider_resolveReplacementOrderId, _HyperLiquidProvider_getStandaloneValidatedDexs, _HyperLiquidProvider_queryDexPositions, _HyperLiquidProvider_getAllMids, _HyperLiquidProvider_fetchSingleDexFresh, _HyperLiquidProvider_excludeNonUsdcCollateralResults, _HyperLiquidProvider_mergeDexResultsInto, _HyperLiquidProvider_cacheFreshMarketDataSnapshot, _HyperLiquidProvider_getStaleMarketDataSnapshot, _HyperLiquidProvider_isFeeCacheValid, _HyperLiquidProvider_getBuilderAddress, _HyperLiquidProvider_getReferralCode, _HyperLiquidProvider_ensureReferralSet, _HyperLiquidProvider_isReferralCodeReady, _HyperLiquidProvider_checkReferralSet, _HyperLiquidProvider_setReferralCode;
+var _HyperLiquidProvider_instances, _HyperLiquidProvider_deps, _HyperLiquidProvider_clientService, _HyperLiquidProvider_walletService, _HyperLiquidProvider_subscriptionService, _HyperLiquidProvider_symbolToAssetId, _HyperLiquidProvider_userFeeCache, _HyperLiquidProvider_maxLeverageCache, _HyperLiquidProvider_cachedMetaByDex, _HyperLiquidProvider_cachedMarketDataWithPrices, _HyperLiquidProvider_cachedSpotMeta, _HyperLiquidProvider_dexDiscoveryCache, _HyperLiquidProvider_referralCheckCache, _HyperLiquidProvider_builderFeeCheckCache, _HyperLiquidProvider_ensureReadyPromise, _HyperLiquidProvider_pendingBuilderFeeApprovals, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, _HyperLiquidProvider_approvedBuilderAddresses, _HyperLiquidProvider_compiledAllowlistPatterns, _HyperLiquidProvider_compiledBlocklistPatterns, _HyperLiquidProvider_userFeeDiscountBips, _HyperLiquidProvider_userFeeResolution, _HyperLiquidProvider_hip3Enabled, _HyperLiquidProvider_allowlistMarkets, _HyperLiquidProvider_blocklistMarkets, _HyperLiquidProvider_useUnifiedAccount, _HyperLiquidProvider_dexDiscoveryComplete, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, _HyperLiquidProvider_pendingValidatedDexsPromise, _HyperLiquidProvider_cachedUsdcTokenId, _HyperLiquidProvider_errorMappings, _HyperLiquidProvider_scaleOrderGroups, _HyperLiquidProvider_chaseSessions, _HyperLiquidProvider_chasePlacementsInFlight, _HyperLiquidProvider_chaseGeneration, _HyperLiquidProvider_clientsInitialized, _HyperLiquidProvider_initializationPromise, _HyperLiquidProvider_messenger, _HyperLiquidProvider_builderAddressTestnet, _HyperLiquidProvider_builderAddressMainnet, _HyperLiquidProvider_subscriptionBuilderAddressTestnet, _HyperLiquidProvider_subscriptionBuilderAddressMainnet, _HyperLiquidProvider_priceDeviationLimit, _HyperLiquidProvider_compilePatternsSafely, _HyperLiquidProvider_ensureClientsInitialized, _HyperLiquidProvider_isWalletOnHyperliquid, _HyperLiquidProvider_isHyperliquidMultiSigAccount, _HyperLiquidProvider_ensureUnifiedAccountEnabled, _HyperLiquidProvider_ensureReady, _HyperLiquidProvider_tradingSetupPromise, _HyperLiquidProvider_tradingSetupComplete, _HyperLiquidProvider_ensureReadyForTrading, _HyperLiquidProvider_getOrFetchPrice, _HyperLiquidProvider_filterFills, _HyperLiquidProvider_getAllAvailableDexs, _HyperLiquidProvider_getValidatedDexs, _HyperLiquidProvider_fetchValidatedDexsInternal, _HyperLiquidProvider_getCachedMeta, _HyperLiquidProvider_backfillAssetMapForDex, _HyperLiquidProvider_getAssetIdWithRepair, _HyperLiquidProvider_getCachedSpotMeta, _HyperLiquidProvider_getCachedPerpDexs, _HyperLiquidProvider_calculateHip3FeeMultiplier, _HyperLiquidProvider_getCacheKey, _HyperLiquidProvider_getApprovedBuilderKey, _HyperLiquidProvider_fetchMarketsForDex, _HyperLiquidProvider_getUsdcTokenId, _HyperLiquidProvider_isUsdcCollateralDex, _HyperLiquidProvider_buildAssetMapping, _HyperLiquidProvider_queryUserDataAcrossDexs, _HyperLiquidProvider_mapError, _HyperLiquidProvider_getErrorContext, _HyperLiquidProvider_isMappedAccountModeExchangeError, _HyperLiquidProvider_getTradingErrorContext, _HyperLiquidProvider_checkBuilderFeeApproval, _HyperLiquidProvider_ensureBuilderFeeApproval, _HyperLiquidProvider_checkBuilderFeeStatus, _HyperLiquidProvider_getBalanceForDex, _HyperLiquidProvider_findSourceDexWithBalance, _HyperLiquidProvider_autoTransferForHip3Order, _HyperLiquidProvider_autoTransferBackAfterClose, _HyperLiquidProvider_calculateHip3RequiredMargin, _HyperLiquidProvider_handleHip3PostOrderRebalance, _HyperLiquidProvider_handleHip3OrderRollback, _HyperLiquidProvider_validateOrderBeforePlacement, _HyperLiquidProvider_getAssetInfo, _HyperLiquidProvider_prepareAssetForTrading, _HyperLiquidProvider_handleHip3PreOrder, _HyperLiquidProvider_submitOrderWithRollback, _HyperLiquidProvider_handleOrderError, _HyperLiquidProvider_placeStrategyOrder, _HyperLiquidProvider_prepareStrategyPlacement, _HyperLiquidProvider_getMinimumOrderSize, _HyperLiquidProvider_buildScaleLadder, _HyperLiquidProvider_placeTwapOrder, _HyperLiquidProvider_placeScaleOrder, _HyperLiquidProvider_startChaseSession, _HyperLiquidProvider_getChaseQuotePrice, _HyperLiquidProvider_restChaseOrder, _HyperLiquidProvider_scheduleChaseTick, _HyperLiquidProvider_recoverFailedChaseTick, _HyperLiquidProvider_runChaseTick, _HyperLiquidProvider_resolveOwnRestingSizes, _HyperLiquidProvider_readOrderRemainder, _HyperLiquidProvider_cancelChaseChild, _HyperLiquidProvider_retractOrphanedChaseOrder, _HyperLiquidProvider_stopChaseSession, _HyperLiquidProvider_cancelStrategyOrder, _HyperLiquidProvider_cancelTwapOrder, _HyperLiquidProvider_cancelScaleOrder, _HyperLiquidProvider_cancelChaseOrder, _HyperLiquidProvider_readOrderIdFromStatus, _HyperLiquidProvider_getDiscountedBuilderFee, _HyperLiquidProvider_getBuilderOrderContext, _HyperLiquidProvider_fetchOpenOrders, _HyperLiquidProvider_resolveReplacementOrderId, _HyperLiquidProvider_getStandaloneValidatedDexs, _HyperLiquidProvider_queryDexPositions, _HyperLiquidProvider_getAllMids, _HyperLiquidProvider_fetchSingleDexFresh, _HyperLiquidProvider_excludeNonUsdcCollateralResults, _HyperLiquidProvider_mergeDexResultsInto, _HyperLiquidProvider_cacheFreshMarketDataSnapshot, _HyperLiquidProvider_getStaleMarketDataSnapshot, _HyperLiquidProvider_isFeeCacheValid, _HyperLiquidProvider_getBuilderAddress, _HyperLiquidProvider_getSubscriptionBuilderAddress, _HyperLiquidProvider_getReferralCode, _HyperLiquidProvider_ensureReferralSet, _HyperLiquidProvider_isReferralCodeReady, _HyperLiquidProvider_checkReferralSet, _HyperLiquidProvider_setReferralCode;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperLiquidProvider = void 0;
 const utils_1 = require("@metamask/utils");
@@ -230,7 +230,32 @@ function groupOrdersBySymbol(orders) {
 function collectPositionTriggerOrders(params) {
     const { orders, position, childOrderIds } = params;
     const byOrderId = new Map();
+    let takeProfitPrice;
+    let stopLossPrice;
     orders.forEach((rawOrder) => {
+        if (rawOrder.isTrigger &&
+            rawOrder.reduceOnly &&
+            rawOrder.isPositionTpsl === Boolean(perpsConfig_js_1.TP_SL_CONFIG.UsePositionBoundTpsl)) {
+            if (rawOrder.orderType.includes('Take Profit')) {
+                takeProfitPrice = rawOrder.triggerPx;
+            }
+            else if (rawOrder.orderType.includes('Stop')) {
+                stopLossPrice = rawOrder.triggerPx;
+            }
+        }
+        rawOrder.children?.forEach((childOrder) => {
+            if (!childOrder.isTrigger ||
+                !childOrder.reduceOnly ||
+                childOrder.isPositionTpsl !== Boolean(perpsConfig_js_1.TP_SL_CONFIG.UsePositionBoundTpsl)) {
+                return;
+            }
+            if (childOrder.orderType.includes('Take Profit')) {
+                takeProfitPrice = childOrder.triggerPx;
+            }
+            else if (childOrder.orderType.includes('Stop')) {
+                stopLossPrice = childOrder.triggerPx;
+            }
+        });
         if (rawOrder.coin !== position.symbol ||
             !rawOrder.isTrigger ||
             !rawOrder.reduceOnly ||
@@ -250,6 +275,8 @@ function collectPositionTriggerOrders(params) {
     return {
         takeProfitOrders: triggerOrders.filter((order) => order.direction === 'take_profit'),
         stopLossOrders: triggerOrders.filter((order) => order.direction !== 'take_profit'),
+        ...(takeProfitPrice && { takeProfitPrice }),
+        ...(stopLossPrice && { stopLossPrice }),
     };
 }
 /**
@@ -301,11 +328,15 @@ class HyperLiquidProvider {
         // Prevents multiple signature requests when methods called simultaneously
         _HyperLiquidProvider_ensureReadyPromise.set(this, null);
         _HyperLiquidProvider_pendingBuilderFeeApprovals.set(this, new Map());
+        _HyperLiquidProvider_subscriptionBuilderApprovalEpoch.set(this, 0);
+        /** Builder approvals keyed by network, account, and builder address. */
+        _HyperLiquidProvider_approvedBuilderAddresses.set(this, new Set());
         // Pre-compiled patterns for fast filtering
         _HyperLiquidProvider_compiledAllowlistPatterns.set(this, []);
         _HyperLiquidProvider_compiledBlocklistPatterns.set(this, []);
         // Fee discount context for MetaMask reward discounts (in basis points)
         _HyperLiquidProvider_userFeeDiscountBips.set(this, void 0);
+        _HyperLiquidProvider_userFeeResolution.set(this, void 0);
         // Feature flag configuration for HIP-3 market filtering
         _HyperLiquidProvider_hip3Enabled.set(this, void 0);
         _HyperLiquidProvider_allowlistMarkets.set(this, void 0);
@@ -362,6 +393,8 @@ class HyperLiquidProvider {
         _HyperLiquidProvider_messenger.set(this, void 0);
         _HyperLiquidProvider_builderAddressTestnet.set(this, void 0);
         _HyperLiquidProvider_builderAddressMainnet.set(this, void 0);
+        _HyperLiquidProvider_subscriptionBuilderAddressTestnet.set(this, void 0);
+        _HyperLiquidProvider_subscriptionBuilderAddressMainnet.set(this, void 0);
         _HyperLiquidProvider_priceDeviationLimit.set(this, void 0);
         /**
          * Ensure provider is ready for TRADING operations (signing required)
@@ -382,6 +415,8 @@ class HyperLiquidProvider {
         __classPrivateFieldSet(this, _HyperLiquidProvider_messenger, options.messenger, "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_builderAddressTestnet, options.builderAddressTestnet, "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_builderAddressMainnet, options.builderAddressMainnet, "f");
+        __classPrivateFieldSet(this, _HyperLiquidProvider_subscriptionBuilderAddressTestnet, options.subscriptionBuilderAddressTestnet, "f");
+        __classPrivateFieldSet(this, _HyperLiquidProvider_subscriptionBuilderAddressMainnet, options.subscriptionBuilderAddressMainnet, "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_priceDeviationLimit, options.priceDeviationLimit ??
             hyperLiquidConfig_js_1.HYPERLIQUID_CONFIG.OraclePriceDeviationLimit, "f");
         const isTestnet = options.isTestnet ?? false;
@@ -404,7 +439,11 @@ class HyperLiquidProvider {
             isTestnet,
         }), "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_subscriptionService, new HyperLiquidSubscriptionService_js_1.HyperLiquidSubscriptionService(__classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_hip3Enabled, "f"), [], // enabledDexs - will be populated after DEX discovery in buildAssetMapping
-        __classPrivateFieldGet(this, _HyperLiquidProvider_allowlistMarkets, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_blocklistMarkets, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_priceDeviationLimit, "f")), "f");
+        __classPrivateFieldGet(this, _HyperLiquidProvider_allowlistMarkets, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_blocklistMarkets, "f"), __classPrivateFieldGet(this, _HyperLiquidProvider_priceDeviationLimit, "f"), async () => {
+            await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureClientsInitialized).call(this);
+            const validatedDexs = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getValidatedDexs).call(this);
+            return validatedDexs.filter((dex) => dex !== null);
+        }), "f");
         // NOTE: Clients are NOT initialized here - they'll be initialized lazily
         // when first needed. This avoids accessing Engine.context before it's ready.
         // Pre-compile filter patterns for performance (invalid patterns are skipped)
@@ -461,6 +500,7 @@ class HyperLiquidProvider {
      * @param discountBips - The discount in basis points (e.g., 550 = 5.5%)
      */
     setUserFeeDiscount(discountBips) {
+        __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeResolution, undefined, "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeDiscountBips, discountBips, "f");
         __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquid: Fee discount context updated', {
             discountBips,
@@ -468,6 +508,20 @@ class HyperLiquidProvider {
             isActive: discountBips !== undefined,
         });
     }
+    /**
+     * Set the resolved fee and its attribution source for the next operation.
+     *
+     * @param resolution - Unified fee resolution, or undefined to clear it.
+     */
+    setUserFeeResolution(resolution) {
+        __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeResolution, resolution, "f");
+        __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeDiscountBips, resolution?.discountBips, "f");
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquid: Fee resolution context updated', {
+            source: resolution?.source,
+            discountBips: resolution?.discountBips,
+            isActive: resolution !== undefined,
+        });
+    }
     /**
      * Get supported deposit routes with complete asset and routing information
      *
@@ -502,6 +556,84 @@ class HyperLiquidProvider {
         // For HyperLiquid, withdrawal routes are the same as deposit routes
         return this.getDepositRoutes(params);
     }
+    /**
+     * Approve the dedicated subscription builder outside order submission.
+     * Failure is non-blocking: order construction will use the ordinary builder
+     * at the standard fee until a later approval succeeds.
+     *
+     * @returns Whether the builder is approved for the current account.
+     */
+    async approveSubscriptionBuilderFee() {
+        const approvalEpoch = __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f");
+        await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureClientsInitialized).call(this);
+        if (approvalEpoch !== __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f")) {
+            return false;
+        }
+        const isTestnet = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode();
+        const network = isTestnet ? 'testnet' : 'mainnet';
+        const builderAddress = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getSubscriptionBuilderAddress).call(this, isTestnet);
+        if (!builderAddress) {
+            return false;
+        }
+        const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
+        const key = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getApprovedBuilderKey).call(this, network, userAddress, builderAddress);
+        if (__classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").has(key)) {
+            return true;
+        }
+        const pending = __classPrivateFieldGet(this, _HyperLiquidProvider_pendingBuilderFeeApprovals, "f").get(key);
+        if (pending) {
+            try {
+                await pending;
+                return __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").has(key);
+            }
+            catch (error) {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Subscription builder approval unavailable', error);
+                return false;
+            }
+        }
+        const approval = (async () => {
+            const currentApproval = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this, builderAddress, userAddress);
+            if (approvalEpoch !== __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f")) {
+                return;
+            }
+            if (currentApproval !== null &&
+                currentApproval >= hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeDecimal) {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").add(key);
+                return;
+            }
+            const exchangeClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getExchangeClient();
+            await exchangeClient.approveBuilderFee({
+                builder: builderAddress,
+                maxFeeRate: hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeRate,
+            });
+            if (approvalEpoch !== __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f")) {
+                return;
+            }
+            const afterApproval = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this, builderAddress, userAddress);
+            if (approvalEpoch !== __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f")) {
+                return;
+            }
+            if (afterApproval === null ||
+                afterApproval < hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeDecimal) {
+                throw new Error('[HyperLiquidProvider] Subscription builder approval verification failed');
+            }
+            __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").add(key);
+        })();
+        __classPrivateFieldGet(this, _HyperLiquidProvider_pendingBuilderFeeApprovals, "f").set(key, approval);
+        try {
+            await approval;
+            return __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").has(key);
+        }
+        catch (error) {
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Subscription builder approval unavailable', error);
+            return false;
+        }
+        finally {
+            if (__classPrivateFieldGet(this, _HyperLiquidProvider_pendingBuilderFeeApprovals, "f").get(key) === approval) {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_pendingBuilderFeeApprovals, "f").delete(key);
+            }
+        }
+    }
     /**
      * Place an order using direct wallet signing
      *
@@ -1249,19 +1381,11 @@ class HyperLiquidProvider {
                     results: skippedResults,
                 };
             }
-            // Calculate discounted builder fee if reward discount is active
-            let builderFee = hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps;
-            if (__classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") !== undefined) {
-                builderFee = Math.floor(builderFee * (1 - __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") / hyperLiquidConfig_js_1.BASIS_POINTS_DIVISOR));
-            }
             // Single batch API call
             const result = await exchangeClient.order({
                 orders,
                 grouping: 'na',
-                builder: {
-                    b: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode()),
-                    f: builderFee,
-                },
+                builder: await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderOrderContext).call(this),
             });
             // Parse response statuses (one per order)
             const { statuses } = result.response.data;
@@ -1627,26 +1751,13 @@ class HyperLiquidProvider {
                     // No orderId since we only cancelled orders, didn't place new ones
                 };
             }
-            // Calculate discounted builder fee if reward discount is active
-            let builderFee = hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps;
-            if (__classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") !== undefined) {
-                builderFee = Math.floor(builderFee * (1 - __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") / hyperLiquidConfig_js_1.BASIS_POINTS_DIVISOR));
-                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquid: Applying builder fee discount to TP/SL', {
-                    originalFee: hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps,
-                    discountBips: __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f"),
-                    discountedFee: builderFee,
-                });
-            }
             // Submit via SDK exchange client. Position-bound TP/SL uses 'positionTpsl';
             // partial TP/SL must be standalone reduce-only triggers ('na'), since a
             // position-bound TP/SL always closes the whole position.
             const result = await exchangeClient.order({
                 orders,
                 grouping: isPartialTpsl ? 'na' : 'positionTpsl',
-                builder: {
-                    b: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode()),
-                    f: builderFee,
-                },
+                builder: await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderOrderContext).call(this),
             });
             if (result.status !== 'ok') {
                 throw new Error(`TP/SL update failed: ${JSON.stringify(result)}`);
@@ -1945,6 +2056,122 @@ class HyperLiquidProvider {
             };
         }
     }
+    /**
+     * Fetch a complete standalone user-data bundle.
+     *
+     * Each DEX clearinghouse response is shared by position and account-state
+     * mapping. Any required request failure rejects the entire bundle.
+     *
+     * @param params - User and captured controller identity.
+     * @returns The complete user-data snapshot.
+     */
+    async getUserDataSnapshot(params) {
+        const { identity, userAddress } = params;
+        const network = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode() ? 'testnet' : 'mainnet';
+        const snapshotStartedAt = __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").performance.now();
+        const measure = async (stage, request, dex) => {
+            const startedAt = __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").performance.now();
+            const dexDetail = dex === undefined ? {} : { dex: dex ?? 'main' };
+            try {
+                const result = await request();
+                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[PerpsUserSnapshot]', {
+                    stage,
+                    durationMs: Math.round(__classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").performance.now() - startedAt),
+                    success: true,
+                    ...dexDetail,
+                });
+                return result;
+            }
+            catch (error) {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[PerpsUserSnapshot]', {
+                    stage,
+                    durationMs: Math.round(__classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").performance.now() - startedAt),
+                    success: false,
+                    ...dexDetail,
+                });
+                throw error;
+            }
+        };
+        if (identity.provider !== 'hyperliquid' || identity.network !== network) {
+            throw new Error('User data snapshot identity does not match provider');
+        }
+        const requestedDexes = identity.dexes;
+        const canonicalDexes = (0, hyperLiquidConfig_js_1.canonicalizeHyperLiquidDexes)(requestedDexes);
+        const hasValidDexIdentity = requestedDexes.length > 0 &&
+            new Set(requestedDexes).size === requestedDexes.length &&
+            requestedDexes.every((dex) => dex === 'main' || /^[a-z0-9][a-z0-9-]*$/u.test(dex)) &&
+            requestedDexes.length === canonicalDexes.length &&
+            requestedDexes.every((dex, index) => dex === canonicalDexes[index]);
+        if (!hasValidDexIdentity) {
+            throw new Error('User data snapshot DEX identity is invalid');
+        }
+        const dexs = requestedDexes.map((dex) => (dex === 'main' ? null : dex));
+        const standaloneInfoClient = (0, standaloneInfoClient_js_1.createStandaloneInfoClient)({
+            isTestnet: network === 'testnet',
+        });
+        const buildUserParams = (dex) => ({
+            user: userAddress,
+            ...(dex ? { dex } : {}),
+        });
+        const [clearinghouseStates, openOrdersByDex, spotState, abstractionMode] = await Promise.all([
+            Promise.all(dexs.map((dex) => measure('clearinghouse_state', () => standaloneInfoClient.clearinghouseState(buildUserParams(dex)), dex))),
+            Promise.all(dexs.map((dex) => measure('frontend_open_orders', () => standaloneInfoClient.frontendOpenOrders(buildUserParams(dex)), dex))),
+            measure('spot_clearinghouse_state', () => standaloneInfoClient.spotClearinghouseState({ user: userAddress })),
+            measure('user_abstraction', () => standaloneInfoClient.userAbstraction({ user: userAddress })),
+        ]);
+        const rawOrders = openOrdersByDex.flat();
+        const childOrderIds = collectChildOrderIds(rawOrders);
+        const ordersBySymbol = groupOrdersBySymbol(rawOrders);
+        const positions = clearinghouseStates.flatMap((state) => state.assetPositions
+            .filter(({ position }) => position.szi !== '0')
+            .map((assetPosition) => {
+            const position = (0, hyperLiquidAdapter_js_1.adaptPositionFromSDK)(assetPosition);
+            const { takeProfitOrders, stopLossOrders, takeProfitPrice, stopLossPrice, } = collectPositionTriggerOrders({
+                orders: ordersBySymbol.get(position.symbol) ?? [],
+                position,
+                childOrderIds,
+            });
+            return {
+                ...position,
+                takeProfitCount: takeProfitOrders.length,
+                stopLossCount: stopLossOrders.length,
+                takeProfitOrders,
+                stopLossOrders,
+                ...(takeProfitPrice && { takeProfitPrice }),
+                ...(stopLossPrice && { stopLossPrice }),
+            };
+        }));
+        const positionsBySymbol = new Map(positions.map((position) => [position.symbol, position]));
+        const orders = rawOrders.map((order) => (0, hyperLiquidAdapter_js_1.adaptOrderFromSDK)(order, positionsBySymbol.get(order.coin)));
+        const dexAccountStates = clearinghouseStates.map((state) => (0, hyperLiquidAdapter_js_1.adaptAccountStateFromSDK)(state));
+        const accountState = (0, accountUtils_js_1.addSpotBalanceToAccountState)((0, accountUtils_js_1.aggregateAccountStates)(dexAccountStates), spotState, { foldIntoCollateral: (0, hyperliquid_types_js_1.hyperLiquidModeFoldsSpot)(abstractionMode) });
+        accountState.subAccountBreakdown = Object.fromEntries(dexAccountStates.map((dexAccountState, index) => {
+            return [
+                dexs[index] ?? '',
+                {
+                    spendableBalance: dexAccountState.spendableBalance,
+                    withdrawableBalance: dexAccountState.withdrawableBalance,
+                    totalBalance: dexAccountState.totalBalance,
+                },
+            ];
+        }));
+        const snapshot = {
+            positions,
+            orders,
+            accountState,
+            identity: {
+                ...identity,
+                address: userAddress,
+            },
+        };
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[PerpsUserSnapshot]', {
+            stage: 'complete',
+            durationMs: Math.round(__classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").performance.now() - snapshotStartedAt),
+            success: true,
+            dexCount: dexs.length,
+        });
+        return snapshot;
+    }
     /**
      * Get current positions with TP/SL prices
      *
@@ -4296,6 +4523,10 @@ class HyperLiquidProvider {
             // Clear session caches (ensures fresh state on reconnect/account switch)
             __classPrivateFieldGet(this, _HyperLiquidProvider_referralCheckCache, "f").clear();
             __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").clear();
+            __classPrivateFieldSet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderApprovalEpoch, "f") + 1, "f");
+            __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").clear();
+            __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeResolution, undefined, "f");
+            __classPrivateFieldSet(this, _HyperLiquidProvider_userFeeDiscountBips, undefined, "f");
             // NOTE: UnifiedAccountCache is global and NOT cleared on disconnect
             // to prevent repeated signing requests across reconnections
             __classPrivateFieldGet(this, _HyperLiquidProvider_cachedMetaByDex, "f").clear();
@@ -4477,7 +4708,7 @@ class HyperLiquidProvider {
     }
 }
 exports.HyperLiquidProvider = HyperLiquidProvider;
-_HyperLiquidProvider_deps = new WeakMap(), _HyperLiquidProvider_clientService = new WeakMap(), _HyperLiquidProvider_walletService = new WeakMap(), _HyperLiquidProvider_subscriptionService = new WeakMap(), _HyperLiquidProvider_symbolToAssetId = new WeakMap(), _HyperLiquidProvider_userFeeCache = new WeakMap(), _HyperLiquidProvider_maxLeverageCache = new WeakMap(), _HyperLiquidProvider_cachedMetaByDex = new WeakMap(), _HyperLiquidProvider_cachedMarketDataWithPrices = new WeakMap(), _HyperLiquidProvider_cachedSpotMeta = new WeakMap(), _HyperLiquidProvider_dexDiscoveryCache = new WeakMap(), _HyperLiquidProvider_referralCheckCache = new WeakMap(), _HyperLiquidProvider_builderFeeCheckCache = new WeakMap(), _HyperLiquidProvider_ensureReadyPromise = new WeakMap(), _HyperLiquidProvider_pendingBuilderFeeApprovals = new WeakMap(), _HyperLiquidProvider_compiledAllowlistPatterns = new WeakMap(), _HyperLiquidProvider_compiledBlocklistPatterns = new WeakMap(), _HyperLiquidProvider_userFeeDiscountBips = new WeakMap(), _HyperLiquidProvider_hip3Enabled = new WeakMap(), _HyperLiquidProvider_allowlistMarkets = new WeakMap(), _HyperLiquidProvider_blocklistMarkets = new WeakMap(), _HyperLiquidProvider_useUnifiedAccount = new WeakMap(), _HyperLiquidProvider_dexDiscoveryComplete = new WeakMap(), _HyperLiquidProvider_unifiedAccountSetupNeedsRetry = new WeakMap(), _HyperLiquidProvider_pendingValidatedDexsPromise = new WeakMap(), _HyperLiquidProvider_cachedUsdcTokenId = new WeakMap(), _HyperLiquidProvider_errorMappings = new WeakMap(), _HyperLiquidProvider_scaleOrderGroups = new WeakMap(), _HyperLiquidProvider_chaseSessions = new WeakMap(), _HyperLiquidProvider_chasePlacementsInFlight = new WeakMap(), _HyperLiquidProvider_chaseGeneration = new WeakMap(), _HyperLiquidProvider_clientsInitialized = new WeakMap(), _HyperLiquidProvider_initializationPromise = new WeakMap(), _HyperLiquidProvider_messenger = new WeakMap(), _HyperLiquidProvider_builderAddressTestnet = new WeakMap(), _HyperLiquidProvider_builderAddressMainnet = new WeakMap(), _HyperLiquidProvider_priceDeviationLimit = new WeakMap(), _HyperLiquidProvider_tradingSetupPromise = new WeakMap(), _HyperLiquidProvider_tradingSetupComplete = new WeakMap(), _HyperLiquidProvider_instances = new WeakSet(), _HyperLiquidProvider_compilePatternsSafely = function _HyperLiquidProvider_compilePatternsSafely(patterns, listName) {
+_HyperLiquidProvider_deps = new WeakMap(), _HyperLiquidProvider_clientService = new WeakMap(), _HyperLiquidProvider_walletService = new WeakMap(), _HyperLiquidProvider_subscriptionService = new WeakMap(), _HyperLiquidProvider_symbolToAssetId = new WeakMap(), _HyperLiquidProvider_userFeeCache = new WeakMap(), _HyperLiquidProvider_maxLeverageCache = new WeakMap(), _HyperLiquidProvider_cachedMetaByDex = new WeakMap(), _HyperLiquidProvider_cachedMarketDataWithPrices = new WeakMap(), _HyperLiquidProvider_cachedSpotMeta = new WeakMap(), _HyperLiquidProvider_dexDiscoveryCache = new WeakMap(), _HyperLiquidProvider_referralCheckCache = new WeakMap(), _HyperLiquidProvider_builderFeeCheckCache = new WeakMap(), _HyperLiquidProvider_ensureReadyPromise = new WeakMap(), _HyperLiquidProvider_pendingBuilderFeeApprovals = new WeakMap(), _HyperLiquidProvider_subscriptionBuilderApprovalEpoch = new WeakMap(), _HyperLiquidProvider_approvedBuilderAddresses = new WeakMap(), _HyperLiquidProvider_compiledAllowlistPatterns = new WeakMap(), _HyperLiquidProvider_compiledBlocklistPatterns = new WeakMap(), _HyperLiquidProvider_userFeeDiscountBips = new WeakMap(), _HyperLiquidProvider_userFeeResolution = new WeakMap(), _HyperLiquidProvider_hip3Enabled = new WeakMap(), _HyperLiquidProvider_allowlistMarkets = new WeakMap(), _HyperLiquidProvider_blocklistMarkets = new WeakMap(), _HyperLiquidProvider_useUnifiedAccount = new WeakMap(), _HyperLiquidProvider_dexDiscoveryComplete = new WeakMap(), _HyperLiquidProvider_unifiedAccountSetupNeedsRetry = new WeakMap(), _HyperLiquidProvider_pendingValidatedDexsPromise = new WeakMap(), _HyperLiquidProvider_cachedUsdcTokenId = new WeakMap(), _HyperLiquidProvider_errorMappings = new WeakMap(), _HyperLiquidProvider_scaleOrderGroups = new WeakMap(), _HyperLiquidProvider_chaseSessions = new WeakMap(), _HyperLiquidProvider_chasePlacementsInFlight = new WeakMap(), _HyperLiquidProvider_chaseGeneration = new WeakMap(), _HyperLiquidProvider_clientsInitialized = new WeakMap(), _HyperLiquidProvider_initializationPromise = new WeakMap(), _HyperLiquidProvider_messenger = new WeakMap(), _HyperLiquidProvider_builderAddressTestnet = new WeakMap(), _HyperLiquidProvider_builderAddressMainnet = new WeakMap(), _HyperLiquidProvider_subscriptionBuilderAddressTestnet = new WeakMap(), _HyperLiquidProvider_subscriptionBuilderAddressMainnet = new WeakMap(), _HyperLiquidProvider_priceDeviationLimit = new WeakMap(), _HyperLiquidProvider_tradingSetupPromise = new WeakMap(), _HyperLiquidProvider_tradingSetupComplete = new WeakMap(), _HyperLiquidProvider_instances = new WeakSet(), _HyperLiquidProvider_compilePatternsSafely = function _HyperLiquidProvider_compilePatternsSafely(patterns, listName) {
     const compiled = [];
     for (const pattern of patterns) {
         try {
@@ -5101,7 +5332,7 @@ async function _HyperLiquidProvider_getOrFetchPrice(params) {
     }
     // Fallback to REST API if cache miss
     __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Price cache miss for getOrFetchPrice, falling back to REST allMids', { symbol });
-    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient();
+    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient({ useHttp: true });
     const mids = await infoClient.allMids(dexName ? { dex: dexName } : undefined);
     const price = parseFloat(mids[symbol] || '0');
     // Validate REST price: must be positive and finite
@@ -5272,8 +5503,16 @@ async function _HyperLiquidProvider_getCachedMeta(params) {
             return cached;
         }
     }
-    // Cache miss or skipCache=true - fetch from API
-    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient();
+    // Cache miss or skipCache=true - fetch from API.
+    // Bring the SDK clients up first. This is the first client touch on the
+    // write path — placeOrder resolves asset info before it ensures trading
+    // readiness — so without it a cold start or a post-disconnect action fails
+    // with CLIENT_NOT_INITIALIZED instead of waiting for the clients it needs.
+    // Idempotent, and a warm cache hit returns above without reaching here.
+    await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureClientsInitialized).call(this);
+    // Metadata is request/response data, so keep this path available while a
+    // failed WebSocket reconnect is retrying.
+    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient({ useHttp: true });
     // Pass dex only for HIP-3 DEXs; omit for main DEX (empty string).
     // Testnet API returns null when dex="" is explicitly sent.
     const meta = await infoClient.meta(dexKey ? { dex: dexKey } : undefined);
@@ -5494,6 +5733,8 @@ async function _HyperLiquidProvider_calculateHip3FeeMultiplier(params) {
     }
 }, _HyperLiquidProvider_getCacheKey = function _HyperLiquidProvider_getCacheKey(network, userAddress) {
     return `${network}:${userAddress.toLowerCase()}`;
+}, _HyperLiquidProvider_getApprovedBuilderKey = function _HyperLiquidProvider_getApprovedBuilderKey(network, userAddress, builderAddress) {
+    return `${__classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getCacheKey).call(this, network, userAddress)}:${builderAddress.toLowerCase()}`;
 }, _HyperLiquidProvider_fetchMarketsForDex = 
 /**
  * Fetch markets for a specific DEX with optional filtering
@@ -5821,12 +6062,12 @@ async function _HyperLiquidProvider_queryUserDataAcrossDexs(baseParams, queryFn)
 /**
  * Check current builder fee approval for the user
  *
+ * @param builder - Builder address to query.
+ * @param userAddress - Account whose approval should be queried.
  * @returns Current max fee rate or null if not approved
  */
-async function _HyperLiquidProvider_checkBuilderFeeApproval() {
+async function _HyperLiquidProvider_checkBuilderFeeApproval(builder, userAddress) {
     const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient();
-    const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
-    const builder = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode());
     return infoClient.maxBuilderFee({
         user: userAddress,
         builder,
@@ -5855,6 +6096,7 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
     if (globalCached?.attempted && globalCached?.success) {
         __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Using global cache (prevents hardware wallet prompt spam)', { network, success: globalCached.success });
         __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").set(cacheKey, true);
+        __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").add(__classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getApprovedBuilderKey).call(this, network, userAddress, builderAddress));
         return;
     }
     // Check if another provider instance is currently attempting this operation
@@ -5874,7 +6116,7 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
             completeInFlight();
             return;
         }
-        const { isApproved, requiredDecimal } = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeStatus).call(this);
+        const { isApproved, requiredDecimal } = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeStatus).call(this, builderAddress, userAddress);
         if (isApproved) {
             // User already has approval on-chain
             TradingReadinessCache_js_1.PerpsSigningCache.setBuilderFee(network, userAddress, {
@@ -5882,6 +6124,7 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
                 success: true,
             });
             __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").set(cacheKey, true);
+            __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").add(__classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getApprovedBuilderKey).call(this, network, userAddress, builderAddress));
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Already approved on-chain', { network });
         }
         else {
@@ -5893,7 +6136,7 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
                 maxFeeRate,
             });
             // Verify approval was successful before caching
-            const afterApprovalDecimal = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this);
+            const afterApprovalDecimal = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this, builderAddress, userAddress);
             if (afterApprovalDecimal === null ||
                 afterApprovalDecimal < requiredDecimal) {
                 throw new Error('[HyperLiquidProvider] Builder fee approval verification failed');
@@ -5904,6 +6147,7 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
                 success: true,
             });
             __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").set(cacheKey, true);
+            __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").add(__classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getApprovedBuilderKey).call(this, network, userAddress, builderAddress));
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Approval successful', {
                 builder: builderAddress,
                 maxFeeRate,
@@ -5935,10 +6179,12 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
 /**
  * Check if builder fee is approved for the current user
  *
+ * @param builderAddress - Builder address to query.
+ * @param userAddress - Account whose approval should be queried.
  * @returns Object with approval status and current rate
  */
-async function _HyperLiquidProvider_checkBuilderFeeStatus() {
-    const currentApproval = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this);
+async function _HyperLiquidProvider_checkBuilderFeeStatus(builderAddress, userAddress) {
+    const currentApproval = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_checkBuilderFeeApproval).call(this, builderAddress, userAddress);
     const requiredDecimal = hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeDecimal;
     return {
         isApproved: currentApproval !== null && currentApproval >= requiredDecimal,
@@ -6492,16 +6738,7 @@ async function _HyperLiquidProvider_handleHip3PreOrder(params) {
 async function _HyperLiquidProvider_submitOrderWithRollback(params) {
     const { orders, grouping, isHip3Order, dexName, transferInfo, symbol } = params;
     const exchangeClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getExchangeClient();
-    // Calculate discounted builder fee
-    let builderFee = hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps;
-    if (__classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") !== undefined) {
-        builderFee = Math.floor(builderFee * (1 - __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") / hyperLiquidConfig_js_1.BASIS_POINTS_DIVISOR));
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Applying builder fee discount', {
-            originalFee: hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps,
-            discountBips: __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f"),
-            discountedFee: builderFee,
-        });
-    }
+    const builder = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderOrderContext).call(this);
     __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Submitting order via asset ID routing', {
         symbol,
         assetId: orders[0].a,
@@ -6514,10 +6751,7 @@ async function _HyperLiquidProvider_submitOrderWithRollback(params) {
         const result = await exchangeClient.order({
             orders,
             grouping,
-            builder: {
-                b: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode()),
-                f: builderFee,
-            },
+            builder,
         });
         if (result.status !== 'ok') {
             throw new Error(`Order failed: ${JSON.stringify(result)}`);
@@ -6835,10 +7069,7 @@ async function _HyperLiquidProvider_placeScaleOrder(params, context) {
     const result = await exchangeClient.order({
         orders,
         grouping: 'na',
-        builder: {
-            b: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode()),
-            f: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getDiscountedBuilderFee).call(this),
-        },
+        builder: await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderOrderContext).call(this),
     });
     if (result.status !== 'ok') {
         throw new Error(`Scale order failed: ${JSON.stringify(result)}`);
@@ -6922,8 +7153,8 @@ async function _HyperLiquidProvider_startChaseSession(params, context, generatio
     if (generation !== __classPrivateFieldGet(this, _HyperLiquidProvider_chaseGeneration, "f")) {
         throw new Error(perpsErrorCodes_js_1.PERPS_ERROR_CODES.ORDER_CHASE_ABANDONED);
     }
-    // Read once, while the caller's discount context is still set.
-    const builderFee = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getDiscountedBuilderFee).call(this);
+    // Read once, while the caller's fee-source context is still set.
+    const builder = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderOrderContext).call(this);
     // Held onto rather than looked up again after the submission returns.
     // `disconnect` drops the service's client reference synchronously, so a
     // retraction that asked for a client after the fact would be refused one
@@ -6936,7 +7167,8 @@ async function _HyperLiquidProvider_startChaseSession(params, context, generatio
         price: quotePrice,
         size: formattedSize,
         reduceOnly: params.reduceOnly ?? false,
-        builderFee,
+        builderFee: builder.f,
+        builderAddress: builder.b,
         exchangeClient: placingClient,
     });
     const intervalMs = params.chaseIntervalMs ?? perpsConfig_js_1.CHASE_ORDER_CONFIG.DefaultIntervalMs;
@@ -6952,7 +7184,8 @@ async function _HyperLiquidProvider_startChaseSession(params, context, generatio
         pendingReplacement: null,
         restingPrice: quotePrice,
         intervalMs,
-        builderFee,
+        builderFee: builder.f,
+        builderAddress: builder.b,
         deadline: Date.now() +
             (params.chaseMaxDurationMs ?? perpsConfig_js_1.CHASE_ORDER_CONFIG.DefaultMaxDurationMs),
         maxRepricings: params.chaseMaxRepricings ?? perpsConfig_js_1.CHASE_ORDER_CONFIG.DefaultMaxRepricings,
@@ -7058,6 +7291,7 @@ async function _HyperLiquidProvider_getChaseQuotePrice(params) {
  * @param params.reduceOnly - Whether the order may only reduce a position.
  * @param params.builderFee - Builder fee, in tenths of a basis point, captured
  * when the session started so replacements keep the rate they were quoted at.
+ * @param params.builderAddress - Builder address captured with the fee.
  * @param params.exchangeClient - Client to submit through. Passed in rather
  * than looked up here so a first placement can keep the instance it signed
  * with, which is the only one that can take the order back once `disconnect`
@@ -7080,7 +7314,7 @@ async function _HyperLiquidProvider_restChaseOrder(params) {
         ],
         grouping: 'na',
         builder: {
-            b: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode()),
+            b: params.builderAddress,
             f: params.builderFee,
         },
     });
@@ -7258,6 +7492,7 @@ async function _HyperLiquidProvider_runChaseTick(sessionId) {
                     size: remaining,
                     reduceOnly: session.reduceOnly,
                     builderFee: session.builderFee,
+                    builderAddress: session.builderAddress,
                     // A running session is on a live provider, so the current client is
                     // the right one; only the first placement has a teardown to survive.
                     exchangeClient: __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getExchangeClient(),
@@ -7631,6 +7866,33 @@ async function _HyperLiquidProvider_cancelChaseOrder(params) {
     }
     return Math.floor(hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps *
         (1 - __classPrivateFieldGet(this, _HyperLiquidProvider_userFeeDiscountBips, "f") / hyperLiquidConfig_js_1.BASIS_POINTS_DIVISOR));
+}, _HyperLiquidProvider_getBuilderOrderContext = 
+/**
+ * Resolve the builder payload for the current operation.
+ *
+ * Subscription waivers use their dedicated builder only after approval is
+ * cached for this provider/account session. Until then, the ordinary builder
+ * and standard fee keep the trade attributable and non-blocking.
+ *
+ * @returns HyperLiquid builder address and fee payload.
+ */
+async function _HyperLiquidProvider_getBuilderOrderContext() {
+    const isTestnet = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode();
+    const network = isTestnet ? 'testnet' : 'mainnet';
+    const defaultBuilder = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getBuilderAddress).call(this, isTestnet);
+    if (__classPrivateFieldGet(this, _HyperLiquidProvider_userFeeResolution, "f")?.source === 'subscription') {
+        const subscriptionBuilder = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getSubscriptionBuilderAddress).call(this, isTestnet);
+        const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
+        if (subscriptionBuilder &&
+            __classPrivateFieldGet(this, _HyperLiquidProvider_approvedBuilderAddresses, "f").has(__classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getApprovedBuilderKey).call(this, network, userAddress, subscriptionBuilder))) {
+            return { b: subscriptionBuilder, f: 0 };
+        }
+        return {
+            b: defaultBuilder,
+            f: hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MaxFeeTenthsBps,
+        };
+    }
+    return { b: defaultBuilder, f: __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getDiscountedBuilderFee).call(this) };
 }, _HyperLiquidProvider_fetchOpenOrders = 
 /**
  * Read the account's currently resting orders.
@@ -7924,6 +8186,10 @@ async function _HyperLiquidProvider_excludeNonUsdcCollateralResults(results) {
     }
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     return __classPrivateFieldGet(this, _HyperLiquidProvider_builderAddressMainnet, "f") || hyperLiquidConfig_js_1.BUILDER_FEE_CONFIG.MainnetBuilder;
+}, _HyperLiquidProvider_getSubscriptionBuilderAddress = function _HyperLiquidProvider_getSubscriptionBuilderAddress(isTestnet) {
+    return isTestnet
+        ? __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderAddressTestnet, "f")
+        : __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionBuilderAddressMainnet, "f");
 }, _HyperLiquidProvider_getReferralCode = function _HyperLiquidProvider_getReferralCode(isTestnet) {
     return isTestnet
         ? hyperLiquidConfig_js_1.REFERRAL_CONFIG.TestnetCode