Merge branch 'main' into fix/remove-confirmation-decode-reliance

MetaMask · Dec 20, 2024 · f99fbd7 · f99fbd7
2 parents 3644b3e + d4c5a73
commit f99fbd7
Show file tree

Hide file tree

Showing 118 changed files with 1,168 additions and 936 deletions.
diff --git a/.yarn/patches/@metamask-assets-controllers-patch-d6ed5f8213.patch b/.yarn/patches/@metamask-assets-controllers-patch-d6ed5f8213.patch
@@ -0,0 +1,61 @@
+diff --git a/dist/multicall.cjs b/dist/multicall.cjs
+index bf9aa5e86573fc1651f421cc0b64f5af121c3ab2..43a0531ed86cd3ee1774dcda3f990dd40f7f52de 100644
+--- a/dist/multicall.cjs
++++ b/dist/multicall.cjs
+@@ -342,9 +342,22 @@ const multicallOrFallback = async (calls, chainId, provider, maxCallsPerMultical
+         return [];
+     }
+     const multicallAddress = MULTICALL_CONTRACT_BY_CHAINID[chainId];
+-    return await (multicallAddress
+-        ? multicall(calls, multicallAddress, provider, maxCallsPerMulticall)
+-        : fallback(calls, maxCallsParallel));
++    if (multicallAddress) {
++        try {
++            return await multicall(calls, multicallAddress, provider, maxCallsPerMulticall);
++        }
++        catch (error) {
++            // Fallback only on revert
++            // https://docs.ethers.org/v5/troubleshooting/errors/#help-CALL_EXCEPTION
++            if (!error ||
++                typeof error !== 'object' ||
++                !('code' in error) ||
++                error.code !== 'CALL_EXCEPTION') {
++                throw error;
++            }
++        }
++    }
++    return await fallback(calls, maxCallsParallel);
+ };
+ exports.multicallOrFallback = multicallOrFallback;
+ //# sourceMappingURL=multicall.cjs.map
+\ No newline at end of file
+diff --git a/dist/multicall.mjs b/dist/multicall.mjs
+index 8fbe0112303d5df1d868e0357a9d31e43a3b6cf9..860dfdbddd813659cb2be5f7faed5d4016db5966 100644
+--- a/dist/multicall.mjs
++++ b/dist/multicall.mjs
+@@ -339,8 +339,21 @@ export const multicallOrFallback = async (calls, chainId, provider, maxCallsPerM
+         return [];
+     }
+     const multicallAddress = MULTICALL_CONTRACT_BY_CHAINID[chainId];
+-    return await (multicallAddress
+-        ? multicall(calls, multicallAddress, provider, maxCallsPerMulticall)
+-        : fallback(calls, maxCallsParallel));
++    if (multicallAddress) {
++        try {
++            return await multicall(calls, multicallAddress, provider, maxCallsPerMulticall);
++        }
++        catch (error) {
++            // Fallback only on revert
++            // https://docs.ethers.org/v5/troubleshooting/errors/#help-CALL_EXCEPTION
++            if (!error ||
++                typeof error !== 'object' ||
++                !('code' in error) ||
++                error.code !== 'CALL_EXCEPTION') {
++                throw error;
++            }
++        }
++    }
++    return await fallback(calls, maxCallsParallel);
+ };
+ //# sourceMappingURL=multicall.mjs.map
+\ No newline at end of file
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json