diff --git a/.github/workflows/dashboard-ci.yml b/.github/workflows/dashboard-ci.yml index 84aebb017..27d0e4f4e 100644 --- a/.github/workflows/dashboard-ci.yml +++ b/.github/workflows/dashboard-ci.yml @@ -76,7 +76,6 @@ jobs: @keep-network/keep-core \ @keep-network/keep-ecdsa \ @keep-network/tbtc \ - @keep-network/coverage-pools \ @keep-network/random-beacon --ignore-scripts - name: Run postinstall script diff --git a/.github/workflows/reusable-build-and-publish.yml b/.github/workflows/reusable-build-and-publish.yml index 06c2ab14d..a2d7f912e 100644 --- a/.github/workflows/reusable-build-and-publish.yml +++ b/.github/workflows/reusable-build-and-publish.yml @@ -135,15 +135,6 @@ jobs: echo "random-beacon-contracts-version=${{ steps.upstream-builds-query.outputs.random-beacon-contracts-version }}" >> $GITHUB_OUTPUT fi - # In the `package.json` there are two different versions of - # `coverage-pools` used. This is done to allow using contracts from two - # different cov pool versions on the mainnet (needed for computations of - # the TVL-related fields) - one relates to KEEP token cov pool (<2.0.0) - # and one to to T token one (>=2.0.0). - # On the testnet environmet we currently don't have the KEEP token cov - # pool deployed. The T-related cov-pool contracts will be used in all TVL - # computations (which differs from the mainnet behavior, but is acceptable - # on the test env). - name: Resolve contracts shell: bash run: | @@ -152,8 +143,6 @@ jobs: @keep-network/keep-core@${{ inputs.environment }} \ @keep-network/keep-ecdsa@${{ inputs.environment }} \ @keep-network/tbtc@${{ inputs.environment }} \ - @keep-network/coverage-pools@${{ inputs.environment }} \ - @threshold-network/coverage-pools@npm:@keep-network/coverage-pools@${{ inputs.environment }} \ @keep-network/random-beacon@${{ steps.set-packages-versions.outputs.random-beacon-contracts-version }} - name: Run postinstall script diff --git a/Dockerfile.dev b/Dockerfile.dev index d359be280..aff922d2b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -18,14 +18,12 @@ ENV NODE_OPTIONS=--max_old_space_size=3072 COPY package*.json yarn.lock ./ RUN npm install -g node-gyp RUN yarn install --ignore-scripts -RUN yarn upgrade @keep-network/coverage-pools@sepolia \ - @keep-network/ecdsa@sepolia \ +RUN yarn upgrade @keep-network/ecdsa@sepolia \ @keep-network/keep-core@sepolia \ @keep-network/keep-ecdsa@sepolia \ @keep-network/random-beacon@sepolia \ @keep-network/tbtc@sepolia \ @keep-network/tbtc-v2@sepolia \ - @threshold-network/coverage-pools@npm:@keep-network/coverage-pools@sepolia \ @threshold-network/solidity-contracts@sepolia RUN yarn run postinstall diff --git a/README.md b/README.md index 5e63db283..89f83a6b9 100644 --- a/README.md +++ b/README.md @@ -26,27 +26,20 @@ REACT_APP_MULTICALL_ADDRESS=$MULTICALL_ADDRESS ## Install Sepolia contracts ``` -yarn upgrade @keep-network/coverage-pools@sepolia \ - @keep-network/keep-core@sepolia \ +yarn upgrade @keep-network/keep-core@sepolia \ @keep-network/keep-ecdsa@sepolia \ @keep-network/random-beacon@sepolia \ @keep-network/tbtc@sepolia \ - @threshold-network/coverage-pools@npm:@keep-network/coverage-pools@sepolia \ @threshold-network/solidity-contracts@sepolia ``` -**NOTE 1:** We use the same Sepolia versions for both -`@keep-network/coverage-pools` and `@threshold-network/coverage-pools`, because -we don't have the v1 version of the package on Sepolia network, only on the -Mainnet. - -**NOTE 2:** If you encounter an `expected manifest` error while executing this, +**NOTE 1:** If you encounter an `expected manifest` error while executing this, then try providing an explicit version of the `keep-core` package: `@keep-network/keep-core@1.8.1-sepolia.0` The error is probably caused by a bug in Yarn: https://github.com/yarnpkg/yarn/issues/4731. -**NOTE 3:** The `token-dashboard` package contains an indirect dependency to +**NOTE 2:** The `token-dashboard` package contains an indirect dependency to `@summa-tx/relay-sol@2.0.2` package, which downloads one of its sub-dependencies via unathenticated `git://` protocol. That protocol is no longer supported by GitHub. This means that in certain situations installation of the package or @@ -66,12 +59,10 @@ Ref: https://github.com/keep-network/tbtc-v2/pull/403 Instead of the goerli contracts above you can also use `dapp-development-sepolia` contracts. They offer shorter durations for some specific elements in the contracts in comparison to goerli/mainnet and also allow to manually control mint and unmint process of tbtc-v2 (for more information see please see https://github.com/keep-network/tbtc-v2/pull/403) To install sepolia-dev contracts run: ``` -yarn upgrade @keep-network/coverage-pools@sepolia \ - @keep-network/keep-core@sepolia \ +yarn @keep-network/keep-core@sepolia \ @keep-network/keep-ecdsa@sepolia \ @keep-network/random-beacon@dapp-development-sepolia \ @keep-network/tbtc@sepolia \ - @threshold-network/coverage-pools@npm:@keep-network/coverage-pools@sepolia \ @threshold-network/solidity-contracts@dapp-development-sepolia ``` diff --git a/package.json b/package.json index 3c4cbd046..ee3a53130 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@ethersproject/constants": "^5.5.0", "@fontsource/ibm-plex-mono": "^4.5.13", "@fontsource/inter": "^4.5.10", - "@keep-network/coverage-pools": "development", "@keep-network/keep-core": "development", "@keep-network/keep-ecdsa": "development", "@keep-network/random-beacon": "development", @@ -23,16 +22,15 @@ "@ledgerhq/connect-kit-loader": "1.1.8", "@ledgerhq/wallet-api-client": "^1.2.0", "@ledgerhq/wallet-api-client-react": "^1.1.1", + "@nucypher/nucypher-contracts": "0.13.0", "@reduxjs/toolkit": "^1.6.1", "@rehooks/local-storage": "^2.4.4", - "@nucypher/nucypher-contracts": "0.13.0", "@sentry/react": "^7.33.0", "@sentry/tracing": "^7.33.0", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", "@threshold-network/components": "development", - "@threshold-network/coverage-pools": "npm:@keep-network/coverage-pools@development", "@threshold-network/solidity-contracts": "development", "@types/jest": "^27.0.1", "@types/node": "^16.9.1", diff --git a/scripts/start_dashboard.sh b/scripts/start_dashboard.sh index 4a5f46b89..1039a0d6e 100644 --- a/scripts/start_dashboard.sh +++ b/scripts/start_dashboard.sh @@ -47,8 +47,6 @@ KEEP_CORE_SOL_PATH="$KEEP_CORE_PATH/solidity-v1" KEEP_ECDSA_PATH="$PWD/../keep-ecdsa" KEEP_ECDSA_SOL_PATH="$KEEP_ECDSA_PATH/solidity" -COV_POOLS_PATH="$PWD/../coverage-pools" - TBTC_PATH="$PWD/../tbtc/" TBTC_SOL_PATH="$TBTC_PATH/solidity" @@ -67,8 +65,7 @@ function start_dashboard { yarn link @threshold-network/solidity-contracts \ @keep-network/keep-core \ @keep-network/keep-ecdsa \ - @keep-network/tbtc \ - @keep-network/coverage-pools + @keep-network/tbtc printf "${LOG_START}Starting dashboard...${LOG_END}" MULTICALL_ADDRESS="${MULTICALL_ADDRESS}" yarn start @@ -105,14 +102,6 @@ cd "$TBTC_PATH" cd "$TBTC_SOL_PATH" yarn link -cd $COV_POOLS_PATH -printf "${LOG_START}Migrating contracts for coverage pools...${LOG_END}" -yarn -yarn link @keep-network/keep-core @keep-network/tbtc -yarn deploy --network development --reset -./scripts/prepare-artifacts.sh --network development -yarn link - cd "$THRESHOLD_CONTRACTS_PATH" printf "${LOG_START}Installing Threshold network solidity contracts dependencies...${LOG_START}" yarn diff --git a/src/enums/externalHref.ts b/src/enums/externalHref.ts index 1a2295fb0..c4d9a21ff 100644 --- a/src/enums/externalHref.ts +++ b/src/enums/externalHref.ts @@ -35,6 +35,5 @@ export enum ExternalHref { mintersAndGuardiansDocs = "https://blog.threshold.network/minters-guardians-and-a-strong-tbtc/", tBTCDuneDashboard = "https://dune.com/threshold/tbtc", delight = "https://delightlabs.io", - coveragePoolsDocs = "https://docs.threshold.network/applications/tbtc-v2/coverage-pool", runningNodeDocs = "https://docs.threshold.network/staking-and-running-a-node/running-a-node", } diff --git a/src/hooks/__tests__/useFetchTvl.test.tsx b/src/hooks/__tests__/useFetchTvl.test.tsx index 923517741..993433fa5 100644 --- a/src/hooks/__tests__/useFetchTvl.test.tsx +++ b/src/hooks/__tests__/useFetchTvl.test.tsx @@ -2,8 +2,6 @@ import { renderHook } from "@testing-library/react-hooks" import * as ethersUnits from "@ethersproject/units" import { Token } from "../../enums" import { - useAssetPoolContract, - useKeepAssetPoolContract, useKeepBondingContract, useKeepTokenStakingContract, useMulticall, @@ -20,8 +18,6 @@ import { FC } from "react" jest.mock("../../web3/hooks", () => ({ ...(jest.requireActual("../../web3/hooks") as {}), - useAssetPoolContract: jest.fn(), - useKeepAssetPoolContract: jest.fn(), useKeepBondingContract: jest.fn(), useKeepTokenStakingContract: jest.fn(), useMulticall: jest.fn(), @@ -66,8 +62,6 @@ describe("Test `useFetchTvl` hook", () => { const mockedKeepBondingContract = { address: "0x0" } const mockedTStakingContract = { address: "0x2" } const mockedMultiCallContract = { interface: {}, address: "0x3" } - const mockedAssetPoolContract = { interface: {}, address: "0x4" } - const mockedKeepAssetPoolContract = { interface: {}, address: "0x5" } const mockedtBTCTokenContract = { interface: {}, address: "0x6" } const wrapper: FC = ({ children }) => ( @@ -96,12 +90,6 @@ describe("Test `useFetchTvl` hook", () => { ;(useMulticallContract as jest.Mock).mockReturnValue( mockedMultiCallContract ) - ;(useAssetPoolContract as jest.Mock).mockReturnValue( - mockedAssetPoolContract - ) - ;(useKeepAssetPoolContract as jest.Mock).mockReturnValue( - mockedKeepAssetPoolContract - ) ;(useTStakingContract as jest.Mock).mockReturnValue(mockedTStakingContract) ;(useKeepTokenStakingContract as jest.Mock).mockReturnValue( mockedKeepTokenStakingContract @@ -115,11 +103,6 @@ describe("Test `useFetchTvl` hook", () => { // given const ethInKeepBonding = { raw: "10000000000000000000", format: "10.0" } const tbtcTokenTotalSupply = { raw: "5000000000000000000", format: "5.0" } - const coveragePoolTvl = { raw: "500000000000000000000", format: "500.0" } - const keepCoveragePoolTvl = { - raw: "300000000000000000000", - format: "300.0", - } const keepStaking = { raw: "500000000000000000000", format: "500.0" } const tStaking = { raw: "600000000000000000000", format: "600.0" } const tBTC = { raw: "700000000000000000000", format: "700.0" } @@ -127,8 +110,6 @@ describe("Test `useFetchTvl` hook", () => { const multicallRequestResult = [ ethInKeepBonding.raw, tbtcTokenTotalSupply.raw, - coveragePoolTvl.raw, - keepCoveragePoolTvl.raw, keepStaking.raw, tStaking.raw, tBTC.raw, @@ -143,8 +124,6 @@ describe("Test `useFetchTvl` hook", () => { const _expectedResult = { ecdsa: +ethInKeepBonding.format * mockedETHData.usdPrice, tbtc: +tbtcTokenTotalSupply.format * tbtcv1Context.usdConversion, - coveragePool: +coveragePoolTvl.format * tContext.usdConversion, - keepCoveragePool: +keepCoveragePoolTvl.format * keepContext.usdConversion, keepStaking: +keepStaking.format * keepContext.usdConversion, tStaking: +tStaking.format * tContext.usdConversion, tBTC: +tBTC.format * tBTCContext.usdConversion, @@ -155,16 +134,12 @@ describe("Test `useFetchTvl` hook", () => { const expectedResult = { ecdsa: `${_expectedResult.ecdsa.toString()}.0`, tbtcv1: `${_expectedResult.tbtc.toString()}.0`, - coveragePool: `${_expectedResult.coveragePool.toString()}.0`, - keepCoveragePool: `${_expectedResult.keepCoveragePool.toString()}.0`, keepStaking: `${_expectedResult.keepStaking.toString()}.0`, tStaking: `${_expectedResult.tStaking.toString()}.0`, tBTC: `${_expectedResult.tBTC.toString()}.0`, total: `${ _expectedResult.ecdsa + _expectedResult.tbtc + - _expectedResult.coveragePool + - _expectedResult.keepCoveragePool + _expectedResult.keepStaking + _expectedResult.tStaking + _expectedResult.tBTC @@ -184,8 +159,6 @@ describe("Test `useFetchTvl` hook", () => { expect(spyOnUseToken).toHaveBeenCalledWith(Token.TBTCV2) expect(useKeepBondingContract).toHaveBeenCalled() expect(useMulticallContract).toHaveBeenCalled() - expect(useAssetPoolContract).toHaveBeenCalled() - expect(useKeepAssetPoolContract).toHaveBeenCalled() expect(useTStakingContract).toHaveBeenCalled() expect(useKeepTokenStakingContract).toHaveBeenCalled() expect(useMulticall).toHaveBeenCalledWith([ @@ -200,16 +173,6 @@ describe("Test `useFetchTvl` hook", () => { address: tbtcv1Context.contract.address, method: "totalSupply", }, - { - interface: mockedAssetPoolContract.interface, - address: mockedAssetPoolContract.address, - method: "totalValue", - }, - { - interface: mockedKeepAssetPoolContract.interface, - address: mockedKeepAssetPoolContract.address, - method: "totalValue", - }, { interface: keepContext.contract.interface, address: keepContext.contract.address, @@ -262,21 +225,11 @@ describe("Test `useFetchTvl` hook", () => { ) expect(spyOnToUsdBalance).toHaveBeenNthCalledWith( 11, - coveragePoolTvl.format, - tContext.usdConversion - ) - expect(spyOnToUsdBalance).toHaveBeenNthCalledWith( - 12, - keepCoveragePoolTvl.format, - keepContext.usdConversion - ) - expect(spyOnToUsdBalance).toHaveBeenNthCalledWith( - 13, keepStaking.format, keepContext.usdConversion ) expect(spyOnToUsdBalance).toHaveBeenNthCalledWith( - 14, + 12, tStaking.format, tContext.usdConversion ) diff --git a/src/hooks/useFetchTvl.ts b/src/hooks/useFetchTvl.ts index c82a18544..a4ff84946 100644 --- a/src/hooks/useFetchTvl.ts +++ b/src/hooks/useFetchTvl.ts @@ -5,8 +5,6 @@ import { useKeepBondingContract, useMulticall, useMulticallContract, - useAssetPoolContract, - useKeepAssetPoolContract, useTStakingContract, useKeepTokenStakingContract, } from "../web3/hooks" @@ -19,8 +17,6 @@ import { useIsTbtcSdkInitializing } from "../contexts/ThresholdContext" interface TvlRawData { ecdsaTvl: string tbtcv1Tvl: string - coveragePoolTvl: string - keepCoveragePoolTvl: string keepStakingTvl: string tStakingTvl: string tBTC: string @@ -29,8 +25,6 @@ interface TvlRawData { interface TvlData { ecdsa: string tbtcv1: string - coveragePool: string - keepCoveragePool: string keepStaking: string tStaking: string tBTC: string @@ -40,11 +34,9 @@ interface TvlData { const initialState = { ecdsaTvl: "0", tbtcv1Tvl: "0", - tBTC: "0", - coveragePoolTvl: "0", - keepCoveragePoolTvl: "0", keepStakingTvl: "0", tStakingTvl: "0", + tBTC: "0", } export const useFetchTvl = (): [ @@ -56,8 +48,6 @@ export const useFetchTvl = (): [ const { ecdsaTvl, tbtcv1Tvl: tbtcTvl, - coveragePoolTvl, - keepCoveragePoolTvl, keepStakingTvl, tStakingTvl, tBTC: tBTCTvl, @@ -69,8 +59,6 @@ export const useFetchTvl = (): [ const t = useToken(Token.T) const keepBonding = useKeepBondingContract() const multicall = useMulticallContract() - const assetPool = useAssetPoolContract() - const keepAssetPool = useKeepAssetPoolContract() const tTokenStaking = useTStakingContract() const keepTokenStaking = useKeepTokenStakingContract() const tBTCToken = useToken(Token.TBTCV2) @@ -88,16 +76,6 @@ export const useFetchTvl = (): [ interface: tbtcv1.contract?.interface!, method: "totalSupply", }, - { - address: assetPool?.address!, - interface: assetPool?.interface!, - method: "totalValue", - }, - { - address: keepAssetPool?.address!, - interface: keepAssetPool?.interface!, - method: "totalValue", - }, { address: keep.contract?.address!, interface: keep.contract?.interface!, @@ -125,8 +103,6 @@ export const useFetchTvl = (): [ const [ ethInKeepBonding, tbtcv1TokenTotalSupply, - coveragePoolTvl, - keepCoveragePoolTvl, keepStaking, tStaking, tBTCTokenTotalSupply, @@ -135,8 +111,6 @@ export const useFetchTvl = (): [ const data: TvlRawData = { ecdsaTvl: ethInKeepBonding, tbtcv1Tvl: tbtcv1TokenTotalSupply, - coveragePoolTvl: coveragePoolTvl, - keepCoveragePoolTvl: keepCoveragePoolTvl, keepStakingTvl: keepStaking, tStakingTvl: tStaking, tBTC: tBTCTokenTotalSupply, @@ -152,16 +126,6 @@ export const useFetchTvl = (): [ const tbtcv1USD = toUsdBalance(formatUnits(tbtcTvl), tbtcv1.usdConversion) const tBTCUSD = toUsdBalance(formatUnits(tBTCTvl), tBTCToken.usdConversion) - const coveragePool = toUsdBalance( - formatUnits(coveragePoolTvl), - t.usdConversion - ) - - const keepCoveragePool = toUsdBalance( - formatUnits(keepCoveragePoolTvl), - keep.usdConversion - ) - const keepStaking = toUsdBalance( formatUnits(keepStakingTvl), keep.usdConversion @@ -172,15 +136,11 @@ export const useFetchTvl = (): [ return { ecdsa: ecdsa.toString(), tbtcv1: tbtcv1USD.toString(), - coveragePool: coveragePool.toString(), - keepCoveragePool: keepCoveragePool.toString(), keepStaking: keepStaking.toString(), tStaking: tStaking.toString(), tBTC: tBTCUSD.toString(), total: ecdsa .addUnsafe(tbtcv1USD) - .addUnsafe(coveragePool) - .addUnsafe(keepCoveragePool) .addUnsafe(keepStaking) .addUnsafe(tStaking) .addUnsafe(tBTCUSD) @@ -188,7 +148,6 @@ export const useFetchTvl = (): [ } as TvlData }, [ ecdsaTvl, - keepCoveragePoolTvl, tbtcTvl, keepStakingTvl, tStakingTvl, diff --git a/src/pages/Overview/Network/index.tsx b/src/pages/Overview/Network/index.tsx index 916ec20df..076ed4c24 100644 --- a/src/pages/Overview/Network/index.tsx +++ b/src/pages/Overview/Network/index.tsx @@ -9,7 +9,6 @@ import { BodyMd, VStack, } from "@threshold-network/components" -import { useWeb3React } from "@web3-react/core" import TotalValueLocked from "./TotalValueLocked" import StakingOverview from "./StakingOverview" import { useFetchTvl } from "../../../hooks/useFetchTvl" @@ -21,7 +20,6 @@ import { useAppDispatch, useAppSelector } from "../../../hooks/store" import { selectBridgeActivity, tbtcSlice } from "../../../store/tbtc" import ButtonLink from "../../../components/ButtonLink" import upgradeToTIcon from "../../../static/images/upgrade-to-t.svg" -import { CoveragePoolsTvlCard } from "../../tBTC/CoveragePools" import { useIsActive } from "../../../hooks/useIsActive" const Network: PageComponent = () => { @@ -60,7 +58,6 @@ const Network: PageComponent = () => { isBridgeActivityFetching={isBridgeActivityFetching} /> - diff --git a/src/pages/tBTC/CoveragePools/CoveragePoolsTvlCard.tsx b/src/pages/tBTC/CoveragePools/CoveragePoolsTvlCard.tsx deleted file mode 100644 index 3e75b38d1..000000000 --- a/src/pages/tBTC/CoveragePools/CoveragePoolsTvlCard.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { FC } from "react" -import { H1, BoxProps, Center } from "@threshold-network/components" -import { formatFiatCurrencyAmount } from "../../../utils/formatAmount" -import { - StatHighlightCard, - StatHighlightTitle, - StatHighlightTitleTooltip, - StatHighlightValue, -} from "../../../components/StatHighlightCard" -import Link, { LinkProps } from "../../../components/Link" -import { ExternalHref } from "../../../enums" - -export interface CoveragePoolsTvlCardProps extends BoxProps { - coveragePoolTvl: string -} - -type LearnMoreLinkProps = Omit - -const LearnMoreLink: FC = ({ children, ...restProps }) => { - return ( - - {children} - - ) -} - -export const CoveragePoolsTvlCard: FC = ({ - coveragePoolTvl, - ...restProps -}) => { - const formattedTvl = formatFiatCurrencyAmount(coveragePoolTvl) - const tooltipLabel = ( - <> - Threshold Coverage Pool serves as a backstop for assets secured by the - tBTC protocol. In the event that secured Bitcoin is los from protocol, - assets from the coverage pool are withdrawn by the risk manager, converted - to BTC, an put back into the protocol to achieve the supply peg as closely - as possible. Learn more - - ) - return ( - - - - - -
- Learn more about Coverage Pools -
- - ) -} diff --git a/src/pages/tBTC/CoveragePools/index.tsx b/src/pages/tBTC/CoveragePools/index.tsx deleted file mode 100644 index 363963aab..000000000 --- a/src/pages/tBTC/CoveragePools/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from "./CoveragePoolsTvlCard" diff --git a/src/web3/hooks/index.ts b/src/web3/hooks/index.ts index 956c76314..b7293b065 100644 --- a/src/web3/hooks/index.ts +++ b/src/web3/hooks/index.ts @@ -12,8 +12,6 @@ export * from "./useVendingMachineContract" export * from "./useVendingMachineRatio" export * from "./useMulticallContract" export * from "./useKeepBondingContract" -export * from "./useAssetPoolContract" -export * from "./useKeepAssetPoolContract" export * from "./useTBTCTokenContract" export * from "./useTStakingContract" export * from "./useKeepTokenStakingContract" diff --git a/src/web3/hooks/useAssetPoolContract.ts b/src/web3/hooks/useAssetPoolContract.ts deleted file mode 100644 index a4d4aea00..000000000 --- a/src/web3/hooks/useAssetPoolContract.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { useContract } from "./useContract" -import AssetPool from "@threshold-network/coverage-pools/artifacts/AssetPool.json" - -export const useAssetPoolContract = () => { - return useContract(AssetPool.address, AssetPool.abi) -} diff --git a/src/web3/hooks/useKeepAssetPoolContract.ts b/src/web3/hooks/useKeepAssetPoolContract.ts deleted file mode 100644 index 99f20fa29..000000000 --- a/src/web3/hooks/useKeepAssetPoolContract.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { useContract } from "./useContract" -import AssetPool from "@keep-network/coverage-pools/artifacts/AssetPool.json" - -export const useKeepAssetPoolContract = () => { - return useContract(AssetPool.address, AssetPool.abi) -} diff --git a/yarn.lock b/yarn.lock index 85969946d..47aebc451 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3299,17 +3299,6 @@ resolved "https://registry.yarnpkg.com/@keep-network/bitcoin-spv-sol/-/bitcoin-spv-sol-3.4.0-solc-0.8.tgz#8b44c246ffab8ea993efe196f6bf385b1a3b84dc" integrity sha512-KlpY9BbasyLvYXSS7dsJktgRChu/yjdFLOX8ldGA/pltLicCm/l0F4oqxL8wSws9XD12vq9x0B5qzPygVLB2TQ== -"@keep-network/coverage-pools@development": - version "2.1.0-dev.2" - resolved "https://registry.yarnpkg.com/@keep-network/coverage-pools/-/coverage-pools-2.1.0-dev.2.tgz#02fc28cb1dab05c16254fa98c9a7f1e15762a5b1" - integrity sha512-gp46JtR7JWVTOPOlk2l2IEfKZtuoooo64BRA6V8aX4XMzX/nZmInoGjeq9z/Pqq1rJnEbxS5tpjvj1cmY44CoA== - dependencies: - "@keep-network/keep-core" "1.8.1-dev.0" - "@keep-network/tbtc" "1.1.2-dev.1" - "@openzeppelin/contracts" "^4.8" - "@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf" - "@threshold-network/solidity-contracts" "1.3.0-dev.5" - "@keep-network/ecdsa@2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@keep-network/ecdsa/-/ecdsa-2.0.0.tgz#96d301cd272e61334bec173b5c4945758fc80853" @@ -3346,14 +3335,6 @@ "@openzeppelin/upgrades" "^2.7.2" openzeppelin-solidity "2.4.0" -"@keep-network/keep-core@1.8.1-dev.0", "@keep-network/keep-core@>1.8.1-dev <1.8.1-goerli", "@keep-network/keep-core@development": - version "1.8.1-dev.0" - resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-dev.0.tgz#d95864b25800214de43d8840376a68336cb12055" - integrity sha512-gFXkgN4PYOYCZ14AskL7fZHEFW5mu3BDd+TJKBuKZc1q9CgRMOK+dxpJnSctxmSH1tV+Ln9v9yqlSkfPCoiBHw== - dependencies: - "@openzeppelin/upgrades" "^2.7.2" - openzeppelin-solidity "2.4.0" - "@keep-network/keep-core@1.8.1-goerli.0": version "1.8.1-goerli.0" resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-goerli.0.tgz#238485aab51902021d42357bf59695225002f0ab" @@ -3362,6 +3343,14 @@ "@openzeppelin/upgrades" "^2.7.2" openzeppelin-solidity "2.4.0" +"@keep-network/keep-core@>1.8.1-dev <1.8.1-goerli", "@keep-network/keep-core@development": + version "1.8.1-dev.0" + resolved "https://registry.yarnpkg.com/@keep-network/keep-core/-/keep-core-1.8.1-dev.0.tgz#d95864b25800214de43d8840376a68336cb12055" + integrity sha512-gFXkgN4PYOYCZ14AskL7fZHEFW5mu3BDd+TJKBuKZc1q9CgRMOK+dxpJnSctxmSH1tV+Ln9v9yqlSkfPCoiBHw== + dependencies: + "@openzeppelin/upgrades" "^2.7.2" + openzeppelin-solidity "2.4.0" + "@keep-network/keep-ecdsa@1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@keep-network/keep-ecdsa/-/keep-ecdsa-1.2.1.tgz#5dcbc2c3808cce55a6e0d9e524868a0e9a0f1562" @@ -3483,7 +3472,7 @@ "@summa-tx/relay-sol" "^2.0.2" openzeppelin-solidity "2.3.0" -"@keep-network/tbtc@1.1.2-dev.1", "@keep-network/tbtc@development": +"@keep-network/tbtc@development": version "1.1.2-dev.1" resolved "https://registry.yarnpkg.com/@keep-network/tbtc/-/tbtc-1.1.2-dev.1.tgz#dd1e734c0fed50474c74d7170c8749127231d1f9" integrity sha512-IRa0j1D7JBG8UpduaFxkaq2Ii6F61HhNMUBmxr7kAIZwj/yx8sYXWi921mn0L2Z+hAYNcwEUVhCM91VKQH29pQ== @@ -3766,7 +3755,7 @@ resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.1.tgz#709cfc4bbb3ca9f4460d60101f15dac6b7a2d5e4" integrity sha512-xQ6eUZl+RDyb/FiZe1h+U7qr/f4p/SrTSQcTPH2bjur3C5DbuW/zFgCU/b1P/xcIaEqJep+9ju4xDRi3rmChdQ== -"@openzeppelin/contracts@^4.3.2", "@openzeppelin/contracts@^4.6.0", "@openzeppelin/contracts@^4.8", "@openzeppelin/contracts@^4.8.1": +"@openzeppelin/contracts@^4.3.2", "@openzeppelin/contracts@^4.6.0", "@openzeppelin/contracts@^4.8.1": version "4.9.1" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.1.tgz#afa804d2c68398704b0175acc94d91a54f203645" integrity sha512-aLDTLu/If1qYIFW5g4ZibuQaUsFGWQPBq1mZKp/txaebUnGHDmmiBhRLY1tDNedN0m+fJtKZ1zAODS9Yk+V6uA== @@ -4406,17 +4395,6 @@ resolved "https://registry.npmjs.org/@threshold-network/components/-/components-1.0.0-dev.31.tgz#7767a9f136156f8d4f3044d90e87a1014eb07a67" integrity sha512-ftzJV6p2He3Co0wLYky+sX0NAFVGrJCRvBDI0n3KF4POBO425Qy3yodS7HOkT1TgGRNU8AGO0KebS2X7gfgAEA== -"@threshold-network/coverage-pools@npm:@keep-network/coverage-pools@development": - version "2.1.0-dev.3" - resolved "https://registry.yarnpkg.com/@keep-network/coverage-pools/-/coverage-pools-2.1.0-dev.3.tgz#95b2c7df4a109a6d82fcb067ea1f4bbac4e9434a" - integrity sha512-b6UMu5/8Rd/OS33T6RwMAHyyJtIInzJVwVFx4ZxMwKvPBE/orRAIVkgkCUWUNM04WWexgt/i5h393lia9d00IQ== - dependencies: - "@keep-network/keep-core" "1.8.1-dev.0" - "@keep-network/tbtc" "1.1.2-dev.1" - "@openzeppelin/contracts" "^4.8" - "@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf" - "@threshold-network/solidity-contracts" "1.3.0-dev.5" - "@threshold-network/solidity-contracts@1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.2.1.tgz#8f9d8fe52f24b51acc52fdff765fdef3b8546587"