Merge branch 'develop' into permission_approval_method_idempotent

MetaMask · Sep 15, 2022 · fb5c96e · fb5c96e
2 parents a1dc291 + 929a1a0
commit fb5c96e
Show file tree

Hide file tree

Showing 9 changed files with 522 additions and 1,196 deletions.
diff --git a/app/scripts/controllers/network/createInfuraClient.js b/app/scripts/controllers/network/createInfuraClient.js
@@ -8,7 +8,7 @@ import {
   providerFromMiddleware,
 } from 'eth-json-rpc-middleware';
 
-import createInfuraMiddleware from 'eth-json-rpc-infura';
+import { createInfuraMiddleware } from '@metamask/eth-json-rpc-infura';
 import { PollingBlockTracker } from 'eth-block-tracker';
 
 import { BUILT_IN_NETWORKS } from '../../../../shared/constants/network';

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -2635,6 +2635,7 @@
         "@metamask/contract-metadata": true,
         "@metamask/controllers>abort-controller": true,
         "@metamask/controllers>async-mutex": true,
+        "@metamask/controllers>eth-json-rpc-infura": true,
         "@metamask/controllers>eth-method-registry": true,
         "@metamask/controllers>eth-phishing-detect": true,
         "@metamask/controllers>ethereumjs-wallet": true,
@@ -2649,7 +2650,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-json-rpc-infura": true,
         "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
@@ -2683,6 +2683,33 @@
         "define": true
       }
     },
+    "@metamask/controllers>eth-json-rpc-infura": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware": true,
+        "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": true,
+        "@metamask/controllers>eth-json-rpc-infura>json-rpc-engine": true,
+        "node-fetch": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware": {
+      "packages": {
+        "safe-event-emitter": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": {
+      "packages": {
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>json-rpc-engine": {
+      "packages": {
+        "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": true,
+        "safe-event-emitter": true
+      }
+    },
     "@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/controllers>eth-method-registry>ethjs": true
@@ -2829,6 +2856,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@metamask/controllers>eth-json-rpc-infura": true,
         "@metamask/controllers>web3-provider-engine>backoff": true,
         "@metamask/controllers>web3-provider-engine>eth-block-tracker": true,
         "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware": true,
@@ -2840,7 +2868,6 @@
         "browserify>events": true,
         "browserify>util": true,
         "eth-json-rpc-filters": true,
-        "eth-json-rpc-infura": true,
         "gh-pages>async": true,
         "lavamoat>json-stable-stringify": true,
         "watchify>xtend": true
@@ -2991,6 +3018,25 @@
         "pubnub>superagent>cookiejar": true
       }
     },
+    "@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "eth-json-rpc-middleware": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "node-fetch": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true,
+        "eslint>fast-deep-equal": true,
+        "madge>debug": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -4297,33 +4343,6 @@
         "eth-json-rpc-filters>json-rpc-engine": true
       }
     },
-    "eth-json-rpc-infura": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "eth-json-rpc-infura>eth-rpc-errors": true,
-        "eth-json-rpc-infura>json-rpc-engine": true,
-        "node-fetch": true
-      }
-    },
-    "eth-json-rpc-infura>eth-json-rpc-middleware": {
-      "packages": {
-        "safe-event-emitter": true
-      }
-    },
-    "eth-json-rpc-infura>eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "eth-json-rpc-infura>json-rpc-engine": {
-      "packages": {
-        "eth-json-rpc-infura>eth-rpc-errors": true,
-        "safe-event-emitter": true
-      }
-    },
     "eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -6395,4 +6414,4 @@
       }
     }
   }
-}
+}
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -2780,6 +2780,7 @@
         "@metamask/contract-metadata": true,
         "@metamask/controllers>abort-controller": true,
         "@metamask/controllers>async-mutex": true,
+        "@metamask/controllers>eth-json-rpc-infura": true,
         "@metamask/controllers>eth-method-registry": true,
         "@metamask/controllers>eth-phishing-detect": true,
         "@metamask/controllers>ethereumjs-wallet": true,
@@ -2794,7 +2795,6 @@
         "deep-freeze-strict": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
-        "eth-json-rpc-infura": true,
         "eth-keyring-controller": true,
         "eth-query": true,
         "eth-rpc-errors": true,
@@ -2828,6 +2828,33 @@
         "define": true
       }
     },
+    "@metamask/controllers>eth-json-rpc-infura": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware": true,
+        "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": true,
+        "@metamask/controllers>eth-json-rpc-infura>json-rpc-engine": true,
+        "node-fetch": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>eth-json-rpc-middleware": {
+      "packages": {
+        "safe-event-emitter": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": {
+      "packages": {
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
+    "@metamask/controllers>eth-json-rpc-infura>json-rpc-engine": {
+      "packages": {
+        "@metamask/controllers>eth-json-rpc-infura>eth-rpc-errors": true,
+        "safe-event-emitter": true
+      }
+    },
     "@metamask/controllers>eth-method-registry": {
       "packages": {
         "@metamask/controllers>eth-method-registry>ethjs": true
@@ -2974,6 +3001,7 @@
       },
       "packages": {
         "@ethereumjs/tx": true,
+        "@metamask/controllers>eth-json-rpc-infura": true,
         "@metamask/controllers>web3-provider-engine>backoff": true,
         "@metamask/controllers>web3-provider-engine>eth-block-tracker": true,
         "@metamask/controllers>web3-provider-engine>eth-json-rpc-middleware": true,
@@ -2985,7 +3013,6 @@
         "browserify>events": true,
         "browserify>util": true,
         "eth-json-rpc-filters": true,
-        "eth-json-rpc-infura": true,
         "gh-pages>async": true,
         "lavamoat>json-stable-stringify": true,
         "watchify>xtend": true
@@ -3136,6 +3163,25 @@
         "pubnub>superagent>cookiejar": true
       }
     },
+    "@metamask/eth-json-rpc-infura": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils": true,
+        "eth-json-rpc-middleware": true,
+        "eth-rpc-errors": true,
+        "json-rpc-engine": true,
+        "node-fetch": true
+      }
+    },
+    "@metamask/eth-json-rpc-infura>@metamask/utils": {
+      "packages": {
+        "@metamask/eth-json-rpc-infura>@metamask/utils>superstruct": true,
+        "eslint>fast-deep-equal": true,
+        "madge>debug": true
+      }
+    },
     "@metamask/eth-ledger-bridge-keyring": {
       "globals": {
         "addEventListener": true,
@@ -4839,33 +4885,6 @@
         "eth-json-rpc-filters>json-rpc-engine": true
       }
     },
-    "eth-json-rpc-infura": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "eth-json-rpc-infura>eth-json-rpc-middleware": true,
-        "eth-json-rpc-infura>eth-rpc-errors": true,
-        "eth-json-rpc-infura>json-rpc-engine": true,
-        "node-fetch": true
-      }
-    },
-    "eth-json-rpc-infura>eth-json-rpc-middleware": {
-      "packages": {
-        "safe-event-emitter": true
-      }
-    },
-    "eth-json-rpc-infura>eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "eth-json-rpc-infura>json-rpc-engine": {
-      "packages": {
-        "eth-json-rpc-infura>eth-rpc-errors": true,
-        "safe-event-emitter": true
-      }
-    },
     "eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -7026,4 +7045,4 @@
       }
     }
   }
-}
+}