@metamask-previews/perps-controller 17.3.0-preview-d3f9964be → 17.4.0-preview-aecbce4ff

package/dist/PerpsController.js

@@ -685,6 +685,30 @@ export class PerpsController extends BaseController {
         // geo-blocking and HIP-3 flag propagation must remain active across
         // disconnect → reconnect cycles and must never be torn down.
         this.messenger.subscribe('RemoteFeatureFlagController:stateChange', this.refreshEligibilityOnFeatureFlagChange.bind(this));
+        // Also subscribed for the controller lifetime: the subscription profile
+        // must learn the new trading address after every account switch, and the
+        // preload-scoped account handler is torn down on disconnect, so it cannot
+        // carry this.
+        const forgetRegisteredTradingAddresses = () => {
+            this.#rewardsIntegrationService.resetRegisteredTradingAddresses();
+            // Clearing alone only guarantees the *next preview* re-registers. An
+            // order submitted straight after a switch, with no preview in between,
+            // would otherwise be attributed to nothing, so the new address announces
+            // itself here. Fire-and-forget: attribution plumbing must not block or
+            // fail an account switch.
+            const switchedAccount = getSelectedEvmAccountFromMessenger(this.messenger);
+            if (switchedAccount) {
+                this.#rewardsIntegrationService
+                    .registerTradingAddress(switchedAccount.address, {
+                    isTestnet: this.state.isTestnet,
+                })
+                    .catch(() => {
+                    /* never blocks an account switch */
+                });
+            }
+        };
+        this.messenger.subscribe('AccountsController:selectedAccountChange', forgetRegisteredTradingAddresses);
+        this.messenger.subscribe('AccountTreeController:selectedAccountGroupChange', forgetRegisteredTradingAddresses);
         this.providers = new Map();
         // Migrate old persisted data without accountAddress
         this.#migrateRequestsIfNeeded();
@@ -4322,24 +4346,54 @@ export class PerpsController extends BaseController {
         // cache read and can therefore never start a benefits request while an
         // order is being signed.
         await this.#rewardsIntegrationService.refreshSubscriptionBenefits();
-        const waiverStatus = this.#rewardsIntegrationService.getSubscriptionFeeWaiverStatus();
+        // ADR 0064: preview is also where the trading address is announced, so a
+        // fill decoded off the HL fan-out can be attributed back to a profile.
+        // Fire-and-forget — attribution plumbing must not delay or fail a quote.
+        const selectedAccount = getSelectedEvmAccountFromMessenger(this.messenger);
+        if (selectedAccount) {
+            this.#rewardsIntegrationService
+                .registerTradingAddress(selectedAccount.address, {
+                isTestnet: this.state.isTestnet,
+            })
+                .catch(() => {
+                /* never blocks a fee preview */
+            });
+        }
+        // The preview quotes the same blended rate the submit path charges, which
+        // is only possible once the order notional reaches the resolver. `amount`
+        // is the order notional in USD for the quote being previewed.
+        const orderNotionalUsd = params.amount
+            ? Number.parseFloat(params.amount)
+            : undefined;
+        const feeResolution = await this.#rewardsIntegrationService.resolveFee(orderNotionalUsd);
+        // Taken from the resolution rather than read separately: a second read can
+        // observe a different snapshot if the cache is invalidated or the feature
+        // flag flips between the two, which would surface metadata describing a
+        // waiver the quoted rates do not reflect.
+        const waiverStatus = feeResolution.subscription;
         const context = this.#createServiceContext('calculateFees', {
             subscriptionFeeWaiver: waiverStatus.reason === 'no-source' ? undefined : waiverStatus,
+            feeResolution,
         });
         return this.#marketDataService.calculateFees({ provider, params, context });
     }
     /**
      * Approve the dedicated subscription builder outside order submission.
-     * Until this succeeds, subscription waivers fall back to the ordinary
-     * builder at the standard fee.
      *
-     * @returns Whether the subscription builder is approved.
+     * @deprecated ADR 0064 replaced the dedicated subscription builder with cloid
+     * marking on the standard builder, so there is nothing left to approve. Kept
+     * as a no-op so clients still calling it keep building while they migrate;
+     * remove it once cloid marking is verified in shadow mode.
+     *
+     * Resolves `true`, not `false`. The method answers "is the subscription
+     * builder ready?", and the honest answer is now "nothing needs approving" —
+     * a `false` would read as a setup failure to a caller that branches on it and
+     * could block a waiver that is already fully in effect.
+     * @returns Always `true`; no approval is required.
      */
     async approveSubscriptionBuilderFee() {
-        const provider = this.getActiveProvider();
-        return provider.approveSubscriptionBuilderFee
-            ? provider.approveSubscriptionBuilderFee()
-            : false;
+        this.#debugLog('PerpsController: approveSubscriptionBuilderFee is a no-op; subscription attribution now rides on the order cloid');
+        return true;
     }
     /**
      * Drop the cached subscription benefits snapshot.