Revert "Move eth_sendTransaction method handler to a separate module (

#5968)" (#6021) This reverts commit 49a6305.
MetaMask · Mar 22, 2023 · 3b02cc9 · 3b02cc9
1 parent 0e676ba
commit 3b02cc9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 278 deletions.
diff --git a/app/core/RPCMethods/RPCMethodMiddleware.ts b/app/core/RPCMethods/RPCMethodMiddleware.ts
@@ -326,25 +326,13 @@ export const getRpcMethodMiddleware = ({
       eth_coinbase: getEthAccounts,
       eth_sendTransaction: async () => {
         checkTabActive();
-        return RPCMethods.eth_sendTransaction({
-          next,
-          req,
-          res,
-          validateAccountAndChainId: async ({
-            from,
-            chainId,
-          }: {
-            from?: string;
-            chainId?: number;
-          }) => {
-            await checkActiveAccountAndChainId({
-              hostname,
-              address: from,
-              chainId,
-              checkSelectedAddress: isMMSDK || isWalletConnect,
-            });
-          },
+        await checkActiveAccountAndChainId({
+          hostname,
+          address: req.params[0].from,
+          chainId: req.params[0].chainId,
+          checkSelectedAddress: isMMSDK || isWalletConnect,
         });
+        next();
       },
       eth_signTransaction: async () => {
         // This is implemented later in our middleware stack – specifically, in

diff --git a/app/core/RPCMethods/eth_sendTransaction.test.ts b/app/core/RPCMethods/eth_sendTransaction.test.ts
diff --git a/app/core/RPCMethods/eth_sendTransaction.ts b/app/core/RPCMethods/eth_sendTransaction.ts
diff --git a/app/core/RPCMethods/index.js b/app/core/RPCMethods/index.js
@@ -1,9 +1,7 @@
-import eth_sendTransaction from './eth_sendTransaction';
 import wallet_addEthereumChain from './wallet_addEthereumChain.js';
 import wallet_switchEthereumChain from './wallet_switchEthereumChain.js';
 
 const RPCMethods = {
-  eth_sendTransaction,
   wallet_addEthereumChain,
   wallet_switchEthereumChain,
 };

diff --git a/metro.config.js b/metro.config.js
@@ -32,7 +32,7 @@ module.exports = (async () => {
     },
     resolver: {
       assetExts: assetExts.filter((ext) => ext !== 'svg'),
-      sourceExts: [...sourceExts, 'svg', 'cjs'],
+      sourceExts: [...sourceExts, 'svg'],
     },
     maxWorkers: 2,
   };

diff --git a/package.json b/package.json
@@ -152,12 +152,11 @@
     "@metamask/message-manager": "^1.0.1",
     "@metamask/network-controller": "^2.0.0",
     "@metamask/permission-controller": "^1.0.2",
-    "@metamask/phishing-controller": "^2.0.0",
     "@metamask/preferences-controller": "^2.1.0",
     "@metamask/sdk-communication-layer": "0.2.0",
+    "@metamask/phishing-controller": "^2.0.0",
     "@metamask/swaps-controller": "^6.8.0",
     "@metamask/transaction-controller": "^2.0.0",
-    "@metamask/utils": "^5.0.0",
     "@ngraveio/bc-ur": "^1.1.6",
     "@react-native-async-storage/async-storage": "^1.17.10",
     "@react-native-clipboard/clipboard": "^1.8.4",