From ee82077b1d3bb37b48ad4500b510f59d170943e0 Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Mon, 7 Mar 2022 23:03:42 +0300
Subject: [PATCH 1/8] Check that network exists when adding a custom network
(#3802)
* check network exists before adding a new network (use chainId)
* updated the network exist message
* replace the logic to use rpcurl instead of chainId
* updated warning text
* updated flash message
---
.../NetworksSettings/NetworkSettings/index.js | 25 +++++++++++++++++--
locales/languages/en.json | 3 ++-
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index f735dc292f8a..0bfddd3384c2 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -243,6 +243,20 @@ class NetworkSettings extends PureComponent {
return true;
};
+ checkIfNetworkExists = async (rpcUrl) => {
+ const checkCustomNetworks = this.props.frequentRpcList.filter((item) => item.rpcUrl === rpcUrl);
+ if (checkCustomNetworks.length > 0) {
+ this.setState({ warningRpcUrl: strings('app_settings.network_exists') });
+ return checkCustomNetworks;
+ }
+ const defaultNetworks = getAllNetworks().map((item) => Networks[item]);
+ const checkDefaultNetworks = defaultNetworks.filter((item) => Number(item.rpcUrl) === rpcUrl);
+ if (checkDefaultNetworks.length > 0) {
+ return checkDefaultNetworks;
+ }
+ return [];
+ };
+
/**
* Add rpc url and parameters to PreferencesController
* Setting NetworkController provider to this custom rpc
@@ -254,6 +268,8 @@ class NetworkSettings extends PureComponent {
const { navigation } = this.props;
const formChainId = stateChainId.trim().toLowerCase();
+
+ const isNetworkExists = await this.checkIfNetworkExists(rpcUrl);
// Ensure chainId is a 0x-prefixed, lowercase hex string
let chainId = formChainId;
if (!chainId.startsWith('0x')) {
@@ -264,7 +280,7 @@ class NetworkSettings extends PureComponent {
return;
}
- if (this.validateRpcUrl()) {
+ if (this.validateRpcUrl() && isNetworkExists.length === 0) {
const url = new URL(rpcUrl);
const decimalChainId = this.getDecimalChainId(chainId);
!isprivateConnection(url.hostname) && url.set('protocol', 'https:');
@@ -292,8 +308,9 @@ class NetworkSettings extends PureComponent {
* Validates rpc url, setting a warningRpcUrl if is invalid
* It also changes validatedRpcURL to true, indicating that was validated
*/
- validateRpcUrl = () => {
+ validateRpcUrl = async () => {
const { rpcUrl } = this.state;
+ const isNetworkExists = await this.checkIfNetworkExists(rpcUrl);
if (!isWebUri(rpcUrl)) {
const appendedRpc = `http://${rpcUrl}`;
if (isWebUri(appendedRpc)) {
@@ -303,6 +320,10 @@ class NetworkSettings extends PureComponent {
}
return false;
}
+
+ if (isNetworkExists.length > 0) {
+ return this.setState({ validatedRpcURL: true, warningRpcUrl: strings('app_settings.network_exists') });
+ }
const url = new URL(rpcUrl);
const privateConnection = isprivateConnection(url.hostname);
if (!privateConnection && url.protocol === 'http:') {
diff --git a/locales/languages/en.json b/locales/languages/en.json
index ce917487129a..dd728f23baed 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -550,7 +550,8 @@
"hide_zero_balance_tokens_title": "Hide Tokens Without Balance",
"hide_zero_balance_tokens_desc": "Prevents tokens with no balance from displaying in your token listing.",
"token_detection_title": "Enhanced Token Detection",
- "token_detection_description": "We use third-party APIs to detect and display new tokens sent to your wallet. Turn off if you don’t want the app to pull data from those services."
+ "token_detection_description": "We use third-party APIs to detect and display new tokens sent to your wallet. Turn off if you don’t want the app to pull data from those services.",
+ "network_exists": "This network has already been added."
},
"app_information": {
"title": "Information",
From f11730b9b5d555a651471ee66f27d1d924fed151 Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Mon, 7 Mar 2022 23:12:56 +0300
Subject: [PATCH 2/8] =?UTF-8?q?The=20recent=20list=20doesn=E2=80=99t=20con?=
=?UTF-8?q?vert=20addresses=20to=20my=20nickname=20(#3819)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* recent list in the send flow now shows nickname||name
* updated feedback
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
---
app/components/Views/SendFlow/AddressList/index.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/components/Views/SendFlow/AddressList/index.js b/app/components/Views/SendFlow/AddressList/index.js
index 7fc7483298f2..7fb55afb91f9 100644
--- a/app/components/Views/SendFlow/AddressList/index.js
+++ b/app/components/Views/SendFlow/AddressList/index.js
@@ -216,7 +216,11 @@ class AddressList extends PureComponent {
};
renderRecents = () => {
- const { recents, onAccountPress, onAccountLongPress, inputSearch } = this.props;
+ const { recents, identities, addressBook, network, onAccountPress, onAccountLongPress, inputSearch } =
+ this.props;
+
+ const networkAddressBook = addressBook[network] || {};
+
if (!recents.length || inputSearch) return;
return (
<>
@@ -227,6 +231,7 @@ class AddressList extends PureComponent {
<AddressElement
key={index}
address={address}
+ name={identities[address]?.name || networkAddressBook[address]?.name}
onAccountPress={onAccountPress}
onAccountLongPress={onAccountLongPress}
/>
From 3a2ac99d3f60988a85a10537a3fe30469e05e805 Mon Sep 17 00:00:00 2001
From: Andrea Salvatore <andrea.salvatore@consensys.net>
Date: Tue, 8 Mar 2022 19:37:13 +0100
Subject: [PATCH 3/8] Release 4.2.2 (#3815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Release 4.2.0 RC1
* Bumps build number to 829
* updates 'package.json' version number
* Fix onramp BUSD address. Add wc_description string (#3838)
* Update en.json (#3839)
remove extra `s`
* Fix custom network icons on Wallet Overview (#3841)
* updated build number
* Bump version code to 831
* Bump version number to 831
* bump version code to 831
* updates changelogs with additional fixes
* removes new SRP flow related phrase from non-en languages files
* updates build version code to 832
* bumped version and code for release 4.2.1
* bump version code for android
* bump version code package
* reverts to english, phrases for reveal SRP for Hindi language
* Bumps version to 4.2.2 and build to 834
Co-authored-by: Gustavo Antunes <gantunes@uc.cl>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: André Fatia <andre@thecodeventure.com>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
---
CHANGELOG.md | 25 ++-
android/app/build.gradle | 4 +-
.../UI/Swaps/components/TokenIcon.js | 7 +-
.../__snapshots__/TokenIcon.test.js.snap | 168 ++++++++----------
bitrise.yml | 4 +-
ios/MetaMask.xcodeproj/project.pbxproj | 8 +-
locales/languages/en.json | 4 +-
locales/languages/es.json | 2 -
locales/languages/hi-in.json | 2 -
locales/languages/id-id.json | 2 -
locales/languages/ja-jp.json | 2 -
locales/languages/ko-kr.json | 2 -
locales/languages/pt-br.json | 2 -
locales/languages/ru-ru.json | 2 -
locales/languages/tl.json | 2 -
locales/languages/vi-vn.json | 2 -
locales/languages/zh-cn.json | 2 -
package.json | 2 +-
18 files changed, 112 insertions(+), 130 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e263be47561..f37de3ab8832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,29 @@
# Changelog
-## Current Develop Branch
+## v4.2.2 - February 24, 2022
+- [#3841](https://github.com/MetaMask/metamask-mobile/pull/3841): [FIX] Fix custom network icons on Wallet Overview
+- [#3839](https://github.com/MetaMask/metamask-mobile/pull/3839): [FIX] Update en.json
+- [#3838](https://github.com/MetaMask/metamask-mobile/pull/3838): [FIX] Fix onramp BUSD address. Add wc_description string
+- [#3811](https://github.com/MetaMask/metamask-mobile/pull/3811): [FIX] Problem when loading unknown icons on Swap token list
+- [#3791](https://github.com/MetaMask/metamask-mobile/pull/3791): [FIX] Update style of ErrorMessage
+- [#3797](https://github.com/MetaMask/metamask-mobile/pull/3797): [ENHANCEMENT] Add Fantom FTM and Celo CELO — Add token after fiat on ramp order
+- [#3685](https://github.com/MetaMask/metamask-mobile/pull/3685): [ENHANCEMENT] WalletConnect, Deeplink and RPC methods refactors
+- [#3766](https://github.com/MetaMask/metamask-mobile/pull/3766): [ENHANCEMENT] Swaps: Add Avalanche
+- [#3806](https://github.com/MetaMask/metamask-mobile/pull/3806): [FIX] Custom network token crash
+- [#3547](https://github.com/MetaMask/metamask-mobile/pull/3547): [IMPROVEMENT] Warn when exporting SRP
+- [#3788](https://github.com/MetaMask/metamask-mobile/pull/3788): [UPGRADE] Bump url-parse from 1.5.2 to 1.5.9
+- [#3764](https://github.com/MetaMask/metamask-mobile/pull/3764): [UPGRADE] Bump vm2 from 3.9.5 to 3.9.8
+- [#3787](https://github.com/MetaMask/metamask-mobile/pull/3787): [FIX] Default spent limit value
+- [#3774](https://github.com/MetaMask/metamask-mobile/pull/3774): [FIX] Address book e2e
+- [#3770](https://github.com/MetaMask/metamask-mobile/pull/3770): [FIX] Delete wallet e2e
+- [#3767](https://github.com/MetaMask/metamask-mobile/pull/3767): [FIX] Edit contact e2e
+- [#3762](https://github.com/MetaMask/metamask-mobile/pull/3762): [ENHANCEMENT] Enhance auto-detection warning
+- [#3618](https://github.com/MetaMask/metamask-mobile/pull/3618): [FIX] Modal view when adding wallet address to address book
+- [#3724](https://github.com/MetaMask/metamask-mobile/pull/3724): [ENHANCEMENT] Update texts to use lock/unlock terminology
+- [#3701](https://github.com/MetaMask/metamask-mobile/pull/3701): [FIX] Make selected option comes first in picker component on Android
+- [#3752](https://github.com/MetaMask/metamask-mobile/pull/3752): [FIX] Fix OpenSea typo
+- [#3548](https://github.com/MetaMask/metamask-mobile/pull/3548): [FIX] Fixes text field frame got cut off
+- [#3690](https://github.com/MetaMask/metamask-mobile/pull/3690): [FIX] Revert svg crash
## v4.1.1 - February 23, 2022
- [3810](https://github.com/MetaMask/metamask-mobile/pull/3810) [FIX] Avalanche token crash
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2c97b1391255..daeac40b4a11 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -160,8 +160,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 827
- versionName "4.1.1"
+ versionCode 834
+ versionName "4.2.2"
multiDexEnabled true
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy "minReactNative", "minReactNative46"
diff --git a/app/components/UI/Swaps/components/TokenIcon.js b/app/components/UI/Swaps/components/TokenIcon.js
index deb411a644c8..3da5bdff4279 100644
--- a/app/components/UI/Swaps/components/TokenIcon.js
+++ b/app/components/UI/Swaps/components/TokenIcon.js
@@ -81,7 +81,7 @@ EmptyIcon.propTypes = {
};
function TokenIcon({ symbol, icon, medium, big, biggest, style }) {
- const [showFallback, setShowFallback] = useState(null);
+ const [showFallback, setShowFallback] = useState(false);
const getSource = useCallback(() => {
if (symbol === 'ETH') {
return ethLogo;
@@ -94,10 +94,11 @@ function TokenIcon({ symbol, icon, medium, big, biggest, style }) {
return { uri: icon };
}
- return { uri: null };
+ return null;
}, [symbol, icon]);
+ const source = getSource();
- if (!showFallback) {
+ if (source && !showFallback) {
return (
<RemoteImage
fadeIn
diff --git a/app/components/UI/Swaps/components/__snapshots__/TokenIcon.test.js.snap b/app/components/UI/Swaps/components/__snapshots__/TokenIcon.test.js.snap
index b805d22381da..3a203f93afcb 100644
--- a/app/components/UI/Swaps/components/__snapshots__/TokenIcon.test.js.snap
+++ b/app/components/UI/Swaps/components/__snapshots__/TokenIcon.test.js.snap
@@ -1,29 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`TokenIcon component should Render correctly 1`] = `
-<RemoteImage
- fadeIn={true}
- onError={[Function]}
- source={
- Object {
- "uri": null,
- }
- }
- style={
- Array [
- Object {
- "borderRadius": 12,
- "height": 24,
- "width": 24,
- },
- undefined,
- undefined,
- undefined,
- undefined,
- ]
- }
-/>
-`;
+exports[`TokenIcon component should Render correctly 1`] = `<EmptyIcon />`;
exports[`TokenIcon component should Render correctly 2`] = `
<RemoteImage
@@ -51,28 +28,40 @@ exports[`TokenIcon component should Render correctly 2`] = `
`;
exports[`TokenIcon component should Render correctly 3`] = `
-<RemoteImage
- fadeIn={true}
- onError={[Function]}
- source={
- Object {
- "uri": null,
+<EmptyIcon>
+ <Text
+ black={false}
+ blue={false}
+ bold={false}
+ centered={false}
+ disclaimer={false}
+ green={false}
+ link={false}
+ modal={false}
+ primary={false}
+ red={false}
+ reset={false}
+ right={false}
+ small={false}
+ strikethrough={false}
+ style={
+ Array [
+ Object {
+ "fontSize": 16,
+ "textAlign": "center",
+ "textAlignVertical": "center",
+ },
+ undefined,
+ undefined,
+ undefined,
+ ]
}
- }
- style={
- Array [
- Object {
- "borderRadius": 12,
- "height": 24,
- "width": 24,
- },
- undefined,
- undefined,
- undefined,
- undefined,
- ]
- }
-/>
+ underline={false}
+ upper={false}
+ >
+ C
+ </Text>
+</EmptyIcon>
`;
exports[`TokenIcon component should Render correctly 4`] = `
@@ -101,31 +90,8 @@ exports[`TokenIcon component should Render correctly 4`] = `
`;
exports[`TokenIcon component should Render correctly 5`] = `
-<RemoteImage
- fadeIn={true}
- onError={[Function]}
- source={
- Object {
- "uri": null,
- }
- }
- style={
- Array [
- Object {
- "borderRadius": 12,
- "height": 24,
- "width": 24,
- },
- Object {
- "borderRadius": 18,
- "height": 36,
- "width": 36,
- },
- undefined,
- undefined,
- undefined,
- ]
- }
+<EmptyIcon
+ medium={true}
/>
`;
@@ -159,32 +125,44 @@ exports[`TokenIcon component should Render correctly 6`] = `
`;
exports[`TokenIcon component should Render correctly 7`] = `
-<RemoteImage
- fadeIn={true}
- onError={[Function]}
- source={
- Object {
- "uri": null,
+<EmptyIcon
+ medium={true}
+>
+ <Text
+ black={false}
+ blue={false}
+ bold={false}
+ centered={false}
+ disclaimer={false}
+ green={false}
+ link={false}
+ modal={false}
+ primary={false}
+ red={false}
+ reset={false}
+ right={false}
+ small={false}
+ strikethrough={false}
+ style={
+ Array [
+ Object {
+ "fontSize": 16,
+ "textAlign": "center",
+ "textAlignVertical": "center",
+ },
+ Object {
+ "fontSize": 22,
+ },
+ undefined,
+ undefined,
+ ]
}
- }
- style={
- Array [
- Object {
- "borderRadius": 12,
- "height": 24,
- "width": 24,
- },
- Object {
- "borderRadius": 18,
- "height": 36,
- "width": 36,
- },
- undefined,
- undefined,
- undefined,
- ]
- }
-/>
+ underline={false}
+ upper={false}
+ >
+ C
+ </Text>
+</EmptyIcon>
`;
exports[`TokenIcon component should Render correctly 8`] = `
diff --git a/bitrise.yml b/bitrise.yml
index bc78c3d7b967..17d69125c333 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -323,10 +323,10 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
- VERSION_NAME: 4.1.1
+ VERSION_NAME: 4.2.2
- opts:
is_expand: false
- VERSION_NUMBER: 827
+ VERSION_NUMBER: 834
- opts:
is_expand: false
ANDROID_APK_LINK: ''
diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
index 5afff5a10942..ad201c2d333d 100644
--- a/ios/MetaMask.xcodeproj/project.pbxproj
+++ b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -817,7 +817,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 827;
+ CURRENT_PROJECT_VERSION = 834;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -853,7 +853,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 4.1.1;
+ MARKETING_VERSION = 4.2.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
@@ -884,7 +884,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 827;
+ CURRENT_PROJECT_VERSION = 834;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
FRAMEWORK_SEARCH_PATHS = (
@@ -919,7 +919,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
- MARKETING_VERSION = 4.1.1;
+ MARKETING_VERSION = 4.2.2;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
diff --git a/locales/languages/en.json b/locales/languages/en.json
index dd728f23baed..d702d6fea6c8 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -468,7 +468,7 @@
"privacy_mode": "Privacy mode",
"privacy_mode_desc": "Websites must request access to view your account information.",
"nft_opensea_mode": "Enable OpenSea API",
- "nft_opensea_desc": "Displaying NFT media & data may expose your IP addresss to centralized servers. Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off. Enabling NFT auto-detection can expose you to fake NFTs being sent to your wallet by anyone, and can allow an attacker to learn your IP address from your Ethereum address.",
+ "nft_opensea_desc": "Displaying NFT media & data may expose your IP address to centralized servers. Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off. Enabling NFT auto-detection can expose you to fake NFTs being sent to your wallet by anyone, and can allow an attacker to learn your IP address from your Ethereum address.",
"nft_autodetect_mode": "Autodetect NFTs",
"nft_autodetect_desc": "Displaying NFT media & data may expose your IP address to centralized servers. Third-party APIs (like OpenSea) are used to detect NFTs in your wallet. This exposes your account address with those services. Leave this disabled if you don't want the app to pull data from those services.",
"show_hex_data": "Show Hex Data",
@@ -1270,7 +1270,7 @@
"wc_connected_rejected_title": "You’ve rejected the connect request",
"wc_signed_rejected_title": "You’ve rejected the sign request",
"wc_sent_tx_rejected_title": "You’ve rejected the transaction request",
- "wc_description": "Check the Daap"
+ "wc_description": "Please check the application"
},
"protect_your_wallet_modal": {
"title": "Protect your wallet",
diff --git a/locales/languages/es.json b/locales/languages/es.json
index def3ec8d1d1b..8036d8728d26 100644
--- a/locales/languages/es.json
+++ b/locales/languages/es.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Mostrar clave privada para \"{{accountName}}\"",
"cancel": "Cancelar",
"confirm": "Siguiente",
- "seed_phrase_explanation": "Si alguna vez cambia de explorador o de equipo, necesitará esta frase secreta de recuperación para acceder a sus cuentas. Guárdela en un lugar seguro y secreto.",
"private_key_explanation": "Guárdela en un lugar seguro y secreto.",
"private_key_warning": "Esta es la clave privada para la cuenta seleccionada actual: {{accountName}}. No revele esta clave. Cualquier persona que tenga su clave privada podrá controlar completamente su cuenta, incluida la transferencia de sus fondos.",
- "seed_phrase_warning_explanation": "NO comparta esta frase con nadie. Estas palabras se pueden usar para robar todas sus cuentas.",
"private_key_warning_explanation": "No revele esta clave. Cualquier persona que tenga su clave privada podrá controlar completamente su cuenta, incluida la transferencia de sus fondos.",
"seed_phrase": "Su frase secreta de recuperación",
"private_key": "Su clave privada",
diff --git a/locales/languages/hi-in.json b/locales/languages/hi-in.json
index dfe9c066c0e5..bbfc38c87931 100644
--- a/locales/languages/hi-in.json
+++ b/locales/languages/hi-in.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "\"{{accountName}}\" के लिए निजी कुंजी दिखाएं",
"cancel": "रद्द करें",
"confirm": "अगला",
- "seed_phrase_explanation": "यदि आप कभी ब्राउज़र बदलते हैं या कंप्यूटर को स्थानांतरित करते हैं, तो आपको अपने खातों तक पहुँचने के लिए इस गुप्त रिकवरी फ्रेज़ की आवश्यकता होगी। उन्हें कहीं सुरक्षित और गोपनीय तरीके से सहेजें।",
"private_key_explanation": "इसे कहीं सुरक्षित और गोपनीय तरीके से सहेजें।",
"private_key_warning": "यह वर्तमान चयनित खाते के लिए निजी कुंजी है: {{accountName}}. इस कुंजी का खुलासा कभी न करें। आपकी निजी कुंजी के साथ कोई भी आपके खाते को पूरी तरह से नियंत्रित कर सकता है, जिसमें आपके किसी भी धन को स्थानांतरित करना शामिल है।",
- "seed_phrase_warning_explanation": "इस वाक्यांश को किसी के साथ साझा न करें! इन शब्दों का उपयोग आपके सभी खातों को चुराने के लिए किया जा सकता है।",
"private_key_warning_explanation": "इस कुंजी का खुलासा कभी न करें। आपकी निजी कुंजी के साथ कोई भी आपके खाते को पूरी तरह से नियंत्रित कर सकता है, जिसमें आपके किसी भी धन को स्थानांतरित करना शामिल है।",
"seed_phrase": "आपका गुप्त रिकवरी फ्रेज़",
"private_key": "आपकी निजी कुंजी",
diff --git a/locales/languages/id-id.json b/locales/languages/id-id.json
index 913b050f279e..b9b92fbc8d85 100644
--- a/locales/languages/id-id.json
+++ b/locales/languages/id-id.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Menampilkan kunci privat untuk \"{{accountName}}\"",
"cancel": "Batal",
"confirm": "Berikutnya",
- "seed_phrase_explanation": "Jika Anda pernah mengubah browser atau mengganti komputer, Anda akan memerlukan Frasa Pemulihan Rahasia ini untuk mengakses akun Anda. Simpan di tempat yang aman dan rahasia.",
"private_key_explanation": "Simpan di tempat yang aman dan rahasia.",
"private_key_warning": "Ini adalah kunci privat untuk akun yang dipilih saat ini: {{accountName}}. Jangan ungkapkan kunci ini. Siapa pun dengan kunci privat Anda dapat sepenuhnya mengontrol akun Anda, termasuk mentransfer keluar dana Anda.",
- "seed_phrase_warning_explanation": "JANGAN bagikan frasa ini kepada siapa pun! Kata-kata ini dapat digunakan untuk mencuri semua akun Anda.",
"private_key_warning_explanation": "Jangan ungkapkan kunci ini. Siapa pun dengan kunci privat Anda dapat sepenuhnya mengontrol akun Anda, termasuk mentransfer keluar dana Anda.",
"seed_phrase": "Frasa Pemulihan Rahasia Anda",
"private_key": "Kunci privat Anda",
diff --git a/locales/languages/ja-jp.json b/locales/languages/ja-jp.json
index f4f2c2ed4c2e..592ae7e9725d 100644
--- a/locales/languages/ja-jp.json
+++ b/locales/languages/ja-jp.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "[{{accountName}}] の秘密鍵の表示",
"cancel": "キャンセル",
"confirm": "次へ",
- "seed_phrase_explanation": "ブラウザーを変更した場合や、コンピューターを移動した場合は、自分のアカウントにアクセスするためにこのシークレット リカバリー フレーズが必要になります。安全で秘密の場所に保管してください。",
"private_key_explanation": "安全な秘密の場所に保管してください。",
"private_key_warning": "これは選択した現在のアカウント用の秘密鍵です:{{accountName}}.この鍵は公開しないでください。秘密鍵を持つ人物は誰でも、資金の移動を含めて、アカウントを完全に制御することができます。",
- "seed_phrase_warning_explanation": "このフレーズは誰にも教えないでください。これらの単語を使用すると、すべてのアカウントの窃取が可能になります。",
"private_key_warning_explanation": "この鍵は公開しないでください。秘密鍵を持つ人物は誰でも、資金の移動を含めて、アカウントを完全に制御することができます。",
"seed_phrase": "あなたのシークレット リカバリー フレーズ",
"private_key": "秘密鍵",
diff --git a/locales/languages/ko-kr.json b/locales/languages/ko-kr.json
index a1c24162e510..dc7ffa37f2a6 100644
--- a/locales/languages/ko-kr.json
+++ b/locales/languages/ko-kr.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "\"{{accountName}}\"의 비공개 키 표시",
"cancel": "취소",
"confirm": "다음",
- "seed_phrase_explanation": "브라우저를 변경하거나 컴퓨터를 옮긴 경우, 계정에 액세스하려면 이 시드 구문이 필요합니다. 기밀이 보장된 안전한 곳에 보관하십시오.",
"private_key_explanation": "기밀이 보장된 안전한 곳에 보관하세요.",
"private_key_warning": "현재 선택한 계정의 비공개 키입니다. {{accountName}}. 이 키를 노출하지 마세요. 비공개 키를 사용하는 사람은 자금을 이체하는 등 본인 계정을 완전히 제어할 수 있습니다.",
- "seed_phrase_warning_explanation": "이 구문은 누구에게도 공유하지 마세요! 이 단어들이 계정 전체 도용에 사용될 수 있습니다.",
"private_key_warning_explanation": "이 키를 노출하지 마세요. 비공개 키를 사용하는 사람은 자금을 이체하는 등 본인 계정을 완전히 제어할 수 있습니다.",
"seed_phrase": "계정 시드 구문",
"private_key": "비공개 키",
diff --git a/locales/languages/pt-br.json b/locales/languages/pt-br.json
index b37be0b20789..3d2c64adfbcb 100644
--- a/locales/languages/pt-br.json
+++ b/locales/languages/pt-br.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Mostrar chave privada para \"{{accountName}}\"",
"cancel": "Cancelar",
"confirm": "Próximo",
- "seed_phrase_explanation": "Se você alguma vez mudou de navegador ou trocou de computador, precisará dessa Frase de recuperação secreta para acessar suas contas. Salve-as em um lugar seguro e secreto.",
"private_key_explanation": "Salve-a em um lugar seguro e secreto.",
"private_key_warning": "Essa é uma chave privada para a conta selecionada no momento: {{accountName}}. Jamais revele essa chave. Qualquer pessoa com sua chave privada consegue ter controle total da sua conta, inclusive transferir seus fundos.",
- "seed_phrase_warning_explanation": "NÃO compartilhe essa frase com ninguém! Essas palavras podem ser usadas para roubar todas as suas contas.",
"private_key_warning_explanation": "Jamais revele essa chave. Qualquer pessoa com sua chave privada consegue ter controle total da sua conta, inclusive transferir seus fundos.",
"seed_phrase": "A sua Frase de Recuperação Secreta",
"private_key": "Sua chave privada",
diff --git a/locales/languages/ru-ru.json b/locales/languages/ru-ru.json
index dbe58e7c8eee..12207198997c 100644
--- a/locales/languages/ru-ru.json
+++ b/locales/languages/ru-ru.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Показать закрытый ключ для счета \"{{accountName}}\"",
"cancel": "Отмена",
"confirm": "Далее",
- "seed_phrase_explanation": "Если вы меняете браузер или переходите на другой компьютер, вам понадобится эта секретная фраза восстановления для доступа к своим счетам. Сохраните их в безопасном секретном месте.",
"private_key_explanation": "Сохраните ее в безопасном секретном месте.",
"private_key_warning": "Это закрытый ключ для выбранного в настоящее время счета: {{accountName}}. Никогда не раскрывайте этот ключ. Любой, у кого есть ваш закрытый ключ, может полностью контролировать ваш счет, в том числе переводить любые ваши средства.",
- "seed_phrase_warning_explanation": "НЕ говорите никому эту фразу! Эти слова можно использовать для кражи всех ваших счетов.",
"private_key_warning_explanation": "Никогда не раскрывайте этот ключ. Любой, у кого есть ваш закрытый ключ, может полностью контролировать ваш счет, в том числе переводить любые ваши средства.",
"seed_phrase": "Ваша секретная фраза восстановления",
"private_key": "Ваш закрытый ключ",
diff --git a/locales/languages/tl.json b/locales/languages/tl.json
index e34f665d3ae7..87b87bca01ba 100644
--- a/locales/languages/tl.json
+++ b/locales/languages/tl.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Ipakita ang pribadong key para sa \"{{accountName}}\"",
"cancel": "Kanselahin",
"confirm": "Susunod",
- "seed_phrase_explanation": "Kung magpapalit ka man ng browser o computer, kakailanganin mo ang Lihim na Recovery Phrase na ito para ma-access ang iyong mga account. I-save ang mga iyon sa isang ligtas at sikretong lugar.",
"private_key_explanation": "I-save ito sa isang ligtas at sikretong lugar.",
"private_key_warning": "Ito ang pribadong key para sa kasalukuyang napiling account: {{accountName}}. Huwag ipaalam ang key na ito. Ang sinumang nakakalaam ng iyong pribadong key ay ganap na makokontrol ang iyong account, pati na ang pag-transfer ng alinman sa iyong mga pondo.",
- "seed_phrase_warning_explanation": "Huwag ibahagi ang phrase na ito sa sinuman! Magagamit ang mga salitang ito para manakaw ang lahat ng iyong account.",
"private_key_warning_explanation": "Huwag ipaalam ang key na ito. Ang sinumang nakakalaam ng iyong pribadong key ay ganap na makokontrol ang iyong account, pati na ang pag-transfer ng alinman sa iyong mga pondo.",
"seed_phrase": "Ang Iyong Lihim na Recovery Phrase",
"private_key": "Ang iyong pribadong key",
diff --git a/locales/languages/vi-vn.json b/locales/languages/vi-vn.json
index 6e7ff9f1550f..9c87a9db1014 100644
--- a/locales/languages/vi-vn.json
+++ b/locales/languages/vi-vn.json
@@ -536,10 +536,8 @@
"private_key_title_for_account": "Hiện khóa riêng tư cho \"{{accountName}}\"",
"cancel": "Hủy",
"confirm": "Tiếp theo",
- "seed_phrase_explanation": "Nếu thay đổi trình duyệt hoặc chuyển máy tính, bạn sẽ cần Cụm mật khẩu khôi phục bí mật này để truy cập tài khoản của mình. Hãy lưu Cụm mật khẩu khôi phục bí mật này ở nơi an toàn và bí mật.",
"private_key_explanation": "Hãy lưu khóa riêng tư này ở nơi an toàn và bí mật.",
"private_key_warning": "Đây là khóa riêng tư cho tài khoản đang chọn: {{accountName}}. Tuyệt đối không để lộ mã khóa này. Bất kỳ ai có khóa riêng tư cũng đều có toàn quyền kiểm soát tài khoản của bạn, bao gồm cả việc chuyển đi mọi khoản tiền của bạn.",
- "seed_phrase_warning_explanation": "KHÔNG chia sẻ cụm mật khẩu này với bất kỳ ai! Kẻ xấu có thể dùng các từ này để đánh cắp tất cả các tài khoản của bạn.",
"private_key_warning_explanation": "Tuyệt đối không để lộ mã khóa này. Bất kỳ ai có khóa riêng tư cũng đều có toàn quyền kiểm soát tài khoản của bạn, bao gồm cả việc chuyển đi mọi khoản tiền của bạn.",
"seed_phrase": "Cụm mật khẩu khôi phục bí mật của bạn",
"private_key": "Khóa riêng tư của bạn",
diff --git a/locales/languages/zh-cn.json b/locales/languages/zh-cn.json
index b41062964596..b5cd9142df86 100644
--- a/locales/languages/zh-cn.json
+++ b/locales/languages/zh-cn.json
@@ -499,10 +499,8 @@
"private_key_title_for_account": "显示 \"{{accountName}}\" 的私钥",
"cancel": "取消",
"confirm": "下一步",
- "seed_phrase_explanation": "如果更改浏览器或移动计算机，您将需要此助记词才能访问账户。将它们保存在安全、秘密的地方。",
"private_key_explanation": "将它保存在安全、秘密的地方。",
"private_key_warning": "这是当前选定账户的私钥：{{accountName}}。请勿泄露此密钥。任何得到您的私钥的人都可以完全控制您的账户，包括转走所有资金。",
- "seed_phrase_warning_explanation": "请勿将此助记词告诉任何人！这些字词可用于窃取您的所有账户。",
"private_key_warning_explanation": "请勿泄露此密钥。任何得到您的私钥的人都可以完全控制您的账户，包括转走所有资金。",
"seed_phrase": "您的助记词",
"private_key": "您的私钥",
diff --git a/package.json b/package.json
index b70def28ced3..9900c1027fbe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "metamask",
- "version": "4.1.0",
+ "version": "4.2.2",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
From 0fe658cab5b6954f6e54c2053548ae976b6323a8 Mon Sep 17 00:00:00 2001
From: Cal Leung <cleun007@gmail.com>
Date: Wed, 9 Mar 2022 08:56:31 -0800
Subject: [PATCH 4/8] Remove web3 patches (#3871)
---
package.json | 4 -
patches/@metamask+controllers+25.1.0.patch | 172 ---
.../@metamask+swaps-controller+6.3.0.patch | 21 -
yarn.lock | 1244 +----------------
4 files changed, 57 insertions(+), 1384 deletions(-)
delete mode 100644 patches/@metamask+controllers+25.1.0.patch
delete mode 100644 patches/@metamask+swaps-controller+6.3.0.patch
diff --git a/package.json b/package.json
index 9900c1027fbe..e5b5e65a2e26 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
"@metamask/contract-metadata": "^1.30.0",
"@exodus/react-native-payments/validator": "^13.7.0",
"react-devtools-core": "4.22.1",
- "web3": "1.6.1",
"simple-get": "4.0.1"
},
"dependencies": {
@@ -396,11 +395,8 @@
"dtrace-provider": false,
"core-js": false,
"sharp": true,
- "web3": false,
- "web3-bzz": false,
"bufferutil": false,
"utf-8-validate": false,
- "web3-shh": false,
"highlight.js": false
}
}
diff --git a/patches/@metamask+controllers+25.1.0.patch b/patches/@metamask+controllers+25.1.0.patch
deleted file mode 100644
index f28172b87e05..000000000000
--- a/patches/@metamask+controllers+25.1.0.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff --git a/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC1155/ERC1155Standard.js b/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC1155/ERC1155Standard.js
-index 2e47f1a..ac49b60 100644
---- a/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC1155/ERC1155Standard.js
-+++ b/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC1155/ERC1155Standard.js
-@@ -49,9 +49,9 @@ class ERC1155Standard {
- * @returns Promise resolving to the 'tokenURI'.
- */
- this.getTokenURI = (address, tokenId) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC1155).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC1155, address);
- return new Promise((resolve, reject) => {
-- contract.uri(tokenId, (error, result) => {
-+ contract.methods.uri(tokenId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -70,9 +70,9 @@ class ERC1155Standard {
- * @returns Promise resolving to the 'balanceOf'.
- */
- this.getBalanceOf = (contractAddress, address, tokenId) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC1155).at(contractAddress);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC1155, contractAddress);
- return new Promise((resolve, reject) => {
-- contract.balanceOf(address, tokenId, (error, result) => {
-+ contract.methods.balanceOf(address, tokenId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -95,9 +95,9 @@ class ERC1155Standard {
- * @returns Promise resolving to the 'transferSingle'.
- */
- this.transferSingle = (operator, from, to, id, value) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC1155).at(operator);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC1155, operator);
- return new Promise((resolve, reject) => {
-- contract.transferSingle(operator, from, to, id, value, (error, result) => {
-+ contract.methods.transferSingle(operator, from, to, id, value).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -115,9 +115,9 @@ class ERC1155Standard {
- * @returns Promise resolving to whether the contract implements `interfaceID`.
- */
- this.contractSupportsInterface = (address, interfaceId) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC1155).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC1155, address);
- return new Promise((resolve, reject) => {
-- contract.supportsInterface(interfaceId, (error, result) => {
-+ contract.methods.supportsInterface(interfaceId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-diff --git a/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.js b/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.js
-index 0935e9c..4914b49 100644
---- a/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.js
-+++ b/node_modules/@metamask/controllers/dist/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.js
-@@ -50,9 +50,9 @@ class ERC721Standard {
- * @returns Promise resolving to token identifier for the 'index'th asset assigned to 'selectedAddress'.
- */
- this.getCollectibleTokenId = (address, selectedAddress, index) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- return new Promise((resolve, reject) => {
-- contract.tokenOfOwnerByIndex(selectedAddress, index, (error, result) => {
-+ contract.methods.tokenOfOwnerByIndex(selectedAddress, index).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -70,13 +70,13 @@ class ERC721Standard {
- * @returns Promise resolving to the 'tokenURI'.
- */
- this.getTokenURI = (address, tokenId) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- const supportsMetadata = yield this.contractSupportsMetadataInterface(address);
- if (!supportsMetadata) {
- throw new Error('Contract does not support ERC721 metadata interface.');
- }
- return new Promise((resolve, reject) => {
-- contract.tokenURI(tokenId, (error, result) => {
-+ contract.methods.tokenURI(tokenId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -93,9 +93,9 @@ class ERC721Standard {
- * @returns Promise resolving to the 'name'.
- */
- this.getAssetName = (address) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- return new Promise((resolve, reject) => {
-- contract.name((error, result) => {
-+ contract.methods.name().call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -112,9 +112,9 @@ class ERC721Standard {
- * @returns Promise resolving to the 'symbol'.
- */
- this.getAssetSymbol = (address) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- return new Promise((resolve, reject) => {
-- contract.symbol((error, result) => {
-+ contract.methods.symbol().call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -132,9 +132,9 @@ class ERC721Standard {
- * @returns Promise resolving to whether the contract implements `interfaceID`.
- */
- this.contractSupportsInterface = (address, interfaceId) => __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- return new Promise((resolve, reject) => {
-- contract.supportsInterface(interfaceId, (error, result) => {
-+ contract.methods.supportsInterface(interfaceId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -187,9 +187,9 @@ class ERC721Standard {
- */
- getOwnerOf(address, tokenId) {
- return __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC721).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC721, address);
- return new Promise((resolve, reject) => {
-- contract.ownerOf(tokenId, (error, result) => {
-+ contract.methods.ownerOf(tokenId).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-diff --git a/node_modules/@metamask/controllers/dist/assets/Standards/ERC20Standard.js b/node_modules/@metamask/controllers/dist/assets/Standards/ERC20Standard.js
-index 5300699..df812c7 100644
---- a/node_modules/@metamask/controllers/dist/assets/Standards/ERC20Standard.js
-+++ b/node_modules/@metamask/controllers/dist/assets/Standards/ERC20Standard.js
-@@ -25,9 +25,9 @@ class ERC20Standard {
- */
- getBalanceOf(address, selectedAddress) {
- return __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC20).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC20, address);
- return new Promise((resolve, reject) => {
-- contract.balanceOf(selectedAddress, (error, result) => {
-+ contract.methods.balanceOf(selectedAddress).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -46,9 +46,9 @@ class ERC20Standard {
- */
- getTokenDecimals(address) {
- return __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC20).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC20, address);
- return new Promise((resolve, reject) => {
-- contract.decimals((error, result) => {
-+ contract.methods.decimals().call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
-@@ -67,9 +67,9 @@ class ERC20Standard {
- */
- getTokenSymbol(address) {
- return __awaiter(this, void 0, void 0, function* () {
-- const contract = this.web3.eth.contract(metamask_eth_abis_1.abiERC20).at(address);
-+ const contract = new this.web3.eth.Contract(metamask_eth_abis_1.abiERC20, address);
- return new Promise((resolve, reject) => {
-- contract.symbol((error, result) => {
-+ contract.methods.symbol().call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
diff --git a/patches/@metamask+swaps-controller+6.3.0.patch b/patches/@metamask+swaps-controller+6.3.0.patch
deleted file mode 100644
index bcc3a093148a..000000000000
--- a/patches/@metamask+swaps-controller+6.3.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/node_modules/@metamask/swaps-controller/dist/SwapsController.js b/node_modules/@metamask/swaps-controller/dist/SwapsController.js
-index 7ca5258..e5f0a1c 100644
---- a/node_modules/@metamask/swaps-controller/dist/SwapsController.js
-+++ b/node_modules/@metamask/swaps-controller/dist/SwapsController.js
-@@ -309,14 +309,14 @@ class SwapsController extends controllers_1.BaseController {
- */
- /* istanbul ignore next */
- async getERC20Allowance(contractAddress, walletAddress) {
-- const contract = this.web3.eth.contract(human_standard_token_abi_1.default).at(contractAddress);
-+ const contract = new this.web3.eth.Contract(human_standard_token_abi_1.default, contractAddress);
- const allowanceTimeout = new Promise((_, reject) => {
- setTimeout(() => {
- reject(new Error(swapsUtil_1.SwapsError.SWAPS_ALLOWANCE_TIMEOUT));
- }, 10000);
- });
- const allowancePromise = new Promise((resolve, reject) => {
-- contract.allowance(walletAddress, swapsUtil_1.getSwapsContractAddress(this.config.chainId), (error, result) => {
-+ contract.methods.allowance(walletAddress, swapsUtil_1.getSwapsContractAddress(this.config.chainId)).call((error, result) => {
- /* istanbul ignore if */
- if (error) {
- reject(error);
diff --git a/yarn.lock b/yarn.lock
index 7c75e831b6e9..99a2b3e9e088 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1239,14 +1239,6 @@
crc-32 "^1.2.0"
ethereumjs-util "^7.1.0"
-"@ethereumjs/common@^2.5.0", "@ethereumjs/common@^2.6.0":
- version "2.6.0"
- resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.0.tgz#feb96fb154da41ee2cc2c5df667621a440f36348"
- integrity sha512-Cq2qS0FTu6O2VU1sgg+WyU9Ps0M6j/BEMHN+hRaECXCV/r0aI78u4N6p52QW/BDVhwWZpCdrvG8X7NJdzlpNUA==
- dependencies:
- crc-32 "^1.2.0"
- ethereumjs-util "^7.1.3"
-
"@ethereumjs/tx@^3.2.1", "@ethereumjs/tx@^3.3.0":
version "3.3.0"
resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
@@ -1255,29 +1247,6 @@
"@ethereumjs/common" "^2.4.0"
ethereumjs-util "^7.1.0"
-"@ethereumjs/tx@^3.3.2":
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.4.0.tgz#7eb1947eefa55eb9cf05b3ca116fb7a3dbd0bce7"
- integrity sha512-WWUwg1PdjHKZZxPPo274ZuPsJCWV3SqATrEKQP1n2DrVYVP1aZIYpo/mFaA0BDoE0tIQmBeimRCEA0Lgil+yYw==
- dependencies:
- "@ethereumjs/common" "^2.6.0"
- ethereumjs-util "^7.1.3"
-
-"@ethersproject/abi@5.0.7":
- version "5.0.7"
- resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.7.tgz#79e52452bd3ca2956d0e1c964207a58ad1a0ee7b"
- integrity sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==
- dependencies:
- "@ethersproject/address" "^5.0.4"
- "@ethersproject/bignumber" "^5.0.7"
- "@ethersproject/bytes" "^5.0.4"
- "@ethersproject/constants" "^5.0.4"
- "@ethersproject/hash" "^5.0.4"
- "@ethersproject/keccak256" "^5.0.3"
- "@ethersproject/logger" "^5.0.5"
- "@ethersproject/properties" "^5.0.3"
- "@ethersproject/strings" "^5.0.4"
-
"@ethersproject/abi@5.4.0", "@ethersproject/abi@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.4.0.tgz#a6d63bdb3672f738398846d4279fa6b6c9818242"
@@ -1334,19 +1303,6 @@
"@ethersproject/transactions" "^5.4.0"
"@ethersproject/web" "^5.4.0"
-"@ethersproject/abstract-provider@^5.5.0":
- version "5.5.1"
- resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz#2f1f6e8a3ab7d378d8ad0b5718460f85649710c5"
- integrity sha512-m+MA/ful6eKbxpr99xUYeRvLkfnlqzrF8SZ46d/xFB1A7ZVknYc/sXJG0RcufF52Qn2jeFj1hhcoQ7IXjNKUqg==
- dependencies:
- "@ethersproject/bignumber" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/networks" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
- "@ethersproject/transactions" "^5.5.0"
- "@ethersproject/web" "^5.5.0"
-
"@ethersproject/abstract-signer@5.4.0", "@ethersproject/abstract-signer@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.0.tgz#cd5f50b93141ee9f9f49feb4075a0b3eafb57d65"
@@ -1369,17 +1325,6 @@
"@ethersproject/logger" "^5.4.0"
"@ethersproject/properties" "^5.4.0"
-"@ethersproject/abstract-signer@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
- integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
- dependencies:
- "@ethersproject/abstract-provider" "^5.5.0"
- "@ethersproject/bignumber" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
-
"@ethersproject/address@5.4.0", "@ethersproject/address@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.4.0.tgz#ba2d00a0f8c4c0854933b963b9a3a9f6eb4a37a3"
@@ -1391,17 +1336,6 @@
"@ethersproject/logger" "^5.4.0"
"@ethersproject/rlp" "^5.4.0"
-"@ethersproject/address@^5.0.4", "@ethersproject/address@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.5.0.tgz#bcc6f576a553f21f3dd7ba17248f81b473c9c78f"
- integrity sha512-l4Nj0eWlTUh6ro5IbPTgbpT4wRbdH5l8CQf7icF7sb/SI3Nhd9Y9HzhonTSTi6CefI0necIw7LJqQPopPLZyWw==
- dependencies:
- "@ethersproject/bignumber" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/keccak256" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/rlp" "^5.5.0"
-
"@ethersproject/base64@5.4.0", "@ethersproject/base64@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.4.0.tgz#7252bf65295954c9048c7ca5f43e5c86441b2a9a"
@@ -1409,13 +1343,6 @@
dependencies:
"@ethersproject/bytes" "^5.4.0"
-"@ethersproject/base64@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.5.0.tgz#881e8544e47ed976930836986e5eb8fab259c090"
- integrity sha512-tdayUKhU1ljrlHzEWbStXazDpsx4eg1dBXUSI6+mHlYklOXoXF6lZvw8tnD6oVaWfnMxAgRSKROg3cVKtCcppA==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
-
"@ethersproject/basex@5.4.0", "@ethersproject/basex@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.4.0.tgz#0a2da0f4e76c504a94f2b21d3161ed9438c7f8a6"
@@ -1442,15 +1369,6 @@
"@ethersproject/logger" "^5.4.0"
bn.js "^4.11.9"
-"@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527"
- integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- bn.js "^4.11.9"
-
"@ethersproject/bytes@5.4.0", "@ethersproject/bytes@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.4.0.tgz#56fa32ce3bf67153756dbaefda921d1d4774404e"
@@ -1458,13 +1376,6 @@
dependencies:
"@ethersproject/logger" "^5.4.0"
-"@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c"
- integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog==
- dependencies:
- "@ethersproject/logger" "^5.5.0"
-
"@ethersproject/constants@5.4.0", "@ethersproject/constants@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.4.0.tgz#ee0bdcb30bf1b532d2353c977bf2ef1ee117958a"
@@ -1472,13 +1383,6 @@
dependencies:
"@ethersproject/bignumber" "^5.4.0"
-"@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.5.0.tgz#d2a2cd7d94bd1d58377d1d66c4f53c9be4d0a45e"
- integrity sha512-2MsRRVChkvMWR+GyMGY4N1sAX9Mt3J9KykCsgUFd/1mwS0UH1qw+Bv9k1UJb3X3YJYFco9H20pjSlOIfCG5HYQ==
- dependencies:
- "@ethersproject/bignumber" "^5.5.0"
-
"@ethersproject/contracts@5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.4.0.tgz#e05fe6bd33acc98741e27d553889ec5920078abb"
@@ -1525,20 +1429,6 @@
"@ethersproject/properties" "^5.4.0"
"@ethersproject/strings" "^5.4.0"
-"@ethersproject/hash@^5.0.4":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.5.0.tgz#7cee76d08f88d1873574c849e0207dcb32380cc9"
- integrity sha512-dnGVpK1WtBjmnp3mUT0PlU2MpapnwWI0PibldQEq1408tQBAbZpPidkWoVVuNMOl/lISO3+4hXZWCL3YV7qzfg==
- dependencies:
- "@ethersproject/abstract-signer" "^5.5.0"
- "@ethersproject/address" "^5.5.0"
- "@ethersproject/bignumber" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/keccak256" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
- "@ethersproject/strings" "^5.5.0"
-
"@ethersproject/hdnode@5.4.0", "@ethersproject/hdnode@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.4.0.tgz#4bc9999b9a12eb5ce80c5faa83114a57e4107cac"
@@ -1584,14 +1474,6 @@
"@ethersproject/bytes" "^5.4.0"
js-sha3 "0.5.7"
-"@ethersproject/keccak256@^5.0.3", "@ethersproject/keccak256@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.5.0.tgz#e4b1f9d7701da87c564ffe336f86dcee82983492"
- integrity sha512-5VoFCTjo2rYbBe1l2f4mccaRFN/4VQEYFwwn04aJV2h7qf4ZvI2wFxUE1XOX+snbwCLRzIeikOqtAoPwMza9kg==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
- js-sha3 "0.8.0"
-
"@ethersproject/logger@5.4.0", "@ethersproject/logger@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.0.tgz#f39adadf62ad610c420bcd156fd41270e91b3ca9"
@@ -1602,11 +1484,6 @@
resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.1.tgz#503bd33683538b923c578c07d1c2c0dd18672054"
integrity sha512-DZ+bRinnYLPw1yAC64oRl0QyVZj43QeHIhVKfD/+YwSz4wsv1pfwb5SOFjz+r710YEWzU6LrhuSjpSO+6PeE4A==
-"@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d"
- integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==
-
"@ethersproject/networks@5.4.1", "@ethersproject/networks@^5.4.0":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.1.tgz#2ce83b8e42aa85216e5d277a7952d97b6ce8d852"
@@ -1621,13 +1498,6 @@
dependencies:
"@ethersproject/logger" "^5.4.0"
-"@ethersproject/networks@^5.5.0":
- version "5.5.2"
- resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.5.2.tgz#784c8b1283cd2a931114ab428dae1bd00c07630b"
- integrity sha512-NEqPxbGBfy6O3x4ZTISb90SjEDkWYDUbEeIFhJly0F7sZjoQMnj5KYzMSkMkLKZ+1fGpx00EDpHQCy6PrDupkQ==
- dependencies:
- "@ethersproject/logger" "^5.5.0"
-
"@ethersproject/pbkdf2@5.4.0", "@ethersproject/pbkdf2@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz#ed88782a67fda1594c22d60d0ca911a9d669641c"
@@ -1650,13 +1520,6 @@
dependencies:
"@ethersproject/logger" "^5.4.0"
-"@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.5.0.tgz#61f00f2bb83376d2071baab02245f92070c59995"
- integrity sha512-l3zRQg3JkD8EL3CPjNK5g7kMx4qSwiR60/uk5IVjd3oq1MZR5qUg40CNOoEJoX5wc3DyY5bt9EbMk86C7x0DNA==
- dependencies:
- "@ethersproject/logger" "^5.5.0"
-
"@ethersproject/providers@5.4.1":
version "5.4.1"
resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.1.tgz#654267b563b833046b9c9647647cfc8267cb93b4"
@@ -1723,14 +1586,6 @@
"@ethersproject/bytes" "^5.4.0"
"@ethersproject/logger" "^5.4.0"
-"@ethersproject/rlp@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.5.0.tgz#530f4f608f9ca9d4f89c24ab95db58ab56ab99a0"
- integrity sha512-hLv8XaQ8PTI9g2RHoQGf/WSxBfTB/NudRacbzdxmst5VHAqd1sMibWG7SENzT5Dj3yZ3kJYx+WiRYEcQTAkcYA==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
-
"@ethersproject/sha2@5.4.0", "@ethersproject/sha2@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.4.0.tgz#c9a8db1037014cbc4e9482bd662f86c090440371"
@@ -1752,18 +1607,6 @@
elliptic "6.5.4"
hash.js "1.1.7"
-"@ethersproject/signing-key@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.5.0.tgz#2aa37169ce7e01e3e80f2c14325f624c29cedbe0"
- integrity sha512-5VmseH7qjtNmDdZBswavhotYbWB0bOwKIlOTSlX14rKn5c11QmJwGt4GHeo7NrL/Ycl7uo9AHvEqs5xZgFBTng==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
- bn.js "^4.11.9"
- elliptic "6.5.4"
- hash.js "1.1.7"
-
"@ethersproject/solidity@5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.4.0.tgz#1305e058ea02dc4891df18b33232b11a14ece9ec"
@@ -1784,15 +1627,6 @@
"@ethersproject/constants" "^5.4.0"
"@ethersproject/logger" "^5.4.0"
-"@ethersproject/strings@^5.0.4", "@ethersproject/strings@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.5.0.tgz#e6784d00ec6c57710755699003bc747e98c5d549"
- integrity sha512-9fy3TtF5LrX/wTrBaT8FGE6TDJyVjOvXynXJz5MT5azq+E6D92zuKNx7i29sWW2FjVOaWjAsiZ1ZWznuduTIIQ==
- dependencies:
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/constants" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
-
"@ethersproject/transactions@5.4.0", "@ethersproject/transactions@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.4.0.tgz#a159d035179334bd92f340ce0f77e83e9e1522e0"
@@ -1808,21 +1642,6 @@
"@ethersproject/rlp" "^5.4.0"
"@ethersproject/signing-key" "^5.4.0"
-"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.5.0":
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.5.0.tgz#7e9bf72e97bcdf69db34fe0d59e2f4203c7a2908"
- integrity sha512-9RZYSKX26KfzEd/1eqvv8pLauCKzDTub0Ko4LfIgaERvRuwyaNV78mJs7cpIgZaDl6RJui4o49lHwwCM0526zA==
- dependencies:
- "@ethersproject/address" "^5.5.0"
- "@ethersproject/bignumber" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/constants" "^5.5.0"
- "@ethersproject/keccak256" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
- "@ethersproject/rlp" "^5.5.0"
- "@ethersproject/signing-key" "^5.5.0"
-
"@ethersproject/units@5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.4.0.tgz#d57477a4498b14b88b10396062c8cbbaf20c79fe"
@@ -1864,17 +1683,6 @@
"@ethersproject/properties" "^5.4.0"
"@ethersproject/strings" "^5.4.0"
-"@ethersproject/web@^5.5.0":
- version "5.5.1"
- resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.5.1.tgz#cfcc4a074a6936c657878ac58917a61341681316"
- integrity sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg==
- dependencies:
- "@ethersproject/base64" "^5.5.0"
- "@ethersproject/bytes" "^5.5.0"
- "@ethersproject/logger" "^5.5.0"
- "@ethersproject/properties" "^5.5.0"
- "@ethersproject/strings" "^5.5.0"
-
"@ethersproject/wordlists@5.4.0", "@ethersproject/wordlists@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.4.0.tgz#f34205ec3bbc9e2c49cadaee774cf0b07e7573d7"
@@ -2747,11 +2555,6 @@
resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-"@sindresorhus/is@^0.14.0":
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
- integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
"@sinonjs/commons@^1.7.0":
version "1.8.3"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -3038,13 +2841,6 @@
resolve-from "^5.0.0"
ts-dedent "^1.1.0"
-"@szmarczak/http-timer@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
- integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
- dependencies:
- defer-to-connect "^1.0.1"
-
"@tootallnate/once@1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -3098,7 +2894,7 @@
dependencies:
"@babel/types" "^7.3.0"
-"@types/bn.js@^4.11.3", "@types/bn.js@^4.11.5":
+"@types/bn.js@^4.11.3":
version "4.11.6"
resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"
integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==
@@ -3204,11 +3000,6 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.1.tgz#70cedfda26af7a2ca073fdcc9beb2fff4aa693f8"
integrity sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==
-"@types/node@^12.12.6":
- version "12.20.41"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.41.tgz#81d7734c5257da9f04354bd9084a6ebbdd5198a5"
- integrity sha512-f6xOqucbDirG7LOzedpvzjP3UTmHttRou3Mosx3vL9wr9AIQGhcPgVnqa8ihpZYnxyM1rxeNCvTyukPKZtq10Q==
-
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -3991,11 +3782,6 @@ array-filter@~0.0.0:
resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-array-flatten@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
- integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
@@ -4533,16 +4319,15 @@ bignumber.js@^7.2.1:
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f"
integrity sha512-S4XzBk5sMB+Rcb/LNcpzXr57VRTxgAvaAEDAl1AwRx27j00hT84O6OkteE7u8UB3NuaaygCRrEpqox4uDOrbdQ==
-bignumber.js@^9.0.0:
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
- integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
-
bignumber.js@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5"
integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA==
+"bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git":
+ version "2.0.7"
+ resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
+
bindings@^1.2.1, bindings@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -4605,7 +4390,7 @@ bn.js@4.11.8:
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.10.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.8, bn.js@^4.11.9:
version "4.12.0"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
@@ -4615,22 +4400,6 @@ bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2:
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-body-parser@1.19.1, body-parser@^1.16.0:
- version "1.19.1"
- resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
- integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
- dependencies:
- bytes "3.1.1"
- content-type "~1.0.4"
- debug "2.6.9"
- depd "~1.1.2"
- http-errors "1.8.1"
- iconv-lite "0.4.24"
- on-finished "~2.3.0"
- qs "6.9.6"
- raw-body "2.4.2"
- type-is "~1.6.18"
-
boolbase@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -4751,7 +4520,7 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
bn.js "^5.0.0"
randombytes "^2.0.1"
-browserify-sign@^4.0.0, browserify-sign@^4.0.4:
+browserify-sign@^4.0.4:
version "4.2.1"
resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
@@ -4844,11 +4613,6 @@ buffer-from@^1.0.0, buffer-from@^1.1.1:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-buffer-to-arraybuffer@^0.0.5:
- version "0.0.5"
- resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a"
- integrity sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=
-
buffer-xor@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -4871,7 +4635,7 @@ buffer@^4.9.1:
ieee754 "^1.1.4"
isarray "^1.0.0"
-buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -4879,13 +4643,6 @@ buffer@^5.0.5, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
base64-js "^1.3.1"
ieee754 "^1.1.13"
-bufferutil@^4.0.1:
- version "4.0.6"
- resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.6.tgz#ebd6c67c7922a0e902f053e5d8be5ec850e48433"
- integrity sha512-jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw==
- dependencies:
- node-gyp-build "^4.3.0"
-
bunyan-debug-stream@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/bunyan-debug-stream/-/bunyan-debug-stream-1.1.1.tgz#4740a00b7d5c2d9d1b714925ab0802516040813e"
@@ -4914,11 +4671,6 @@ bytes@3.1.0:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-bytes@3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
- integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
-
cache-base@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4934,19 +4686,6 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
-cacheable-request@^6.0.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
- integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
- dependencies:
- clone-response "^1.0.2"
- get-stream "^5.1.0"
- http-cache-semantics "^4.0.0"
- keyv "^3.0.0"
- lowercase-keys "^2.0.0"
- normalize-url "^4.1.0"
- responselike "^1.0.2"
-
call-bind@^1.0.0, call-bind@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -5137,7 +4876,7 @@ child-process-promise@^2.2.0:
node-version "^1.0.0"
promise-polyfill "^6.0.1"
-chownr@^1.1.1, chownr@^1.1.4:
+chownr@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -5287,13 +5026,6 @@ clone-deep@^4.0.1:
kind-of "^6.0.2"
shallow-clone "^3.0.0"
-clone-response@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
- integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
- dependencies:
- mimic-response "^1.0.0"
-
clone@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -5539,14 +5271,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-content-disposition@0.5.4:
- version "0.5.4"
- resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
- integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
- dependencies:
- safe-buffer "5.2.1"
-
-content-hash@2.5.2, content-hash@^2.5.2:
+content-hash@2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/content-hash/-/content-hash-2.5.2.tgz#bbc2655e7c21f14fd3bfc7b7d4bfe6e454c9e211"
integrity sha512-FvIQKy0S1JaWV10sMsA7TRx8bpU+pqPkhbsfvOJAdjRXvYxEckAwQWGwtRjiaJfh+E0DvcWUGqcdjwMGFjsSdw==
@@ -5555,11 +5280,6 @@ content-hash@2.5.2, content-hash@^2.5.2:
multicodec "^0.5.5"
multihashes "^0.4.15"
-content-type@~1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
- integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
@@ -5567,16 +5287,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0,
dependencies:
safe-buffer "~5.1.1"
-cookie-signature@1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
- integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
- integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
cookiejar@^2.1.0, cookiejar@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -5617,14 +5327,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-cors@^2.8.1:
- version "2.8.5"
- resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
- integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
- dependencies:
- object-assign "^4"
- vary "^1"
-
cosmiconfig@^5.0.5, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
@@ -5764,22 +5466,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
shebang-command "^2.0.0"
which "^2.0.1"
-crypto-browserify@3.12.0:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
- integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
- dependencies:
- browserify-cipher "^1.0.0"
- browserify-sign "^4.0.0"
- create-ecdh "^4.0.0"
- create-hash "^1.1.0"
- create-hmac "^1.1.0"
- diffie-hellman "^5.0.0"
- inherits "^2.0.1"
- pbkdf2 "^3.0.3"
- public-encrypt "^4.0.0"
- randombytes "^2.0.0"
- randomfill "^1.0.3"
+crypto-js@^3.1.4:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b"
+ integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==
css-color-keywords@^1.0.0:
version "1.0.0"
@@ -5880,14 +5570,6 @@ d64@^1.0.0:
resolved "https://registry.yarnpkg.com/d64/-/d64-1.0.0.tgz#4002a87e850cbfc9f9d9706b60fca613a3336e90"
integrity sha1-QAKofoUMv8n52XBrYPymE6MzbpA=
-d@1, d@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
- integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
- dependencies:
- es5-ext "^0.10.50"
- type "^1.0.1"
-
dashdash@^1.12.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -5955,13 +5637,6 @@ decode-uri-component@^0.2.0:
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-decompress-response@^3.2.0, decompress-response@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
- integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
- dependencies:
- mimic-response "^1.0.0"
-
decompress-response@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -6051,11 +5726,6 @@ defaults@^1.0.3:
dependencies:
clone "^1.0.2"
-defer-to-connect@^1.0.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
- integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
deferred-leveldown@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"
@@ -6354,11 +6024,6 @@ dtrace-provider@~0.8:
dependencies:
nan "^2.14.0"
-duplexer3@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
- integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
ecc-jsbn@~0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -6382,7 +6047,7 @@ electron-to-chromium@^1.3.886:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.895.tgz#9b0f8f2e32d8283bbb200156fd5d8dfd775f31ed"
integrity sha512-9Ww3fB8CWctjqHwkOt7DQbMZMpal2x2reod+/lU4b9axO1XJEDUpPMBxs7YnjLhhqpKXIIB5SRYN/B4K0QpvyQ==
-elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4:
+elliptic@6.5.4, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4:
version "6.5.4"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
@@ -6627,37 +6292,11 @@ es-to-primitive@^1.2.1:
is-date-object "^1.0.1"
is-symbol "^1.0.2"
-es5-ext@^0.10.35, es5-ext@^0.10.50:
- version "0.10.53"
- resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
- integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
- dependencies:
- es6-iterator "~2.0.3"
- es6-symbol "~3.1.3"
- next-tick "~1.0.0"
-
es6-error@^4.0.2:
version "4.1.1"
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-es6-iterator@~2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
- integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
- dependencies:
- d "1"
- es5-ext "^0.10.35"
- es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
- integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
- dependencies:
- d "^1.0.1"
- ext "^1.1.2"
-
escalade@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -7316,27 +6955,6 @@ eth-keyring-controller@^6.2.1:
loglevel "^1.5.0"
obs-store "^4.0.3"
-eth-lib@0.2.8:
- version "0.2.8"
- resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.8.tgz#b194058bef4b220ad12ea497431d6cb6aa0623c8"
- integrity sha512-ArJ7x1WcWOlSpzdoTBX8vkwlkSQ85CjjifSZtV4co64vWxSV8geWfPI9x4SVYu3DSxnX4yWFVTtGL+j9DUFLNw==
- dependencies:
- bn.js "^4.11.6"
- elliptic "^6.4.0"
- xhr-request-promise "^0.1.2"
-
-eth-lib@^0.1.26:
- version "0.1.29"
- resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.1.29.tgz#0c11f5060d42da9f931eab6199084734f4dbd1d9"
- integrity sha512-bfttrr3/7gG4E02HoWTDUcDDslN003OlOoBxk9virpAZQ1ja/jDgwkWB8QfJF7ojuEowrqy+lzp9VcJG7/k5bQ==
- dependencies:
- bn.js "^4.11.6"
- elliptic "^6.4.0"
- nano-json-stream-parser "^0.1.2"
- servify "^0.1.12"
- ws "^3.0.0"
- xhr-request-promise "^0.1.2"
-
eth-method-registry@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/eth-method-registry/-/eth-method-registry-1.1.0.tgz#3cc01bd23dcf513428d14a0bb19910652cc5cac0"
@@ -7409,13 +7027,6 @@ eth-url-parser@1.0.4:
bignumber.js "^7.2.1"
qs "^6.5.2"
-ethereum-bloom-filters@^1.0.6:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.10.tgz#3ca07f4aed698e75bd134584850260246a5fed8a"
- integrity sha512-rxJ5OFN3RwjQxDcFP2Z5+Q9ho4eIdEmSc2ht0fCu8Se9nbXjZ7/031uXoUYJ87KHCOdVeiUuwSnoS7hmYAGVHA==
- dependencies:
- js-sha3 "^0.8.0"
-
ethereum-common@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.2.0.tgz#13bf966131cce1eeade62a1b434249bb4cb120ca"
@@ -7602,17 +7213,6 @@ ethereumjs-util@^7.1.0:
ethjs-util "0.1.6"
rlp "^2.2.4"
-ethereumjs-util@^7.1.3:
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.3.tgz#b55d7b64dde3e3e45749e4c41288238edec32d23"
- integrity sha512-y+82tEbyASO0K0X1/SRhbJJoAlfcvq8JbrG4a5cjrOks7HS/36efU/0j2flxCPOUM++HFahk33kr/ZxyC4vNuw==
- dependencies:
- "@types/bn.js" "^5.1.0"
- bn.js "^5.1.2"
- create-hash "^1.1.2"
- ethereum-cryptography "^0.1.3"
- rlp "^2.2.4"
-
ethereumjs-vm@^2.3.4, ethereumjs-vm@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6"
@@ -7910,11 +7510,6 @@ event-target-shim@^5.0.0, event-target-shim@^5.0.1:
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-eventemitter3@4.0.4:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
- integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
-
eventemitter3@^4.0.0:
version "4.0.7"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -8023,49 +7618,6 @@ expect@^26.6.2:
jest-message-util "^26.6.2"
jest-regex-util "^26.0.0"
-express@^4.14.0:
- version "4.17.2"
- resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
- integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
- dependencies:
- accepts "~1.3.7"
- array-flatten "1.1.1"
- body-parser "1.19.1"
- content-disposition "0.5.4"
- content-type "~1.0.4"
- cookie "0.4.1"
- cookie-signature "1.0.6"
- debug "2.6.9"
- depd "~1.1.2"
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- etag "~1.8.1"
- finalhandler "~1.1.2"
- fresh "0.5.2"
- merge-descriptors "1.0.1"
- methods "~1.1.2"
- on-finished "~2.3.0"
- parseurl "~1.3.3"
- path-to-regexp "0.1.7"
- proxy-addr "~2.0.7"
- qs "6.9.6"
- range-parser "~1.2.1"
- safe-buffer "5.2.1"
- send "0.17.2"
- serve-static "1.14.2"
- setprototypeof "1.2.0"
- statuses "~1.5.0"
- type-is "~1.6.18"
- utils-merge "1.0.1"
- vary "~1.1.2"
-
-ext@^1.1.2:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
- integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
- dependencies:
- type "^2.5.0"
-
extend-shallow@^1.1.2:
version "1.1.4"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -8303,7 +7855,7 @@ filter-obj@^1.1.0:
resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
-finalhandler@1.1.2, finalhandler@~1.1.2:
+finalhandler@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -8466,11 +8018,6 @@ formidable@^1.2.0:
resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
-forwarded@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
- integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
fragment-cache@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -8542,13 +8089,6 @@ fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
-fs-minipass@^1.2.7:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
- integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
- dependencies:
- minipass "^2.6.0"
-
fs-minipass@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -8671,19 +8211,14 @@ get-stdin@^6.0.0:
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-get-stream@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
- integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
dependencies:
pump "^3.0.0"
-get-stream@^5.0.0, get-stream@^5.1.0:
+get-stream@^5.0.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
@@ -8808,43 +8343,6 @@ good-listener@^1.2.2:
dependencies:
delegate "^3.1.2"
-got@9.6.0:
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
- integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
- dependencies:
- "@sindresorhus/is" "^0.14.0"
- "@szmarczak/http-timer" "^1.1.2"
- cacheable-request "^6.0.0"
- decompress-response "^3.3.0"
- duplexer3 "^0.1.4"
- get-stream "^4.1.0"
- lowercase-keys "^1.0.1"
- mimic-response "^1.0.1"
- p-cancelable "^1.0.0"
- to-readable-stream "^1.0.0"
- url-parse-lax "^3.0.0"
-
-got@^7.1.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
- integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==
- dependencies:
- decompress-response "^3.2.0"
- duplexer3 "^0.1.4"
- get-stream "^3.0.0"
- is-plain-obj "^1.1.0"
- is-retry-allowed "^1.0.0"
- is-stream "^1.0.0"
- isurl "^1.0.0-alpha5"
- lowercase-keys "^1.0.0"
- p-cancelable "^0.3.0"
- p-timeout "^1.1.1"
- safe-buffer "^5.0.1"
- timed-out "^4.0.0"
- url-parse-lax "^1.0.0"
- url-to-options "^1.0.1"
-
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
version "4.2.6"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -8905,23 +8403,11 @@ has-flag@^4.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-symbol-support-x@^1.4.1:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
- integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
-
has-symbols@^1.0.1, has-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-has-to-string-tag-x@^1.2.0:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
- integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
- dependencies:
- has-symbol-support-x "^1.4.1"
-
has-tostringtag@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -9082,11 +8568,6 @@ htmlparser2@^6.1.0:
domutils "^2.5.2"
entities "^2.0.0"
-http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
-
http-errors@1.7.3, http-errors@~1.7.2:
version "1.7.3"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
@@ -9098,22 +8579,6 @@ http-errors@1.7.3, http-errors@~1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
-http-errors@1.8.1:
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
- integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
- dependencies:
- depd "~1.1.2"
- inherits "2.0.4"
- setprototypeof "1.2.0"
- statuses ">= 1.5.0 < 2"
- toidentifier "1.0.1"
-
-http-https@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/http-https/-/http-https-1.0.0.tgz#2f908dd5f1db4068c058cd6e6d4ce392c913389b"
- integrity sha1-L5CN1fHbQGjAWM1ubUzjkskTOJs=
-
http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
@@ -9402,11 +8867,6 @@ ip@^1.1.5:
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-ipaddr.js@1.9.1:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
- integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
is-accessor-descriptor@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -9687,11 +9147,6 @@ is-object@~0.1.2:
resolved "https://registry.yarnpkg.com/is-object/-/is-object-0.1.2.tgz#00efbc08816c33cfc4ac8251d132e10dc65098d7"
integrity sha1-AO+8CIFsM8/ErIJR0TLhDcZQmNc=
-is-plain-obj@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
- integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
is-plain-obj@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -9740,11 +9195,6 @@ is-regexp@^1.0.0:
resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
-is-retry-allowed@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
- integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
is-set@^2.0.1, is-set@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
@@ -9755,7 +9205,7 @@ is-shared-array-buffer@^1.0.1:
resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -9950,14 +9400,6 @@ istanbul-reports@^3.0.2:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
-isurl@^1.0.0-alpha5:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
- integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
- dependencies:
- has-to-string-tag-x "^1.2.0"
- is-object "^1.0.1"
-
jest-changed-files@^26.6.2:
version "26.6.2"
resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
@@ -10377,7 +9819,7 @@ js-sha3@0.5.7, js-sha3@^0.5.7:
resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=
-js-sha3@0.8.0, js-sha3@^0.8.0:
+js-sha3@0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
@@ -10473,11 +9915,6 @@ jsesc@~0.5.0:
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-json-buffer@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
- integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
json-parse-better-errors@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -10645,13 +10082,6 @@ keymirror@^0.1.1:
resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
integrity sha1-kYiJ6hP40KQufFVyUO7nE63JXDU=
-keyv@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
- integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
- dependencies:
- json-buffer "3.0.0"
-
keyvaluestorage-interface@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/keyvaluestorage-interface/-/keyvaluestorage-interface-1.0.0.tgz#13ebdf71f5284ad54be94bd1ad9ed79adad515ff"
@@ -11071,16 +10501,6 @@ lottie-ios@2.5.0:
prop-types "^15.5.10"
react-native-safe-module "^1.1.0"
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
- integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lowercase-keys@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
- integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
lowlight@~1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz#1304d83005126d4e8b1dc0f07981e9b689ec2efc"
@@ -11182,11 +10602,6 @@ mdn-data@2.0.14:
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-media-typer@0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
- integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
memdown@^1.0.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
@@ -11211,11 +10626,6 @@ memoizerific@^1.11.3:
dependencies:
map-or-similar "^1.5.0"
-merge-descriptors@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
- integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -11245,7 +10655,7 @@ mersenne-twister@^1.1.0:
resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o=
-methods@^1.1.1, methods@~1.1.2:
+methods@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
@@ -11568,7 +10978,7 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
dependencies:
mime-db "1.48.0"
-mime-types@^2.1.16, mime-types@^2.1.27:
+mime-types@^2.1.27:
version "2.1.34"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -11595,11 +11005,6 @@ mimic-fn@^2.1.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-mimic-response@^1.0.0, mimic-response@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
- integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
mimic-response@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -11634,14 +11039,6 @@ minimist@^1.1.1, minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minipass@^2.6.0, minipass@^2.9.0:
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
- integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
- dependencies:
- safe-buffer "^5.1.2"
- yallist "^3.0.0"
-
minipass@^3.0.0:
version "3.1.5"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
@@ -11649,13 +11046,6 @@ minipass@^3.0.0:
dependencies:
yallist "^4.0.0"
-minizlib@^1.3.3:
- version "1.3.3"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
- integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
- dependencies:
- minipass "^2.9.0"
-
minizlib@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -11677,18 +11067,6 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-mkdirp-promise@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
- integrity sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=
- dependencies:
- mkdirp "*"
-
-mkdirp@*, mkdirp@^1.0.3:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
- integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
mkdirp@0.x.x, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
version "0.5.5"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -11696,10 +11074,10 @@ mkdirp@0.x.x, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
dependencies:
minimist "^1.2.5"
-mock-fs@^4.1.0:
- version "4.14.0"
- resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18"
- integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==
+mkdirp@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+ integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
mockdate@^3.0.2:
version "3.0.5"
@@ -11731,7 +11109,7 @@ ms@2.1.2:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
+ms@^2.0.0, ms@^2.1.1:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -11813,11 +11191,6 @@ nan@^2.0.5, nan@^2.14.0, nan@^2.2.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
-nano-json-stream-parser@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f"
- integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=
-
nanoid@^3.1.15, nanoid@^3.1.31:
version "3.2.0"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
@@ -11885,11 +11258,6 @@ netmask@^2.0.1:
resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
-next-tick@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
- integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -11943,11 +11311,6 @@ node-gyp-build@^4.2.0:
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
-node-gyp-build@^4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
- integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
-
node-gyp@^7.1.0:
version "7.1.2"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
@@ -12042,11 +11405,6 @@ normalize-svg-path@^1.0.1:
dependencies:
svg-arc-to-cubic-bezier "^3.0.0"
-normalize-url@^4.1.0:
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
- integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
npm-logical-tree@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
@@ -12130,7 +11488,7 @@ obj-multiplex@1.0.0:
once "^1.4.0"
readable-stream "^2.3.3"
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -12268,13 +11626,6 @@ object.values@^1.1.5:
define-properties "^1.1.3"
es-abstract "^1.19.1"
-oboe@2.1.5:
- version "2.1.5"
- resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd"
- integrity sha1-VVQoTFQ6ImbXo48X4HOCH73jk80=
- dependencies:
- http-https "^1.0.0"
-
obs-store@4.0.3, obs-store@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/obs-store/-/obs-store-4.0.3.tgz#b632ec7814baa604fae084a4c97e87c0b7a6d14c"
@@ -12408,16 +11759,6 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-p-cancelable@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
- integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==
-
-p-cancelable@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
- integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
p-each-series@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -12470,13 +11811,6 @@ p-map@^4.0.0:
dependencies:
aggregate-error "^3.0.0"
-p-timeout@^1.1.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
- integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=
- dependencies:
- p-finally "^1.0.0"
-
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -12650,11 +11984,6 @@ path-parse@^1.0.6:
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-path-to-regexp@0.1.7:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
- integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
path-type@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -12887,16 +12216,6 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-prepend-http@^1.0.1:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
- integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
-prepend-http@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
- integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
prettier-linter-helpers@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -13054,14 +12373,6 @@ property-information@^5.0.0:
dependencies:
xtend "^4.0.0"
-proxy-addr@~2.0.7:
- version "2.0.7"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
- integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
- dependencies:
- forwarded "0.2.0"
- ipaddr.js "1.9.1"
-
proxy-agent@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-4.0.1.tgz#326c3250776c7044cd19655ccbfadf2e065a045c"
@@ -13165,11 +12476,6 @@ qs@6.7.0:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-qs@6.9.6:
- version "6.9.6"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
- integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
-
qs@^6.5.1, qs@^6.5.2:
version "6.10.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
@@ -13198,15 +12504,6 @@ query-string@6.13.5:
split-on-first "^1.0.0"
strict-uri-encode "^2.0.0"
-query-string@^5.0.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
- integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
- dependencies:
- decode-uri-component "^0.2.0"
- object-assign "^4.1.0"
- strict-uri-encode "^1.0.0"
-
query-string@^6.12.1, query-string@^6.13.6:
version "6.14.1"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
@@ -13266,21 +12563,13 @@ randombytes@2.0.3:
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
integrity sha1-Z0yZdgkBw8QRJ3GjHlIdw0nMCew=
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.0.6, randombytes@^2.1.0:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.6, randombytes@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
dependencies:
safe-buffer "^5.1.0"
-randomfill@^1.0.3:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
- integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
- dependencies:
- randombytes "^2.0.5"
- safe-buffer "^5.1.0"
-
randomstring@^1.1.5:
version "1.2.1"
resolved "https://registry.yarnpkg.com/randomstring/-/randomstring-1.2.1.tgz#71cd3cda24ad1b7e0b65286b3aa5c10853019349"
@@ -13294,16 +12583,6 @@ range-parser@~1.2.1:
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-raw-body@2.4.2:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
- integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
- dependencies:
- bytes "3.1.1"
- http-errors "1.8.1"
- iconv-lite "0.4.24"
- unpipe "1.0.0"
-
raw-body@^2.2.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
@@ -14352,7 +13631,7 @@ repeat-string@^1.6.1:
resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-request@^2.72.0, request@^2.79.0, request@^2.85.0, request@^2.88.2:
+request@^2.72.0, request@^2.85.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -14451,13 +13730,6 @@ resolve@^2.0.0-next.3:
is-core-module "^2.2.0"
path-parse "^1.0.6"
-responselike@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
- integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
- dependencies:
- lowercase-keys "^1.0.0"
-
restore-cursor@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -14619,7 +13891,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -14809,25 +14081,6 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"
-send@0.17.2:
- version "0.17.2"
- resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
- integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
- dependencies:
- debug "2.6.9"
- depd "~1.1.2"
- destroy "~1.0.4"
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- etag "~1.8.1"
- fresh "0.5.2"
- http-errors "1.8.1"
- mime "1.6.0"
- ms "2.1.3"
- on-finished "~2.3.0"
- range-parser "~1.2.1"
- statuses "~1.5.0"
-
serialize-error@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
@@ -14840,16 +14093,6 @@ serialize-error@^8.0.1:
dependencies:
type-fest "^0.20.2"
-serve-static@1.14.2:
- version "1.14.2"
- resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
- integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
- dependencies:
- encodeurl "~1.0.2"
- escape-html "~1.0.3"
- parseurl "~1.3.3"
- send "0.17.2"
-
serve-static@^1.13.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -14860,17 +14103,6 @@ serve-static@^1.13.1:
parseurl "~1.3.3"
send "0.17.1"
-servify@^0.1.12:
- version "0.1.12"
- resolved "https://registry.yarnpkg.com/servify/-/servify-0.1.12.tgz#142ab7bee1f1d033b66d0707086085b17c06db95"
- integrity sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==
- dependencies:
- body-parser "^1.16.0"
- cors "^2.8.1"
- express "^4.14.0"
- request "^2.79.0"
- xhr "^2.3.3"
-
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -14899,11 +14131,6 @@ setprototypeof@1.1.1:
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-setprototypeof@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
- integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
sha.js@^2.4.0, sha.js@^2.4.8:
version "2.4.11"
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -15013,7 +14240,7 @@ simple-concat@^1.0.0:
resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-simple-get@4.0.1, simple-get@^2.7.0, simple-get@^3.0.3, simple-get@^3.1.0:
+simple-get@4.0.1, simple-get@^3.0.3, simple-get@^3.1.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
@@ -15358,11 +14585,6 @@ stream-events@^1.0.5:
dependencies:
stubs "^3.0.0"
-strict-uri-encode@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
- integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
strict-uri-encode@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -15643,23 +14865,6 @@ swappable-obj-proxy@^1.1.0:
resolved "https://registry.yarnpkg.com/swappable-obj-proxy/-/swappable-obj-proxy-1.1.0.tgz#fe23c60a0df22499e85d94b71297d9c39ff05fa4"
integrity sha512-bXbKO85b0YNbZi/61TjRAbNtY49ABKu7rQ4k2+RFXPL7TA2mphttfqAqCeJ+lrlKlkYc5pvm6erFk6vOWJSpdw==
-swarm-js@^0.1.40:
- version "0.1.40"
- resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.40.tgz#b1bc7b6dcc76061f6c772203e004c11997e06b99"
- integrity sha512-yqiOCEoA4/IShXkY3WKwP5PvZhmoOOD8clsKA7EEcRILMkTEYHCQ21HDCAcVpmIxZq4LyZvWeRJ6quIyHk1caA==
- dependencies:
- bluebird "^3.5.0"
- buffer "^5.0.5"
- eth-lib "^0.1.26"
- fs-extra "^4.0.2"
- got "^7.1.0"
- mime-types "^2.1.16"
- mkdirp-promise "^5.0.1"
- mock-fs "^4.1.0"
- setimmediate "^1.0.5"
- tar "^4.0.2"
- xhr-request "^1.0.1"
-
symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -15701,19 +14906,6 @@ tar-stream@^2.1.4:
inherits "^2.0.3"
readable-stream "^3.1.1"
-tar@^4.0.2:
- version "4.4.19"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
- integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
- dependencies:
- chownr "^1.1.4"
- fs-minipass "^1.2.7"
- minipass "^2.9.0"
- minizlib "^1.3.3"
- mkdirp "^0.5.5"
- safe-buffer "^5.2.1"
- yallist "^3.1.1"
-
tar@^6.0.2:
version "6.1.11"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
@@ -15838,11 +15030,6 @@ time-stamp@^1.0.0:
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-timed-out@^4.0.0, timed-out@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
- integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
tiny-emitter@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
@@ -15882,11 +15069,6 @@ to-object-path@^0.3.0:
dependencies:
kind-of "^3.0.2"
-to-readable-stream@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
- integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
to-regex-range@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -15922,11 +15104,6 @@ toidentifier@1.0.0:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-toidentifier@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
- integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
tough-cookie@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -16085,24 +15262,6 @@ type-fest@^0.8.1:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
-type-is@~1.6.18:
- version "1.6.18"
- resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
- integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
- dependencies:
- media-typer "0.3.0"
- mime-types "~2.1.24"
-
-type@^1.0.1:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
- integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
- integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
-
typed-styles@^0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
@@ -16143,11 +15302,6 @@ ultron@1.0.x:
resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=
-ultron@~1.1.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
- integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
unbox-primitive@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -16241,20 +15395,6 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-url-parse-lax@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
- integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
- dependencies:
- prepend-http "^1.0.1"
-
-url-parse-lax@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
- integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
- dependencies:
- prepend-http "^2.0.0"
-
url-parse@1.5.9:
version "1.5.9"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.9.tgz#05ff26484a0b5e4040ac64dcee4177223d74675e"
@@ -16263,16 +15403,6 @@ url-parse@1.5.9:
querystringify "^2.1.1"
requires-port "^1.0.0"
-url-set-query@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339"
- integrity sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=
-
-url-to-options@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
- integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
-
url@0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -16311,19 +15441,17 @@ use@^3.1.0:
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-utf-8-validate@^5.0.2:
- version "5.0.8"
- resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.8.tgz#4a735a61661dbb1c59a0868c397d2fe263f14e58"
- integrity sha512-k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA==
- dependencies:
- node-gyp-build "^4.3.0"
-
utf8-byte-length@^1.0.1:
version "1.0.4"
resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
-utf8@3.0.0, utf8@^3.0.0:
+utf8@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
+ integrity sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=
+
+utf8@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==
@@ -16347,7 +15475,7 @@ util@^0.10.3:
dependencies:
inherits "2.0.3"
-util@^0.12.0, util@^0.12.1:
+util@^0.12.1:
version "0.12.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
@@ -16438,7 +15566,7 @@ varint@^5.0.0:
resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4"
integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==
-vary@^1, vary@~1.1.2:
+vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -16518,173 +15646,6 @@ weak@^1.0.0:
bindings "^1.2.1"
nan "^2.0.5"
-web3-bzz@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.6.1.tgz#8430eb3cbb69baaee4981d190b840748c37a9ec2"
- integrity sha512-JbnFNbRlwwHJZPtVuCxo7rC4U4OTg+mPsyhjgPQJJhS0a6Y54OgVWYk9UA/95HqbmTJwTtX329gJoSsseEfrng==
- dependencies:
- "@types/node" "^12.12.6"
- got "9.6.0"
- swarm-js "^0.1.40"
-
-web3-core-helpers@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.6.1.tgz#cb21047306871f4cf0fedfece7d47ea2aa96141b"
- integrity sha512-om2PZvK1uoWcgMq6JfcSx3241LEIVF6qi2JuHz2SLKiKEW5UsBUaVx0mNCmcZaiuYQCyOsLS3r33q5AdM+v8ng==
- dependencies:
- web3-eth-iban "1.6.1"
- web3-utils "1.6.1"
-
-web3-core-method@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.6.1.tgz#4ae91c639bf1da85ebfd8b99595da6a2235d7b98"
- integrity sha512-szH5KyIWIaULQDBdDvevQUCHV9lsExJ/oV0ePqK+w015D2SdMPMuhii0WB+HCePaksWO+rr/GAypvV9g2T3N+w==
- dependencies:
- "@ethersproject/transactions" "^5.0.0-beta.135"
- web3-core-helpers "1.6.1"
- web3-core-promievent "1.6.1"
- web3-core-subscriptions "1.6.1"
- web3-utils "1.6.1"
-
-web3-core-promievent@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.6.1.tgz#f650dea9361e2edf02691015b213fcc8ea499992"
- integrity sha512-byJ5s2MQxrWdXd27pWFmujfzsTZK4ik8rDgIV1RFDFc+rHZ2nZhq+VWk7t/Nkrj7EaVXncEgTdPEHc18nx+ocQ==
- dependencies:
- eventemitter3 "4.0.4"
-
-web3-core-requestmanager@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.6.1.tgz#d9c08b0716c9cda546a0c02767b7e08deb04448a"
- integrity sha512-4y7etYEUtkfflyYVBfN1oJtCbVFNhNX1omlEYzezhTnPj3/dT7n+dhUXcqvIhx9iKA13unGfpFge80XNFfcB8A==
- dependencies:
- util "^0.12.0"
- web3-core-helpers "1.6.1"
- web3-providers-http "1.6.1"
- web3-providers-ipc "1.6.1"
- web3-providers-ws "1.6.1"
-
-web3-core-subscriptions@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.6.1.tgz#4dfc1f74137354d4ac9eaa628aa916c5e2cc8741"
- integrity sha512-WZwxsYttIojyGQ5RqxuQcKg0IJdDCFpUe4EncS3QKZwxPqWzGmgyLwE0rm7tP+Ux1waJn5CUaaoSCBxWGSun1g==
- dependencies:
- eventemitter3 "4.0.4"
- web3-core-helpers "1.6.1"
-
-web3-core@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.6.1.tgz#b41f08fdc9ea1082d15384a3d6fa93a47c3fc1b4"
- integrity sha512-m+b7UfYvU5cQUAh6NRfxRzH/5B3to1AdEQi1HIQt570cDWlObOOmoO9tY6iJnI5w4acxIO19LqjDMqEJGBYyRQ==
- dependencies:
- "@types/bn.js" "^4.11.5"
- "@types/node" "^12.12.6"
- bignumber.js "^9.0.0"
- web3-core-helpers "1.6.1"
- web3-core-method "1.6.1"
- web3-core-requestmanager "1.6.1"
- web3-utils "1.6.1"
-
-web3-eth-abi@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.6.1.tgz#15b937e3188570754d50bbac51a4bb0578600d1d"
- integrity sha512-svhYrAlXP9XQtV7poWKydwDJq2CaNLMtmKydNXoOBLcQec6yGMP+v20pgrxF2H6wyTK+Qy0E3/5ciPOqC/VuoQ==
- dependencies:
- "@ethersproject/abi" "5.0.7"
- web3-utils "1.6.1"
-
-web3-eth-accounts@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.6.1.tgz#aeb0dfb52c4391773550569732975b471212583f"
- integrity sha512-rGn3jwnuOKwaQRu4SiShz0YAQ87aVDBKs4HO43+XTCI1q1Y1jn3NOsG3BW9ZHaOckev4+zEyxze/Bsh2oEk24w==
- dependencies:
- "@ethereumjs/common" "^2.5.0"
- "@ethereumjs/tx" "^3.3.2"
- crypto-browserify "3.12.0"
- eth-lib "0.2.8"
- ethereumjs-util "^7.0.10"
- scrypt-js "^3.0.1"
- uuid "3.3.2"
- web3-core "1.6.1"
- web3-core-helpers "1.6.1"
- web3-core-method "1.6.1"
- web3-utils "1.6.1"
-
-web3-eth-contract@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.6.1.tgz#4b0a2c0b37015d70146e54c7cb3f035a58fbeec0"
- integrity sha512-GXqTe3mF6kpbOAakiNc7wtJ120/gpuKMTZjuGFKeeY8aobRLfbfgKzM9IpyqVZV2v5RLuGXDuurVN2KPgtu3hQ==
- dependencies:
- "@types/bn.js" "^4.11.5"
- web3-core "1.6.1"
- web3-core-helpers "1.6.1"
- web3-core-method "1.6.1"
- web3-core-promievent "1.6.1"
- web3-core-subscriptions "1.6.1"
- web3-eth-abi "1.6.1"
- web3-utils "1.6.1"
-
-web3-eth-ens@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.6.1.tgz#801bd5fb5237377ec2ed8517a9fe4634f2269c7a"
- integrity sha512-ngprtbnoRgxg8s1wXt9nXpD3h1P+p7XnKXrp/8GdFI9uDmrbSQPRfzBw86jdZgOmy78hAnWmrHI6pBInmgi2qQ==
- dependencies:
- content-hash "^2.5.2"
- eth-ens-namehash "2.0.8"
- web3-core "1.6.1"
- web3-core-helpers "1.6.1"
- web3-core-promievent "1.6.1"
- web3-eth-abi "1.6.1"
- web3-eth-contract "1.6.1"
- web3-utils "1.6.1"
-
-web3-eth-iban@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.6.1.tgz#20bbed75723e3e9ff98e624979629d26329462b6"
- integrity sha512-91H0jXZnWlOoXmc13O9NuQzcjThnWyAHyDn5Yf7u6mmKOhpJSGF/OHlkbpXt1Y4v2eJdEPaVFa+6i8aRyagE7Q==
- dependencies:
- bn.js "^4.11.9"
- web3-utils "1.6.1"
-
-web3-eth-personal@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.6.1.tgz#9b524fb9f92b51163f46920ee2663d34a4897c8d"
- integrity sha512-ItsC89Ln02+irzJjK6ALcLrMZfbVUCqVbmb/ieDKJ+eLW3pNkBNwoUzaydh92d5NzxNZgNxuQWVdlFyYX2hkEw==
- dependencies:
- "@types/node" "^12.12.6"
- web3-core "1.6.1"
- web3-core-helpers "1.6.1"
- web3-core-method "1.6.1"
- web3-net "1.6.1"
- web3-utils "1.6.1"
-
-web3-eth@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.6.1.tgz#a25aba1ac213d872ecf3f81c7b4ab8072ecae224"
- integrity sha512-kOV1ZgCKypSo5BQyltRArS7ZC3bRpIKAxSgzl7pUFinUb/MxfbM9KGeNxUXoCfTSErcCQJaDjcS6bSre5EMKuQ==
- dependencies:
- web3-core "1.6.1"
- web3-core-helpers "1.6.1"
- web3-core-method "1.6.1"
- web3-core-subscriptions "1.6.1"
- web3-eth-abi "1.6.1"
- web3-eth-accounts "1.6.1"
- web3-eth-contract "1.6.1"
- web3-eth-ens "1.6.1"
- web3-eth-iban "1.6.1"
- web3-eth-personal "1.6.1"
- web3-net "1.6.1"
- web3-utils "1.6.1"
-
-web3-net@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.6.1.tgz#7a630a804ec9f81908ae52ccbb4ebbb9530b3906"
- integrity sha512-gpnqKEIwfUHh5ik7wsQFlCje1DfcmGv+Sk7LCh1hCqn++HEDQxJ/mZCrMo11ZZpZHCH7c87imdxTg96GJnRxDw==
- dependencies:
- web3-core "1.6.1"
- web3-core-method "1.6.1"
- web3-utils "1.6.1"
-
web3-provider-engine@^16.0.3:
version "16.0.3"
resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-16.0.3.tgz#8ff93edf3a8da2f70d7f85c5116028c06a0d9f07"
@@ -16713,66 +15674,16 @@ web3-provider-engine@^16.0.3:
xhr "^2.2.0"
xtend "^4.0.1"
-web3-providers-http@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.6.1.tgz#b59b14eefef23b98c327806f5f566303a73bd435"
- integrity sha512-xBoKOJxu10+kO3ikamXmBfrWZ/xpQOGy0ocdp7Y81B17En5TXELwlmMXt1UlIgWiyYDhjq4OwlH/VODYqHXy3A==
- dependencies:
- web3-core-helpers "1.6.1"
- xhr2-cookies "1.1.0"
-
-web3-providers-ipc@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.6.1.tgz#7ba460589d46896bb3d124288deed1b6a72d517e"
- integrity sha512-anyoIZlpMzwEQI4lwylTzDrHsVp20v0QUtSTp2B5jInBinmQtyCE7vnbX20jEQ4j5uPwfJabKNtoJsk6a3O4WQ==
- dependencies:
- oboe "2.1.5"
- web3-core-helpers "1.6.1"
-
-web3-providers-ws@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.6.1.tgz#f7ee71f158971102b865e99ea7911f483e0507e9"
- integrity sha512-FWMEFYb4rYFYRgSFBf/O1Ex4p/YKSlN+JydCtdlJwRimd89qm95CTfs4xGjCskwvXMjV2sarH+f1NPwJXicYpg==
- dependencies:
- eventemitter3 "4.0.4"
- web3-core-helpers "1.6.1"
- websocket "^1.0.32"
-
-web3-shh@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.6.1.tgz#eebaab2e5e6be80fe2585c6c094fa10a03349ca7"
- integrity sha512-oP00HbAtybLCGlLOZUYXOdeB9xq88k2l0TtStvKBtmFqRt+zVk5TxEeuOnVPRxNhcA2Un8RUw6FtvgZlWStu9A==
+web3@^0.20.7:
+ version "0.20.7"
+ resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.7.tgz#1605e6d81399ed6f85a471a4f3da0c8be57df2f7"
+ integrity sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==
dependencies:
- web3-core "1.6.1"
- web3-core-method "1.6.1"
- web3-core-subscriptions "1.6.1"
- web3-net "1.6.1"
-
-web3-utils@1.6.1:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.6.1.tgz#befcb23922b00603ab56d8c5b4158468dc494aca"
- integrity sha512-RidGKv5kOkcerI6jQqDFDoTllQQqV+rPhTzZHhmbqtFObbYpU93uc+yG1LHivRTQhA6llIx67iudc/vzisgO+w==
- dependencies:
- bn.js "^4.11.9"
- ethereum-bloom-filters "^1.0.6"
- ethereumjs-util "^7.1.0"
- ethjs-unit "0.1.6"
- number-to-bn "1.7.0"
- randombytes "^2.1.0"
- utf8 "3.0.0"
-
-web3@1.6.1, web3@^0.20.7:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/web3/-/web3-1.6.1.tgz#c9e68fe7b3073adddf35393441f950ec69b92735"
- integrity sha512-c299lLiyb2/WOcxh7TinwvbATaMmrgNIeAzbLbmOKHI0LcwyfsB1eu2ReOIrfrCYDYRW2KAjYr7J7gHawqDNPQ==
- dependencies:
- web3-bzz "1.6.1"
- web3-core "1.6.1"
- web3-eth "1.6.1"
- web3-eth-personal "1.6.1"
- web3-net "1.6.1"
- web3-shh "1.6.1"
- web3-utils "1.6.1"
+ bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
+ crypto-js "^3.1.4"
+ utf8 "^2.1.1"
+ xhr2-cookies "^1.1.0"
+ xmlhttprequest "*"
webidl-conversions@^3.0.0:
version "3.0.1"
@@ -16789,18 +15700,6 @@ webidl-conversions@^6.1.0:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-websocket@^1.0.32:
- version "1.0.34"
- resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.34.tgz#2bdc2602c08bf2c82253b730655c0ef7dcab3111"
- integrity sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==
- dependencies:
- bufferutil "^4.0.1"
- debug "^2.2.0"
- es5-ext "^0.10.50"
- typedarray-to-buffer "^3.1.5"
- utf-8-validate "^5.0.2"
- yaeti "^0.0.6"
-
whatwg-encoding@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
@@ -17016,15 +15915,6 @@ ws@^1.1.0, ws@^1.1.5:
options ">=0.0.5"
ultron "1.0.x"
-ws@^3.0.0:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
- integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
- dependencies:
- async-limiter "~1.0.0"
- safe-buffer "~5.1.0"
- ultron "~1.1.0"
-
ws@^5.1.1:
version "5.2.3"
resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
@@ -17065,27 +15955,7 @@ xcode@^2.0.0:
simple-plist "^1.0.0"
uuid "^3.3.2"
-xhr-request-promise@^0.1.2:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/xhr-request-promise/-/xhr-request-promise-0.1.3.tgz#2d5f4b16d8c6c893be97f1a62b0ed4cf3ca5f96c"
- integrity sha512-YUBytBsuwgitWtdRzXDDkWAXzhdGB8bYm0sSzMPZT7Z2MBjMSTHFsyCT1yCRATY+XC69DUrQraRAEgcoCRaIPg==
- dependencies:
- xhr-request "^1.1.0"
-
-xhr-request@^1.0.1, xhr-request@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/xhr-request/-/xhr-request-1.1.0.tgz#f4a7c1868b9f198723444d82dcae317643f2e2ed"
- integrity sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==
- dependencies:
- buffer-to-arraybuffer "^0.0.5"
- object-assign "^4.1.1"
- query-string "^5.0.1"
- simple-get "^2.7.0"
- timed-out "^4.0.1"
- url-set-query "^1.0.0"
- xhr "^2.0.4"
-
-xhr2-cookies@1.1.0:
+xhr2-cookies@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz#7d77449d0999197f155cb73b23df72505ed89d48"
integrity sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=
@@ -17097,7 +15967,7 @@ xhr2@0.1.3:
resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.3.tgz#cbfc4759a69b4a888e78cf4f20b051038757bd11"
integrity sha1-y/xHWaabSoiOeM9PILBRA4dXvRE=
-xhr@^2.0.4, xhr@^2.2.0, xhr@^2.3.3:
+xhr@^2.2.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d"
integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==
@@ -17139,6 +16009,11 @@ xmldom@^0.6.0:
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
+xmlhttprequest@*:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
+ integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
+
xregexp@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
@@ -17179,17 +16054,12 @@ y18n@^3.2.0, y18n@^3.2.2, y18n@^4.0.0, y18n@^5.0.5:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
-yaeti@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
- integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=
-
yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
+yallist@^3.0.2:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
From 80302c4aa8fd64d0e80b188d4323fb9823230d6b Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <gantunes@uc.cl>
Date: Wed, 9 Mar 2022 14:52:07 -0300
Subject: [PATCH 5/8] [FIX] "Speed up" and "Cancel" buttons showing up in the
receiver side (#3790)
---
app/components/Views/Asset/index.js | 49 +++--
.../Views/TransactionsView/index.js | 52 ++---
app/constants/transaction.ts | 5 +
app/util/activity/index.test.ts | 185 ++++++++++++++++++
app/util/activity/index.ts | 70 +++++++
5 files changed, 308 insertions(+), 53 deletions(-)
create mode 100644 app/constants/transaction.ts
create mode 100644 app/util/activity/index.test.ts
create mode 100644 app/util/activity/index.ts
diff --git a/app/components/Views/Asset/index.js b/app/components/Views/Asset/index.js
index 0752c990ab62..1f77ac870fb9 100644
--- a/app/components/Views/Asset/index.js
+++ b/app/components/Views/Asset/index.js
@@ -4,11 +4,13 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { swapsUtils } from '@metamask/swaps-controller/';
+import { TX_UNAPPROVED, TX_SUBMITTED, TX_SIGNED, TX_PENDING, TX_CONFIRMED } from '../../../constants/transaction';
import { colors } from '../../../styles/common';
import AssetOverview from '../../UI/AssetOverview';
import Transactions from '../../UI/Transactions';
import { getNetworkNavbarOptions } from '../../UI/Navbar';
import Engine from '../../../core/Engine';
+import { sortTransactions } from '../../../util/activity';
import { safeToChecksumAddress } from '../../../util/address';
import { addAccountTimeFlagFilter } from '../../../util/transactions';
import { toLowerCaseEquals } from '../../../util/general';
@@ -190,13 +192,16 @@ class Asset extends PureComponent {
const { selectedAddress } = this.props;
const addedAccountTime = this.props.identities[selectedAddress]?.importTime;
this.isNormalizing = true;
+
let submittedTxs = [];
const newPendingTxs = [];
const confirmedTxs = [];
+ const submittedNonces = [];
+
const { chainId, transactions } = this.props;
if (transactions.length) {
- transactions.sort((a, b) => (a.time > b.time ? -1 : b.time > a.time ? 1 : 0));
- const txs = transactions.filter((tx) => {
+ const sortedTransactions = sortTransactions(transactions);
+ const filteredTransactions = sortedTransactions.filter((tx) => {
const filterResult = this.filter(tx);
if (filterResult) {
tx.insertImportTime = addAccountTimeFlagFilter(
@@ -206,15 +211,15 @@ class Asset extends PureComponent {
);
if (tx.insertImportTime) accountAddedTimeInsertPointFound = true;
switch (tx.status) {
- case 'submitted':
- case 'signed':
- case 'unapproved':
+ case TX_SUBMITTED:
+ case TX_SIGNED:
+ case TX_UNAPPROVED:
submittedTxs.push(tx);
return false;
- case 'pending':
+ case TX_PENDING:
newPendingTxs.push(tx);
break;
- case 'confirmed':
+ case TX_CONFIRMED:
confirmedTxs.push(tx);
break;
}
@@ -222,39 +227,43 @@ class Asset extends PureComponent {
return filterResult;
});
- const submittedNonces = [];
- submittedTxs = submittedTxs.filter((transaction) => {
- const alreadySubmitted = submittedNonces.includes(transaction.transaction.nonce);
+ submittedTxs = submittedTxs.filter(({ transaction: { from, nonce } }) => {
+ if (!toLowerCaseEquals(from, selectedAddress)) {
+ return false;
+ }
+ const alreadySubmitted = submittedNonces.includes(nonce);
const alreadyConfirmed = confirmedTxs.find(
- (tx) =>
- safeToChecksumAddress(tx.transaction.from) === selectedAddress &&
- tx.transaction.nonce === transaction.transaction.nonce
+ (confirmedTransaction) =>
+ toLowerCaseEquals(
+ safeToChecksumAddress(confirmedTransaction.transaction.from),
+ selectedAddress
+ ) && confirmedTransaction.transaction.nonce === nonce
);
if (alreadyConfirmed) {
return false;
}
- submittedNonces.push(transaction.transaction.nonce);
+ submittedNonces.push(nonce);
return !alreadySubmitted;
});
- //if the account added insertpoint is not found add it to the last transaction
- if (!accountAddedTimeInsertPointFound && txs && txs.length) {
- txs[txs.length - 1].insertImportTime = true;
+ // If the account added "Insert Point" is not found add it to the last transaction
+ if (!accountAddedTimeInsertPointFound && filteredTransactions && filteredTransactions.length) {
+ filteredTransactions[filteredTransactions.length - 1].insertImportTime = true;
}
// To avoid extra re-renders we want to set the new txs only when
// there's a new tx in the history or the status of one of the existing txs changed
if (
(this.txs.length === 0 && !this.state.transactionsUpdated) ||
- this.txs.length !== txs.length ||
+ this.txs.length !== filteredTransactions.length ||
this.chainId !== chainId ||
this.didTxStatusesChange(newPendingTxs)
) {
- this.txs = txs;
+ this.txs = filteredTransactions;
this.txsPending = newPendingTxs;
this.setState({
transactionsUpdated: true,
loading: false,
- transactions: txs,
+ transactions: filteredTransactions,
submittedTxs,
confirmedTxs,
});
diff --git a/app/components/Views/TransactionsView/index.js b/app/components/Views/TransactionsView/index.js
index 1af82e764731..8124c76f8f4f 100644
--- a/app/components/Views/TransactionsView/index.js
+++ b/app/components/Views/TransactionsView/index.js
@@ -6,6 +6,8 @@ import { withNavigation } from '@react-navigation/compat';
import Engine from '../../../core/Engine';
import { showAlert } from '../../../actions/alert';
import Transactions from '../../UI/Transactions';
+import { TX_UNAPPROVED, TX_SUBMITTED, TX_SIGNED, TX_PENDING, TX_CONFIRMED } from '../../../constants/transaction';
+import { sortTransactions, filterByAddressAndNetwork } from '../../../util/activity';
import { safeToChecksumAddress } from '../../../util/address';
import { addAccountTimeFlagFilter } from '../../../util/transactions';
import { toLowerCaseEquals } from '../../../util/general';
@@ -39,67 +41,51 @@ const TransactionsView = ({
let accountAddedTimeInsertPointFound = false;
const addedAccountTime = identities[selectedAddress]?.importTime;
- const ethFilter = (tx) => {
- const {
- transaction: { from, to },
- isTransfer,
- transferInformation,
- } = tx;
- if (
- (safeToChecksumAddress(from) === selectedAddress || safeToChecksumAddress(to) === selectedAddress) &&
- (chainId === tx.chainId || (!tx.chainId && network === tx.networkID)) &&
- tx.status !== 'unapproved'
- ) {
- if (isTransfer)
- return tokens.find(({ address }) =>
- toLowerCaseEquals(address, transferInformation.contractAddress)
- );
- return true;
- }
- return false;
- };
-
const submittedTxs = [];
const newPendingTxs = [];
const confirmedTxs = [];
+ const submittedNonces = [];
- const allTransactionsSorted = transactions.sort((a, b) => (a.time > b.time ? -1 : b.time > a.time ? 1 : 0));
+ const allTransactionsSorted = sortTransactions(transactions);
const allTransactions = allTransactionsSorted.filter((tx) => {
- const filter = ethFilter(tx);
+ const filter = filterByAddressAndNetwork(tx, tokens, selectedAddress, chainId, network);
if (!filter) return false;
tx.insertImportTime = addAccountTimeFlagFilter(tx, addedAccountTime, accountAddedTimeInsertPointFound);
if (tx.insertImportTime) accountAddedTimeInsertPointFound = true;
switch (tx.status) {
- case 'submitted':
- case 'signed':
- case 'unapproved':
+ case TX_SUBMITTED:
+ case TX_SIGNED:
+ case TX_UNAPPROVED:
submittedTxs.push(tx);
return false;
- case 'pending':
+ case TX_PENDING:
newPendingTxs.push(tx);
break;
- case 'confirmed':
+ case TX_CONFIRMED:
confirmedTxs.push(tx);
break;
}
return filter;
});
- const submittedNonces = [];
- const submittedTxsFiltered = submittedTxs.filter((transaction) => {
- const alreadySubmitted = submittedNonces.includes(transaction.transaction.nonce);
+ const submittedTxsFiltered = submittedTxs.filter(({ transaction }) => {
+ const { from, nonce } = transaction;
+ if (!toLowerCaseEquals(from, selectedAddress)) {
+ return false;
+ }
+ const alreadySubmitted = submittedNonces.includes(nonce);
const alreadyConfirmed = confirmedTxs.find(
(tx) =>
- safeToChecksumAddress(tx.transaction.from) === selectedAddress &&
- tx.transaction.nonce === transaction.transaction.nonce
+ toLowerCaseEquals(safeToChecksumAddress(tx.transaction.from), selectedAddress) &&
+ tx.transaction.nonce === nonce
);
if (alreadyConfirmed) {
return false;
}
- submittedNonces.push(transaction.transaction.nonce);
+ submittedNonces.push(nonce);
return !alreadySubmitted;
});
diff --git a/app/constants/transaction.ts b/app/constants/transaction.ts
new file mode 100644
index 000000000000..036e133a457e
--- /dev/null
+++ b/app/constants/transaction.ts
@@ -0,0 +1,5 @@
+export const TX_UNAPPROVED = 'unapproved';
+export const TX_SUBMITTED = 'submitted';
+export const TX_SIGNED = 'signed';
+export const TX_PENDING = 'pending';
+export const TX_CONFIRMED = 'confirmed';
diff --git a/app/util/activity/index.test.ts b/app/util/activity/index.test.ts
new file mode 100644
index 000000000000..687bc8ee3c1f
--- /dev/null
+++ b/app/util/activity/index.test.ts
@@ -0,0 +1,185 @@
+import { isFromOrToSelectedAddress, isFromCurrentChain, sortTransactions, filterByAddressAndNetwork } from '.';
+import { TX_SUBMITTED } from '../../constants/transaction';
+
+const TEST_ADDRESS_ONE = '0x5a3ca5cd63807ce5e4d7841ab32ce6b6d9bbba2d';
+const TEST_ADDRESS_TWO = '0x202637daaefbd7f131f90338a4a6c69f6cd5ce91';
+const TEST_ADDRESS_THREE = '0xA9d8520b9F2da2A35df109dAeDf047CD7E10309a';
+const UNISWAP_ADDRESS = '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984';
+const MAKER_ADDRESS = '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2';
+
+describe('Activity utils :: isFromOrToSelectedAddress', () => {
+ const tx = {
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ };
+ it('should return true if the transaction is from the selected address', () => {
+ const {
+ transaction: { from, to },
+ } = tx;
+ const selectedAddress = TEST_ADDRESS_ONE;
+ const result = isFromOrToSelectedAddress(from, to, selectedAddress);
+ expect(result).toEqual(true);
+ });
+ it('should return true if the transaction is to the selected address', () => {
+ const {
+ transaction: { from, to },
+ } = tx;
+ const selectedAddress = TEST_ADDRESS_TWO;
+ const result = isFromOrToSelectedAddress(from, to, selectedAddress);
+ expect(result).toEqual(true);
+ });
+ it('should return false if the transaction is not from nor to the selected address', () => {
+ const {
+ transaction: { from, to },
+ } = tx;
+ const selectedAddress = TEST_ADDRESS_THREE;
+ const result = isFromOrToSelectedAddress(from, to, selectedAddress);
+ expect(result).toEqual(false);
+ });
+ it('should return false if no address is provided', () => {
+ const {
+ transaction: { from, to },
+ } = tx;
+ const selectedAddress = '';
+ const result = isFromOrToSelectedAddress(from, to, selectedAddress);
+ expect(result).toEqual(false);
+ });
+});
+
+describe('Activity utils :: isFromCurrentChain', () => {
+ const txWithChainId = {
+ chainId: '4',
+ networkID: '4',
+ };
+ it('should return true if the chain ids matches', () => {
+ expect(isFromCurrentChain(txWithChainId, '4', '4')).toEqual(true);
+ });
+ it('should return true if the network ids matches and chain id is missing', () => {
+ const txWithoutChainId = {
+ networkID: '4',
+ };
+ expect(isFromCurrentChain(txWithoutChainId, '4', '4')).toEqual(true);
+ });
+ it('should return false if the chain ids do not match', () => {
+ expect(isFromCurrentChain(txWithChainId, '1', '1')).toEqual(false);
+ });
+ it('should return false if the network ids do not match and chain id is missing', () => {
+ const txWithoutChainId = {
+ networkID: '4',
+ };
+ expect(isFromCurrentChain(txWithoutChainId, '1', '1')).toEqual(false);
+ });
+});
+
+describe('Activity utils :: sortTransactions', () => {
+ it('should sort txs based on the timestamp', () => {
+ const unsortedTxs = [
+ { id: 'a3', time: 1645104692826 },
+ { id: 'a2', time: 1645322223255 },
+ { id: 'a1', time: 1645406937199 },
+ ];
+
+ const expectedSortedTxs = [
+ { id: 'a1', time: 1645406937199 },
+ { id: 'a2', time: 1645322223255 },
+ { id: 'a3', time: 1645104692826 },
+ ];
+
+ const sortedTxs = sortTransactions(unsortedTxs);
+ expect(sortedTxs).toEqual(expectedSortedTxs);
+ });
+});
+
+describe('Activity utils :: filterByAddressAndNetwork', () => {
+ it('should return true if the transaction meets the condition of address, network, and status', () => {
+ const chainId = '1';
+ const transaction = {
+ chainId,
+ status: TX_SUBMITTED,
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ isTransfer: false,
+ transferInformation: undefined,
+ };
+ const tokens: any[] = [];
+
+ const result = filterByAddressAndNetwork(transaction, tokens, TEST_ADDRESS_ONE, chainId, chainId);
+ expect(result).toEqual(true);
+ });
+ it('should return true if the transaction meets the condition of address, network, and status and its a transfer transaction from a token contract', () => {
+ const chainId = '1';
+ const transaction = {
+ chainId,
+ status: TX_SUBMITTED,
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ isTransfer: true,
+ transferInformation: {
+ contractAddress: TEST_ADDRESS_THREE,
+ },
+ };
+ const tokens = [{ address: TEST_ADDRESS_THREE }];
+
+ const result = filterByAddressAndNetwork(transaction, tokens, TEST_ADDRESS_ONE, chainId, chainId);
+ expect(result).toEqual(true);
+ });
+ it('should return false if the transaction does not meet the address condition', () => {
+ const chainId = '1';
+ const transaction = {
+ chainId,
+ status: TX_SUBMITTED,
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ isTransfer: false,
+ transferInformation: undefined,
+ };
+ const tokens = [{ address: TEST_ADDRESS_THREE }];
+
+ const result = filterByAddressAndNetwork(transaction, tokens, TEST_ADDRESS_THREE, chainId, chainId);
+ expect(result).toEqual(false);
+ });
+ it('should return false if the transaction does not meet the chain condition', () => {
+ const chainId = '1';
+ const transaction = {
+ chainId: '4',
+ status: TX_SUBMITTED,
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ isTransfer: false,
+ transferInformation: undefined,
+ };
+ const tokens = [{ address: TEST_ADDRESS_THREE }];
+
+ const result = filterByAddressAndNetwork(transaction, tokens, TEST_ADDRESS_ONE, chainId, chainId);
+ expect(result).toEqual(false);
+ });
+ it('should return false if the transaction does not meet the token condition', () => {
+ const chainId = '1';
+ const transaction = {
+ chainId: '4',
+ status: TX_SUBMITTED,
+ transaction: {
+ from: TEST_ADDRESS_ONE,
+ to: TEST_ADDRESS_TWO,
+ },
+ isTransfer: false,
+ transferInformation: {
+ contractAddress: MAKER_ADDRESS,
+ },
+ };
+ const tokens = [{ address: UNISWAP_ADDRESS }];
+
+ const result = filterByAddressAndNetwork(transaction, tokens, TEST_ADDRESS_ONE, chainId, chainId);
+ expect(result).toEqual(false);
+ });
+});
diff --git a/app/util/activity/index.ts b/app/util/activity/index.ts
new file mode 100644
index 000000000000..21784e3444f2
--- /dev/null
+++ b/app/util/activity/index.ts
@@ -0,0 +1,70 @@
+import { safeToChecksumAddress } from '../../util/address';
+import { toLowerCaseEquals } from '../../util/general';
+import { TX_UNAPPROVED } from '../../constants/transaction';
+
+/**
+ * Determines if the transaction is from or to the current wallet
+ * @param from Transaction sender address
+ * @param to Transaction receiver address
+ * @param selectedAddress Current wallet address
+ * @returns Boolean indicating if the current address is the sender or receiver
+ */
+export const isFromOrToSelectedAddress = (from: string, to: string, selectedAddress: string): boolean =>
+ toLowerCaseEquals(safeToChecksumAddress(from), selectedAddress) ||
+ toLowerCaseEquals(safeToChecksumAddress(to), selectedAddress);
+
+/**
+ * Determines if a transaction was executed in the current chain/network
+ * @param tx - Transaction to evaluate
+ * @param networkId - Current network id
+ * @param chainId - Current chain id
+ * @returns Boolean indicating if the transaction was executed in current chain
+ */
+export const isFromCurrentChain = (tx: any, networkId: string, chainId: string): boolean =>
+ chainId === tx.chainId || (!tx.chainId && networkId === tx.networkID);
+
+/**
+ * Sorts an array of transaction based on the timestamp
+ * @param transactions Array of transactions
+ * @returns Sorted array
+ */
+export const sortTransactions = (transactions: any[]): any[] =>
+ transactions.sort((a, b) => (a.time > b.time ? -1 : b.time > a.time ? 1 : 0));
+
+/**
+ * Filter based on the following conditions:
+ * 1. The transaction is from/to the current address
+ * 2. The transaction was executed in the current chain
+ * 3. The status of the transaction is different to 'unapproved'
+ * 4. If the transaction is a token transfer, the user must have that token in the wallet
+ * @param tx - Transaction to evaluate
+ * @param tokens - Arrays of tokens
+ * @param selectedAddress - Current wallet address
+ * @param networkId - Current network ID
+ * @param chainId - Current chain ID
+ * @returns A boolean indicating if the transaction meets the conditions
+ */
+export const filterByAddressAndNetwork = (
+ tx: any,
+ tokens: any[],
+ selectedAddress: string,
+ networkId: string,
+ chainId: string
+): boolean => {
+ const {
+ transaction: { from, to },
+ isTransfer,
+ transferInformation,
+ } = tx;
+
+ if (
+ isFromOrToSelectedAddress(from, to, selectedAddress) &&
+ isFromCurrentChain(tx, networkId, chainId) &&
+ tx.status !== TX_UNAPPROVED
+ ) {
+ return isTransfer
+ ? !!tokens.find(({ address }) => toLowerCaseEquals(address, transferInformation.contractAddress))
+ : true;
+ }
+ return false;
+};
From 3507c90569e35dee5bb9dd8f6c207634c4176cbd Mon Sep 17 00:00:00 2001
From: Andre Pimenta <andrepimenta7@gmail.com>
Date: Wed, 9 Mar 2022 18:16:05 +0000
Subject: [PATCH 6/8] Clear browser tabs when cleaning history (#3851)
* Clear browser tabs when cleaning history
* Limit history to just 50
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
---
app/actions/browser/index.js | 1 +
app/reducers/browser/index.js | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/actions/browser/index.js b/app/actions/browser/index.js
index 7cf6f908e605..a58f9edff33a 100644
--- a/app/actions/browser/index.js
+++ b/app/actions/browser/index.js
@@ -19,6 +19,7 @@ export function addToHistory({ url, name }) {
export function clearHistory() {
return {
type: 'CLEAR_BROWSER_HISTORY',
+ id: Date.now(),
};
}
diff --git a/app/reducers/browser/index.js b/app/reducers/browser/index.js
index 456f9d6b77e2..6dfcd84b5606 100644
--- a/app/reducers/browser/index.js
+++ b/app/reducers/browser/index.js
@@ -1,3 +1,5 @@
+import AppConstants from '../../core/AppConstants';
+
const initialState = {
history: [],
whitelist: [],
@@ -9,7 +11,7 @@ const browserReducer = (state = initialState, action) => {
case 'ADD_TO_BROWSER_HISTORY':
return {
...state,
- history: [...state.history, { url: action.url, name: action.name }],
+ history: [...state.history, { url: action.url, name: action.name }].slice(0, 50),
};
case 'ADD_TO_BROWSER_WHITELIST':
return {
@@ -20,6 +22,8 @@ const browserReducer = (state = initialState, action) => {
return {
...state,
history: [],
+ tabs: [{ url: AppConstants.HOMEPAGE_URL, id: action.id }],
+ activeTab: action.id,
};
case 'CLOSE_ALL_TABS':
return {
From 0da30b0ba265d89b23b1088cc3e5b1f57db2c877 Mon Sep 17 00:00:00 2001
From: ricky <ricky.miller@gmail.com>
Date: Wed, 9 Mar 2022 14:39:38 -0500
Subject: [PATCH 7/8] add metamaskbot to crowdin_action config (#3862)
---
.github/workflows/crowdin_action.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/crowdin_action.yml b/.github/workflows/crowdin_action.yml
index d7ded6ac3720..f1d33387c184 100644
--- a/.github/workflows/crowdin_action.yml
+++ b/.github/workflows/crowdin_action.yml
@@ -25,7 +25,10 @@ jobs:
with:
upload_translations: true
download_translations: true
+ github_user_name: metamaskbot
+ github_user_email: metamaskbot@users.noreply.github.com
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GITHUB_ACTOR: metamaskbot
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
From 2fc4a3dc20285d425fa84c2beae08dbc3fd42cb7 Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <gantunes@uc.cl>
Date: Wed, 9 Mar 2022 16:48:49 -0300
Subject: [PATCH 8/8] [FIX] Issue #172 (#3863)
---
.../UI/ApproveTransactionReview/index.js | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
index 65451aa31206..dbb6b6619601 100644
--- a/app/components/UI/ApproveTransactionReview/index.js
+++ b/app/components/UI/ApproveTransactionReview/index.js
@@ -245,6 +245,10 @@ class ApproveTransactionReview extends PureComponent {
* Whether the transaction was confirmed or not
*/
transactionConfirmed: PropTypes.bool,
+ /**
+ * Dispatch set transaction object from transaction action
+ */
+ setTransactionObject: PropTypes.func,
};
state = {
@@ -434,6 +438,7 @@ class ApproveTransactionReview extends PureComponent {
} = this.state;
try {
+ const { setTransactionObject } = this.props;
const uint = toTokenMinimalUnit(
spendLimitUnlimitedSelected ? originalApproveAmount : spendLimitCustomValue,
token.decimals
@@ -443,7 +448,15 @@ class ApproveTransactionReview extends PureComponent {
spender: spenderAddress,
value: Number(uint).toString(16),
});
- const newApprovalTransaction = { ...transaction, data: approvalData };
+ const newApprovalTransaction = {
+ ...transaction,
+ data: approvalData,
+ transaction: {
+ ...transaction.transaction,
+ data: approvalData,
+ },
+ };
+
setTransactionObject(newApprovalTransaction);
} catch (err) {
Logger.log('Failed to setTransactionObject', err);
@@ -662,8 +675,10 @@ class ApproveTransactionReview extends PureComponent {
originalApproveAmount,
spendLimitUnlimitedSelected,
spendLimitCustomValue,
- transaction: { to, data },
} = this.state;
+ const {
+ transaction: { to, data },
+ } = this.props;
const allowance = (!spendLimitUnlimitedSelected && spendLimitCustomValue) || originalApproveAmount;
return (
<TransactionReviewDetailsCard