From 69b46bb4ec0fdf1ebd86d8845d6ff739eb50e924 Mon Sep 17 00:00:00 2001 From: Tai Nguyen TT Date: Thu, 22 Oct 2026 16:38:55 +0700 Subject: [PATCH 1/5] fix: stop requiring perps benefits builderCode The benefits API no longer sends Perps builderCode, and requiring it rejected otherwise valid subscription benefits. --- .../RewardsIntegrationService.test.ts | 1 - packages/subscription-controller/CHANGELOG.md | 4 ++++ .../src/SubscriptionController.test.ts | 2 -- .../src/SubscriptionService-structs.ts | 1 - .../src/SubscriptionService.test.ts | 20 +++++++++++++++++-- packages/subscription-controller/src/types.ts | 1 - 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts b/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts index 20c5079a12f..f542c84e45b 100644 --- a/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts +++ b/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts @@ -317,7 +317,6 @@ describe('RewardsIntegrationService', () => { }, perps: { builderFeeBips: null, - builderCode: null, // 5000 USD, reported in micro-USD as the controller does. remainingMicroUsd: 5_000_000_000, exhausted: false, diff --git a/packages/subscription-controller/CHANGELOG.md b/packages/subscription-controller/CHANGELOG.md index ef8c65f2981..253374b8eac 100644 --- a/packages/subscription-controller/CHANGELOG.md +++ b/packages/subscription-controller/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- **BREAKING:** Remove `builderCode` from `PerpsBenefitUsage` and from benefits-response validation. The Perps benefits payload no longer includes it, and requiring the field rejected otherwise valid responses. + ## [14.0.2] ### Changed diff --git a/packages/subscription-controller/src/SubscriptionController.test.ts b/packages/subscription-controller/src/SubscriptionController.test.ts index d16b5bd636f..dcb6e27a126 100644 --- a/packages/subscription-controller/src/SubscriptionController.test.ts +++ b/packages/subscription-controller/src/SubscriptionController.test.ts @@ -252,7 +252,6 @@ const MOCK_BENEFITS_RESPONSE: SubscriptionBenefitsResponse = { }, perps: { builderFeeBips: '0', - builderCode: '', capMicroUsd: 1_500_000_000, consumedMicroUsd: 500_000_000, remainingMicroUsd: 1_000_000_000, @@ -279,7 +278,6 @@ const MOCK_INELIGIBLE_BENEFITS_RESPONSE: SubscriptionBenefitsResponse = { }, perps: { builderFeeBips: null, - builderCode: null, remainingMicroUsd: null, exhausted: false, }, diff --git a/packages/subscription-controller/src/SubscriptionService-structs.ts b/packages/subscription-controller/src/SubscriptionService-structs.ts index 30447b55721..6ae48a3c486 100644 --- a/packages/subscription-controller/src/SubscriptionService-structs.ts +++ b/packages/subscription-controller/src/SubscriptionService-structs.ts @@ -143,7 +143,6 @@ const SwapsBenefitUsageStruct = type({ const PerpsBenefitUsageStruct = type({ builderFeeBips: nullable(string()), - builderCode: nullable(string()), capMicroUsd: optional(number()), consumedMicroUsd: optional(number()), remainingMicroUsd: nullable(number()), diff --git a/packages/subscription-controller/src/SubscriptionService.test.ts b/packages/subscription-controller/src/SubscriptionService.test.ts index f1201876d76..100632a3069 100644 --- a/packages/subscription-controller/src/SubscriptionService.test.ts +++ b/packages/subscription-controller/src/SubscriptionService.test.ts @@ -85,7 +85,6 @@ const MOCK_BENEFITS_RESPONSE: SubscriptionBenefitsResponse = { }, perps: { builderFeeBips: '0', - builderCode: '', capMicroUsd: 1_500_000_000, consumedMicroUsd: 500_000_000, remainingMicroUsd: 1_000_000_000, @@ -112,7 +111,6 @@ const MOCK_INELIGIBLE_BENEFITS_RESPONSE: SubscriptionBenefitsResponse = { }, perps: { builderFeeBips: null, - builderCode: null, remainingMicroUsd: null, exhausted: false, }, @@ -447,6 +445,24 @@ describe('SubscriptionService', () => { ).toStrictEqual(MOCK_BENEFITS_RESPONSE); }); + it('ignores a legacy perps builderCode', () => { + expect( + create( + { + ...MOCK_BENEFITS_RESPONSE, + products: { + ...MOCK_BENEFITS_RESPONSE.products, + perps: { + ...MOCK_BENEFITS_RESPONSE.products.perps, + builderCode: 'legacy-builder-code', + }, + }, + }, + SubscriptionBenefitsResponseStruct, + ), + ).toStrictEqual(MOCK_BENEFITS_RESPONSE); + }); + it('accepts an ineligible benefits response', () => { expect( create( diff --git a/packages/subscription-controller/src/types.ts b/packages/subscription-controller/src/types.ts index 707a1d86083..5e2b30812ba 100644 --- a/packages/subscription-controller/src/types.ts +++ b/packages/subscription-controller/src/types.ts @@ -277,7 +277,6 @@ export type SwapsBenefitUsage = { export type PerpsBenefitUsage = { builderFeeBips: string | null; - builderCode: string | null; capMicroUsd?: number; consumedMicroUsd?: number; remainingMicroUsd: number | null; From a12cf362729157d019d4cbd75e39a31b8ac11032 Mon Sep 17 00:00:00 2001 From: Tai Nguyen TT Date: Thu, 22 Oct 2026 16:39:26 +0700 Subject: [PATCH 2/5] chore: link the perps builderCode changelog entry --- packages/subscription-controller/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/subscription-controller/CHANGELOG.md b/packages/subscription-controller/CHANGELOG.md index 253374b8eac..cca8846d3b8 100644 --- a/packages/subscription-controller/CHANGELOG.md +++ b/packages/subscription-controller/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- **BREAKING:** Remove `builderCode` from `PerpsBenefitUsage` and from benefits-response validation. The Perps benefits payload no longer includes it, and requiring the field rejected otherwise valid responses. +- **BREAKING:** Remove `builderCode` from `PerpsBenefitUsage` and from benefits-response validation. The Perps benefits payload no longer includes it, and requiring the field rejected otherwise valid responses. ([#10995](https://github.com/MetaMask/core/pull/10995)) ## [14.0.2] From c334a8bdb2b1f31aa415cee397c235e345471bfd Mon Sep 17 00:00:00 2001 From: Tai Nguyen TT Date: Thu, 22 Oct 2026 16:49:16 +0700 Subject: [PATCH 3/5] test: accept legacy perps builderCode responses --- .../src/SubscriptionService.test.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/subscription-controller/src/SubscriptionService.test.ts b/packages/subscription-controller/src/SubscriptionService.test.ts index 100632a3069..345820d0aca 100644 --- a/packages/subscription-controller/src/SubscriptionService.test.ts +++ b/packages/subscription-controller/src/SubscriptionService.test.ts @@ -445,22 +445,24 @@ describe('SubscriptionService', () => { ).toStrictEqual(MOCK_BENEFITS_RESPONSE); }); - it('ignores a legacy perps builderCode', () => { + it('accepts a legacy perps builderCode', () => { + const responseWithLegacyBuilderCode = { + ...MOCK_BENEFITS_RESPONSE, + products: { + ...MOCK_BENEFITS_RESPONSE.products, + perps: { + ...MOCK_BENEFITS_RESPONSE.products.perps, + builderCode: 'legacy-builder-code', + }, + }, + }; + expect( create( - { - ...MOCK_BENEFITS_RESPONSE, - products: { - ...MOCK_BENEFITS_RESPONSE.products, - perps: { - ...MOCK_BENEFITS_RESPONSE.products.perps, - builderCode: 'legacy-builder-code', - }, - }, - }, + responseWithLegacyBuilderCode, SubscriptionBenefitsResponseStruct, ), - ).toStrictEqual(MOCK_BENEFITS_RESPONSE); + ).toStrictEqual(responseWithLegacyBuilderCode); }); it('accepts an ineligible benefits response', () => { From 61bcffedb9d7724b4898245f6bbd0eaba5426427 Mon Sep 17 00:00:00 2001 From: Tai Nguyen TT Date: Thu, 22 Oct 2026 16:52:06 +0700 Subject: [PATCH 4/5] test: drop the legacy perps builderCode case --- .../src/SubscriptionService.test.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/packages/subscription-controller/src/SubscriptionService.test.ts b/packages/subscription-controller/src/SubscriptionService.test.ts index 345820d0aca..59bbeb10385 100644 --- a/packages/subscription-controller/src/SubscriptionService.test.ts +++ b/packages/subscription-controller/src/SubscriptionService.test.ts @@ -445,26 +445,6 @@ describe('SubscriptionService', () => { ).toStrictEqual(MOCK_BENEFITS_RESPONSE); }); - it('accepts a legacy perps builderCode', () => { - const responseWithLegacyBuilderCode = { - ...MOCK_BENEFITS_RESPONSE, - products: { - ...MOCK_BENEFITS_RESPONSE.products, - perps: { - ...MOCK_BENEFITS_RESPONSE.products.perps, - builderCode: 'legacy-builder-code', - }, - }, - }; - - expect( - create( - responseWithLegacyBuilderCode, - SubscriptionBenefitsResponseStruct, - ), - ).toStrictEqual(responseWithLegacyBuilderCode); - }); - it('accepts an ineligible benefits response', () => { expect( create( From d562c636b601af2eb4ee4f6e94b39d6907ae41b5 Mon Sep 17 00:00:00 2001 From: Tai Nguyen TT Date: Thu, 22 Oct 2026 17:12:57 +0700 Subject: [PATCH 5/5] test: leave the perps benefits fixture unchanged The fixture is cast as never and the waiver path ignores builderCode, so dropping the field only pulls in a perps-controller review. --- .../tests/src/services/RewardsIntegrationService.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts b/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts index f542c84e45b..20c5079a12f 100644 --- a/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts +++ b/packages/perps-controller/tests/src/services/RewardsIntegrationService.test.ts @@ -317,6 +317,7 @@ describe('RewardsIntegrationService', () => { }, perps: { builderFeeBips: null, + builderCode: null, // 5000 USD, reported in micro-USD as the controller does. remainingMicroUsd: 5_000_000_000, exhausted: false,