From 4868b8a4d1091c4ea10a6bc1e0e874619514b1ca Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Wed, 6 Sep 2023 13:49:45 -0300 Subject: [PATCH 1/8] refactor: use address from npm packages --- package.json | 2 + subgraphs/isolated-pools/config/bsc.json | 6 -- subgraphs/isolated-pools/config/chapel.json | 6 -- subgraphs/isolated-pools/config/index.ts | 55 ++++++++++++++ subgraphs/isolated-pools/config/sepolia.json | 6 -- subgraphs/isolated-pools/package.json | 3 + subgraphs/venus-governance/config/bsc.json | 14 ---- subgraphs/venus-governance/config/chapel.json | 14 ---- subgraphs/venus-governance/config/index.ts | 75 +++++++++++++++++++ subgraphs/venus/config/index.ts | 46 ++++++++++++ subgraphs/venus/src/constants/index.ts | 3 + subgraphs/venus/src/operations/create.ts | 22 +++--- .../venus/src/utilities/getBnbPriceInUsd.ts | 18 ----- subgraphs/venus/src/utilities/index.ts | 1 - subgraphs/venus/tests/Comptroller.test.ts | 10 ++- subgraphs/venus/tests/constants.ts | 8 ++ subgraphs/venus/tests/mocks.ts | 2 +- tsconfig.json | 2 +- yarn.lock | 25 ++++++- 19 files changed, 237 insertions(+), 81 deletions(-) delete mode 100644 subgraphs/isolated-pools/config/bsc.json delete mode 100644 subgraphs/isolated-pools/config/chapel.json create mode 100644 subgraphs/isolated-pools/config/index.ts delete mode 100644 subgraphs/isolated-pools/config/sepolia.json delete mode 100644 subgraphs/venus-governance/config/bsc.json delete mode 100644 subgraphs/venus-governance/config/chapel.json create mode 100644 subgraphs/venus-governance/config/index.ts create mode 100644 subgraphs/venus/config/index.ts delete mode 100644 subgraphs/venus/src/utilities/getBnbPriceInUsd.ts create mode 100644 subgraphs/venus/tests/constants.ts diff --git a/package.json b/package.json index 488b23b8..af37a925 100644 --- a/package.json +++ b/package.json @@ -45,11 +45,13 @@ "@typechain/hardhat": "^6.1.2", "@types/mocha": "^9.1.1", "@types/mustache": "^4.2.1", + "@types/node": "^20.5.9", "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", "@venusprotocol/governance-contracts": "^1.3.0", "@venusprotocol/isolated-pools": "2.1.0-dev.2", "@venusprotocol/oracle": "^1.7.3-dev.1", + "@venusprotocol/venus-protocol": "^3.0.0-dev.7", "assemblyscript": "0.19.23", "chai": "^4.3.6", "eslint": "^8.25.0", diff --git a/subgraphs/isolated-pools/config/bsc.json b/subgraphs/isolated-pools/config/bsc.json deleted file mode 100644 index 561522c3..00000000 --- a/subgraphs/isolated-pools/config/bsc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "bsc", - "poolRegistryAddress": "0x9F7b01A536aFA00EF10310A162877fd792cD0666", - "poolLensAddress": "0xe12da02820fAD83e0369C6De7Ae30721eaB60E32", - "startBlock": "29300000" -} diff --git a/subgraphs/isolated-pools/config/chapel.json b/subgraphs/isolated-pools/config/chapel.json deleted file mode 100644 index 4137fb4b..00000000 --- a/subgraphs/isolated-pools/config/chapel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "chapel", - "poolRegistryAddress": "0xC85491616Fa949E048F3aAc39fbf5b0703800667", - "poolLensAddress": "0x559936086C5f65b92240012ae0D2F70C082Ac0b0", - "startBlock": "30870000" -} diff --git a/subgraphs/isolated-pools/config/index.ts b/subgraphs/isolated-pools/config/index.ts new file mode 100644 index 00000000..0c759713 --- /dev/null +++ b/subgraphs/isolated-pools/config/index.ts @@ -0,0 +1,55 @@ +import mainnetDeployments from '@venusprotocol/isolated-pools/deployments/bscmainnet.json'; +import sepoliaDeployments from '@venusprotocol/isolated-pools/deployments/bsctestnet.json'; +import chapelDeployments from '@venusprotocol/isolated-pools/deployments/bsctestnet.json'; +import fs from 'fs'; +import Mustache from 'mustache'; + +export const getNetwork = () => { + const supportedNetworks = ['sepolia', 'chapel', 'bsc', 'local'] as const; + const network = process.env.NETWORK; + // @ts-expect-error network env var is unknown here + if (!supportedNetworks.includes(network)) { + throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); + } + return network as typeof supportedNetworks[number]; +}; + +const main = () => { + const network = getNetwork(); + const config = { + local: { + network: 'hardhat', + poolRegistryAddress: '0x95401dc811bb5740090279Ba06cfA8fcF6113778', + poolLensAddress: '0x809d550fca64d94Bd9F66E60752A544199cfAC3D', + startBlock: 0, + }, + sepolia: { + network: 'sepolia', + poolRegistryAddress: sepoliaDeployments.contracts.PoolRegistry.address, + poolLensAddress: sepoliaDeployments.contracts.PoolLens.address, + startBlock: '3930059', + }, + chapel: { + network: 'chapel', + poolRegistryAddress: chapelDeployments.contracts.PoolRegistry.address, + poolLensAddress: chapelDeployments.contracts.PoolLens.address, + startBlock: '30870000', + }, + bsc: { + network: 'bsc', + poolRegistryAddress: mainnetDeployments.contracts.PoolRegistry.address, + poolLensAddress: mainnetDeployments.contracts.PoolLens.address, + startBlock: '29300000', + }, + }; + + const yamlTemplate = fs.readFileSync('template.yaml', 'utf8'); + const yamlOutput = Mustache.render(yamlTemplate, config[network]); + fs.writeFileSync('subgraph.yaml', yamlOutput); + + const configTemplate = fs.readFileSync('src/constants/config-template', 'utf8'); + const tsOutput = Mustache.render(configTemplate, config[network]); + fs.writeFileSync('src/constants/config.ts', tsOutput); +}; + +main(); diff --git a/subgraphs/isolated-pools/config/sepolia.json b/subgraphs/isolated-pools/config/sepolia.json deleted file mode 100644 index 6b239700..00000000 --- a/subgraphs/isolated-pools/config/sepolia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "sepolia", - "poolRegistryAddress": "0xe7CE0296D5B0a26fB183ceBf800ECC918eBBD738", - "poolLensAddress": "0x57E0b52dBcC63F5c23fEd947e634aF06Fc20C70b", - "startBlock": "3930059" -} diff --git a/subgraphs/isolated-pools/package.json b/subgraphs/isolated-pools/package.json index e1f7e5b6..bd3ae59a 100644 --- a/subgraphs/isolated-pools/package.json +++ b/subgraphs/isolated-pools/package.json @@ -18,10 +18,13 @@ "deploy:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts && npx graph deploy venusprotocol/venus-isolated-pools --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", "deploy:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-isolated-pools-chapel --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", "deploy:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-isolated-pools --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "deploy:sepolia": "prepare:sepolia && npx graph deploy --studio venus-isolated-pools-sepolia", "prepare:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts", "prepare:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts", "prepare:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts", + "prepare:sepolia": "NETWORK=sepolia npx ts-node config/index.ts", "generate-subgraph-types": "rm -rf /subgraph-client/.graphclient && npx graphclient build --dir ./subgraph-client", + "pretty": "prettier —-write '**/*.ts'", "test": "yarn prepare:docker && graph test", "test:integration": "npx hardhat test tests/integration/index.ts --network localhost" }, diff --git a/subgraphs/venus-governance/config/bsc.json b/subgraphs/venus-governance/config/bsc.json deleted file mode 100644 index 1deb277e..00000000 --- a/subgraphs/venus-governance/config/bsc.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": "bsc", - "accessControlManagerAddress": "", - "accessControlManagerStartBlock": "", - "governorAlphaAddress": "0x406f48f47d25e9caa29f17e7cfbd1dc6878f078f", - "governorAlphaStartBlock": "2474351", - "governorAlpha2Address": "0x388313BfEFEE8ddfeAD55b585F62812293Cf3A60", - "governorAlpha2StartBlock": "11934064", - "governorBravoDelegatorAddress": "0x2d56dC077072B53571b8252008C60e945108c75a", - "governorBravoDelegatorStartBlock": "13729317", - "xvsVaultAddress": "0x6eF49b4e0772Fe78128F981d42D54172b55eCF9F", - "xvsVaultStartBlock": "13018718", - "xvsVaultPid": "0" -} diff --git a/subgraphs/venus-governance/config/chapel.json b/subgraphs/venus-governance/config/chapel.json deleted file mode 100644 index 8b008e4b..00000000 --- a/subgraphs/venus-governance/config/chapel.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": "bsc-testnet", - "accessControlManagerAddress": "0x4a471468cdABA84CEA885aF72129F2e974C3649B", - "accessControlManagerStartBlock": "24711629", - "governorAlphaAddress": "0x7df10b2118eb04d9806b15198019f83741a9f8f4", - "governorAlphaStartBlock": "8205736", - "governorAlpha2Address": "0x7116894ed34FC4B27D5b84f46B70Af48397a6C24", - "governorAlpha2StartBlock": "13584539", - "governorBravoDelegatorAddress": "0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2", - "governorBravoDelegatorStartBlock": "16002994", - "xvsVaultAddress": "0xa4Fd54cACdA379FB7CaA783B83Cc846f8ac0Faa6", - "xvsVaultStartBlock": "13937802", - "xvsVaultPid": "1" -} diff --git a/subgraphs/venus-governance/config/index.ts b/subgraphs/venus-governance/config/index.ts new file mode 100644 index 00000000..976d75c9 --- /dev/null +++ b/subgraphs/venus-governance/config/index.ts @@ -0,0 +1,75 @@ +import fs from 'fs'; +import Mustache from 'mustache'; + +export const getNetwork = () => { + const supportedNetworks = ['chapel', 'bsc', 'local'] as const; + const network = process.env.NETWORK; + // @ts-expect-error network env var is unknown here + if (!supportedNetworks.includes(network)) { + throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); + } + return network as typeof supportedNetworks[number]; +}; + +const main = () => { + const network = getNetwork(); + const config = { + local: { + network: 'bsc', + accessControlManagerAddress: '0xc5a5C42992dECbae36851359345FE25997F5C42d', + accessControlManagerStartBlock: '0', + governorAlphaAddress: '0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1', + governorAlphaStartBlock: '0', + governorAlpha2Address: '0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE', + governorAlpha2StartBlock: '0', + governorBravoDelegateAddress: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', + governorBravoDelegateStartBlock: '16002994', + governorBravoDelegate2Address: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', + governorBravoDelegate2StartBlock: '16002994', + xvsTokenAddress: '0x5FbDB2315678afecb367f032d93F642f64180aa3', + xvsTokenStartBlock: '0', + xvsVaultAddress: '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0', + xvsVaultStartBlock: '0', + }, + chapel: { + network: 'chapel', + accessControlManagerAddress: '0x4a471468cdABA84CEA885aF72129F2e974C3649B', + accessControlManagerStartBlock: '24711629', + governorAlphaAddress: '0x7df10b2118eb04d9806b15198019f83741a9f8f4', + governorAlphaStartBlock: '8205736', + governorAlpha2Address: '0x7116894ed34FC4B27D5b84f46B70Af48397a6C24', + governorAlpha2StartBlock: '13584539', + governorBravoDelegateAddress: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', + governorBravoDelegateStartBlock: '16002994 ', + governorBravoDelegate2Address: '', + governorBravoDelegate2StartBlock: '', + xvsTokenAddress: '0xB9e0E753630434d7863528cc73CB7AC638a7c8ff', + xvsTokenStartBlock: '2802593', + xvsVaultAddress: '0xa4Fd54cACdA379FB7CaA783B83Cc846f8ac0Faa6', + xvsVaultStartBlock: '13937802', + }, + bsc: { + network: 'bsc', + accessControlManagerAddress: '', + accessControlManagerStartBlock: '', + governorAlphaAddress: '0x406f48f47d25e9caa29f17e7cfbd1dc6878f078f', + governorAlphaStartBlock: '2474351', + governorAlpha2Address: '0x388313BfEFEE8ddfeAD55b585F62812293Cf3A60', + governorAlpha2StartBlock: '11934064', + governorBravoDelegateAddress: '0x2d56dC077072B53571b8252008C60e945108c75a', + governorBravoDelegateStartBlock: '13729317', + governorBravoDelegate2Address: '', + governorBravoDelegate2StartBlock: '', + xvsTokenAddress: '0xcf6bb5389c92bdda8a3747ddb454cb7a64626c63', + xvsTokenStartBlock: '858561', + xvsVaultAddress: '0x6eF49b4e0772Fe78128F981d42D54172b55eCF9F', + xvsVaultStartBlock: '13018718', + }, + }; + + const yamlTemplate = fs.readFileSync('template.yaml', 'utf8'); + const yamlOutput = Mustache.render(yamlTemplate, config[network]); + fs.writeFileSync('subgraph.yaml', yamlOutput); +}; + +main(); diff --git a/subgraphs/venus/config/index.ts b/subgraphs/venus/config/index.ts new file mode 100644 index 00000000..f6b13ff1 --- /dev/null +++ b/subgraphs/venus/config/index.ts @@ -0,0 +1,46 @@ +#!/usr/bin/env ts-node +import bscMainnetCoreDeployments from '@venusprotocol/venus-protocol/networks/mainnet.json'; +import bscTestnetCoreDeployments from '@venusprotocol/venus-protocol/networks/testnet.json'; +import fs from 'fs'; +import Mustache from 'mustache'; + +export const getNetwork = () => { + const supportedNetworks = ['chapel', 'bsc', 'local'] as const; + const network = process.env.NETWORK; + // @ts-expect-error network env var is unknown here + if (!supportedNetworks.includes(network)) { + throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); + } + return network as typeof supportedNetworks[number]; +}; + +const main = () => { + const network = getNetwork(); + const config = { + local: { + network: 'hardhat', + comptrollerAddress: '0x94d1820b2D1c7c7452A163983Dc888CEC546b77D', + startBlock: '0', + }, + chapel: { + network: 'chapel', + comptrollerAddress: bscTestnetCoreDeployments.Contracts.Comptroller, + startBlock: '2470000', + }, + bsc: { + network: 'bsc', + comptrollerAddress: bscMainnetCoreDeployments.Contracts.Comptroller, + startBlock: '2470000', + }, + }; + + const yamlTemplate = fs.readFileSync('template.yaml', 'utf8'); + const yamlOutput = Mustache.render(yamlTemplate, config[network]); + fs.writeFileSync('subgraph.yaml', yamlOutput); + + const configTemplate = fs.readFileSync('src/constants/config-template', 'utf8'); + const tsOutput = Mustache.render(configTemplate, config[network]); + fs.writeFileSync('src/constants/config.ts', tsOutput); +}; + +main(); diff --git a/subgraphs/venus/src/constants/index.ts b/subgraphs/venus/src/constants/index.ts index 41c14c61..77f2b7b1 100644 --- a/subgraphs/venus/src/constants/index.ts +++ b/subgraphs/venus/src/constants/index.ts @@ -15,6 +15,9 @@ export const EXIT_MARKET = 'EXIT_MARKET'; export const mantissaFactor = 18; export const mantissaFactorBigDecimal: BigDecimal = exponentToBigDecimal(mantissaFactor); +export const NOT_AVAILABLE_BIG_INT = BigInt.fromString('-1'); +export const NOT_AVAILABLE_BIG_DECIMAL = BigDecimal.fromString('-1'); + export const zeroBigDecimal = BigDecimal.fromString('0'); export const zeroBigInt32 = BigInt.fromString('0'); export const oneBigInt = BigInt.fromString('1'); diff --git a/subgraphs/venus/src/operations/create.ts b/subgraphs/venus/src/operations/create.ts index b45f0a2b..b25deb3d 100644 --- a/subgraphs/venus/src/operations/create.ts +++ b/subgraphs/venus/src/operations/create.ts @@ -4,7 +4,7 @@ import { Account, AccountVToken, Market, MintEvent, RedeemEvent } from '../../ge import { BEP20 } from '../../generated/templates/VToken/BEP20'; import { VToken } from '../../generated/templates/VToken/VToken'; import { zeroBigInt32 } from '../constants'; -import { nullAddress, vBnbAddress } from '../constants/addresses'; +import { nullAddress } from '../constants/addresses'; import { getUnderlyingPrice } from '../utilities/getUnderlyingPrice'; import { getTransactionId } from '../utilities/ids'; @@ -44,22 +44,24 @@ export function createAccount(accountId: string): Account { export function createMarket(marketAddress: string): Market { let market: Market; - const contract = VToken.bind(Address.fromString(marketAddress)); + const vTokenContract = VToken.bind(Address.fromString(marketAddress)); log.debug('[createMarket] market address: {}', [marketAddress]); + const vTokenSymbol = vTokenContract.symbol(); + // It is vBNB, which has a slightly different interface - if (marketAddress == vBnbAddress.toHexString()) { + if (vTokenSymbol == 'vBNB') { market = new Market(marketAddress); market.underlyingAddress = nullAddress; market.underlyingDecimals = 18; - market.underlyingName = 'Binance Coin'; + market.underlyingName = 'BNB'; market.underlyingSymbol = 'BNB'; market.underlyingPriceCents = zeroBigInt32; // It is all other VBEP20 contracts } else { market = new Market(marketAddress); - market.underlyingAddress = contract.underlying(); + market.underlyingAddress = vTokenContract.underlying(); log.debug('[createMarket] market underlying address: {}', [ market.underlyingAddress.toHexString(), ]); @@ -72,10 +74,10 @@ export function createMarket(marketAddress: string): Market { market.underlyingPriceCents = underlyingPriceCents; } - market.vTokenDecimals = contract.decimals(); + market.vTokenDecimals = vTokenContract.decimals(); - const interestRateModelAddress = contract.try_interestRateModel(); - const reserveFactor = contract.try_reserveFactorMantissa(); + const interestRateModelAddress = vTokenContract.try_interestRateModel(); + const reserveFactor = vTokenContract.try_reserveFactorMantissa(); market.borrowRateMantissa = zeroBigInt32; market.cashMantissa = zeroBigInt32; @@ -84,10 +86,10 @@ export function createMarket(marketAddress: string): Market { market.interestRateModelAddress = interestRateModelAddress.reverted ? nullAddress : interestRateModelAddress.value; - market.name = contract.name(); + market.name = vTokenContract.name(); market.reservesMantissa = BigInt.fromI32(0); market.supplyRateMantissa = zeroBigInt32; - market.symbol = contract.symbol(); + market.symbol = vTokenContract.symbol(); market.totalBorrowsMantissa = zeroBigInt32; market.totalSupplyMantissa = zeroBigInt32; diff --git a/subgraphs/venus/src/utilities/getBnbPriceInUsd.ts b/subgraphs/venus/src/utilities/getBnbPriceInUsd.ts deleted file mode 100644 index d9d51242..00000000 --- a/subgraphs/venus/src/utilities/getBnbPriceInUsd.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Address, BigDecimal } from '@graphprotocol/graph-ts'; - -import { PriceOracle } from '../../generated/templates/VToken/PriceOracle'; -import { mantissaFactorBigDecimal } from '../constants'; -import { vBnbAddress } from '../constants/addresses'; -import { getOrCreateComptroller } from '../operations/getOrCreate'; - -export function getBnbPriceInUsd(): BigDecimal { - const comptroller = getOrCreateComptroller(); - - const oracleAddress = Address.fromBytes(comptroller.priceOracle); - const oracle = PriceOracle.bind(oracleAddress); - const bnbPriceInUSD = oracle - .getUnderlyingPrice(vBnbAddress) - .toBigDecimal() - .div(mantissaFactorBigDecimal); - return bnbPriceInUSD; -} diff --git a/subgraphs/venus/src/utilities/index.ts b/subgraphs/venus/src/utilities/index.ts index d409e6a1..0397b8fa 100644 --- a/subgraphs/venus/src/utilities/index.ts +++ b/subgraphs/venus/src/utilities/index.ts @@ -1,4 +1,3 @@ -export { getBnbPriceInUsd } from './getBnbPriceInUsd'; export { getTokenPriceCents } from './getTokenPriceCents'; export { exponentToBigDecimal } from './exponentToBigDecimal'; export { ensureComptrollerSynced } from './ensureComptrollerSynced'; diff --git a/subgraphs/venus/tests/Comptroller.test.ts b/subgraphs/venus/tests/Comptroller.test.ts index c6848fce..b6b0167e 100644 --- a/subgraphs/venus/tests/Comptroller.test.ts +++ b/subgraphs/venus/tests/Comptroller.test.ts @@ -8,9 +8,13 @@ import { test, } from 'matchstick-as/assembly/index'; -import { comptrollerAddress, nullAddress, vBnbAddress } from '../src/constants/addresses'; import { handleMarketListed } from '../src/mappings/comptroller'; -import { interestRateModelAddress } from './constants'; +import { + comptrollerAddress, + interestRateModelAddress, + nullAddress, + vBnbAddress, +} from './constants'; import { createMarketListedEvent } from './events'; import { createComptrollerMock, createVBep20AndUnderlyingMock } from './mocks'; @@ -48,7 +52,7 @@ describe('handleMarketListing', () => { assertMarketDocument('id', vBnbAddress.toHex()); assertMarketDocument('underlyingAddress', nullAddress.toHex()); assertMarketDocument('underlyingDecimals', '18'); - assertMarketDocument('underlyingName', 'Binance Coin'); + assertMarketDocument('underlyingName', 'BNB'); assertMarketDocument('underlyingSymbol', 'BNB'); assertMarketDocument('underlyingPriceCents', '0'); assertMarketDocument('borrowRateMantissa', '0'); diff --git a/subgraphs/venus/tests/constants.ts b/subgraphs/venus/tests/constants.ts new file mode 100644 index 00000000..291e0b8c --- /dev/null +++ b/subgraphs/venus/tests/constants.ts @@ -0,0 +1,8 @@ +import { Address } from '@graphprotocol/graph-ts'; + +export const vBnbAddress = Address.fromString('0xA07c5b74C9B40447a954e1466938b865b6BBea36'); +export const interestRateModelAddress = Address.fromString( + '0x594942C0e62eC577889777424CD367545C796A74', +); +export const comptrollerAddress = Address.fromString('0xfd36e2c2a6789db23113685031d7f16329158384'); +export const nullAddress = Address.fromString('0x0000000000000000000000000000000000000000'); diff --git a/subgraphs/venus/tests/mocks.ts b/subgraphs/venus/tests/mocks.ts index 2d4d5e76..48e6d6d5 100644 --- a/subgraphs/venus/tests/mocks.ts +++ b/subgraphs/venus/tests/mocks.ts @@ -1,7 +1,7 @@ import { Address, BigInt, ethereum } from '@graphprotocol/graph-ts'; import { createMockedFunction } from 'matchstick-as'; -import { vBnbAddress } from '../src/constants/addresses'; +import { vBnbAddress } from './constants'; export const mockPriceOracleAddress = Address.fromString( '0x0000000000000000000000000000000000000001', diff --git a/tsconfig.json b/tsconfig.json index b17a342e..03778313 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "module": "node16", - "types": ["@graphprotocol/graph-ts"], + "types": ["@graphprotocol/graph-ts", "node"], "noLib": false, "lib": ["es2015"], "forceConsistentCasingInFileNames": true, diff --git a/yarn.lock b/yarn.lock index dc8a5a79..1fdd0b92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4017,13 +4017,20 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=13.7.0": +"@types/node@npm:*": version: 20.6.0 resolution: "@types/node@npm:20.6.0" checksum: 52611801af5cf151c6fac1963aa4a8a8ca2e388a9e9ed82b01b70bca762088ded5b32cc789c5564220d5d7dccba2b8dd34446a3d4fc74736805e1f2cf262e29d languageName: node linkType: hard +"@types/node@npm:>=13.7.0, @types/node@npm:^20.5.9": + version: 20.5.9 + resolution: "@types/node@npm:20.5.9" + checksum: 717490e94131722144878b4ca1a963ede1673bb8f2ef78c2f5b50b918df6dc9b35e7f8283e5c2a7a9f137730f7c08dc6228e53d4494a94c9ee16881e6ce6caed + languageName: node + linkType: hard + "@types/node@npm:^10.0.3": version: 10.17.60 resolution: "@types/node@npm:10.17.60" @@ -4358,6 +4365,20 @@ __metadata: languageName: node linkType: hard +"@venusprotocol/venus-protocol@npm:^3.0.0-dev.7": + version: 3.1.0 + resolution: "@venusprotocol/venus-protocol@npm:3.1.0" + dependencies: + "@openzeppelin/contracts": ^4.8.3 + "@openzeppelin/contracts-upgradeable": ^4.8.0 + dotenv: ^16.0.1 + module-alias: ^2.2.2 + peerDependencies: + hardhat: ^2.10.1 + checksum: 0c44a6566ed623161f49036961d2118958485a59bdba71733e86c77731cde2adcfcb535b69c275381888bc1fc6d807ab9ec271e8796aa961897dac2850081e1c + languageName: node + linkType: hard + "@vue/compiler-core@npm:3.3.4": version: 3.3.4 resolution: "@vue/compiler-core@npm:3.3.4" @@ -14878,11 +14899,13 @@ __metadata: "@typechain/hardhat": ^6.1.2 "@types/mocha": ^9.1.1 "@types/mustache": ^4.2.1 + "@types/node": ^20.5.9 "@typescript-eslint/eslint-plugin": ^5.40.1 "@typescript-eslint/parser": ^5.40.1 "@venusprotocol/governance-contracts": ^1.3.0 "@venusprotocol/isolated-pools": 2.1.0-dev.2 "@venusprotocol/oracle": ^1.7.3-dev.1 + "@venusprotocol/venus-protocol": ^3.0.0-dev.7 assemblyscript: 0.19.23 chai: ^4.3.6 eslint: ^8.25.0 From ee33b5083a5bfa3bf92a26f171e315fd6289be47 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Tue, 5 Dec 2023 10:30:09 -0300 Subject: [PATCH 2/8] refactor: merge docker json files --- package.json | 6 +- ...ol+governance-contracts+1.4.0-dev.6.patch} | 0 ...protocol+venus-protocol+6.1.0-dev.5.patch} | 137 +- subgraphs/isolated-pools/config/docker.json | 6 - subgraphs/isolated-pools/config/index.ts | 12 +- subgraphs/isolated-pools/package.json | 14 +- subgraphs/venus-governance/config/docker.json | 14 - subgraphs/venus-governance/config/index.ts | 69 +- subgraphs/venus-governance/package.json | 12 +- subgraphs/venus/config/bsc.json | 6 - subgraphs/venus/config/chapel.json | 6 - subgraphs/venus/config/docker.json | 6 - subgraphs/venus/config/index.ts | 9 +- subgraphs/venus/package.json | 12 +- yarn.lock | 2321 +++++++---------- 15 files changed, 1108 insertions(+), 1522 deletions(-) rename patches/{@venusprotocol+governance-contracts+1.3.0.patch => @venusprotocol+governance-contracts+1.4.0-dev.6.patch} (100%) rename patches/{@venusprotocol+venus-protocol+5.2.0.patch => @venusprotocol+venus-protocol+6.1.0-dev.5.patch} (79%) delete mode 100644 subgraphs/isolated-pools/config/docker.json delete mode 100644 subgraphs/venus-governance/config/docker.json delete mode 100644 subgraphs/venus/config/bsc.json delete mode 100644 subgraphs/venus/config/chapel.json delete mode 100644 subgraphs/venus/config/docker.json diff --git a/package.json b/package.json index af37a925..d1216fcb 100644 --- a/package.json +++ b/package.json @@ -48,10 +48,10 @@ "@types/node": "^20.5.9", "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", - "@venusprotocol/governance-contracts": "^1.3.0", - "@venusprotocol/isolated-pools": "2.1.0-dev.2", + "@venusprotocol/governance-contracts": "^1.4.0-dev.6", + "@venusprotocol/isolated-pools": "^2.3.0-dev.4", "@venusprotocol/oracle": "^1.7.3-dev.1", - "@venusprotocol/venus-protocol": "^3.0.0-dev.7", + "@venusprotocol/venus-protocol": "^6.1.0-dev.5", "assemblyscript": "0.19.23", "chai": "^4.3.6", "eslint": "^8.25.0", diff --git a/patches/@venusprotocol+governance-contracts+1.3.0.patch b/patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch similarity index 100% rename from patches/@venusprotocol+governance-contracts+1.3.0.patch rename to patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch diff --git a/patches/@venusprotocol+venus-protocol+5.2.0.patch b/patches/@venusprotocol+venus-protocol+6.1.0-dev.5.patch similarity index 79% rename from patches/@venusprotocol+venus-protocol+5.2.0.patch rename to patches/@venusprotocol+venus-protocol+6.1.0-dev.5.patch index 9a0c16be..5cd7f5f3 100644 --- a/patches/@venusprotocol+venus-protocol+5.2.0.patch +++ b/patches/@venusprotocol+venus-protocol+6.1.0-dev.5.patch @@ -24,7 +24,7 @@ index 2f56b52..fcd8940 100644 interface ComptrollerLensInterface { function liquidateCalculateSeizeTokens( diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/ComptrollerStorage.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/ComptrollerStorage.sol -index 729ada8..c0de12b 100644 +index f662961..9ca7ba3 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/ComptrollerStorage.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/ComptrollerStorage.sol @@ -2,7 +2,7 @@ @@ -37,7 +37,7 @@ index 729ada8..c0de12b 100644 import { VAIControllerInterface } from "../Tokens/VAI/VAIControllerInterface.sol"; import { ComptrollerLensInterface } from "./ComptrollerLensInterface.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/FacetBase.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/FacetBase.sol -index 47d6d43..0bfc050 100644 +index 0897c1e..d563c78 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/FacetBase.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/FacetBase.sol @@ -2,7 +2,7 @@ @@ -47,80 +47,73 @@ index 47d6d43..0bfc050 100644 -import { VToken, ComptrollerErrorReporter, ExponentialNoError } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken, ComptrollerErrorReporter, ExponentialNoError } from "../../../Tokens/VTokens/VToken.sol"; import { IVAIVault } from "../../../Comptroller/ComptrollerInterface.sol"; - import { ComptrollerV14Storage } from "../../../Comptroller/ComptrollerStorage.sol"; + import { ComptrollerV15Storage } from "../../../Comptroller/ComptrollerStorage.sol"; import { IAccessControlManagerV5 } from "@venusprotocol/governance-contracts/contracts/Governance/IAccessControlManagerV5.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/MarketFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/MarketFacet.sol -index 835abca..3b1a2ad 100644 +index 654a351..fd6bc14 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/MarketFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/MarketFacet.sol -@@ -3,8 +3,8 @@ - pragma solidity 0.5.16; +@@ -4,7 +4,7 @@ pragma solidity 0.5.16; import { IMarketFacet } from "../interfaces/IMarketFacet.sol"; --import { FacetBase, VToken } from "./FacetBase.sol"; -- -+import { FacetBase } from "./FacetBase.sol"; + import { FacetBase } from "./FacetBase.sol"; +-import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; + /** * @title MarketFacet - * @author Venus diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/PolicyFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/PolicyFacet.sol -index 3bc54c6..6c0a244 100644 +index 9702f65..5e35254 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/PolicyFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/PolicyFacet.sol -@@ -4,7 +4,8 @@ pragma solidity 0.5.16; +@@ -2,7 +2,7 @@ - import { IPolicyFacet } from "../interfaces/IPolicyFacet.sol"; + pragma solidity 0.5.16; --import { XVSRewardsHelper, VToken } from "./XVSRewardsHelper.sol"; -+import { XVSRewardsHelper } from "./XVSRewardsHelper.sol"; +-import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; + import { IPolicyFacet } from "../interfaces/IPolicyFacet.sol"; - /** - * @title PolicyFacet + import { XVSRewardsHelper } from "./XVSRewardsHelper.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/RewardFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/RewardFacet.sol -index 5a417cb..68357f7 100644 +index d84f6e4..68357f7 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/RewardFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/RewardFacet.sol -@@ -2,8 +2,9 @@ +@@ -2,7 +2,7 @@ pragma solidity 0.5.16; +-import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; import { IRewardFacet } from "../interfaces/IRewardFacet.sol"; --import { XVSRewardsHelper, VToken } from "./XVSRewardsHelper.sol"; -+import { XVSRewardsHelper } from "./XVSRewardsHelper.sol"; + import { XVSRewardsHelper } from "./XVSRewardsHelper.sol"; import { SafeBEP20, IBEP20 } from "../../../Utils/SafeBEP20.sol"; - import { VBep20Interface } from "../../../Tokens/VTokens/VTokenInterfaces.sol"; - diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/SetterFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/SetterFacet.sol -index 4ac0112..b120d70 100644 +index 692b39c..ad996dd 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/SetterFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/SetterFacet.sol -@@ -6,7 +6,8 @@ import { ISetterFacet } from "../interfaces/ISetterFacet.sol"; +@@ -2,7 +2,7 @@ + + pragma solidity 0.5.16; + +-import { VToken } from "../../../Tokens/VTokens/VToken.sol"; ++import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; + import { ISetterFacet } from "../interfaces/ISetterFacet.sol"; import { PriceOracle } from "../../../Oracle/PriceOracle.sol"; import { ComptrollerLensInterface } from "../../ComptrollerLensInterface.sol"; - import { VAIControllerInterface } from "../../../Tokens/VAI/VAIControllerInterface.sol"; --import { FacetBase, VToken } from "./FacetBase.sol"; -+import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; -+import { FacetBase } from "./FacetBase.sol"; - import { IPrime } from "../../../Tokens/Prime/IPrime.sol"; - - /** diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/XVSRewardsHelper.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/XVSRewardsHelper.sol -index 76eda44..01071a4 100644 +index 46bb333..15f4ad1 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/XVSRewardsHelper.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/facets/XVSRewardsHelper.sol -@@ -2,7 +2,8 @@ +@@ -2,7 +2,7 @@ pragma solidity 0.5.16; --import { FacetBase, VToken } from "./FacetBase.sol"; -+import { FacetBase } from "./FacetBase.sol"; +-import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; + import { FacetBase } from "./FacetBase.sol"; /** - * @title XVSRewardsHelper diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IMarketFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IMarketFacet.sol index 684d76f..4e8ce87 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IMarketFacet.sol @@ -148,7 +141,7 @@ index 3eac49c..faf85a5 100644 interface IPolicyFacet { function mintAllowed(address vToken, address minter, uint256 mintAmount) external returns (uint256); diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IRewardFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IRewardFacet.sol -index f44a8f0..bb2a814 100644 +index 6b5eb75..94badd6 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IRewardFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/IRewardFacet.sol @@ -2,7 +2,7 @@ @@ -157,11 +150,11 @@ index f44a8f0..bb2a814 100644 -import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; - import { ComptrollerV14Storage } from "../../ComptrollerStorage.sol"; + import { ComptrollerTypes } from "../../ComptrollerStorage.sol"; interface IRewardFacet { diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/ISetterFacet.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/ISetterFacet.sol -index 35526fc..a07eab4 100644 +index 43e629f..a802986 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/ISetterFacet.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/interfaces/ISetterFacet.sol @@ -3,7 +3,7 @@ @@ -170,50 +163,35 @@ index 35526fc..a07eab4 100644 import { PriceOracle } from "../../../Oracle/PriceOracle.sol"; -import { VToken } from "../../../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../../../Tokens/VTokens/VToken.sol"; - import { ComptrollerV14Storage } from "../../ComptrollerStorage.sol"; + import { ComptrollerTypes } from "../../ComptrollerStorage.sol"; import { VAIControllerInterface } from "../../../Tokens/VAI/VAIController.sol"; import { ComptrollerLensInterface } from "../../../Comptroller/ComptrollerLensInterface.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/ComptrollerLens.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/ComptrollerLens.sol -index 3359849..2394a23 100644 +index 47e18e3..2394a23 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/ComptrollerLens.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/ComptrollerLens.sol -@@ -2,7 +2,8 @@ pragma solidity ^0.5.16; +@@ -2,7 +2,7 @@ pragma solidity ^0.5.16; pragma experimental ABIEncoderV2; import "../Tokens/VTokens/VBep20.sol"; --import "../Tokens/VTokens/VToken.sol"; +-import { VToken } from "../Tokens/VTokens/VToken.sol"; +import { CorePoolVToken as VToken } from "../Tokens/VTokens/VToken.sol"; -+import { ExponentialNoError } from "../Utils/ExponentialNoError.sol"; + import { ExponentialNoError } from "../Utils/ExponentialNoError.sol"; import "../Tokens/EIP20Interface.sol"; import "../Oracle/PriceOracle.sol"; - import "../Utils/ErrorReporter.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/SnapshotLens.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/SnapshotLens.sol -index 9bad3b7..c75ec08 100644 +index 11b56be..04303bd 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/SnapshotLens.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/SnapshotLens.sol -@@ -1,7 +1,8 @@ +@@ -1,7 +1,7 @@ pragma solidity ^0.5.16; pragma experimental ABIEncoderV2; --import "../Tokens/VTokens/VToken.sol"; -+import { CorePoolVToken as VToken } from "../Tokens/VTokens/VToken.sol"; -+import { ExponentialNoError } from "../Utils/ExponentialNoError.sol"; +-import { VToken } from "../Tokens/VTokens/VToken.sol"; ++import { CorePoolVToken as VToken } from "../Tokens/VTokens/VToken.sol"; + import { ExponentialNoError } from "../Utils/ExponentialNoError.sol"; import "../Utils/SafeMath.sol"; import "../Comptroller/ComptrollerInterface.sol"; - import "../Tokens/EIP20Interface.sol"; -diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/VenusLens.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/VenusLens.sol -index a2448a4..ea2ecfe 100644 ---- a/node_modules/@venusprotocol/venus-protocol/contracts/Lens/VenusLens.sol -+++ b/node_modules/@venusprotocol/venus-protocol/contracts/Lens/VenusLens.sol -@@ -2,7 +2,7 @@ pragma solidity ^0.5.16; - pragma experimental ABIEncoderV2; - - import "../Tokens/VTokens/VBep20.sol"; --import "../Tokens/VTokens/VToken.sol"; -+import {CorePoolVToken as VToken } from "../Tokens/VTokens/VToken.sol"; - import "../Oracle/PriceOracle.sol"; - import "../Tokens/EIP20Interface.sol"; - import "../Tokens/XVS/XVS.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Oracle/PriceOracle.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Oracle/PriceOracle.sol index 15f44c1..f8f5685 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Oracle/PriceOracle.sol @@ -227,45 +205,30 @@ index 15f44c1..f8f5685 100644 contract PriceOracle { /// @notice Indicator that this is a PriceOracle contract (for inspection) diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VAI/VAIController.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VAI/VAIController.sol -index 7e76520..191422a 100644 +index e1c21d3..191422a 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VAI/VAIController.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VAI/VAIController.sol @@ -5,7 +5,7 @@ import "../../Utils/ErrorReporter.sol"; import "../../Utils/Exponential.sol"; import "../../Comptroller/ComptrollerInterface.sol"; import "@venusprotocol/governance-contracts/contracts/Governance/IAccessControlManagerV5.sol"; --import "../VTokens/VToken.sol"; +-import { VToken, EIP20Interface } from "../VTokens/VToken.sol"; +import { CorePoolVToken as VToken, EIP20Interface } from "../VTokens/VToken.sol"; import "./VAIUnitroller.sol"; import "./VAI.sol"; diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20.sol -index 53ea99e..31a188a 100644 +index e788777..31a188a 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20.sol +++ b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20.sol -@@ -1,6 +1,8 @@ +@@ -1,6 +1,6 @@ pragma solidity ^0.5.16; --import "./VToken.sol"; +-import { VToken, VBep20Interface, ComptrollerInterface, InterestRateModel, VTokenInterface } from "./VToken.sol"; +import { CorePoolVToken as VToken, VBep20Interface, ComptrollerInterface, InterestRateModel, VTokenInterface } from "./VToken.sol"; -+import { EIP20Interface } from "../EIP20Interface.sol"; -+import { EIP20NonStandardInterface } from "../EIP20NonStandardInterface.sol"; + import { EIP20Interface } from "../EIP20Interface.sol"; + import { EIP20NonStandardInterface } from "../EIP20NonStandardInterface.sol"; - /** - * @title Venus's VBep20 Contract -diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20Delegate.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20Delegate.sol -index e93817f..8d859b7 100644 ---- a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20Delegate.sol -+++ b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBep20Delegate.sol -@@ -1,6 +1,7 @@ - pragma solidity ^0.5.16; - --import "./VBep20.sol"; -+import { VBep20 } from "./VBep20.sol"; -+import { VDelegateInterface } from "./VTokenInterfaces.sol"; - - /** - * @title Venus's VBep20Delegate Contract diff --git a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VToken.sol b/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VToken.sol index 7786270..8334f51 100644 --- a/node_modules/@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VToken.sol diff --git a/subgraphs/isolated-pools/config/docker.json b/subgraphs/isolated-pools/config/docker.json deleted file mode 100644 index efffadde..00000000 --- a/subgraphs/isolated-pools/config/docker.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "hardhat", - "poolRegistryAddress": "0xffa7CA1AEEEbBc30C874d32C7e22F052BbEa0429", - "poolLensAddress": "0x3aade2dcd2df6a8cac689ee797591b2913658659", - "startBlock": 0 -} diff --git a/subgraphs/isolated-pools/config/index.ts b/subgraphs/isolated-pools/config/index.ts index 0c759713..3d1e4630 100644 --- a/subgraphs/isolated-pools/config/index.ts +++ b/subgraphs/isolated-pools/config/index.ts @@ -1,26 +1,26 @@ import mainnetDeployments from '@venusprotocol/isolated-pools/deployments/bscmainnet.json'; -import sepoliaDeployments from '@venusprotocol/isolated-pools/deployments/bsctestnet.json'; import chapelDeployments from '@venusprotocol/isolated-pools/deployments/bsctestnet.json'; +import sepoliaDeployments from '@venusprotocol/isolated-pools/deployments/sepolia.json'; import fs from 'fs'; import Mustache from 'mustache'; export const getNetwork = () => { - const supportedNetworks = ['sepolia', 'chapel', 'bsc', 'local'] as const; + const supportedNetworks = ['sepolia', 'chapel', 'bsc', 'docker'] as const; const network = process.env.NETWORK; // @ts-expect-error network env var is unknown here if (!supportedNetworks.includes(network)) { throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); } - return network as typeof supportedNetworks[number]; + return network as (typeof supportedNetworks)[number]; }; const main = () => { const network = getNetwork(); const config = { - local: { + docker: { network: 'hardhat', - poolRegistryAddress: '0x95401dc811bb5740090279Ba06cfA8fcF6113778', - poolLensAddress: '0x809d550fca64d94Bd9F66E60752A544199cfAC3D', + poolRegistryAddress: '0x5bf5b11053e734690269C6B9D438F8C9d48F528A', + poolLensAddress: '0xffa7ca1aeeebbc30c874d32c7e22f052bbea0429', startBlock: 0, }, sepolia: { diff --git a/subgraphs/isolated-pools/package.json b/subgraphs/isolated-pools/package.json index bd3ae59a..77e4b2e5 100644 --- a/subgraphs/isolated-pools/package.json +++ b/subgraphs/isolated-pools/package.json @@ -15,13 +15,13 @@ "build:docker": "npx graph build --ipfs http://ipfs:5001", "build:bsc": "graph build --ipfs https://api.thegraph.com/ipfs/ ", "deploy:integration": "graph deploy venusprotocol/venus-isolated-pools --ipfs http://localhost:5001 --node http://127.0.0.1:8020/", - "deploy:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts && npx graph deploy venusprotocol/venus-isolated-pools --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", - "deploy:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-isolated-pools-chapel --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "deploy:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-isolated-pools --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "deploy:sepolia": "prepare:sepolia && npx graph deploy --studio venus-isolated-pools-sepolia", - "prepare:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts", - "prepare:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts", - "prepare:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts", + "deploy:docker": "yarn prepare:docker && npx graph deploy venusprotocol/venus-isolated-pools --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", + "deploy:chapel": "yarn prepare:chapel && graph deploy venusprotocol/venus-isolated-pools-chapel --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "deploy:bsc": "yarn prepare:bsc && graph deploy venusprotocol/venus-isolated-pools --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "deploy:sepolia": "yarn prepare:sepolia && npx graph deploy --studio venus-isolated-pools-sepolia", + "prepare:docker": "NETWORK=docker npx ts-node config/index.ts", + "prepare:chapel": "NETWORK=chapel npx ts-node config/index.ts", + "prepare:bsc": "NETWORK=bsc npx ts-node config/index.ts", "prepare:sepolia": "NETWORK=sepolia npx ts-node config/index.ts", "generate-subgraph-types": "rm -rf /subgraph-client/.graphclient && npx graphclient build --dir ./subgraph-client", "pretty": "prettier —-write '**/*.ts'", diff --git a/subgraphs/venus-governance/config/docker.json b/subgraphs/venus-governance/config/docker.json deleted file mode 100644 index e775d591..00000000 --- a/subgraphs/venus-governance/config/docker.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": "hardhat", - "accessControlManagerAddress": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", - "accessControlManagerStartBlock": "0", - "governorAlphaAddress": "0x0fe4223AD99dF788A6Dcad148eB4086E6389cEB6", - "governorAlphaStartBlock": "0", - "governorAlpha2Address": "0x193521c8934bcf3473453af4321911e7a89e0e12", - "governorAlpha2StartBlock": "0", - "governorBravoDelegatorAddress": "0x22a9b82a6c3d2bfb68f324b2e8367f346dd6f32a", - "governorBravoDelegatorStartBlock": "0", - "xvsVaultAddress": "0xe1708FA6bb2844D5384613ef0846F9Bc1e8eC55E", - "xvsVaultStartBlock": "0", - "xvsVaultPid": "0" -} diff --git a/subgraphs/venus-governance/config/index.ts b/subgraphs/venus-governance/config/index.ts index 976d75c9..141e0c9a 100644 --- a/subgraphs/venus-governance/config/index.ts +++ b/subgraphs/venus-governance/config/index.ts @@ -1,75 +1,84 @@ +import bscMainnetGovernanceDeployments from '@venusprotocol/governance-contracts/deployments/bscmainnet.json'; +import bscTestnetGovernanceDeployments from '@venusprotocol/governance-contracts/deployments/bsctestnet.json'; +import bscMainnetCoreDeployments from '@venusprotocol/venus-protocol/deployments/bscmainnet.json'; +import bscTestnetCoreDeployments from '@venusprotocol/venus-protocol/deployments/bsctestnet.json'; import fs from 'fs'; import Mustache from 'mustache'; export const getNetwork = () => { - const supportedNetworks = ['chapel', 'bsc', 'local'] as const; + const supportedNetworks = ['chapel', 'bsc', 'docker'] as const; const network = process.env.NETWORK; // @ts-expect-error network env var is unknown here if (!supportedNetworks.includes(network)) { throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); } - return network as typeof supportedNetworks[number]; + return network as (typeof supportedNetworks)[number]; }; const main = () => { const network = getNetwork(); const config = { - local: { - network: 'bsc', - accessControlManagerAddress: '0xc5a5C42992dECbae36851359345FE25997F5C42d', + docker: { + network: 'hardhat', + accessControlManagerAddress: '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9', accessControlManagerStartBlock: '0', - governorAlphaAddress: '0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1', + governorAlphaAddress: '0x95775fD3Afb1F4072794CA4ddA27F2444BCf8Ac3', governorAlphaStartBlock: '0', - governorAlpha2Address: '0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE', + governorAlpha2Address: '0x512F7469BcC83089497506b5df64c6E246B39925', governorAlpha2StartBlock: '0', - governorBravoDelegateAddress: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', - governorBravoDelegateStartBlock: '16002994', - governorBravoDelegate2Address: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', - governorBravoDelegate2StartBlock: '16002994', - xvsTokenAddress: '0x5FbDB2315678afecb367f032d93F642f64180aa3', + governorBravoDelegatorAddress: '0xE8F7d98bE6722d42F29b50500B0E318EF2be4fc8', + governorBravoDelegatorStartBlock: '0', + xvsTokenAddress: '0x1343248Cbd4e291C6979e70a138f4c774e902561', xvsTokenStartBlock: '0', - xvsVaultAddress: '0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0', + xvsVaultAddress: '0x547382C0D1b23f707918D3c83A77317B71Aa8470', xvsVaultStartBlock: '0', + xvsVaultPid: '0', }, chapel: { network: 'chapel', - accessControlManagerAddress: '0x4a471468cdABA84CEA885aF72129F2e974C3649B', + accessControlManagerAddress: + bscTestnetGovernanceDeployments.contracts.AccessControlManager.address, accessControlManagerStartBlock: '24711629', - governorAlphaAddress: '0x7df10b2118eb04d9806b15198019f83741a9f8f4', + governorAlphaAddress: bscTestnetGovernanceDeployments.contracts.GovernorAlpha.address, governorAlphaStartBlock: '8205736', governorAlpha2Address: '0x7116894ed34FC4B27D5b84f46B70Af48397a6C24', governorAlpha2StartBlock: '13584539', - governorBravoDelegateAddress: '0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2', - governorBravoDelegateStartBlock: '16002994 ', - governorBravoDelegate2Address: '', - governorBravoDelegate2StartBlock: '', - xvsTokenAddress: '0xB9e0E753630434d7863528cc73CB7AC638a7c8ff', + governorBravoDelegatorAddress: + bscTestnetGovernanceDeployments.contracts.GovernorBravoDelegator.address, + governorBravoDelegatorStartBlock: '16002994 ', + xvsTokenAddress: bscTestnetCoreDeployments.contracts.XVS.address, xvsTokenStartBlock: '2802593', - xvsVaultAddress: '0xa4Fd54cACdA379FB7CaA783B83Cc846f8ac0Faa6', + xvsVaultAddress: bscTestnetCoreDeployments.contracts.XVSVault.address, xvsVaultStartBlock: '13937802', + xvsVaultPid: '1', }, bsc: { network: 'bsc', - accessControlManagerAddress: '', + accessControlManagerAddress: + bscMainnetGovernanceDeployments.contracts.AccessControlManager.address, accessControlManagerStartBlock: '', - governorAlphaAddress: '0x406f48f47d25e9caa29f17e7cfbd1dc6878f078f', + governorAlphaAddress: bscMainnetGovernanceDeployments.contracts.GovernorAlpha.address, governorAlphaStartBlock: '2474351', - governorAlpha2Address: '0x388313BfEFEE8ddfeAD55b585F62812293Cf3A60', + governorAlpha2Address: bscMainnetGovernanceDeployments.contracts.GovernorAlpha2.address, governorAlpha2StartBlock: '11934064', - governorBravoDelegateAddress: '0x2d56dC077072B53571b8252008C60e945108c75a', - governorBravoDelegateStartBlock: '13729317', - governorBravoDelegate2Address: '', - governorBravoDelegate2StartBlock: '', - xvsTokenAddress: '0xcf6bb5389c92bdda8a3747ddb454cb7a64626c63', + governorBravoDelegatorAddress: + bscMainnetGovernanceDeployments.contracts.GovernorBravoDelegator.address, + governorBravoDelegatorStartBlock: '13729317', + xvsTokenAddress: bscMainnetCoreDeployments.contracts.XVS.address, xvsTokenStartBlock: '858561', - xvsVaultAddress: '0x6eF49b4e0772Fe78128F981d42D54172b55eCF9F', + xvsVaultAddress: bscMainnetCoreDeployments.contracts.XVSVault.address, xvsVaultStartBlock: '13018718', + xvsVaultPid: '0', }, }; const yamlTemplate = fs.readFileSync('template.yaml', 'utf8'); const yamlOutput = Mustache.render(yamlTemplate, config[network]); fs.writeFileSync('subgraph.yaml', yamlOutput); + + const configTemplate = fs.readFileSync('src/constants/config-template', 'utf8'); + const tsOutput = Mustache.render(configTemplate, config[network]); + fs.writeFileSync('src/constants/config.ts', tsOutput); }; main(); diff --git a/subgraphs/venus-governance/package.json b/subgraphs/venus-governance/package.json index 3eedeaa9..b44d5ed0 100644 --- a/subgraphs/venus-governance/package.json +++ b/subgraphs/venus-governance/package.json @@ -15,12 +15,12 @@ "build:docker": "npx graph build --ipfs http://ipfs:5001", "build:bsc": "graph build --ipfs https://api.thegraph.com/ipfs/ ", "deploy:integration": "graph deploy venusprotocol/venus-governance --debug --ipfs http://localhost:5001 --node http://127.0.0.1:8020/", - "deploy:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts && npx graph deploy venusprotocol/venus-governance --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", - "deploy:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-governance-chapel --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "deploy:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-governance --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "prepare:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts", - "prepare:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts", - "prepare:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts", + "deploy:docker": "yarn prepare:docker && npx graph deploy venusprotocol/venus-governance --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", + "deploy:chapel": "yarn prepare:chapel && graph deploy venusprotocol/venus-governance-chapel --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "deploy:bsc": "yarn prepare:bsc && graph deploy venusprotocol/venus-governance --debug --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "prepare:docker": "NETWORK=docker npx ts-node config/index.ts", + "prepare:chapel": "NETWORK=chapel npx ts-node config/index.ts", + "prepare:bsc": "NETWORK=bsc npx ts-node config/index.ts", "generate-subgraph-types": "rm -rf /subgraph-client/.graphclient && npx graphclient build --dir ./subgraph-client", "test": "graph test", "test:integration": "npx hardhat test tests/integration/index.ts --network localhost" diff --git a/subgraphs/venus/config/bsc.json b/subgraphs/venus/config/bsc.json deleted file mode 100644 index 5027b3a5..00000000 --- a/subgraphs/venus/config/bsc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "bsc", - "comptrollerAddress": "0xfd36e2c2a6789db23113685031d7f16329158384", - "startBlock": "2470000", - "vBnbAddress": "0xA07c5b74C9B40447a954e1466938b865b6BBea36" -} diff --git a/subgraphs/venus/config/chapel.json b/subgraphs/venus/config/chapel.json deleted file mode 100644 index cb7990fd..00000000 --- a/subgraphs/venus/config/chapel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "bsc-testnet", - "comptrollerAddress": "0x94d1820b2D1c7c7452A163983Dc888CEC546b77D", - "startBlock": "2470000", - "vBnbAddress": "0x2E7222e51c0f6e98610A1543Aa3836E092CDe62c" -} diff --git a/subgraphs/venus/config/docker.json b/subgraphs/venus/config/docker.json deleted file mode 100644 index a61df7e2..00000000 --- a/subgraphs/venus/config/docker.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": "bsc-testnet", - "comptrollerAddress": "0x94d1820b2D1c7c7452A163983Dc888CEC546b77D", - "startBlock": "0", - "vBnbAddress": "0xA07c5b74C9B40447a954e1466938b865b6BBea36" -} diff --git a/subgraphs/venus/config/index.ts b/subgraphs/venus/config/index.ts index f6b13ff1..cc931b43 100644 --- a/subgraphs/venus/config/index.ts +++ b/subgraphs/venus/config/index.ts @@ -5,32 +5,35 @@ import fs from 'fs'; import Mustache from 'mustache'; export const getNetwork = () => { - const supportedNetworks = ['chapel', 'bsc', 'local'] as const; + const supportedNetworks = ['chapel', 'bsc', 'docker'] as const; const network = process.env.NETWORK; // @ts-expect-error network env var is unknown here if (!supportedNetworks.includes(network)) { throw new Error(`NETWORK env var must be set to one of ${supportedNetworks}`); } - return network as typeof supportedNetworks[number]; + return network as (typeof supportedNetworks)[number]; }; const main = () => { const network = getNetwork(); const config = { - local: { + docker: { network: 'hardhat', comptrollerAddress: '0x94d1820b2D1c7c7452A163983Dc888CEC546b77D', startBlock: '0', + vBnbAddress: '0xA07c5b74C9B40447a954e1466938b865b6BBea36', }, chapel: { network: 'chapel', comptrollerAddress: bscTestnetCoreDeployments.Contracts.Comptroller, startBlock: '2470000', + vBnbAddress: bscTestnetCoreDeployments.Contracts.vBNB, }, bsc: { network: 'bsc', comptrollerAddress: bscMainnetCoreDeployments.Contracts.Comptroller, startBlock: '2470000', + vBnbAddress: bscMainnetCoreDeployments.Contracts.vBNB, }, }; diff --git a/subgraphs/venus/package.json b/subgraphs/venus/package.json index 18e5f57a..b14e32ff 100644 --- a/subgraphs/venus/package.json +++ b/subgraphs/venus/package.json @@ -15,12 +15,12 @@ "build:docker": "npx graph build --ipfs http://ipfs:5001", "build:bsc": "graph build --ipfs https://api.thegraph.com/ipfs/ ", "deploy:integration": "graph deploy venusprotocol/venus-subgraph --debug --ipfs http://localhost:5001 --node http://127.0.0.1:8020/", - "deploy:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts && npx graph deploy venusprotocol/venus-subgraph --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", - "deploy:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-subgraph-chapel --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "deploy:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts && graph deploy venusprotocol/venus-subgraph --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", - "prepare:docker": "npx mustache config/docker.json template.yaml > subgraph.yaml && npx mustache config/docker.json src/constants/config-template > src/constants/config.ts", - "prepare:chapel": "npx mustache config/chapel.json template.yaml > subgraph.yaml && npx mustache config/chapel.json src/constants/config-template > src/constants/config.ts", - "prepare:bsc": "npx mustache config/bsc.json template.yaml > subgraph.yaml && npx mustache config/bsc.json src/constants/config-template > src/constants/config.ts", + "deploy:docker": "yarn prepare:docker && npx graph deploy venusprotocol/venus-subgraph --ipfs http://ipfs:5001 --node http://graph-node:8020/ --version-label ci", + "deploy:chapel": "yarn prepare:chapel && graph deploy venusprotocol/venus-subgraph-chapel --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "deploy:bsc": "yarn prepare:bsc && graph deploy venusprotocol/venus-subgraph --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/", + "prepare:docker": "NETWORK=docker npx ts-node config/index.ts", + "prepare:chapel": "NETWORK=chapel npx ts-node config/index.ts", + "prepare:bsc": "NETWORK=bsc npx ts-node config/index.ts", "test": "graph test", "test:integration": "true" }, diff --git a/yarn.lock b/yarn.lock index 1fdd0b92..63dbccb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -97,12 +97,12 @@ __metadata: linkType: hard "@aws-sdk/types@npm:^3.1.0": - version: 3.410.0 - resolution: "@aws-sdk/types@npm:3.410.0" + version: 3.465.0 + resolution: "@aws-sdk/types@npm:3.465.0" dependencies: - "@smithy/types": ^2.3.0 + "@smithy/types": ^2.5.0 tslib: ^2.5.0 - checksum: 9de51a6b2e1c0012c9b2348eb4f334bcfedc4abd127cd1bc6d16ee5a65bc7f6f55d1742b0d3e7e97918897ea554d5508b4a4339fbedf34d06a33223d8f106bf6 + checksum: 73f05accd990f70a0eb58c5c568ed091a097caab808415efb420deee0873e912469fe2e0a68e1d0087cd376237cc4a7e3182a475670cd295676735d90f132ca6 languageName: node linkType: hard @@ -115,20 +115,20 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13": - version: 7.22.13 - resolution: "@babel/code-frame@npm:7.22.13" +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/code-frame@npm:7.23.5" dependencies: - "@babel/highlight": ^7.22.13 + "@babel/highlight": ^7.23.4 chalk: ^2.4.2 - checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058 + checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a languageName: node linkType: hard "@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.9": - version: 7.22.9 - resolution: "@babel/compat-data@npm:7.22.9" - checksum: bed77d9044ce948b4327b30dd0de0779fa9f3a7ed1f2d31638714ed00229fa71fc4d1617ae0eb1fad419338d3658d0e9a5a083297451e09e73e078d0347ff808 + version: 7.23.5 + resolution: "@babel/compat-data@npm:7.23.5" + checksum: 06ce244cda5763295a0ea924728c09bae57d35713b675175227278896946f922a63edf803c322f855a3878323d48d0255a2a3023409d2a123483c8a69ebb4744 languageName: node linkType: hard @@ -156,25 +156,25 @@ __metadata: linkType: hard "@babel/core@npm:^7.14.0": - version: 7.22.17 - resolution: "@babel/core@npm:7.22.17" + version: 7.23.5 + resolution: "@babel/core@npm:7.23.5" dependencies: "@ampproject/remapping": ^2.2.0 - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.22.15 + "@babel/code-frame": ^7.23.5 + "@babel/generator": ^7.23.5 "@babel/helper-compilation-targets": ^7.22.15 - "@babel/helper-module-transforms": ^7.22.17 - "@babel/helpers": ^7.22.15 - "@babel/parser": ^7.22.16 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helpers": ^7.23.5 + "@babel/parser": ^7.23.5 "@babel/template": ^7.22.15 - "@babel/traverse": ^7.22.17 - "@babel/types": ^7.22.17 - convert-source-map: ^1.7.0 + "@babel/traverse": ^7.23.5 + "@babel/types": ^7.23.5 + convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 355216a342d1b3952d7c040dd4c99ecef6b3501ba99a713703c1fec1ae73bc92a48a0c1234562bdbb4fd334b2e452f5a6c3bb282f0e613fa89e1518c91d1aea1 + checksum: 5e5dfb1e61f298676f1fca18c646dbf6fb164ca1056b0169b8d42b7f5c35e026d81823582ccb2358e93a61b035e22b3ad37e2abaae4bf43f1ffb93b6ce19466e languageName: node linkType: hard @@ -189,15 +189,15 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.17.3, @babel/generator@npm:^7.17.7, @babel/generator@npm:^7.22.15": - version: 7.22.15 - resolution: "@babel/generator@npm:7.22.15" +"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.17.3, @babel/generator@npm:^7.17.7, @babel/generator@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/generator@npm:7.23.5" dependencies: - "@babel/types": ^7.22.15 + "@babel/types": ^7.23.5 "@jridgewell/gen-mapping": ^0.3.2 "@jridgewell/trace-mapping": ^0.3.17 jsesc: ^2.5.1 - checksum: 5b2a3ccdc3634f6ea86e0a442722bcd430238369432d31f15b428a4ee8013c2f4f917b5b135bf4fc1d0a3e2f87f10fd4ce5d07955ecc2d3b9400a05c2a481374 + checksum: 845ddda7cf38a3edf4be221cc8a439dee9ea6031355146a1a74047aa8007bc030305b27d8c68ec9e311722c910610bde38c0e13a9ce55225251e7cb7e7f3edc8 languageName: node linkType: hard @@ -210,7 +210,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5": +"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15": version: 7.22.15 resolution: "@babel/helper-compilation-targets@npm:7.22.15" dependencies: @@ -224,38 +224,38 @@ __metadata: linkType: hard "@babel/helper-create-class-features-plugin@npm:^7.18.6": - version: 7.22.15 - resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15" + version: 7.23.5 + resolution: "@babel/helper-create-class-features-plugin@npm:7.23.5" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 - "@babel/helper-member-expression-to-functions": ^7.22.15 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-member-expression-to-functions": ^7.23.0 "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.9 + "@babel/helper-replace-supers": ^7.22.20 "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3 + checksum: fe7c6c0baca1838bba76ac1330df47b661d932354115ea9e2ea65b179f80b717987d3c3da7e1525fd648e5f2d86c620efc959cabda4d7562b125a27c3ac780d0 languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.16.7, @babel/helper-environment-visitor@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-environment-visitor@npm:7.22.5" - checksum: 248532077d732a34cd0844eb7b078ff917c3a8ec81a7f133593f71a860a582f05b60f818dc5049c2212e5baa12289c27889a4b81d56ef409b4863db49646c4b1 +"@babel/helper-environment-visitor@npm:^7.16.7, @babel/helper-environment-visitor@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-environment-visitor@npm:7.22.20" + checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69 languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.16.7, @babel/helper-function-name@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-function-name@npm:7.22.5" +"@babel/helper-function-name@npm:^7.16.7, @babel/helper-function-name@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-function-name@npm:7.23.0" dependencies: - "@babel/template": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a + "@babel/template": ^7.22.15 + "@babel/types": ^7.23.0 + checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10 languageName: node linkType: hard @@ -268,12 +268,12 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/helper-member-expression-to-functions@npm:7.22.15" +"@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0" dependencies: - "@babel/types": ^7.22.15 - checksum: c7c5d01c402dd8902c2ec3093f203ed0fc3bc5f669328a084d2e663c4c06dd0415480ee8220c6f96ba9b2dc49545c0078f221fc3900ab1e65de69a12fe7b361f + "@babel/types": ^7.23.0 + checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75 languageName: node linkType: hard @@ -286,18 +286,18 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.17.7, @babel/helper-module-transforms@npm:^7.22.15, @babel/helper-module-transforms@npm:^7.22.17": - version: 7.22.17 - resolution: "@babel/helper-module-transforms@npm:7.22.17" +"@babel/helper-module-transforms@npm:^7.17.7, @babel/helper-module-transforms@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/helper-module-transforms@npm:7.23.3" dependencies: - "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.20 "@babel/helper-module-imports": ^7.22.15 "@babel/helper-simple-access": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/helper-validator-identifier": ^7.22.15 + "@babel/helper-validator-identifier": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0 - checksum: 458021c74093e66179765fcc9d1c1cb694f7bdf98656f23486901d35636495c38aab4661547fac2142e13d887987d1ea30cc9fe42968376a51a99bcd207b4989 + checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71 languageName: node linkType: hard @@ -317,16 +317,16 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9": - version: 7.22.9 - resolution: "@babel/helper-replace-supers@npm:7.22.9" +"@babel/helper-replace-supers@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-replace-supers@npm:7.22.20" dependencies: - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-member-expression-to-functions": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-member-expression-to-functions": ^7.22.15 "@babel/helper-optimise-call-expression": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0 - checksum: d41471f56ff2616459d35a5df1900d5f0756ae78b1027040365325ef332d66e08e3be02a9489756d870887585ff222403a228546e93dd7019e19e59c0c0fe586 + checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639 languageName: node linkType: hard @@ -357,46 +357,46 @@ __metadata: languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-string-parser@npm:7.22.5" - checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467 +"@babel/helper-string-parser@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/helper-string-parser@npm:7.23.4" + checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90 languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.15, @babel/helper-validator-identifier@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/helper-validator-identifier@npm:7.22.15" - checksum: eb0bee4bda664c0959924bc1ad5611eacfce806f46612202dd164fef1df8fef1a11682a1e7615288987100e9fb304982b6e2a4ff07ffe842ab8765b95ed1118c +"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-validator-identifier@npm:7.22.20" + checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc languageName: node linkType: hard "@babel/helper-validator-option@npm:^7.22.15": - version: 7.22.15 - resolution: "@babel/helper-validator-option@npm:7.22.15" - checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d + version: 7.23.5 + resolution: "@babel/helper-validator-option@npm:7.23.5" + checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e languageName: node linkType: hard -"@babel/helpers@npm:^7.17.8, @babel/helpers@npm:^7.22.15": - version: 7.22.15 - resolution: "@babel/helpers@npm:7.22.15" +"@babel/helpers@npm:^7.17.8, @babel/helpers@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/helpers@npm:7.23.5" dependencies: "@babel/template": ^7.22.15 - "@babel/traverse": ^7.22.15 - "@babel/types": ^7.22.15 - checksum: 49f61a93cbae4df3328bda67af5db743fead659ae4242571226c3596b7df78546189cdf991fed1eca33b559de8abf396a90a001f474a1bab351418f07b7ae6ef + "@babel/traverse": ^7.23.5 + "@babel/types": ^7.23.5 + checksum: c16dc8a3bb3d0e02c7ee1222d9d0865ed4b92de44fb8db43ff5afd37a0fc9ea5e2906efa31542c95b30c1a3a9540d66314663c9a23b5bb9b5ec76e8ebc896064 languageName: node linkType: hard -"@babel/highlight@npm:^7.22.13": - version: 7.22.13 - resolution: "@babel/highlight@npm:7.22.13" +"@babel/highlight@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/highlight@npm:7.23.4" dependencies: - "@babel/helper-validator-identifier": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 chalk: ^2.4.2 js-tokens: ^4.0.0 - checksum: 7266d2bff8aa8fc78eb65b6e92a8211e12897a731126a282d2f9bb50d8fcaa4c1b02af2284f990ac7e3ab8d892d448a2cab8f5ed0ea8a90bce2c025b11ebe802 + checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89 languageName: node linkType: hard @@ -409,12 +409,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.14.0, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.17.8, @babel/parser@npm:^7.20.15, @babel/parser@npm:^7.21.3, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.22.16": - version: 7.22.16 - resolution: "@babel/parser@npm:7.22.16" +"@babel/parser@npm:^7.14.0, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.17.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/parser@npm:7.23.5" bin: parser: ./bin/babel-parser.js - checksum: 944c756b5bdeb07b9fec16ecef6b3c61aff9d4c4b924abadcf01afa1840a740b8e2357ae00482b5b37daad6d2bfd848c947f27ad65138d687b6fdc924bc59edd + checksum: ea763629310f71580c4a3ea9d3705195b7ba994ada2cc98f9a584ebfdacf54e92b2735d351672824c2c2b03c7f19206899f4d95650d85ce514a822b19a8734c7 languageName: node linkType: hard @@ -456,36 +456,36 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-flow@npm:7.22.5" +"@babel/plugin-syntax-flow@npm:^7.0.0, @babel/plugin-syntax-flow@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-flow@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 84c8c40fcfe8e78cecdd6fb90e8f97f419e3f3b27a33de8324ae97d5ce1b87cdd98a636fa21a68d4d2c37c7d63f3a279bb84b6956b849921affed6b806b6ffe7 + checksum: c6e6f355d6ace5f4a9e7bb19f1fed2398aeb9b62c4c671a189d81b124f9f5bb77c4225b6e85e19339268c60a021c1e49104e450375de5e6bb70612190d9678af languageName: node linkType: hard "@babel/plugin-syntax-import-assertions@npm:^7.20.0": - version: 7.22.5 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1 + checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7 languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.0.0, @babel/plugin-syntax-jsx@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-jsx@npm:7.22.5" +"@babel/plugin-syntax-jsx@npm:^7.0.0, @babel/plugin-syntax-jsx@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-jsx@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce + checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e languageName: node linkType: hard @@ -501,255 +501,255 @@ __metadata: linkType: hard "@babel/plugin-transform-arrow-functions@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a + checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66 languageName: node linkType: hard "@babel/plugin-transform-block-scoped-functions@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c + checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020 languageName: node linkType: hard "@babel/plugin-transform-block-scoping@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-block-scoping@npm:7.22.15" + version: 7.23.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c7091dc000b854ce0c471588ca0704ef1ce78cff954584a9f21c1668fd0669e7c8d5396fb72fe49a2216d9b96a400d435f424f27e41a097ef6c855f9c57df195 + checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4 languageName: node linkType: hard "@babel/plugin-transform-classes@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-classes@npm:7.22.15" + version: 7.23.5 + resolution: "@babel/plugin-transform-classes@npm:7.23.5" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-compilation-targets": ^7.22.15 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 "@babel/helper-optimise-call-expression": ^7.22.5 "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.9 + "@babel/helper-replace-supers": ^7.22.20 "@babel/helper-split-export-declaration": ^7.22.6 globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d3f4d0c107dd8a3557ea3575cc777fab27efa92958b41e4a9822f7499725c1f554beae58855de16ddec0a7b694e45f59a26cea8fbde4275563f72f09c6e039a0 + checksum: 6d0dd3b0828e84a139a51b368f33f315edee5688ef72c68ba25e0175c68ea7357f9c8810b3f61713e368a3063cdcec94f3a2db952e453b0b14ef428a34aa8169 languageName: node linkType: hard "@babel/plugin-transform-computed-properties@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/template": ^7.22.5 + "@babel/template": ^7.22.15 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131 + checksum: 80452661dc25a0956f89fe98cb562e8637a9556fb6c00d312c57653ce7df8798f58d138603c7e1aad96614ee9ccd10c47e50ab9ded6b6eded5adeb230d2a982e languageName: node linkType: hard "@babel/plugin-transform-destructuring@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-destructuring@npm:7.22.15" + version: 7.23.3 + resolution: "@babel/plugin-transform-destructuring@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 4bccb4765e5287f1d36119d930afb9941ea8f4f001bddb8febff716bac0e09dc58576624f3ec59470630513044dd342075fe11af16d8c1b234cb7406cffca9f0 + checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105 languageName: node linkType: hard "@babel/plugin-transform-flow-strip-types@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-flow-strip-types@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-flow": ^7.22.5 + "@babel/plugin-syntax-flow": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 1ba48187d6f33814be01c6870489f0b1858256cf2b9dd7e62f02af8b30049bf375112f1d44692c5fed3cb9cd26ee2fb32e358cd79b6ad2360a51e8f993e861bf + checksum: de38cc5cf948bc19405ea041292181527a36f59f08d787a590415fac36e9b0c7992f0d3e2fd3b9402089bafdaa1a893291a0edf15beebfd29bdedbbe582fee9b languageName: node linkType: hard "@babel/plugin-transform-for-of@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-for-of@npm:7.22.15" + version: 7.23.3 + resolution: "@babel/plugin-transform-for-of@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f395ae7bce31e14961460f56cf751b5d6e37dd27d7df5b1f4e49fec1c11b6f9cf71991c7ffbe6549878591e87df0d66af798cf26edfa4bfa6b4c3dba1fb2f73a + checksum: a6288122a5091d96c744b9eb23dc1b2d4cce25f109ac1e26a0ea03c4ea60330e6f3cc58530b33ba7369fa07163b71001399a145238b7e92bff6270ef3b9c32a0 languageName: node linkType: hard "@babel/plugin-transform-function-name@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-function-name@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-function-name@npm:7.23.3" dependencies: - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-function-name": ^7.23.0 "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845 + checksum: 355c6dbe07c919575ad42b2f7e020f320866d72f8b79181a16f8e0cd424a2c761d979f03f47d583d9471b55dcd68a8a9d829b58e1eebcd572145b934b48975a6 languageName: node linkType: hard "@babel/plugin-transform-literals@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-literals@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-literals@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b + checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed languageName: node linkType: hard "@babel/plugin-transform-member-expression-literals@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504 + checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db languageName: node linkType: hard "@babel/plugin-transform-modules-commonjs@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.15" + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3" dependencies: - "@babel/helper-module-transforms": ^7.22.15 + "@babel/helper-module-transforms": ^7.23.3 "@babel/helper-plugin-utils": ^7.22.5 "@babel/helper-simple-access": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f8fc85fefa6be8626a378ca38fb84c7359043e7c692c854e9ee250a05121553b7f4a58e127099efe12662ec6bebbfd304ce638a0b4563d7cbd5982f3d877321c + checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7 languageName: node linkType: hard "@babel/plugin-transform-object-super@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-object-super@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-object-super@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.5 + "@babel/helper-replace-supers": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7 + checksum: e495497186f621fa79026e183b4f1fbb172fd9df812cbd2d7f02c05b08adbe58012b1a6eb6dd58d11a30343f6ec80d0f4074f9b501d70aa1c94df76d59164c53 languageName: node linkType: hard "@babel/plugin-transform-parameters@npm:^7.0.0, @babel/plugin-transform-parameters@npm:^7.20.7": - version: 7.22.15 - resolution: "@babel/plugin-transform-parameters@npm:7.22.15" + version: 7.23.3 + resolution: "@babel/plugin-transform-parameters@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 541188bb7d1876cad87687b5c7daf90f63d8208ae83df24acb1e2b05020ad1c78786b2723ca4054a83fcb74fb6509f30c4cacc5b538ee684224261ad5fb047c1 + checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16 languageName: node linkType: hard "@babel/plugin-transform-property-literals@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-property-literals@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-property-literals@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e + checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9 languageName: node linkType: hard "@babel/plugin-transform-react-display-name@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a12bfd1e4e93055efca3ace3c34722571bda59d9740dca364d225d9c6e3ca874f134694d21715c42cc63d79efd46db9665bd4a022998767f9245f1e29d5d204d + checksum: 7f86964e8434d3ddbd3c81d2690c9b66dbf1cd8bd9512e2e24500e9fa8cf378bc52c0853270b3b82143aba5965aec04721df7abdb768f952b44f5c6e0b198779 languageName: node linkType: hard "@babel/plugin-transform-react-jsx@npm:^7.0.0": - version: 7.22.15 - resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15" + version: 7.23.4 + resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4" dependencies: "@babel/helper-annotate-as-pure": ^7.22.5 "@babel/helper-module-imports": ^7.22.15 "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-jsx": ^7.22.5 - "@babel/types": ^7.22.15 + "@babel/plugin-syntax-jsx": ^7.23.3 + "@babel/types": ^7.23.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3899054e89550c3a0ef041af7c47ee266e2e934f498ee80fefeda778a6aa177b48aa8b4d2a8bf5848de977fec564571699ab952d9fa089c4c19b45ddb121df09 + checksum: d8b8c52e8e22e833bf77c8d1a53b0a57d1fd52ba9596a319d572de79446a8ed9d95521035bc1175c1589d1a6a34600d2e678fa81d81bac8fac121137097f1f0a languageName: node linkType: hard "@babel/plugin-transform-shorthand-properties@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b + checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326 languageName: node linkType: hard "@babel/plugin-transform-spread@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-spread@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-spread@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c + checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2 languageName: node linkType: hard "@babel/plugin-transform-template-literals@npm:^7.0.0": - version: 7.22.5 - resolution: "@babel/plugin-transform-template-literals@npm:7.22.5" + version: 7.23.3 + resolution: "@babel/plugin-transform-template-literals@npm:7.23.3" dependencies: "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff + checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2 languageName: node linkType: hard "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.18.3": - version: 7.22.15 - resolution: "@babel/runtime@npm:7.22.15" + version: 7.23.5 + resolution: "@babel/runtime@npm:7.23.5" dependencies: regenerator-runtime: ^0.14.0 - checksum: 793296df1e41599a935a3d77ec01eb6088410d3fd4dbe4e92f06c6b7bb2f8355024e6d78621a3a35f44e0e23b0b59107f23d585384df4f3123256a1e1492040e + checksum: 164d9802424f06908e62d29b8fd3a87db55accf82f46f964ac481dcead11ff7df8391e3696e5fa91a8ca10ea8845bf650acd730fa88cf13f8026cd8d5eec6936 languageName: node linkType: hard -"@babel/template@npm:^7.16.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5": +"@babel/template@npm:^7.16.7, @babel/template@npm:^7.22.15": version: 7.22.15 resolution: "@babel/template@npm:7.22.15" dependencies: @@ -778,21 +778,21 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.22.15, @babel/traverse@npm:^7.22.17": - version: 7.22.17 - resolution: "@babel/traverse@npm:7.22.17" +"@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/traverse@npm:7.23.5" dependencies: - "@babel/code-frame": ^7.22.13 - "@babel/generator": ^7.22.15 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 + "@babel/code-frame": ^7.23.5 + "@babel/generator": ^7.23.5 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 "@babel/helper-hoist-variables": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/parser": ^7.22.16 - "@babel/types": ^7.22.17 + "@babel/parser": ^7.23.5 + "@babel/types": ^7.23.5 debug: ^4.1.0 globals: ^11.1.0 - checksum: 1153ca166a0a9b3fddf67f7f7c8c5b4f88aa2c2c00261ff2fc8424a63bc93250ed3fd08b04bd526ad19e797aeb6f22161120646a570cbfe5ff2a5d2f5d28af01 + checksum: 0558b05360850c3ad6384e85bd55092126a8d5f93e29a8e227dd58fa1f9e1a4c25fd337c07c7ae509f0983e7a2b1e761ffdcfaa77a1e1bedbc867058e1de5a7d languageName: node linkType: hard @@ -806,14 +806,14 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.17, @babel/types@npm:^7.22.5, @babel/types@npm:^7.8.3": - version: 7.22.17 - resolution: "@babel/types@npm:7.22.17" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.5, @babel/types@npm:^7.8.3": + version: 7.23.5 + resolution: "@babel/types@npm:7.23.5" dependencies: - "@babel/helper-string-parser": ^7.22.5 - "@babel/helper-validator-identifier": ^7.22.15 + "@babel/helper-string-parser": ^7.23.4 + "@babel/helper-validator-identifier": ^7.22.20 to-fast-properties: ^2.0.0 - checksum: 7382220f6eb2548f2c867a98916c3aa8a6063498d5372e5d21d8d184ba354033defb72aeba5858c1b2b42177058b896a34a7dcbae5eccd47fb0104721efa909d + checksum: 3d21774480a459ef13b41c2e32700d927af649e04b70c5d164814d8e04ab584af66a93330602c2925e1a6925c2b829cc153418a613a4e7d79d011be1f29ad4b2 languageName: node linkType: hard @@ -964,15 +964,15 @@ __metadata: linkType: hard "@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": - version: 4.8.1 - resolution: "@eslint-community/regexpp@npm:4.8.1" - checksum: 82d62c845ef42b810f268cfdc84d803a2da01735fb52e902fd34bdc09f92464a094fd8e4802839874b000b2f73f67c972859e813ba705233515d3e954f234bf2 + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.2": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -983,14 +983,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 + checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127 languageName: node linkType: hard -"@eslint/js@npm:8.49.0": - version: 8.49.0 - resolution: "@eslint/js@npm:8.49.0" - checksum: a6601807c8aeeefe866926ad92ed98007c034a735af20ff709009e39ad1337474243d47908500a3bde04e37bfba16bcf1d3452417f962e1345bc8756edd6b830 +"@eslint/js@npm:8.55.0": + version: 8.55.0 + resolution: "@eslint/js@npm:8.55.0" + checksum: fa33ef619f0646ed15649b0c2e313e4d9ccee8425884bdbfc78020d6b6b64c0c42fa9d83061d0e6158e1d4274f03f0f9008786540e2efab8fcdc48082259908c languageName: node linkType: hard @@ -1108,7 +1108,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.0-beta.146, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.6.3, @ethersproject/abi@npm:^5.7.0": +"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.1.2, @ethersproject/abi@npm:^5.6.3, @ethersproject/abi@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/abi@npm:5.7.0" dependencies: @@ -1510,6 +1510,13 @@ __metadata: languageName: node linkType: hard +"@fastify/busboy@npm:^2.0.0": + version: 2.1.0 + resolution: "@fastify/busboy@npm:2.1.0" + checksum: 3233abd10f73e50668cb4bb278a79b7b3fadd30215ac6458299b0e5a09a29c3586ec07597aae6bd93f5cbedfcef43a8aeea51829cd28fc13850cdbcd324c28d5 + languageName: node + linkType: hard + "@fastify/deepmerge@npm:^1.0.0": version: 1.3.0 resolution: "@fastify/deepmerge@npm:1.3.0" @@ -2460,15 +2467,16 @@ __metadata: linkType: hard "@graphql-tools/utils@npm:^10.0.0": - version: 10.0.6 - resolution: "@graphql-tools/utils@npm:10.0.6" + version: 10.0.11 + resolution: "@graphql-tools/utils@npm:10.0.11" dependencies: "@graphql-typed-document-node/core": ^3.1.1 + cross-inspect: 1.0.0 dset: ^3.1.2 tslib: ^2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 1eae5ff2056930edf1b5a6aa38a2b28c2b3da0260d4d6babbd3fb25f8638b04c7ea8a481b3e1d4d965d81f2123b577646afb0fe20da87e76362d6f7f099e4be9 + checksum: cb480d0b3f253f85b84415f5b9e2893013a8e8b72501ec04e338c54a26ac234c9723c6c2d697f1316e89589425e5b133fd45eab2504a52b84d1d75dc6a495863 languageName: node linkType: hard @@ -2550,14 +2558,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.11": - version: 0.11.11 - resolution: "@humanwhocodes/config-array@npm:0.11.11" +"@humanwhocodes/config-array@npm:^0.11.13": + version: 0.11.13 + resolution: "@humanwhocodes/config-array@npm:0.11.13" dependencies: - "@humanwhocodes/object-schema": ^1.2.1 + "@humanwhocodes/object-schema": ^2.0.1 debug: ^4.1.1 minimatch: ^3.0.5 - checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19 + checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805 languageName: node linkType: hard @@ -2568,10 +2576,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.1": + version: 2.0.1 + resolution: "@humanwhocodes/object-schema@npm:2.0.1" + checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45 languageName: node linkType: hard @@ -2661,12 +2669,12 @@ __metadata: linkType: hard "@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.19 - resolution: "@jridgewell/trace-mapping@npm:0.3.19" + version: 0.3.20 + resolution: "@jridgewell/trace-mapping@npm:0.3.20" dependencies: "@jridgewell/resolve-uri": ^3.1.0 "@jridgewell/sourcemap-codec": ^1.4.14 - checksum: 956a6f0f6fec060fb48c6bf1f5ec2064e13cd38c8be3873877d4b92b4a27ba58289a34071752671262a3e3c202abcc3fa2aac64d8447b4b0fa1ba3c9047f1c20 + checksum: cd1a7353135f385909468ff0cf20bdd37e59f2ee49a13a966dedf921943e222082c583ade2b579ff6cd0d8faafcb5461f253e1bf2a9f48fec439211fdbe788f5 languageName: node linkType: hard @@ -3226,7 +3234,7 @@ __metadata: languageName: node linkType: hard -"@nomiclabs/hardhat-ethers@npm:^2.1.1": +"@nomiclabs/hardhat-ethers@npm:^2.1.1, @nomiclabs/hardhat-ethers@npm:^2.2.3": version: 2.2.3 resolution: "@nomiclabs/hardhat-ethers@npm:2.2.3" peerDependencies: @@ -3256,6 +3264,19 @@ __metadata: languageName: node linkType: hard +"@npmcli/agent@npm:^2.0.0": + version: 2.2.0 + resolution: "@npmcli/agent@npm:2.2.0" + dependencies: + agent-base: ^7.1.0 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.1 + lru-cache: ^10.0.1 + socks-proxy-agent: ^8.0.1 + checksum: 3b25312edbdfaa4089af28e2d423b6f19838b945e47765b0c8174c1395c79d43c3ad6d23cb364b43f59fd3acb02c93e3b493f72ddbe3dfea04c86843a7311fc4 + languageName: node + linkType: hard + "@npmcli/fs@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/fs@npm:3.1.0" @@ -3316,37 +3337,23 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts@npm:4.9.3, @openzeppelin/contracts@npm:^4.3.3": +"@openzeppelin/contracts@npm:4.9.3, @openzeppelin/contracts@npm:^4.3.3, @openzeppelin/contracts@npm:^4.6.0, @openzeppelin/contracts@npm:^4.8.3": version: 4.9.3 resolution: "@openzeppelin/contracts@npm:4.9.3" checksum: 4932063e733b35fa7669b9fe2053f69b062366c5c208b0c6cfa1ac451712100c78acff98120c3a4b88d94154c802be05d160d71f37e7d74cadbe150964458838 languageName: node linkType: hard -"@openzeppelin/contracts@npm:^4.6.0": - version: 4.8.0 - resolution: "@openzeppelin/contracts@npm:4.8.0" - checksum: dfab51a7f91735cfb1e94dd5074736b0dac0207e4ebf26eb46b32defd3b67adce5a36b248daa7b841c21be74863c1e37cf92ed194a9c36d3f8c5326d1a24242a - languageName: node - linkType: hard - -"@openzeppelin/contracts@npm:^4.8.3": - version: 4.9.1 - resolution: "@openzeppelin/contracts@npm:4.9.1" - checksum: 9bb3cc6aecd6c56d5ece10d9820d43e6e9c460395b75cc4af9b4e776f1a9e56c9906bc03538b0707e617dc31f1abdfffcbeedfecc8884358d864198ed73f59c1 - languageName: node - linkType: hard - "@openzeppelin/defender-base-client@npm:^1.46.0": - version: 1.48.0 - resolution: "@openzeppelin/defender-base-client@npm:1.48.0" + version: 1.52.0 + resolution: "@openzeppelin/defender-base-client@npm:1.52.0" dependencies: amazon-cognito-identity-js: ^6.0.1 async-retry: ^1.3.3 axios: ^1.4.0 lodash: ^4.17.19 node-fetch: ^2.6.0 - checksum: 7391ac924b48d0ec38853f2d85aef837edbe7b8caf7afb32e6914e2a68ec40a0377bdd0cd60b52d35edaf6b4d7d57ebd4d34805adb410a9d5051f71d2c329455 + checksum: 7857a656a534e54ae94f50d6bb7ad6a17860375581a792c293f15707ae66088a02e2eb7213bb8e7e00496ea4e86330cbcee1a383c517f0d2e959c76a3722cdcd languageName: node linkType: hard @@ -3388,8 +3395,8 @@ __metadata: linkType: hard "@openzeppelin/upgrades-core@npm:^1.27.0": - version: 1.28.0 - resolution: "@openzeppelin/upgrades-core@npm:1.28.0" + version: 1.31.3 + resolution: "@openzeppelin/upgrades-core@npm:1.31.3" dependencies: cbor: ^9.0.0 chalk: ^4.1.0 @@ -3398,21 +3405,21 @@ __metadata: ethereumjs-util: ^7.0.3 minimist: ^1.2.7 proper-lockfile: ^4.1.1 - solidity-ast: ^0.4.26 + solidity-ast: ^0.4.51 bin: openzeppelin-upgrades-core: dist/cli/cli.js - checksum: 9da2e057bc16375a5eab7e65a4b13f478ab964e7f96b3d5480f798b241bb8a3590e16339fe23cde08d5ffdb01964be6a829f50a9baee85783f18cb5fb8a41421 + checksum: e7ab98bb822b7b69b0a5f333fd9113e13d05b995ccf880ea8e15406c2a5a0a8c0c61205e8b548859fac779c646d621c9315112c4bc16d7f5001b7fbf29972644 languageName: node linkType: hard "@peculiar/asn1-schema@npm:^2.3.6": - version: 2.3.6 - resolution: "@peculiar/asn1-schema@npm:2.3.6" + version: 2.3.8 + resolution: "@peculiar/asn1-schema@npm:2.3.8" dependencies: asn1js: ^3.0.5 - pvtsutils: ^1.3.2 - tslib: ^2.4.0 - checksum: fc09387c6e3dea07fca21b54ea8c71ce3ec0f8c92377237e51aef729f0c2df92781aa7a18a546a6fe809519faeaa222df576ec21a35c6095037a78677204a55b + pvtsutils: ^1.3.5 + tslib: ^2.6.2 + checksum: 1f4dd421f1411df8bc52bca12b1cef710434c13ff0a8b5746ede42b10d62b5ad06a3925c4a6db53102aaf1e589947539a6955fa8554a9b8ebb1ffa38b0155a24 languageName: node linkType: hard @@ -3518,13 +3525,20 @@ __metadata: languageName: node linkType: hard -"@repeaterjs/repeater@npm:3.0.4, @repeaterjs/repeater@npm:^3.0.4": +"@repeaterjs/repeater@npm:3.0.4": version: 3.0.4 resolution: "@repeaterjs/repeater@npm:3.0.4" checksum: cca0db3e802bc26fcce0b4a574074d9956da53bf43094de03c0e4732d05e13441279a92f0b96e2a7a39da50933684947a138c1213406eaafe39cfd4683d6c0df languageName: node linkType: hard +"@repeaterjs/repeater@npm:^3.0.4": + version: 3.0.5 + resolution: "@repeaterjs/repeater@npm:3.0.5" + checksum: 4f66020679a2e7a93fbd43d40a7ae6a187d6d7d148b019cca025791dade452599848bd20cd225861a65629571806c551a18cd40190426eb74b050710ac3ae865 + languageName: node + linkType: hard + "@rescript/std@npm:9.0.0": version: 9.0.0 resolution: "@rescript/std@npm:9.0.0" @@ -3677,12 +3691,12 @@ __metadata: languageName: node linkType: hard -"@smithy/types@npm:^2.3.0": - version: 2.3.0 - resolution: "@smithy/types@npm:2.3.0" +"@smithy/types@npm:^2.5.0": + version: 2.6.0 + resolution: "@smithy/types@npm:2.6.0" dependencies: tslib: ^2.5.0 - checksum: c0195be70fed780cd3063d54481b7393eec9d229c49aa05da76570a8ad1eb2478888700fbb5f004c38ce6b1c99175898639225a44c0dc474419524f4d62b8bb4 + checksum: 9233d1e6e414a8b807f9fe7a7c30064626f77b0242d8634b9b1c192f77b27a997a3caf90ecf7f4361d5926c9e9cc761991eecfb47bbfa6ce2be21c5533a3bea6 languageName: node linkType: hard @@ -3731,13 +3745,6 @@ __metadata: languageName: node linkType: hard -"@tootallnate/once@npm:2": - version: 2.0.0 - resolution: "@tootallnate/once@npm:2.0.0" - checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8 - languageName: node - linkType: hard - "@trivago/prettier-plugin-sort-imports@npm:^3.2.0": version: 3.4.0 resolution: "@trivago/prettier-plugin-sort-imports@npm:3.4.0" @@ -3847,9 +3854,11 @@ __metadata: linkType: hard "@types/async-eventemitter@npm:^0.2.1": - version: 0.2.1 - resolution: "@types/async-eventemitter@npm:0.2.1" - checksum: 36ba0a6f52082f76b19b9123a2fa0497f94fe15218fa54040cc45f0edff483ec3be93a38c177cd4dab79f5e32333fbdf3682d4dc94197438e86694b1fddd6896 + version: 0.2.4 + resolution: "@types/async-eventemitter@npm:0.2.4" + dependencies: + "@types/events": "*" + checksum: cee62e258cf02a45688a3f6f517b623270a9c2779dfd2f53b52e0efbcb0282d7078c3ce1fafb2af257aefdb892acc09ba51d93647930885414ec719437430bf7 languageName: node linkType: hard @@ -3863,11 +3872,11 @@ __metadata: linkType: hard "@types/bn.js@npm:^5.1.0, @types/bn.js@npm:^5.1.1": - version: 5.1.1 - resolution: "@types/bn.js@npm:5.1.1" + version: 5.1.5 + resolution: "@types/bn.js@npm:5.1.5" dependencies: "@types/node": "*" - checksum: e50ed2dd3abe997e047caf90e0352c71e54fc388679735217978b4ceb7e336e51477791b715f49fd77195ac26dd296c7bad08a3be9750e235f9b2e1edb1b51c2 + checksum: c87b28c4af74545624f8a3dae5294b16aa190c222626e8d4b2e327b33b1a3f1eeb43e7a24d914a9774bca43d8cd6e1cb0325c1f4b3a244af6693a024e1d918e6 languageName: node linkType: hard @@ -3884,27 +3893,27 @@ __metadata: linkType: hard "@types/chai-as-promised@npm:^7.1.3": - version: 7.1.6 - resolution: "@types/chai-as-promised@npm:7.1.6" + version: 7.1.8 + resolution: "@types/chai-as-promised@npm:7.1.8" dependencies: "@types/chai": "*" - checksum: f765dd249ae9384540f8e6402bd3a9f5e87b97f9078ef58f4b5ec15f7c3673e1f10f0089f819eceb20e00b3df40b7aae1bd44d2b8f4edbbedfcb33ce296f6791 + checksum: f0e5eab451b91bc1e289ed89519faf6591932e8a28d2ec9bbe95826eb73d28fe43713633e0c18706f3baa560a7d97e7c7c20dc53ce639e5d75bac46b2a50bf21 languageName: node linkType: hard "@types/chai@npm:*": - version: 4.3.6 - resolution: "@types/chai@npm:4.3.6" - checksum: 32a6c18bf53fb3dbd89d1bfcadb1c6fd45cc0007c34e436393cc37a0a5a556f9e6a21d1e8dd71674c40cc36589d2f30bf4d9369d7787021e54d6e997b0d7300a + version: 4.3.11 + resolution: "@types/chai@npm:4.3.11" + checksum: d0c05fe5d02b2e6bbca2bd4866a2ab20a59cf729bc04af0060e7a3277eaf2fb65651b90d4c74b0ebf1d152b4b1d49fa8e44143acef276a2bbaa7785fbe5642d3 languageName: node linkType: hard "@types/cli-progress@npm:^3.11.0": - version: 3.11.2 - resolution: "@types/cli-progress@npm:3.11.2" + version: 3.11.5 + resolution: "@types/cli-progress@npm:3.11.5" dependencies: "@types/node": "*" - checksum: 4068ef410137560cc4f0e036e0fbf096432e94a5acbcce934893148663569bf936f25e0d7ba156780c355b31a235a0db58b86b25b991f0ae6dcb21b4b294af57 + checksum: 571fb3b11646415ac49c90e8003b82f3ac58d75fde5952caf40b4a079517b6e25e79ab0a7455d0ab0398d0b2de062646dba075d3d1f8d147eed2ab4d41abbf64 languageName: node linkType: hard @@ -3918,11 +3927,18 @@ __metadata: linkType: hard "@types/connect@npm:^3.4.33": - version: 3.4.36 - resolution: "@types/connect@npm:3.4.36" + version: 3.4.38 + resolution: "@types/connect@npm:3.4.38" dependencies: "@types/node": "*" - checksum: 4dee3d966fb527b98f0cbbdcf6977c9193fc3204ed539b7522fe5e64dfa45f9017bdda4ffb1f760062262fce7701a0ee1c2f6ce2e50af36c74d4e37052303172 + checksum: 7eb1bc5342a9604facd57598a6c62621e244822442976c443efb84ff745246b10d06e8b309b6e80130026a396f19bf6793b7cecd7380169f369dac3bfc46fb99 + languageName: node + linkType: hard + +"@types/events@npm:*": + version: 3.0.3 + resolution: "@types/events@npm:3.0.3" + checksum: 50af9312fab001fd6bd4bb3ff65830f940877e6778de140a92481a0d9bf5f4853d44ec758a8800ef60e0598ac43ed1b5688116a3c65906ae54e989278d6c7c82 languageName: node linkType: hard @@ -3946,16 +3962,16 @@ __metadata: linkType: hard "@types/http-cache-semantics@npm:*": - version: 4.0.1 - resolution: "@types/http-cache-semantics@npm:4.0.1" - checksum: 1048aacf627829f0d5f00184e16548205cd9f964bf0841c29b36bc504509230c40bc57c39778703a1c965a6f5b416ae2cbf4c1d4589c889d2838dd9dbfccf6e9 + version: 4.0.4 + resolution: "@types/http-cache-semantics@npm:4.0.4" + checksum: 7f4dd832e618bc1e271be49717d7b4066d77c2d4eed5b81198eb987e532bb3e1c7e02f45d77918185bad936f884b700c10cebe06305f50400f382ab75055f9e8 languageName: node linkType: hard "@types/json-schema@npm:^7.0.9": - version: 7.0.12 - resolution: "@types/json-schema@npm:7.0.12" - checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98 languageName: node linkType: hard @@ -4011,23 +4027,18 @@ __metadata: linkType: hard "@types/mustache@npm:^4.2.1": - version: 4.2.2 - resolution: "@types/mustache@npm:4.2.2" - checksum: 1fa67a519f4302c96615524be4c8248067da02ca047bae9d4c4bb79977135ac7c15dcc388e7c70b8a817b9497004d5ca5c77a155dcb096bea16d53d4cdbe75d2 - languageName: node - linkType: hard - -"@types/node@npm:*": - version: 20.6.0 - resolution: "@types/node@npm:20.6.0" - checksum: 52611801af5cf151c6fac1963aa4a8a8ca2e388a9e9ed82b01b70bca762088ded5b32cc789c5564220d5d7dccba2b8dd34446a3d4fc74736805e1f2cf262e29d + version: 4.2.5 + resolution: "@types/mustache@npm:4.2.5" + checksum: 0ff1d52022fd3ab0db1c97964ca0c24b45ad74e81ec62e05d27eab5b66ef1d78ff257f4cfb481c72b8b511f15520ca48717e000dc5fa8c3fdf732790b28f05cb languageName: node linkType: hard -"@types/node@npm:>=13.7.0, @types/node@npm:^20.5.9": - version: 20.5.9 - resolution: "@types/node@npm:20.5.9" - checksum: 717490e94131722144878b4ca1a963ede1673bb8f2ef78c2f5b50b918df6dc9b35e7f8283e5c2a7a9f137730f7c08dc6228e53d4494a94c9ee16881e6ce6caed +"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20.5.9": + version: 20.10.3 + resolution: "@types/node@npm:20.10.3" + dependencies: + undici-types: ~5.26.4 + checksum: 34a329494f0ea239af05eeb6f00f396963725b3eb9a2f79c5e6a6d37e823f2ab85e1079c2ee56723a37d8b89e7bbe2bd050c97144e5bb06dab93fd1cace65c97 languageName: node linkType: hard @@ -4053,25 +4064,25 @@ __metadata: linkType: hard "@types/normalize-package-data@npm:^2.4.0": - version: 2.4.1 - resolution: "@types/normalize-package-data@npm:2.4.1" - checksum: e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5 + version: 2.4.4 + resolution: "@types/normalize-package-data@npm:2.4.4" + checksum: 65dff72b543997b7be8b0265eca7ace0e34b75c3e5fee31de11179d08fa7124a7a5587265d53d0409532ecb7f7fba662c2012807963e1f9b059653ec2c83ee05 languageName: node linkType: hard "@types/parse-json@npm:^4.0.0": - version: 4.0.0 - resolution: "@types/parse-json@npm:4.0.0" - checksum: fd6bce2b674b6efc3db4c7c3d336bd70c90838e8439de639b909ce22f3720d21344f52427f1d9e57b265fcb7f6c018699b99e5e0c208a1a4823014269a6bf35b + version: 4.0.2 + resolution: "@types/parse-json@npm:4.0.2" + checksum: 5bf62eec37c332ad10059252fc0dab7e7da730764869c980b0714777ad3d065e490627be9f40fc52f238ffa3ac4199b19de4127196910576c2fe34dd47c7a470 languageName: node linkType: hard "@types/pbkdf2@npm:^3.0.0": - version: 3.1.0 - resolution: "@types/pbkdf2@npm:3.1.0" + version: 3.1.2 + resolution: "@types/pbkdf2@npm:3.1.2" dependencies: "@types/node": "*" - checksum: d15024b1957c21cf3b8887329d9bd8dfde754cf13a09d76ae25f1391cfc62bb8b8d7b760773c5dbaa748172fba8b3e0c3dbe962af6ccbd69b76df12a48dfba40 + checksum: bebe1e596cbbe5f7d2726a58859e61986c5a42459048e29cb7f2d4d764be6bbb0844572fd5d70ca8955a8a17e8b4ed80984fc4903e165d9efb8807a3fbb051aa languageName: node linkType: hard @@ -4083,9 +4094,9 @@ __metadata: linkType: hard "@types/qs@npm:^6.2.31, @types/qs@npm:^6.9.7": - version: 6.9.8 - resolution: "@types/qs@npm:6.9.8" - checksum: c28e07d00d07970e5134c6eed184a0189b8a4649e28fdf36d9117fe671c067a44820890de6bdecef18217647a95e9c6aebdaaae69f5fe4b0bec9345db885f77e + version: 6.9.10 + resolution: "@types/qs@npm:6.9.10" + checksum: 3e479ee056bd2b60894baa119d12ecd33f20a25231b836af04654e784c886f28a356477630430152a86fba253da65d7ecd18acffbc2a8877a336e75aa0272c67 languageName: node linkType: hard @@ -4100,27 +4111,27 @@ __metadata: linkType: hard "@types/responselike@npm:^1.0.0": - version: 1.0.0 - resolution: "@types/responselike@npm:1.0.0" + version: 1.0.3 + resolution: "@types/responselike@npm:1.0.3" dependencies: "@types/node": "*" - checksum: e99fc7cc6265407987b30deda54c1c24bb1478803faf6037557a774b2f034c5b097ffd65847daa87e82a61a250d919f35c3588654b0fdaa816906650f596d1b0 + checksum: 6ac4b35723429b11b117e813c7acc42c3af8b5554caaf1fc750404c1ae59f9b7376bc69b9e9e194a5a97357a597c2228b7173d317320f0360d617b6425212f58 languageName: node linkType: hard "@types/secp256k1@npm:^4.0.1": - version: 4.0.3 - resolution: "@types/secp256k1@npm:4.0.3" + version: 4.0.6 + resolution: "@types/secp256k1@npm:4.0.6" dependencies: "@types/node": "*" - checksum: 1bd10b9afa724084b655dc81b7b315def3d2d0e272014ef16009fa76e17537411c07c0695fdea412bc7b36d2a02687f5fea33522d55b8ef29eda42992f812913 + checksum: 984494caf49a4ce99fda2b9ea1840eb47af946b8c2737314108949bcc0c06b4880e871296bd49ed6ea4c8423e3a302ad79fec43abfc987330e7eb98f0c4e8ba4 languageName: node linkType: hard "@types/semver@npm:^7.3.12": - version: 7.5.1 - resolution: "@types/semver@npm:7.5.1" - checksum: 2fffe938c7ac168711f245a16e1856a3578d77161ca17e29a05c3e02c7be3e9c5beefa29a3350f6c1bd982fb70aa28cc52e4845eb7d36246bcdc0377170d584d + version: 7.5.6 + resolution: "@types/semver@npm:7.5.6" + checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037 languageName: node linkType: hard @@ -4134,11 +4145,11 @@ __metadata: linkType: hard "@types/ws@npm:^8.0.0": - version: 8.5.5 - resolution: "@types/ws@npm:8.5.5" + version: 8.5.10 + resolution: "@types/ws@npm:8.5.10" dependencies: "@types/node": "*" - checksum: d00bf8070e6938e3ccf933010921c6ce78ac3606696ce37a393b27a9a603f7bd93ea64f3c5fa295a2f743575ba9c9a9fdb904af0f5fe2229bf2adf0630386e4a + checksum: 3ec416ea2be24042ebd677932a462cf16d2080393d8d7d0b1b3f5d6eaa4a7387aaf0eefb99193c0bfd29444857cf2e0c3ac89899e130550dc6c14ada8a46d25e languageName: node linkType: hard @@ -4263,6 +4274,13 @@ __metadata: languageName: node linkType: hard +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524 + languageName: node + linkType: hard + "@urql/core@npm:^3.2.0": version: 3.2.2 resolution: "@urql/core@npm:3.2.2" @@ -4288,10 +4306,22 @@ __metadata: languageName: node linkType: hard -"@venusprotocol/isolated-pools@npm:2.1.0-dev.2": - version: 2.1.0-dev.2 - resolution: "@venusprotocol/isolated-pools@npm:2.1.0-dev.2" +"@venusprotocol/governance-contracts@npm:^1.4.0-dev.2, @venusprotocol/governance-contracts@npm:^1.4.0-dev.6": + version: 1.4.0-dev.6 + resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.6" + dependencies: + "@venusprotocol/solidity-utilities": ^1.1.0 + hardhat-deploy-ethers: ^0.3.0-beta.13 + module-alias: ^2.2.2 + checksum: ec185ebcb54f1dadf6fea2439c429831feae8998e688817ccada0ad0ea8f5c54277a0418c299eb281017c12d4723c4cdb388e3e6afdc3abb81a679fdf279d2f2 + languageName: node + linkType: hard + +"@venusprotocol/isolated-pools@npm:^2.3.0-dev.4": + version: 2.3.0-dev.4 + resolution: "@venusprotocol/isolated-pools@npm:2.3.0-dev.4" dependencies: + "@nomiclabs/hardhat-ethers": ^2.2.3 "@openzeppelin/contracts": ^4.8.3 "@openzeppelin/contracts-upgradeable": ^4.8.3 "@openzeppelin/hardhat-upgrades": ^1.21.0 @@ -4299,13 +4329,13 @@ __metadata: ethers: ^5.7.0 hardhat-deploy: ^0.11.14 module-alias: ^2.2.2 - checksum: 6915770070382a41f900df7e2bbd7184aabc77cbc191fc73c1737a8c41175dbf93be37accb698e0e06e06d2979943c7f5148f2800a6afcd7db7fa0743588171f + checksum: 5c2fd1dea4253994e7d51de9986b15cbf60194068272c7306d11dcb69f4ded38b5be9696c28abe84da95125f66fc71849e894325c52621219d95e03b8bac8c2e languageName: node linkType: hard "@venusprotocol/oracle@npm:^1.7.3-dev.1": - version: 1.7.3-dev.1 - resolution: "@venusprotocol/oracle@npm:1.7.3-dev.1" + version: 1.7.3 + resolution: "@venusprotocol/oracle@npm:1.7.3" dependencies: "@chainlink/contracts": ^0.5.1 "@defi-wonderland/smock": ^2.3.4 @@ -4319,7 +4349,31 @@ __metadata: hardhat-deploy: ^0.11.14 module-alias: ^2.2.2 solidity-docgen: ^0.6.0-beta.29 - checksum: ae803c39e8fddeccff6d14c79d4a0974b6c910d45f16302870bfbb1d4374f56e19295d17ffb83eacb6fd3a1e4941f0200592ca729e493b2df691eb4ba4b0c34b + checksum: 4187974f762fe1082db449acf2edd2d9d94feec76fab88a50d0eb5de44d12baf80381e365e71b2784c12a0e0941630c37b81d23cea01ec4b4a6f549a90457803 + languageName: node + linkType: hard + +"@venusprotocol/protocol-reserve@npm:1.2.0-dev.2": + version: 1.2.0-dev.2 + resolution: "@venusprotocol/protocol-reserve@npm:1.2.0-dev.2" + dependencies: + "@nomiclabs/hardhat-ethers": ^2.2.3 + "@openzeppelin/contracts": ^4.8.3 + "@openzeppelin/contracts-upgradeable": ^4.8.3 + "@openzeppelin/hardhat-upgrades": ^1.21.0 + "@solidity-parser/parser": ^0.13.2 + "@venusprotocol/solidity-utilities": ^1.0.1 + ethers: ^5.7.0 + hardhat-deploy: ^0.11.14 + module-alias: ^2.2.2 + checksum: e644bc58b6b4646ce6b262e9e34646d65285dee97cb38a34ac99d35330b3f4bea4c9075d87ee6e6d1e813563c622a01e12eba82014e6d7952e17ea798673bac3 + languageName: node + linkType: hard + +"@venusprotocol/solidity-utilities@npm:^1.0.1, @venusprotocol/solidity-utilities@npm:^1.1.0": + version: 1.1.0 + resolution: "@venusprotocol/solidity-utilities@npm:1.1.0" + checksum: 3b17ec451cd0ba5aaea76686c7bef35757fb158709214be094f73ebd0d643c79817159f7aa162cc694e1a5ee1f02b20e26211a65929113b985827959aae99fa7 languageName: node linkType: hard @@ -4365,87 +4419,89 @@ __metadata: languageName: node linkType: hard -"@venusprotocol/venus-protocol@npm:^3.0.0-dev.7": - version: 3.1.0 - resolution: "@venusprotocol/venus-protocol@npm:3.1.0" +"@venusprotocol/venus-protocol@npm:^6.1.0-dev.5": + version: 6.1.0-dev.5 + resolution: "@venusprotocol/venus-protocol@npm:6.1.0-dev.5" dependencies: - "@openzeppelin/contracts": ^4.8.3 + "@openzeppelin/contracts": 4.9.3 "@openzeppelin/contracts-upgradeable": ^4.8.0 + "@venusprotocol/governance-contracts": ^1.4.0-dev.2 + "@venusprotocol/protocol-reserve": 1.2.0-dev.2 + "@venusprotocol/solidity-utilities": ^1.1.0 + bignumber.js: ^9.1.2 dotenv: ^16.0.1 module-alias: ^2.2.2 - peerDependencies: - hardhat: ^2.10.1 - checksum: 0c44a6566ed623161f49036961d2118958485a59bdba71733e86c77731cde2adcfcb535b69c275381888bc1fc6d807ab9ec271e8796aa961897dac2850081e1c + checksum: f5c7922a6e57838326a9ead42dcfb7625294926f029b4727e31cc14124c5961ed6f2aa848461a4213a54b357be3097a6120873974957fad223dc2821f1694ad7 languageName: node linkType: hard -"@vue/compiler-core@npm:3.3.4": - version: 3.3.4 - resolution: "@vue/compiler-core@npm:3.3.4" +"@vue/compiler-core@npm:3.3.10": + version: 3.3.10 + resolution: "@vue/compiler-core@npm:3.3.10" dependencies: - "@babel/parser": ^7.21.3 - "@vue/shared": 3.3.4 + "@babel/parser": ^7.23.5 + "@vue/shared": 3.3.10 estree-walker: ^2.0.2 source-map-js: ^1.0.2 - checksum: 5437942ea6575b316c9cd84f4f128a44939713da8b6958060e152c599e6d771d5db056c398d7574ee706ff8092e0d99ac4f14e7eef8712a8dd923d2323201b9e + checksum: d266a83996f1dff8882dc98c9022b235008659bed303bbcf6ff2ac8c7d2bbb7b32acd11629cc8d0fa2de9c3fba4f6050c68cdf58f74aee7969655017936e71eb languageName: node linkType: hard -"@vue/compiler-dom@npm:3.3.4": - version: 3.3.4 - resolution: "@vue/compiler-dom@npm:3.3.4" +"@vue/compiler-dom@npm:3.3.10": + version: 3.3.10 + resolution: "@vue/compiler-dom@npm:3.3.10" dependencies: - "@vue/compiler-core": 3.3.4 - "@vue/shared": 3.3.4 - checksum: 1c2ac0c89de8eef7be1c568d57504e6245adaaec40c2c4d9717bc231ca10bf682d918a3b358d24c786eeaf8e0d7eb8a65f57d9044775a304783fde1d069a1896 + "@vue/compiler-core": 3.3.10 + "@vue/shared": 3.3.10 + checksum: 5b672307ea5da10b827958f3a0aee55478b08ca5a9d552c23bb02bbccd333e558cb0675eaa0275435e623433da3fa1f6c59adca03b463dd5d79cbe129d50b064 languageName: node linkType: hard "@vue/compiler-sfc@npm:^3.2.40": - version: 3.3.4 - resolution: "@vue/compiler-sfc@npm:3.3.4" - dependencies: - "@babel/parser": ^7.20.15 - "@vue/compiler-core": 3.3.4 - "@vue/compiler-dom": 3.3.4 - "@vue/compiler-ssr": 3.3.4 - "@vue/reactivity-transform": 3.3.4 - "@vue/shared": 3.3.4 + version: 3.3.10 + resolution: "@vue/compiler-sfc@npm:3.3.10" + dependencies: + "@babel/parser": ^7.23.5 + "@vue/compiler-core": 3.3.10 + "@vue/compiler-dom": 3.3.10 + "@vue/compiler-ssr": 3.3.10 + "@vue/reactivity-transform": 3.3.10 + "@vue/shared": 3.3.10 estree-walker: ^2.0.2 - magic-string: ^0.30.0 - postcss: ^8.1.10 + magic-string: ^0.30.5 + postcss: ^8.4.32 source-map-js: ^1.0.2 - checksum: 0a0adfdd3e812f528e25e4b3bbf14b2296b719a8aac609eca42035295527cc253b918a552dc15218e917efef26b7ca94054dc8784a1a18c06c3d4bb4d18ab8b9 + checksum: 978a1dc2555807104c071234a966cc5d009a643b8c7868abc3cfe59b8c9087b5c6617648158b2876049478f18bb44f7ee2a7a5d46dac7befdbc12db402fd2f97 languageName: node linkType: hard -"@vue/compiler-ssr@npm:3.3.4": - version: 3.3.4 - resolution: "@vue/compiler-ssr@npm:3.3.4" +"@vue/compiler-ssr@npm:3.3.10": + version: 3.3.10 + resolution: "@vue/compiler-ssr@npm:3.3.10" dependencies: - "@vue/compiler-dom": 3.3.4 - "@vue/shared": 3.3.4 - checksum: 5d1875d55ea864080dd90e5d81a29f93308e312faf00163db5b391b38c2fe799fd3eb58955823dc632f2f8bdd271a4534cc0020646b7f82717be1a8d30dc16e7 + "@vue/compiler-dom": 3.3.10 + "@vue/shared": 3.3.10 + checksum: 8fba20decde9d6ba86a1167aabe4cf4d47bd688ae84b1e9160e4d60905067725e918a79e255a82d1946f466dee738860969e2f6be7e89b7fa9de99b5bff7c544 languageName: node linkType: hard -"@vue/reactivity-transform@npm:3.3.4": - version: 3.3.4 - resolution: "@vue/reactivity-transform@npm:3.3.4" +"@vue/reactivity-transform@npm:3.3.10": + version: 3.3.10 + resolution: "@vue/reactivity-transform@npm:3.3.10" dependencies: - "@babel/parser": ^7.20.15 - "@vue/compiler-core": 3.3.4 - "@vue/shared": 3.3.4 + "@babel/parser": ^7.23.5 + "@vue/compiler-core": 3.3.10 + "@vue/shared": 3.3.10 estree-walker: ^2.0.2 - magic-string: ^0.30.0 - checksum: b425e78b2084ac7037887fbe012dcad5e5963ac9714ae15a04fda1c6766ec8c53ef231de1cfdc4d3cf46bd5d84bfec8ebdccf48da4ff5ee2f4b5084e54f0a1b1 + magic-string: ^0.30.5 + checksum: cf721e9799576dc2d0d0857e129af45fdd14b712a990bfcdd77c6b1515f6e5777d69e5cafa6411042d4dd5c9b0395cd07796439ad24ba532262d61857cb3fb56 languageName: node linkType: hard -"@vue/shared@npm:3.3.4": - version: 3.3.4 - resolution: "@vue/shared@npm:3.3.4" - checksum: 12fe53ff816bfa29ea53f89212067a86512c626b8d30149ff28b36705820f6150e1fb4e4e46897ad9eddb1d1cfc02d8941053939910eed69a905f7a5509baabe +"@vue/shared@npm:3.3.10": + version: 3.3.10 + resolution: "@vue/shared@npm:3.3.10" + checksum: 6cfb930290c10b810aea18730d8754ff967e804fa04f8e47884c15a2121c24923cb9ab8244ae75ad448bf835e44093b2daf8d294555b9bb1901fefce681d228c languageName: node linkType: hard @@ -4540,7 +4596,7 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:1, abbrev@npm:^1.0.0": +"abbrev@npm:1": version: 1.1.1 resolution: "abbrev@npm:1.1.1" checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17 @@ -4554,6 +4610,13 @@ __metadata: languageName: node linkType: hard +"abbrev@npm:^2.0.0": + version: 2.0.0 + resolution: "abbrev@npm:2.0.0" + checksum: 0e994ad2aa6575f94670d8a2149afe94465de9cedaaaac364e7fb43a40c3691c980ff74899f682f4ca58fa96b4cbd7421a015d3a6defe43a442117d7821a2f36 + languageName: node + linkType: hard + "abort-controller@npm:^3.0.0": version: 3.0.0 resolution: "abort-controller@npm:3.0.0" @@ -4605,18 +4668,18 @@ __metadata: linkType: hard "acorn-walk@npm:^8.1.1": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 + version: 8.3.0 + resolution: "acorn-walk@npm:8.3.0" + checksum: 15ea56ab6529135be05e7d018f935ca80a572355dd3f6d3cd717e36df3346e0f635a93ae781b1c7942607693e2e5f3ef81af5c6fc697bbadcc377ebda7b7f5f6 languageName: node linkType: hard "acorn@npm:^8.4.1, acorn@npm:^8.9.0": - version: 8.10.0 - resolution: "acorn@npm:8.10.0" + version: 8.11.2 + resolution: "acorn@npm:8.11.2" bin: acorn: bin/acorn - checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d + checksum: 818450408684da89423e3daae24e4dc9b68692db8ab49ea4569c7c5abb7a3f23669438bf129cc81dfdada95e1c9b944ee1bfca2c57a05a4dc73834a612fbf6a7 languageName: node linkType: hard @@ -4641,7 +4704,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": +"agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -4650,12 +4713,12 @@ __metadata: languageName: node linkType: hard -"agentkeepalive@npm:^4.2.1": - version: 4.5.0 - resolution: "agentkeepalive@npm:4.5.0" +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": + version: 7.1.0 + resolution: "agent-base@npm:7.1.0" dependencies: - humanize-ms: ^1.2.1 - checksum: 13278cd5b125e51eddd5079f04d6fe0914ac1b8b91c1f3db2c1822f99ac1a7457869068997784342fe455d59daaff22e14fb7b8c3da4e741896e7e31faf92481 + debug: ^4.3.4 + checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f languageName: node linkType: hard @@ -4708,15 +4771,15 @@ __metadata: linkType: hard "amazon-cognito-identity-js@npm:^6.0.1": - version: 6.3.5 - resolution: "amazon-cognito-identity-js@npm:6.3.5" + version: 6.3.8 + resolution: "amazon-cognito-identity-js@npm:6.3.8" dependencies: "@aws-crypto/sha256-js": 1.2.2 buffer: 4.9.2 fast-base64-decode: ^1.0.0 isomorphic-unfetch: ^3.0.0 js-cookie: ^2.2.1 - checksum: d1c2030d482004a82d58e3977e418da268ea34a3418e136dece50714d719ac6b62b0f19214f41b5660797e01e730b0fb2fa7f8cf3c21bc5710da11b89e0f8851 + checksum: af58a7bb29e188d3d8fdbaf5206c0b83340491a9f95bf1d6178d2d3b54494d375384d5f2de39babc1acd7f380eba599239c369afdc17e6e2cac1ade4dd835277 languageName: node linkType: hard @@ -4727,13 +4790,6 @@ __metadata: languageName: node linkType: hard -"ansi-colors@npm:3.2.3": - version: 3.2.3 - resolution: "ansi-colors@npm:3.2.3" - checksum: 018a92fbf8b143feb9e00559655072598902ff2cdfa07dbe24b933c70ae04845e3dda2c091ab128920fc50b3db06c3f09947f49fcb287d53beb6c5869b8bb32b - languageName: node - linkType: hard - "ansi-colors@npm:4.1.1": version: 4.1.1 resolution: "ansi-colors@npm:4.1.1" @@ -4785,7 +4841,7 @@ __metadata: languageName: node linkType: hard -"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": +"ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" dependencies: @@ -4843,7 +4899,7 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:~3.1.1, anymatch@npm:~3.1.2": +"anymatch@npm:~3.1.2": version: 3.1.3 resolution: "anymatch@npm:3.1.3" dependencies: @@ -4878,23 +4934,6 @@ __metadata: languageName: node linkType: hard -"aproba@npm:^1.0.3 || ^2.0.0": - version: 2.0.0 - resolution: "aproba@npm:2.0.0" - checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24 - languageName: node - linkType: hard - -"are-we-there-yet@npm:^3.0.0": - version: 3.0.1 - resolution: "are-we-there-yet@npm:3.0.1" - dependencies: - delegates: ^1.0.0 - readable-stream: ^3.6.0 - checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83 - languageName: node - linkType: hard - "arg@npm:^4.1.0": version: 4.1.3 resolution: "arg@npm:4.1.3" @@ -4949,7 +4988,7 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.6": +"array-includes@npm:^3.1.7": version: 3.1.7 resolution: "array-includes@npm:3.1.7" dependencies: @@ -4989,7 +5028,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.findlastindex@npm:^1.2.2": +"array.prototype.findlastindex@npm:^1.2.3": version: 1.2.3 resolution: "array.prototype.findlastindex@npm:1.2.3" dependencies: @@ -5002,7 +5041,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.3.1": +"array.prototype.flat@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -5014,7 +5053,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1": +"array.prototype.flatmap@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flatmap@npm:1.3.2" dependencies: @@ -5026,20 +5065,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.reduce@npm:^1.0.6": - version: 1.0.6 - resolution: "array.prototype.reduce@npm:1.0.6" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.2.0 - es-abstract: ^1.22.1 - es-array-method-boxes-properly: ^1.0.0 - is-string: ^1.0.7 - checksum: c709c3f5caa2aac4fb10e0c6c1982cca50328a2a48658d53b1da8ee3a78069ad67cdac21296d6285521aa3a932a8178c0e192b5fc831fae2977b69a5a8a64ad7 - languageName: node - linkType: hard - -"arraybuffer.prototype.slice@npm:^1.0.1": +"arraybuffer.prototype.slice@npm:^1.0.2": version: 1.0.2 resolution: "arraybuffer.prototype.slice@npm:1.0.2" dependencies: @@ -5183,9 +5209,9 @@ __metadata: linkType: hard "async@npm:^3.2.3": - version: 3.2.4 - resolution: "async@npm:3.2.4" - checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 + version: 3.2.5 + resolution: "async@npm:3.2.5" + checksum: 5ec77f1312301dee02d62140a6b1f7ee0edd2a0f983b6fd2b0849b969f245225b990b47b8243e7b9ad16451a53e7f68e753700385b706198ced888beedba3af4 languageName: node linkType: hard @@ -5240,14 +5266,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.4.0": - version: 1.5.0 - resolution: "axios@npm:1.5.0" +"axios@npm:^1.4.0, axios@npm:^1.5.1": + version: 1.6.2 + resolution: "axios@npm:1.6.2" dependencies: follow-redirects: ^1.15.0 form-data: ^4.0.0 proxy-from-env: ^1.1.0 - checksum: e7405a5dbbea97760d0e6cd58fecba311b0401ddb4a8efbc4108f5537da9b3f278bde566deb777935a960beec4fa18e7b8353881f2f465e4f2c0e949fead35be + checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8 languageName: node linkType: hard @@ -5438,7 +5464,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1, bn.js@npm:^5.1.2, bn.js@npm:^5.1.3, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": +"bn.js@npm:^5.0.0, bn.js@npm:^5.1.2, bn.js@npm:^5.1.3, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": version: 5.2.1 resolution: "bn.js@npm:5.2.1" checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 @@ -5583,7 +5609,7 @@ __metadata: languageName: node linkType: hard -"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1": +"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.1.0": version: 4.1.0 resolution: "browserify-rsa@npm:4.1.0" dependencies: @@ -5594,33 +5620,33 @@ __metadata: linkType: hard "browserify-sign@npm:^4.0.0": - version: 4.2.1 - resolution: "browserify-sign@npm:4.2.1" + version: 4.2.2 + resolution: "browserify-sign@npm:4.2.2" dependencies: - bn.js: ^5.1.1 - browserify-rsa: ^4.0.1 + bn.js: ^5.2.1 + browserify-rsa: ^4.1.0 create-hash: ^1.2.0 create-hmac: ^1.1.7 - elliptic: ^6.5.3 + elliptic: ^6.5.4 inherits: ^2.0.4 - parse-asn1: ^5.1.5 - readable-stream: ^3.6.0 - safe-buffer: ^5.2.0 - checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707 + parse-asn1: ^5.1.6 + readable-stream: ^3.6.2 + safe-buffer: ^5.2.1 + checksum: b622730c0fc183328c3a1c9fdaaaa5118821ed6822b266fa6b0375db7e20061ebec87301d61931d79b9da9a96ada1cab317fce3c68f233e5e93ed02dbb35544c languageName: node linkType: hard "browserslist@npm:^4.21.9": - version: 4.21.10 - resolution: "browserslist@npm:4.21.10" + version: 4.22.2 + resolution: "browserslist@npm:4.22.2" dependencies: - caniuse-lite: ^1.0.30001517 - electron-to-chromium: ^1.4.477 - node-releases: ^2.0.13 - update-browserslist-db: ^1.0.11 + caniuse-lite: ^1.0.30001565 + electron-to-chromium: ^1.4.601 + node-releases: ^2.0.14 + update-browserslist-db: ^1.0.13 bin: browserslist: cli.js - checksum: 1e27c0f111a35d1dd0e8fc2c61781b0daefabc2c9471b0b10537ce54843014bceb2a1ce4571af1a82b2bf1e6e6e05d38865916689a158f03bc2c7a4ec2577db8 + checksum: 33ddfcd9145220099a7a1ac533cecfe5b7548ffeb29b313e1b57be6459000a1f8fa67e781cf4abee97268ac594d44134fcc4a6b2b4750ceddc9796e3a22076d9 languageName: node linkType: hard @@ -5730,12 +5756,12 @@ __metadata: linkType: hard "bufferutil@npm:^4.0.1": - version: 4.0.7 - resolution: "bufferutil@npm:4.0.7" + version: 4.0.8 + resolution: "bufferutil@npm:4.0.8" dependencies: node-gyp: latest node-gyp-build: ^4.3.0 - checksum: f75aa87e3d1b99b87a95f60a855e63f70af07b57fb8443e75a2ddfef2e47788d130fdd46e3a78fd7e0c10176082b26dfbed970c5b8632e1cc299cafa0e93ce45 + checksum: 7e9a46f1867dca72fda350966eb468eca77f4d623407b0650913fadf73d5750d883147d6e5e21c56f9d3b0bdc35d5474e80a600b9f31ec781315b4d2469ef087 languageName: node linkType: hard @@ -5762,23 +5788,23 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^17.0.0": - version: 17.1.4 - resolution: "cacache@npm:17.1.4" +"cacache@npm:^18.0.0": + version: 18.0.1 + resolution: "cacache@npm:18.0.1" dependencies: "@npmcli/fs": ^3.1.0 fs-minipass: ^3.0.0 glob: ^10.2.2 - lru-cache: ^7.7.1 + lru-cache: ^10.0.1 minipass: ^7.0.3 - minipass-collect: ^1.0.2 + minipass-collect: ^2.0.1 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 p-map: ^4.0.0 ssri: ^10.0.0 tar: ^6.1.11 unique-filename: ^3.0.0 - checksum: b7751df756656954a51201335addced8f63fc53266fa56392c9f5ae83c8d27debffb4458ac2d168a744a4517ec3f2163af05c20097f93d17bdc2dc8a385e14a6 + checksum: 5a0b3b2ea451a0379814dc1d3c81af48c7c6db15cd8f7d72e028501ae0036a599a99bbac9687bfec307afb2760808d1c7708e9477c8c70d2b166e7d80b162a23 languageName: node linkType: hard @@ -5826,13 +5852,14 @@ __metadata: languageName: node linkType: hard -"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": - version: 1.0.2 - resolution: "call-bind@npm:1.0.2" +"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" dependencies: - function-bind: ^1.1.1 - get-intrinsic: ^1.0.2 - checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0 + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 languageName: node linkType: hard @@ -5892,10 +5919,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001517": - version: 1.0.30001533 - resolution: "caniuse-lite@npm:1.0.30001533" - checksum: 1ffb2d69f817ee5f13351cb01c26a98ac61515809a6ce355305df3fbc6de6391a58466c1dcad1f322231b1ddc59bdda9bc52b9480cac100c3ff2f5782e859eb1 +"caniuse-lite@npm:^1.0.30001565": + version: 1.0.30001566 + resolution: "caniuse-lite@npm:1.0.30001566" + checksum: 0f9084bf9f7d5c0a9ddb200c2baddb25dd2ad5a2f205f01e7b971f3e98e9a7bb23c2d86bae48237e9bc9782b682cffaaf3406d936937ab9844987dbe2a6401f2 languageName: node linkType: hard @@ -5982,17 +6009,17 @@ __metadata: linkType: hard "chai@npm:^4.3.4, chai@npm:^4.3.6": - version: 4.3.8 - resolution: "chai@npm:4.3.8" + version: 4.3.10 + resolution: "chai@npm:4.3.10" dependencies: assertion-error: ^1.1.0 - check-error: ^1.0.2 - deep-eql: ^4.1.2 - get-func-name: ^2.0.0 - loupe: ^2.3.1 + check-error: ^1.0.3 + deep-eql: ^4.1.3 + get-func-name: ^2.0.2 + loupe: ^2.3.6 pathval: ^1.1.1 - type-detect: ^4.0.5 - checksum: 29e0984ed13308319cadc35437c8ef0a3e271544d226c991bf7e3b6d771bf89707321669e11d05e362bc0ad0bd26585079b989d1032f3c106e3bb95d7f079cce + type-detect: ^4.0.8 + checksum: 536668c60a0d985a0fbd94418028e388d243a925d7c5e858c7443e334753511614a3b6a124bac9ca077dfc4c37acc367d62f8c294960f440749536dc181dfc6d languageName: node linkType: hard @@ -6090,29 +6117,12 @@ __metadata: languageName: node linkType: hard -"check-error@npm:^1.0.2": - version: 1.0.2 - resolution: "check-error@npm:1.0.2" - checksum: d9d106504404b8addd1ee3f63f8c0eaa7cd962a1a28eb9c519b1c4a1dc7098be38007fc0060f045ee00f075fbb7a2a4f42abcf61d68323677e11ab98dc16042e - languageName: node - linkType: hard - -"chokidar@npm:3.3.0": - version: 3.3.0 - resolution: "chokidar@npm:3.3.0" +"check-error@npm:^1.0.2, check-error@npm:^1.0.3": + version: 1.0.3 + resolution: "check-error@npm:1.0.3" dependencies: - anymatch: ~3.1.1 - braces: ~3.0.2 - fsevents: ~2.1.1 - glob-parent: ~5.1.0 - is-binary-path: ~2.1.0 - is-glob: ~4.0.1 - normalize-path: ~3.0.0 - readdirp: ~3.2.0 - dependenciesMeta: - fsevents: - optional: true - checksum: e9863256ebb29dbc5e58a7e2637439814beb63b772686cb9e94478312c24dcaf3d0570220c5e75ea29029f43b664f9956d87b716120d38cf755f32124f047e8e + get-func-name: ^2.0.2 + checksum: e2131025cf059b21080f4813e55b3c480419256914601750b0fee3bd9b2b8315b531e551ef12560419b8b6d92a3636511322752b1ce905703239e7cc451b6399 languageName: node linkType: hard @@ -6235,9 +6245,9 @@ __metadata: linkType: hard "cli-spinners@npm:^2.2.0": - version: 2.9.0 - resolution: "cli-spinners@npm:2.9.0" - checksum: a9c56e1f44457d4a9f4f535364e729cb8726198efa9e98990cfd9eda9e220dfa4ba12f92808d1be5e29029cdfead781db82dc8549b97b31c907d55f96aa9b0e2 + version: 2.9.2 + resolution: "cli-spinners@npm:2.9.2" + checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c languageName: node linkType: hard @@ -6289,17 +6299,6 @@ __metadata: languageName: node linkType: hard -"cliui@npm:^5.0.0": - version: 5.0.0 - resolution: "cliui@npm:5.0.0" - dependencies: - string-width: ^3.1.0 - strip-ansi: ^5.2.0 - wrap-ansi: ^5.1.0 - checksum: 0bb8779efe299b8f3002a73619eaa8add4081eb8d1c17bc4fedc6240557fb4eacdc08fe87c39b002eacb6cfc117ce736b362dbfd8bf28d90da800e010ee97df4 - languageName: node - linkType: hard - "cliui@npm:^6.0.0": version: 6.0.0 resolution: "cliui@npm:6.0.0" @@ -6381,15 +6380,6 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.3": - version: 1.1.3 - resolution: "color-support@npm:1.1.3" - bin: - color-support: bin.js - checksum: 9b7356817670b9a13a26ca5af1c21615463b500783b739b7634a0c2047c16cef4b2865d7576875c31c3cddf9dd621fa19285e628f20198b233a5cfdda6d0793b - languageName: node - linkType: hard - "colorette@npm:^2.0.16": version: 2.0.20 resolution: "colorette@npm:2.0.20" @@ -6498,13 +6488,6 @@ __metadata: languageName: node linkType: hard -"console-control-strings@npm:^1.1.0": - version: 1.1.0 - resolution: "console-control-strings@npm:1.1.0" - checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed - languageName: node - linkType: hard - "constant-case@npm:^3.0.4": version: 3.0.4 resolution: "constant-case@npm:3.0.4" @@ -6550,6 +6533,13 @@ __metadata: languageName: node linkType: hard +"convert-source-map@npm:^2.0.0": + version: 2.0.0 + resolution: "convert-source-map@npm:2.0.0" + checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035 + languageName: node + linkType: hard + "cookie-signature@npm:1.0.6": version: 1.0.6 resolution: "cookie-signature@npm:1.0.6" @@ -6628,8 +6618,8 @@ __metadata: linkType: hard "cosmiconfig@npm:^8.1.3": - version: 8.3.5 - resolution: "cosmiconfig@npm:8.3.5" + version: 8.3.6 + resolution: "cosmiconfig@npm:8.3.6" dependencies: import-fresh: ^3.3.0 js-yaml: ^4.1.0 @@ -6640,7 +6630,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: c6e44bb3cabf268b70049e7bd4ee8ecf00068854e53cbc32f9104794927ef406817f9e64e1c4949bd10776b604c01f7b50674336fcd2d5b9efc4cf8277fdf025 + checksum: dc339ebea427898c9e03bf01b56ba7afbac07fc7d2a2d5a15d6e9c14de98275a9565da949375aee1809591c152c0a3877bb86dbeaf74d5bd5aaa79955ad9e7a0 languageName: node linkType: hard @@ -6716,6 +6706,15 @@ __metadata: languageName: node linkType: hard +"cross-inspect@npm:1.0.0": + version: 1.0.0 + resolution: "cross-inspect@npm:1.0.0" + dependencies: + tslib: ^2.4.0 + checksum: 975c81799549627027254eb70f1c349cefb14435d580bea6f351f510c839dcb1a9288983407bac2ad317e6eff29cf1e99299606da21f404562bfa64cec502239 + languageName: node + linkType: hard + "cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -6815,15 +6814,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:3.2.6": - version: 3.2.6 - resolution: "debug@npm:3.2.6" - dependencies: - ms: ^2.1.1 - checksum: 07bc8b3a13ef3cfa6c06baf7871dfb174c291e5f85dbf566f086620c16b9c1a0e93bb8f1935ebbd07a683249e7e30286f2966e2ef461e8fd17b1b60732062d6b - languageName: node - linkType: hard - "debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" @@ -6884,7 +6874,7 @@ __metadata: languageName: node linkType: hard -"deep-eql@npm:^4.0.1, deep-eql@npm:^4.1.2": +"deep-eql@npm:^4.0.1, deep-eql@npm:^4.1.3": version: 4.1.3 resolution: "deep-eql@npm:4.1.3" dependencies: @@ -6930,13 +6920,25 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0": - version: 1.2.0 - resolution: "define-properties@npm:1.2.0" +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": + version: 1.1.1 + resolution: "define-data-property@npm:1.1.1" + dependencies: + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d + languageName: node + linkType: hard + +"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": + version: 1.2.1 + resolution: "define-properties@npm:1.2.1" dependencies: + define-data-property: ^1.0.1 has-property-descriptors: ^1.0.0 object-keys: ^1.1.1 - checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6 + checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12 languageName: node linkType: hard @@ -6954,13 +6956,6 @@ __metadata: languageName: node linkType: hard -"delegates@npm:^1.0.0": - version: 1.0.0 - resolution: "delegates@npm:1.0.0" - checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd - languageName: node - linkType: hard - "depd@npm:2.0.0": version: 2.0.0 resolution: "depd@npm:2.0.0" @@ -7005,13 +7000,6 @@ __metadata: languageName: node linkType: hard -"diff@npm:3.5.0": - version: 3.5.0 - resolution: "diff@npm:3.5.0" - checksum: 00842950a6551e26ce495bdbce11047e31667deea546527902661f25cc2e73358967ebc78cf86b1a9736ec3e14286433225f9970678155753a6291c3bca5227b - languageName: node - linkType: hard - "diff@npm:5.0.0": version: 5.0.0 resolution: "diff@npm:5.0.0" @@ -7149,9 +7137,9 @@ __metadata: linkType: hard "dset@npm:^3.1.1, dset@npm:^3.1.2": - version: 3.1.2 - resolution: "dset@npm:3.1.2" - checksum: 4f8066f517aa0a70af688c66e9a0a5590f0aada76f6edc7ba9ddb309e27d3a6d65c0a2e31ab2a84005d4c791e5327773cdde59b8ab169050330a0dc283663e87 + version: 3.1.3 + resolution: "dset@npm:3.1.3" + checksum: 5db964a36c60c51aa3f7088bfe1dc5c0eedd9a6ef3b216935bb70ef4a7b8fc40fd2f9bb16b9a4692c9c9772cea60cfefb108d2d09fbd53c85ea8f6cd54502d6a languageName: node linkType: hard @@ -7217,10 +7205,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.477": - version: 1.4.515 - resolution: "electron-to-chromium@npm:1.4.515" - checksum: ac5e901f0c39bd5bff52e8d8a4243c5b0c0abb4366df96c56480902ddcd2ce74e3fe389171092a887fd09c0444fb47951351cf0d2ae530c251716bd8ed57111f +"electron-to-chromium@npm:^1.4.601": + version: 1.4.603 + resolution: "electron-to-chromium@npm:1.4.603" + checksum: 4d81f73c0f7e5e6c9374b6ada0b5f85acf2c71cacf4d169c56d350387516a932da0f68bff81cfda62ef7f9365b5092586b9a0a364b5051dcc3a5bb0ae75a61b0 languageName: node linkType: hard @@ -7239,13 +7227,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^7.0.1": - version: 7.0.3 - resolution: "emoji-regex@npm:7.0.3" - checksum: 9159b2228b1511f2870ac5920f394c7e041715429a68459ebe531601555f11ea782a8e1718f969df2711d38c66268174407cbca57ce36485544f695c2dfdc96e - languageName: node - linkType: hard - "emoji-regex@npm:^8.0.0": version: 8.0.0 resolution: "emoji-regex@npm:8.0.0" @@ -7342,24 +7323,24 @@ __metadata: linkType: hard "es-abstract@npm:^1.22.1": - version: 1.22.1 - resolution: "es-abstract@npm:1.22.1" + version: 1.22.3 + resolution: "es-abstract@npm:1.22.3" dependencies: array-buffer-byte-length: ^1.0.0 - arraybuffer.prototype.slice: ^1.0.1 + arraybuffer.prototype.slice: ^1.0.2 available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + call-bind: ^1.0.5 es-set-tostringtag: ^2.0.1 es-to-primitive: ^1.2.1 - function.prototype.name: ^1.1.5 - get-intrinsic: ^1.2.1 + function.prototype.name: ^1.1.6 + get-intrinsic: ^1.2.2 get-symbol-description: ^1.0.0 globalthis: ^1.0.3 gopd: ^1.0.1 - has: ^1.0.3 has-property-descriptors: ^1.0.0 has-proto: ^1.0.1 has-symbols: ^1.0.3 + hasown: ^2.0.0 internal-slot: ^1.0.5 is-array-buffer: ^3.0.2 is-callable: ^1.2.7 @@ -7367,51 +7348,44 @@ __metadata: is-regex: ^1.1.4 is-shared-array-buffer: ^1.0.2 is-string: ^1.0.7 - is-typed-array: ^1.1.10 + is-typed-array: ^1.1.12 is-weakref: ^1.0.2 - object-inspect: ^1.12.3 + object-inspect: ^1.13.1 object-keys: ^1.1.1 object.assign: ^4.1.4 - regexp.prototype.flags: ^1.5.0 - safe-array-concat: ^1.0.0 + regexp.prototype.flags: ^1.5.1 + safe-array-concat: ^1.0.1 safe-regex-test: ^1.0.0 - string.prototype.trim: ^1.2.7 - string.prototype.trimend: ^1.0.6 - string.prototype.trimstart: ^1.0.6 + string.prototype.trim: ^1.2.8 + string.prototype.trimend: ^1.0.7 + string.prototype.trimstart: ^1.0.7 typed-array-buffer: ^1.0.0 typed-array-byte-length: ^1.0.0 typed-array-byte-offset: ^1.0.0 typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 - which-typed-array: ^1.1.10 - checksum: 614e2c1c3717cb8d30b6128ef12ea110e06fd7d75ad77091ca1c5dbfb00da130e62e4bbbbbdda190eada098a22b27fe0f99ae5a1171dac2c8663b1e8be8a3a9b - languageName: node - linkType: hard - -"es-array-method-boxes-properly@npm:^1.0.0": - version: 1.0.0 - resolution: "es-array-method-boxes-properly@npm:1.0.0" - checksum: 2537fcd1cecf187083890bc6f5236d3a26bf39237433587e5bf63392e88faae929dbba78ff0120681a3f6f81c23fe3816122982c160d63b38c95c830b633b826 + which-typed-array: ^1.1.13 + checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a languageName: node linkType: hard "es-set-tostringtag@npm:^2.0.1": - version: 2.0.1 - resolution: "es-set-tostringtag@npm:2.0.1" + version: 2.0.2 + resolution: "es-set-tostringtag@npm:2.0.2" dependencies: - get-intrinsic: ^1.1.3 - has: ^1.0.3 + get-intrinsic: ^1.2.2 has-tostringtag: ^1.0.0 - checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884 + hasown: ^2.0.0 + checksum: afcec3a4c9890ae14d7ec606204858441c801ff84f312538e1d1ccf1e5493c8b17bd672235df785f803756472cb4f2d49b87bde5237aef33411e74c22f194e07 languageName: node linkType: hard "es-shim-unscopables@npm:^1.0.0": - version: 1.0.0 - resolution: "es-shim-unscopables@npm:1.0.0" + version: 1.0.2 + resolution: "es-shim-unscopables@npm:1.0.2" dependencies: - has: ^1.0.3 - checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1 + hasown: ^2.0.0 + checksum: 432bd527c62065da09ed1d37a3f8e623c423683285e6188108286f4a1e8e164a5bcbfbc0051557c7d14633cd2a41ce24c7048e6bbb66a985413fd32f1be72626 languageName: node linkType: hard @@ -7488,13 +7462,6 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:1.0.5, escape-string-regexp@npm:^1.0.5": - version: 1.0.5 - resolution: "escape-string-regexp@npm:1.0.5" - checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410 - languageName: node - linkType: hard - "escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -7502,6 +7469,13 @@ __metadata: languageName: node linkType: hard +"escape-string-regexp@npm:^1.0.5": + version: 1.0.5 + resolution: "escape-string-regexp@npm:1.0.5" + checksum: 6092fda75c63b110c706b6a9bfde8a612ad595b628f0bd2147eea1d3406723020810e591effc7db1da91d80a71a737a313567c5abb3813e8d9c71f4aa595b410 + languageName: node + linkType: hard + "escodegen@npm:1.8.x": version: 1.8.1 resolution: "escodegen@npm:1.8.1" @@ -7534,7 +7508,7 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.7": +"eslint-import-resolver-node@npm:^0.3.9": version: 0.3.9 resolution: "eslint-import-resolver-node@npm:0.3.9" dependencies: @@ -7558,29 +7532,29 @@ __metadata: linkType: hard "eslint-plugin-import@npm:^2.26.0": - version: 2.28.1 - resolution: "eslint-plugin-import@npm:2.28.1" + version: 2.29.0 + resolution: "eslint-plugin-import@npm:2.29.0" dependencies: - array-includes: ^3.1.6 - array.prototype.findlastindex: ^1.2.2 - array.prototype.flat: ^1.3.1 - array.prototype.flatmap: ^1.3.1 + array-includes: ^3.1.7 + array.prototype.findlastindex: ^1.2.3 + array.prototype.flat: ^1.3.2 + array.prototype.flatmap: ^1.3.2 debug: ^3.2.7 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.7 + eslint-import-resolver-node: ^0.3.9 eslint-module-utils: ^2.8.0 - has: ^1.0.3 - is-core-module: ^2.13.0 + hasown: ^2.0.0 + is-core-module: ^2.13.1 is-glob: ^4.0.3 minimatch: ^3.1.2 - object.fromentries: ^2.0.6 - object.groupby: ^1.0.0 - object.values: ^1.1.6 + object.fromentries: ^2.0.7 + object.groupby: ^1.0.1 + object.values: ^1.1.7 semver: ^6.3.1 tsconfig-paths: ^3.14.2 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf + checksum: 19ee541fb95eb7a796f3daebe42387b8d8262bbbcc4fd8a6e92f63a12035f3d2c6cb8bc0b6a70864fa14b1b50ed6b8e6eed5833e625e16cb6bb98b665beff269 languageName: node linkType: hard @@ -7612,16 +7586,17 @@ __metadata: linkType: hard "eslint@npm:^8.25.0": - version: 8.49.0 - resolution: "eslint@npm:8.49.0" + version: 8.55.0 + resolution: "eslint@npm:8.55.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.2 - "@eslint/js": 8.49.0 - "@humanwhocodes/config-array": ^0.11.11 + "@eslint/eslintrc": ^2.1.4 + "@eslint/js": 8.55.0 + "@humanwhocodes/config-array": ^0.11.13 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 + "@ungap/structured-clone": ^1.2.0 ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -7654,7 +7629,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 4dfe257e1e42da2f9da872b05aaaf99b0f5aa022c1a91eee8f2af1ab72651b596366320c575ccd4e0469f7b4c97aff5bb85ae3323ebd6a293c3faef4028b0d81 + checksum: 83f82a604559dc1faae79d28fdf3dfc9e592ca221052e2ea516e1b379b37e77e4597705a16880e2f5ece4f79087c1dd13fd7f6e9746f794a401175519db18b41 languageName: node linkType: hard @@ -7760,22 +7735,20 @@ __metadata: linkType: hard "eth-gas-reporter@npm:^0.2.25": - version: 0.2.25 - resolution: "eth-gas-reporter@npm:0.2.25" + version: 0.2.27 + resolution: "eth-gas-reporter@npm:0.2.27" dependencies: - "@ethersproject/abi": ^5.0.0-beta.146 "@solidity-parser/parser": ^0.14.0 + axios: ^1.5.1 cli-table3: ^0.5.0 colors: 1.4.0 ethereum-cryptography: ^1.0.3 - ethers: ^4.0.40 + ethers: ^5.7.2 fs-readdir-recursive: ^1.1.0 lodash: ^4.17.14 markdown-table: ^1.1.3 - mocha: ^7.1.1 + mocha: ^10.2.0 req-cwd: ^2.0.0 - request: ^2.88.0 - request-promise-native: ^1.0.5 sha1: ^1.1.1 sync-request: ^6.0.0 peerDependencies: @@ -7783,7 +7756,7 @@ __metadata: peerDependenciesMeta: "@codechecks/client": optional: true - checksum: 3bfa81e554b069bb817f2a073a601a0429e6b582c56ad99db0727dc2a102ab00fc27888820b8a042a194a8fb7d40954d10cd7b011ede6b8170285d2d5a88666c + checksum: 9a26a4936693de6dbe633a9e6f9d69eb93c9d45c61ecbc20702a72f15ade424785e29ae8e62ea3a2afc49ea22a4777a71914dc8da1b8587e9d47d085a3246784 languageName: node linkType: hard @@ -7906,7 +7879,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^4.0.32, ethers@npm:^4.0.40": +"ethers@npm:^4.0.32": version: 4.0.49 resolution: "ethers@npm:4.0.49" dependencies: @@ -7923,7 +7896,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.5.3, ethers@npm:^5.6.8, ethers@npm:^5.7.0, ethers@npm:^5.7.1": +"ethers@npm:^5.6.8, ethers@npm:^5.7.0, ethers@npm:^5.7.1, ethers@npm:^5.7.2": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -8157,15 +8130,15 @@ __metadata: linkType: hard "fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.9": - version: 3.3.1 - resolution: "fast-glob@npm:3.3.1" + version: 3.3.2 + resolution: "fast-glob@npm:3.3.2" dependencies: "@nodelib/fs.stat": ^2.0.2 "@nodelib/fs.walk": ^1.2.3 glob-parent: ^5.1.2 merge2: ^1.3.0 micromatch: ^4.0.4 - checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 + checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1 languageName: node linkType: hard @@ -8312,15 +8285,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:3.0.0, find-up@npm:^3.0.0": - version: 3.0.0 - resolution: "find-up@npm:3.0.0" - dependencies: - locate-path: ^3.0.0 - checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9 - languageName: node - linkType: hard - "find-up@npm:5.0.0, find-up@npm:^5.0.0": version: 5.0.0 resolution: "find-up@npm:5.0.0" @@ -8360,24 +8324,13 @@ __metadata: linkType: hard "flat-cache@npm:^3.0.4": - version: 3.1.0 - resolution: "flat-cache@npm:3.1.0" + version: 3.2.0 + resolution: "flat-cache@npm:3.2.0" dependencies: - flatted: ^3.2.7 + flatted: ^3.2.9 keyv: ^4.5.3 rimraf: ^3.0.2 - checksum: 99312601d5b90f44aef403f17f056dc09be7e437703740b166cdc9386d99e681f74e6b6e8bd7d010bda66904ea643c9527276b1b80308a2119741d94108a4d8f - languageName: node - linkType: hard - -"flat@npm:^4.1.0": - version: 4.1.1 - resolution: "flat@npm:4.1.1" - dependencies: - is-buffer: ~2.0.3 - bin: - flat: cli.js - checksum: 398be12185eb0f3c59797c3670a8c35d07020b673363175676afbaf53d6b213660e060488554cf82c25504986e1a6059bdbcc5d562e87ca3e972e8a33148e3ae + checksum: e7e0f59801e288b54bee5cb9681e9ee21ee28ef309f886b312c9d08415b79fc0f24ac842f84356ce80f47d6a53de62197ce0e6e148dc42d5db005992e2a756ec languageName: node linkType: hard @@ -8390,10 +8343,10 @@ __metadata: languageName: node linkType: hard -"flatted@npm:^3.2.7": - version: 3.2.7 - resolution: "flatted@npm:3.2.7" - checksum: 427633049d55bdb80201c68f7eb1cbd533e03eac541f97d3aecab8c5526f12a20ccecaeede08b57503e772c769e7f8680b37e8d482d1e5f8d7e2194687f9ea35 +"flatted@npm:^3.2.9": + version: 3.2.9 + resolution: "flatted@npm:3.2.9" + checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026 languageName: node linkType: hard @@ -8407,12 +8360,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 languageName: node linkType: hard @@ -8644,16 +8597,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:~2.1.1": - version: 2.1.3 - resolution: "fsevents@npm:2.1.3" - dependencies: - node-gyp: latest - checksum: b5ec0516b44d75b60af5c01ff80a80cd995d175e4640d2a92fbabd02991dd664d76b241b65feef0775c23d531c3c74742c0fbacd6205af812a9c3cef59f04292 - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -8664,15 +8607,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@~2.1.1#~builtin": - version: 2.1.3 - resolution: "fsevents@patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=18f3a7" - dependencies: - node-gyp: latest - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@patch:fsevents@~2.3.2#~builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=18f3a7" @@ -8682,14 +8616,14 @@ __metadata: languageName: node linkType: hard -"function-bind@npm:^1.1.1": - version: 1.1.1 - resolution: "function-bind@npm:1.1.1" - checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 languageName: node linkType: hard -"function.prototype.name@npm:^1.1.5": +"function.prototype.name@npm:^1.1.6": version: 1.1.6 resolution: "function.prototype.name@npm:1.1.6" dependencies: @@ -8715,22 +8649,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^4.0.3": - version: 4.0.4 - resolution: "gauge@npm:4.0.4" - dependencies: - aproba: ^1.0.3 || ^2.0.0 - color-support: ^1.1.3 - console-control-strings: ^1.1.0 - has-unicode: ^2.0.1 - signal-exit: ^3.0.7 - string-width: ^4.2.3 - strip-ansi: ^6.0.1 - wide-align: ^1.1.5 - checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d - languageName: node - linkType: hard - "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -8745,22 +8663,22 @@ __metadata: languageName: node linkType: hard -"get-func-name@npm:^2.0.0": - version: 2.0.0 - resolution: "get-func-name@npm:2.0.0" - checksum: 8d82e69f3e7fab9e27c547945dfe5cc0c57fc0adf08ce135dddb01081d75684a03e7a0487466f478872b341d52ac763ae49e660d01ab83741f74932085f693c3 +"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2": + version: 2.0.2 + resolution: "get-func-name@npm:2.0.2" + checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": - version: 1.2.1 - resolution: "get-intrinsic@npm:1.2.1" +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2": + version: 1.2.2 + resolution: "get-intrinsic@npm:1.2.2" dependencies: - function-bind: ^1.1.1 - has: ^1.0.3 + function-bind: ^1.1.2 has-proto: ^1.0.1 has-symbols: ^1.0.3 - checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f + hasown: ^2.0.0 + checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417 languageName: node linkType: hard @@ -8855,7 +8773,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.0, glob-parent@npm:~5.1.2": +"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" dependencies: @@ -8873,20 +8791,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.3": - version: 7.1.3 - resolution: "glob@npm:7.1.3" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: d72a834a393948d6c4a5cacc6a29fe5fe190e1cd134e55dfba09aee0be6fe15be343e96d8ec43558ab67ff8af28e4420c7f63a4d4db1c779e515015e9c318616 - languageName: node - linkType: hard - "glob@npm:7.1.7": version: 7.1.7 resolution: "glob@npm:7.1.7" @@ -8927,18 +8831,18 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.2.2, glob@npm:^10.2.5": - version: 10.3.4 - resolution: "glob@npm:10.3.4" +"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": + version: 10.3.10 + resolution: "glob@npm:10.3.10" dependencies: foreground-child: ^3.1.0 - jackspeak: ^2.0.3 + jackspeak: ^2.3.5 minimatch: ^9.0.1 minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 path-scurry: ^1.10.1 bin: - glob: dist/cjs/src/bin.js - checksum: 176b97c124414401cb51329a93d2ba112cef8814adbed10348481916b9521b677773eee2691cb6b24d66632d8c8bb8913533f5ac4bfb2d0ef5454a1856082361 + glob: dist/esm/bin.mjs + checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3 languageName: node linkType: hard @@ -8955,7 +8859,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4": +"glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.3": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -9007,11 +8911,11 @@ __metadata: linkType: hard "globals@npm:^13.19.0": - version: 13.21.0 - resolution: "globals@npm:13.21.0" + version: 13.23.0 + resolution: "globals@npm:13.23.0" dependencies: type-fest: ^0.20.2 - checksum: 86c92ca8a04efd864c10852cd9abb1ebe6d447dcc72936783e66eaba1087d7dba5c9c3421a48d6ca722c319378754dbcc3f3f732dbe47592d7de908edf58a773 + checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3 languageName: node linkType: hard @@ -9162,20 +9066,13 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.11": +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 languageName: node linkType: hard -"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": - version: 4.2.10 - resolution: "graceful-fs@npm:4.2.10" - checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da - languageName: node - linkType: hard - "graphemer@npm:^1.4.0": version: 1.4.0 resolution: "graphemer@npm:1.4.0" @@ -9213,11 +9110,11 @@ __metadata: linkType: hard "graphql-ws@npm:^5.12.1": - version: 5.14.0 - resolution: "graphql-ws@npm:5.14.0" + version: 5.14.2 + resolution: "graphql-ws@npm:5.14.2" peerDependencies: graphql: ">=0.11 <=16" - checksum: 7b622944823fa12a77ea490656121a77e1a1daf08114a6a0b027922113f4481d95f4fe380a5de369a51657ef777d35757dc31f63e41071c21f3e97ca47e4205a + checksum: ee9affa2478b9d262405986f07616267b4db10ae45cf32fffb551572fb5bf5e1e3aa6652375511b3ff640d382c74c1327ce75ff1ee2fa8b964b3ef3d55d97f75 languageName: node linkType: hard @@ -9258,16 +9155,9 @@ __metadata: linkType: hard "graphql@npm:^16.6.0": - version: 16.8.0 - resolution: "graphql@npm:16.8.0" - checksum: d853d4085b0c911a7e2a926c3b0d379934ec61cd4329e70cdf281763102f024fd80a97db7a505b8b04fed9050cb4875f8f518150ea854557a500a0b41dcd7f4e - languageName: node - linkType: hard - -"growl@npm:1.10.5": - version: 1.10.5 - resolution: "growl@npm:1.10.5" - checksum: 4b86685de6831cebcbb19f93870bea624afee61124b0a20c49017013987cd129e73a8c4baeca295728f41d21265e1f859d25ef36731b142ca59c655fea94bb1a + version: 16.8.1 + resolution: "graphql@npm:16.8.1" + checksum: 8d304b7b6f708c8c5cc164b06e92467dfe36aff6d4f2cf31dd19c4c2905a0e7b89edac4b7e225871131fd24e21460836b369de0c06532644d15b461d55b1ccc0 languageName: node linkType: hard @@ -9326,8 +9216,8 @@ __metadata: linkType: hard "hardhat-deploy@npm:^0.11.14, hardhat-deploy@npm:^0.11.15": - version: 0.11.37 - resolution: "hardhat-deploy@npm:0.11.37" + version: 0.11.44 + resolution: "hardhat-deploy@npm:0.11.44" dependencies: "@ethersproject/abi": ^5.7.0 "@ethersproject/abstract-signer": ^5.7.0 @@ -9346,14 +9236,14 @@ __metadata: chokidar: ^3.5.2 debug: ^4.3.2 enquirer: ^2.3.6 - ethers: ^5.5.3 + ethers: ^5.7.0 form-data: ^4.0.0 fs-extra: ^10.0.0 match-all: ^1.2.6 murmur-128: ^0.2.1 qs: ^6.9.4 zksync-web3: ^0.14.3 - checksum: c338289849f26530296be648c7bfc2d4673d0786855ed256ee9cc864f40b94125cfa36808bedfbae4f2bad7adc38def7547bbeb3b84cbfb0aeabae04de5238fd + checksum: c37ec9bcba32abb3f81bf40480b5523b6825e27b344e11ccbc3d121655f41dba09debfa70f7ad871c7d5fa7d14d7a65938f9415cfd2a18293f12a39763cf2d31 languageName: node linkType: hard @@ -9371,8 +9261,8 @@ __metadata: linkType: hard "hardhat@npm:^2.10.2, hardhat@npm:^2.16.1": - version: 2.17.3 - resolution: "hardhat@npm:2.17.3" + version: 2.19.1 + resolution: "hardhat@npm:2.19.1" dependencies: "@ethersproject/abi": ^5.1.2 "@metamask/eth-sig-util": ^4.0.0 @@ -9432,7 +9322,7 @@ __metadata: optional: true bin: hardhat: internal/cli/bootstrap.js - checksum: 0540ef225b3992749c6b828540a9b9a20b4aaa0f2b4f25556d0769b9f32687593ef0fa9e753496647d772e5d4b07300694d588b13cfb5f7d5fb33ed8238ea9fe + checksum: 0c12069e8eae47419d595e38d22716049136cf74390f9e89121ae73fdc716ffcb6cd3283e3ca8676ce00e3ff90804dfa95473830d96340ec01860dfa6237d8d3 languageName: node linkType: hard @@ -9465,11 +9355,11 @@ __metadata: linkType: hard "has-property-descriptors@npm:^1.0.0": - version: 1.0.0 - resolution: "has-property-descriptors@npm:1.0.0" + version: 1.0.1 + resolution: "has-property-descriptors@npm:1.0.1" dependencies: - get-intrinsic: ^1.1.1 - checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb + get-intrinsic: ^1.2.2 + checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4 languageName: node linkType: hard @@ -9480,7 +9370,7 @@ __metadata: languageName: node linkType: hard -"has-symbols@npm:^1.0.0, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": +"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 @@ -9496,22 +9386,6 @@ __metadata: languageName: node linkType: hard -"has-unicode@npm:^2.0.1": - version: 2.0.1 - resolution: "has-unicode@npm:2.0.1" - checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400 - languageName: node - linkType: hard - -"has@npm:^1.0.3": - version: 1.0.3 - resolution: "has@npm:1.0.3" - dependencies: - function-bind: ^1.1.1 - checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792 - languageName: node - linkType: hard - "hash-base@npm:^3.0.0": version: 3.1.0 resolution: "hash-base@npm:3.1.0" @@ -9550,6 +9424,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + "he@npm:1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -9633,14 +9516,13 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "http-proxy-agent@npm:5.0.0" +"http-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "http-proxy-agent@npm:7.0.0" dependencies: - "@tootallnate/once": 2 - agent-base: 6 - debug: 4 - checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786 + agent-base: ^7.1.0 + debug: ^4.3.4 + checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6 languageName: node linkType: hard @@ -9675,12 +9557,12 @@ __metadata: linkType: hard "http2-wrapper@npm:^2.1.10": - version: 2.2.0 - resolution: "http2-wrapper@npm:2.2.0" + version: 2.2.1 + resolution: "http2-wrapper@npm:2.2.1" dependencies: quick-lru: ^5.1.1 resolve-alpn: ^1.2.0 - checksum: 6fd20e5cb6a58151715b3581e06a62a47df943187d2d1f69e538a50cccb7175dd334ecfde7900a37d18f3e13a1a199518a2c211f39860e81e9a16210c199cfaa + checksum: e95e55e22c6fd61182ce81fecb9b7da3af680d479febe8ad870d05f7ebbc9f076e455193766f4e7934e50913bf1d8da3ba121fb5cd2928892390b58cf9d5c509 languageName: node linkType: hard @@ -9694,6 +9576,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.1": + version: 7.0.2 + resolution: "https-proxy-agent@npm:7.0.2" + dependencies: + agent-base: ^7.0.2 + debug: 4 + checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292 + languageName: node + linkType: hard + "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -9701,15 +9593,6 @@ __metadata: languageName: node linkType: hard -"humanize-ms@npm:^1.2.1": - version: 1.2.1 - resolution: "humanize-ms@npm:1.2.1" - dependencies: - ms: ^2.0.0 - checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16 - languageName: node - linkType: hard - "husky@npm:^3.0.5": version: 3.1.0 resolution: "husky@npm:3.1.0" @@ -9774,9 +9657,9 @@ __metadata: linkType: hard "ignore@npm:^5.1.1, ignore@npm:^5.2.0": - version: 5.2.4 - resolution: "ignore@npm:5.2.4" - checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef + version: 5.3.0 + resolution: "ignore@npm:5.3.0" + checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9 languageName: node linkType: hard @@ -9899,13 +9782,13 @@ __metadata: linkType: hard "internal-slot@npm:^1.0.5": - version: 1.0.5 - resolution: "internal-slot@npm:1.0.5" + version: 1.0.6 + resolution: "internal-slot@npm:1.0.6" dependencies: - get-intrinsic: ^1.2.0 - has: ^1.0.3 + get-intrinsic: ^1.2.2 + hasown: ^2.0.0 side-channel: ^1.0.4 - checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a + checksum: 7872454888047553ce97a3fa1da7cc054a28ec5400a9c2e9f4dbe4fe7c1d041cb8e8301467614b80d4246d50377aad2fb58860b294ed74d6700cc346b6f89549 languageName: node linkType: hard @@ -10121,7 +10004,7 @@ __metadata: languageName: node linkType: hard -"is-buffer@npm:^2.0.5, is-buffer@npm:~2.0.3": +"is-buffer@npm:^2.0.5": version: 2.0.5 resolution: "is-buffer@npm:2.0.5" checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42 @@ -10146,12 +10029,12 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0": - version: 2.13.0 - resolution: "is-core-module@npm:2.13.0" +"is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" dependencies: - has: ^1.0.3 - checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355 + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c languageName: node linkType: hard @@ -10376,7 +10259,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": version: 1.1.12 resolution: "is-typed-array@npm:1.1.12" dependencies: @@ -10470,6 +10353,13 @@ __metadata: languageName: node linkType: hard +"isexe@npm:^3.1.1": + version: 3.1.1 + resolution: "isexe@npm:3.1.1" + checksum: 7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e + languageName: node + linkType: hard + "iso-url@npm:^1.1.5": version: 1.2.1 resolution: "iso-url@npm:1.2.1" @@ -10587,16 +10477,16 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.0.3": - version: 2.3.3 - resolution: "jackspeak@npm:2.3.3" +"jackspeak@npm:^2.3.5": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" dependencies: "@isaacs/cliui": ^8.0.2 "@pkgjs/parseargs": ^0.11.0 dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: 4313a7c0cc44c7753c4cb9869935f0b06f4cf96827515f63f58ff46b3d2f6e29aba6b3b5151778397c3f5ae67ef8bfc48871967bd10343c27e90cff198ec7808 + checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54 languageName: node linkType: hard @@ -10678,18 +10568,6 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:3.13.1": - version: 3.13.1 - resolution: "js-yaml@npm:3.13.1" - dependencies: - argparse: ^1.0.7 - esprima: ^4.0.0 - bin: - js-yaml: bin/js-yaml.js - checksum: 7511b764abb66d8aa963379f7d2a404f078457d106552d05a7b556d204f7932384e8477513c124749fa2de52eb328961834562bd09924902c6432e40daa408bc - languageName: node - linkType: hard - "js-yaml@npm:3.14.1, js-yaml@npm:3.x, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.1": version: 3.14.1 resolution: "js-yaml@npm:3.14.1" @@ -10903,14 +10781,14 @@ __metadata: linkType: hard "keccak@npm:^3.0.0, keccak@npm:^3.0.2": - version: 3.0.3 - resolution: "keccak@npm:3.0.3" + version: 3.0.4 + resolution: "keccak@npm:3.0.4" dependencies: node-addon-api: ^2.0.0 node-gyp: latest node-gyp-build: ^4.2.0 readable-stream: ^3.6.0 - checksum: f08f04f5cc87013a3fc9e87262f761daff38945c86dd09c01a7f7930a15ae3e14f93b310ef821dcc83675a7b814eb1c983222399a2f263ad980251201d1b9a99 + checksum: 2bf27b97b2f24225b1b44027de62be547f5c7326d87d249605665abd0c8c599d774671c35504c62c9b922cae02758504c6f76a73a84234d23af8a2211afaaa11 languageName: node linkType: hard @@ -10924,11 +10802,11 @@ __metadata: linkType: hard "keyv@npm:^4.0.0, keyv@npm:^4.5.3": - version: 4.5.3 - resolution: "keyv@npm:4.5.3" + version: 4.5.4 + resolution: "keyv@npm:4.5.4" dependencies: json-buffer: 3.0.1 - checksum: 3ffb4d5b72b6b4b4af443bbb75ca2526b23c750fccb5ac4c267c6116888b4b65681015c2833cb20d26cf3e6e32dac6b988c77f7f022e1a571b7d90f1442257da + checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72 languageName: node linkType: hard @@ -11094,16 +10972,6 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^3.0.0": - version: 3.0.0 - resolution: "locate-path@npm:3.0.0" - dependencies: - p-locate: ^3.0.0 - path-exists: ^3.0.0 - checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11 - languageName: node - linkType: hard - "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -11283,15 +11151,6 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:3.0.0, log-symbols@npm:^3.0.0": - version: 3.0.0 - resolution: "log-symbols@npm:3.0.0" - dependencies: - chalk: ^2.4.2 - checksum: f2322e1452d819050b11aad247660e1494f8b2219d40a964af91d5f9af1a90636f1b3d93f2952090e42af07cc5550aecabf6c1d8ec1181207e95cb66ba112361 - languageName: node - linkType: hard - "log-symbols@npm:4.1.0": version: 4.1.0 resolution: "log-symbols@npm:4.1.0" @@ -11302,6 +11161,15 @@ __metadata: languageName: node linkType: hard +"log-symbols@npm:^3.0.0": + version: 3.0.0 + resolution: "log-symbols@npm:3.0.0" + dependencies: + chalk: ^2.4.2 + checksum: f2322e1452d819050b11aad247660e1494f8b2219d40a964af91d5f9af1a90636f1b3d93f2952090e42af07cc5550aecabf6c1d8ec1181207e95cb66ba112361 + languageName: node + linkType: hard + "log-update@npm:^4.0.0": version: 4.0.0 resolution: "log-update@npm:4.0.0" @@ -11339,12 +11207,12 @@ __metadata: languageName: node linkType: hard -"loupe@npm:^2.3.1": - version: 2.3.6 - resolution: "loupe@npm:2.3.6" +"loupe@npm:^2.3.6": + version: 2.3.7 + resolution: "loupe@npm:2.3.7" dependencies: - get-func-name: ^2.0.0 - checksum: cc83f1b124a1df7384601d72d8d1f5fe95fd7a8185469fec48bb2e4027e45243949e7a013e8d91051a138451ff0552310c32aa9786e60b6a30d1e801bdc2163f + get-func-name: ^2.0.1 + checksum: 96c058ec7167598e238bb7fb9def2f9339215e97d6685d9c1e3e4bdb33d14600e11fe7a812cf0c003dfb73ca2df374f146280b2287cae9e8d989e9d7a69a203b languageName: node linkType: hard @@ -11387,6 +11255,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0": + version: 10.1.0 + resolution: "lru-cache@npm:10.1.0" + checksum: 58056d33e2500fbedce92f8c542e7c11b50d7d086578f14b7074d8c241422004af0718e08a6eaae8705cee09c77e39a61c1c79e9370ba689b7010c152e6a76ab + languageName: node + linkType: hard + "lru-cache@npm:^5.1.1": version: 5.1.1 resolution: "lru-cache@npm:5.1.1" @@ -11405,20 +11280,13 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.14.1": version: 7.18.3 resolution: "lru-cache@npm:7.18.3" checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356 languageName: node linkType: hard -"lru-cache@npm:^9.1.1 || ^10.0.0": - version: 10.0.1 - resolution: "lru-cache@npm:10.0.1" - checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181 - languageName: node - linkType: hard - "lru_map@npm:^0.3.3": version: 0.3.3 resolution: "lru_map@npm:0.3.3" @@ -11426,12 +11294,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.0": - version: 0.30.3 - resolution: "magic-string@npm:0.30.3" +"magic-string@npm:^0.30.5": + version: 0.30.5 + resolution: "magic-string@npm:0.30.5" dependencies: "@jridgewell/sourcemap-codec": ^1.4.15 - checksum: a5a9ddf9bd3bf49a2de1048bf358464f1bda7b3cc1311550f4a0ba8f81a4070e25445d53a5ee28850161336f1bff3cf28aa3320c6b4aeff45ce3e689f300b2f3 + checksum: da10fecff0c0a7d3faf756913ce62bd6d5e7b0402be48c3b27bfd651b90e29677e279069a63b764bcdc1b8ecdcdb898f29a5c5ec510f2323e8d62ee057a6eb18 languageName: node linkType: hard @@ -11442,26 +11310,22 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^11.0.3": - version: 11.1.1 - resolution: "make-fetch-happen@npm:11.1.1" +"make-fetch-happen@npm:^13.0.0": + version: 13.0.0 + resolution: "make-fetch-happen@npm:13.0.0" dependencies: - agentkeepalive: ^4.2.1 - cacache: ^17.0.0 + "@npmcli/agent": ^2.0.0 + cacache: ^18.0.0 http-cache-semantics: ^4.1.1 - http-proxy-agent: ^5.0.0 - https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 - lru-cache: ^7.7.1 - minipass: ^5.0.0 + minipass: ^7.0.2 minipass-fetch: ^3.0.0 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 - socks-proxy-agent: ^7.0.0 ssri: ^10.0.0 - checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540 + checksum: 7c7a6d381ce919dd83af398b66459a10e2fe8f4504f340d1d090d3fa3d1b0c93750220e1d898114c64467223504bd258612ba83efbc16f31b075cd56de24b4af languageName: node linkType: hard @@ -11694,15 +11558,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.0.4": - version: 3.0.4 - resolution: "minimatch@npm:3.0.4" - dependencies: - brace-expansion: ^1.1.7 - checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 - languageName: node - linkType: hard - "minimatch@npm:5.0.1": version: 5.0.1 resolution: "minimatch@npm:5.0.1" @@ -11746,12 +11601,12 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" +"minipass-collect@npm:^2.0.1": + version: 2.0.1 + resolution: "minipass-collect@npm:2.0.1" dependencies: - minipass: ^3.0.0 - checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10 + minipass: ^7.0.3 + checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342 languageName: node linkType: hard @@ -11830,10 +11685,10 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3": - version: 7.0.3 - resolution: "minipass@npm:7.0.3" - checksum: 6f1614f5b5b55568a46bca5fec0e7c46dac027691db27d0e1923a8192866903144cd962ac772c0e9f89b608ea818b702709c042bce98e190d258847d85461531 +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3": + version: 7.0.4 + resolution: "minipass@npm:7.0.4" + checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21 languageName: node linkType: hard @@ -11874,17 +11729,6 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:0.5.5": - version: 0.5.5 - resolution: "mkdirp@npm:0.5.5" - dependencies: - minimist: ^1.2.5 - bin: - mkdirp: bin/cmd.js - checksum: 3bce20ea525f9477befe458ab85284b0b66c8dc3812f94155af07c827175948cdd8114852ac6c6d82009b13c1048c37f6d98743eb019651ee25c39acc8aabe7d - languageName: node - linkType: hard - "mkdirp@npm:0.5.x, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" @@ -11914,7 +11758,7 @@ __metadata: languageName: node linkType: hard -"mocha@npm:^10.0.0": +"mocha@npm:^10.0.0, mocha@npm:^10.2.0": version: 10.2.0 resolution: "mocha@npm:10.2.0" dependencies: @@ -11946,41 +11790,6 @@ __metadata: languageName: node linkType: hard -"mocha@npm:^7.1.1": - version: 7.2.0 - resolution: "mocha@npm:7.2.0" - dependencies: - ansi-colors: 3.2.3 - browser-stdout: 1.3.1 - chokidar: 3.3.0 - debug: 3.2.6 - diff: 3.5.0 - escape-string-regexp: 1.0.5 - find-up: 3.0.0 - glob: 7.1.3 - growl: 1.10.5 - he: 1.2.0 - js-yaml: 3.13.1 - log-symbols: 3.0.0 - minimatch: 3.0.4 - mkdirp: 0.5.5 - ms: 2.1.1 - node-environment-flags: 1.0.6 - object.assign: 4.1.0 - strip-json-comments: 2.0.1 - supports-color: 6.0.0 - which: 1.3.1 - wide-align: 1.1.3 - yargs: 13.3.2 - yargs-parser: 13.1.2 - yargs-unparser: 1.6.0 - bin: - _mocha: bin/_mocha - mocha: bin/mocha - checksum: d098484fe1b165bb964fdbf6b88b256c71fead47575ca7c5bcf8ed07db0dcff41905f6d2f0a05111a0441efaef9d09241a8cc1ddf7961056b28984ec63ba2874 - languageName: node - linkType: hard - "mock-fs@npm:^4.1.0": version: 4.14.0 resolution: "mock-fs@npm:4.14.0" @@ -12009,13 +11818,6 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.1": - version: 2.1.1 - resolution: "ms@npm:2.1.1" - checksum: 0078a23cd916a9a7435c413caa14c57d4b4f6e2470e0ab554b6964163c8a4436448ac7ae020e883685475da6b6796cc396b670f579cb275db288a21e3e57721e - languageName: node - linkType: hard - "ms@npm:2.1.2": version: 2.1.2 resolution: "ms@npm:2.1.2" @@ -12023,7 +11825,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1": +"ms@npm:2.1.3, ms@npm:^2.1.1": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d @@ -12146,12 +11948,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.0.2, nanoid@npm:^3.1.20, nanoid@npm:^3.1.23, nanoid@npm:^3.3.6": - version: 3.3.6 - resolution: "nanoid@npm:3.3.6" +"nanoid@npm:^3.0.2, nanoid@npm:^3.1.20, nanoid@npm:^3.1.23, nanoid@npm:^3.3.7": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" bin: nanoid: bin/nanoid.cjs - checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3 + checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 languageName: node linkType: hard @@ -12257,16 +12059,6 @@ __metadata: languageName: node linkType: hard -"node-environment-flags@npm:1.0.6": - version: 1.0.6 - resolution: "node-environment-flags@npm:1.0.6" - dependencies: - object.getownpropertydescriptors: ^2.0.3 - semver: ^5.7.0 - checksum: 268139ed0f7fabdca346dcb26931300ec7a1dc54a58085a849e5c78a82b94967f55df40177a69d4e819da278d98686d5c4fd49ab0d7bcff16fda25b6fffc4ca3 - languageName: node - linkType: hard - "node-fetch@npm:1.7.3": version: 1.7.3 resolution: "node-fetch@npm:1.7.3" @@ -12292,34 +12084,33 @@ __metadata: linkType: hard "node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.3.0": - version: 4.6.1 - resolution: "node-gyp-build@npm:4.6.1" + version: 4.7.1 + resolution: "node-gyp-build@npm:4.7.1" bin: node-gyp-build: bin.js node-gyp-build-optional: optional.js node-gyp-build-test: build-test.js - checksum: c3676d337b36803bc7792e35bf7fdcda7cdcb7e289b8f9855a5535702a82498eb976842fefcf487258c58005ca32ce3d537fbed91280b04409161dcd7232a882 + checksum: 2ef8248021489db03be3e8098977cdc797b80a9b12b77c6dcb89b0dc89b8c62e6a482672ee298f61021740ae7f080fb33154cfec8fb158cec620f57b0fae87c0 languageName: node linkType: hard "node-gyp@npm:latest": - version: 9.4.0 - resolution: "node-gyp@npm:9.4.0" + version: 10.0.1 + resolution: "node-gyp@npm:10.0.1" dependencies: env-paths: ^2.2.0 exponential-backoff: ^3.1.1 - glob: ^7.1.4 + glob: ^10.3.10 graceful-fs: ^4.2.6 - make-fetch-happen: ^11.0.3 - nopt: ^6.0.0 - npmlog: ^6.0.0 - rimraf: ^3.0.2 + make-fetch-happen: ^13.0.0 + nopt: ^7.0.0 + proc-log: ^3.0.0 semver: ^7.3.5 tar: ^6.1.2 - which: ^2.0.2 + which: ^4.0.0 bin: node-gyp: bin/node-gyp.js - checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99 + checksum: 60a74e66d364903ce02049966303a57f898521d139860ac82744a5fdd9f7b7b3b61f75f284f3bfe6e6add3b8f1871ce305a1d41f775c7482de837b50c792223f languageName: node linkType: hard @@ -12330,10 +12121,10 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.13": - version: 2.0.13 - resolution: "node-releases@npm:2.0.13" - checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3 +"node-releases@npm:^2.0.14": + version: 2.0.14 + resolution: "node-releases@npm:2.0.14" + checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41 languageName: node linkType: hard @@ -12355,14 +12146,14 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^6.0.0": - version: 6.0.0 - resolution: "nopt@npm:6.0.0" +"nopt@npm:^7.0.0": + version: 7.2.0 + resolution: "nopt@npm:7.2.0" dependencies: - abbrev: ^1.0.0 + abbrev: ^2.0.0 bin: nopt: bin/nopt.js - checksum: 82149371f8be0c4b9ec2f863cc6509a7fd0fa729929c009f3a58e4eb0c9e4cae9920e8f1f8eb46e7d032fec8fb01bede7f0f41a67eb3553b7b8e14fa53de1dac + checksum: a9c0f57fb8cb9cc82ae47192ca2b7ef00e199b9480eed202482c962d61b59a7fbe7541920b2a5839a97b42ee39e288c0aed770e38057a608d7f579389dfde410 languageName: node linkType: hard @@ -12426,18 +12217,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^6.0.0": - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" - dependencies: - are-we-there-yet: ^3.0.0 - console-control-strings: ^1.1.0 - gauge: ^4.0.3 - set-blocking: ^2.0.0 - checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a - languageName: node - linkType: hard - "nullthrows@npm:^1.1.1": version: 1.1.1 resolution: "nullthrows@npm:1.1.1" @@ -12476,14 +12255,14 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0": - version: 1.12.3 - resolution: "object-inspect@npm:1.12.3" - checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db +"object-inspect@npm:^1.12.2, object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f languageName: node linkType: hard -"object-keys@npm:^1.0.11, object-keys@npm:^1.1.1": +"object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a @@ -12497,31 +12276,19 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:4.1.0": - version: 4.1.0 - resolution: "object.assign@npm:4.1.0" - dependencies: - define-properties: ^1.1.2 - function-bind: ^1.1.1 - has-symbols: ^1.0.0 - object-keys: ^1.0.11 - checksum: 648a9a463580bf48332d9a49a76fede2660ab1ee7104d9459b8a240562246da790b4151c3c073f28fda31c1fdc555d25a1d871e72be403e997e4468c91f4801f - languageName: node - linkType: hard - "object.assign@npm:^4.1.4": - version: 4.1.4 - resolution: "object.assign@npm:4.1.4" + version: 4.1.5 + resolution: "object.assign@npm:4.1.5" dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 + call-bind: ^1.0.5 + define-properties: ^1.2.1 has-symbols: ^1.0.3 object-keys: ^1.1.1 - checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 + checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25 languageName: node linkType: hard -"object.fromentries@npm:^2.0.6": +"object.fromentries@npm:^2.0.7": version: 2.0.7 resolution: "object.fromentries@npm:2.0.7" dependencies: @@ -12532,20 +12299,7 @@ __metadata: languageName: node linkType: hard -"object.getownpropertydescriptors@npm:^2.0.3": - version: 2.1.7 - resolution: "object.getownpropertydescriptors@npm:2.1.7" - dependencies: - array.prototype.reduce: ^1.0.6 - call-bind: ^1.0.2 - define-properties: ^1.2.0 - es-abstract: ^1.22.1 - safe-array-concat: ^1.0.0 - checksum: 8e7ae1d522a3874d2d23a3d0fb75828cbcee60958b65c2ad8e58ce227f4efba8cc2b59c7431a0fd48b20d9e04ec075bc0e0d694b1d2c2296e534daf558beb10b - languageName: node - linkType: hard - -"object.groupby@npm:^1.0.0": +"object.groupby@npm:^1.0.1": version: 1.0.1 resolution: "object.groupby@npm:1.0.1" dependencies: @@ -12557,7 +12311,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.6": +"object.values@npm:^1.1.7": version: 1.1.7 resolution: "object.values@npm:1.1.7" dependencies: @@ -12757,7 +12511,7 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": +"p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" dependencies: @@ -12775,15 +12529,6 @@ __metadata: languageName: node linkType: hard -"p-locate@npm:^3.0.0": - version: 3.0.0 - resolution: "p-locate@npm:3.0.0" - dependencies: - p-limit: ^2.0.0 - checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae - languageName: node - linkType: hard - "p-locate@npm:^4.1.0": version: 4.1.0 resolution: "p-locate@npm:4.1.0" @@ -12844,7 +12589,7 @@ __metadata: languageName: node linkType: hard -"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5": +"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.6": version: 5.1.6 resolution: "parse-asn1@npm:5.1.6" dependencies: @@ -13143,14 +12888,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10": - version: 8.4.29 - resolution: "postcss@npm:8.4.29" +"postcss@npm:^8.4.32": + version: 8.4.32 + resolution: "postcss@npm:8.4.32" dependencies: - nanoid: ^3.3.6 + nanoid: ^3.3.7 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: dd6daa25e781db9ae5b651d9b7bfde0ec6e60e86a37da69a18eb4773d5ddd51e28fc4ff054fbdc04636a31462e6bf09a1e50986f69ac52b10d46b7457cd36d12 + checksum: 220d9d0bf5d65be7ed31006c523bfb11619461d296245c1231831f90150aeb4a31eab9983ac9c5c89759a3ca8b60b3e0d098574964e1691673c3ce5c494305ae languageName: node linkType: hard @@ -13202,6 +12947,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^3.0.0": + version: 3.0.0 + resolution: "proc-log@npm:3.0.0" + checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02 + languageName: node + linkType: hard + "process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -13352,13 +13104,13 @@ __metadata: linkType: hard "punycode@npm:^2.1.0, punycode@npm:^2.1.1": - version: 2.3.0 - resolution: "punycode@npm:2.3.0" - checksum: 39f760e09a2a3bbfe8f5287cf733ecdad69d6af2fe6f97ca95f24b8921858b91e9ea3c9eeec6e08cede96181b3bb33f95c6ffd8c77e63986508aa2e8159fa200 + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2 languageName: node linkType: hard -"pvtsutils@npm:^1.3.2": +"pvtsutils@npm:^1.3.2, pvtsutils@npm:^1.3.5": version: 1.3.5 resolution: "pvtsutils@npm:1.3.5" dependencies: @@ -13533,7 +13285,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^3.6.0": +"readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.2": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -13556,15 +13308,6 @@ __metadata: languageName: node linkType: hard -"readdirp@npm:~3.2.0": - version: 3.2.0 - resolution: "readdirp@npm:3.2.0" - dependencies: - picomatch: ^2.0.4 - checksum: 0456a4465a13eb5eaf40f0e0836b1bc6b9ebe479b48ba6f63a738b127a1990fb7b38f3ec4b4b6052f9230f976bc0558f12812347dc6b42ce4d548cfe82a9b6f3 - languageName: node - linkType: hard - "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -13624,14 +13367,14 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.5.0": - version: 1.5.0 - resolution: "regexp.prototype.flags@npm:1.5.0" +"regexp.prototype.flags@npm:^1.5.1": + version: 1.5.1 + resolution: "regexp.prototype.flags@npm:1.5.1" dependencies: call-bind: ^1.0.2 define-properties: ^1.2.0 - functions-have-names: ^1.2.3 - checksum: c541687cdbdfff1b9a07f6e44879f82c66bbf07665f9a7544c5fd16acdb3ec8d1436caab01662d2fbcad403f3499d49ab0b77fbc7ef29ef961d98cc4bc9755b4 + set-function-name: ^2.0.0 + checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47 languageName: node linkType: hard @@ -13671,31 +13414,7 @@ __metadata: languageName: node linkType: hard -"request-promise-core@npm:1.1.4": - version: 1.1.4 - resolution: "request-promise-core@npm:1.1.4" - dependencies: - lodash: ^4.17.19 - peerDependencies: - request: ^2.34 - checksum: c798bafd552961e36fbf5023b1d081e81c3995ab390f1bc8ef38a711ba3fe4312eb94dbd61887073d7356c3499b9380947d7f62faa805797c0dc50f039425699 - languageName: node - linkType: hard - -"request-promise-native@npm:^1.0.5": - version: 1.0.9 - resolution: "request-promise-native@npm:1.0.9" - dependencies: - request-promise-core: 1.1.4 - stealthy-require: ^1.1.1 - tough-cookie: ^2.3.3 - peerDependencies: - request: ^2.34 - checksum: 3e2c694eefac88cb20beef8911ad57a275ab3ccbae0c4ca6c679fffb09d5fd502458aab08791f0814ca914b157adab2d4e472597c97a73be702918e41725ed69 - languageName: node - linkType: hard - -"request@npm:2.88.2, request@npm:^2.79.0, request@npm:^2.88.0": +"request@npm:2.88.2, request@npm:^2.79.0": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: @@ -13789,15 +13508,15 @@ __metadata: linkType: hard "resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.22.4": - version: 1.22.4 - resolution: "resolve@npm:1.22.4" + version: 1.22.8 + resolution: "resolve@npm:1.22.8" dependencies: is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 23f25174c2736ce24c6d918910e0d1f89b6b38fefa07a995dff864acd7863d59a7f049e691f93b4b2ee29696303390d921552b6d1b841ed4a8101f517e1d0124 + checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c languageName: node linkType: hard @@ -13818,15 +13537,15 @@ __metadata: linkType: hard "resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.22.4#~builtin": - version: 1.22.4 - resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin::version=1.22.4&hash=07638b" + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b" dependencies: is-core-module: ^2.13.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: c45f2545fdc4d21883861b032789e20aa67a2f2692f68da320cc84d5724cd02f2923766c5354b3210897e88f1a7b3d6d2c7c22faeead8eed7078e4c783a444bc + checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847 languageName: node linkType: hard @@ -13916,13 +13635,13 @@ __metadata: linkType: hard "rimraf@npm:^5.0.0": - version: 5.0.1 - resolution: "rimraf@npm:5.0.1" + version: 5.0.5 + resolution: "rimraf@npm:5.0.5" dependencies: - glob: ^10.2.5 + glob: ^10.3.7 bin: - rimraf: dist/cjs/src/bin.js - checksum: bafce85391349a2d960847980bf9b5caa2a8887f481af630f1ea27e08288217293cec72d75e9a2ba35495c212789f66a7f3d23366ba6197026ab71c535126857 + rimraf: dist/esm/bin.mjs + checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1 languageName: node linkType: hard @@ -13990,7 +13709,7 @@ __metadata: languageName: node linkType: hard -"safe-array-concat@npm:^1.0.0": +"safe-array-concat@npm:^1.0.1": version: 1.0.1 resolution: "safe-array-concat@npm:1.0.1" dependencies: @@ -14091,12 +13810,12 @@ __metadata: languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.7.0": - version: 5.7.1 - resolution: "semver@npm:5.7.1" +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": + version: 5.7.2 + resolution: "semver@npm:5.7.2" bin: semver: bin/semver - checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf + checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686 languageName: node linkType: hard @@ -14122,15 +13841,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^5.6.0": - version: 5.7.2 - resolution: "semver@npm:5.7.2" - bin: - semver: bin/semver - checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686 - languageName: node - linkType: hard - "semver@npm:^6.3.0, semver@npm:^6.3.1": version: 6.3.1 resolution: "semver@npm:6.3.1" @@ -14224,6 +13934,29 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.1.1 + resolution: "set-function-length@npm:1.1.1" + dependencies: + define-data-property: ^1.1.1 + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06 + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.0": + version: 2.0.1 + resolution: "set-function-name@npm:2.0.1" + dependencies: + define-data-property: ^1.0.1 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.0 + checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + languageName: node + linkType: hard + "setimmediate@npm:1.0.4": version: 1.0.4 resolution: "setimmediate@npm:1.0.4" @@ -14323,7 +14056,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -14425,18 +14158,18 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" +"socks-proxy-agent@npm:^8.0.1": + version: 8.0.2 + resolution: "socks-proxy-agent@npm:8.0.2" dependencies: - agent-base: ^6.0.2 - debug: ^4.3.3 - socks: ^2.6.2 - checksum: 720554370154cbc979e2e9ce6a6ec6ced205d02757d8f5d93fe95adae454fc187a5cbfc6b022afab850a5ce9b4c7d73e0f98e381879cf45f66317a4895953846 + agent-base: ^7.0.2 + debug: ^4.3.4 + socks: ^2.7.1 + checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d languageName: node linkType: hard -"socks@npm:^2.6.2": +"socks@npm:^2.7.1": version: 2.7.1 resolution: "socks@npm:2.7.1" dependencies: @@ -14465,12 +14198,12 @@ __metadata: languageName: node linkType: hard -"solidity-ast@npm:^0.4.26, solidity-ast@npm:^0.4.38": - version: 0.4.52 - resolution: "solidity-ast@npm:0.4.52" +"solidity-ast@npm:^0.4.38, solidity-ast@npm:^0.4.51": + version: 0.4.55 + resolution: "solidity-ast@npm:0.4.55" dependencies: array.prototype.findlast: ^1.2.2 - checksum: 8302faaa9a510b6d9e0d64681bbfb113103035fab1680637b2455f2201fe4e3fa0db5e640bb32222013117df2cb6f770fce705e7e5ff170c9c061c27cea1dd27 + checksum: a33f50b48039ca6a980eeb5d2e55a32d93c48bacbe33494faad8d50262f734cdb5c10b6d01d8bda289e702e0f9d144dd120fca1aa954c5390be8300a74a48af6 languageName: node linkType: hard @@ -14582,9 +14315,9 @@ __metadata: linkType: hard "spdx-license-ids@npm:^3.0.0": - version: 3.0.13 - resolution: "spdx-license-ids@npm:3.0.13" - checksum: 3469d85c65f3245a279fa11afc250c3dca96e9e847f2f79d57f466940c5bb8495da08a542646086d499b7f24a74b8d0b42f3fc0f95d50ff99af1f599f6360ad7 + version: 3.0.16 + resolution: "spdx-license-ids@npm:3.0.16" + checksum: 5cdaa85aaa24bd02f9353a2e357b4df0a4f205cb35655f3fd0a5674a4fb77081f28ffd425379214bc3be2c2b7593ce1215df6bcc75884aeee0a9811207feabe2 languageName: node linkType: hard @@ -14612,8 +14345,8 @@ __metadata: linkType: hard "sshpk@npm:^1.7.0": - version: 1.17.0 - resolution: "sshpk@npm:1.17.0" + version: 1.18.0 + resolution: "sshpk@npm:1.18.0" dependencies: asn1: ~0.2.3 assert-plus: ^1.0.0 @@ -14628,7 +14361,7 @@ __metadata: sshpk-conv: bin/sshpk-conv sshpk-sign: bin/sshpk-sign sshpk-verify: bin/sshpk-verify - checksum: ba109f65c8e6c35133b8e6ed5576abeff8aa8d614824b7275ec3ca308f081fef483607c28d97780c1e235818b0f93ed8c8b56d0a5968d5a23fd6af57718c7597 + checksum: 01d43374eee3a7e37b3b82fdbecd5518cbb2e47ccbed27d2ae30f9753f22bd6ffad31225cb8ef013bc3fb7785e686cea619203ee1439a228f965558c367c3cfa languageName: node linkType: hard @@ -14657,13 +14390,6 @@ __metadata: languageName: node linkType: hard -"stealthy-require@npm:^1.1.1": - version: 1.1.1 - resolution: "stealthy-require@npm:1.1.1" - checksum: 6805b857a9f3a6a1079fc6652278038b81011f2a5b22cbd559f71a6c02087e6f1df941eb10163e3fdc5391ab5807aa46758d4258547c1f5ede31e6d9bfda8dd3 - languageName: node - linkType: hard - "stream-to-it@npm:^0.2.2": version: 0.2.4 resolution: "stream-to-it@npm:0.2.4" @@ -14701,7 +14427,7 @@ __metadata: languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -14712,7 +14438,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2, string-width@npm:^2.1.1": +"string-width@npm:^2.1.1": version: 2.1.1 resolution: "string-width@npm:2.1.1" dependencies: @@ -14722,17 +14448,6 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^3.0.0, string-width@npm:^3.1.0": - version: 3.1.0 - resolution: "string-width@npm:3.1.0" - dependencies: - emoji-regex: ^7.0.1 - is-fullwidth-code-point: ^2.0.0 - strip-ansi: ^5.1.0 - checksum: 57f7ca73d201682816d573dc68bd4bb8e1dff8dc9fcf10470fdfc3474135c97175fec12ea6a159e67339b41e86963112355b64529489af6e7e70f94a7caf08b2 - languageName: node - linkType: hard - "string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2": version: 5.1.2 resolution: "string-width@npm:5.1.2" @@ -14744,7 +14459,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.trim@npm:^1.2.7": +"string.prototype.trim@npm:^1.2.8": version: 1.2.8 resolution: "string.prototype.trim@npm:1.2.8" dependencies: @@ -14755,7 +14470,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimend@npm:^1.0.6": +"string.prototype.trimend@npm:^1.0.7": version: 1.0.7 resolution: "string.prototype.trimend@npm:1.0.7" dependencies: @@ -14766,7 +14481,7 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.6": +"string.prototype.trimstart@npm:^1.0.7": version: 1.0.7 resolution: "string.prototype.trimstart@npm:1.0.7" dependencies: @@ -14820,7 +14535,7 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0": +"strip-ansi@npm:^5.2.0": version: 5.2.0 resolution: "strip-ansi@npm:5.2.0" dependencies: @@ -14868,13 +14583,6 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:2.0.1": - version: 2.0.1 - resolution: "strip-json-comments@npm:2.0.1" - checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1 - languageName: node - linkType: hard - "strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -14902,10 +14610,10 @@ __metadata: "@types/node": ^20.5.9 "@typescript-eslint/eslint-plugin": ^5.40.1 "@typescript-eslint/parser": ^5.40.1 - "@venusprotocol/governance-contracts": ^1.3.0 - "@venusprotocol/isolated-pools": 2.1.0-dev.2 + "@venusprotocol/governance-contracts": ^1.4.0-dev.6 + "@venusprotocol/isolated-pools": ^2.3.0-dev.4 "@venusprotocol/oracle": ^1.7.3-dev.1 - "@venusprotocol/venus-protocol": ^3.0.0-dev.7 + "@venusprotocol/venus-protocol": ^6.1.0-dev.5 assemblyscript: 0.19.23 chai: ^4.3.6 eslint: ^8.25.0 @@ -14934,15 +14642,6 @@ __metadata: languageName: unknown linkType: soft -"supports-color@npm:6.0.0": - version: 6.0.0 - resolution: "supports-color@npm:6.0.0" - dependencies: - has-flag: ^3.0.0 - checksum: 005b4a7e5d78a9a703454f5b7da34336b82825747724d1f3eefea6c3956afcb33b79b31854a93cef0fc1f2449919ae952f79abbfd09a5b5b43ecd26407d3a3a1 - languageName: node - linkType: hard - "supports-color@npm:8.1.1, supports-color@npm:^8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1" @@ -15263,7 +14962,7 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0": +"tough-cookie@npm:~2.5.0": version: 2.5.0 resolution: "tough-cookie@npm:2.5.0" dependencies: @@ -15378,7 +15077,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.1": +"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad @@ -15465,7 +15164,7 @@ __metadata: languageName: node linkType: hard -"type-detect@npm:^4.0.0, type-detect@npm:^4.0.5": +"type-detect@npm:^4.0.0, type-detect@npm:^4.0.8": version: 4.0.8 resolution: "type-detect@npm:4.0.8" checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15 @@ -15525,8 +15224,8 @@ __metadata: linkType: hard "typechain@npm:^8.1.0": - version: 8.3.1 - resolution: "typechain@npm:8.3.1" + version: 8.3.2 + resolution: "typechain@npm:8.3.2" dependencies: "@types/prettier": ^2.1.1 debug: ^4.3.1 @@ -15542,7 +15241,7 @@ __metadata: typescript: ">=4.3.0" bin: typechain: dist/cli/cli.js - checksum: c1e11ab1452d0c83be0c34a8b900b156b0c6654b95f7e7bb18dd98c0decd6009ffa1316e393f4e8def187af1bea3e931a13503815cc37155c0c945b7ae5b5215 + checksum: 146a1896fa93403404be78757790b0f95b5457efebcca16b61622e09c374d555ef4f837c1c4eedf77e03abc50276d96a2f33064ec09bb802f62d8cc2b13fce70 languageName: node linkType: hard @@ -15620,12 +15319,12 @@ __metadata: linkType: hard "typescript@npm:^5.0.4": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" + version: 5.3.2 + resolution: "typescript@npm:5.3.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + checksum: d92534dda639eb825db013203404c1fabca8ac630564283c9e7dc9e64fd9c9346c2de95ecebdf3e6e8c1c32941bca1cfe0da37877611feb9daf8feeaea58d230 languageName: node linkType: hard @@ -15640,12 +15339,12 @@ __metadata: linkType: hard "typescript@patch:typescript@^5.0.4#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=f456af" + version: 5.3.2 + resolution: "typescript@patch:typescript@npm%3A5.3.2#~builtin::version=5.3.2&hash=f456af" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554 + checksum: c034461079fbfde3cb584ddee52afccb15b6e32a0ce186d0b2719968786f7ca73e1b07f71fac4163088790b16811c6ccf79680de190664ef66ff0ba9c1fe4a23 languageName: node linkType: hard @@ -15664,9 +15363,9 @@ __metadata: linkType: hard "ua-parser-js@npm:^1.0.35": - version: 1.0.36 - resolution: "ua-parser-js@npm:1.0.36" - checksum: 5b2c8a5e3443dfbba7624421805de946457c26ae167cb2275781a2729d1518f7067c9d5c74c3b0acac4b9ff3278cae4eace08ca6eecb63848bc3b2f6a63cc975 + version: 1.0.37 + resolution: "ua-parser-js@npm:1.0.37" + checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07 languageName: node linkType: hard @@ -15714,12 +15413,19 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~5.26.4": + version: 5.26.5 + resolution: "undici-types@npm:5.26.5" + checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487 + languageName: node + linkType: hard + "undici@npm:^5.14.0": - version: 5.24.0 - resolution: "undici@npm:5.24.0" + version: 5.28.2 + resolution: "undici@npm:5.28.2" dependencies: - busboy: ^1.6.0 - checksum: 0795b69e0f7e1b2b162bce0d1670e6b44c968960e519f5b450df5196fd9c5102e0838ed854e68e61588f3c2436a3dc3d4390f9bf4a24b04eeb03926fe0eaa599 + "@fastify/busboy": ^2.0.0 + checksum: f9e9335803f962fff07c3c11c6d50bbc76248bacf97035047155adb29c3622a65bd6bff23a22218189740133149d22e63b68131d8c40e78ac6cb4b6d686a6dfa languageName: node linkType: hard @@ -15756,9 +15462,9 @@ __metadata: linkType: hard "universalify@npm:^2.0.0": - version: 2.0.0 - resolution: "universalify@npm:2.0.0" - checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44 + version: 2.0.1 + resolution: "universalify@npm:2.0.1" + checksum: ecd8469fe0db28e7de9e5289d32bd1b6ba8f7183db34f3bfc4ca53c49891c2d6aa05f3fb3936a81285a905cc509fb641a0c3fc131ec786167eff41236ae32e60 languageName: node linkType: hard @@ -15778,9 +15484,9 @@ __metadata: languageName: node linkType: hard -"update-browserslist-db@npm:^1.0.11": - version: 1.0.11 - resolution: "update-browserslist-db@npm:1.0.11" +"update-browserslist-db@npm:^1.0.13": + version: 1.0.13 + resolution: "update-browserslist-db@npm:1.0.13" dependencies: escalade: ^3.1.1 picocolors: ^1.0.0 @@ -15788,7 +15494,7 @@ __metadata: browserslist: ">= 4.21.0" bin: update-browserslist-db: cli.js - checksum: b98327518f9a345c7cad5437afae4d2ae7d865f9779554baf2a200fdf4bac4969076b679b1115434bd6557376bdd37ca7583d0f9b8f8e302d7d4cc1e91b5f231 + checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322 languageName: node linkType: hard @@ -16601,8 +16307,8 @@ __metadata: linkType: hard "web3-utils@npm:^1.3.0": - version: 1.10.2 - resolution: "web3-utils@npm:1.10.2" + version: 1.10.3 + resolution: "web3-utils@npm:1.10.3" dependencies: "@ethereumjs/util": ^8.1.0 bn.js: ^5.2.1 @@ -16612,7 +16318,7 @@ __metadata: number-to-bn: 1.7.0 randombytes: ^2.1.0 utf8: 3.0.0 - checksum: a5f8db69603fdd5e984aa6407f47f7a4e0dab83af42e10de25a6d9eeaf2e7d4d18fe665b569e364b2e916233fb73b26cc70ff0d730e7909720118c4790dfb043 + checksum: 353226710b2089a8e84f2b97cc765093e3018b850d3a6d60c92fe012829fa15a54ad15d432f1927bc185c6ef5100397a32fd4a896da5f514817c3f53583df134 languageName: node linkType: hard @@ -16717,31 +16423,20 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2": - version: 1.1.11 - resolution: "which-typed-array@npm:1.1.11" +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.2": + version: 1.1.13 + resolution: "which-typed-array@npm:1.1.13" dependencies: available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + call-bind: ^1.0.4 for-each: ^0.3.3 gopd: ^1.0.1 has-tostringtag: ^1.0.0 - checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206 + checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309 languageName: node linkType: hard -"which@npm:1.3.1, which@npm:^1.1.1, which@npm:^1.2.9, which@npm:^1.3.1": - version: 1.3.1 - resolution: "which@npm:1.3.1" - dependencies: - isexe: ^2.0.0 - bin: - which: ./bin/which - checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04 - languageName: node - linkType: hard - -"which@npm:2.0.2, which@npm:^2.0.1, which@npm:^2.0.2": +"which@npm:2.0.2, which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" dependencies: @@ -16752,21 +16447,25 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:1.1.3": - version: 1.1.3 - resolution: "wide-align@npm:1.1.3" +"which@npm:^1.1.1, which@npm:^1.2.9, which@npm:^1.3.1": + version: 1.3.1 + resolution: "which@npm:1.3.1" dependencies: - string-width: ^1.0.2 || 2 - checksum: d09c8012652a9e6cab3e82338d1874a4d7db2ad1bd19ab43eb744acf0b9b5632ec406bdbbbb970a8f4771a7d5ef49824d038ba70aa884e7723f5b090ab87134d + isexe: ^2.0.0 + bin: + which: ./bin/which + checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04 languageName: node linkType: hard -"wide-align@npm:^1.1.5": - version: 1.1.5 - resolution: "wide-align@npm:1.1.5" +"which@npm:^4.0.0": + version: 4.0.0 + resolution: "which@npm:4.0.0" dependencies: - string-width: ^1.0.2 || 2 || 3 || 4 - checksum: d5fc37cd561f9daee3c80e03b92ed3e84d80dde3365a8767263d03dacfc8fa06b065ffe1df00d8c2a09f731482fcacae745abfbb478d4af36d0a891fad4834d3 + isexe: ^3.1.1 + bin: + node-which: bin/which.js + checksum: f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651 languageName: node linkType: hard @@ -16828,17 +16527,6 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^5.1.0": - version: 5.1.0 - resolution: "wrap-ansi@npm:5.1.0" - dependencies: - ansi-styles: ^3.2.0 - string-width: ^3.0.0 - strip-ansi: ^5.0.0 - checksum: 9b48c862220e541eb0daa22661b38b947973fc57054e91be5b0f2dcc77741a6875ccab4ebe970a394b4682c8dfc17e888266a105fb8b0a9b23c19245e781ceae - languageName: node - linkType: hard - "wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" @@ -16925,8 +16613,8 @@ __metadata: linkType: hard "ws@npm:^8.12.0, ws@npm:^8.13.0": - version: 8.14.1 - resolution: "ws@npm:8.14.1" + version: 8.14.2 + resolution: "ws@npm:8.14.2" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -16935,7 +16623,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 9e310be2b0ff69e1f87d8c6d093ecd17a1ed4c37f281d17c35e8c30e2bd116401775b3d503249651374e6e0e1e9905db62fff096b694371c77561aee06bc3466 + checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b languageName: node linkType: hard @@ -17040,16 +16728,6 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:13.1.2, yargs-parser@npm:^13.1.2": - version: 13.1.2 - resolution: "yargs-parser@npm:13.1.2" - dependencies: - camelcase: ^5.0.0 - decamelize: ^1.2.0 - checksum: c8bb6f44d39a4acd94462e96d4e85469df865de6f4326e0ab1ac23ae4a835e5dd2ddfe588317ebf80c3a7e37e741bd5cb0dc8d92bcc5812baefb7df7c885e86b - languageName: node - linkType: hard - "yargs-parser@npm:20.2.4": version: 20.2.4 resolution: "yargs-parser@npm:20.2.4" @@ -17081,17 +16759,6 @@ __metadata: languageName: node linkType: hard -"yargs-unparser@npm:1.6.0": - version: 1.6.0 - resolution: "yargs-unparser@npm:1.6.0" - dependencies: - flat: ^4.1.0 - lodash: ^4.17.15 - yargs: ^13.3.0 - checksum: ca662bb94af53d816d47f2162f0a1d135783f09de9fd47645a5cb18dd25532b0b710432b680d2c065ff45de122ba4a96433c41595fa7bfcc08eb12e889db95c1 - languageName: node - linkType: hard - "yargs-unparser@npm:2.0.0": version: 2.0.0 resolution: "yargs-unparser@npm:2.0.0" @@ -17104,24 +16771,6 @@ __metadata: languageName: node linkType: hard -"yargs@npm:13.3.2, yargs@npm:^13.3.0": - version: 13.3.2 - resolution: "yargs@npm:13.3.2" - dependencies: - cliui: ^5.0.0 - find-up: ^3.0.0 - get-caller-file: ^2.0.1 - require-directory: ^2.1.1 - require-main-filename: ^2.0.0 - set-blocking: ^2.0.0 - string-width: ^3.0.0 - which-module: ^2.0.0 - y18n: ^4.0.0 - yargs-parser: ^13.1.2 - checksum: 75c13e837eb2bb25717957ba58d277e864efc0cca7f945c98bdf6477e6ec2f9be6afa9ed8a876b251a21423500c148d7b91e88dee7adea6029bdec97af1ef3e8 - languageName: node - linkType: hard - "yargs@npm:16.2.0": version: 16.2.0 resolution: "yargs@npm:16.2.0" @@ -17195,17 +16844,17 @@ __metadata: linkType: hard "zod-to-json-schema@npm:^3.20.5": - version: 3.21.4 - resolution: "zod-to-json-schema@npm:3.21.4" + version: 3.22.1 + resolution: "zod-to-json-schema@npm:3.22.1" peerDependencies: - zod: ^3.21.4 - checksum: 899c1f461fb6547c0b08a265c82040c250be9b88d3f408f2f3ff77a418fdfad7549077e589d418fccb312c1f6d555c3c7217b199cc9072762e1fab20716dd2a6 + zod: ^3.22.4 + checksum: 7c0cdcf0acac81a9b69b26e44bc45e43aefacd5759e12f89856f0a4b957b66be27560671473ef7ab4a5883a871b6990a7f61fce3cee96ecad3823c5b7e524fa5 languageName: node linkType: hard "zod@npm:^3.21.4": - version: 3.22.2 - resolution: "zod@npm:3.22.2" - checksum: 231e2180c8eabb56e88680d80baff5cf6cbe6d64df3c44c50ebe52f73081ecd0229b1c7215b9552537f537a36d9e36afac2737ddd86dc14e3519bdbc777e82b9 + version: 3.22.4 + resolution: "zod@npm:3.22.4" + checksum: 80bfd7f8039b24fddeb0718a2ec7c02aa9856e4838d6aa4864335a047b6b37a3273b191ef335bf0b2002e5c514ef261ffcda5a589fb084a48c336ffc4cdbab7f languageName: node linkType: hard From cb1811904de8da1d7ce4650a6890a9977e6b3779 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Tue, 5 Dec 2023 11:46:19 -0300 Subject: [PATCH 3/8] fix: update name of ReservesReduced event --- subgraphs/isolated-pools/src/mappings/vToken.ts | 4 ++-- subgraphs/isolated-pools/template.yaml | 4 ++-- subgraphs/isolated-pools/tests/VToken/events.ts | 8 ++++---- subgraphs/isolated-pools/tests/VToken/index.test.ts | 8 ++++---- subgraphs/isolated-pools/tests/integration/vTokens.ts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/subgraphs/isolated-pools/src/mappings/vToken.ts b/subgraphs/isolated-pools/src/mappings/vToken.ts index f5218fa8..78a0b607 100644 --- a/subgraphs/isolated-pools/src/mappings/vToken.ts +++ b/subgraphs/isolated-pools/src/mappings/vToken.ts @@ -10,7 +10,7 @@ import { Redeem, RepayBorrow, ReservesAdded, - ReservesReduced, + SpreadReservesReduced, Transfer, } from '../../generated/PoolRegistry/VToken'; import { nullAddress } from '../constants/addresses'; @@ -309,7 +309,7 @@ export function handleReservesAdded(event: ReservesAdded): void { market.save(); } -export function handleReservesReduced(event: ReservesReduced): void { +export function handleSpreadReservesReduced(event: SpreadReservesReduced): void { const vTokenAddress = event.address; const market = getOrCreateMarket(vTokenAddress); market.reservesMantissa = event.params.newTotalReserves; diff --git a/subgraphs/isolated-pools/template.yaml b/subgraphs/isolated-pools/template.yaml index b7cbbc84..446621d5 100644 --- a/subgraphs/isolated-pools/template.yaml +++ b/subgraphs/isolated-pools/template.yaml @@ -150,8 +150,8 @@ templates: handler: handleNewAccessControlManager - event: ReservesAdded(indexed address,uint256,uint256) handler: handleReservesAdded - - event: ReservesReduced(indexed address,uint256,uint256) - handler: handleReservesReduced + - event: SpreadReservesReduced(indexed address,uint256,uint256) + handler: handleSpreadReservesReduced - name: RewardsDistributor kind: ethereum/contract network: {{ network }} diff --git a/subgraphs/isolated-pools/tests/VToken/events.ts b/subgraphs/isolated-pools/tests/VToken/events.ts index 74b07e34..5c69b848 100644 --- a/subgraphs/isolated-pools/tests/VToken/events.ts +++ b/subgraphs/isolated-pools/tests/VToken/events.ts @@ -15,7 +15,7 @@ import { Redeem as RedeemEvent, RepayBorrow as RepayBorrowEvent, ReservesAdded as ReservesAddedEvent, - ReservesReduced as ReservesReducedEvent, + SpreadReservesReduced as SpreadReservesReducedEvent, Transfer as TransferEvent, } from '../../generated/PoolRegistry/VToken'; @@ -461,13 +461,13 @@ export const createReservesAddedEvent = ( return event; }; -export const createReservesReducedEvent = ( +export const createSpreadReservesReducedEvent = ( vTokenAddress: Address, benefactor: Address, reduceAmount: BigInt, newTotalReserves: BigInt, -): ReservesReducedEvent => { - const event = changetype(newMockEvent()); +): SpreadReservesReducedEvent => { + const event = changetype(newMockEvent()); event.address = vTokenAddress; event.parameters = []; diff --git a/subgraphs/isolated-pools/tests/VToken/index.test.ts b/subgraphs/isolated-pools/tests/VToken/index.test.ts index 68777422..9e49bbeb 100644 --- a/subgraphs/isolated-pools/tests/VToken/index.test.ts +++ b/subgraphs/isolated-pools/tests/VToken/index.test.ts @@ -33,7 +33,7 @@ import { handleRedeem, handleRepayBorrow, handleReservesAdded, - handleReservesReduced, + handleSpreadReservesReduced, handleTransfer, } from '../../src/mappings/vToken'; import { getMarket } from '../../src/operations/get'; @@ -53,7 +53,7 @@ import { createRedeemEvent, createRepayBorrowEvent, createReservesAddedEvent, - createReservesReducedEvent, + createSpreadReservesReducedEvent, createTransferEvent, } from './events'; import { createAccountVTokenBalanceOfMock, createPoolRegistryMock } from './mocks'; @@ -808,14 +808,14 @@ describe('VToken', () => { const reduceAmount = BigInt.fromString('100000000000000000'); const newTotalReserves = BigInt.fromString('9111222333444555666'); - const reservesReducedEvent = createReservesReducedEvent( + const reservesReducedEvent = createSpreadReservesReducedEvent( aaaTokenAddress, benefactor, reduceAmount, newTotalReserves, ); - handleReservesReduced(reservesReducedEvent); + handleSpreadReservesReduced(reservesReducedEvent); assert.fieldEquals( 'Market', aaaTokenAddress.toHexString(), diff --git a/subgraphs/isolated-pools/tests/integration/vTokens.ts b/subgraphs/isolated-pools/tests/integration/vTokens.ts index fa9075e1..f6084090 100644 --- a/subgraphs/isolated-pools/tests/integration/vTokens.ts +++ b/subgraphs/isolated-pools/tests/integration/vTokens.ts @@ -239,7 +239,7 @@ describe('VToken events', function () { expect(market?.reservesMantissa).to.be.equal('508333330000000000'); }); - it('handles ReservesReduced event', async function () { + it('handles SpreadReservesReduced event', async function () { const { data: dataBeforeEvent } = await subgraphClient.getMarketById( vBtcbAddress.toLowerCase(), ); From 944eade7a0daad6a6fba11cf35f6272052f47d24 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Tue, 5 Dec 2023 12:31:42 -0300 Subject: [PATCH 4/8] fix: update compiler version to support 0.8.20 --- hardhat.config.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hardhat.config.ts b/hardhat.config.ts index 254fec5c..7f567f0a 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -21,7 +21,7 @@ const compilers = { } }, { - version: '0.8.17', + version: '0.6.6', settings: { optimizer: { enabled: true, @@ -47,7 +47,7 @@ const compilers = { }, }, { - version: '0.8.13', + version: '0.8.17', settings: { optimizer: { enabled: true, @@ -60,10 +60,10 @@ const compilers = { }, }, { - version: '0.6.6', + version: '0.8.20', settings: { optimizer: { - enabled: !process.env.CI, + enabled: true, }, outputSelection: { '*': { @@ -71,7 +71,7 @@ const compilers = { }, }, }, - }, + } ], } From 64934aad8d8e3ff0181aaef49eb7ac2b407a7a78 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Tue, 5 Dec 2023 12:52:05 -0300 Subject: [PATCH 5/8] refactor: remove bnb address from configs --- copy_contracts.sh | 8 ++ deploy/000-governance-access-control.ts | 14 +- deploy/003-configure-feeds.ts | 2 +- deploy/018-governance.ts | 22 +-- hardhat.config.ts | 1 - package.json | 7 +- ...col+governance-contracts+1.4.0-dev.6.patch | 133 ------------------ ...col+governance-contracts+1.4.0-dev.7.patch | 30 ++++ subgraphs/venus/config/index.ts | 3 - subgraphs/venus/src/constants/addresses.ts | 6 +- subgraphs/venus/src/constants/config-template | 1 - yarn.lock | 43 +++++- 12 files changed, 87 insertions(+), 183 deletions(-) delete mode 100644 patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch create mode 100644 patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch diff --git a/copy_contracts.sh b/copy_contracts.sh index 373891d1..f79869b9 100755 --- a/copy_contracts.sh +++ b/copy_contracts.sh @@ -16,10 +16,18 @@ mkdir -p ./contracts/protocol cp -rf ./node_modules/@venusprotocol/venus-protocol/contracts/ ./contracts/protocol/contracts rm -rf contracts/protocol/contracts/test +mkdir -p ./contracts/protocol-reserve +cp -rf ./node_modules/@venusprotocol/protocol-reserve/contracts/ ./contracts/protocol-reserve/contracts +rm -rf contracts/protocol-reserve/contracts/Test + mkdir -p ./contracts/governance/contracts/Governance mkdir -p ./contracts/governance/contracts/legacy +mkdir -p ./contracts/governance/contracts/test + cp -rf ./node_modules/@venusprotocol/governance-contracts/contracts/legacy ./contracts/governance/contracts +cp ./node_modules/@venusprotocol/governance-contracts/contracts/test/TestTimelockV8.sol ./contracts/governance/contracts/test/TestTimelockV8.sol cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoInterfaces.sol ./contracts/governance/contracts/Governance/GovernorBravoInterfaces.sol +cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/TimelockV8.sol ./contracts/governance/contracts/Governance/TimelockV8.sol rm -rf contracts/protocol/contracts/Lens/VenusLens.sol diff --git a/deploy/000-governance-access-control.ts b/deploy/000-governance-access-control.ts index 593a6cb1..99cc6234 100644 --- a/deploy/000-governance-access-control.ts +++ b/deploy/000-governance-access-control.ts @@ -1,18 +1,10 @@ -import accessControl from '@venusprotocol/governance-contracts/dist/deploy/001-access-control'; +import timelock from '@venusprotocol/governance-contracts/dist/deploy/001-timelock'; +import accessControl from '@venusprotocol/governance-contracts/dist/deploy/002-access-control'; import { DeployFunction } from 'hardhat-deploy/types'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - const { deployments, getNamedAccounts } = hre; - const { deploy } = deployments; - const { deployer } = await getNamedAccounts(); - - await deploy('Timelock', { - from: deployer, - args: [deployer, 3600], - log: true, - autoMine: true, - }); + await timelock(hre); await accessControl(hre); }; diff --git a/deploy/003-configure-feeds.ts b/deploy/003-configure-feeds.ts index 7d1796ea..c6e81895 100644 --- a/deploy/003-configure-feeds.ts +++ b/deploy/003-configure-feeds.ts @@ -1,3 +1,3 @@ -import configureFeeds from '@venusprotocol/oracle/dist/deploy/2-configure-feeds'; +import configureFeeds from '@venusprotocol/oracle/dist/deploy/3-configure-feeds'; export default configureFeeds; diff --git a/deploy/018-governance.ts b/deploy/018-governance.ts index 300a5a94..8dc22dab 100644 --- a/deploy/018-governance.ts +++ b/deploy/018-governance.ts @@ -8,18 +8,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { deployer } = await getNamedAccounts(); const signers = await ethers.getSigners(); - const timelock = await ethers.getContract('Timelock'); + const timelock = await ethers.getContract('CriticalTimelock'); const xvsVault = await ethers.getContract('XVSVaultProxy'); - await deploy('GovernorAlphaTimelock', { - contract: 'Timelock', - from: deployer, - args: [deployer, 3600], - log: true, - autoMine: true, - }); - - const governorAlphaTimelock = await ethers.getContract('GovernorAlphaTimelock'); + const governorAlphaTimelock = await ethers.getContract('CriticalTimelock'); await deploy('GovernorAlpha', { from: deployer, args: [governorAlphaTimelock.address, xvsVault.address, deployer], @@ -47,15 +39,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { await governorAlpha.__acceptAdmin(); - await deploy('GovernorAlpha2Timelock', { - contract: 'Timelock', - from: deployer, - args: [deployer, 3600], - log: true, - autoMine: true, - }); - - const governorAlpha2Timelock = await ethers.getContract('GovernorAlpha2Timelock'); + const governorAlpha2Timelock = await ethers.getContract('CriticalTimelock'); await deploy('GovernorAlpha2', { from: deployer, diff --git a/hardhat.config.ts b/hardhat.config.ts index 7f567f0a..2dc0d1d7 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -92,7 +92,6 @@ const config: HardhatUserConfig = { paths: [ '@venusprotocol/governance-contracts/contracts/Governance/Timelock.sol', '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegate.sol', - '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegator.sol', ], }, mocha: { diff --git a/package.json b/package.json index d1216fcb..a6ed82fc 100644 --- a/package.json +++ b/package.json @@ -48,9 +48,9 @@ "@types/node": "^20.5.9", "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", - "@venusprotocol/governance-contracts": "^1.4.0-dev.6", + "@venusprotocol/governance-contracts": "^1.4.0-dev.7", "@venusprotocol/isolated-pools": "^2.3.0-dev.4", - "@venusprotocol/oracle": "^1.7.3-dev.1", + "@venusprotocol/oracle": "^1.8.0-dev.5", "@venusprotocol/venus-protocol": "^6.1.0-dev.5", "assemblyscript": "0.19.23", "chai": "^4.3.6", @@ -86,5 +86,8 @@ "packageManager": "yarn@3.2.2", "_moduleAliases": { "@nomiclabs/hardhat-ethers": "node_modules/hardhat-deploy-ethers" + }, + "dependencies": { + "@venusprotocol/protocol-reserve": "^1.1.0" } } diff --git a/patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch b/patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch deleted file mode 100644 index 5bace989..00000000 --- a/patches/@venusprotocol+governance-contracts+1.4.0-dev.6.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol -index fca5350..4713034 100644 ---- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol -+++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol -@@ -27,8 +27,8 @@ contract GovernorAlpha { - - /// @notice The duration of voting on a proposal, in blocks - function votingPeriod() public pure returns (uint) { -- return (60 * 60 * 24 * 3) / 3; -- } // ~3 days in blocks (assuming 3s blocks) -+ return 100; -+ } // A reasonable amount of block suitable for testing - - /// @notice The address of the Venus Protocol Timelock - TimelockInterface public timelock; -diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol -index c009718..0e8e8ec 100644 ---- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol -+++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol -@@ -27,8 +27,8 @@ contract GovernorAlpha2 { - - /// @notice The duration of voting on a proposal, in blocks - function votingPeriod() public pure returns (uint) { -- return (60 * 60 * 24 * 3) / 3; -- } // ~3 days in blocks (assuming 3s blocks) -+ return 100; -+ } // A reasonable amount of block suitable for testing - - /// @notice The address of the Venus Protocol Timelock - TimelockInterface public timelock; -diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorBravoDelegator.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorBravoDelegator.sol -new file mode 100644 -index 0000000..4323517 ---- /dev/null -+++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorBravoDelegator.sol -@@ -0,0 +1,97 @@ -+pragma solidity ^0.5.16; -+pragma experimental ABIEncoderV2; -+ -+import "./GovernorBravoInterfaces.sol"; -+ -+/** -+ * @title GovernorBravoDelegator -+ * @author Venus -+ * @notice The `GovernorBravoDelegator` contract. -+ */ -+contract GovernorBravoDelegatorV1 is GovernorBravoDelegatorStorage, GovernorBravoEventsV1 { -+ constructor( -+ address timelock_, -+ address xvsVault_, -+ address admin_, -+ address implementation_, -+ uint votingPeriod_, -+ uint votingDelay_, -+ uint proposalThreshold_, -+ address guardian_ -+ ) public { -+ // Admin set to msg.sender for initialization -+ admin = msg.sender; -+ -+ delegateTo( -+ implementation_, -+ abi.encodeWithSignature( -+ "initialize(address,address,uint256,uint256,uint256,address)", -+ timelock_, -+ xvsVault_, -+ votingPeriod_, -+ votingDelay_, -+ proposalThreshold_, -+ guardian_ -+ ) -+ ); -+ -+ _setImplementation(implementation_); -+ -+ admin = admin_; -+ } -+ -+ /** -+ * @notice Called by the admin to update the implementation of the delegator -+ * @param implementation_ The address of the new implementation for delegation -+ */ -+ function _setImplementation(address implementation_) public { -+ require(msg.sender == admin, "GovernorBravoDelegator::_setImplementation: admin only"); -+ require( -+ implementation_ != address(0), -+ "GovernorBravoDelegator::_setImplementation: invalid implementation address" -+ ); -+ -+ address oldImplementation = implementation; -+ implementation = implementation_; -+ -+ emit NewImplementation(oldImplementation, implementation); -+ } -+ -+ /** -+ * @notice Internal method to delegate execution to another contract -+ * @dev It returns to the external caller whatever the implementation returns or forwards reverts -+ * @param callee The contract to delegatecall -+ * @param data The raw data to delegatecall -+ */ -+ function delegateTo(address callee, bytes memory data) internal { -+ (bool success, bytes memory returnData) = callee.delegatecall(data); -+ assembly { -+ if eq(success, 0) { -+ revert(add(returnData, 0x20), returndatasize) -+ } -+ } -+ } -+ -+ /** -+ * @dev Delegates execution to an implementation contract. -+ * It returns to the external caller whatever the implementation returns -+ * or forwards reverts. -+ */ -+ function() external payable { -+ // delegate all other functions to current implementation -+ (bool success, ) = implementation.delegatecall(msg.data); -+ -+ assembly { -+ let free_mem_ptr := mload(0x40) -+ returndatacopy(free_mem_ptr, 0, returndatasize) -+ -+ switch success -+ case 0 { -+ revert(free_mem_ptr, returndatasize) -+ } -+ default { -+ return(free_mem_ptr, returndatasize) -+ } -+ } -+ } -+} diff --git a/patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch b/patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch new file mode 100644 index 00000000..ecedc1b8 --- /dev/null +++ b/patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch @@ -0,0 +1,30 @@ +diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol +index fca5350..4713034 100644 +--- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol ++++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol +@@ -27,8 +27,8 @@ contract GovernorAlpha { + + /// @notice The duration of voting on a proposal, in blocks + function votingPeriod() public pure returns (uint) { +- return (60 * 60 * 24 * 3) / 3; +- } // ~3 days in blocks (assuming 3s blocks) ++ return 100; ++ } // A reasonable amount of block suitable for testing + + /// @notice The address of the Venus Protocol Timelock + TimelockInterface public timelock; +diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol +index c009718..0e8e8ec 100644 +--- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol ++++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol +@@ -27,8 +27,8 @@ contract GovernorAlpha2 { + + /// @notice The duration of voting on a proposal, in blocks + function votingPeriod() public pure returns (uint) { +- return (60 * 60 * 24 * 3) / 3; +- } // ~3 days in blocks (assuming 3s blocks) ++ return 100; ++ } // A reasonable amount of block suitable for testing + + /// @notice The address of the Venus Protocol Timelock + TimelockInterface public timelock; diff --git a/subgraphs/venus/config/index.ts b/subgraphs/venus/config/index.ts index cc931b43..169ec6c3 100644 --- a/subgraphs/venus/config/index.ts +++ b/subgraphs/venus/config/index.ts @@ -21,19 +21,16 @@ const main = () => { network: 'hardhat', comptrollerAddress: '0x94d1820b2D1c7c7452A163983Dc888CEC546b77D', startBlock: '0', - vBnbAddress: '0xA07c5b74C9B40447a954e1466938b865b6BBea36', }, chapel: { network: 'chapel', comptrollerAddress: bscTestnetCoreDeployments.Contracts.Comptroller, startBlock: '2470000', - vBnbAddress: bscTestnetCoreDeployments.Contracts.vBNB, }, bsc: { network: 'bsc', comptrollerAddress: bscMainnetCoreDeployments.Contracts.Comptroller, startBlock: '2470000', - vBnbAddress: bscMainnetCoreDeployments.Contracts.vBNB, }, }; diff --git a/subgraphs/venus/src/constants/addresses.ts b/subgraphs/venus/src/constants/addresses.ts index c8f66fb0..2dec04b2 100644 --- a/subgraphs/venus/src/constants/addresses.ts +++ b/subgraphs/venus/src/constants/addresses.ts @@ -1,10 +1,6 @@ import { Address } from '@graphprotocol/graph-ts'; -import { - comptrollerAddress as comptrollerAddressString, - vBnbAddress as vBnbAddressString, -} from './config'; +import { comptrollerAddress as comptrollerAddressString } from './config'; -export const vBnbAddress = Address.fromString(vBnbAddressString); export const comptrollerAddress = Address.fromString(comptrollerAddressString); export const nullAddress = Address.fromString('0x0000000000000000000000000000000000000000'); diff --git a/subgraphs/venus/src/constants/config-template b/subgraphs/venus/src/constants/config-template index d5af8f52..e68ec726 100644 --- a/subgraphs/venus/src/constants/config-template +++ b/subgraphs/venus/src/constants/config-template @@ -1,4 +1,3 @@ // Use yarn prepare commands to generate config typescript file per env -export const vBnbAddress = '{{ vBnbAddress }}'; export const comptrollerAddress = '{{ comptrollerAddress }}'; diff --git a/yarn.lock b/yarn.lock index 63dbccb6..02a184b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4306,7 +4306,7 @@ __metadata: languageName: node linkType: hard -"@venusprotocol/governance-contracts@npm:^1.4.0-dev.2, @venusprotocol/governance-contracts@npm:^1.4.0-dev.6": +"@venusprotocol/governance-contracts@npm:^1.4.0-dev.2": version: 1.4.0-dev.6 resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.6" dependencies: @@ -4317,6 +4317,17 @@ __metadata: languageName: node linkType: hard +"@venusprotocol/governance-contracts@npm:^1.4.0-dev.7": + version: 1.4.0-dev.7 + resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.7" + dependencies: + "@venusprotocol/solidity-utilities": ^1.1.0 + hardhat-deploy-ethers: ^0.3.0-beta.13 + module-alias: ^2.2.2 + checksum: cc6aead9facf41d638b93306fa2a8b85d43f260d0a0d1f6977ea57ac6d409405cc70e71158f16bb058319de291d685af974ce8a76a60e7b3d719dd2c53b6ba8d + languageName: node + linkType: hard + "@venusprotocol/isolated-pools@npm:^2.3.0-dev.4": version: 2.3.0-dev.4 resolution: "@venusprotocol/isolated-pools@npm:2.3.0-dev.4" @@ -4333,9 +4344,9 @@ __metadata: languageName: node linkType: hard -"@venusprotocol/oracle@npm:^1.7.3-dev.1": - version: 1.7.3 - resolution: "@venusprotocol/oracle@npm:1.7.3" +"@venusprotocol/oracle@npm:^1.8.0-dev.5": + version: 1.8.0-dev.5 + resolution: "@venusprotocol/oracle@npm:1.8.0-dev.5" dependencies: "@chainlink/contracts": ^0.5.1 "@defi-wonderland/smock": ^2.3.4 @@ -4349,7 +4360,7 @@ __metadata: hardhat-deploy: ^0.11.14 module-alias: ^2.2.2 solidity-docgen: ^0.6.0-beta.29 - checksum: 4187974f762fe1082db449acf2edd2d9d94feec76fab88a50d0eb5de44d12baf80381e365e71b2784c12a0e0941630c37b81d23cea01ec4b4a6f549a90457803 + checksum: 32e1dc6aca38bc5c7b3cc205be4b07ce097a2905f9d565ef867056945b6617a7e9480b0177f31dc5ccff524f7fcc815e10cf19fa5fe8c274b459d48abd5123d9 languageName: node linkType: hard @@ -4370,6 +4381,23 @@ __metadata: languageName: node linkType: hard +"@venusprotocol/protocol-reserve@npm:^1.1.0": + version: 1.1.0 + resolution: "@venusprotocol/protocol-reserve@npm:1.1.0" + dependencies: + "@nomiclabs/hardhat-ethers": ^2.2.3 + "@openzeppelin/contracts": ^4.8.3 + "@openzeppelin/contracts-upgradeable": ^4.8.3 + "@openzeppelin/hardhat-upgrades": ^1.21.0 + "@solidity-parser/parser": ^0.13.2 + "@venusprotocol/solidity-utilities": ^1.0.1 + ethers: ^5.7.0 + hardhat-deploy: ^0.11.14 + module-alias: ^2.2.2 + checksum: 86e2da20ddb3824603c1f5e0931cc4715cd442624a03cc0fed7633ecbb5f2cab9a04ca5dcec805a4d9b0e04904799286210299f39935034f9fe85155f7b56da3 + languageName: node + linkType: hard + "@venusprotocol/solidity-utilities@npm:^1.0.1, @venusprotocol/solidity-utilities@npm:^1.1.0": version: 1.1.0 resolution: "@venusprotocol/solidity-utilities@npm:1.1.0" @@ -14610,9 +14638,10 @@ __metadata: "@types/node": ^20.5.9 "@typescript-eslint/eslint-plugin": ^5.40.1 "@typescript-eslint/parser": ^5.40.1 - "@venusprotocol/governance-contracts": ^1.4.0-dev.6 + "@venusprotocol/governance-contracts": ^1.4.0-dev.7 "@venusprotocol/isolated-pools": ^2.3.0-dev.4 - "@venusprotocol/oracle": ^1.7.3-dev.1 + "@venusprotocol/oracle": ^1.8.0-dev.5 + "@venusprotocol/protocol-reserve": ^1.1.0 "@venusprotocol/venus-protocol": ^6.1.0-dev.5 assemblyscript: 0.19.23 chai: ^4.3.6 From af9426ed47663c90c0ed6adfb61d5b1499007110 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Wed, 6 Dec 2023 10:28:09 -0300 Subject: [PATCH 6/8] test: update test fixtures --- .../isolated-pools/subgraph-client/index.ts | 6 + .../tests/integration/constants.ts | 138 +++++++++--------- .../isolated-pools/tests/integration/pool.ts | 18 +-- .../tests/integration/poolRegistry.ts | 18 +-- .../integration/queries/poolByIdQuery.graphql | 22 +++ .../tests/integration/vTokens.ts | 17 +-- 6 files changed, 122 insertions(+), 97 deletions(-) create mode 100644 subgraphs/isolated-pools/tests/integration/queries/poolByIdQuery.graphql diff --git a/subgraphs/isolated-pools/subgraph-client/index.ts b/subgraphs/isolated-pools/subgraph-client/index.ts index 45e6e5d1..5a853c35 100644 --- a/subgraphs/isolated-pools/subgraph-client/index.ts +++ b/subgraphs/isolated-pools/subgraph-client/index.ts @@ -13,6 +13,7 @@ import { MarketByIdDocument, MarketsDocument, PoolsDocument, + PoolByIdDocument } from './.graphclient'; class SubgraphClient { @@ -38,6 +39,11 @@ class SubgraphClient { return result; } + async getPool(id: string) { + const result = await this.query(PoolByIdDocument, { id }); + return result; + } + async getMarkets() { const result = await this.query(MarketsDocument, {}); return result; diff --git a/subgraphs/isolated-pools/tests/integration/constants.ts b/subgraphs/isolated-pools/tests/integration/constants.ts index ef7ac529..962a5e26 100644 --- a/subgraphs/isolated-pools/tests/integration/constants.ts +++ b/subgraphs/isolated-pools/tests/integration/constants.ts @@ -6,9 +6,9 @@ export const SYNC_DELAY = 2000; export const defaultMarkets = [ { - id: '0x8a93d247134d91e0de6f96547cb0204e5be8e5d8', + id: '0xb9beecd1a582768711de1ee7b0a1d582d9d72a6c', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -16,17 +16,17 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '700000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x2a810409872afc346f9b5b26571fd6ec42ea4849', + interestRateModelAddress: '0xb82008565fdc7e44609fa118a4a681e92581e680', name: 'Venus ANKR', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vANKR', - underlyingAddress: '0x1291be112d480055dafd8a610b7d1e203891c274', + underlyingAddress: '0x4c5859f0f772848b2d91f1d83e2fe57935348029', underlyingName: 'MockANKR', underlyingSymbol: 'MockANKR', borrowCapMantissa: '3000000000000000000000000', - accrualBlockNumber: 249, - blockTimestamp: 1694785699, + accrualBlockNumber: 263, + blockTimestamp: 1701809550, borrowIndexMantissa: '1000000000000000000', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', @@ -39,9 +39,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0xb82008565fdc7e44609fa118a4a681e92581e680', + id: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', pool: { - id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', + id: '0xe3011a37a904ab90c8881a99bd1f6e21401f1522', __typename: 'Pool', }, badDebtMantissa: '0', @@ -49,18 +49,18 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '600000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', + interestRateModelAddress: '0x38a024c0b412b9d1db8bc398140d00f5af3093d4', name: 'Venus BNX', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vBNX', - underlyingAddress: '0x95401dc811bb5740090279ba06cfa8fcf6113778', + underlyingAddress: '0xf5059a5d33d5853360d16c683c16e67980206f36', underlyingName: 'MockBNX', underlyingSymbol: 'MockBNX', borrowCapMantissa: '478980000000000000000000', - accrualBlockNumber: 243, - blockTimestamp: 1694785693, - borrowIndexMantissa: '1000000058980213058', + accrualBlockNumber: 255, + blockTimestamp: 1701809541, + borrowIndexMantissa: '1000000069444444407', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', underlyingDecimals: 18, @@ -72,9 +72,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0xd6e1afe5ca8d00a2efc01b89997abe2de47fdfaf', + id: '0xf32d39ff9f6aa7a7a64d7a4f00a54826ef791a55', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -82,18 +82,18 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '600000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', + interestRateModelAddress: '0x38a024c0b412b9d1db8bc398140d00f5af3093d4', name: 'Venus NFT', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vNFT', - underlyingAddress: '0xfd471836031dc5108809d173a067e8486b9047a3', + underlyingAddress: '0xc351628eb244ec633d5f21fbd6621e1a683b1181', underlyingName: 'MockNFT', underlyingSymbol: 'MockNFT', borrowCapMantissa: '24654278679000000000000000000', - accrualBlockNumber: 258, - blockTimestamp: 1694785708, - borrowIndexMantissa: '1000000061834094335', + accrualBlockNumber: 275, + blockTimestamp: 1701809563, + borrowIndexMantissa: '1000000077054794479', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', underlyingDecimals: 18, @@ -105,9 +105,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0xf32d39ff9f6aa7a7a64d7a4f00a54826ef791a55', + id: '0x40918ba7f132e0acba2ce4de4c4baf9bd2d7d849', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -115,17 +115,17 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '700000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x2a810409872afc346f9b5b26571fd6ec42ea4849', + interestRateModelAddress: '0xb82008565fdc7e44609fa118a4a681e92581e680', name: 'Venus MBOX', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vMBOX', - underlyingAddress: '0x7969c5ed335650692bc04293b07f5bf2e7a673c0', + underlyingAddress: '0x2bdcc0de6be1f7d2ee689a0342d76f52e8efaba3', underlyingName: 'MockMBOX', underlyingSymbol: 'MockMBOX', borrowCapMantissa: '3184294000000000000000000', - accrualBlockNumber: 255, - blockTimestamp: 1694785705, + accrualBlockNumber: 271, + blockTimestamp: 1701809559, borrowIndexMantissa: '1000000000000000000', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', @@ -138,9 +138,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0xca8c8688914e0f7096c920146cd0ad85cd7ae8b9', + id: '0x6f6f570f45833e249e27022648a26f4076f48f78', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -148,17 +148,17 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '700000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x2a810409872afc346f9b5b26571fd6ec42ea4849', + interestRateModelAddress: '0xb82008565fdc7e44609fa118a4a681e92581e680', name: 'Venus USDD', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vUSDD', - underlyingAddress: '0x04c89607413713ec9775e14b954286519d836fef', + underlyingAddress: '0xdbc43ba45381e02825b14322cddd15ec4b3164e6', underlyingName: 'MockUSDD', underlyingSymbol: 'MockUSDD', borrowCapMantissa: '1698253000000000000000000', - accrualBlockNumber: 267, - blockTimestamp: 1694785717, + accrualBlockNumber: 287, + blockTimestamp: 1701809575, borrowIndexMantissa: '1000000000000000000', reserveFactorMantissa: '100000000000000000', underlyingPriceCents: '159', @@ -171,9 +171,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0xb9beecd1a582768711de1ee7b0a1d582d9d72a6c', + id: '0x2a810409872afc346f9b5b26571fd6ec42ea4849', pool: { - id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', + id: '0xe3011a37a904ab90c8881a99bd1f6e21401f1522', __typename: 'Pool', }, badDebtMantissa: '0', @@ -181,17 +181,17 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '700000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x2a810409872afc346f9b5b26571fd6ec42ea4849', + interestRateModelAddress: '0xb82008565fdc7e44609fa118a4a681e92581e680', name: 'Venus BTCB', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vBTCB', - underlyingAddress: '0x4826533b4897376654bb4d4ad88b7fafd0c98528', + underlyingAddress: '0x70e0ba845a1a0f2da3359c97e0285013525ffc49', underlyingName: 'MockBTCB', underlyingSymbol: 'MockBTCB', borrowCapMantissa: '1000000000000000000000', - accrualBlockNumber: 246, - blockTimestamp: 1694785696, + accrualBlockNumber: 259, + blockTimestamp: 1701809546, borrowIndexMantissa: '1000000000000000000', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '0', @@ -204,9 +204,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0x40918ba7f132e0acba2ce4de4c4baf9bd2d7d849', + id: '0x8a93d247134d91e0de6f96547cb0204e5be8e5d8', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -214,18 +214,18 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '600000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', + interestRateModelAddress: '0x38a024c0b412b9d1db8bc398140d00f5af3093d4', name: 'Venus ankrBNB', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vankrBNB', - underlyingAddress: '0xcd8a1c3ba11cf5ecfa6267617243239504a98d90', + underlyingAddress: '0xb7278a61aa25c888815afc32ad3cc52ff24fe575', underlyingName: 'MockankrBNB', underlyingSymbol: 'MockankrBNB', borrowCapMantissa: '100000000000000000000', - accrualBlockNumber: 252, - blockTimestamp: 1694785702, - borrowIndexMantissa: '1000000059931506817', + accrualBlockNumber: 267, + blockTimestamp: 1701809554, + borrowIndexMantissa: '1000000073249619443', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', underlyingDecimals: 18, @@ -237,9 +237,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0x6f6f570f45833e249e27022648a26f4076f48f78', + id: '0x99dbe4aea58e518c50a1c04ae9b48c9f6354612f', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -247,18 +247,18 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '600000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', + interestRateModelAddress: '0x38a024c0b412b9d1db8bc398140d00f5af3093d4', name: 'Venus stkBNB', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vstkBNB', - underlyingAddress: '0x5081a39b8a5f0e35a8d959395a630b68b74dd30f', + underlyingAddress: '0x922d6956c99e12dfeb3224dea977d0939758a1fe', underlyingName: 'MockstkBNB', underlyingSymbol: 'MockstkBNB', borrowCapMantissa: '324000000000000000000', - accrualBlockNumber: 264, - blockTimestamp: 1694785714, - borrowIndexMantissa: '1000000063736681853', + accrualBlockNumber: 283, + blockTimestamp: 1701809571, + borrowIndexMantissa: '1000000080859969515', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', underlyingDecimals: 18, @@ -270,9 +270,9 @@ export const defaultMarkets = [ __typename: 'Market', }, { - id: '0x99dbe4aea58e518c50a1c04ae9b48c9f6354612f', + id: '0xd6e1afe5ca8d00a2efc01b89997abe2de47fdfaf', pool: { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', __typename: 'Pool', }, badDebtMantissa: '0', @@ -280,18 +280,18 @@ export const defaultMarkets = [ cashMantissa: '10000000000000000000', collateralFactorMantissa: '600000000000000000', exchangeRateMantissa: '10000000000000000000000000000', - interestRateModelAddress: '0x5fc748f1feb28d7b76fa1c6b07d8ba2d5535177c', + interestRateModelAddress: '0x38a024c0b412b9d1db8bc398140d00f5af3093d4', name: 'Venus RACA', reservesMantissa: '0', supplyRateMantissa: '0', symbol: 'vRACA', - underlyingAddress: '0xb0d4afd8879ed9f52b28595d31b441d079b2ca07', + underlyingAddress: '0x1429859428c0abc9c2c47c8ee9fbaf82cfa0f20f', underlyingName: 'MockRACA', underlyingSymbol: 'MockRACA', borrowCapMantissa: '3805812642000000000000000000', - accrualBlockNumber: 261, - blockTimestamp: 1694785711, - borrowIndexMantissa: '1000000062785388094', + accrualBlockNumber: 279, + blockTimestamp: 1701809567, + borrowIndexMantissa: '1000000078957381997', reserveFactorMantissa: '250000000000000000', underlyingPriceCents: '159', underlyingDecimals: 18, @@ -306,7 +306,7 @@ export const defaultMarkets = [ export const defaultPools = [ { - id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', + id: '0xe3011a37a904ab90c8881a99bd1f6e21401f1522', name: 'Pool 1', creator: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', blockPosted: '238', @@ -314,15 +314,15 @@ export const defaultPools = [ category: '', logoUrl: '', description: '', - priceOracleAddress: '0x59b670e9fa9d0a427751af201d676719a970857b', - closeFactorMantissa: '500000000000000000', - liquidationIncentiveMantissa: '3000000000000000000', - minLiquidatableCollateralMantissa: '200000000000000000000', + priceOracleAddress: '0x322813fd9a801c5507c9de605d63cea4f2ce6c44', + closeFactorMantissa: '50000000000000000', + liquidationIncentiveMantissa: '1000000000000000000', + minLiquidatableCollateralMantissa: '100000000000000000000', markets: [Array], __typename: 'Pool', }, { - id: '0x457ccf29090fe5a24c19c1bc95f492168c0eafdb', + id: '0x1f10f3ba7acb61b2f50b9d6ddcf91a6f787c0e82', name: 'Pool 2', creator: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266', blockPosted: '240', @@ -330,10 +330,10 @@ export const defaultPools = [ category: '', logoUrl: '', description: '', - priceOracleAddress: '0x59b670e9fa9d0a427751af201d676719a970857b', - closeFactorMantissa: '50000000000000000', - liquidationIncentiveMantissa: '1000000000000000000', - minLiquidatableCollateralMantissa: '100000000000000000000', + priceOracleAddress: '0x322813fd9a801c5507c9de605d63cea4f2ce6c44', + closeFactorMantissa: '600000000000000000', + liquidationIncentiveMantissa: '3000000000000000000', + minLiquidatableCollateralMantissa: '200000000000000000000', markets: [Array], __typename: 'Pool', }, diff --git a/subgraphs/isolated-pools/tests/integration/pool.ts b/subgraphs/isolated-pools/tests/integration/pool.ts index df1d9e36..f3b050bf 100644 --- a/subgraphs/isolated-pools/tests/integration/pool.ts +++ b/subgraphs/isolated-pools/tests/integration/pool.ts @@ -156,27 +156,27 @@ describe('Pools', function () { const comptrollerProxy = await ethers.getContractAt('Comptroller', poolsBeforeUpdate[0].id); - const tx = await comptrollerProxy.setCloseFactor('500000000000000000'); + const tx = await comptrollerProxy.setCloseFactor('600000000000000000'); await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); const { data } = await subgraphClient.getPools(); const { pools } = data!; - expect(pools[0].closeFactorMantissa).to.equal('500000000000000000'); + expect(pools[0].closeFactorMantissa).to.equal('600000000000000000'); }); it('handles NewCollateralFactor event', async function () { const { data: dataBeforeEvent } = await subgraphClient.getMarkets(); const { markets: marketsBeforeEvent } = dataBeforeEvent!; const market = marketsBeforeEvent[1]; - expect(market.collateralFactorMantissa).to.equal('600000000000000000'); + expect(market.collateralFactorMantissa).to.equal('700000000000000000'); const comptrollerProxy = await ethers.getContractAt('Comptroller', market.pool.id); const tx = await comptrollerProxy.setCollateralFactor( marketsBeforeEvent[1].id, - scaleValue(0.00007).toString(), // collateral factor + scaleValue(0.00006).toString(), // collateral factor scaleValue(0.00009).toString(), // liquidation threshold ); await tx.wait(1); @@ -185,7 +185,7 @@ describe('Pools', function () { const { data } = await subgraphClient.getMarketById(market.id); const { market: marketNew } = data!; - expect(marketNew?.collateralFactorMantissa).to.equal('70000000000000'); + expect(marketNew?.collateralFactorMantissa).to.equal('60000000000000'); expect(marketNew?.liquidationThresholdMantissa).to.equal('90000000000000'); }); @@ -262,7 +262,7 @@ describe('Pools', function () { const { data } = await subgraphClient.getMarkets(); const { markets: marketsBeforeUpdate } = data!; - expect(marketsBeforeUpdate[0].borrowCapMantissa).to.equal('100000000000000000000'); + expect(marketsBeforeUpdate[0].borrowCapMantissa).to.equal('1000000000000000000000'); const comptrollerProxy = await ethers.getContractAt( 'Comptroller', @@ -302,7 +302,7 @@ describe('Pools', function () { const { data } = await subgraphClient.getMarkets(); const { markets: marketsBeforeUpdate } = data!; - expect(marketsBeforeUpdate[0].supplyCapMantissa).to.equal('100000000000000000000'); + expect(marketsBeforeUpdate[0].supplyCapMantissa).to.equal('1000000000000000000000'); const comptrollerProxy = await ethers.getContractAt( 'Comptroller', @@ -311,13 +311,13 @@ describe('Pools', function () { const tx = await comptrollerProxy.setMarketSupplyCaps( [marketsBeforeUpdate[0].id], - ['100000000000000000'], + ['100000000000000000000000'], ); await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); const { data: marketsData } = await subgraphClient.getMarkets(); const { markets } = marketsData!; - expect(markets[0].supplyCapMantissa).to.equal('100000000000000000'); + expect(markets[0].supplyCapMantissa).to.equal('100000000000000000000000'); }); }); diff --git a/subgraphs/isolated-pools/tests/integration/poolRegistry.ts b/subgraphs/isolated-pools/tests/integration/poolRegistry.ts index 27289da2..5536c646 100644 --- a/subgraphs/isolated-pools/tests/integration/poolRegistry.ts +++ b/subgraphs/isolated-pools/tests/integration/poolRegistry.ts @@ -64,14 +64,13 @@ describe('Pool Registry', function () { }); it('updates and returns metadata from the pool', async function () { - const { data: dataBeforeUpdate } = await subgraphClient.getPools(); - const { pools: poolsBeforeUpdate } = dataBeforeUpdate!; - const poolBeforeUpdate = poolsBeforeUpdate[0]; - expect(poolBeforeUpdate.category).to.equal(defaultPools[0].category); - expect(poolBeforeUpdate.logoUrl).to.equal(defaultPools[0].logoUrl); - expect(poolBeforeUpdate.description).to.equal(defaultPools[0].description); + const { data: dataBeforeUpdate } = await subgraphClient.getPool(defaultPools[1].id); + const { pool: poolBeforeUpdate } = dataBeforeUpdate!; + expect(poolBeforeUpdate.category).to.equal(defaultPools[1].category); + expect(poolBeforeUpdate.logoUrl).to.equal(defaultPools[1].logoUrl); + expect(poolBeforeUpdate.description).to.equal(defaultPools[1].description); - const tx = await poolRegistry.updatePoolMetadata(defaultPools[0].id, [ + const tx = await poolRegistry.updatePoolMetadata(defaultPools[1].id, [ 'Games', logoUrl, description, @@ -79,9 +78,8 @@ describe('Pool Registry', function () { await tx.wait(1); await waitForSubgraphToBeSynced(syncDelay); - const { data } = await subgraphClient.getPools(); - const { pools } = data!; - const pool = pools[0]; + const { data } = await subgraphClient.getPool(poolBeforeUpdate.id); + const { pool } = data!; expect(pool.category).to.equal(category); expect(pool.logoUrl).to.equal(logoUrl); expect(pool.description).to.equal(description); diff --git a/subgraphs/isolated-pools/tests/integration/queries/poolByIdQuery.graphql b/subgraphs/isolated-pools/tests/integration/queries/poolByIdQuery.graphql new file mode 100644 index 00000000..95079336 --- /dev/null +++ b/subgraphs/isolated-pools/tests/integration/queries/poolByIdQuery.graphql @@ -0,0 +1,22 @@ +query PoolById($id: ID!) { + pool (id: $id) { + id + name + creator + blockPosted + timestampPosted + category + logoUrl + description + priceOracleAddress + closeFactorMantissa + liquidationIncentiveMantissa + minLiquidatableCollateralMantissa + markets { + id + pool { + id + } + } + } +} diff --git a/subgraphs/isolated-pools/tests/integration/vTokens.ts b/subgraphs/isolated-pools/tests/integration/vTokens.ts index f6084090..97ad1ee9 100644 --- a/subgraphs/isolated-pools/tests/integration/vTokens.ts +++ b/subgraphs/isolated-pools/tests/integration/vTokens.ts @@ -203,16 +203,16 @@ describe('VToken events', function () { const { data } = await subgraphClient.getMarketById(vBnxAddress.toLowerCase()); const { market } = data!; - expect(market?.badDebtMantissa).to.equal('444600002962838'); + expect(market?.badDebtMantissa).to.equal('444600002961796'); const { data: accountVTokensData } = await subgraphClient.getAccountVTokens(); const { accountVTokens } = accountVTokensData!; - const vBnxAccountTokens = accountVTokens.find(avt => - avt.id.includes(borrower.address.toLowerCase()), + const vBnxAccountTokens = accountVTokens.find(avt => + avt.id.includes(borrower.address.toLowerCase()) && avt.market.id.toLowerCase() == vBnxToken.address.toLowerCase() ); expect(vBnxAccountTokens?.badDebt.length).to.be.equal(1); - expect(vBnxAccountTokens?.badDebt[0].amountMantissa).to.be.equal('444600002962838'); + expect(vBnxAccountTokens?.badDebt[0].amountMantissa).to.be.equal('444600002961796'); }); it('handles ReservesAdded event', async function () { @@ -220,8 +220,7 @@ describe('VToken events', function () { vBtcbAddress.toLowerCase(), ); const { market: marketBeforeEvent } = dataBeforeEvent!; - - expect(marketBeforeEvent?.reservesMantissa).to.be.equals('8333330000000000'); + expect(marketBeforeEvent?.reservesMantissa).to.be.equals('0'); await btcbToken.connect(liquidator2).faucet(faucetAmount.toString()); await btcbToken.connect(liquidator2).approve(vBtcbToken.address, faucetAmount.toString()); @@ -236,7 +235,7 @@ describe('VToken events', function () { const { data } = await subgraphClient.getMarketById(vBtcbAddress.toLowerCase()); const { market } = data!; - expect(market?.reservesMantissa).to.be.equal('508333330000000000'); + expect(market?.reservesMantissa).to.be.equal('500000000000000000'); }); it('handles SpreadReservesReduced event', async function () { @@ -245,7 +244,7 @@ describe('VToken events', function () { ); const { market: marketBeforeEvent } = dataBeforeEvent!; - expect(marketBeforeEvent?.reservesMantissa).to.be.equals('508333330000000000'); + expect(marketBeforeEvent?.reservesMantissa).to.be.equals('500000000000000000'); const vTokenContract = await ethers.getContractAt('VToken', vBtcbAddress); @@ -258,6 +257,6 @@ describe('VToken events', function () { const { data } = await subgraphClient.getMarketById(vBtcbAddress.toLowerCase()); const { market } = data!; - expect(market?.reservesMantissa).to.be.equal('8333330000000000'); + expect(market?.reservesMantissa).to.be.equal('0'); }); }); From bd0ddf2899efdd0c38ea233f78d5d6e47802d2d4 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Wed, 6 Dec 2023 11:54:57 -0300 Subject: [PATCH 7/8] test: set deployer as timelock admin --- deploy/000-governance-access-control.ts | 59 ++++++++++++++++++- deploy/018-governance.ts | 22 ++++++- subgraphs/venus-governance/config/index.ts | 6 +- .../tests/integration/accessControlManager.ts | 6 +- .../tests/integration/bravo.ts | 4 +- 5 files changed, 84 insertions(+), 13 deletions(-) diff --git a/deploy/000-governance-access-control.ts b/deploy/000-governance-access-control.ts index 99cc6234..e37790f4 100644 --- a/deploy/000-governance-access-control.ts +++ b/deploy/000-governance-access-control.ts @@ -1,10 +1,65 @@ -import timelock from '@venusprotocol/governance-contracts/dist/deploy/001-timelock'; import accessControl from '@venusprotocol/governance-contracts/dist/deploy/002-access-control'; import { DeployFunction } from 'hardhat-deploy/types'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { - await timelock(hre); + const { deployments, getNamedAccounts } = hre; + const { deploy } = deployments; + const { deployer } = await getNamedAccounts(); + + const networkName = hre.network.name; + + const delayConfig = { + hardhat: { + normal: 600, + fast: 300, + critical: 100, + }, + bscmainnet: { + normal: 172800, + fast: 21600, + critical: 3600, + }, + bsctestnet: { + normal: 600, + fast: 300, + critical: 100, + }, + sepolia: { + normal: 600, + fast: 300, + critical: 100, + }, + ethereum: { + normal: 172800, + fast: 21600, + critical: 3600, + }, + }; + + await deploy("NormalTimelock", { + contract: "TestTimelockV8", + from: deployer, + args: [deployer, delayConfig[networkName].normal], + log: true, + autoMine: true, + }); + + await deploy("FastTrackTimelock", { + contract: "TestTimelockV8", + from: deployer, + args: [deployer, delayConfig[networkName].fast], + log: true, + autoMine: true, + }); + + await deploy("CriticalTimelock", { + contract: "TestTimelockV8", + from: deployer, + args: [deployer, delayConfig[networkName].critical], + log: true, + autoMine: true, + }); await accessControl(hre); }; diff --git a/deploy/018-governance.ts b/deploy/018-governance.ts index 8dc22dab..f86f9971 100644 --- a/deploy/018-governance.ts +++ b/deploy/018-governance.ts @@ -8,10 +8,18 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const { deployer } = await getNamedAccounts(); const signers = await ethers.getSigners(); - const timelock = await ethers.getContract('CriticalTimelock'); + const timelock = await ethers.getContract('NormalTimelock'); const xvsVault = await ethers.getContract('XVSVaultProxy'); - const governorAlphaTimelock = await ethers.getContract('CriticalTimelock'); + await deploy('GovernorAlphaTimelock', { + contract: 'Timelock', + from: deployer, + args: [deployer, 3600], + log: true, + autoMine: true, + }); + + const governorAlphaTimelock = await ethers.getContract('GovernorAlphaTimelock'); await deploy('GovernorAlpha', { from: deployer, args: [governorAlphaTimelock.address, xvsVault.address, deployer], @@ -39,7 +47,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { await governorAlpha.__acceptAdmin(); - const governorAlpha2Timelock = await ethers.getContract('CriticalTimelock'); + await deploy('GovernorAlpha2Timelock', { + contract: 'Timelock', + from: deployer, + args: [deployer, 3600], + log: true, + autoMine: true, + }); + + const governorAlpha2Timelock = await ethers.getContract('GovernorAlpha2Timelock'); await deploy('GovernorAlpha2', { from: deployer, diff --git a/subgraphs/venus-governance/config/index.ts b/subgraphs/venus-governance/config/index.ts index 141e0c9a..552b50b5 100644 --- a/subgraphs/venus-governance/config/index.ts +++ b/subgraphs/venus-governance/config/index.ts @@ -22,11 +22,11 @@ const main = () => { network: 'hardhat', accessControlManagerAddress: '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9', accessControlManagerStartBlock: '0', - governorAlphaAddress: '0x95775fD3Afb1F4072794CA4ddA27F2444BCf8Ac3', + governorAlphaAddress: '0xd9fEc8238711935D6c8d79Bef2B9546ef23FC046', governorAlphaStartBlock: '0', - governorAlpha2Address: '0x512F7469BcC83089497506b5df64c6E246B39925', + governorAlpha2Address: '0xCBBe2A5c3A22BE749D5DDF24e9534f98951983e2', governorAlpha2StartBlock: '0', - governorBravoDelegatorAddress: '0xE8F7d98bE6722d42F29b50500B0E318EF2be4fc8', + governorBravoDelegatorAddress: '0x2c8ED11fd7A058096F2e5828799c68BE88744E2F', governorBravoDelegatorStartBlock: '0', xvsTokenAddress: '0x1343248Cbd4e291C6979e70a138f4c774e902561', xvsTokenStartBlock: '0', diff --git a/subgraphs/venus-governance/tests/integration/accessControlManager.ts b/subgraphs/venus-governance/tests/integration/accessControlManager.ts index 392b5a93..6a581df7 100644 --- a/subgraphs/venus-governance/tests/integration/accessControlManager.ts +++ b/subgraphs/venus-governance/tests/integration/accessControlManager.ts @@ -16,7 +16,7 @@ describe('AccessControlManager', function () { const { data } = await subgraphClient.getPermissions(); const { permissions } = data!; - expect(permissions.length).to.be.equal(12); + expect(permissions.length).to.be.equal(13); permissions.forEach(pe => { expect(pe.type).to.be.equal('GRANTED'); @@ -36,7 +36,7 @@ describe('AccessControlManager', function () { const { data } = await subgraphClient.getPermissions(); const { permissions } = data!; - expect(permissions.length).to.be.equal(13); + expect(permissions.length).to.be.equal(14); expect(permissions[0].type).to.be.equal('REVOKED'); }); @@ -54,7 +54,7 @@ describe('AccessControlManager', function () { const { data } = await subgraphClient.getPermissions(); const { permissions } = data!; - expect(permissions.length).to.be.equal(13); + expect(permissions.length).to.be.equal(14); expect(permissions[0].type).to.be.equal('GRANTED'); }); diff --git a/subgraphs/venus-governance/tests/integration/bravo.ts b/subgraphs/venus-governance/tests/integration/bravo.ts index 168c8465..9e390580 100644 --- a/subgraphs/venus-governance/tests/integration/bravo.ts +++ b/subgraphs/venus-governance/tests/integration/bravo.ts @@ -28,7 +28,7 @@ describe('GovernorBravo', function () { const governorAlpha2 = await ethers.getContract('GovernorAlpha2'); // Impersonating timelock for convenience - const timelock = await ethers.getContract('Timelock'); + const timelock = await ethers.getContract('CriticalTimelock'); await signers[0].sendTransaction({ to: timelock.address, @@ -41,7 +41,7 @@ describe('GovernorBravo', function () { }); const timelockSigner = await ethers.getSigner(timelock.address); - await timelock.connect(timelockSigner).setPendingAdmin(governorBravoDelegator.address); + await timelock.connect(timelockSigner).setPendingAdmin(governorBravo.address); await network.provider.request({ method: 'hardhat_stopImpersonatingAccount', From 23c345fa14997bdecd0e9ceca225e9d872a8e357 Mon Sep 17 00:00:00 2001 From: Corey Rice Date: Thu, 7 Dec 2023 15:00:00 -0300 Subject: [PATCH 8/8] test: update governance tests --- copy_contracts.sh | 5 ++-- deploy/018-governance.ts | 16 ++++--------- hardhat.config.ts | 6 ----- package.json | 2 +- ...ol+governance-contracts+1.4.0-dev.9.patch} | 0 .../tests/integration/alpha.ts | 3 ++- .../tests/integration/bravo.ts | 23 ++++++++++--------- yarn.lock | 10 ++++---- 8 files changed, 27 insertions(+), 38 deletions(-) rename patches/{@venusprotocol+governance-contracts+1.4.0-dev.7.patch => @venusprotocol+governance-contracts+1.4.0-dev.9.patch} (100%) diff --git a/copy_contracts.sh b/copy_contracts.sh index f79869b9..c46dd10e 100755 --- a/copy_contracts.sh +++ b/copy_contracts.sh @@ -26,8 +26,9 @@ mkdir -p ./contracts/governance/contracts/test cp -rf ./node_modules/@venusprotocol/governance-contracts/contracts/legacy ./contracts/governance/contracts cp ./node_modules/@venusprotocol/governance-contracts/contracts/test/TestTimelockV8.sol ./contracts/governance/contracts/test/TestTimelockV8.sol -cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoInterfaces.sol ./contracts/governance/contracts/Governance/GovernorBravoInterfaces.sol -cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/TimelockV8.sol ./contracts/governance/contracts/Governance/TimelockV8.sol +cp -rf ./node_modules/@venusprotocol/governance-contracts/contracts/Governance ./contracts/governance/contracts +rm ./contracts/governance/contracts/Governance/AccessControlManager.sol +rm ./contracts/governance/contracts/Governance/Timelock.sol rm -rf contracts/protocol/contracts/Lens/VenusLens.sol diff --git a/deploy/018-governance.ts b/deploy/018-governance.ts index f86f9971..310ac902 100644 --- a/deploy/018-governance.ts +++ b/deploy/018-governance.ts @@ -12,7 +12,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const xvsVault = await ethers.getContract('XVSVaultProxy'); await deploy('GovernorAlphaTimelock', { - contract: 'Timelock', + contract: 'TestTimelockV8', from: deployer, args: [deployer, 3600], log: true, @@ -48,7 +48,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { await governorAlpha.__acceptAdmin(); await deploy('GovernorAlpha2Timelock', { - contract: 'Timelock', + contract: 'TestTimelockV8', from: deployer, args: [deployer, 3600], log: true, @@ -96,8 +96,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { }); await deploy('GovernorBravoDelegateV2', { - contract: - '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegate.sol:GovernorBravoDelegate', + contract: 'GovernorBravoDelegate', from: deployer, args: [], log: true, @@ -110,7 +109,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { const minVotingPeriod = await governorBravoDelegate.MIN_VOTING_PERIOD(); const minProposalThreshold = await governorBravoDelegate.MIN_PROPOSAL_THRESHOLD(); - await deploy('GovernorBravoDelegatorV1', { + await deploy('GovernorBravoDelegator', { from: deployer, args: [ timelock.address, @@ -125,13 +124,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { log: true, autoMine: true, }); - - await deploy('GovernorBravoDelegate', { - from: deployer, - args: [], - log: true, - autoMine: true, - }); }; func.tags = ['Governance']; diff --git a/hardhat.config.ts b/hardhat.config.ts index 2dc0d1d7..49b15150 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -88,12 +88,6 @@ const config: HardhatUserConfig = { sources: `${__dirname}/contracts`, artifacts: `${__dirname}/artifacts`, }, - dependencyCompiler: { - paths: [ - '@venusprotocol/governance-contracts/contracts/Governance/Timelock.sol', - '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegate.sol', - ], - }, mocha: { timeout: 100000000 }, diff --git a/package.json b/package.json index a6ed82fc..a3b826f9 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@types/node": "^20.5.9", "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", - "@venusprotocol/governance-contracts": "^1.4.0-dev.7", + "@venusprotocol/governance-contracts": "^1.4.0-dev.9", "@venusprotocol/isolated-pools": "^2.3.0-dev.4", "@venusprotocol/oracle": "^1.8.0-dev.5", "@venusprotocol/venus-protocol": "^6.1.0-dev.5", diff --git a/patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch b/patches/@venusprotocol+governance-contracts+1.4.0-dev.9.patch similarity index 100% rename from patches/@venusprotocol+governance-contracts+1.4.0-dev.7.patch rename to patches/@venusprotocol+governance-contracts+1.4.0-dev.9.patch diff --git a/subgraphs/venus-governance/tests/integration/alpha.ts b/subgraphs/venus-governance/tests/integration/alpha.ts index a1452fb9..5dfaab3a 100644 --- a/subgraphs/venus-governance/tests/integration/alpha.ts +++ b/subgraphs/venus-governance/tests/integration/alpha.ts @@ -182,8 +182,9 @@ describe('GovernorAlpha', function () { expect(proposal.queued).to.equal(true); expect(proposal.executionEta).to.equal(eta.toString()); + await mine(1); - await ethers.provider.send('evm_setNextBlockTimestamp', [eta + 1]); + await ethers.provider.send('evm_setNextBlockTimestamp', [eta]); }); it('should transition to executed', async () => { diff --git a/subgraphs/venus-governance/tests/integration/bravo.ts b/subgraphs/venus-governance/tests/integration/bravo.ts index 9e390580..9b981ad7 100644 --- a/subgraphs/venus-governance/tests/integration/bravo.ts +++ b/subgraphs/venus-governance/tests/integration/bravo.ts @@ -16,7 +16,7 @@ describe('GovernorBravo', function () { before(async function () { signers = await ethers.getSigners(); - governorBravoDelegator = await ethers.getContract('GovernorBravoDelegatorV1'); + governorBravoDelegator = await ethers.getContract('GovernorBravoDelegator'); const governorBravoDelegateV1 = await ethers.getContract('GovernorBravoDelegateV1'); governorBravo = await ethers.getContractAt( 'GovernorBravoDelegateV1', @@ -28,7 +28,7 @@ describe('GovernorBravo', function () { const governorAlpha2 = await ethers.getContract('GovernorAlpha2'); // Impersonating timelock for convenience - const timelock = await ethers.getContract('CriticalTimelock'); + const timelock = await ethers.getContract('NormalTimelock'); await signers[0].sendTransaction({ to: timelock.address, @@ -41,7 +41,7 @@ describe('GovernorBravo', function () { }); const timelockSigner = await ethers.getSigner(timelock.address); - await timelock.connect(timelockSigner).setPendingAdmin(governorBravo.address); + await timelock.connect(timelockSigner).setPendingAdmin(governorBravoDelegator.address); await network.provider.request({ method: 'hardhat_stopImpersonatingAccount', @@ -160,10 +160,10 @@ describe('GovernorBravo', function () { await governorBravo.queue(23); - const governorAlpha2Timelock = await ethers.getContract('Timelock'); + const timelock = await ethers.getContract('NormalTimelock'); const eta = (await ethers.provider.getBlock(await ethers.provider.getBlockNumber())).timestamp + - +(await governorAlpha2Timelock.delay()); + +(await timelock.delay()); await waitForSubgraphToBeSynced(SYNC_DELAY); @@ -173,8 +173,8 @@ describe('GovernorBravo', function () { expect(proposal.queued).to.equal(true); expect(proposal.executionEta).to.equal(eta.toString()); - - await ethers.provider.send('evm_setNextBlockTimestamp', [eta + 1]); + await mine(1); + await ethers.provider.send('evm_setNextBlockTimestamp', [eta]); }); it('should index succeeded proposal event', async function () { @@ -192,7 +192,7 @@ describe('GovernorBravo', function () { describe('GovernorBravo2', function () { it('should update GovernorEntity when setting implementation', async function () { - const timelock = await ethers.getContract('Timelock'); + const timelock = await ethers.getContract('NormalTimelock'); const governorBravoDelegateV1 = await ethers.getContract('GovernorBravoDelegateV1'); // Assert original values let { @@ -210,7 +210,7 @@ describe('GovernorBravo', function () { expect(governance.guardian).to.equal(signers[0].address.toLowerCase()); expect(governance.proposalMaxOperations).to.equal('10'); - const governorBravoDelegatorV2 = await ethers.getContract('GovernorBravoDelegate'); + const governorBravoDelegatorV2 = await ethers.getContract('GovernorBravoDelegateV2'); const xvsVaultProxy = await ethers.getContract('XVSVaultProxy'); const xvsVault = await ethers.getContractAt('XVSVault', xvsVaultProxy.address); @@ -375,7 +375,7 @@ describe('GovernorBravo', function () { await governorBravo.queue(25); - const governorBravoTimelock = await ethers.getContract('Timelock'); + const governorBravoTimelock = await ethers.getContract('NormalTimelock'); const eta = (await ethers.provider.getBlock(await ethers.provider.getBlockNumber())).timestamp + +(await governorBravoTimelock.delay()); @@ -389,7 +389,8 @@ describe('GovernorBravo', function () { expect(proposal.queued).to.equal(true); expect(proposal.executionEta).to.equal(eta.toString()); - await ethers.provider.send('evm_setNextBlockTimestamp', [eta + 1]); + await mine(1); + await ethers.provider.send('evm_setNextBlockTimestamp', [eta]); }); it('should index succeeded proposal event', async function () { diff --git a/yarn.lock b/yarn.lock index 02a184b9..8e6d4c7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4317,14 +4317,14 @@ __metadata: languageName: node linkType: hard -"@venusprotocol/governance-contracts@npm:^1.4.0-dev.7": - version: 1.4.0-dev.7 - resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.7" +"@venusprotocol/governance-contracts@npm:^1.4.0-dev.9": + version: 1.4.0-dev.9 + resolution: "@venusprotocol/governance-contracts@npm:1.4.0-dev.9" dependencies: "@venusprotocol/solidity-utilities": ^1.1.0 hardhat-deploy-ethers: ^0.3.0-beta.13 module-alias: ^2.2.2 - checksum: cc6aead9facf41d638b93306fa2a8b85d43f260d0a0d1f6977ea57ac6d409405cc70e71158f16bb058319de291d685af974ce8a76a60e7b3d719dd2c53b6ba8d + checksum: 25583a20738973d2ade4a1fdf84dcacf0caec42004f5bf755fdfa29b3602f2b9184638f2d828359195bf8baa3b082797cad941874be1a91a61900b343420cead languageName: node linkType: hard @@ -14638,7 +14638,7 @@ __metadata: "@types/node": ^20.5.9 "@typescript-eslint/eslint-plugin": ^5.40.1 "@typescript-eslint/parser": ^5.40.1 - "@venusprotocol/governance-contracts": ^1.4.0-dev.7 + "@venusprotocol/governance-contracts": ^1.4.0-dev.9 "@venusprotocol/isolated-pools": ^2.3.0-dev.4 "@venusprotocol/oracle": ^1.8.0-dev.5 "@venusprotocol/protocol-reserve": ^1.1.0