From 4e10b4b9097ffd320085e4ad4025973dbf8513a0 Mon Sep 17 00:00:00 2001 From: tomasz-rozmus Date: Thu, 9 Jun 2022 14:56:41 +0200 Subject: [PATCH 01/11] fix: number formatting fixes --- .../formatting/NumberFormatText.tsx | 41 +++++++++-- .../typography/TypographyHelpers.tsx | 4 +- src/constants/environmentVariables.ts | 5 -- .../gateway/components/GatewayFees.tsx | 3 + src/features/gateway/renJSHooks.ts | 1 + .../gateway/steps/GatewayFeesStep.tsx | 2 +- src/utils/assetsConfig.ts | 73 ++++++++----------- 7 files changed, 73 insertions(+), 56 deletions(-) diff --git a/src/components/formatting/NumberFormatText.tsx b/src/components/formatting/NumberFormatText.tsx index 8cd43504..a002dd48 100644 --- a/src/components/formatting/NumberFormatText.tsx +++ b/src/components/formatting/NumberFormatText.tsx @@ -1,22 +1,47 @@ +import { makeStyles } from "@material-ui/core/styles"; import React, { FunctionComponent } from "react"; import NumberFormat, { NumberFormatProps } from "react-number-format"; import { numberFormatOptions } from "../../utils/formatters"; +const useNumberFormatStyles = makeStyles({ + root: { + display: "flex", + }, + rootInline: { + display: "inline-flex", + }, + value: { + overflow: "hidden", + textOverflow: "ellipsis", + flexShrink: 1, + }, + // suffix: {} +}); + type NumberFormatTextProps = NumberFormatProps & { + inline?: boolean; spacedSuffix?: string; }; + export const NumberFormatText: FunctionComponent = ({ + inline, spacedSuffix, - suffix, + value, ...props }) => { - const resolvedSuffix = spacedSuffix ? ` ${spacedSuffix}` : suffix; + const styles = useNumberFormatStyles(); + // const resolvedSuffix = spacedSuffix ? ` ${spacedSuffix}` : suffix; return ( - + + + {Boolean(spacedSuffix) &&  {spacedSuffix}} + ); }; diff --git a/src/components/typography/TypographyHelpers.tsx b/src/components/typography/TypographyHelpers.tsx index fbdde0f5..3e05f19e 100644 --- a/src/components/typography/TypographyHelpers.tsx +++ b/src/components/typography/TypographyHelpers.tsx @@ -60,15 +60,17 @@ const useLabelWithValueStyles = makeStyles< verticalAlign: "middle", }, valueWrapper: { - flexGrow: 1, + display: "flex", overflow: "hidden", textAlign: "right", color: (props) => getElementColor(props, black, grey), }, value: { whiteSpace: "nowrap", + overflow: "hidden", }, valueEquivalent: { + whiteSpace: "nowrap", marginLeft: 4, color: (props) => getElementColor(props, grey), }, diff --git a/src/constants/environmentVariables.ts b/src/constants/environmentVariables.ts index a78a9976..2f512b00 100644 --- a/src/constants/environmentVariables.ts +++ b/src/constants/environmentVariables.ts @@ -20,15 +20,10 @@ const BSC_MM_ENABLED = Boolean(process.env.REACT_APP_BSC_MM_ENABLED); const ENABLED_EXTRA_WALLETS = process.env.REACT_APP_ENABLED_EXTRA_WALLETS?.split(",") || ["*"]; -const ENABLED_ASSETS = process.env.REACT_APP_ENABLED_ASSETS?.split(",") || [ - "*", -]; - export const env = { DEV, NETWORK, INFURA_ID, - ENABLED_ASSETS, ENABLED_EXTRA_WALLETS, BSC_MM_ENABLED, MEWCONNECT_ENABLED, diff --git a/src/features/gateway/components/GatewayFees.tsx b/src/features/gateway/components/GatewayFees.tsx index b06fb7a4..13f430a8 100644 --- a/src/features/gateway/components/GatewayFees.tsx +++ b/src/features/gateway/components/GatewayFees.tsx @@ -88,6 +88,7 @@ export const GatewayFees: FunctionComponent = ({ valueEquivalent={ renVMFeeAmountUsd !== null ? ( = ({ valueEquivalent={ fromChainFeeAmountUsd !== null ? ( = ({ valueEquivalent={ toChainFeeAmountUsd !== null ? ( { lockAndMint: {}, }; for (let selector of whitelist) { + console.log(selector); const { asset, from, to, ioType } = decomposeSelector(selector); if (!supportedAssets.includes(asset) || ioType === null) { continue; diff --git a/src/features/gateway/steps/GatewayFeesStep.tsx b/src/features/gateway/steps/GatewayFeesStep.tsx index dbebf45b..a14c6712 100644 --- a/src/features/gateway/steps/GatewayFeesStep.tsx +++ b/src/features/gateway/steps/GatewayFeesStep.tsx @@ -231,7 +231,7 @@ export const GatewayFeesStep: FunctionComponent = ({ ) : ( diff --git a/src/utils/assetsConfig.ts b/src/utils/assetsConfig.ts index 41d619be..d64ac8b7 100644 --- a/src/utils/assetsConfig.ts +++ b/src/utils/assetsConfig.ts @@ -67,7 +67,7 @@ import { EmptyCircleIcon, } from "../components/icons/RenIcons"; -import { env } from "../constants/environmentVariables"; +// import { env } from "../constants/environmentVariables"; import { getAssetChainsConfig } from "./chainsConfig"; export type AssetIconsConfig = { @@ -426,45 +426,36 @@ export const getUIAsset = (asset: Asset, chain: Chain) => { return { shortName, fullName, Icon }; }; -export const supportedAssets = - env.ENABLED_ASSETS[0] === "*" - ? [ - Asset.BTC, - Asset.BCH, - Asset.DGB, - Asset.DOGE, - Asset.FIL, - Asset.LUNA, - Asset.ZEC, - Asset.ETH, - Asset.BNB, - Asset.AVAX, - Asset.FTM, - Asset.ArbETH, - Asset.MATIC, - // Asset.SOL, // not sure about that - Asset.REN, - Asset.DAI, - Asset.USDC, - Asset.USDT, - Asset.EURT, - Asset.BUSD, - Asset.MIM, - Asset.CRV, - Asset.LINK, - Asset.UNI, - Asset.SUSHI, - Asset.FTT, - Asset.ROOK, - Asset.BADGER, - Asset.KNC, - ] - : env.ENABLED_ASSETS.filter((x) => { - const included = Object.keys(assetsConfig).includes(x); - if (!included) { - console.error("Unknown asset:", x); - } - return included; - }).map((x) => x as Asset); +export const supportedAssets = [ + Asset.BTC, + Asset.BCH, + Asset.DGB, + Asset.DOGE, + Asset.FIL, + Asset.LUNA, + Asset.ZEC, + Asset.ETH, + Asset.BNB, + Asset.AVAX, + Asset.FTM, + Asset.ArbETH, + Asset.MATIC, + // Asset.SOL, // not sure about that + Asset.REN, + Asset.DAI, + Asset.USDC, + Asset.USDT, + Asset.EURT, + Asset.BUSD, + Asset.MIM, + Asset.CRV, + Asset.LINK, + Asset.UNI, + Asset.SUSHI, + Asset.FTT, + Asset.ROOK, + Asset.BADGER, + Asset.KNC, +]; console.log("supportedAssets", supportedAssets); From da9076a8d56283cb10bce184f5b534d0a9b96017 Mon Sep 17 00:00:00 2001 From: tomasz-rozmus Date: Fri, 10 Jun 2022 13:35:38 +0200 Subject: [PATCH 02/11] fix: Badger icon --- src/utils/assetsConfig.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/assetsConfig.ts b/src/utils/assetsConfig.ts index d64ac8b7..e093321e 100644 --- a/src/utils/assetsConfig.ts +++ b/src/utils/assetsConfig.ts @@ -1,8 +1,8 @@ -import { Badge } from "@material-ui/core"; import { Asset, Chain } from "@renproject/chains"; import { assetsColors, Avax, + Badger, Bch, Bnb, Btc, @@ -118,7 +118,7 @@ const assetsBaseConfig: Record = { rateSymbol: "weth", // simple hack for duplicated ethereum entry }, BADGER: { - Icon: nativeTokenIcon(Badge), + Icon: nativeTokenIcon(Badger), RenIcon: wrappedTokenIcon(RenBadger), shortName: "BADGER", fullName: "Badger DAO", From e24bde5f8784635c942a857b3a968ed04df774d9 Mon Sep 17 00:00:00 2001 From: tomasz-rozmus Date: Fri, 10 Jun 2022 16:12:47 +0200 Subject: [PATCH 03/11] fix: overwriting BigNumber.js --- src/features/gateway/renJSHooks.ts | 2 +- src/index.tsx | 3 +++ src/utils/assetsConfig.ts | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/features/gateway/renJSHooks.ts b/src/features/gateway/renJSHooks.ts index 4959704b..25474a9f 100644 --- a/src/features/gateway/renJSHooks.ts +++ b/src/features/gateway/renJSHooks.ts @@ -85,7 +85,7 @@ export const useWhitelist = () => { lockAndMint: {}, }; for (let selector of whitelist) { - console.log(selector); + // console.log(selector); const { asset, from, to, ioType } = decomposeSelector(selector); if (!supportedAssets.includes(asset) || ioType === null) { continue; diff --git a/src/index.tsx b/src/index.tsx index 44bfad39..28dc4de6 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -11,6 +11,9 @@ import store from "./store/store"; import { lightTheme } from "./theme/theme"; import "./i18n/i18n"; import * as Sentry from "@sentry/react"; +// overwrite default BigNumber toString() digits policy +import BigNumber from "bignumber.js"; +BigNumber.set({ EXPONENTIAL_AT: 30 }); // clean history state after page reaload window.history.replaceState({}, document.title); diff --git a/src/utils/assetsConfig.ts b/src/utils/assetsConfig.ts index e093321e..b3ad67fd 100644 --- a/src/utils/assetsConfig.ts +++ b/src/utils/assetsConfig.ts @@ -66,8 +66,6 @@ import { CustomSvgIconComponent, EmptyCircleIcon, } from "../components/icons/RenIcons"; - -// import { env } from "../constants/environmentVariables"; import { getAssetChainsConfig } from "./chainsConfig"; export type AssetIconsConfig = { From f04da8f3f0b213da35474e427ff34c7c5c821c25 Mon Sep 17 00:00:00 2001 From: tomasz-rozmus Date: Wed, 22 Jun 2022 16:43:38 +0200 Subject: [PATCH 04/11] feat: custom recipient account for h2h --- .../formatting/NumberFormatText.tsx | 6 +- .../gateway/components/GatewayFees.tsx | 6 +- .../gateway/steps/GatewayFeesStep.tsx | 6 +- .../steps/shared/WalletSwitchHelpers.tsx | 144 +++++++++++------- src/services/wallets/bsc.ts | 31 ---- 5 files changed, 99 insertions(+), 94 deletions(-) delete mode 100644 src/services/wallets/bsc.ts diff --git a/src/components/formatting/NumberFormatText.tsx b/src/components/formatting/NumberFormatText.tsx index a002dd48..5eae3370 100644 --- a/src/components/formatting/NumberFormatText.tsx +++ b/src/components/formatting/NumberFormatText.tsx @@ -19,12 +19,12 @@ const useNumberFormatStyles = makeStyles({ }); type NumberFormatTextProps = NumberFormatProps & { - inline?: boolean; + flex?: boolean; spacedSuffix?: string; }; export const NumberFormatText: FunctionComponent = ({ - inline, + flex, spacedSuffix, value, ...props @@ -32,7 +32,7 @@ export const NumberFormatText: FunctionComponent = ({ const styles = useNumberFormatStyles(); // const resolvedSuffix = spacedSuffix ? ` ${spacedSuffix}` : suffix; return ( - + = ({ value={ renVMFeeAmount ? ( = ({ valueEquivalent={ renVMFeeAmountUsd !== null ? ( = ({ value={ fromChainFeeAmount !== null && fromChainFeeAsset !== null ? ( @@ -119,7 +120,6 @@ export const GatewayFees: FunctionComponent = ({ valueEquivalent={ fromChainFeeAmountUsd !== null ? ( = ({ value={ toChainFeeAmount !== null && toChainFeeAsset !== null ? ( @@ -150,7 +151,6 @@ export const GatewayFees: FunctionComponent = ({ valueEquivalent={ toChainFeeAmountUsd !== null ? ( = ({ @@ -190,7 +191,10 @@ export const GatewayFeesStep: FunctionComponent = ({ <> {Header} - Please connect a wallet to proceed + + Please connect a wallet to proceed + + ); diff --git a/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx b/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx index b489f81b..18ccf8d9 100644 --- a/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx +++ b/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx @@ -30,6 +30,7 @@ import { DeleteIcon, WalletIcon, } from "../../../../components/icons/RenIcons"; +import { OutlinedTextField } from "../../../../components/inputs/OutlinedTextField"; import { BigTopWrapper } from "../../../../components/layout/LayoutHelpers"; import { PaperContent, @@ -54,7 +55,10 @@ import { useWallet } from "../../../wallet/walletHooks"; import { setChain, setPickerOpened } from "../../../wallet/walletSlice"; import { FeesToggler } from "../../components/FeeHelpers"; import { GatewayFees } from "../../components/GatewayFees"; -import { useGatewayFeesWithoutGateway } from "../../gatewayHooks"; +import { + useAddressValidator, + useGatewayFeesWithoutGateway, +} from "../../gatewayHooks"; import { GatewayPaperHeader } from "./GatewayNavigationHelpers"; type WalletConnectionActionButtonGuardProps = { @@ -305,6 +309,14 @@ export const SendingReceivingWrapper: FunctionComponent< ); }; +type ManualAddressInputProps = {}; + +export const ManualAddressInput: FunctionComponent< + ManualAddressInputProps +> = () => { + return null; +}; + export const H2HAccountsResolver: FunctionComponent< H2HAccountsResolverProps > = ({ transactionType, from, to, disabled, onResolved }) => { @@ -348,6 +360,11 @@ export const H2HAccountsResolver: FunctionComponent< const [differentAccounts, setDifferentAccounts] = useState( isCrossContractBaseChain ); + const [customAccountMode, setCustomAccountMode] = useState(false); + const handleCustomAccountModeChange = useCallback((event) => { + setCustomAccountMode(event.target.checked); + }, []); + // const [customAccount, setCustomAccount] = useState(""); const handleAccountsModeChange = useCallback((event) => { setDifferentAccounts(event.target.checked); @@ -377,6 +394,15 @@ export const H2HAccountsResolver: FunctionComponent< const [cachedFromAccount, setCachedFromAccount] = useState(fromAccount); const [cachedToAccount, setCachedToAccount] = useState(toAccount); + const handleCustomAccountChange = useCallback((event) => { + setCachedToAccount(event.target.value); + // setCustomAccount(event.target.value); + }, []); + const { validateAddress } = useAddressValidator(to); + const isAddressValid = validateAddress(cachedToAccount); + const hasAddressError = !isAddressValid; + const showAddressError = Boolean(cachedToAccount) && hasAddressError; + useEffect(() => { setCachedFromAccount(fromAccount); }, [fromAccount]); @@ -384,7 +410,7 @@ export const H2HAccountsResolver: FunctionComponent< useEffect(() => { const newToAccount = differentAccounts ? toAccount : fromAccount; setCachedToAccount(newToAccount); - }, [toAccount, fromAccount, differentAccounts]); + }, [toAccount, fromAccount, differentAccounts, customAccountMode]); const [toPickerOpened, setToPickerOpened] = useState(false); const handleToPickerOpened = useCallback(() => { @@ -409,23 +435,6 @@ export const H2HAccountsResolver: FunctionComponent< <> - {/* - - - - - - - - - Choose accounts used for this transaction. - - */} - {/* - */} + /> {cachedFromAccount ? ( <> {trimAddress(cachedFromAccount, 5)} - - {differentAccounts && cachedToAccount && ( - - - - )} - {trimAddress(cachedToAccount, 5)} - {differentAccounts && !cachedToAccount && ( - + {differentAccounts && cachedToAccount && ( + + + + )} + {trimAddress(cachedToAccount, 5)} + {differentAccounts && !cachedToAccount && ( + + Choose account + + )} + + )} + {customAccountMode && ( + + )} + {differentAccounts && ( + <> + - Choose account - - )} - + + } + label={ + + I will enter recipient address manually + + } + /> + + + )} {showDifferentAccountSwitcher && ( )} - {cachedFromAccount ? "Accept Accounts" : "Connect a Wallet"} diff --git a/src/services/wallets/bsc.ts b/src/services/wallets/bsc.ts deleted file mode 100644 index b7649e15..00000000 --- a/src/services/wallets/bsc.ts +++ /dev/null @@ -1,31 +0,0 @@ -const connectBinanceChain = () => { - if (getBinanceChain() !== "undefined") { - getBinanceChain().enable().catch(console.error); - } -}; - -const getBinanceChain = () => { - return (window as any).BinanceChain; -}; - -export const signWithBinanceChain: (msg: string) => Promise = ( - msg: string -) => - new Promise((resolve, reject) => { - if (!getBinanceChain()) { - reject("no binance chain"); - } - getBinanceChain() - .request({ method: "eth_requestAccounts" }) - .then((addresses: Array) => { - const from = addresses[0]; - if (!from) return connectBinanceChain(); - getBinanceChain() - .request({ - method: "eth_sign", - params: [from, msg], - }) - .then(resolve) - .catch(reject); - }); - }); From a6f806c05ea0aec9c65b2e4ff9aff98a9ab4bf8c Mon Sep 17 00:00:00 2001 From: noiach Date: Mon, 27 Jun 2022 20:45:16 +1000 Subject: [PATCH 05/11] feat: update RenJS from 3.1.0 to 3.2.0 --- package.json | 13 +- src/features/chain/chainUtils.ts | 6 +- .../gateway/gatewayTransactionHooks.ts | 12 +- src/features/gateway/gatewayUtils.ts | 2 +- .../gateway/steps/flows/MintStandard.tsx | 12 +- .../components/TransactionMenu.tsx | 20 +- src/utils/chainsConfig.ts | 2 +- yarn.lock | 893 ++++++++---------- 8 files changed, 451 insertions(+), 509 deletions(-) diff --git a/package.json b/package.json index b4e6d601..41d81e00 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "@material-ui/lab": "^4.0.0-alpha.57", "@netlify/functions": "^1.0.0", "@reduxjs/toolkit": "^1.4.0", - "@renproject/chains": "3.1.0", - "@renproject/chains-bitcoin": "3.1.0", - "@renproject/chains-ethereum": "3.1.0", - "@renproject/chains-solana": "3.1.0", + "@renproject/chains": "3.2.0", + "@renproject/chains-bitcoin": "3.2.0", + "@renproject/chains-ethereum": "3.2.0", + "@renproject/chains-solana": "3.2.0", "@renproject/fonts": "^2.0.0-alpha.2", "@renproject/icons": "^0.0.1-alpha.9", "@renproject/interfaces": "2.5.9", @@ -24,8 +24,8 @@ "@renproject/multiwallet-ethereum-walletconnect-connector": "2.5.9", "@renproject/multiwallet-solana-connector": "2.5.9", "@renproject/multiwallet-ui": "2.5.10-alpha.0", - "@renproject/ren": "3.1.0", - "@renproject/utils": "3.1.0", + "@renproject/ren": "3.2.0", + "@renproject/utils": "3.2.0", "@sentry/react": "^6.5.1", "@slack/web-api": "^6.7.1", "@solana/web3.js": "^1.36.0", @@ -113,6 +113,7 @@ "@babel/helper-call-delegate": "^7.12.1", "@babel/plugin-transform-modules-commonjs": "^7.13.0", "@babel/preset-env": "^7.15.8", + "cross-env": "^7.0.3", "netlify-cli": "^10", "prettier": "^2.5.1", "react-app-rewired": "^2.2.1" diff --git a/src/features/chain/chainUtils.ts b/src/features/chain/chainUtils.ts index 56240e20..b9dc2754 100644 --- a/src/features/chain/chainUtils.ts +++ b/src/features/chain/chainUtils.ts @@ -14,7 +14,7 @@ import { BinanceSmartChain, Ethereum, EthProvider, - EvmNetworkConfig, + EVMNetworkConfig, Fantom, Polygon, } from "@renproject/chains-ethereum"; @@ -48,7 +48,7 @@ export type PartialChainInstanceMap = Partial; interface EVMConstructor { configMap: { - [network in RenNetwork]?: EvmNetworkConfig; + [network in RenNetwork]?: EVMNetworkConfig; }; new ({ @@ -152,7 +152,7 @@ const getBitcoinBaseChain = (ChainClass: BTC) => { }; }; -const getDepositBaseChain = (ChainClass: DBC) => { +const getDepositBaseChain = >(ChainClass: DBC) => { return { chain: ChainClass, }; diff --git a/src/features/gateway/gatewayTransactionHooks.ts b/src/features/gateway/gatewayTransactionHooks.ts index 55fac963..d7d84560 100644 --- a/src/features/gateway/gatewayTransactionHooks.ts +++ b/src/features/gateway/gatewayTransactionHooks.ts @@ -42,7 +42,7 @@ export const useRenVMChainTransactionStatusUpdater = ({ const [status, setStatus] = useState(null); const [target, setTarget] = useState(null); const [txId, setTxId] = useState(null); - const [txIdFormatted, setTxIdFormatted] = useState(null); + const [txHash, setTxHash] = useState(null); const [txIndex, setTxIndex] = useState(null); const [amount, setAmount] = useState(null); @@ -60,7 +60,7 @@ export const useRenVMChainTransactionStatusUpdater = ({ if (isDefined(progress.transaction)) { setTxId(progress.transaction.txid); - setTxIdFormatted(progress.transaction.txidFormatted); + setTxHash(progress.transaction.txHash); setTxIndex(progress.transaction.txindex); if (isDefined((progress.transaction as InputChainTransaction).amount)) { setAmount((progress.transaction as InputChainTransaction).amount); @@ -101,7 +101,7 @@ export const useRenVMChainTransactionStatusUpdater = ({ status, target, txId, - txIdFormatted, + txHash, txIndex, amount, }; @@ -127,7 +127,7 @@ export const useChainTransactionStatusUpdater = ({ const [target, setTarget] = useState(null); const [status, setStatus] = useState(null); const [txId, setTxId] = useState(null); - const [txIdFormatted, setTxIdFormatted] = useState(null); + const [txHash, setTxHash] = useState(null); const [txIndex, setTxIndex] = useState(null); const [amount, setAmount] = useState(null); const [txUrl, setTxUrl] = useState(null); @@ -148,7 +148,7 @@ export const useChainTransactionStatusUpdater = ({ } if (isDefined(progress.transaction)) { setTxId(progress.transaction.txid); - setTxIdFormatted(progress.transaction.txidFormatted); + setTxHash(progress.transaction.txHash); setTxIndex(progress.transaction.txindex); if (isDefined((progress.transaction as InputChainTransaction).amount)) { setAmount((progress.transaction as InputChainTransaction).amount); @@ -193,7 +193,7 @@ export const useChainTransactionStatusUpdater = ({ target, confirmations, txId, - txIdFormatted, + txHash, txIndex, txUrl, amount, diff --git a/src/features/gateway/gatewayUtils.ts b/src/features/gateway/gatewayUtils.ts index 17d6ce88..2c0e696a 100644 --- a/src/features/gateway/gatewayUtils.ts +++ b/src/features/gateway/gatewayUtils.ts @@ -21,7 +21,7 @@ export type PartialChainTransaction = Partial & txid: string; } | { - txidFormatted: string; + txHash: string; } ); diff --git a/src/features/gateway/steps/flows/MintStandard.tsx b/src/features/gateway/steps/flows/MintStandard.tsx index 402d2bf9..01a2e941 100644 --- a/src/features/gateway/steps/flows/MintStandard.tsx +++ b/src/features/gateway/steps/flows/MintStandard.tsx @@ -286,7 +286,7 @@ export const GatewayDepositProcessor: FunctionComponent< confirmations: lockConfirmations, target: lockTargetConfirmations, // txId: lockTxId, - txIdFormatted: lockTxIdFormatted, + txHash: lockTxHash, // txIndex: lockTxIndex, txUrl: lockTxUrl, amount: lockAmount, @@ -363,7 +363,7 @@ export const GatewayDepositProcessor: FunctionComponent< confirmations: mintConfirmations, target: mintTargetConfirmations, // txId: mintTxId, - txIdFormatted: mintTxIdFormatted, + txHash: mintTxHash, // txIndex: mintTxIndex, txUrl: mintTxUrl, } = outTxMeta; @@ -411,7 +411,7 @@ export const GatewayDepositProcessor: FunctionComponent< lockStatus={lockStatus} lockAssetDecimals={lockAssetDecimals} lockAmount={lockAmount} - lockTxId={lockTxIdFormatted} + lockTxId={lockTxHash} lockTxUrl={lockTxUrl} /> ); @@ -435,7 +435,7 @@ export const GatewayDepositProcessor: FunctionComponent< lockTargetConfirmations={lockTargetConfirmations} lockAssetDecimals={lockAssetDecimals} lockAmount={lockAmount} - lockTxId={lockTxIdFormatted} + lockTxId={lockTxHash} lockTxUrl={lockTxUrl} onSubmit={handleSubmit} onReset={handleReset} @@ -470,12 +470,12 @@ export const GatewayDepositProcessor: FunctionComponent< diff --git a/src/features/transactions/components/TransactionMenu.tsx b/src/features/transactions/components/TransactionMenu.tsx index ef6cc5bf..e278be84 100644 --- a/src/features/transactions/components/TransactionMenu.tsx +++ b/src/features/transactions/components/TransactionMenu.tsx @@ -212,7 +212,7 @@ export interface ChainTransaction { txid: UrlBase64String; txindex: NumericString; - txidFormatted: string; + txHash: string; } export interface InputChainTransaction extends ChainTransaction { @@ -286,10 +286,10 @@ export const UpdateTransactionForm: FunctionComponent< } }, []); - const [txIdFormatted, setTxIdFormatted] = useState(""); - const handleTxIdFormattedChange = useCallback((event) => { + const [txHash, setTxHash] = useState(""); + const handleTxHashChange = useCallback((event) => { const newValue = event.target.value; - setTxIdFormatted(newValue); + setTxHash(newValue); }, []); const [amount, setAmount] = useState(""); @@ -336,11 +336,11 @@ export const UpdateTransactionForm: FunctionComponent< let txPayload; if (isFromCC) { txPayload = (instance as EthereumBaseChain).Transaction({ - txidFormatted: txIdFormatted, + txHash: txHash, }); } else { txPayload = (instance as BitcoinBaseChain).Transaction({ - txidFormatted: txIdFormatted, + txHash: txHash, txindex: txIndex, }); } @@ -351,7 +351,7 @@ export const UpdateTransactionForm: FunctionComponent< .tx as ChainTransaction; // const finalTx: InputChainTransaction = { // txid: txId || payloadTxData.txid, - // txidFormatted: txIdFormatted || payloadTxData.txidFormatted, + // txHash: txHash || payloadTxData.txHash, // txindex: txIndex || payloadTxData.txindex, // chain: payloadTxData.chain, // asset: asset as string, @@ -385,7 +385,7 @@ export const UpdateTransactionForm: FunctionComponent< // gateway, // txId, txIndex, - txIdFormatted, + txHash, navigateToGateway, handleTxRecoveryClose, // amount, @@ -414,8 +414,8 @@ export const UpdateTransactionForm: FunctionComponent< diff --git a/src/utils/chainsConfig.ts b/src/utils/chainsConfig.ts index de2fc004..f96fbb2f 100644 --- a/src/utils/chainsConfig.ts +++ b/src/utils/chainsConfig.ts @@ -51,7 +51,7 @@ export type ChainColorConfig = { export type ChainConfig = ChainBaseConfig & ChainColorConfig & {}; -const chainsBaseConfig: Record = { +const chainsBaseConfig: Record, ChainBaseConfig> = { Arbitrum: { Icon: chainIcon(Arbitrum), fullName: "Arbitrum", diff --git a/yarn.lock b/yarn.lock index 7a072aab..0424bade 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1471,21 +1471,6 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/abi@5.6.0", "@ethersproject/abi@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.0.tgz#ea07cbc1eec2374d32485679c12408005895e9f3" - integrity sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/abi@5.6.3", "@ethersproject/abi@^5.6.3": version "5.6.3" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.3.tgz#2d643544abadf6e6b63150508af43475985c23db" @@ -1501,6 +1486,21 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" +"@ethersproject/abi@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.0.tgz#ea07cbc1eec2374d32485679c12408005895e9f3" + integrity sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/hash" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/abstract-provider@5.5.1", "@ethersproject/abstract-provider@^5.5.0": version "5.5.1" resolved "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz" @@ -1514,19 +1514,6 @@ "@ethersproject/transactions" "^5.5.0" "@ethersproject/web" "^5.5.0" -"@ethersproject/abstract-provider@5.6.0", "@ethersproject/abstract-provider@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" - integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - "@ethersproject/abstract-provider@5.6.1", "@ethersproject/abstract-provider@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.1.tgz#02ddce150785caf0c77fe036a0ebfcee61878c59" @@ -1540,6 +1527,19 @@ "@ethersproject/transactions" "^5.6.2" "@ethersproject/web" "^5.6.1" +"@ethersproject/abstract-provider@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061" + integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/networks" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/web" "^5.6.0" + "@ethersproject/abstract-signer@5.5.0", "@ethersproject/abstract-signer@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz" @@ -1551,17 +1551,6 @@ "@ethersproject/logger" "^5.5.0" "@ethersproject/properties" "^5.5.0" -"@ethersproject/abstract-signer@5.6.0", "@ethersproject/abstract-signer@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" - integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/abstract-signer@5.6.2", "@ethersproject/abstract-signer@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.2.tgz#491f07fc2cbd5da258f46ec539664713950b0b33" @@ -1573,6 +1562,17 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/properties" "^5.6.0" +"@ethersproject/abstract-signer@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7" + integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ== + dependencies: + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/address@5.5.0", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/address/-/address-5.5.0.tgz" @@ -1584,17 +1584,6 @@ "@ethersproject/logger" "^5.5.0" "@ethersproject/rlp" "^5.5.0" -"@ethersproject/address@5.6.0", "@ethersproject/address@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" - integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/address@5.6.1", "@ethersproject/address@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.1.tgz#ab57818d9aefee919c5721d28cd31fd95eff413d" @@ -1606,6 +1595,17 @@ "@ethersproject/logger" "^5.6.0" "@ethersproject/rlp" "^5.6.1" +"@ethersproject/address@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012" + integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/base64@5.5.0", "@ethersproject/base64@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.5.0.tgz" @@ -1613,13 +1613,6 @@ dependencies: "@ethersproject/bytes" "^5.5.0" -"@ethersproject/base64@5.6.0", "@ethersproject/base64@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" - integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/base64@5.6.1", "@ethersproject/base64@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.1.tgz#2c40d8a0310c9d1606c2c37ae3092634b41d87cb" @@ -1627,6 +1620,13 @@ dependencies: "@ethersproject/bytes" "^5.6.1" +"@ethersproject/base64@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9" + integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/basex@5.5.0", "@ethersproject/basex@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.5.0.tgz" @@ -1635,14 +1635,6 @@ "@ethersproject/bytes" "^5.5.0" "@ethersproject/properties" "^5.5.0" -"@ethersproject/basex@5.6.0", "@ethersproject/basex@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" - integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/basex@5.6.1", "@ethersproject/basex@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.1.tgz#badbb2f1d4a6f52ce41c9064f01eab19cc4c5305" @@ -1651,6 +1643,14 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/properties" "^5.6.0" +"@ethersproject/basex@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69" + integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.5.0.tgz" @@ -1660,15 +1660,6 @@ "@ethersproject/logger" "^5.5.0" bn.js "^4.11.9" -"@ethersproject/bignumber@5.6.0", "@ethersproject/bignumber@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" - integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - bn.js "^4.11.9" - "@ethersproject/bignumber@5.6.2", "@ethersproject/bignumber@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.2.tgz#72a0717d6163fab44c47bcc82e0c550ac0315d66" @@ -1678,6 +1669,15 @@ "@ethersproject/logger" "^5.6.0" bn.js "^5.2.1" +"@ethersproject/bignumber@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26" + integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + bn.js "^4.11.9" + "@ethersproject/bytes@5.5.0", "@ethersproject/bytes@^5.0.4", "@ethersproject/bytes@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.5.0.tgz" @@ -1685,13 +1685,6 @@ dependencies: "@ethersproject/logger" "^5.5.0" -"@ethersproject/bytes@5.6.0", "@ethersproject/bytes@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.0.tgz#81652f2a0e04533575befadce555213c11d8aa20" - integrity sha512-3hJPlYemb9V4VLfJF5BfN0+55vltPZSHU3QKUyP9M3Y2TcajbiRrz65UG+xVHOzBereB1b9mn7r12o177xgN7w== - dependencies: - "@ethersproject/logger" "^5.6.0" - "@ethersproject/bytes@5.6.1", "@ethersproject/bytes@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.1.tgz#24f916e411f82a8a60412344bf4a813b917eefe7" @@ -1699,6 +1692,13 @@ dependencies: "@ethersproject/logger" "^5.6.0" +"@ethersproject/bytes@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.0.tgz#81652f2a0e04533575befadce555213c11d8aa20" + integrity sha512-3hJPlYemb9V4VLfJF5BfN0+55vltPZSHU3QKUyP9M3Y2TcajbiRrz65UG+xVHOzBereB1b9mn7r12o177xgN7w== + dependencies: + "@ethersproject/logger" "^5.6.0" + "@ethersproject/constants@5.5.0", "@ethersproject/constants@^5.0.4", "@ethersproject/constants@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.5.0.tgz" @@ -1706,13 +1706,6 @@ dependencies: "@ethersproject/bignumber" "^5.5.0" -"@ethersproject/constants@5.6.0", "@ethersproject/constants@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" - integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants@5.6.1", "@ethersproject/constants@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.1.tgz#e2e974cac160dd101cf79fdf879d7d18e8cb1370" @@ -1720,6 +1713,13 @@ dependencies: "@ethersproject/bignumber" "^5.6.2" +"@ethersproject/constants@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088" + integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA== + dependencies: + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/contracts@5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.5.0.tgz" @@ -1736,22 +1736,6 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/transactions" "^5.5.0" -"@ethersproject/contracts@5.6.0", "@ethersproject/contracts@^5.4.1": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" - integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== - dependencies: - "@ethersproject/abi" "^5.6.0" - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/contracts@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.2.tgz#20b52e69ebc1b74274ff8e3d4e508de971c287bc" @@ -1768,6 +1752,22 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/transactions" "^5.6.2" +"@ethersproject/contracts@^5.4.1": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067" + integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw== + dependencies: + "@ethersproject/abi" "^5.6.0" + "@ethersproject/abstract-provider" "^5.6.0" + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/transactions" "^5.6.0" + "@ethersproject/hash@5.5.0", "@ethersproject/hash@^5.0.4", "@ethersproject/hash@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.5.0.tgz" @@ -1782,20 +1782,6 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/hash@5.6.0", "@ethersproject/hash@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" - integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/hash@5.6.1", "@ethersproject/hash@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.1.tgz#224572ea4de257f05b4abf8ae58b03a67e99b0f4" @@ -1810,6 +1796,20 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" +"@ethersproject/hash@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2" + integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA== + dependencies: + "@ethersproject/abstract-signer" "^5.6.0" + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/hdnode@5.5.0", "@ethersproject/hdnode@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.5.0.tgz" @@ -1828,24 +1828,6 @@ "@ethersproject/transactions" "^5.5.0" "@ethersproject/wordlists" "^5.5.0" -"@ethersproject/hdnode@5.6.0", "@ethersproject/hdnode@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998" - integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/hdnode@5.6.2", "@ethersproject/hdnode@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.2.tgz#26f3c83a3e8f1b7985c15d1db50dc2903418b2d2" @@ -1883,25 +1865,6 @@ aes-js "3.0.0" scrypt-js "3.0.1" -"@ethersproject/json-wallets@5.6.0", "@ethersproject/json-wallets@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5" - integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ== - dependencies: - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/pbkdf2" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - aes-js "3.0.0" - scrypt-js "3.0.1" - "@ethersproject/json-wallets@5.6.1", "@ethersproject/json-wallets@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.1.tgz#3f06ba555c9c0d7da46756a12ac53483fe18dd91" @@ -1929,14 +1892,6 @@ "@ethersproject/bytes" "^5.5.0" js-sha3 "0.8.0" -"@ethersproject/keccak256@5.6.0", "@ethersproject/keccak256@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" - integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== - dependencies: - "@ethersproject/bytes" "^5.6.0" - js-sha3 "0.8.0" - "@ethersproject/keccak256@5.6.1", "@ethersproject/keccak256@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.1.tgz#b867167c9b50ba1b1a92bccdd4f2d6bd168a91cc" @@ -1945,6 +1900,14 @@ "@ethersproject/bytes" "^5.6.1" js-sha3 "0.8.0" +"@ethersproject/keccak256@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459" + integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w== + dependencies: + "@ethersproject/bytes" "^5.6.0" + js-sha3 "0.8.0" + "@ethersproject/logger@5.5.0", "@ethersproject/logger@^5.0.5", "@ethersproject/logger@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.5.0.tgz" @@ -1962,13 +1925,6 @@ dependencies: "@ethersproject/logger" "^5.5.0" -"@ethersproject/networks@5.6.0", "@ethersproject/networks@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.0.tgz#486d03fff29b4b6b5414d47a232ded09fe10de5e" - integrity sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ== - dependencies: - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks@5.6.3", "@ethersproject/networks@^5.6.3": version "5.6.3" resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.3.tgz#3ee3ab08f315b433b50c99702eb32e0cf31f899f" @@ -1976,6 +1932,13 @@ dependencies: "@ethersproject/logger" "^5.6.0" +"@ethersproject/networks@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.0.tgz#486d03fff29b4b6b5414d47a232ded09fe10de5e" + integrity sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ== + dependencies: + "@ethersproject/logger" "^5.6.0" + "@ethersproject/pbkdf2@5.5.0", "@ethersproject/pbkdf2@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.5.0.tgz" @@ -1984,14 +1947,6 @@ "@ethersproject/bytes" "^5.5.0" "@ethersproject/sha2" "^5.5.0" -"@ethersproject/pbkdf2@5.6.0", "@ethersproject/pbkdf2@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a" - integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/pbkdf2@5.6.1", "@ethersproject/pbkdf2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.1.tgz#f462fe320b22c0d6b1d72a9920a3963b09eb82d1" @@ -2039,32 +1994,7 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.6.1", "@ethersproject/providers@^5.6.1": - version "5.6.1" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.1.tgz#9a05f00ecbac59565bf6907c8d2af8ac33303b48" - integrity sha512-w8Wx15nH+aVDvnoKCyI1f3x0B5idmk/bDJXMEUqCfdO8Eadd0QpDx9lDMTMmenhOmf9vufLJXjpSm24D3ZnVpg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/basex" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/networks" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/web" "^5.6.0" - bech32 "1.1.4" - ws "7.4.6" - -"@ethersproject/providers@5.6.8": +"@ethersproject/providers@5.6.8", "@ethersproject/providers@^5.6.8": version "5.6.8" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.8.tgz#22e6c57be215ba5545d3a46cf759d265bb4e879d" integrity sha512-Wf+CseT/iOJjrGtAOf3ck9zS7AgPmr2fZ3N97r4+YXN3mBePTG2/bJ8DApl9mVwYL+RpYbNxMEkEp4mPGdwG/w== @@ -2123,14 +2053,6 @@ "@ethersproject/bytes" "^5.5.0" "@ethersproject/logger" "^5.5.0" -"@ethersproject/random@5.6.0", "@ethersproject/random@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" - integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/random@5.6.1", "@ethersproject/random@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.1.tgz#66915943981bcd3e11bbd43733f5c3ba5a790255" @@ -2139,6 +2061,14 @@ "@ethersproject/bytes" "^5.6.1" "@ethersproject/logger" "^5.6.0" +"@ethersproject/random@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6" + integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/rlp@5.5.0", "@ethersproject/rlp@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.5.0.tgz" @@ -2147,20 +2077,20 @@ "@ethersproject/bytes" "^5.5.0" "@ethersproject/logger" "^5.5.0" -"@ethersproject/rlp@5.6.0", "@ethersproject/rlp@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" - integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/rlp@5.6.1", "@ethersproject/rlp@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.1.tgz#df8311e6f9f24dcb03d59a2bac457a28a4fe2bd8" integrity sha512-uYjmcZx+DKlFUk7a5/W9aQVaoEC7+1MOBgNtvNg13+RnuUwT4F0zTovC0tmay5SmRslb29V1B7Y5KCri46WhuQ== dependencies: - "@ethersproject/bytes" "^5.6.1" + "@ethersproject/bytes" "^5.6.1" + "@ethersproject/logger" "^5.6.0" + +"@ethersproject/rlp@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717" + integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g== + dependencies: + "@ethersproject/bytes" "^5.6.0" "@ethersproject/logger" "^5.6.0" "@ethersproject/sha2@5.5.0", "@ethersproject/sha2@^5.5.0": @@ -2172,15 +2102,6 @@ "@ethersproject/logger" "^5.5.0" hash.js "1.1.7" -"@ethersproject/sha2@5.6.0", "@ethersproject/sha2@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" - integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - hash.js "1.1.7" - "@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" @@ -2190,6 +2111,15 @@ "@ethersproject/logger" "^5.6.0" hash.js "1.1.7" +"@ethersproject/sha2@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9" + integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + hash.js "1.1.7" + "@ethersproject/signing-key@5.5.0", "@ethersproject/signing-key@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.5.0.tgz" @@ -2202,18 +2132,6 @@ elliptic "6.5.4" hash.js "1.1.7" -"@ethersproject/signing-key@5.6.0", "@ethersproject/signing-key@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.0.tgz#4f02e3fb09e22b71e2e1d6dc4bcb5dafa69ce042" - integrity sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - bn.js "^4.11.9" - elliptic "6.5.4" - hash.js "1.1.7" - "@ethersproject/signing-key@5.6.2", "@ethersproject/signing-key@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.2.tgz#8a51b111e4d62e5a62aee1da1e088d12de0614a3" @@ -2226,6 +2144,18 @@ elliptic "6.5.4" hash.js "1.1.7" +"@ethersproject/signing-key@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.0.tgz#4f02e3fb09e22b71e2e1d6dc4bcb5dafa69ce042" + integrity sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + bn.js "^4.11.9" + elliptic "6.5.4" + hash.js "1.1.7" + "@ethersproject/solidity@5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.5.0.tgz" @@ -2238,18 +2168,6 @@ "@ethersproject/sha2" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/solidity@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3" - integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/sha2" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/solidity@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.1.tgz#5845e71182c66d32e6ec5eefd041fca091a473e2" @@ -2271,15 +2189,6 @@ "@ethersproject/constants" "^5.5.0" "@ethersproject/logger" "^5.5.0" -"@ethersproject/strings@5.6.0", "@ethersproject/strings@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" - integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/strings@5.6.1", "@ethersproject/strings@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.1.tgz#dbc1b7f901db822b5cafd4ebf01ca93c373f8952" @@ -2289,6 +2198,15 @@ "@ethersproject/constants" "^5.6.1" "@ethersproject/logger" "^5.6.0" +"@ethersproject/strings@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd" + integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg== + dependencies: + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.5.0.tgz" @@ -2304,21 +2222,6 @@ "@ethersproject/rlp" "^5.5.0" "@ethersproject/signing-key" "^5.5.0" -"@ethersproject/transactions@5.6.0", "@ethersproject/transactions@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" - integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== - dependencies: - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/rlp" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions@5.6.2", "@ethersproject/transactions@^5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.2.tgz#793a774c01ced9fe7073985bb95a4b4e57a6370b" @@ -2334,6 +2237,21 @@ "@ethersproject/rlp" "^5.6.1" "@ethersproject/signing-key" "^5.6.2" +"@ethersproject/transactions@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e" + integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg== + dependencies: + "@ethersproject/address" "^5.6.0" + "@ethersproject/bignumber" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/constants" "^5.6.0" + "@ethersproject/keccak256" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/rlp" "^5.6.0" + "@ethersproject/signing-key" "^5.6.0" + "@ethersproject/units@5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/units/-/units-5.5.0.tgz" @@ -2343,15 +2261,6 @@ "@ethersproject/constants" "^5.5.0" "@ethersproject/logger" "^5.5.0" -"@ethersproject/units@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c" - integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw== - dependencies: - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/constants" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/units@5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.1.tgz#ecc590d16d37c8f9ef4e89e2005bda7ddc6a4e6f" @@ -2382,27 +2291,6 @@ "@ethersproject/transactions" "^5.5.0" "@ethersproject/wordlists" "^5.5.0" -"@ethersproject/wallet@5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a" - integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg== - dependencies: - "@ethersproject/abstract-provider" "^5.6.0" - "@ethersproject/abstract-signer" "^5.6.0" - "@ethersproject/address" "^5.6.0" - "@ethersproject/bignumber" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/hdnode" "^5.6.0" - "@ethersproject/json-wallets" "^5.6.0" - "@ethersproject/keccak256" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/random" "^5.6.0" - "@ethersproject/signing-key" "^5.6.0" - "@ethersproject/transactions" "^5.6.0" - "@ethersproject/wordlists" "^5.6.0" - "@ethersproject/wallet@5.6.2": version "5.6.2" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.2.tgz#cd61429d1e934681e413f4bc847a5f2f87e3a03c" @@ -2435,17 +2323,6 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/web@5.6.0", "@ethersproject/web@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" - integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== - dependencies: - "@ethersproject/base64" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/web@5.6.1", "@ethersproject/web@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.1.tgz#6e2bd3ebadd033e6fe57d072db2b69ad2c9bdf5d" @@ -2457,6 +2334,17 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/strings" "^5.6.1" +"@ethersproject/web@^5.6.0": + version "5.6.0" + resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8" + integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg== + dependencies: + "@ethersproject/base64" "^5.6.0" + "@ethersproject/bytes" "^5.6.0" + "@ethersproject/logger" "^5.6.0" + "@ethersproject/properties" "^5.6.0" + "@ethersproject/strings" "^5.6.0" + "@ethersproject/wordlists@5.5.0", "@ethersproject/wordlists@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.5.0.tgz" @@ -2468,17 +2356,6 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/wordlists@5.6.0", "@ethersproject/wordlists@^5.6.0": - version "5.6.0" - resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032" - integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q== - dependencies: - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/hash" "^5.6.0" - "@ethersproject/logger" "^5.6.0" - "@ethersproject/properties" "^5.6.0" - "@ethersproject/strings" "^5.6.0" - "@ethersproject/wordlists@5.6.1", "@ethersproject/wordlists@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.1.tgz#1e78e2740a8a21e9e99947e47979d72e130aeda1" @@ -2533,6 +2410,13 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== +"@improbable-eng/grpc-web@^0.14.1": + version "0.14.1" + resolved "https://registry.yarnpkg.com/@improbable-eng/grpc-web/-/grpc-web-0.14.1.tgz#f4662f64dc89c0f956a94bb8a3b576556c74589c" + integrity sha512-XaIYuunepPxoiGVLLHmlnVminUGzBTnXr8Wv7khzmLWbNw4TCwJKX09GSMJlKhu/TRk6gms0ySFxewaETSBqgw== + dependencies: + browser-headers "^0.4.1" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz" @@ -3342,10 +3226,10 @@ unixify "^1.0.0" yargs "^16.0.0" -"@noble/hashes@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.0.0.tgz#d5e38bfbdaba174805a4e649f13be9a9ed3351ae" - integrity sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg== +"@noble/hashes@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.1.tgz#c056d9b7166c1e7387a7453c2aff199bf7d88e5f" + integrity sha512-Lkp9+NijmV7eSVZqiUvt3UCuuHeJpUVmRrvh430gyJjJiuJMqkeHf6/A9lQ/smmbWV/0spDeJscscPzyB4waZg== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -3573,13 +3457,13 @@ redux-thunk "^2.4.1" reselect "^4.1.5" -"@renproject/chains-bitcoin@3.1.0", "@renproject/chains-bitcoin@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-bitcoin/-/chains-bitcoin-3.1.0.tgz#a0512e523eb4b6e46403d1d4461dfb2b8feaee16" - integrity sha512-nmPquC3GmP7+CZUYj8fOm3/TNT/V5FseOcgI0uqraBTg9DrKJdPZwOy2eOq8i30PZbJUuscNlVNjQVREmlG0MA== +"@renproject/chains-bitcoin@3.2.0", "@renproject/chains-bitcoin@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains-bitcoin/-/chains-bitcoin-3.2.0.tgz#39afe56b3065a02c137f83d4bab6c98d8a2002c9" + integrity sha512-CfCZcPnvb3YUsusiC81N4JZ13rnNfljU+s2OCT0DIruoWvrYy6brd64Cfwtir+cK84t/8u4Su6E6uOXXC3vRVw== dependencies: - "@noble/hashes" "1.0.0" - "@renproject/utils" "^3.1.0" + "@noble/hashes" "1.1.1" + "@renproject/utils" "^3.2.0" "@types/bchaddrjs" "^0.4.0" "@types/bs58" "^4.0.1" "@types/bs58check" "2.1.0" @@ -3590,22 +3474,22 @@ bs58 "^5.0.0" bs58check "^2.1.2" cashaddrjs "^0.4.4" - qs "^6.10.3" + qs "^6.10.5" wallet-address-validator "^0.2.4" -"@renproject/chains-ethereum@3.1.0", "@renproject/chains-ethereum@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-ethereum/-/chains-ethereum-3.1.0.tgz#b340add0df9b037c271bdfcfca802fc0241000a2" - integrity sha512-6oXp19TfBkvNIyM5bxbwHaIWFAf/+tHhJjgncaBVso215I8C3sPgmswhT/gf4jppaetA4+gvb0vWiIy51ZUSkQ== +"@renproject/chains-ethereum@3.2.0", "@renproject/chains-ethereum@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains-ethereum/-/chains-ethereum-3.2.0.tgz#6af9cf1c5d3fe1cc1e0746656f65839bf006f53a" + integrity sha512-MyEWKwennb18w/Y3lZaBirlixcOZgrDsvQf5ur3pMcM8T1esMDThWPmcJazjOkfeArdTnvAzIViwQeMBzrXSjg== dependencies: - "@ethersproject/abi" "^5.6.0" - "@ethersproject/bytes" "^5.6.0" - "@ethersproject/providers" "^5.6.1" - "@renproject/utils" "^3.1.0" + "@ethersproject/abi" "^5.6.3" + "@ethersproject/bytes" "^5.6.1" + "@ethersproject/providers" "^5.6.8" + "@renproject/utils" "^3.2.0" "@types/elliptic" "^6.4.14" bignumber.js "^9.0.2" elliptic "^6.5.4" - ethers "^5.6.1" + ethers "^5.6.8" "@renproject/chains-ethereum@^2.5.11": version "2.5.11" @@ -3621,62 +3505,64 @@ bn.js "^5.2.0" ethers "^5.4.5" -"@renproject/chains-filecoin@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-filecoin/-/chains-filecoin-3.1.0.tgz#14bc37016159a125ec6ab25c4319280e2e59ef56" - integrity sha512-JgoCTezAZ4COpOEQIVx2WmHYv6kIbV/PnvCsO30yaXWo56cp0rw2/sxJ7LpxKJFFCQPKOspy6BKvY1ytp1tHrA== +"@renproject/chains-filecoin@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains-filecoin/-/chains-filecoin-3.2.0.tgz#7a5539b4a706b1c99137a04083f06ef00f8c2ba5" + integrity sha512-C2hSpNwrNfNmHxZnuVwCJsUE6BnygQa8VmU2zjx+b0GCY/D01VqxUT0fpS1FEV+kI9SzK4lOlXOhx5iQOx740Q== dependencies: "@glif/filecoin-address" "^1.1.0" "@glif/filecoin-rpc-client" "^1.1.0" - "@renproject/utils" "^3.1.0" + "@renproject/utils" "^3.2.0" "@types/elliptic" "^6.4.14" bignumber.js "^9.0.2" - blakejs "^1.1.1" + blakejs "^1.2.1" elliptic "^6.5.4" multiformats "^9.6.5" -"@renproject/chains-solana@3.1.0", "@renproject/chains-solana@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-solana/-/chains-solana-3.1.0.tgz#55c586c133df9fa64238e00c0567beda63261f3e" - integrity sha512-ycGOl5KsjSU8FsgHpuxJ30uNuECwIcgJnkGkbVM50lX+y/gVn5HETh9S9kjDaXht+4lnyT/CPGw6FMdjSqZ7Yg== +"@renproject/chains-solana@3.2.0", "@renproject/chains-solana@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains-solana/-/chains-solana-3.2.0.tgz#60312e088b1e27dba8fef930c765f75ae33e7379" + integrity sha512-JZPVcIX17OFZqhNE1qm/jW63hICVj/jGEcO9n8iAYG0tVyA3MTNR+43gjof0A469BF6V9vMjaYfRNjLs5iY1oA== dependencies: "@project-serum/associated-token" "^0.1.1" "@project-serum/borsh" "^0.2.5" "@project-serum/sol-wallet-adapter" "^0.2.6" - "@renproject/utils" "^3.1.0" + "@renproject/utils" "^3.2.0" "@solana/buffer-layout" "^4.0.0" "@solana/spl-token" "0.2.0" - "@solana/web3.js" "1.36.0" + "@solana/web3.js" "1.44.0" "@types/bs58" "^4.0.1" + "@types/node-fetch" "^2.6.2" bignumber.js "^9.0.2" bip39 "^3.0.4" bs58 "^5.0.0" + crypto-hash "^2.0.1" ed25519-hd-key "^1.2.0" tweetnacl "^1.0.3" -"@renproject/chains-terra@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-terra/-/chains-terra-3.1.0.tgz#b89ba7d3dcfdbdfc7cfac88804bd13b178ff319f" - integrity sha512-ew12crN80lAdhRHjk8SS+KEqJRnXdKB/MBACmwuXZNoc5n7AKfby2TPfktG+ep5NqnqH6ygYIBTclPJl6eeYqw== +"@renproject/chains-terra@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains-terra/-/chains-terra-3.2.0.tgz#454ce24807c09f2698ec932c5820733f369628d0" + integrity sha512-8PInxYxIWX3dxSy6TRFudn4RBImgepTZxhep04tfpFnryE0rt255mbijw+K1C8QzbE7jAEg1mjbnktvKytX+oQ== dependencies: - "@renproject/utils" "^3.1.0" - "@terra-money/terra.js" "3.0.8" + "@renproject/utils" "^3.2.0" + "@terra-money/terra.js" "3.1.3" "@types/elliptic" "^6.4.14" bech32 "^2.0.0" bignumber.js "^9.0.2" elliptic "^6.5.4" -"@renproject/chains@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/chains/-/chains-3.1.0.tgz#c576c46833d5c6a181f2ce4834434f92d0ccff90" - integrity sha512-D2oCnZFxlkTfVk+yx0OvOWF4U0yqluF3G8UOkxxahcxSM3wBam+j0iMMNCkLYjRhx8SLslzToyq6G+V7CXzYvA== +"@renproject/chains@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/chains/-/chains-3.2.0.tgz#883b70cdf9bf3834c441aa4e0e8884ed339e4ed4" + integrity sha512-uRFl5qw48sLLIGVg69l2NyL6Jjh8XqBo9O16QM8WqULF9mHTco3SfGdA948tX5EC0s2lfr86eJbdufAnWn0OUw== dependencies: - "@renproject/chains-bitcoin" "^3.1.0" - "@renproject/chains-ethereum" "^3.1.0" - "@renproject/chains-filecoin" "^3.1.0" - "@renproject/chains-solana" "^3.1.0" - "@renproject/chains-terra" "^3.1.0" - "@renproject/utils" "^3.1.0" + "@renproject/chains-bitcoin" "^3.2.0" + "@renproject/chains-ethereum" "^3.2.0" + "@renproject/chains-filecoin" "^3.2.0" + "@renproject/chains-solana" "^3.2.0" + "@renproject/chains-terra" "^3.2.0" + "@renproject/utils" "^3.2.0" "@renproject/fonts@^2.0.0-alpha.2": version "2.0.0-alpha.2" @@ -3803,39 +3689,38 @@ "@renproject/multiwallet-base-connector" "^2.5.2" babel-plugin-import "^1.13.3" -"@renproject/provider@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/provider/-/provider-3.1.0.tgz#c285909882b2ade9fee268a68487e1abd26c782f" - integrity sha512-KPHboStwW/7NRpOtAjVG78jM6grTMNCdZnlxG3H6k8GkPEt6iA3ZByvUKHZPEDD+f3j1Djc+smX8udp9jrkEVQ== +"@renproject/provider@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/provider/-/provider-3.2.0.tgz#bdc92bd81950f1906ee2eb89abb2cd790e856a08" + integrity sha512-U1bJT8co8OuKujsX++8w2W5+j5XZPQPD73c63RLiRnLTtXifGnJWMRq0uhdedl/5rs0HQ8AFuNVtktjW7uzuRQ== dependencies: - "@renproject/utils" "^3.1.0" - axios "^0.26.1" + "@renproject/utils" "^3.2.0" + axios "^0.27.2" bignumber.js "^9.0.2" -"@renproject/ren@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/ren/-/ren-3.1.0.tgz#82521beb2a9f72112559c6af30627c99c4e8ab42" - integrity sha512-zn4gRscMf9VCkPbN4ENKemZtno09rJOztZmMcMSIuTgz+buN/PstPYe95PK1albAuykUt3mDkj4T2d25P7noDg== +"@renproject/ren@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/ren/-/ren-3.2.0.tgz#215d8f98c091fedc99bbce6143d2461833bb73d9" + integrity sha512-vieGf4BiRvVVfOuvtKZejM0q0JkVTKMl14sLZ7fNXzYhQUfbWrQOId6SZRYjwYnIvS+zke123clDX8rpMp0sqg== dependencies: - "@renproject/provider" "^3.1.0" - "@renproject/utils" "^3.1.0" + "@renproject/provider" "^3.2.0" + "@renproject/utils" "^3.2.0" bignumber.js "^9.0.2" events "^3.3.0" - immutable "^4.0.0" + immutable "^4.1.0" -"@renproject/utils@3.1.0", "@renproject/utils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@renproject/utils/-/utils-3.1.0.tgz#77878407bce40c2b03ed8a500a1f464369bee9a6" - integrity sha512-4ABT4AE0gPnS2nQUSdBqWxVtt++sVoiDH/5OW4+XFEU8RYhp66gPSw5LkEiyTVRRSLBj3CGCol6qT0uDKAbhJw== +"@renproject/utils@3.2.0", "@renproject/utils@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@renproject/utils/-/utils-3.2.0.tgz#c2490c64b4b40c8971e81d38d9259d32f2da7f44" + integrity sha512-TlThbZZ59B8kVM6fNpalLzQAM1jaXUFyX6OXFmtMRFhLTop8jiqUamyh29IcU6ihBg/fGI4X4kVrlZUKViLS9g== dependencies: - "@noble/hashes" "1.0.0" - "@types/bn.js" "^5.1.0" + "@noble/hashes" "1.1.1" "@types/events" "3.0.0" - axios "^0.26.1" + axios "^0.27.2" base64-js "^1.5.1" bignumber.js "^9.0.2" events "^3.3.0" - immutable "^4.0.0" + immutable "^4.1.0" "@renproject/utils@^2.5.10-1": version "2.5.10-1" @@ -4134,7 +4019,29 @@ "@solana/web3.js" "^1.32.0" start-server-and-test "^1.14.0" -"@solana/web3.js@1.36.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0": +"@solana/web3.js@1.44.0": + version "1.44.0" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.44.0.tgz#233f7bd268520a0ce852ff7f92ded150c5fad0f5" + integrity sha512-KHf7o8sM5FlxYGHGroD7IJeCCOmjFITdBIXq4cO5xPFQ8O6Y26FWfYqIXqY1dXI29t240g0m1GYPssCp5UVgZg== + dependencies: + "@babel/runtime" "^7.12.5" + "@ethersproject/sha2" "^5.5.0" + "@solana/buffer-layout" "^4.0.0" + bigint-buffer "^1.1.5" + bn.js "^5.0.0" + borsh "^0.7.0" + bs58 "^4.0.1" + buffer "6.0.1" + fast-stable-stringify "^1.0.0" + jayson "^3.4.4" + js-sha3 "^0.8.0" + node-fetch "2" + rpc-websockets "^7.4.2" + secp256k1 "^4.0.2" + superstruct "^0.14.2" + tweetnacl "^1.0.0" + +"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0": version "1.36.0" resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.36.0.tgz#79d7d5217b49b80139f4de68953adc5b9a9a264f" integrity sha512-RNT1451iRR7TyW7EJKMCrH/0OXawIe4zVm0DWQASwXlR/u1jmW6FrmH0lujIh7cGTlfOVbH+2ZU9AVUPLBFzwA== @@ -4281,13 +4188,23 @@ dependencies: defer-to-connect "^2.0.0" -"@terra-money/terra.js@3.0.8": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@terra-money/terra.js/-/terra.js-3.0.8.tgz#056b88b0a14d17a28a91f61196687bbbd5feb9db" - integrity sha512-TSosUWw1OeZmgliHwgydDBgEEl+dGnAoFeaYmYYv+dzcYFnyUwY4NXpvg2cU0rjPBLGQHQdV/zRRfSyNQlGDBQ== +"@terra-money/legacy.proto@npm:@terra-money/terra.proto@^0.1.7": + version "0.1.7" + resolved "https://registry.yarnpkg.com/@terra-money/terra.proto/-/terra.proto-0.1.7.tgz#59c18f30da10d43200bab3ba8feb5b17e43a365f" + integrity sha512-NXD7f6pQCulvo6+mv6MAPzhOkUzRjgYVuHZE/apih+lVnPG5hDBU0rRYnOGGofwvKT5/jQoOENnFn/gioWWnyQ== + dependencies: + google-protobuf "^3.17.3" + long "^4.0.0" + protobufjs "~6.11.2" + +"@terra-money/terra.js@3.1.3": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@terra-money/terra.js/-/terra.js-3.1.3.tgz#11f78e4f72f0c9b28ad6063f527ad2de72a594f4" + integrity sha512-80HU5WXrqf3hZTo2GRhIycH17A+SkLD6afbu8MynMDGGD/A861F3zVv6NQ/Z7PWQGHxgddZEK/A0UQ2uK/xfHg== dependencies: - "@terra-money/terra.proto" "^0.1.7" - axios "^0.24.0" + "@terra-money/legacy.proto" "npm:@terra-money/terra.proto@^0.1.7" + "@terra-money/terra.proto" "~2.0.0" + axios "^0.26.1" bech32 "^2.0.0" bip32 "^2.0.6" bip39 "^3.0.3" @@ -4300,11 +4217,12 @@ utf-8-validate "^5.0.5" ws "^7.5.5" -"@terra-money/terra.proto@^0.1.7": - version "0.1.7" - resolved "https://registry.npmjs.org/@terra-money/terra.proto/-/terra.proto-0.1.7.tgz" - integrity sha512-NXD7f6pQCulvo6+mv6MAPzhOkUzRjgYVuHZE/apih+lVnPG5hDBU0rRYnOGGofwvKT5/jQoOENnFn/gioWWnyQ== +"@terra-money/terra.proto@~2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@terra-money/terra.proto/-/terra.proto-2.0.0.tgz#5f861d782208b64bba71ddb88f617168bfddd61f" + integrity sha512-ZjyFOFUzrGn8IwzGIgr1OJFcPSsQoz/XAfoSKThJx+OjJA7CLhdcz51+5h7ehNfb+qB9wr7aNME0h24wu9D4SQ== dependencies: + "@improbable-eng/grpc-web" "^0.14.1" google-protobuf "^3.17.3" long "^4.0.0" protobufjs "~6.11.2" @@ -4766,6 +4684,14 @@ "@types/node" "*" form-data "^3.0.0" +"@types/node-fetch@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*", "@types/node@^12.12.54", "@types/node@^12.12.6": version "12.20.43" resolved "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz" @@ -6156,13 +6082,6 @@ axios@^0.21.1: dependencies: follow-redirects "^1.14.0" -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== - dependencies: - follow-redirects "^1.14.4" - axios@^0.26.1: version "0.26.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" @@ -6170,6 +6089,14 @@ axios@^0.26.1: dependencies: follow-redirects "^1.14.8" +axios@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== + dependencies: + follow-redirects "^1.14.9" + form-data "^4.0.0" + axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" @@ -6552,11 +6479,16 @@ blakejs@1.1.0: resolved "https://registry.npmjs.org/blakejs/-/blakejs-1.1.0.tgz" integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U= -blakejs@^1.1.0, blakejs@^1.1.1: +blakejs@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz" integrity sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg== +blakejs@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" + integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== + blob@0.0.5: version "0.0.5" resolved "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz" @@ -6651,6 +6583,15 @@ borsh@^0.4.0: bs58 "^4.0.0" text-encoding-utf-8 "^1.0.2" +borsh@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.7.0.tgz#6e9560d719d86d90dc589bca60ffc8a6c51fec2a" + integrity sha512-CLCsZGIBCFnPtkNnieW/a8wmreDmfUtjU2m9yHrzPXIlNbqVs0AQrSatSG6vdNYUqdc83tkQi2eHfF98ubzQLA== + dependencies: + bn.js "^5.2.0" + bs58 "^4.0.0" + text-encoding-utf-8 "^1.0.2" + boxen@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" @@ -6701,6 +6642,11 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-headers@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/browser-headers/-/browser-headers-0.4.1.tgz#4308a7ad3b240f4203dbb45acedb38dc2d65dd02" + integrity sha512-CA9hsySZVo9371qEHjHZtYxV2cFtVj5Wj/ZHi8ooEsrtm4vOnl9Y9HmyYWk9q+05d7K3rdoAE0j3MVEFVvtQtg== + browser-or-node@^1.2.1: version "1.3.0" resolved "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz" @@ -7922,6 +7868,13 @@ cron-parser@^4.1.0, cron-parser@^4.2.1: dependencies: luxon "^1.28.0" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-fetch@3.1.5, cross-fetch@^3.1.4: version "3.1.5" resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" @@ -7937,7 +7890,7 @@ cross-fetch@^2.1.0: node-fetch "2.6.1" whatwg-fetch "2.0.4" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -7963,6 +7916,11 @@ crypto-browserify@3.12.0, crypto-browserify@^3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" +crypto-hash@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/crypto-hash/-/crypto-hash-2.0.1.tgz#46c3732e65a078ea06b8b4ae686db41216f81213" + integrity sha512-t4mkp7Vh6MuCZRBf0XLzBOfhkH3nW6YEAotMDSjshVQ1GffCMGdPLSr7pKH0rdXY02jTjAZ7QW2apD0buaZXcQ== + crypto-random-string@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz" @@ -9864,42 +9822,6 @@ ethers@^5.4.3, ethers@^5.4.5: "@ethersproject/web" "5.5.1" "@ethersproject/wordlists" "5.5.0" -ethers@^5.6.1: - version "5.6.1" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.1.tgz#a56cd67f1595b745dc3dde0ccf2b5de53a41a6d0" - integrity sha512-qtl/2W+dwmUa5Z3JqwsbV3JEBZZHNARe5K/A2ePcNAuhJYnEKIgGOT/O9ouPwBijSqVoQnmQMzi5D48LFNOY2A== - dependencies: - "@ethersproject/abi" "5.6.0" - "@ethersproject/abstract-provider" "5.6.0" - "@ethersproject/abstract-signer" "5.6.0" - "@ethersproject/address" "5.6.0" - "@ethersproject/base64" "5.6.0" - "@ethersproject/basex" "5.6.0" - "@ethersproject/bignumber" "5.6.0" - "@ethersproject/bytes" "5.6.0" - "@ethersproject/constants" "5.6.0" - "@ethersproject/contracts" "5.6.0" - "@ethersproject/hash" "5.6.0" - "@ethersproject/hdnode" "5.6.0" - "@ethersproject/json-wallets" "5.6.0" - "@ethersproject/keccak256" "5.6.0" - "@ethersproject/logger" "5.6.0" - "@ethersproject/networks" "5.6.0" - "@ethersproject/pbkdf2" "5.6.0" - "@ethersproject/properties" "5.6.0" - "@ethersproject/providers" "5.6.1" - "@ethersproject/random" "5.6.0" - "@ethersproject/rlp" "5.6.0" - "@ethersproject/sha2" "5.6.0" - "@ethersproject/signing-key" "5.6.0" - "@ethersproject/solidity" "5.6.0" - "@ethersproject/strings" "5.6.0" - "@ethersproject/transactions" "5.6.0" - "@ethersproject/units" "5.6.0" - "@ethersproject/wallet" "5.6.0" - "@ethersproject/web" "5.6.0" - "@ethersproject/wordlists" "5.6.0" - ethers@^5.6.8: version "5.6.8" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.8.tgz#d36b816b4896341a80a8bbd2a44e8cb6e9b98dd4" @@ -10249,6 +10171,11 @@ fast-shallow-equal@^1.0.0: resolved "https://registry.npmjs.org/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz" integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw== +fast-stable-stringify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313" + integrity sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag== + fastest-stable-stringify@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz" @@ -10543,7 +10470,7 @@ folder-walker@^3.2.0: dependencies: from2 "^2.1.0" -follow-redirects@^1.0.0, follow-redirects@^1.10.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4: +follow-redirects@^1.0.0, follow-redirects@^1.10.0, follow-redirects@^1.14.0: version "1.14.7" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz" integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== @@ -10553,6 +10480,11 @@ follow-redirects@^1.14.8: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.14.9: + version "1.15.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" + integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz" @@ -10605,6 +10537,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz" @@ -11667,11 +11608,16 @@ immer@^9.0.7: resolved "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz" integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA== -immutable@^4.0.0, immutable@^4.0.0-rc.14: +immutable@^4.0.0-rc.14: version "4.0.0" resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz" integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== +immutable@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" + integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== + import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" @@ -14727,18 +14673,18 @@ node-emoji@^1.10.0: dependencies: lodash "^4.17.21" -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-fetch@2.6.7, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.5, node-fetch@^2.6.7: +node-fetch@2, node-fetch@2.6.7, node-fetch@^2.3.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.5, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" +node-fetch@2.6.1: + version "2.6.1" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-fetch@^3.0.0, node-fetch@^3.1.1: version "3.2.5" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.5.tgz#7d31da657804db5185540ddac7ddd516a9a2bd26" @@ -16711,7 +16657,14 @@ qs@6.9.6: resolved "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz" integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== -qs@^6.10.3, qs@^6.9.6: +qs@^6.10.5: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + +qs@^6.9.6: version "6.10.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== @@ -18085,13 +18038,6 @@ slack-markdown@^0.2.0: node-emoji "^1.10.0" simple-markdown "^0.7.3" -slack-to-html@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slack-to-html/-/slack-to-html-1.0.0.tgz#0b1b0dab1775c3bc66bf587a7313d7266786b8c5" - integrity sha512-5qJ6DNgy2LmrVZvXForuBRBtSLHgPT7ymvYdJAhZUbc/6z3pgBd+CcZ5VPNhaB4Xm+jIckUq8ecFaTnJR7qnPA== - dependencies: - xregexp "^3.2.0" - slash@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz" @@ -20867,11 +20813,6 @@ xmlhttprequest-ssl@~1.6.2: resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz" integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== -xregexp@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-3.2.0.tgz#cb3601987bfe2695b584000c18f1c4a8c322878e" - integrity sha1-yzYBmHv+JpW1hAAMGPHEqMMih44= - xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz" From 68d200a5a6ad68607cdc0cceefa38e3f433e2475 Mon Sep 17 00:00:00 2001 From: Tomasz Rozmus Date: Thu, 7 Jul 2022 18:54:04 +0200 Subject: [PATCH 06/11] feat: removing unsupported chains --- src/constants/featureFlags.ts | 2 +- src/utils/chainsConfig.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/featureFlags.ts b/src/constants/featureFlags.ts index c226b7c5..a34f423a 100644 --- a/src/constants/featureFlags.ts +++ b/src/constants/featureFlags.ts @@ -14,7 +14,7 @@ export const featureFlags = { queryString.parse(window.location.search).walletConnectEnabled, godMode: Boolean(queryString.parse(window.location.search).godMode) || - Boolean(localStorage.getItem("godMode")), + Boolean(localStorage.getItem("godMode")) }; console.info(featureFlags); diff --git a/src/utils/chainsConfig.ts b/src/utils/chainsConfig.ts index 0d47fa32..a49b6185 100644 --- a/src/utils/chainsConfig.ts +++ b/src/utils/chainsConfig.ts @@ -235,8 +235,8 @@ export const supportedEthereumChains: Array = [ Chain.Polygon, Chain.Avalanche, Chain.Arbitrum, - Chain.Kava, - Chain.Moonbeam, + // Chain.Kava, + // Chain.Moonbeam, Chain.Optimism, ]; From a2803cb9a665b215276fa70ec1622abaf6b4286f Mon Sep 17 00:00:00 2001 From: Tomasz Rozmus Date: Mon, 11 Jul 2022 22:48:47 +0200 Subject: [PATCH 07/11] fix: solana web3 update --- package.json | 2 +- yarn.lock | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b88c1c35..7d284058 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@renproject/utils": "3.3.0", "@sentry/react": "^6.5.1", "@slack/web-api": "^6.7.1", - "@solana/web3.js": "^1.36.0", + "@solana/web3.js": "^1.47.3", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/yarn.lock b/yarn.lock index 4ebd1f8d..6d0c33c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1103,6 +1103,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.17.2": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.6.tgz#6a1ef59f838debd670421f8c7f2cbb8da9751580" + integrity sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz" @@ -4095,7 +4102,7 @@ superstruct "^0.14.2" tweetnacl "^1.0.0" -"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0": +"@solana/web3.js@^1.32.0": version "1.36.0" resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.36.0.tgz#79d7d5217b49b80139f4de68953adc5b9a9a264f" integrity sha512-RNT1451iRR7TyW7EJKMCrH/0OXawIe4zVm0DWQASwXlR/u1jmW6FrmH0lujIh7cGTlfOVbH+2ZU9AVUPLBFzwA== @@ -4115,6 +4122,28 @@ superstruct "^0.14.2" tweetnacl "^1.0.0" +"@solana/web3.js@^1.47.3": + version "1.47.3" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.47.3.tgz#ec13f2cf4f9f54cc4fbd26d20be1e026c6e2279c" + integrity sha512-TQJulaN/+b0xXq5EhQAYFwVyOORxSyVJn1EiXupClZm8DY7f9EeUG6vl0FzSAgwEAwXKsgK3sVs/3px2e7H7dQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@ethersproject/sha2" "^5.5.0" + "@solana/buffer-layout" "^4.0.0" + bigint-buffer "^1.1.5" + bn.js "^5.0.0" + borsh "^0.7.0" + bs58 "^4.0.1" + buffer "6.0.1" + fast-stable-stringify "^1.0.0" + jayson "^3.4.4" + js-sha3 "^0.8.0" + node-fetch "2" + rpc-websockets "^7.5.0" + secp256k1 "^4.0.2" + superstruct "^0.14.2" + tweetnacl "^1.0.0" + "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" @@ -17598,6 +17627,19 @@ rpc-websockets@^7.4.2: bufferutil "^4.0.1" utf-8-validate "^5.0.2" +rpc-websockets@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.0.tgz#bbeb87572e66703ff151e50af1658f98098e2748" + integrity sha512-9tIRi1uZGy7YmDjErf1Ax3wtqdSSLIlnmL5OtOzgd5eqPKbsPpwDP5whUDO2LQay3Xp0CcHlcNSGzacNRluBaQ== + dependencies: + "@babel/runtime" "^7.17.2" + eventemitter3 "^4.0.7" + uuid "^8.3.2" + ws "^8.5.0" + optionalDependencies: + bufferutil "^4.0.1" + utf-8-validate "^5.0.2" + rtcpeerconnection-shim@^1.2.14: version "1.2.15" resolved "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz" @@ -20803,6 +20845,11 @@ ws@^8.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== +ws@^8.5.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769" + integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ== + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz" From ac8cc739fbf95a9ee43257a7031bccd155cf43cc Mon Sep 17 00:00:00 2001 From: Tomasz Rozmus Date: Mon, 11 Jul 2022 23:06:42 +0200 Subject: [PATCH 08/11] fix: bumping --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d284058..c8db98e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridge-v2", - "version": "3.0.0", + "version": "3.0.1", "private": true, "dependencies": { "@davatar/react": "^1.9.0", From 321b6b0b92f7b26d22b8cd74390e6990af87dcca Mon Sep 17 00:00:00 2001 From: Tomasz Rozmus Date: Wed, 13 Jul 2022 19:24:21 +0200 Subject: [PATCH 09/11] fix: updating solana chain --- package.json | 3 ++- yarn.lock | 32 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c8db98e6..8f88fc05 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@renproject/chains": "3.4.0", "@renproject/chains-bitcoin": "3.3.0", "@renproject/chains-ethereum": "3.4.0", - "@renproject/chains-solana": "3.3.0", + "@renproject/chains-solana": "3.4.2", "@renproject/fonts": "^2.0.0-alpha.2", "@renproject/icons": "0.3.5", "@renproject/interfaces": "2.5.9", @@ -47,6 +47,7 @@ "buffer": "^6.0.3", "cancelable-promise": "^4.3.0", "classnames": "^2.2.6", + "cross-env": "^7.0.3", "crypto-browserify": "^3.12.0", "dotenv": "^10.0.0", "ethers": "^5.6.8", diff --git a/yarn.lock b/yarn.lock index 6d0c33c4..a024e19a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3546,15 +3546,15 @@ elliptic "^6.5.4" multiformats "^9.6.5" -"@renproject/chains-solana@3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@renproject/chains-solana/-/chains-solana-3.3.0.tgz#5e126b3a0e16a8a28f8d8680b2a4eba822cd91db" - integrity sha512-tFL5F9cTjtnTeaFGh6y8F0m5QXDmG4wrjfHOn8l4pLHwmMyMCKj6lTRhgJhKFUXq1tm5xIEYJL9s6nEsh6glKQ== +"@renproject/chains-solana@3.4.2": + version "3.4.2" + resolved "https://registry.yarnpkg.com/@renproject/chains-solana/-/chains-solana-3.4.2.tgz#2f99a49e3304c46d9eab485baab6d34456cd0e8a" + integrity sha512-HA7H16Ccx3jLtU14jJpVx61d9+bVm4Pu8jyRd/Jgkx0U7XJ6ax51Wy+tBLOYe+RiwPrWrCxT2aqoLMpx6+ICZA== dependencies: "@project-serum/associated-token" "^0.1.1" "@project-serum/borsh" "^0.2.5" "@project-serum/sol-wallet-adapter" "^0.2.6" - "@renproject/utils" "^3.3.0" + "@renproject/utils" "^3.4.2" "@solana/buffer-layout" "^4.0.0" "@solana/spl-token" "0.2.0" "@solana/web3.js" "1.44.0" @@ -3801,6 +3801,19 @@ events "^3.3.0" immutable "^4.1.0" +"@renproject/utils@^3.4.2": + version "3.4.2" + resolved "https://registry.yarnpkg.com/@renproject/utils/-/utils-3.4.2.tgz#b23e414e06c4226333ed31e24a740c28e5404e83" + integrity sha512-D4/zITmiR6dgkEUEyl4NcR3ACK99kHpGwflivvHSncA5h9NZb8pEgHPGfIRMT9gjIjBp5KnBE2hKL2AfL1AF8w== + dependencies: + "@noble/hashes" "1.1.1" + "@types/events" "3.0.0" + axios "^0.27.2" + base64-js "^1.5.1" + bignumber.js "^9.0.2" + events "^3.3.0" + immutable "^4.1.0" + "@rollup/plugin-babel@^5.2.0", "@rollup/plugin-babel@^5.3.0": version "5.3.0" resolved "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz" @@ -7956,6 +7969,13 @@ cron-parser@^4.1.0, cron-parser@^4.2.1: dependencies: luxon "^1.28.0" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-fetch@3.1.5, cross-fetch@^3.1.4: version "3.1.5" resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz" @@ -7971,7 +7991,7 @@ cross-fetch@^2.1.0: node-fetch "2.6.1" whatwg-fetch "2.0.4" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== From bc4328e81d88836f89d7930c828dcf8af516ecc8 Mon Sep 17 00:00:00 2001 From: Tomasz Rozmus Date: Wed, 13 Jul 2022 20:08:59 +0200 Subject: [PATCH 10/11] fix: hiding custom account under feature flag, updating solana deps --- package.json | 8 +- src/constants/featureFlags.ts | 3 +- src/features/chain/chainUtils.ts | 4 +- src/features/gateway/gatewayUtils.ts | 4 +- .../steps/shared/WalletSwitchHelpers.tsx | 3 +- yarn.lock | 157 ++++-------------- 6 files changed, 46 insertions(+), 133 deletions(-) diff --git a/package.json b/package.json index d3306043..e1feb772 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,12 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.57", "@netlify/functions": "^1.0.0", + "@project-serum/associated-token": "^0.1.1", + "@project-serum/borsh": "^0.2.5", "@reduxjs/toolkit": "^1.4.0", - "@renproject/chains": "3.4.0", - "@renproject/chains-bitcoin": "3.3.0", - "@renproject/chains-ethereum": "3.4.0", + "@renproject/chains": "3.4.2", + "@renproject/chains-bitcoin": "3.4.2", + "@renproject/chains-ethereum": "3.4.2", "@renproject/chains-solana": "3.4.2", "@renproject/fonts": "^2.0.0-alpha.2", "@renproject/icons": "0.3.5", diff --git a/src/constants/featureFlags.ts b/src/constants/featureFlags.ts index a34f423a..5c464c5f 100644 --- a/src/constants/featureFlags.ts +++ b/src/constants/featureFlags.ts @@ -14,7 +14,8 @@ export const featureFlags = { queryString.parse(window.location.search).walletConnectEnabled, godMode: Boolean(queryString.parse(window.location.search).godMode) || - Boolean(localStorage.getItem("godMode")) + Boolean(localStorage.getItem("godMode")), + customRecipient: false }; console.info(featureFlags); diff --git a/src/features/chain/chainUtils.ts b/src/features/chain/chainUtils.ts index d321fa00..e753c7bd 100644 --- a/src/features/chain/chainUtils.ts +++ b/src/features/chain/chainUtils.ts @@ -132,7 +132,7 @@ export const getSolanaChain = ( network, provider, signer, - }), + }) as any, connectionRequired: true, accounts: [], }; @@ -217,7 +217,7 @@ export const alterContractChainProviderSigner = ( console.info("Solana", provider); (window as any).solanaProvider = provider; alterSolanaChainProviderSigner( - chains[alteredChain] as ChainInstance, + chains[alteredChain] as any as ChainInstance, provider as SolanaConnector, false ); diff --git a/src/features/gateway/gatewayUtils.ts b/src/features/gateway/gatewayUtils.ts index 5f52761c..89fe0c75 100644 --- a/src/features/gateway/gatewayUtils.ts +++ b/src/features/gateway/gatewayUtils.ts @@ -79,7 +79,7 @@ export const createGateway = async ( }); } } else if (isSolanaBaseChain(gatewayParams.from)) { - const solana = fromChainInstance.chain as Solana; + const solana = fromChainInstance.chain as unknown as Solana; if (partialTx) { fromChain = solana.Transaction(partialTx); } else if (gatewayParams.fromAddress) { @@ -114,7 +114,7 @@ export const createGateway = async ( toChain = ethereumChain.Account({ convertUnit, anyoneCanSubmit }); } } else if (isSolanaBaseChain(gatewayParams.to)) { - const solana = toChainInstance.chain as Solana; + const solana = toChainInstance.chain as unknown as Solana; if (gatewayParams.toAddress) { toChain = solana.Address(gatewayParams.toAddress); } else { diff --git a/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx b/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx index 18ccf8d9..239ce5e1 100644 --- a/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx +++ b/src/features/gateway/steps/shared/WalletSwitchHelpers.tsx @@ -40,6 +40,7 @@ import { Link } from "../../../../components/links/Links"; import { BridgeModal } from "../../../../components/modals/BridgeModal"; import { InlineSkeleton } from "../../../../components/progress/ProgressHelpers"; import { Debug } from "../../../../components/utils/Debug"; +import { featureFlags } from "../../../../constants/featureFlags"; import { getAssetConfig } from "../../../../utils/assetsConfig"; import { getChainConfig, @@ -485,7 +486,7 @@ export const H2HAccountsResolver: FunctionComponent< } /> )} - {differentAccounts && ( + {featureFlags.customRecipient && differentAccounts && ( <> Date: Wed, 13 Jul 2022 20:24:02 +0200 Subject: [PATCH 11/11] fix: bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1feb772..528cc67a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bridge-v2", - "version": "3.0.1", + "version": "3.0.2", "private": true, "dependencies": { "@davatar/react": "^1.9.0",