Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/util/networks/customNetworks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ export const NETWORK_CHAIN_ID: {
readonly TEMPO_MAINNET: '0x1079';
readonly CHILIZ: '0x15b38';
readonly STABLE_MAINNET: '0x3dc';
readonly MANTLE: '0x1388';
} & typeof CHAIN_IDS = {
FLARE_MAINNET: '0xe',
SONGBIRD_TESTNET: '0x13',
Expand Down Expand Up @@ -438,7 +437,6 @@ export const NETWORK_CHAIN_ID: {
TEMPO_MAINNET: '0x1079',
CHILIZ: '0x15b38',
STABLE_MAINNET: '0x3dc',
MANTLE: '0x1388',
...CHAIN_IDS,
};

Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,9 @@
"expo-web-browser@npm:~14.0.2": "patch:expo-web-browser@npm%3A14.0.2#~/.yarn/patches/expo-web-browser-npm-14.0.2-98d00ce880.patch",
"@metamask/messenger@^0.3.0": "^1.0.0",
"@metamask/accounts-controller": "^37.2.0",
"@metamask/profile-sync-controller": "^28.0.2"
"@metamask/profile-sync-controller": "^28.0.2",
"@metamask/transaction-controller@^63.0.0": "^64.2.0",
"@metamask/transaction-controller@^63.3.1": "^64.2.0"
},
"dependencies": {
"@braze/react-native-sdk": "patch:@braze/react-native-sdk@npm%3A19.1.0#~/.yarn/patches/@braze-react-native-sdk-npm-19.1.0-076-reactmoduleinfo.patch",
Expand Down Expand Up @@ -325,7 +327,7 @@
"@metamask/superstruct": "^3.2.1",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/transaction-controller": "^64.2.0",
"@metamask/transaction-pay-controller": "^19.1.1",
"@metamask/transaction-pay-controller": "^19.2.1",
"@metamask/tron-wallet-snap": "^1.25.2",
"@metamask/utils": "^11.11.0",
"@myx-trade/sdk": "^0.1.265",
Expand Down
53 changes: 53 additions & 0 deletions patches/@metamask+transaction-pay-controller+19.2.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.cjs b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.cjs
index 66884ed..d475de2 100644
--- a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.cjs
+++ b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.cjs
@@ -238,7 +238,8 @@ exports.getPayStrategiesConfig = getPayStrategiesConfig;
function isRelayExecuteEnabled(messenger) {
const state = messenger.call('RemoteFeatureFlagController:getState');
const featureFlags = state.remoteFeatureFlags?.confirmations_pay ?? {};
- return featureFlags.payStrategies?.relay?.executeEnabled ?? false;
+ // Renamed from `executeEnabled` so the flag cannot re-enable the flow on older broken versions (predates version support).
+ return featureFlags.payStrategies?.relay?.gaslessEnabled ?? false;
}
exports.isRelayExecuteEnabled = isRelayExecuteEnabled;
/**
diff --git a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.mjs b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.mjs
index c8b2f8a..5ab03a9 100644
--- a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.mjs
+++ b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.mjs
@@ -232,7 +232,7 @@ export function getPayStrategiesConfig(messenger) {
export function isRelayExecuteEnabled(messenger) {
const state = messenger.call('RemoteFeatureFlagController:getState');
const featureFlags = state.remoteFeatureFlags?.confirmations_pay ?? {};
- return featureFlags.payStrategies?.relay?.executeEnabled ?? false;
+ return featureFlags.payStrategies?.relay?.gaslessEnabled ?? false;
}
/**
* Get the origin gas overhead to include in Relay quote requests
diff --git a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.cts b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.cts
index 0ef444d..0538026 100644
--- a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.cts
+++ b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.cts
@@ -41,7 +41,7 @@ export type PayStrategiesConfigRaw = {
across?: AcrossConfigRaw;
relay?: {
enabled?: boolean;
- executeEnabled?: boolean;
+ gaslessEnabled?: boolean;
originGasOverhead?: string;
pollingInterval?: number;
pollingTimeout?: number;
diff --git a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.mts b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.mts
index e08336e..8dd8f42 100644
--- a/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.mts
+++ b/node_modules/@metamask/transaction-pay-controller/dist/utils/feature-flags.d.mts
@@ -41,7 +41,7 @@ export type PayStrategiesConfigRaw = {
across?: AcrossConfigRaw;
relay?: {
enabled?: boolean;
- executeEnabled?: boolean;
+ gaslessEnabled?: boolean;
originGasOverhead?: string;
pollingInterval?: number;
pollingTimeout?: number;
Loading
Loading